Merge pull request #326 from mathjax/issue323

Update fontURL, support for reconfiguration

Author: pkra

README.md

@@ -83,7 +83,7 @@ The `config` method is used to set _global_ configuration options. Its default o
   displayErrors:   true, // determines whether error messages are shown on the console
   undefinedCharError: false, // determines whether "unknown characters" (i.e., no glyph in the configured fonts) are saved in the error array
   extensions: '', // a convenience option to add MathJax extensions
-  fontURL: 'https://cdn.mathjax.org/mathjax/latest/fonts/HTML-CSS', // for webfont urls in the CSS for HTML output
+  fontURL: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/fonts/HTML-CSS', // for webfont urls in the CSS for HTML output
   MathJax: { } // standard MathJax configuration options, see https://docs.mathjax.org for more detail.
 }
 ```

lib/main.js

@@ -38,7 +38,7 @@ var displayMessages = false;      // don't log Message.Set() calls
 var displayErrors = true;         // show error messages on the console
 var undefinedChar = false;        // unknown characters are not saved in the error array
 var extensions = '';              // no additional extensions used
-var fontURL = 'https://cdn.mathjax.org/mathjax/latest/fonts/HTML-CSS';  // location of web fonts for CHTML
+var fontURL = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/fonts/HTML-CSS';  // location of web fonts for CHTML
 
 var defaults = {
   ex: 6,                          // ex-size in pixels
@@ -773,9 +773,9 @@ function ReturnResult(result) {
     state.n = GLYPH.n;
     state.ID = ID;
   }
-  callback(result, data);
   serverState = STATE.READY;
-  StartQueue();
+  callback(result, data);
+  if (serverState === STATE.READY) StartQueue();
 }
 
 //
@@ -809,8 +809,8 @@ function RestartMathJax() {
     MathJax.Hub.queue.queue = [];  // clear MathJax queue, so pending operations won't fire
     MathJax = timer = window = document = html = content = null;
     ReportError("Timeout waiting for MathJax:  restarting");
-    serverState = STATE.STOPPED;
   }
+  serverState = STATE.STOPPED;
   GetWindow();
   ConfigureMathJax();
   StartMathJax();

test/base-config-fonturl.js

@@ -0,0 +1,31 @@
+var tape = require('tape');
+var mjAPI = require("../lib/main.js");
+
+tape('basic configuration: check fontURL', function (t) {
+    t.plan(2);
+
+    var tex = 'a';
+    mjAPI.typeset({
+        math: tex,
+        format: "TeX",
+        css: true
+    }, function (result, data) {
+        t.ok(result.css.indexOf('https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/fonts/HTML-CSS') > -1, 'Default fontURL');
+    });
+    // reconfigure
+    mjAPI.typeset({
+        math: ''
+    }, function(){
+        mjAPI.config({
+            fontURL: 'https://example.com'
+        });
+        mjAPI.start();
+    })
+    mjAPI.typeset({
+        math: tex,
+        format: "TeX",
+        css: true,
+    }, function (result, data) {
+        t.ok(result.css.indexOf('https://example.com') > -1, 'Configuring fontURL');
+    });
+});