add marked.js entry point for md2html in nbconvert

now uses the exact same code as the live notebook

IPython/nbconvert/filters/marked.js

@@ -0,0 +1,54
+// Node.js script for markdown to html conversion
+// This applies the same math extraction and marked settings
+// that we use in the live notebook.
+
+// IPython static_path dir relative to here:
+var static_path = __dirname + "/../../html/static/";
+
+var fs = require('fs');
+var IPython;
+// marked can be loaded with require,
+// the others must be execfiled
+var marked = require(static_path + 'components/marked/lib/marked.js');
+
+eval(fs.readFileSync(static_path + "components/highlight.js/build/highlight.pack.js", 'utf8'));
+eval(fs.readFileSync(static_path + "base/js/namespace.js", 'utf8'));
+
+eval(fs.readFileSync(static_path + "base/js/utils.js", 'utf8'));
+eval(fs.readFileSync(static_path + "notebook/js/mathjaxutils.js", 'utf8'));
+
+// this is copied from notebook.main. Should it be moved somewhere we can reuse it?
+marked.setOptions({
+    gfm : true,
+    tables: true,
+    langPrefix: "language-",
+    highlight: function(code, lang) {
+        if (!lang) {
+            // no language, no highlight
+            return code;
+        }
+        var highlighted;
+        try {
+            highlighted = hljs.highlight(lang, code, false);
+        } catch(err) {
+            highlighted = hljs.highlightAuto(code);
+        }
+        return highlighted.value;
+    }
+});
+
+// read the markdown from stdin
+var md='';
+process.stdin.on("data", function (data) {
+    md += data;
+});
+
+// perform the md2html transform once stdin is complete
+process.stdin.on("end", function () {
+    var text_and_math = IPython.mathjaxutils.remove_math(md);
+    var text = text_and_math[0];
+    var math = text_and_math[1];
+    var html = marked.parser(marked.lexer(text));
+    html = IPython.mathjaxutils.replace_math(html, math);
+    process.stdout.write(html);
+});

IPython/nbconvert/filters/markdown.py

@@ -16,6 +16,7 markdown within Jinja templates.
 from __future__ import print_function
 
 # Stdlib imports
+import os
 import subprocess
 from io import TextIOWrapper, BytesIO
 
@@ -28,6 +29,7 from IPython.utils.py3compat import cast_bytes
 #-----------------------------------------------------------------------------
 # Functions
 #-----------------------------------------------------------------------------
+marked = os.path.join(os.path.dirname(__file__), "marked.js")
 
 __all__ = [
     'markdown2html',
@@ -37,8 +39,8 __all__ = [
     'markdown2rst',
 ]
 
-class MarkedMissing(ConversionException):
-    """Exception raised when Marked is missing."""
+class NodeJSMissing(ConversionException):
+    """Exception raised when node.js is missing."""
     pass
 
 def markdown2latex(source):
@@ -65,16 +67,15 def markdown2html_pandoc(source):
 
 def markdown2html_marked(source, encoding='utf-8'):
     """Convert a markdown string to HTML via marked"""
-    command = ['marked', '--gfm', '--tables']
+    command = ['node', marked]
     try:
         p = subprocess.Popen(command,
                              stdin=subprocess.PIPE, stdout=subprocess.PIPE
         )
     except OSError as e:
-        raise MarkedMissing(
+        raise NodeJSMissing(
             "The command '%s' returned an error: %s.\n" % (" ".join(command), e) +
-            "Please check that marked is installed:\n" +
-            "    npm install -g marked"
+            "Please check that Node.js is installed."
         )
     out, _ = p.communicate(cast_bytes(source, encoding))
     out = TextIOWrapper(BytesIO(out), encoding, 'replace').read()
@@ -99,7 +100,7 def markdown2rst(source):
     return pandoc(source, 'markdown', 'rst')
 
 try:
-    find_cmd('marked')
+    find_cmd('node')
 except FindCmdError:
     markdown2html = markdown2html_pandoc
 else: