Merge pull request #343 from mathjax/develop

v1.1.1 release
mathjax · Jul 14, 2017 · 41eb7bf · 41eb7bf
2 parents 8720f30 + 6ff4d62
commit 41eb7bf
Show file tree

Hide file tree

Showing 7 changed files with 952 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - '4'
   - '5'
   - '6'
+  - '7'
   - stable
 sudo: false
 script:

diff --git a/lib/main.js b/lib/main.js
@@ -394,7 +394,7 @@ function ConfigureMathJax() {
               jax.CHTML.ex = ex = (data||defaults).ex;
               jax.CHTML.em = jax.CHTML.outerEm = em = ex / CHTML.TEX.x_height; // scale ex to x_height
               jax.CHTML.cwidth = width / em;
-              jax.CHTML.lineWidth = (linebreak ? width / em : CHTML.BIGDIMEN);
+              jax.CHTML.lineWidth = (linebreak ? width / em : 1000000);
               jax.CHTML.scale = 1; jax.CHTML.fontsize = "100%";
             }
             //
@@ -867,5 +867,9 @@ exports.config = function (config) {
   if (config.undefinedCharError != null) {undefinedChar   = config.undefinedCharError}
   if (config.extensions != null)         {extensions      = config.extensions}
   if (config.fontURL != null)            {fontURL         = config.fontURL}
-  if (config.MathJax) {MathJaxConfig = config.MathJax}
+  if (config.MathJax) {
+    // strip MathJax config blocks to avoid errors
+    if (config.MathJax.config) delete config.MathJax.config
+    MathJaxConfig = config.MathJax
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ node_js: @@
       - '4'
       - '5'
       - '6'
+      - '7'
       - stable
     sudo: false
     script:
@@ Expand Down @@