Merge pull request #317 from mathjax/309

sanitize user configuration

Author: pkra

lib/main.js

@@ -145,9 +145,6 @@ function ConfigureMathJax() {
     jax: ["input/TeX", "input/MathML", "input/AsciiMath", "output/SVG", "output/CommonHTML"],
     extensions: ["toMathML.js"],
     TeX: {extensions: window.Array("AMSmath.js","AMSsymbols.js","autoload-all.js")},
-    tex2jax: {inlineMath: [['$','$'],['\\(','\\)']], preview:"none"},
-    mml2jax: {preview:"none"},
-    asciimath2jax: {preview:"none"},
     SVG: {useFontCache: true, useGlobalCache: false, EqnChunk: 1000000, EqnDelay: 0},
     CommonHTML: {EqnChunk: 1000000, EqnDelay: 0, undefinedFamily:"monospace"},
 
@@ -473,7 +470,11 @@ function ConfigureMathJax() {
   }
   if (MathJaxConfig) {
     adjustArrays(MathJaxConfig);
-    Insert(window.MathJax,MathJaxConfig);
+    // merge the defaults into the user configuration (to sanitize)
+    window.MathJax = Insert(Insert({},MathJaxConfig),window.MathJax);
+    if (MathJaxConfig.extensions) {
+      window.MathJax.extensions = window.MathJax.extensions.concat(MathJaxConfig.extensions);
+    }
   }
 }
 
@@ -656,7 +657,7 @@ function StartQueue() {
 
   //
   //  Get the math data and callback
-  //  and set the content with the proper delimiters
+  // and set the content with the proper script type
   //
   var item = queue.shift();
   data = item[0]; callback = item[1];
@@ -696,7 +697,7 @@ function StartQueue() {
   timer = setTimeout(RestartMathJax,data.timeout);
   HUB.Queue(
     $$(SetRenderer,renderer),
-    $$("Typeset",HUB),
+    $$("Process",HUB),
     $$(TypesetDone,result),
     $$(GetSpeech,result),
     $$(GetMML,result),

test/userconfig-jax.js

@@ -0,0 +1,20 @@
+var tape = require('tape');
+var mjAPI = require('../lib/main.js');
+var jsdom = require('jsdom').jsdom;
+
+tape('User configuration with jax array', function (t) {
+        t.plan(1);
+
+        mjAPI.config({
+                MathJax: {
+                        jax: ["input/MathML", "output/SVG"]
+                }
+        });
+        mjAPI.typeset({
+                math: '<math><mn>1</mn></math>',
+                format: 'MathML',
+                svg: true
+        }, function (data) {
+                t.ok(!data.errors, 'No errors');
+        });
+});