Merge branch 'refactor'

Author: dpvc

lib/mj-single.js

@@ -60,7 +60,7 @@ var defaults = {
   speakRuleset: "mathspeak",      // set speech ruleset (default (chromevox rules), mathspeak)
   speakStyle: "default",          // set speech style (mathspeak:  default, brief, sbrief)
 
-  timeout: 5 * 1000,              // 5 second timeout before restarting MathJax
+  timeout: 10 * 1000,             // 10 second timeout before restarting MathJax
 };
 
 //
@@ -361,21 +361,30 @@ function AddError(message,nopush) {
 //
 function GetMML(result) {
   if (!data.mml && !data.speakText) return;
-  var mml, jax = MathJax.Hub.getAllJax()[0];
+  var jax = MathJax.Hub.getAllJax()[0];
   try {result.mml = jax.root.toMathML('',jax)} catch(err) {
     if (!err.restart) {throw err;} // an actual error
     return MathJax.Callback.After(window.Array(GetMML,result),err.restart);
   }
-  if (data.speakText) {
-    speech.setupEngine({semantics: true, domain: data.speakRuleset, style: data.speakStyle});
-    jax.root.alttext = result.speakText = speech.processExpression(result.mml);
+}
+
+//
+//  Creates the speech string and updates the MathML to include it, if needed
+//
+function GetSpeech(result) {
+  if (!data.speakText) return;
+  speech.setupEngine({semantics: true, domain: data.speakRuleset, style: data.speakStyle});
+  result.speakText = speech.processExpression(result.mml);
+  if (data.mml) {
+    var jax = MathJax.Hub.getAllJax()[0];
+    jax.root.alttext = result.speakText;
     if (jax.root.attrNames) {jax.root.attrNames.push("alttext")}
     result.mml = jax.root.toMathML('',jax);
   }
 }
 
 //
-//  Create SVG output and PNG output, if requested
+//  Create SVG output and IMG output, if requested
 //
 function GetSVG(result) {
   if (!data.svg && !data.png && !data.img) return;
@@ -389,12 +398,11 @@ function GetSVG(result) {
   //
   if (data.speakText) {
     ID++; var id = "MathJax-SVG-"+ID;
-    var speak = result.speakText;
     svg.setAttribute("role","math");
     svg.setAttribute("aria-labelledby",id+"-Title "+id+"-Desc");
     for (var i=0, m=svg.childNodes.length; i < m; i++)
-      {svg.childNodes[i].setAttribute("aria-hidden",true);}
-    var node = MathJax.HTML.Element("desc",{id:id+"-Desc"},[speak]);
+      svg.childNodes[i].setAttribute("aria-hidden",true);
+    var node = MathJax.HTML.Element("desc",{id:id+"-Desc"},[result.speakText]);
     svg.insertBefore(node,svg.firstChild);
     node = MathJax.HTML.Element("title",{id:id+"-Title"},["Equation"]);
     svg.insertBefore(node,svg.firstChild);
@@ -420,56 +428,41 @@ function GetSVG(result) {
   //
   //  Add the requested data to the results
   //
-  if (data.svg) {result.svg = svgdata}
+  if (data.svg) result.svg = svgdata;
+  if (data.png) result.svgfile = svgfile;
   if (data.img) {
     if (data.svg) result.svg = svgfile;
     result.img = '<img src="file.svg" style="'+svg.style.cssText+
        " width:"+svg.getAttribute("width")+"; height:"+svg.getAttribute("height")+';">';
   }
+}
+
+//
+//  Create the PNG file asynchronously, reporting errors.
+//
+function GetPNG(result) {
+  var svgfile = result.svgfile; delete result.svgfile;
   if (data.png) {
-    var callback = MathJax.Callback(function () {}); // for synchronization with MathJax
-    fs.writeFileSync(tmpfile+".svg",svgfile);
     var batikCommand = fmt("java -jar %s -dpi %d '%s.svg'",BatikRasterizerPath,data.dpi,tmpfile);
-    exec(batikCommand, function (err,stdout,stderr) {
-      if (err) {AddError(err)} else {
-        var buffer = fs.readFileSync(tmpfile+".png");
-        result.png = "data:image/png;base64," + buffer.toString('base64');
-        fs.unlinkSync(tmpfile+".svg"); fs.unlinkSync(tmpfile+".png");
-        callback();
-      }
+    var synch = MathJax.Callback(function () {}); // for synchronization with MathJax
+    var check = function (err) {if (err) {AddError(err.message); synch(); return true}}
+    var tmpSVG = tmpfile+".svg", tmpPNG = tmpfile+".png";
+    fs.writeFile(tmpSVG,svgfile,function (err) {
+      if (check(err)) return;
+      exec(batikCommand, function (err,stdout,stderr) {
+        if (check(err)) {fs.unlinkSync(tmpSVG); return}
+        fs.readFile(tmpPNG,null,function (err,buffer) {
+          result.png = "data:image/png;base64,"+(buffer||"").toString('base64');
+          fs.unlinkSync(tmpSVG); fs.unlinkSync(tmpPNG);
+          check(err); synch();
+        });
+      });
     });
-    return callback;  //  This keeps the queue from continuing until the exec() is complete
+    return synch;  // This keeps the queue from continuing until the readFile() is complete
   }
 }
 
-//
-//  When the expression is typeset,
-//    clear the timeout timer, if any,
-//    update the MathJax state,
-//    return the result object, and
-//    do the next queued expression
-//  
-function TypesetDone(result) {
-  if (timer) {clearTimeout(timer); timer = null}
-  html.removeAttribute("xmlns:"+data.xmlns);
-  var state = data.state;
-  if (state) {
-    var AMS = MathJax.Extension["TeX/AMSmath"];
-    var GLYPH = MathJax.OutputJax.SVG.BBOX.GLYPH;
-    state.AMS.startNumber = AMS.startNumber;
-    state.AMS.labels = AMS.labels;
-    state.AMS.IDs = AMS.IDs;
-    state.mmlID = MathJax.ElementJax.mml.SUPER.ID;
-    state.glyphs = GLYPH.glyphs;
-    state.defs = GLYPH.defs;
-    state.n = GLYPH.n;
-    state.ID = ID;
-  }
-  if (errors.length) {result.errors = errors}
-  callback(result);
-  serverState = STATE.READY;
-  StartQueue();
-}
+/********************************************************************/
 
 //
 //  Start typesetting the queued expressions
@@ -490,9 +483,8 @@ function StartQueue() {
   data = item[0]; callback = item[1];
   var delim = delimiters[data.format];
   var math = data.math;
-  if (data.format !== "MathML") {
+  if (data.format !== "MathML")
     math = math.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
-  }
   content.innerHTML = delim[0]+math+delim[1];
   html.setAttribute("xmlns:"+data.xmlns,"http://www.w3.org/1998/Math/MathML");
 
@@ -502,10 +494,7 @@ function StartQueue() {
   //
   var SVG = MathJax.OutputJax.SVG,
       TEX = MathJax.InputJax.TeX,
-      MML = MathJax.ElementJax.mml,
-      AMS = MathJax.Extension["TeX/AMSmath"],
-      HUB = MathJax.Hub, HTML = MathJax.HTML,
-      GLYPH = SVG.BBOX.GLYPH;
+      HUB = MathJax.Hub;
 
   SVG.defaultEx = data.ex;
   SVG.defaultWidth = data.width;
@@ -516,10 +505,38 @@ function StartQueue() {
   TEX.config.equationNumbers.autoNumber = data.equationNumbers;
 
   //
-  //  Update the MathJax values from the state,
-  //  or clear them if there is no state.
-  //  
-  var state = data.state;
+  // Set the state from data.state or clear it
+  // 
+  GetState(data.state);
+
+  //
+  //  Set up a timeout timer to restart MathJax if it runs too long,
+  //  Then push the Typeset call, the MathML, speech, SVG, and PNG calls,
+  //  and our TypesetDone routine
+  //
+  timer = setTimeout(RestartMathJax,data.timeout);
+  HUB.Queue(
+    $$("Typeset",HUB),
+    $$(GetMML,result),
+    $$(GetSpeech,result),
+    $$(GetSVG,result),
+    $$(GetPNG,result),
+    $$(TypesetDone,result)
+  );
+}
+
+//
+//  Update the MathJax values from the state,
+//  or clear them if there is no state.
+//  
+function GetState(state) {
+  var SVG = MathJax.OutputJax.SVG,
+      TEX = MathJax.InputJax.TeX,
+      MML = MathJax.ElementJax.mml,
+      AMS = MathJax.Extension["TeX/AMSmath"],
+      HUB = MathJax.Hub, HTML = MathJax.HTML,
+      GLYPH = SVG.BBOX.GLYPH;
+
   if (state && state.AMS) {
     AMS.startNumber = state.AMS.startNumber;
     AMS.labels = state.AMS.labels;
@@ -540,21 +557,38 @@ function StartQueue() {
     TEX.resetEquationNumbers();
     MML.SUPER.ID = ID = 0;
   }
+}
 
-  //
-  //  Set up a timeout timer to restart MathJax if it runs too long,
-  //  Then push the Typeset call, the MathML and SVG calls, and our
-  //  TypesetDone routine
-  //
-  timer = setTimeout(RestartMathJax,data.timeout);
-  HUB.Queue(
-    $$("Typeset",HUB),
-    $$(GetMML,result),
-    $$(GetSVG,result),
-    $$(TypesetDone,result)
-  );
+//
+//  When the expression is typeset,
+//    clear the timeout timer, if any,
+//    update the MathJax state,
+//    return the result object, and
+//    do the next queued expression
+//  
+function TypesetDone(result) {
+  if (timer) {clearTimeout(timer); timer = null}
+  html.removeAttribute("xmlns:"+data.xmlns);
+  var state = data.state;
+  if (state) {
+    var AMS = MathJax.Extension["TeX/AMSmath"];
+    var GLYPH = MathJax.OutputJax.SVG.BBOX.GLYPH;
+    state.AMS.startNumber = AMS.startNumber;
+    state.AMS.labels = AMS.labels;
+    state.AMS.IDs = AMS.IDs;
+    state.mmlID = MathJax.ElementJax.mml.SUPER.ID;
+    state.glyphs = GLYPH.glyphs;
+    state.defs = GLYPH.defs;
+    state.n = GLYPH.n;
+    state.ID = ID;
+  }
+  if (errors.length) {result.errors = errors}
+  callback(result);
+  serverState = STATE.READY;
+  StartQueue();
 }
 
+
 /********************************************************************/
 
 //