Merge branch 'feat-c92'

Author: vvakame

Diff for: .gitmodules

@@ -0,0 +1,3 @@
+[submodule "prh-rules"]
+	path = prh-rules
+	url = https://github.com/prh/rules.git

Diff for: .vscode/settings.json

@@ -1,4 +1,5 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "typescript.tsdk": "./node_modules/typescript/lib/"
+    "typescript.tsdk": "./node_modules/typescript/lib/",
+    "prh.prhlsPath": "./node_modules/.bin/prhls"
 }

Diff for: Gemfile

@@ -1,5 +1,5 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'review', :git => 'https://github.com/kmuto/review.git'
+gem 'review', '2.3.0'
 gem 'review-peg', '0.2.2'

Diff for: Gemfile.lock

@@ -1,22 +1,19 @@
-GIT
-  remote: https://github.com/kmuto/review.git
-  revision: eb6845763b8875b89af997277abd0c158f8092b9
-  specs:
-    review (2.0.0)
-      rubyzip
-
 GEM
   remote: https://rubygems.org/
   specs:
+    review (2.3.0)
+      rouge
+      rubyzip
     review-peg (0.2.2)
-    rubyzip (1.2.0)
+    rouge (2.1.1)
+    rubyzip (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  review!
+  review (= 2.3.0)
   review-peg (= 0.2.2)
 
 BUNDLED WITH
-   1.12.5
+   1.15.3

Diff for: Gruntfile.js

@@ -25,94 +25,103 @@ module.exports = grunt => {
 					`${articles}/*.epub`,
 					`${articles}/*.html`,
 					`${articles}/*.xml`,
-					`${articles}/*.txt`
+					`${articles}/*.txt`,
+					`${articles}/*.md`,
 				]
 			},
 			publish: {
 				src: `${publish}/`
-			}
+			},
 		},
 		copy: {
 			publish: {
 				files: [
-					{expand: true, cwd: `${articles}/webroot/`, src: ['**'], dest: `${publish}/`}
-				]
-			}
+					{ expand: true, cwd: `${articles}/webroot/`, src: ['**'], dest: `${publish}/` },
+				],
+			},
 		},
 		shell: {
 			preprocess: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewPreproc} -r --tabwidth=2 *.re`
+				command: `${reviewPreproc} -r --tabwidth=2 *.re`,
 			},
 			sass: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `node-sass ./ -o ./`
+				command: `node-sass ./ -o ./`,
 			},
 			compile2text: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewCompile} --target=text`
+				command: `${reviewCompile} --target=text`,
+			},
+			compile2markdown: {
+				options: {
+					execOptions: {
+						cwd: articles,
+					},
+				},
+				command: `${reviewCompile} --target=markdown`,
 			},
 			compile2html: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewCompile} --target=html --yaml=config.yml --chapterlink --footnotetext`
+				command: `${reviewCompile} --target=html --yaml=config.yml --chapterlink --footnotetext`,
 			},
 			compile2latex: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewCompile} --target=latex --footnotetext`
+				command: `${reviewCompile} --target=latex --footnotetext`,
 			},
 			compile2idgxml: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewCompile} --target=idgxml`
+				command: `${reviewCompile} --target=idgxml`,
 			},
 			compile2web: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewWebMaker} config.yml`
+				command: `${reviewWebMaker} config.yml`,
 			},
 			compile2pdf: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewPdfMaker} config.yml`
+				command: `${reviewPdfMaker} config.yml`,
 			},
 			compile2epub: {
 				options: {
 					execOptions: {
 						cwd: articles,
-					}
+					},
 				},
-				command: `${reviewEpubMaker} config.yml`
+				command: `${reviewEpubMaker} config.yml`,
 			},
-		}
+		},
 	});
 
 	function generateTask(target, pretask) {
@@ -130,6 +139,11 @@ module.exports = grunt => {
 		"原稿をコンパイルしてTextファイルにする",
 		generateTask("text"));
 
+	grunt.registerTask(
+		"markdown",
+		"原稿をコンパイルしてMarkdownファイルにする",
+		generateTask("markdown"));
+
 	grunt.registerTask(
 		"html",
 		"原稿をコンパイルしてHTMLファイルにする",

Diff for: articles/.gitignore

@@ -1,5 +1,6 @@
 *.html
 *.txt
+*.md
 *.xml
 *.tex