Handle restarts during toMathML(), even though they are rare.

Author: dpvc

lib/mj-page.js

@@ -520,7 +520,7 @@ function TypesetDone() {
 //  Clean up the SVG for use in a page without MathJax.
 // 
 function AdjustSVG() {
-  var nodes, i;
+  var nodes, i, callback;
   if (data.renderer === "SVG" || data.renderer === "IMG" || data.renderer === "PNG") {
     //
     //  Fix missing xlink namespace on href's
@@ -563,20 +563,23 @@ function AdjustSVG() {
     //
     //  Add speech text, if needed
     //
-    if (data.speakText) {GetSpeech()}
+    if (data.speakText) {callback = GetSpeech()}
   }
+  return callback;
 }
 
 //
 //  Add the speech text and mark the SVG appropriately
 //
 function GetSpeech() {
-  var nodes = document.querySelectorAll(".MathJax_SVG svg");
-  for (var j = nodes.length-1; j >= 0; j--) {
-    var svg = nodes[j];
-    var jax = MathJax.Hub.getJaxFor(svg);
-    var mml = jax.root.toMathML("",jax);  // ### FIXME: should trap restarts here
-    var id = jax.inputID;
+  var nodes = document.querySelectorAll(".MathJax_SVG svg"), queue;
+  var SPEAK = function (svg) {
+    var jax = MathJax.Hub.getJaxFor(svg), id = jax.inputID, mml;
+    try {mml = jax.root.toMathML('',jax)} catch(err) {
+      if (!err.restart) {throw err;} // an actual error
+      if (!queue) {queue = MathJax.Callback.Queue()}
+      return queue.Push(err.restart,window.Array(SPEAK,svg));
+    }
     svg.setAttribute("role","math");
     svg.setAttribute("aria-labelledby",id+"-Title "+id+"-Desc");
     for (var i = 0, m = svg.childNodes.length; i < m; i++)
@@ -586,6 +589,8 @@ function GetSpeech() {
     node = MathJax.HTML.Element("title",{id:id+"-Title"},["Equation"]);
     svg.insertBefore(node,svg.firstChild);
   }
+  for (var i = nodes.length-1; i >= 0; i--) SPEAK(nodes[i]);
+  if (queue) return queue.Push(function () {}); // wait for all the queue entries to finish
 }
 
 //