Merge branch 'master' into alpha

Author: dpvc

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

@@ -85,7 +85,7 @@ export class CHTMLTextNode extends CHTMLWrapper {
     /*
      * @param{string} variant   The variant in which to look for the character
      * @param{number} n         The number of the character to look up
-     * @param{CharData}         The full CharData object, with CharOptions guaranteed to be defined
+     * @return{CharData}        The full CharData object, with CharOptions guaranteed to be defined
      */
     protected getChar(variant: string, n: number) {
         const char = this.font.getChar(variant, n) || [0, 0, 0, null];

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

@@ -72,7 +72,7 @@ export class CHTMLmrow extends CHTMLWrapper {
     }
 
     /*
-     * Handle the case where a child as a percentage width by
+     * Handle the case where a child has a percentage width by
      * marking the parent as 100% width.
      */
     protected makeFullWidth() {

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

@@ -158,6 +158,11 @@ export class CHTMLmsqrt extends CHTMLWrapper {
         surd.toCHTML(SURD);
         base.toCHTML(BASE);
         if (surd.size < 0) {
+            //
+            // size < 0 means surd is multi-character.  The angle glyph at the
+            // top is hard to align with the horizontal line, so overlap them
+            // using CSS.
+            //
             SQRT.classList.add('mjx-tall');
         }
     }

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

@@ -173,7 +173,19 @@ export class CHTMLmsubsup extends CHTMLscriptbase {
         const t = 3 * tex.rule_thickness;
         const subscriptshift = this.length2em(this.node.attributes.get('subscriptshift'), tex.sub2);
         const drop = (this.isCharBase() ? 0 : basebox.d + tex.sub_drop * subbox.rscale);
+        //
+        // u and v are the veritcal shifts of the scripts, initially set to minimum values and then adjusted
+        //
         let [u, v] = [this.getU(basebox, supbox), Math.max(drop, subscriptshift)];
+        //
+        // q is the space currently between the super- and subscripts.
+        // If it is less than 3 rule thicknesses,
+        //   increase the subscript offset to make the space 3 rule thicknesses
+        //   If the bottom of the superscript is below 4/5 of the x-height
+        //     raise both the super- and subscripts by the difference
+        //     (make the bottom of the superscript be at 4/5 the x-height, and the
+        //      subscript 3 rule thickness below that).
+        //
         let q = (u - supbox.d * supbox.rscale) - (subbox.h * subbox.rscale - v);
         if (q < t) {
             v += t - q;
@@ -183,6 +195,10 @@ export class CHTMLmsubsup extends CHTMLscriptbase {
                 v -= p;
             }
         }
+        //
+        // Make sure the shifts are at least the minimum amounts and
+        // return the shifts and the space between the scripts
+        //
         u = Math.max(this.length2em(this.node.attributes.get('superscriptshift'), u), u);
         v = Math.max(this.length2em(this.node.attributes.get('subscriptshift'), v), v);
         q = (u - supbox.d * supbox.rscale) - (subbox.h * subbox.rscale - v);

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

@@ -90,9 +90,9 @@ export class CHTMLmunder extends CHTMLmsub {
         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;
+        const del = DELTA * this.baseCore.bbox.ic / 2;
         under.style.paddingTop = this.em(k);
-        this.setDeltaW([base, under], this.getDeltaW([basebox, underbox], [0, -delta]));
+        this.setDeltaW([base, under], this.getDeltaW([basebox, underbox], [0, -del]));
     }
 
     /*

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

@@ -243,7 +243,9 @@ export class CHTMLscriptbase extends CHTMLWrapper {
         let m = 0;
         for (const i of widths.keys()) {
             dw[i] = (w - widths[i]) / 2 + delta[i];
-            if (dw[i] < m) m = -dw[i];
+            if (dw[i] < m) {
+                m = -dw[i];
+            }
         }
         if (m) {
             for (const i of dw.keys()) {

mathjax3-ts/output/chtml/fonts/tex.ts

@@ -554,8 +554,9 @@ export class TeXFont extends FontData {
         const char = vclass + ' mjx-c[c="' + this.char(n) + '"]';
         styles['.MJX-TEX' + char + '::before'] = css;
         if (options.ic) {
-            styles['.MJX-TEX mjx-mi:not([noIC="true"])' + char.substr(1) + ':last-child::before'] =
-            styles['.MJX-TEX mjx-mo:not([noIC="true"])' + char.substr(1) + ':last-child::before'] = {
+            const [MJX, noIC] = ['.MJX-TEX mjx-', ':not([noIC="true"])' + char.substr(1) + ':last-child::before'];
+            styles[MJX + 'mi' + noIC] =
+            styles[MJX + 'mo' + noIC] = {
                 width: this.em(w + options.ic)
             };
         }