Merge pull request #1146 from mathjax/issue3300

Make over/under braces and matrices be full size, as in actual TeX (mathjax/MathJax#3300)

Author: dpvc

ts/core/MmlTree/MmlNode.ts

@@ -772,14 +772,8 @@ export abstract class AbstractMmlNode
         delete attributes[key];
       }
     }
-    const displaystyle = this.attributes.getExplicit('displaystyle');
-    if (displaystyle === undefined) {
-      this.attributes.setInherited('displaystyle', display);
-    }
-    const scriptlevel = this.attributes.getExplicit('scriptlevel');
-    if (scriptlevel === undefined) {
-      this.attributes.setInherited('scriptlevel', level);
-    }
+    this.attributes.setInherited('displaystyle', display);
+    this.attributes.setInherited('scriptlevel', level);
     if (prime) {
       this.setProperty('texprimestyle', prime);
     }

ts/core/MmlTree/MmlNodes/mtable.ts

@@ -142,7 +142,6 @@ export class MmlMtable extends AbstractMmlNode {
         this.replaceChild(this.factory.create('mtr'), child).appendChild(child);
       }
     }
-    level = (this.getProperty('scriptlevel') as number) || level;
     display = !!(
       this.attributes.getExplicit('displaystyle') ||
       this.attributes.getDefault('displaystyle')

ts/core/MmlTree/MmlVisitor.ts

@@ -211,10 +211,7 @@ export class MmlVisitor extends AbstractVisitor<MmlNode> {
         );
       }
     }
-    if (
-      node.getProperty('scriptlevel') &&
-      node.getProperty('useHeight') === false
-    ) {
+    if (node.getProperty('smallmatrix')) {
       this.setDataAttribute(data, 'smallmatrix', 'true');
     }
     return data;

ts/input/mathml/MathMLCompile.ts

@@ -215,7 +215,7 @@ export class MathMLCompile<N, T, D> {
             ignoreVariant = true;
             break;
           case 'smallmatrix':
-            mml.setProperty('scriptlevel', 1);
+            mml.setProperty('smallmatrix', true);
             mml.setProperty('useHeight', false);
             break;
           case 'mathaccent':

ts/input/tex.ts

@@ -159,8 +159,9 @@ export class TeX<N, T, D> extends AbstractInputJax<N, T, D> {
     userOptions(parseOptions.options, rest);
     configuration.config(this);
     TeX.tags(parseOptions, configuration);
-    this.postFilters.add(FilterUtil.cleanSubSup, -6);
-    this.postFilters.add(FilterUtil.setInherited, -5);
+    this.postFilters.add(FilterUtil.cleanSubSup, -7);
+    this.postFilters.add(FilterUtil.setInherited, -6);
+    this.postFilters.add(FilterUtil.checkScriptlevel, -5);
     this.postFilters.add(FilterUtil.moveLimits, -4);
     this.postFilters.add(FilterUtil.cleanStretchy, -3);
     this.postFilters.add(FilterUtil.cleanAttributes, -2);

ts/input/tex/FilterUtil.ts

@@ -333,6 +333,36 @@ namespace FilterUtil {
   }) {
     arg.data.root.setInheritedAttributes({}, arg.math['display'], 0, false);
   };
+
+  /**
+   * Removes unneeded mstyle elements that just set the scriptlevel
+   */
+  export const checkScriptlevel = function (arg: { data: ParseOptions }) {
+    const options = arg.data;
+    const remove: MmlNode[] = [];
+    for (const mml of options.getList('mstyle')) {
+      if (mml.childNodes?.[0]?.childNodes?.length !== 1) {
+        continue;
+      }
+      const attributes = mml.attributes;
+      for (const key of ['displaystyle', 'scriptlevel']) {
+        if (attributes.getExplicit(key) === attributes.getInherited(key)) {
+          attributes.unset(key);
+        }
+      }
+      const names = attributes.getExplicitNames();
+      if (
+        names.filter((key) => key.substring(0, 10) !== 'data-latex').length ===
+        0
+      ) {
+        const child = mml.childNodes[0].childNodes[0];
+        names.forEach((key) => child.attributes.set(key, attributes.get(key)));
+        mml.parent.replaceChild(child, mml);
+        remove.push(mml);
+      }
+    }
+    options.removeFromList('mstyle', remove);
+  };
 }
 
 export default FilterUtil;

ts/input/tex/ParseUtil.ts

@@ -639,10 +639,20 @@ export const ParseUtil = {
     let node: MmlNode = mml;
     if (stack) {
       // @test Overbrace 1 2 3, Underbrace, Overbrace Op 1 2
-      node = parser.create('node', 'TeXAtom', [mml], {
-        texClass: TEXCLASS.OP,
-        movesupsub: true,
-      });
+      node = parser.create(
+        'node',
+        'TeXAtom',
+        [
+          parser.create('node', 'mstyle', [mml], {
+            displaystyle: true,
+            scriptlevel: 0,
+          }),
+        ],
+        {
+          texClass: TEXCLASS.OP,
+          movesupsub: true,
+        }
+      );
     }
     NodeUtil.setProperty(node, 'subsupOK', true);
     return node;

ts/input/tex/ams/AmsMappings.ts

@@ -205,7 +205,7 @@ new sm.EnvironmentMap('AMSmath-environment', ParseMethods.environment, {
     ParseUtil.cols(0),
     '0.1em',
     'S',
-    1,
+    true,
   ],
   smallmatrix: [
     AmsMethods.Array,
@@ -216,7 +216,7 @@ new sm.EnvironmentMap('AMSmath-environment', ParseMethods.environment, {
     ParseUtil.cols(1 / 3),
     '.2em',
     'S',
-    1,
+    true,
   ],
   matrix: [AmsMethods.Array, null, null, null, 'c'],
   pmatrix: [AmsMethods.Array, null, '(', ')', 'c'],

ts/input/tex/base/BaseItems.ts

@@ -1101,7 +1101,7 @@ export class ArrayItem extends BaseItem {
     delete this.arraydef['scriptlevel'];
     let mml = this.create('node', 'mtable', this.table, this.arraydef);
     if (scriptlevel) {
-      mml.setProperty('scriptlevel', scriptlevel);
+      mml.setProperty('smallmatrix', true);
     }
     if (this.breakAlign.table) {
       NodeUtil.setAttribute(mml, 'data-break-align', this.breakAlign.table);
@@ -1115,6 +1115,9 @@ export class ArrayItem extends BaseItem {
       );
     }
     mml = this.handleFrame(mml);
+    if (scriptlevel !== undefined) {
+      mml = this.create('node', 'mstyle', [mml], { scriptlevel });
+    }
     if (this.getProperty('open') || this.getProperty('close')) {
       // @test Cross Product Formula
       mml = ParseUtil.fenced(

ts/input/tex/base/BaseMethods.ts

@@ -1968,6 +1968,8 @@ const BaseMethods: { [key: string]: ParseMethod } = {
     if (style === 'S') {
       // @test Subarray, Small Matrix
       array.arraydef['scriptlevel'] = 1;
+    } else {
+      array.arraydef['scriptlevel'] = 0;
     }
     if (raggedHeight) {
       // @test Subarray, Small Matrix