Merge branch 'develop' into chtml

dpvc · dpvc · commit 993f5318a7f5 · 2015-12-31T15:56:53.000-05:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# MathJax-node [![Build Status](https://travis-ci.org/mathjax/MathJax-node.svg?branch=develop)](https://travis-ci.org/mathjax/MathJax-node)
+# mathjax-node [![Build Status](https://travis-ci.org/mathjax/MathJax-node.svg?branch=develop)](https://travis-ci.org/mathjax/MathJax-node)
 
 This repository contains files that provide APIs to call MathJax from 
 node.js programs.  There is an API for converting individual math 
@@ -14,9 +14,9 @@ of calling the MathJax API.
 
 Use
 
-    npm install MathJax-node
+    npm install mathjax-node
 
-to install MathJax-node and its dependencies.
+to install mathjax-node and its dependencies.
 
 These API's can produce PNG images, but that requires the
 [Batik](http://xmlgraphics.apache.org/batik/download.html) library.  It 
@@ -25,7 +25,7 @@ directory for more details.
 
 # Getting started
 
-MahJax-node provides two libraries, `lib/mj-single.js` and `lib/mj-page.js`. Below are two  very minimal examples -- be sure to check out the examples in `./bin/` for more advanced configurations.
+mathjax-node provides two libraries, `lib/mj-single.js` and `lib/mj-page.js`. Below are two  very minimal examples -- be sure to check out the examples in `./bin/` for more advanced configurations.
 
 * `lib/mj-single.js` is optimized for processing single equations.
 
diff --git a/bin/page2mml b/bin/page2mml
@@ -104,7 +104,7 @@ function processHTML(html,callback) {
     xmlns:xmlns
   }, function (result) {
     document.body.innerHTML = result.html;
-    var HTML = "<!DOCTYPE html>\n"+document.documentElement.outerHTML.replace(/^(\n|\s)*/,"");
+    var HTML = "<!DOCTYPE html>\n"+document.documentElement.outerHTML.replace(/^(\n|\s)*/,"")+"\n";
     callback(HTML);
   });
 }
diff --git a/lib/mj-page.js b/lib/mj-page.js
@@ -87,7 +87,7 @@ 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 tmpfile = os.tmpdir() + "/mj-single-svg";  // file name prefix to use for temp files
+var tmpfile = os.tmpdir() + "/mj-single-svg" +  process.pid;  // file name prefix to use for temp files
 
 var document, window, content, html; // the DOM elements
 
@@ -213,6 +213,9 @@ function ConfigureMathJax() {
       MathJax.Hub.Register.MessageHook("TeX Jax - parse error",function (message) {
         AddError("TeX parse error",message[1]);
       });
+      MathJax.Hub.Register.MessageHook("file load error",function (message) {
+        AddError("File load error",message[1]);
+      });
 
       //
       //  Set the delays to 0 (we don't need to update the screen)
@@ -650,7 +653,7 @@ function ConfigureTypeset() {
   //  Reset the MathJax counters for things
   //
   SVG.resetGlyphs(true);
-  TEX.resetEquationNumbers();
+  if (TEX.resetEquationNUmbers) TEX.resetEquationNumbers();
   MML.SUPER.ID = 0;
   
   //
@@ -790,7 +793,8 @@ function AdjustMML() {
     for (var i = nodes.length-1; i >= 0; i--) {
       var math = nodes[i].getElementsByTagName("math")[0]
       nodes[i].parentNode.replaceChild(math,nodes[i]);
-      if (data.speakText) math.setAttribute("alttext",speech.processExpression(math.outerHTML));
+      var alttext = speech.processExpression(math.outerHTML.replace(/&nbsp;/g,"\u00A0"));
+      if (data.speakText) math.setAttribute("alttext",alttext);
     }
   }
 }
diff --git a/lib/mj-single.js b/lib/mj-single.js
@@ -87,7 +87,7 @@ 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 tmpfile = os.tmpdir() + "/mj-single-svg";  // file name prefix to use for temp files
+var tmpfile = os.tmpdir() + "/mj-single-svg" +  process.pid;  // file name prefix to use for temp files
 
 var document, window, content, html; // the DOM elements
 
@@ -215,6 +215,9 @@ function ConfigureMathJax() {
       MathJax.Hub.Register.MessageHook("TeX Jax - parse error",function (message) {
         AddError("TeX parse error: "+message[1]);
       });
+      MathJax.Hub.Register.MessageHook("file load error",function (message) {
+        AddError("File load error: "+message[1]);
+      });
       
       //
       //  Set the delays to 0 (we don't need to update the screen)
@@ -535,6 +538,7 @@ function GetSpeech(result) {
     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);
   } else {
     delete result.mml;
   }
@@ -734,7 +738,7 @@ function GetState(state) {
       state.defs = HTML.Element("defs");
       state.n = 0;
     }
-    TEX.resetEquationNumbers();
+    if (TEX.resetEquationNumbers) TEX.resetEquationNumbers();
     MML.SUPER.ID = ID = 0;
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "MathJax-node",
-  "version": "0.3.0",
+  "name": "mathjax-node",
+  "version": "0.4.0",
   "description": "API's for calling MathJax from node.js",
   "keywords": [
     "MathJax",
@@ -16,18 +16,15 @@
   "bugs": {
     "url": "http://github.com/mathjax/MathJax-node/issues"
   },
-  "license": {
-    "type": "Apache-2.0",
-    "url": "http://github.com/mathjax/MathJax-node/blob/master/LICENSE"
-  },
+  "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/mathjax/MathJax-node.git"
   },
   "dependencies": {
-    "jsdom": "*",
+    "jsdom": "^6.0.0",
     "speech-rule-engine": "*",
-    "yargs": "*",
+    "yargs": "^3.0.0",
     "MathJax": "https://github.com/mathjax/MathJax/tarball/mathjax-node-2.5.1"
   },
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ function processHTML(html,callback) {`
`104`	`104`	`xmlns:xmlns`
`105`	`105`	`}, function (result) {`
`106`	`106`	`document.body.innerHTML = result.html;`
`107`		`- var HTML = "<!DOCTYPE html>\n"+document.documentElement.outerHTML.replace(/^(\n\|\s)*/,"");`
	`107`	`+ var HTML = "<!DOCTYPE html>\n"+document.documentElement.outerHTML.replace(/^(\n\|\s)*/,"")+"\n";`
`108`	`108`	`callback(HTML);`
`109`	`109`	`});`
`110`	`110`	`}`