From 55d52d060a3681a67b83caf5728203c33135e665 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 4 Aug 2015 13:20:19 -0700 Subject: [PATCH] [Documentation] Switch to marked Switch markdown generator to something more up-to-date, MissionControl/vista#21. --- docs/gendocs.js | 15 +++++++++++++-- package.json | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/gendocs.js b/docs/gendocs.js index 6fe71f1347..26816ba703 100644 --- a/docs/gendocs.js +++ b/docs/gendocs.js @@ -15,7 +15,7 @@ GLOBAL.window = GLOBAL.window || GLOBAL; // nomnoml expects window to be define mkdirp = require("mkdirp"), path = require("path"), glob = require("glob"), - showdown = require("github-flavored-markdown"), + marked = require("marked"), split = require("split"), stream = require("stream"), nomnoml = require('nomnoml'), @@ -79,7 +79,7 @@ GLOBAL.window = GLOBAL.window || GLOBAL; // nomnoml expects window to be define }; transform._flush = function (done) { this.push("\n"); - this.push(showdown.parse(markdown)); + this.push(marked(markdown)); this.push("\n\n"); done(); }; @@ -89,6 +89,17 @@ GLOBAL.window = GLOBAL.window || GLOBAL; // nomnoml expects window to be define options['in'] = options['in'] || options.i; options.out = options.out || options.o; + marked.setOptions({ + renderer: new marked.Renderer(), + gfm: true, + tables: true, + breaks: false, + pedantic: false, + sanitize: true, + smartLists: true, + smartypants: false + }); + glob(options['in'] + "/**/*.md", {}, function (err, files) { files.forEach(function (file) { var destination = file.replace(options['in'], options.out) diff --git a/package.json b/package.json index df7a7f9529..d1d675df19 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "karma-phantomjs-launcher": "^0.1.4", "karma-requirejs": "^0.2.2", "requirejs": "^2.1.17", - "github-flavored-markdown": ">= 1.0.0", + "marked": "^0.3.5", "glob": ">= 3.0.0", "split": "^1.0.0", "mkdirp": "^0.5.1",