1 files changed, 47 insertions, 15 deletions

diff --git a/public/js/extra.js b/public/js/extra.js
index a4eed879..4a9cc76e 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -11,6 +11,7 @@ var PDFObject = require('pdfobject');
 var S = require('string');
 var saveAs = require('file-saver').saveAs;
 require('../vendor/md-toc');
+var Viz = require("viz.js");
 
 //auto update last change
 window.createtime = null;
@@ -308,6 +309,7 @@ function finishView(view) {
             svg[0].setAttribute('preserveAspectRatio', 'xMidYMid meet');
         } catch (err) {
             $value.unwrap();
+            $value.parent().append('<div class="alert alert-warning">' + err + '</div>');
             console.warn(err);
         }
     });
@@ -331,25 +333,36 @@ function finishView(view) {
             $value.children().unwrap().unwrap();
         } catch (err) {
             $value.unwrap();
+            $value.parent().append('<div class="alert alert-warning">' + err + '</div>');
             console.warn(err);
         }
     });
     //graphviz
-    var Viz = require("viz.js");
     var graphvizs = view.find("div.graphviz.raw").removeClass("raw");
-    graphvizs.each(function (key, value) {
-        try {
-            var $value = $(value);
-            var $ele = $(value).parent().parent();
+    function parseGraphviz(key, value) {
+        var $value = $(value);
+        var $ele = $(value).parent().parent();
 
-            var graphviz = Viz($value.text());
-            $value.html(graphviz);
+        var graphviz = Viz($value.text());
+        if (!graphviz) throw Error('viz.js output empty graph');
+        $value.html(graphviz);
 
-            $ele.addClass('graphviz');
-            $value.children().unwrap().unwrap();
+        $ele.addClass('graphviz');
+        $value.children().unwrap().unwrap();
+    }
+    graphvizs.each(function (key, value) {
+        try {
+            parseGraphviz(key, value);
         } catch (err) {
-            $value.unwrap();
-            console.warn(err);
+            // workaround for graphviz not recover from error
+            try {
+                parseGraphviz(key, value);
+            } catch (err) {
+                var $value = $(value);
+                $value.unwrap();
+                $value.parent().append('<div class="alert alert-warning">' + err + '</div>');
+                console.warn(err);
+            }
         }
     });
     //mermaid
@@ -369,11 +382,11 @@ function finishView(view) {
                 $ele.html($value.text());
                 mermaid.init(undefined, $ele);
             } else {
-                $value.unwrap();
-                console.warn(mermaidError);
+                throw new Error(mermaidError);
             }
         } catch (err) {
             $value.unwrap();
+            $value.parent().append('<div class="alert alert-warning">' + err + '</div>');
             console.warn(err);
         }
     });
@@ -532,6 +545,16 @@ function postProcess(code) {
 			});
 		}
 	}
+    // show yaml meta paring error
+    if (md.metaError) {
+        var warning = result.find('div#meta-error');
+        if (warning && warning.length > 0) {
+            warning.text(md.metaError)
+        } else {
+            warning = $('<div id="meta-error" class="alert alert-warning">' + md.metaError + '</div>')
+            result.prepend(warning);
+        }
+    }
     return result;
 }
 window.postProcess = postProcess;
@@ -903,7 +926,14 @@ md.use(require('markdown-it-mark'));
 md.use(require('markdown-it-ins'));
 md.use(require('markdown-it-sub'));
 md.use(require('markdown-it-sup'));
-md.use(require('../vendor/markdown-it-mathjax'));
+md.use(require('markdown-it-mathjax')({
+    beforeMath: '<span class="mathjax raw">',
+    afterMath: '</span>',
+    beforeInlineMath: '<span class="mathjax raw">\\(',
+    afterInlineMath: '\\)</span>',
+    beforeDisplayMath: '<span class="mathjax raw">\\[',
+    afterDisplayMath: '\\]</span>'
+}));
 md.use(require('markdown-it-imsize'));
 
 md.use(require('markdown-it-emoji'), {
@@ -980,7 +1010,7 @@ md.renderer.rules.fence = function (tokens, idx, options, env, self) {
 };
 
 /* Defined regex markdown it plugins */
-require('script!../vendor/markdown-it-regexp');
+var Plugin = require('markdown-it-regexp');
 
 //youtube
 var youtubePlugin = new Plugin(
@@ -1104,7 +1134,9 @@ function meta(state, start, end, silent) {
 
     try {
         md.meta = jsyaml.safeLoad(data.join('\n')) || {};
+        delete md.metaError;
     } catch(err) {
+        md.metaError = err;
         console.warn(err);
         return false;
     }