v0.6.0: Fix KaTeX support, expand sanitization

Spurred by jsvine/nbpreview#3

README.md

@@ -1,4 +1,4 @@
-# notebook.js `v0.5.2`
+# notebook.js `v0.6.0`
 
 Notebook.js parses raw [Jupyter](http://jupyter.org/)/[IPython](http://ipython.org/) notebooks, and lets you render them as HTML. See a __[working demo here](https://jsvine.github.io/nbpreview/)__.
 
@@ -101,8 +101,9 @@ The function should at least return the original `text` value if it cannot perfo
 Notebook.js currently doesn't support all of MathJax's syntaxes (MathML, AsciiMath, LaTeX). In the browser, however, it does support a significant subset of LaTeX via [KaTeX](https://github.com/Khan/KaTeX). To enable this functionality, the webpage must have the following JavaScript and CSS libraries (or their equivalents, from other sources) loaded:
 
 - `https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.12.0/katex.min.js`
-- `https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.12.0/katex.min.css`
 - `https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.12.0/contrib/auto-render.min.js`
+- `https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.12.0/katex.min.css`
+- [KaTeX fonts](https://katex.org/docs/font.html)
 
 ## Styling Rendered Notebooks
 
@@ -123,3 +124,4 @@ Many thanks to the following users for catching bugs, fixing typos, and proposin
 - [@dereklieu](https://github.com/dereklieu)
 - [@micmcg](https://github.com/micmcg)
 - [@mhrvol](https://github.com/mhrvol)
+- [@ingodahn](https://github.com/ingodahn)

notebook.js

@@ -1,8 +1,8 @@
-// notebook.js 0.5.2
+// notebook.js 0.6.0
 // http://github.com/jsvine/notebookjs
 // notebook.js may be freely distributed under the MIT license.
 (function () {
-    var VERSION = "0.5.2";
+    var VERSION = "0.6.0";
     var root = this;
     var isBrowser = root.window !== undefined;
     var doc;
@@ -255,35 +255,38 @@
         }
     };
 
+    var math_delimiters = [
+        {left: "$$", right: "$$", display: true},
+        {left: "\\[", right: "\\]", display: true},
+        {left: "\\(", right: "\\)", display: false},
+        {left: "$", right: "$", display: false}
+    ];
+
     nb.Cell.prototype.renderers = {
         markdown: function () {
             var el = makeElement("div", [ "cell", "markdown-cell" ]);
-            el.innerHTML = nb.markdown(joinText(this.raw.source));
 
-            /* Requires to render KaTeX
-            'https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.js',
-            'https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css',
-            'https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/contrib/auto-render.min.js',
-            */
+            var joined = joinText(this.raw.source);
+
+            // Pre-render math via KaTeX's auto-render extension, if available
             if (root.renderMathInElement != null) {
-                root.renderMathInElement(el, {delimiters: [
-                    {left: "$$", right: "$$", display: true},
-                    {left: "\\[", right: "\\]", display: true},
-                    {left: "\\(", right: "\\)", display: false},
-                    {left: "$", right: "$", display: false}
-                ]});
+                el.innerHTML = nb.sanitizer(joined);
+                root.renderMathInElement(el, { delimiters: math_delimiters });
+                el.innerHTML = nb.sanitizer(nb.markdown(el.innerHTML));
+            } else {
+                el.innerHTML = nb.sanitizer(nb.markdown(joined));
             }
 
             return el;
         },
         heading: function () {
             var el = makeElement("h" + this.raw.level, [ "cell", "heading-cell" ]);
-            el.innerHTML = joinText(this.raw.source);
+            el.innerHTML = nb.sanitizer(joinText(this.raw.source));
             return el;
         },
         raw: function () {
             var el = makeElement("div", [ "cell", "raw-cell" ]);
-            el.innerHTML = joinText(this.raw.source);
+            el.innerHTML = escapeHTML(joinText(this.raw.source));
             return el;
         },
         code: function () {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "notebookjs",
-    "version": "0.5.2",
+    "version": "0.6.0",
     "description": "Parse and render IPython/Jupyter notebooks.",
     "main": "notebook.js",
     "homepage": "https://github.com/jsvine/notebookjs",