Generalises Postprocessor.

Author: zorkow

bin/mjsre.js

@@ -25,7 +25,7 @@ const argv = require("yargs")
     .options({
         speech: {
             boolean: true,
-            default: mj.options.speak,
+            default: mj.options.speakText,
             describe: "include speech text"
         },
         sre: {
@@ -93,6 +93,14 @@ const argv = require("yargs")
     })
     .argv;
 
+const formats = {
+  'commonhtml': 'html',
+  'mathml': 'mml',
+  'chtml': 'html'
+};
+
+argv.output = formats[argv.output] || argv.output;
+
 if (argv.font === "STIX") argv.font = "STIX-Web";
 if (argv.format === "TeX") argv.format = (argv.inline ? "inline-TeX" : "TeX");
 
@@ -109,14 +117,6 @@ const mjconf = {
     extensions: argv.extensions
 };
 
-const outputFormats = {
-  'commonhtml': 'html',
-  'mathml': 'mml',
-  'chtml': 'html'
-};
-
-argv.output = outputFormats[argv.output] || argv.output;
-
 const mjinput = {
     math: argv._[0],
     format: argv.format,

lib/main.js

@@ -22,7 +22,7 @@ const sre = require('speech-rule-engine');
 
 
 const optionsDefault = {
-    speak: true,
+    speakText: true,
     speakRules: "mathspeak",
     speakStyle: "default",
     format: "TeX",
@@ -52,8 +52,7 @@ const sreconfig = function(data) {
         style: data.speakStyle || 'default',
         // TODO: What does that do?
         minSTree: data.minSTree,
-        semantic: data.semantic,
-        speakText: true
+        semantic: data.semantic
     };
     if (data.sre) {
         for (let i = 0, key; key = data.sre[i]; i++) {
@@ -82,11 +81,12 @@ const main = function (data, callback) {
     data.mml = true;
 
     mathjax.typeset(data, function (result, input) {
-        postprocessor(speechConfig, result, input, callback);
+        postprocessor(data, result, input, callback);
     })
 };
 
-const postprocessor = function (speechConfig, result, input, callback) {
+const postprocessor = function (data, result, input, callback) {
+    let speechConfig = sreconfig(data);
     if (result.error) throw result.error;
     if (!result.mml && !result.mmlNode) throw new Error('No MathML found. Please check the mathjax-node configuration');
     if (!result.svgNode && !result.htmlNode && !result.mmlNode) throw new Error('No suitable output found. Either svgNode, htmlNode or mmlNode are required.');
@@ -99,7 +99,7 @@ const postprocessor = function (speechConfig, result, input, callback) {
         result.streeXml = speechConfig.minSTree ? xml : sre.pprintXML(xml);
     }
     // return if no speakText is requested
-    if (!speechConfig.speakText) {
+    if (!data.speakText) {
         callback(result, input);
         return
     }