Merge pull request #402 from mathjax/401

 [main] extensions options: support names containing "s"

Author: dpvc

lib/main.js

@@ -92,6 +92,7 @@ var document, window, content, html; // the DOM elements
 var queue = [];       // queue of typesetting requests of the form [data,callback]
 var data, callback, originalData;   // the current queue item
 var errors = [];      // errors collected durring the typesetting
+var sErrors = [];     // errors collected durring MathJax startup
 var ID = 0;           // id for this SVG element
 
 //
@@ -523,7 +524,10 @@ function ConfigureMathJax() {
           setTimeout(RestartMathJax, 100);
         } else {
           serverState = STATE.READY;
-          MathJax.Hub.Queue(StartQueue);
+          MathJax.Hub.Queue(
+            function () {sErrors = errors},
+            StartQueue
+          );
         }
       });
     }
@@ -533,7 +537,7 @@ function ConfigureMathJax() {
     //
     // Parse added extensions list and add to standard ones
     //
-    var extensionList = extensions.split(/s*,\s*/);
+    var extensionList = extensions.split(/\s*,\s*/);
     for (var i = 0; i < extensionList.length; i++) {
       var matches = extensionList[i].match(/^(.*?)(\.js)?$/);
       window.MathJax.extensions.push(matches[1] + '.js');
@@ -735,7 +739,7 @@ function GetSVG(result) {
 //
 function StartQueue() {
   data = callback = originalData = null;       //  clear existing equation, if any
-  errors = [];                  //  clear any errors
+  errors = sErrors; sErrors = [];              //  clear any errors
   if (!queue.length) return;    //  return if nothing to do
 
   serverState = STATE.BUSY;

test/base-config-extensions.js

@@ -0,0 +1,22 @@
+var tape = require('tape');
+var mjAPI = require('../lib/main.js');
+
+tape('Options "extension": multiple extensions', function(t) {
+  t.plan(1);
+  mjAPI.config({
+    extensions: 'TeX/autoload-all.js, TeX/color.js'
+  });
+  mjAPI.typeset(
+    {
+      math: 'E = mc^2',
+      format: 'TeX',
+      mml: true
+    },
+    function(data) {
+      t.notOk(
+        data.errors,
+        'Config block with multiple extensions throws no error'
+      );
+    }
+  );
+});

test/base-errors-startup.js

@@ -0,0 +1,28 @@
+var tape = require('tape');
+var mjAPI = require('../lib/main.js');
+
+tape('Catch errors during startup phase', function(t) {
+  t.plan(1);
+  mjAPI.config({
+    extensions: 'blargh'
+  });
+  mjAPI.start();
+  mjAPI.typeset(
+    {
+      math: 'x',
+      format: 'TeX',
+      mml: true
+    },
+    function(data) {
+      t.ok(
+        data.errors,
+        'Error (loading non-existent extension) is caught in output'
+      );
+     // reset configuration
+     mjAPI.config({
+        extensions: ''
+      });
+      mjAPI.start();
+    }
+  );
+});