Merge remote-tracking branch 'origin/master'

dpvc · dpvc · commit 0f857a304c62 · 2018-04-13T15:53:10.000-04:00
diff --git a/main.js b/main.js
@@ -1,18 +1,21 @@
 import {MathJax} from "mathjax3/mathjax.js";
 export {MathJax} from "mathjax3/mathjax.js";
 
-import "mathjax3/handlers/html.js";
 import {TeX} from "mathjax3/input/tex.js";
+import {RegisterHTMLHandler} from "mathjax3/handlers/html.js";
+import {chooseAdaptor} from "mathjax3/adaptors/chooseAdaptor.js";
 import {CHTML} from "mathjax3/output/chtml.js";
 
-let html = MathJax.Document("<html></html>", {
+RegisterHTMLHandler(chooseAdaptor());
+
+let html = MathJax.document("<html></html>", {
   InputJax: new TeX(),
   OutputJax: new CHTML()
 });
 
-MathJax.HandleRetriesFor(function () {
+MathJax.handleRetriesFor(function () {
 
-    html.TestMath(process.argv[3] || '').Compile().Typeset();
+    html.TestMath(process.argv[3] || '').compile().typeset();
     let math = html.math.pop();
     console.log(math.typeset.outerHTML);
 
diff --git a/mathjax2/legacy/jax/element/MmlNode.js b/mathjax2/legacy/jax/element/MmlNode.js
@@ -29,7 +29,7 @@
       return node;
     },
     nodeMake: function (factory,kind) {
-      var node = factory.MML[kind]();
+      var node = factory.MML[kind === 'TeXmathchoice' ? 'mathchoice' : kind]();
       var data = (this.data[0] && this.data[0].inferred && this.inferRow ? this.data[0].data : this.data);
       for (var i = 0, m = data.length; i < m; i++) {
         var child = data[i];
