Merge branch 'server-state'

Author: dpvc

lib/mj-page.js

@@ -60,13 +60,21 @@ var defaults = {
   timeout: 60 * 1000,             // 60 second timeout before restarting MathJax
 };
 
+//
+//  The MathJax server states
+//
+var STATE = {
+  STOPPED: 1,          // no DOM or MathJax available
+  STARTED: 2,          // DOM loaded, MathJax starting up
+  READY:   3,          // MathJax initialized and ready to process math
+  BUSY:    4           // MathJax currently processing math
+};
+
 var MathJaxPath = "file://"+require.resolve('MathJax/unpacked/MathJax');
-var MathJaxConfig;         // configuration for when starting MathJax
-var MathJax;               // filled in once MathJax is loaded
-var serverStarted = false; // true when the MathJax DOM has been created
-var serverReady = false;   // true when MathJax has done its initial typeset (loaded all components)
-var serverBusy = false;    // true when MathJax is working on a job in the que
-var timer;                 // used to reset MathJax if it runs too long
+var MathJaxConfig;                 // configuration for when starting MathJax
+var MathJax;                       // filled in once MathJax is loaded
+var serverState = STATE.STOPPED;   // nothing loaded yet
+var timer;                         // used to reset MathJax if it runs too long
 
 var document, window, content, html; // the DOM elements
 
@@ -312,7 +320,7 @@ function ConfigureMathJax() {
 	    MathJax.InputJax.AsciiMath.annotationEncoding = null;
 	  });
 	}
-        serverReady = true;
+        serverState = STATE.READY;
         MathJax.Hub.Queue(StartQueue);
       });
 
@@ -340,6 +348,7 @@ function Insert(dst,src) {
 //  Load MathJax into the DOM
 //
 function StartMathJax() {
+  serverState = STATE.STARTED;
   var script = document.createElement("script");
   script.src = MathJaxPath;
   document.head.appendChild(script);
@@ -527,21 +536,19 @@ function TypesetDone(result,selector) {
   //
   result.html = content.innerHTML;
   callback(result);
+  serverState = STATE.READY;
   StartQueue();
 }
 
 //
 //  Start typesetting the queued expressions
 //  
 function StartQueue() {
-  serverBusy = true;
   data = callback = null;       //  clear existing equation, if any
   errors = [];                  //  clear any errors
-  if (!queue.length) {         //  return if nothing to do
-    serverBusy = false;
-    return;
-  }
+  if (!queue.length) return     //  return if nothing to do
 
+  serverState = STATE.BUSY;
   var result = {}, $$ = window.Array;
 
   //
@@ -626,12 +633,10 @@ function StartQueue() {
 function RestartMathJax() {
   if (timer) {
     MathJax.Hub.queue.queue = [];  // clear MathJax queue, so pending operations won't fire
-    MathJax = timer = null;
+    MathJax = timer = window = document = html = content = null;
     ReportError("Timeout waiting for MathJax:  restarting");
-    serverReady = false;
+    serverState = STATE.STOPPED;
   }
-  serverStarted = true;
-  serverBusy = false;
   GetWindow();
   ConfigureMathJax();
   StartMathJax();
@@ -654,8 +659,8 @@ exports.typeset = function (data,callback) {
     options[id] = (data.hasOwnProperty(id) ? data[id]: defaults[id]);
   }}
   queue.push([options,callback]);
-  if (!serverStarted) {RestartMathJax()}
-  if (serverReady && !serverBusy) StartQueue();
+  if (serverState == STATE.STOPPED) {RestartMathJax()}
+  if (serverState == STATE.READY) StartQueue();
 }
 
 //

lib/mj-single.js

@@ -63,12 +63,21 @@ var defaults = {
   timeout: 5 * 1000,              // 5 second timeout before restarting MathJax
 };
 
+//
+//  The MathJax server states
+//
+var STATE = {
+  STOPPED: 1,          // no DOM or MathJax available
+  STARTED: 2,          // DOM loaded, MathJax starting up
+  READY:   3,          // MathJax initialized and ready to process math
+  BUSY:    4           // MathJax currently processing math
+};
+
 var MathJaxPath = "file://"+require.resolve('MathJax/unpacked/MathJax');
 var BatikRasterizerPath = path.resolve(__dirname,'..','batik/batik-rasterizer.jar');
-var MathJaxConfig;                    // configuration for when starting MathJax
+var MathJaxConfig;                   // configuration for when starting MathJax
 var MathJax;                         // filled in once MathJax is loaded
-var serverStarted = false;           // true when the MathJax DOM has been created
-var serverReady = false;             // true when MathJax has done its initial typeset (loaded all components)
+var serverState = STATE.STOPPED;     // nothing loaded yet
 var timer;                           // used to reset MathJax if it runs too long
 var tmpfile = "/tmp/mj-single-svg";  // file name prefix to use for temp files
 
@@ -293,7 +302,7 @@ function ConfigureMathJax() {
       MathJax.Hub.Register.StartupHook("End",function () {
         MathJax.OutputJax.SVG.resetGlyphs(true);
         MathJax.ElementJax.mml.ID = 0;
-        serverReady = true;
+        serverState = STATE.READY;
         MathJax.Hub.Queue(StartQueue);
       });
     }
@@ -319,6 +328,7 @@ function Insert(dst,src) {
 //  Load MathJax into the DOM
 //
 function StartMathJax() {
+  serverState = STATE.STARTED;
   var script = document.createElement("script");
   script.src = MathJaxPath;
   document.head.appendChild(script);
@@ -457,6 +467,7 @@ function TypesetDone(result) {
   }
   if (errors.length) {result.errors = errors}
   callback(result);
+  serverState = STATE.READY;
   StartQueue();
 }
 
@@ -468,6 +479,9 @@ function StartQueue() {
   errors = [];                  //  clear any errors
   if (!queue.length) return;    //  return if nothing to do
 
+  serverState = STATE.BUSY;
+  var result = {}, $$ = window.Array;
+
   //
   //  Get the math data and callback
   //  and set the content with the proper delimiters
@@ -533,7 +547,6 @@ function StartQueue() {
   //  TypesetDone routine
   //
   timer = setTimeout(RestartMathJax,data.timeout);
-  var result = {}, $$ = window.Array;
   HUB.Queue(
     $$("Typeset",HUB),
     $$(GetMML,result),
@@ -551,11 +564,10 @@ function StartQueue() {
 function RestartMathJax() {
   if (timer) {
     MathJax.Hub.queue.queue = [];  // clear MathJax queue, so pending operations won't fire
-    MathJax = timer = null;
+    MathJax = timer = window = document = html = content = null;
     ReportError("Timeout waiting for MathJax:  restarting");
-    serverReady = false;
+    serverState = STATE.STOPPED;
   }
-  serverStarted = true;
   GetWindow();
   ConfigureMathJax();
   StartMathJax();
@@ -581,8 +593,8 @@ exports.typeset = function (data,callback) {
   if (data.state) {options.state = data.state}
   if (!delimiters[options.format]) {ReportError("Unknown format: "+options.format,callback); return}
   queue.push([options,callback]);
-  if (!serverStarted) {RestartMathJax()}
-  if (serverReady) StartQueue();
+  if (serverState == STATE.STOPPED) {RestartMathJax()}
+  if (serverState == STATE.READY) StartQueue();
 }
 
 //