Merge pull request #71 from mathjax/develop

Release 0.3

Author: pkra

README.md

@@ -14,7 +14,7 @@ of calling the MathJax API.
 
 Use
 
-    npm install https://github.com/mathjax/MathJax-node/tarball/master
+    npm install MathJax-node
 
 to install MathJax-node and its dependencies.
 

batik/README.md

@@ -2,4 +2,6 @@ If you intend to use MathJax-node's ability to create PNG images, you
 should install [batik](http://xmlgraphics.apache.org/batik/download.html)
 in this directory.  Just download it and unpack it here.  You need
 `batik-rasterizer.jar` and the `lib` directory to be in the top level
-of this directory.
+of this directory. Since Batik v1.8 you have to either create a symlink
+to `batik-rasterizer-1.8.jar` or change `mj-page.js` and `mj-single.js`
+to point to the version-specific file name.

bin/am2mml

@@ -43,6 +43,10 @@ var argv = require("yargs")
     semantics: {
       boolean: true,
       describe: "add AsciiMath code in <semantics> tag"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
@@ -52,7 +56,8 @@ mjAPI.config({
     menuSettings: {
       semantics: argv.semantics
     }
-  }
+  },
+  extensions: argv.extensions
 });
 mjAPI.start();
 

bin/am2png

@@ -34,8 +34,8 @@ var argv = require("yargs")
       describe: "perform automatic line-breaking"
     },
     dpi: {
-      default: 144,
-      describe: "dpi for image"
+      default: 0,
+      describe: "dpi for image (0 = calculate automatically)"
     },
     font: {
       default: "TeX",
@@ -48,14 +48,20 @@ var argv = require("yargs")
     width: {
       default: 100,
       describe: "width of container in ex"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
 if (argv.font === "STIX") argv.font = "STIX-Web";
-mjAPI.config({MathJax: {SVG: {font: argv.font}}});
+mjAPI.config({MathJax: {SVG: {font: argv.font}}, extensions: argv.extensions});
 mjAPI.start();
 
+if (argv.dpi === 0) {argv.dpi = argv.ex * 16} // pixels properly sized
+
 mjAPI.typeset({
   math: argv._[0],
   format: "AsciiMath",

bin/am2svg

@@ -55,12 +55,16 @@ var argv = require("yargs")
     width: {
       default: 100,
       describe: "width of container in ex"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
 if (argv.font === "STIX") argv.font = "STIX-Web";
-mjAPI.config({MathJax: {SVG: {font: argv.font}}});
+mjAPI.config({MathJax: {SVG: {font: argv.font}}, extensions: argv.extensions});
 mjAPI.start();
 
 mjAPI.typeset({

bin/mml2mml

@@ -40,11 +40,15 @@ var argv = require("yargs")
     speechstyle: {
       default: "default",
       describe: "style to use for speech text (default, brief, sbrief)"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
-mjAPI.config({});
+mjAPI.config({extensions: argv.extensions});
 mjAPI.start();
 
 mjAPI.typeset({

bin/mml2png

@@ -33,8 +33,8 @@ var argv = require("yargs")
       describe: "perform automatic line-breaking"
     },
     dpi: {
-      default: 144,
-      describe: "dpi for image"
+      default: 0,
+      describe: "dpi for image (0 = calculate automatically)"
     },
     font: {
       default: "TeX",
@@ -47,14 +47,20 @@ var argv = require("yargs")
     width: {
       default: 100,
       describe: "width of container in ex"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
 if (argv.font === "STIX") argv.font = "STIX-Web";
-mjAPI.config({MathJax: {SVG: {font: argv.font}}});
+mjAPI.config({MathJax: {SVG: {font: argv.font}}, extensions: argv.extensions});
 mjAPI.start();
 
+if (argv.dpi === 0) {argv.dpi = argv.ex * 16} // pixels properly sized
+
 mjAPI.typeset({
   math: argv._[0],
   format: "MathML",

bin/mml2svg

@@ -55,12 +55,16 @@ var argv = require("yargs")
     width: {
       default: 100,
       describe: "width of container in ex"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
 if (argv.font === "STIX") argv.font = "STIX-Web";
-mjAPI.config({MathJax: {SVG: {font: argv.font}}});
+mjAPI.config({MathJax: {SVG: {font: argv.font}}, extensions: argv.extensions});
 mjAPI.start();
 
 mjAPI.typeset({

bin/mml2svg-html5

@@ -63,12 +63,16 @@ var argv = require("yargs")
     width: {
       default: 100,
       describe: "width of container in ex"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
 if (argv.font === "STIX") argv.font = "STIX-Web";
-mjAPI.config({MathJax: {SVG: {font: argv.font}}});
+mjAPI.config({MathJax: {SVG: {font: argv.font}}, extensions: argv.extensions});
 mjAPI.start();
 
 //

bin/page2mml

@@ -71,20 +71,24 @@ var argv = require("yargs")
     width: {
       default: 100,
       describe: "width of container in ex"
+    },
+    extensions: {
+      default: "",
+      describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
     }
   })
   .argv;
 
 argv.format = argv.format.split(/ *, */);
 
-mjAPI.config({MathJax: {menuSettings: {semantics: argv.semantics}}});
+mjAPI.config({MathJax: {menuSettings: {semantics: argv.semantics}}, extensions: argv.extensions});
 mjAPI.start();
 
 //
 //  Process an HTML file:
 //
 function processHTML(html,callback) {
-  var document = jsdom(html,null,{features:{FetchExternalResources: false}});
+  var document = jsdom(html,{features:{FetchExternalResources: false}});
   var xmlns = getXMLNS(document);
   mjAPI.typeset({
     html:document.body.innerHTML,