merge branch 'ie-stretchy-braces' into alpha

Author: dpvc

mathjax2/legacy/jax/element/MmlNode.js

@@ -13,7 +13,8 @@
     'isError',
     'multiline',
     'variantForm',
-    'autoOP'
+    'autoOP',
+    'fnOP'  
   ];
   var RENAME = {
       texWithDelims: 'withDelims'

mathjax3-ts/output/chtml/Wrappers/mfrac.ts

@@ -147,7 +147,7 @@ export class CHTMLmfrac extends CHTMLWrapper {
         const dbox = this.childNodes[1].getBBox();
         const pad = (this.node.getProperty('withDelims') as boolean ? 0 : this.font.params.nulldelimiterspace);
         const a = this.font.params.axis_height;
-        const T = (display ? 3.5 : 1.5) * this.font.params.rule_thickness;;
+        const T = (display ? 3.5 : 1.5) * this.font.params.rule_thickness;
         bbox.combine(nbox, 0, a + T + Math.max(nbox.d * nbox.rscale, display ? .217 : .054));
         bbox.combine(dbox, 0, a - T - Math.max(dbox.h * dbox.rscale, display ? .726 : .505));
         bbox.w += 2 * pad + .2;

mathjax3-ts/output/chtml/Wrappers/msubsup.ts

@@ -113,14 +113,14 @@ export class CHTMLmsubsup extends CHTMLscriptbase {
     /*
      * @return{CHTMLWrapper}  The wrapper for the subscript
      */
-    public get sub() {
+    public get subChild() {
         return this.childNodes[(this.node as MmlMsubsup).sub];
     }
 
     /*
      * @return{CHTMLWrapper}  The wrapper for the superscript
      */
-    public get sup() {
+    public get supChild() {
         return this.childNodes[(this.node as MmlMsubsup).sup];
     }
 
@@ -129,26 +129,26 @@ export class CHTMLmsubsup extends CHTMLscriptbase {
      */
     public toCHTML(parent: HTMLElement) {
         this.chtml = this.standardCHTMLnode(parent);
-        const [u, v, q] = this.getUVQ(this.base.getBBox(), this.sub.getBBox(), this.sup.getBBox());
+        const [u, v, q] = this.getUVQ(this.baseChild.getBBox(), this.subChild.getBBox(), this.supChild.getBBox());
         const style = {'vertical-align': this.em(v)};
-        this.base.toCHTML(this.chtml);
+        this.baseChild.toCHTML(this.chtml);
         const stack = this.chtml.appendChild(this.html('mjx-script', {style}));
-        this.sup.toCHTML(stack);
+        this.supChild.toCHTML(stack);
         stack.appendChild(this.html('mjx-spacer', {style: {'margin-top': this.em(q)}}));
-        this.sub.toCHTML(stack);
+        this.subChild.toCHTML(stack);
         const corebox = this.baseCore.bbox;
         if (corebox.ic) {
-            this.sup.chtml.style.marginLeft = this.em((1.2 * corebox.ic + .05) / this.sup.bbox.rscale);
+            this.supChild.chtml.style.marginLeft = this.em((1.2 * corebox.ic + .05) / this.supChild.bbox.rscale);
         }
     }
 
     /*
      * @override
      */
     public computeBBox(bbox: BBox) {
-        const basebox = this.base.getBBox();
-        const subbox  = this.sub.getBBox();
-        const supbox  = this.sup.getBBox();
+        const basebox = this.baseChild.getBBox();
+        const subbox  = this.subChild.getBBox();
+        const supbox  = this.supChild.getBBox();
         bbox.empty();
         bbox.append(basebox);
         const w = bbox.w;

mathjax3-ts/output/chtml/Wrappers/munderover.ts

@@ -85,9 +85,9 @@ export class CHTMLmunder extends CHTMLmsub {
         this.chtml = this.standardCHTMLnode(parent);
         const base = this.chtml.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-base'));
         const under = this.chtml.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-under'));
-        this.base.toCHTML(base);
+        this.baseChild.toCHTML(base);
         this.script.toCHTML(under);
-        const basebox = this.base.getBBox();
+        const basebox = this.baseChild.getBBox();
         const underbox = this.script.getBBox();
         const [k, v] = this.getUnderKV(basebox, underbox);
         const delta = DELTA * this.baseCore.bbox.ic / 2;
@@ -104,7 +104,7 @@ export class CHTMLmunder extends CHTMLmsub {
             return;
         }
         bbox.empty();
-        const basebox = this.base.getBBox();
+        const basebox = this.baseChild.getBBox();
         const underbox = this.script.getBBox();
         const [k, v] = this.getUnderKV(basebox, underbox);
         const delta = DELTA * this.baseCore.bbox.ic / 2;
@@ -166,9 +166,9 @@ export class CHTMLmover extends CHTMLmsup {
         const over = this.chtml.appendChild(this.html('mjx-over'));
         const base = this.chtml.appendChild(this.html('mjx-base'));
         this.script.toCHTML(over);
-        this.base.toCHTML(base);
+        this.baseChild.toCHTML(base);
         const overbox = this.script.getBBox();
-        const basebox = this.base.getBBox();
+        const basebox = this.baseChild.getBBox();
         const [k, u] = this.getOverKU(basebox, overbox);
         const delta = DELTA * this.baseCore.bbox.ic / 2;
         over.style.paddingBottom = this.em(k);
@@ -187,7 +187,7 @@ export class CHTMLmover extends CHTMLmsup {
             return;
         }
         bbox.empty();
-        const basebox = this.base.getBBox();
+        const basebox = this.baseChild.getBBox();
         const overbox = this.script.getBBox();
         const [k, u] = this.getOverKU(basebox, overbox);
         const delta = DELTA * this.baseCore.bbox.ic / 2;
@@ -222,14 +222,14 @@ export class CHTMLmunderover extends CHTMLmsubsup {
     /*
      * @return{CHTMLWrapper)   The wrapped under node
      */
-    public get under() {
+    public get underChild() {
         return this.childNodes[(this.node as MmlMunderover).under];
     }
 
     /*
      * @return{CHTMLWrapper)   The wrapped overder node
      */
-    public get over() {
+    public get overChild() {
         return this.childNodes[(this.node as MmlMunderover).over];
     }
 
@@ -238,17 +238,17 @@ export class CHTMLmunderover extends CHTMLmsubsup {
      *
      * @override
      */
-    public get sub() {
-        return this.under;
+    public get subChild() {
+        return this.underChild;
     }
 
     /*
      * Needed for movablelimits
      *
      * @override
      */
-    public get sup() {
-        return this.over;
+    public get supChild() {
+        return this.overChild;
     }
 
     /*
@@ -274,12 +274,12 @@ export class CHTMLmunderover extends CHTMLmsubsup {
         const table = this.chtml.appendChild(this.html('mjx-box')).appendChild(this.html('mjx-munder'));
         const base = table.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-base'));
         const under = table.appendChild(this.html('mjx-row')).appendChild(this.html('mjx-under'));
-        this.over.toCHTML(over);
-        this.base.toCHTML(base);
-        this.under.toCHTML(under);
-        const overbox = this.over.getBBox();
-        const basebox = this.base.getBBox();
-        const underbox = this.under.getBBox();
+        this.overChild.toCHTML(over);
+        this.baseChild.toCHTML(base);
+        this.underChild.toCHTML(under);
+        const overbox = this.overChild.getBBox();
+        const basebox = this.baseChild.getBBox();
+        const underbox = this.underChild.getBBox();
         const [ok, u] = this.getOverKU(basebox, overbox);
         const [uk, v] = this.getUnderKV(basebox, underbox);
         const delta = DELTA * this.baseCore.bbox.ic / 2;
@@ -300,9 +300,9 @@ export class CHTMLmunderover extends CHTMLmsubsup {
             return;
         }
         bbox.empty();
-        const overbox = this.over.getBBox();
-        const basebox = this.base.getBBox();
-        const underbox = this.under.getBBox();
+        const overbox = this.overChild.getBBox();
+        const basebox = this.baseChild.getBBox();
+        const underbox = this.underChild.getBBox();
         const [ok, u] = this.getOverKU(basebox, overbox);
         const [uk, v] = this.getUnderKV(basebox, underbox);
         const delta = DELTA * this.baseCore.bbox.ic / 2;

mathjax3-ts/output/chtml/Wrappers/scriptbase.ts

@@ -55,7 +55,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
     /*
      * @return{CHTMLWrapper}  The base element's wrapper
      */
-    public get base() {
+    public get baseChild() {
         return this.childNodes[(this.node as MmlMsubsup).base];
     }
 
@@ -98,12 +98,12 @@ export class CHTMLscriptbase extends CHTMLWrapper {
      */
     public toCHTML(parent: HTMLElement) {
         this.chtml = this.standardCHTMLnode(parent);
-        const [x, v] = this.getOffset(this.base.getBBox(), this.script.getBBox());
+        const [x, v] = this.getOffset(this.baseChild.getBBox(), this.script.getBBox());
         const style: StyleData = {'vertical-align': this.em(v)};
         if (x) {
             style['margin-left'] = this.em(x);
         }
-        this.base.toCHTML(this.chtml);
+        this.baseChild.toCHTML(this.chtml);
         this.script.toCHTML(this.chtml.appendChild(this.html('mjx-script', {style})));
     }
 
@@ -114,7 +114,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
      * @override
      */
     public computeBBox(bbox: BBox) {
-        const basebox = this.base.getBBox();
+        const basebox = this.baseChild.getBBox();
         const scriptbox = this.script.getBBox();
         const [x, y] = this.getOffset(basebox, scriptbox);
         bbox.append(basebox);
@@ -127,7 +127,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
      * @return{boolean}  True if the base is an mi, mn, or mo (not a largeop) consisting of a single character
      */
     protected isCharBase() {
-        let base = this.base;
+        let base = this.baseChild;
         if ((base.node.isKind('mstyle') || base.node.isKind('mrow')) && base.childNodes.length === 1) {
             base = base.childNodes[0];
         }
@@ -200,7 +200,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
         const display = this.node.attributes.get('displaystyle');
         return (!display && (this.node.getProperty('movablelimits') ||
                              this.node.attributes.get('movablelimits') ||
-                             this.base.coreMO().node.attributes.get('movablelimits')));
+                             this.baseChild.coreMO().node.attributes.get('movablelimits')));
     }
 
     /*
@@ -218,7 +218,7 @@ export class CHTMLscriptbase extends CHTMLWrapper {
     }
 
     /*
-     * Get the separation and offset for undercripts (TeXBoox Appendix G 13, 13a)
+     * Get the separation and offset for underscripts (TeXBoox Appendix G 13, 13a)
      *
      * @param{BBox} basebox   The bounding box of the base
      * @param{BBox} underbox  The bounding box of the underscript