Updates to handle smallmatrix properly

ts/core/MmlTree/MmlNodes/mtable.ts

@@ -61,7 +61,7 @@ export class MmlMtable extends AbstractMmlNode {
    * Extra properties for this node
    */
   public properties = {
-    useHeight: 1
+    useHeight: true
   };
 
   /**
@@ -116,6 +116,7 @@ export class MmlMtable extends AbstractMmlNode {
           .appendChild(child);
       }
     }
+    level = this.getProperty('scriptlevel') as number || level;
     display = !!(this.attributes.getExplicit('displaystyle') || this.attributes.getDefault('displaystyle'));
     attributes = this.addInheritedAttributes(attributes, {
       columnalign: this.attributes.get('columnalign'),

ts/core/MmlTree/SerializedMmlVisitor.ts

@@ -210,6 +210,8 @@ export class SerializedMmlVisitor extends MmlVisitor {
       }
       setclass && this.setDataAttribute(data, 'texclass', texclass < 0 ? 'NONE' : TEXCLASSNAMES[texclass]);
     }
+    node.getProperty('scriptlevel') && node.getProperty('useHeight') === false &&
+      this.setDataAttribute(data, 'smallmatrix', 'true');
     return data;
   }
 

ts/input/mathml/MathMLCompile.ts

@@ -159,6 +159,9 @@ export class MathMLCompile<N, T, D> {
         } else if (name === 'data-mjx-variant') {
           mml.attributes.set('mathvariant', value);
           ignoreVariant = true;
+        } else if (name === 'data-mjx-smallmatrix') {
+          mml.setProperty('scriptlevel', 1);
+          mml.setProperty('useHeight', false);
         }
       } else if (name !== 'class') {
         let val = value.toLowerCase();

ts/input/tex/base/BaseItems.ts

@@ -846,6 +846,9 @@ export class ArrayItem extends BaseItem {
       const scriptlevel = this.arraydef['scriptlevel'];
       delete this.arraydef['scriptlevel'];
       let mml = this.create('node', 'mtable', this.table, this.arraydef);
+      if (scriptlevel) {
+        mml.setProperty('scriptlevel', scriptlevel);
+      }
       if (this.frame.length === 4) {
         // @test Enclosed frame solid, Enclosed frame dashed
         NodeUtil.setAttribute(mml, 'frame', this.dashed ? 'dashed' : 'solid');
@@ -866,10 +869,6 @@ export class ArrayItem extends BaseItem {
           NodeUtil.setAttribute(mml, 'padding', 0);
         }
       }
-      if (scriptlevel) {
-        // @test Subarray, Small Matrix
-        mml = this.create('node', 'mstyle', [mml], {scriptlevel: scriptlevel});
-      }
       if (this.getProperty('open') || this.getProperty('close')) {
         // @test Cross Product Formula
         mml = ParseUtil.fenced(this.factory.configuration,

ts/output/chtml/Wrappers/mtable.ts

@@ -58,6 +58,9 @@ CommonMtableMixin<CHTMLmtd<any, any, any>, CHTMLmtr<any, any, any>, CHTMLConstru
       'position': 'relative',
       'box-sizing': 'border-box'
     },
+    'mjx-mstyle[size="s"] mjx-mtable': {
+      'vertical-align': '.354em'
+    },
     'mjx-labels': {
       position: 'absolute',
       left: 0,

ts/output/chtml/Wrappers/mtd.ts

@@ -109,9 +109,12 @@ CommonMtdMixin<CHTMLConstructor<any, any, any>>(CHTMLWrapper) {
       this.adaptor.setStyle(this.chtml, 'textAlign', calign);
     }
     //
-    // Include a strut to force minimum height and depth
+    // If we are using minimum row heights,
+    //   Include a strut to force minimum height and depth
     //
-    this.adaptor.append(this.chtml, this.html('mjx-tstrut'));
+    if (this.parent.parent.node.getProperty('useHeight')) {
+      this.adaptor.append(this.chtml, this.html('mjx-tstrut'));
+    }
   }
 
 }

ts/output/common/Wrappers/mrow.ts

@@ -102,7 +102,9 @@ export function CommonMrowMixin<T extends WrapperConstructor>(Base: T): MrowCons
         for (const child of this.childNodes) {
           const noStretch = (child.stretch.dir === DIRECTION.None);
           if (all || noStretch) {
-            const {h, d} = child.getBBox(noStretch);
+            let {h, d, rscale} = child.getBBox(noStretch);
+            h *= rscale;
+            d *= rscale;
             if (h > H) H = h;
             if (d > D) D = d;
           }

ts/output/common/Wrappers/mtable.ts

@@ -617,8 +617,16 @@ export function CommonMtableMixin<
      */
     public updateHDW(cell: C, i: number, j: number, H: number[], D: number[], W: number[] = null) {
       let {h, d, w} = cell.getBBox();
-      if (h < .75) h = .75;
-      if (d < .25) d = .25;
+      const scale = cell.parent.bbox.rscale;
+      if (cell.parent.bbox.rscale !== 1) {
+        h *= scale;
+        d *= scale;
+        w *= scale;
+      }
+      if (this.node.getProperty('useHeight')) {
+        if (h < .75) h = .75;
+        if (d < .25) d = .25;
+      }
       if (h > H[j]) H[j] = h;
       if (d > D[j]) D[j] = d;
       if (W && w > W[i]) W[i] = w;