Merge branch 'refactor'

Author: dpvc

bin/page2mml

@@ -32,6 +32,22 @@ var jsdom = require('jsdom').jsdom;
 var argv = require("yargs")
   .strict()
   .usage("Usage: page2mml [options] < input.html > output.html",{
+    preview: {
+      boolean: true,
+      describe: "make MathML into a Mathjax preview"
+    },
+    speech: {
+      boolean: true,
+      describe: "include speech text"
+    },
+    speechrules: {
+      default: "mathspeak",
+      describe: "ruleset to use for speech text (chromevox or mathspeak)"
+    },
+    speechstyle: {
+      default: "default",
+      describe: "style to use for speech text (default, brief, sbrief)"
+    },
     nodollars: {
       boolean: true,
       describe: "don't use single-dollar delimiters"
@@ -76,6 +92,10 @@ function processHTML(html,callback) {
     inputs: argv.format,
     equationNumbers: argv.eqno,
     singleDollars: !argv.nodollars,
+    addPreview: argv.preview,
+    speakText: argv.speech,
+    speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
+    speakStyle: argv.speechstyle,
     ex: argv.ex, width: argv.width,
     xmlns:xmlns
   }, function (result) {

bin/page2svg

@@ -40,6 +40,14 @@ var argv = require("yargs")
       boolean: true,
       describe: "include speech text"
     },
+    speechrules: {
+      default: "mathspeak",
+      describe: "ruleset to use for speech text (chromevox or mathspeak)"
+    },
+    speechstyle: {
+      default: "default",
+      describe: "style to use for speech text (default, brief, sbrief)"
+    },
     linebreaks: {
       boolean: true,
       describe: "perform automatic line-breaking"
@@ -96,15 +104,16 @@ function processHTML(html,callback) {
   var xmlns = getXMLNS(document);
   mjAPI.typeset({
     html: document.body.innerHTML,
-    renderer: "SVG",
+    renderer: (argv.img == "" ? "SVG" : "IMG"),
     inputs: argv.format,
     equationNumbers: argv.eqno,
     singleDollars: !argv.nodollars,
     useFontCache: !argv.nofontcache,
     useGlobalCache: !argv.localcache,
-    svgPreview: argv.preview,
-    imgSVG: (argv.img !== ""),
+    addPreview: argv.preview,
     speakText: argv.speech,
+    speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
+    speakStyle: argv.speechstyle,
     ex: argv.ex, width: argv.width,
     linebreaks: argv.linebreaks,
     xmlns:xmlns