Support MathJaX v3

vnotex · Feb 26, 2020 · e57eb7a · e57eb7a
1 parent 6158263
commit e57eb7a
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 49 deletions.
diff --git a/src/resources/hoedown.js b/src/resources/hoedown.js
@@ -100,13 +100,14 @@ var updateHtml = function(html) {
     // finishLoading logic.
     // MathJax may be not loaded for now.
     if (VEnableMathjax && (typeof MathJax != "undefined")) {
-        try {
-            MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
-                              ["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
-        } catch (err) {
-            content.setLog("err: " + err);
-            finishOneAsyncJob();
-        }
+        MathJax.texReset();
+        MathJax
+            .typesetPromise([contentDiv])
+            .then(postProcessMathJax)
+            .catch(function (err) {
+                content.setLog("err: " + err);
+                finishOneAsyncJob();
+            });
     } else {
         finishOneAsyncJob();
     }

diff --git a/src/resources/markdown-it.js b/src/resources/markdown-it.js
@@ -195,13 +195,14 @@ var updateText = function(text) {
             eles.push(texToRender[i]);
         }
 
-        try {
-            MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
-                              ["Typeset", MathJax.Hub, eles, postProcessMathJax]);
-        } catch (err) {
-            content.setLog("err: " + err);
-            finishOneAsyncJob();
-        }
+        MathJax.texReset();
+        MathJax
+            .typesetPromise(eles)
+            .then(postProcessMathJax)
+            .catch(function (err) {
+                content.setLog("err: " + err);
+                finishOneAsyncJob();
+            });
     } else {
         finishOneAsyncJob();
     }
