simplify

archmoj · archmoj · commit 5cd3ba0b4f25 · 2022-01-06T12:41:42.000-05:00
diff --git a/devtools/test_dashboard/index-mathjax3.html b/devtools/test_dashboard/index-mathjax3.html
@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>Plotly.js Devtools - MathJax v3 loaded with svg output</title>
+  <p>MathJax $V^3$ with $svg$ output on the page as well as plotly graphs</p>
   <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:600,400,300,200|Droid+Sans|PT+Sans+Narrow|Gravitas+One|Droid+Sans+Mono|Droid+Serif|Raleway|Old+Standard+TT"/>
   <link rel="stylesheet" type="text/css" href="./style.css">
 </head>
@@ -20,7 +21,7 @@
   </div>
   <div id="snapshot"></div>
 
-  <script src="../../node_modules/mathjax-v3/es5/tex-mml-svg.js"></script>
+  <script src="../../node_modules/mathjax-v3/es5/tex-svg.js"></script>
   <script charset="utf-8" id="source"  type="module">import "../../build/plotly.js"</script>
   <script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
 </body>
diff --git a/devtools/test_dashboard/index-mathjax3chtml.html b/devtools/test_dashboard/index-mathjax3chtml.html
@@ -23,44 +23,43 @@
 
   <script>
     window.MathJax = window.MathJax || {
+      // see https://github.com/mathjax/MathJax/issues/2705#issuecomment-859742446
       loader: {load: ['output/svg']},
       startup: {
         ready() {
-          //
-          //  Get the MathJax modules that we need.
-          //
+          // Get the MathJax modules that we need.
           const {mathjax} = MathJax._.mathjax;
           const {SVG} = MathJax._.output.svg_ts;
-          //
+
           // Do the normal setup
-          //
           MathJax.startup.defaultReady();
-          //
-          //  Create an SVG output jax and a new MathDocument that uses it.
-          //
+
+          // Create an SVG output jax and a new MathDocument that uses it.
           const svgOutput = new SVG(MathJax.config.svg);
           const svgDocument = mathjax.document(document, {
             ...MathJax.config.options,
             InputJax: MathJax.startup.input,
             OutputJax: svgOutput
           });
-          //
-          //  Define the SVG-based conversion methods
-          //
+
+          // Define the SVG-based conversion methods
           MathJax.tex2svg = (math, options = {}) => {
             options.format = svgDocument.inputJax[0].name;
             return svgDocument.convert(math, options);
           };
+          /*
           MathJax.tex2svgPromise = (math, options = {}) => {
             options.format = svgDocument.inputJax[0].name;
             return mathjax.handleRetriesFor(() => svgDocument.convert(math, options));
           };
+          */
           MathJax.svgStylesheet = () => svgOutput.styleSheet(svgDocument);
         }
       }
     };
   </script>
-  <script src="../../node_modules/mathjax-v3/es5/tex-mml-chtml.js"></script>
+  <script src="../../node_modules/mathjax-v3/es5/tex-chtml.js"></script>
+
   <script charset="utf-8" id="source"  type="module">import "../../build/plotly.js"</script>
   <script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
 </body>
diff --git a/src/lib/svg_text_utils.js b/src/lib/svg_text_utils.js
@@ -224,7 +224,9 @@ function texToSVG(_texString, _config, _callback) {
             }
         } else {
             originalRenderer = MathJax.config.startup.output;
-            MathJax.config.startup.output = 'svg';
+            if(originalRenderer !== 'svg') {
+                MathJax.config.startup.output = 'svg';
+            }
         }
     };
 
@@ -306,10 +308,8 @@ function texToSVG(_texString, _config, _callback) {
         setConfig();
         setRenderer();
         MathJax.startup.defaultReady();
-        MathJax.startup.promise.then(function() {
-            initiateMathJax();
-            finalizeMathJax();
-        });
+        initiateMathJax();
+        finalizeMathJax();
         resetRenderer();
         resetConfig();
     }
diff --git a/test/jasmine/bundle_tests/mathjax_v3_test.js b/test/jasmine/bundle_tests/mathjax_v3_test.js
@@ -23,7 +23,7 @@ describe('Test MathJax v3:', function() {
         mathJaxScriptTag.onerror = function() {
             fail('MathJax v3 failed to load');
         };
-        mathJaxScriptTag.src = '/base/node_modules/mathjax-v3/es5/tex-mml-svg.js';
+        mathJaxScriptTag.src = '/base/node_modules/mathjax-v3/es5/tex-svg.js';
         document.body.appendChild(mathJaxScriptTag);
     });
 
