[main] refactor normalizing scripts (again)

pkra · Apr 28, 2017 · 2478b91 · 2478b91
1 parent 5fba358
commit 2478b91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -80,6 +80,15 @@ exports.mjpage = function(htmlstring, configOptions, typesetOptions, callback) {
     const window = doc.defaultView;
     const document = window.document;
 
+    //rewrite custom scripts types from core MathJax
+    const rewriteScripts = function(oldType, newType){
+        const scripts = document.querySelectorAll('script[type="' + oldType + '"]');
+        for (let script of scripts) script.setAttribute('type', newType);
+    }
+    rewriteScripts('math/tex','math/inline-TeX');
+    rewriteScripts('math/tex; mode=display','math/TeX');
+    rewriteScripts('math/asciimath','math/asciiMath');
+
     // configure mathjax-node
     mathjax.config(config);
 
@@ -113,23 +122,7 @@ exports.mjpage = function(htmlstring, configOptions, typesetOptions, callback) {
         window.ascii.config.doc = document;
         window.ascii.PreProcess();
     }
-    //normalize type strings
-    const allScripts = document.querySelectorAll('script[type^="math/"]');
-    for (let i = 0; i < allScripts.length; i++) {
-        const script = allScripts[i];
-        let format = script.getAttribute('type');
-        if (format === "math/tex") {
-            format = "math/inline-TeX";
-        } else if (format === 'math/tex; mode=display') {
-            format = "math/TeX";
-        } else if (format === 'math/asciimath') {
-            format = 'math/AsciiMath'
-        }
-        else {
-            continue;
-        }
-        script.setAttribute('type', format);
-    }
+
     const scripts = document.querySelectorAll(`
         script[type="math/TeX"],
         script[type="math/inline-TeX"],
@@ -234,7 +227,7 @@ exports.mjpage = function(htmlstring, configOptions, typesetOptions, callback) {
                             border: 0;
                             margin: 0
                             }
-														
+
                             .mjpage__block {
                             text-align: center;
                             margin: 1em 0em;

diff --git a/test/script-types.js b/test/script-types.js
@@ -45,7 +45,7 @@ tape('Custom script types are processed correctly', function(t) {
     }, function(output) {
 			const window = jsdom(output).defaultView;
 			const expected = window.document.querySelector('.mjpage');
-      t.notOk(expected, 'Case and space insensitivity');
+      t.notOk(expected, 'Other scripts are ignored');
     });
 
 });