markdown-styles
Advanced tools
Comparing version 2.0.1 to 2.0.2
@@ -13,3 +13,8 @@ var fs = require('fs'), | ||
md.annotateMdHeadings(), | ||
md.highlight(), | ||
md.highlight(function(code, lang) { | ||
if (argv.highlight && typeof argv.highlight[lang] === 'function') { | ||
return argv.highlight[lang](code, lang); | ||
} | ||
return false; | ||
}), | ||
md.convertMd(), | ||
@@ -16,0 +21,0 @@ |
var fs = require('fs'), | ||
path = require('path'); | ||
path = require('path'), | ||
nodeResolve = require('resolve'); | ||
@@ -65,6 +66,3 @@ var layoutDir = __dirname + '/../layouts/'; | ||
var matched = (typeof name === 'string' ? name.match(/highlight\-(.*)/) : false); | ||
if (name == 'highlight') { | ||
argv[name] = findModule(argv[name], [process.cwd, __dirname]); | ||
hl['default'] = require(argv[name]); | ||
} else if (matched) { | ||
if (matched) { | ||
var ext = matched[1]; | ||
@@ -79,1 +77,16 @@ argv[name] = findModule(argv[name], [process.cwd, __dirname]); | ||
}; | ||
function findModule(name) { | ||
var result = ''; | ||
try { | ||
result = nodeResolve.sync(name, { basedir: process.cwd() }); | ||
} catch(e) { | ||
try { | ||
result = nodeResolve.sync(name, { basedir: __dirname }); | ||
} catch(e) { | ||
console.error('Cannot find module ' + name + ' from ' + process.cwd() + ' or ' + __dirname); | ||
throw e; | ||
} | ||
} | ||
return result; | ||
} |
{ | ||
"name": "markdown-styles", | ||
"description": "Markdown to HTML generator and multiple CSS themes for Markdown", | ||
"version": "2.0.1", | ||
"version": "2.0.2", | ||
"author": { | ||
@@ -32,3 +32,3 @@ "name": "Mikito Takada", | ||
"handlebars": "~2.0.0", | ||
"markdown-stream-utils": "~1.0.1", | ||
"markdown-stream-utils": "~1.0.2", | ||
"mkdirp": "0.3.5", | ||
@@ -35,0 +35,0 @@ "pipe-iterators": "~1.1.0", |
Sorry, the diff of this file is not supported yet
4102102
32527
12
Updatedmarkdown-stream-utils@~1.0.2