Merge branch 'master' into use_mathchoice

zorkow · zorkow · commit 8f6a5af9316c · 2018-04-16T15:01:43.000+01:00
diff --git a/lib/Mml-lab.js b/lib/Mml-lab.js
@@ -26,7 +26,7 @@ const Lab = window.Lab = {
   Typeset() {
     let MML = this.mml.value;
     let math = new LabMathItem(MML,mml);
-    math.setMetrics(16,8,1000000,100000,1);
+    math.setMetrics(16,8,16*20,100000,1);
     math.display = this.display;
     this.jax = math;
 
diff --git a/lib/TeX-lab.js b/lib/TeX-lab.js
@@ -26,7 +26,7 @@ const Lab = window.Lab = {
   Typeset() {
     let TeX = this.tex.value;
     let math = new LabMathItem(TeX,tex);
-    math.setMetrics(16,8,1000000,100000,1);
+    math.setMetrics(16,8,16*20,100000,1);
     math.display = this.display;
     this.jax = math;
 
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];
diff --git a/mathjax3-ts/core/MathItem.ts b/mathjax3-ts/core/MathItem.ts
@@ -47,7 +47,7 @@ export type Location<N, T> = {
 
 /*****************************************************************/
 /*
- *  The Metrics object includes tht data needed to typeset
+ *  The Metrics object includes the data needed to typeset
  *  a Mathitem.
  */
 
diff --git a/mathjax3-ts/output/chtml/Wrapper.ts b/mathjax3-ts/output/chtml/Wrapper.ts
@@ -653,24 +653,32 @@ export class CHTMLWrapper<N, T, D> extends AbstractWrapper<MmlNode, CHTMLWrapper
      */
 
     public drawBBox() {
-        const bbox = this.getBBox();
+        let {w, h, d, R}  = this.getBBox();
         const box = this.html('mjx-box', {style: {
-            opacity: .25, 'margin-left': this.em(-bbox.w - bbox.R)
+            opacity: .25, 'margin-left': this.em(-w - R)
         }}, [
             this.html('mjx-box', {style: {
-                height: this.em(bbox.h),
-                width: this.em(bbox.w),
+                height: this.em(h),
+                width: this.em(w),
                 'background-color': 'red'
             }}),
             this.html('mjx-box', {style: {
-                height: this.em(bbox.d),
-                width: this.em(bbox.w),
-                'margin-left': this.em(-bbox.w),
-                'vertical-align': this.em(-bbox.d),
+                height: this.em(d),
+                width: this.em(w),
+                'margin-left': this.em(-w),
+                'vertical-align': this.em(-d),
                 'background-color': 'green'
             }})
         ] as N[]);
         const node = this.chtml || this.parent.chtml;
+        const size = this.adaptor.getAttribute(node, 'size');
+        if (size) {
+            this.adaptor.setAttribute(box, 'size', size);
+        }
+        const fontsize = this.adaptor.getStyle(node, 'fontSize');
+        if (fontsize) {
+            this.adaptor.setStyle(box, 'fontSize', fontsize);
+        }
         this.adaptor.append(this.adaptor.parent(node), box);
         this.adaptor.setStyle(node, 'backgroundColor', '#FFEE00');
     }
diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
     "tslint-jsdoc-rules": "*",
     "tslint-unix-formatter": "*",
     "typescript-tools": "^0.3.1",
-    "typedoc": "^0.9.0"
   },
   "repository": {
     "type": "git",
