[package.json] bump version

fixes merge conflicts.

README.md

@@ -29,6 +29,7 @@ The defaults for `pageConfig` are
 ```javascript
 {
     format: ["MathML", "TeX", "AsciiMath"], // determines type of pre-processors to run
+    output: '', // global override for output option; 'svg', 'html' or 'mml'
     tex: {}, // configuration options for tex pre-processor, cf. lib/tex.js
     ascii: {}, // configuration options for ascii pre-processor, cf. lib/ascii.js
     singleDollars: false, // allow single-dollar delimiter for inline TeX
@@ -59,7 +60,7 @@ and where `mjnodeConfig` represents mathjax-node configuration options, the defa
   mml: false, // generate mml output?
   svg: false, // generate svg output?
   speakText: true, // add spoken annotations to output?
-  timeout: 10 * 1000, // 10 second timeout before restarting MathJax  
+  timeout: 10 * 1000, // 10 second timeout before restarting MathJax
 }
 ```
 

lib/main.js

@@ -17,6 +17,7 @@ exports.mjpage = function(htmlstring, configOptions, typesetOptions, callback) {
     const config = {
         // mathjax-node-page specific
         format: ["MathML", "TeX", "AsciiMath"], // determines type of pre-processors to run
+        output: '', // global override for output option; 'svg', 'html' or 'mml'
         tex: {}, // configuration options for tex pre-processor
         ascii: {}, // configuration options for ascii pre-processor
         singleDollars: false, // allow single-dollar delimiter for inline TeX
@@ -70,6 +71,14 @@ exports.mjpage = function(htmlstring, configOptions, typesetOptions, callback) {
     mergeConfig(configOptions, config);
     mergeConfig(typesetOptions, typesetConfig);
 
+    // override output options with global option
+    const outputJax = ['svg', 'html', 'mml'];
+    if (outputJax.indexOf(config.output) > -1){
+        for (let jax of outputJax){
+            typesetConfig[jax] = (jax === config.output);
+        }
+    }
+
     // Create jsdom options (cf. defaults for config.jsdom)
     const jsdomConfig = {
         features: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mathjax-node-page",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "Converter for HTML fragments with mathematics using mathjax-node",
   "main": "./lib/main.js",
   "scripts": {

test/config-global-output.js

@@ -0,0 +1,19 @@
+const tape = require('tape');
+const mjpage = require('../lib/main.js').mjpage;
+
+tape('Configuration option (global) for output', function(t) {
+    t.plan(1);
+    const input = '$$x$$';
+    mjpage(input,
+    {
+        format: ["TeX"],
+        output: "svg"
+    },
+    {
+        svg: false,
+        html: true
+    },
+    function(output) {
+        t.ok(output.includes('id="MathJax-SVG-1-Title"'), 'global config overrides')
+    });
+});