Merge pull request #1382 from mathjax/develop

Merge develop into master for 2.6.1 release
mathjax · Feb 8, 2016 · d4ab1b3 · d4ab1b3
2 parents 0715ef9 + e213c84
commit d4ab1b3
Show file tree

Hide file tree

Showing 76 changed files with 579 additions and 437 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,18 @@
+language: node_js
+node_js:
+  - '5'
+sudo: false
+script:
+  - npm install
+  - npm test
+branches:
+  only:
+    - master
+    - /^\d+\.\d+/
+deploy:
+  provider: npm
+  email: manager@mathjax.org
+  api_key:
+    secure: q7e4haV9hAHng28w6EBnOc6ptorxjxeATW6ZocYiPk68To3IUHMt615rzyotfA5TBCcPJyeUJiqNcuUXbh+r8HmER4bJsjaGMpETPSkdvzQ1bYg2EJEvT6V/xc+sRGoj5ri/F2uH99AYnF99IugjeWvjpp5F5z370fJIMiUmXX8=
+  on:
+    tags: true
diff --git a/MathJax.js b/MathJax.js
diff --git a/config/AM_CHTML-full.js b/config/AM_CHTML-full.js
diff --git a/config/AM_CHTML.js b/config/AM_CHTML.js
diff --git a/config/AM_HTMLorMML-full.js b/config/AM_HTMLorMML-full.js
diff --git a/config/AM_HTMLorMML.js b/config/AM_HTMLorMML.js
diff --git a/config/AM_SVG-full.js b/config/AM_SVG-full.js
diff --git a/config/AM_SVG.js b/config/AM_SVG.js
diff --git a/config/Accessible-full.js b/config/Accessible-full.js
diff --git a/config/Accessible.js b/config/Accessible.js
diff --git a/config/MML_CHTML-full.js b/config/MML_CHTML-full.js
diff --git a/config/MML_CHTML.js b/config/MML_CHTML.js
diff --git a/config/MML_HTMLorMML-full.js b/config/MML_HTMLorMML-full.js
diff --git a/config/MML_HTMLorMML.js b/config/MML_HTMLorMML.js
diff --git a/config/MML_SVG-full.js b/config/MML_SVG-full.js
diff --git a/config/MML_SVG.js b/config/MML_SVG.js
diff --git a/config/TeX-AMS-MML_HTMLorMML-full.js b/config/TeX-AMS-MML_HTMLorMML-full.js
diff --git a/config/TeX-AMS-MML_HTMLorMML.js b/config/TeX-AMS-MML_HTMLorMML.js
diff --git a/config/TeX-AMS-MML_SVG-full.js b/config/TeX-AMS-MML_SVG-full.js
diff --git a/config/TeX-AMS-MML_SVG.js b/config/TeX-AMS-MML_SVG.js
diff --git a/config/TeX-AMS_CHTML-full.js b/config/TeX-AMS_CHTML-full.js
diff --git a/config/TeX-AMS_CHTML.js b/config/TeX-AMS_CHTML.js
diff --git a/config/TeX-AMS_HTML-full.js b/config/TeX-AMS_HTML-full.js
diff --git a/config/TeX-AMS_HTML.js b/config/TeX-AMS_HTML.js
diff --git a/config/TeX-AMS_SVG-full.js b/config/TeX-AMS_SVG-full.js
diff --git a/config/TeX-AMS_SVG.js b/config/TeX-AMS_SVG.js
diff --git a/config/TeX-MML-AM_CHTML-full.js b/config/TeX-MML-AM_CHTML-full.js
diff --git a/config/TeX-MML-AM_CHTML.js b/config/TeX-MML-AM_CHTML.js
diff --git a/config/TeX-MML-AM_HTMLorMML-full.js b/config/TeX-MML-AM_HTMLorMML-full.js
diff --git a/config/TeX-MML-AM_HTMLorMML.js b/config/TeX-MML-AM_HTMLorMML.js
diff --git a/config/TeX-MML-AM_SVG-full.js b/config/TeX-MML-AM_SVG-full.js
diff --git a/config/TeX-MML-AM_SVG.js b/config/TeX-MML-AM_SVG.js
diff --git a/config/default.js b/config/default.js
@@ -240,12 +240,18 @@ MathJax.Hub.Config({
     ALT: false,          //    require Alt or Option?
     CMD: false,          //    require CMD?
     Shift: false,        //    require Shift?
+    discoverable: false, //  make math menu discoverable on hover?
     zscale: "200%",      //  the scaling factor for MathZoom
+    renderer: null,      //  set when Jax are loaded
     font: "Auto",        //  what font HTML-CSS should use
     context: "MathJax",  //  or "Browser" for pass-through to browser menu
+    locale: null,        //  the language to use for messages
     mpContext: false,    //  true means pass menu events to MathPlayer in IE
     mpMouse: false,      //  true means pass mouse events to MathPlayer in IE
     texHints: true,      //  include class names for TeXAtom elements
+    FastPreview: null,   //  use PreviewHTML output as preview?
+    assistiveMML: null,  //  include hidden MathML for screen readers?
+    inTabOrder: true,    //  set to true if math elements should be included in the tabindex
     semantics: false     //  add semantics tag with original form in MathML output
   },
 

diff --git a/extensions/AssistiveMML.js b/extensions/AssistiveMML.js
diff --git a/extensions/MathMenu.js b/extensions/MathMenu.js
diff --git a/extensions/TeX/AMSmath.js b/extensions/TeX/AMSmath.js
diff --git a/extensions/toMathML.js b/extensions/toMathML.js
diff --git a/jax/input/MathML/config.js b/jax/input/MathML/config.js
@@ -16,4 +16,4 @@
  *  limitations under the License.
  */
 
-MathJax.InputJax.MathML=MathJax.InputJax({id:"MathML",version:"2.6.0",directory:MathJax.InputJax.directory+"/MathML",extensionDir:MathJax.InputJax.extensionDir+"/MathML",entityDir:MathJax.InputJax.directory+"/MathML/entities",config:{useMathMLspacing:false}});MathJax.InputJax.MathML.Register("math/mml");MathJax.InputJax.MathML.loadComplete("config.js");
+MathJax.InputJax.MathML=MathJax.InputJax({id:"MathML",version:"2.6.1",directory:MathJax.InputJax.directory+"/MathML",extensionDir:MathJax.InputJax.extensionDir+"/MathML",entityDir:MathJax.InputJax.directory+"/MathML/entities",config:{useMathMLspacing:false}});MathJax.InputJax.MathML.Register("math/mml");MathJax.InputJax.MathML.loadComplete("config.js");