@@ -244,7 +245,7 @@ var handleMetaData = function() {
 };
 
 var postProcessMathJaxWhenMathjaxReady = function() {
-    var all = MathJax.Hub.getAllJax();
+    var all = Array.from(MathJax.startup.document.math);
     for (var i = 0; i < all.length; ++i) {
         var node = all[i].SourceElement().parentNode;
         if (VRemoveMathjaxScript) {
@@ -282,8 +283,7 @@ var handleMathjaxReady = function() {
     }
 
     try {
-        MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
-                          ["Typeset", MathJax.Hub, eles, postProcessMathJaxWhenMathjaxReady]);
+        MathJax.typesetPromise(eles).then(postProcessMathJaxWhenMathjaxReady);
     } catch (err) {
         content.setLog("err: " + err);
         finishOneAsyncJob();

diff --git a/src/resources/markdown_template.html b/src/resources/markdown_template.html
@@ -29,7 +29,14 @@
     <script src="qrc:/utils/highlightjs/highlight.pack.js"></script>
     <script src="qrc:/utils/clipboard.js/clipboard.min.js"></script>
     <!-- EXTRA_PLACE_HOLDER -->
-    <script src="JS_PLACE_HOLDER" defer></script>
+    <script>
+        MathJax = {
+          tex: {
+            inlineMath: [['$', '$'], ['\\(', '\\)']]
+          }
+        };
+    </script>
+    <script src="JS_PLACE_HOLDER" defer id="MathJax-script"></script>
     <script src="qrc:/resources/common.js" defer></script>
     <script src="qrc:/resources/view_image.js" defer></script>
     <script src="qrc:/resources/markdown_template.js" defer></script>

diff --git a/src/resources/markdown_template.js b/src/resources/markdown_template.js
@@ -1385,7 +1385,7 @@ var getHtmlWithInlineStyles = function(container) {
 // Will be called after MathJax rendering finished.
 // Make <pre><code>math</code></pre> to <p>math</p>
 var postProcessMathJax = function() {
-    var all = MathJax.Hub.getAllJax();
+    var all = Array.from(MathJax.startup.document.math);
     for (var i = 0; i < all.length; ++i) {
         var node = all[i].SourceElement().parentNode;
         if (VRemoveMathjaxScript) {

diff --git a/src/resources/marked.js b/src/resources/marked.js
@@ -79,13 +79,14 @@ var updateText = function(text) {
     // If you add new logics after handling MathJax, please pay attention to
     // finishLoading logic.
     if (VEnableMathjax) {
-        try {
-            MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
-                              ["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
-        } catch (err) {
-            content.setLog("err: " + err);
-            finishOneAsyncJob();
-        }
+        MathJax.texReset();
+        MathJax
+            .typesetPromise([contentDiv])
+            .then(postProcessMathJax)
+            .catch(function (err) {
+                content.setLog("err: " + err);
+                finishOneAsyncJob();
+            });
     } else {
         finishOneAsyncJob();
     }

diff --git a/src/resources/mathjax_preview.js b/src/resources/mathjax_preview.js
@@ -71,19 +71,16 @@ var previewMathJax = function(identifier, id, timeStamp, text, isHtml) {
     if (text.indexOf('$$') !== -1) {
         isBlock = true;
     }
-
-    try {
-        MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
-                          ["Typeset",
-                           MathJax.Hub,
-                           p,
-                           [postProcessMathJax, identifier, id, timeStamp, p, isBlock]]);
-    } catch (err) {
-        content.setLog("err: " + err);
-        content.mathjaxResultReady(identifier, id, timeStamp, 'png', '');
-        contentDiv.removeChild(p);
-        delete p;
-    }
+    MathJax
+        .typesetPromise([p])
+        .then(function () {
+            postProcessMathJax(identifier, id, timeStamp, p, isBlock);
+        }).catch(function (err) {
+            content.setLog("err: " + err);
+            content.mathjaxResultReady(identifier, id, timeStamp, 'png', '');
+            contentDiv.removeChild(p);
+            delete p;
+        });
 };
 
 var postProcessMathJax = function(identifier, id, timeStamp, container, isBlock) {
@@ -93,7 +90,7 @@ var postProcessMathJax = function(identifier, id, timeStamp, container, isBlock)
         return;
     }
 
-    var hei = (isBlock ? container.clientHeight * 1.5 : container.clientHeight * 1.6) + 5;
+    var hei = container.clientHeight * 1.5 + (isBlock ? 20 : 5);
     domtoimage.toPng(container, { height: hei }).then(function (dataUrl) {
         var png = dataUrl.substring(dataUrl.indexOf(',') + 1);
         content.mathjaxResultReady(identifier, id, timeStamp, 'png', png);

diff --git a/src/resources/mathjax_preview_template.html b/src/resources/mathjax_preview_template.html
@@ -10,7 +10,14 @@
     <link rel="stylesheet" type="text/css" href="CSS_PLACE_HOLDER">
     <script src="qrc:/resources/qwebchannel.js"></script>
     <!-- EXTRA_PLACE_HOLDER -->
-    <script src="JS_PLACE_HOLDER" async></script>
+    <script>
+        MathJax = {
+          tex: {
+            inlineMath: [['$', '$'], ['\\(', '\\)']]
+          }
+        };
+    </script>
+    <script src="JS_PLACE_HOLDER" defer id="MathJax-script"></script>
     <script src="qrc:/utils/dom-to-image/dom-to-image.js" defer></script>
     <script src="qrc:/resources/common.js" defer></script>
     <script src="qrc:/resources/mathjax_preview.js" defer></script>

diff --git a/src/resources/showdown.js b/src/resources/showdown.js
@@ -134,13 +134,14 @@ var updateText = function(text) {
     // If you add new logics after handling MathJax, please pay attention to
     // finishLoading logic.
     if (VEnableMathjax) {
-        try {
-            MathJax.Hub.Queue(["resetEquationNumbers",MathJax.InputJax.TeX],
-                              ["Typeset", MathJax.Hub, contentDiv, postProcessMathJax]);
-        } catch (err) {
-            content.setLog("err: " + err);
-            finishOneAsyncJob();
-        }
+        MathJax.texReset();
+        MathJax
+            .typesetPromise([contentDiv])
+            .then(postProcessMathJax)
+            .catch(function (err) {
+                content.setLog("err: " + err);
+                finishOneAsyncJob();
+            });
     } else {
         finishOneAsyncJob();
     }

diff --git a/src/resources/vnote.ini b/src/resources/vnote.ini
@@ -388,7 +388,7 @@ custom_export=
 markdownit_opt=html,break,linkify,metadata
 
 ; Location and configuration for Mathjax
-mathjax_javascript=https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_HTMLorMML
+mathjax_javascript=https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.0.1/es5/tex-mml-chtml.js
 
 ; Styles to be removed when copied
 ; style1,style2,style3