Initial use of defaults.

Author: zorkow

bin/mjsre.js

@@ -25,27 +25,32 @@ const argv = require("yargs")
     .options({
         speech: {
             boolean: true,
-            default: true,
+            default: mj.options.speak,
             describe: "include speech text"
         },
-        speechrules: {
-            default: "mathspeak",
+        sre: {
+            array: true,
+            nargs: 2,
+            describe: "SRE flags as key value pairs"
+        },
+        speechrules: { // deprecated
+            default: mj.options.speakRules,
             describe: "ruleset to use for speech text (chromevox or mathspeak)"
         },
-        speechstyle: {
-            default: "default",
+        speechstyle: { // deprecated
+            default: mj.options.speakStyle,
             describe: "style to use for speech text (default, brief, sbrief)"
         },
         linebreaks: {
             boolean: true,
             describe: "perform automatic line-breaking"
         },
         format: {
-            default: "TeX",
+            default: mj.options.format,
             describe: "input format(s) to look for"
         },
         font: {
-            default: "TeX",
+            default: mj.options.font,
             describe: "web font to use"
         },
         inline: {
@@ -61,24 +66,24 @@ const argv = require("yargs")
             describe: "For TeX input and MathML output, don't add TeX-specific classes"
         },
         output: {
-            default: "SVG",
+            default: mj.options.output,
             describe: "output format (SVG, CommonHTML, or MML)",
             coerce: (x => {return x.toLowerCase();})
         },
         ex: {
-            default: 6,
+            default: mj.options.ex,
             describe: "ex-size in pixels"
         },
         width: {
-            default: 100,
+            default: mj.options.width,
             describe: "width of equation container in ex (for line-breaking)"
         },
         extensions: {
-            default: "",
+            default: mj.options.extensions,
             describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
         },
         fontURL: {
-            default: "https://cdn.mathjax.org/mathjax/latest/fonts/HTML-CSS",
+            default: mj.options.fontURL,
             describe: "the URL to use for web fonts"
         },
         css: {
@@ -124,16 +129,17 @@ const mjinput = {
     speakStyle: argv.speechstyle,
     ex: argv.ex,
     width: argv.width,
-    linebreaks: argv.linebreaks
-}
+    linebreaks: argv.linebreaks,
+    sre: argv.sre
+};
 
 console.log(argv._[0])
 const output = function(result) {
     if (result.errors) console.log(result.errors);
     else if (argv.css) console.log(result.css);
     else console.log(result[argv.output]);
-}
+};
 
 mj.config(mjconf);
 mj.start();
-mj.typeset(mjinput, output)
+mj.typeset(mjinput, output);

lib/main.js

@@ -21,6 +21,48 @@ const sre = require('speech-rule-engine');
 // speakText:                      // string with spoken annotation
 
 
+const optionsDefault = {
+    speak: true,
+    speakRules: "mathspeak",
+    speakStyle: "default",
+    format: "TeX",
+    font: "TeX",
+    output: "SVG",
+    ex: 6,
+    width: 100,
+    extensions: "",
+    enrich: false,
+    semantic: false,
+    fontURL: "https://cdn.mathjax.org/mathjax/latest/fonts/HTML-CSS"
+};
+
+const sreDefault = {
+    speech: 'deep',
+    semantics: true,
+    domain: 'mathspeak',
+    style: 'default'
+};
+
+
+const sreconfig = function(data) {
+    let config = {
+        // TODO: remove as deprecated!
+        domain: data.speakRules || 'mathspeak',
+        style: data.speakStyle || 'default',
+        // TODO: What does that do?
+        minSTree: data.minSTree
+    };
+    if (data.sre) {
+        for (let i = 0, key; key = data.sre[i]; i++) {
+            let value = data.sre[++i];
+            config[key] = value || false;
+        }
+    }
+    Object.assign(sreDefault, config);
+    return config;
+};
+
+
 const main = function (data, callback) {
     const speechConfig = {
         speech: data.speech ||'deep',
@@ -138,6 +180,7 @@ const preprocessor = function (data, callback) {
 }
 
 
+exports.options = optionsDefault;
 exports.start = mathjax.start;
 exports.config = mathjax.config;
 const cbTypeset = function (data, callback) {