From c169f741c0473d63ac83d5ff94f5932af91abe82 Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Sun, 12 Jul 2026 09:46:03 +0200
Subject: [PATCH 01/11] fix latex attributes for rows in array-like expressions

---
 ts/input/tex/base/BaseItems.ts | 48 +++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts
index a2eb4d66b..f3f99016d 100644
--- a/ts/input/tex/base/BaseItems.ts
+++ b/ts/input/tex/base/BaseItems.ts
@@ -965,6 +965,14 @@ export class ArrayItem extends BaseItem {
    */
   public row: MmlNode[] = [];
 
+  /**
+   * The LaTeX source for the content cells of the current row, used to
+   * reconstruct the `data-latex` attribute of the row (mtr/mlabeledtr) node.
+   *
+   * @type {string[]}
+   */
+  public rowLatex: string[] = [];
+
   /**
    * Frame specification as a list of pairs of strings [side, style].
    *
@@ -1346,6 +1354,7 @@ export class ArrayItem extends BaseItem {
     this.breakAlign.cell = '';
     //
     this.row.push(mtd);
+    this.rowLatex.push(this.cellLatex(mtd));
     this.Clear();
     this.hfill = [];
   }
@@ -1370,12 +1379,49 @@ export class ArrayItem extends BaseItem {
       NodeUtil.setAttribute(node, 'data-break-align', this.breakAlign.row);
       this.breakAlign.row = '';
     }
-    this.addLatexItem(node);
+    this.setRowLatex(node);
     this.table.push(node);
     this.row = [];
+    this.rowLatex = [];
     this.atEnd = false;
   }
 
+  /**
+   * Reconstructs the LaTeX source of a single table cell from the `data-latex`
+   * attributes of its content nodes.
+   *
+   * @param {MmlNode} mtd The mtd node whose content is reconstructed.
+   * @returns {string} The LaTeX source of the cell content.
+   */
+  public cellLatex(mtd: MmlNode): string {
+    const children = mtd.childNodes[0]?.childNodes || [];
+    let expr = '';
+    for (const child of children) {
+      const att = (child?.attributes?.get(TexConstant.Attr.LATEX) ||
+        '') as string;
+      if (!att) continue;
+      expr +=
+        expr && expr.match(/[a-zA-Z]$/) && att.match(/^[a-zA-Z]/)
+          ? ' ' + att
+          : att;
+    }
+    return expr;
+  }
+
+  /**
+   * Sets the `data-latex` attribute of a row node by joining the LaTeX source
+   * of its content cells with `&`.
+   *
+   * @param {MmlNode} node The mtr/mlabeledtr node.
+   */
+  public setRowLatex(node: MmlNode) {
+    const tex = this.rowLatex.join('&');
+    if (tex) {
+      node.attributes.set(TexConstant.Attr.LATEXITEM, tex);
+      node.attributes.set(TexConstant.Attr.LATEX, tex);
+    }
+  }
+
   /**
    * Finishes the table layout.
    */

From 1d90849e453251a5040e1624a8cbe1a945369567 Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Sun, 12 Jul 2026 09:47:11 +0200
Subject: [PATCH 02/11] update tests to for new LaTeX output in rows

---
 .../input/tex/__snapshots__/Ams.test.ts.snap  | 230 +++---
 .../tex/__snapshots__/Amscd.test.ts.snap      |  66 +-
 .../tex/__snapshots__/Autoload.test.ts.snap   |   2 +-
 .../input/tex/__snapshots__/Base.test.ts.snap | 369 +++++-----
 .../tex/__snapshots__/Cases.test.ts.snap      |  34 +-
 .../tex/__snapshots__/Colortbl.test.ts.snap   |  50 +-
 .../tex/__snapshots__/Empheq.test.ts.snap     |  38 +-
 .../tex/__snapshots__/Mathtools.test.ts.snap  | 330 ++++-----
 .../tex/__snapshots__/Newcommand.test.ts.snap |  10 +-
 .../tex/__snapshots__/Physics.test.ts.snap    | 684 +++++++++---------
 .../input/tex/__snapshots__/Tag.test.ts.snap  | 168 ++---
 .../tex/__snapshots__/TagFormat.test.ts.snap  |  12 +-
 .../input/tex/__snapshots__/Tex.test.ts.snap  |   2 +-
 13 files changed, 997 insertions(+), 998 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
index f76f8eee6..15f1f6d89 100644
--- a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
@@ -185,7 +185,7 @@ exports[`Ams Complex A Cross Product Formula 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="{vmatrix}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr>
+      <mtr data-latex="\\mathbf{i}&amp;\\mathbf{j}&amp;\\mathbf{k}">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="\\mathbf{i}">
             <mi mathvariant="bold" data-latex="i">i</mi>
@@ -202,7 +202,7 @@ exports[`Ams Complex A Cross Product Formula 1`] = `
           </mrow>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="\\frac{\\partial X}{\\partial u}&amp;\\frac{\\partial Y}{\\partial u}&amp;0">
         <mtd>
           <mfrac data-latex="\\frac{\\partial X}{\\partial u}">
             <mrow data-latex="\\partial X">
@@ -231,7 +231,7 @@ exports[`Ams Complex A Cross Product Formula 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="\\frac{\\partial X}{\\partial v}&amp;\\frac{\\partial Y}{\\partial v}&amp;0">
         <mtd>
           <mfrac data-latex="\\frac{\\partial X}{\\partial v}">
             <mrow data-latex="\\partial X">
@@ -269,7 +269,7 @@ exports[`Ams Complex A Cross Product Formula 1`] = `
 exports[`Ams Complex Cubic Binomial 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}(x+y)^{3}&amp;=&amp;(x+y)(x+y)(x+y)\\\\&amp;=&amp;xxx+xxy+xyx+{\\underline {xyy}}+yxx+{\\underline {yxy}}+{\\underline {yyx}}+yyy\\\\&amp;=&amp;x^{3}+3x^{2}y+{\\underline {3xy^{2}}}+y^{3}.\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}(x+y)^{3}&amp;=&amp;(x+y)(x+y)(x+y)\\\\&amp;=&amp;xxx+xxy+xyx+{\\underline {xyy}}+yxx+{\\underline {yxy}}+{\\underline {yyx}}+yyy\\\\&amp;=&amp;x^{3}+3x^{2}y+{\\underline {3xy^{2}}}+y^{3}.\\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="(x+y)^{3}&amp;=&amp;(x+y)(x+y)(x+y)">
       <mtd>
         <mo data-latex="(" stretchy="false">(</mo>
         <mi data-latex="x">x</mi>
@@ -307,7 +307,7 @@ exports[`Ams Complex Cubic Binomial 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;=&amp;x x x+x x y+x y x+{\\underline {xyy}}+y x x+{\\underline {yxy}}+{\\underline {yyx}}+y y y">
       <mtd></mtd>
       <mtd>
         <mi></mi>
@@ -370,7 +370,7 @@ exports[`Ams Complex Cubic Binomial 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;=&amp;x^{3}+3x^{2}y+{\\underline {3xy^{2}}}+y^{3}.">
       <mtd></mtd>
       <mtd>
         <mi></mi>
@@ -427,7 +427,7 @@ exports[`Ams Complex Cubic Binomial 1`] = `
 exports[`Ams Complex Maxwell's Equations 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align} \\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} &amp; = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\  \\nabla \\cdot \\vec{\\mathbf{E}} &amp; = 4 \\pi \\rho \\\\  \\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} &amp; = \\vec{\\mathbf{0}} \\\\  \\nabla \\cdot \\vec{\\mathbf{B}} &amp; = 0 \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} \\nabla \\times \\vec{\\mathbf{B}} -\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t} &amp; = \\frac{4\\pi}{c}\\vec{\\mathbf{j}} \\\\  \\nabla \\cdot \\vec{\\mathbf{E}} &amp; = 4 \\pi \\rho \\\\  \\nabla \\times \\vec{\\mathbf{E}}\\, +\\, \\frac1c\\, \\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t} &amp; = \\vec{\\mathbf{0}} \\\\  \\nabla \\cdot \\vec{\\mathbf{B}} &amp; = 0 \\end{align}">
-    <mtr>
+    <mtr data-latex="\\nabla\\times\\vec{\\mathbf{B}}-\\,\\frac1c\\,\\frac{\\partial\\vec{\\mathbf{E}}}{\\partial t}&amp;=\\frac{4\\pi}{c}\\vec{\\mathbf{j}}">
       <mtd>
         <mi mathvariant="normal" data-latex="\\nabla">&#x2207;</mi>
         <mo data-latex="\\times">&#xD7;</mo>
@@ -486,7 +486,7 @@ exports[`Ams Complex Maxwell's Equations 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\nabla\\cdot\\vec{\\mathbf{E}}&amp;=4\\pi\\rho">
       <mtd>
         <mi mathvariant="normal" data-latex="\\nabla">&#x2207;</mi>
         <mo data-latex="\\cdot">&#x22C5;</mo>
@@ -509,7 +509,7 @@ exports[`Ams Complex Maxwell's Equations 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\nabla\\times\\vec{\\mathbf{E}}\\,+\\,\\frac1c\\,\\frac{\\partial\\vec{\\mathbf{B}}}{\\partial t}&amp;=\\vec{\\mathbf{0}}">
       <mtd>
         <mi mathvariant="normal" data-latex="\\nabla">&#x2207;</mi>
         <mo data-latex="\\times">&#xD7;</mo>
@@ -562,7 +562,7 @@ exports[`Ams Complex Maxwell's Equations 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\nabla\\cdot\\vec{\\mathbf{B}}&amp;=0">
       <mtd>
         <mi mathvariant="normal" data-latex="\\nabla">&#x2207;</mi>
         <mo data-latex="\\cdot">&#x22C5;</mo>
@@ -590,7 +590,7 @@ exports[`Ams Complex Maxwell's Equations 1`] = `
 exports[`Ams Complex The Lorenz Equations 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}\\dot{x} &amp; = \\sigma(y-x) \\\\\\dot{y} &amp; = \\rho x - y - xz \\\\\\dot{z} &amp; = -\\beta z + xy\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align}\\dot{x} &amp; = \\sigma(y-x) \\\\\\dot{y} &amp; = \\rho x - y - xz \\\\\\dot{z} &amp; = -\\beta z + xy\\end{align}">
-    <mtr>
+    <mtr data-latex="\\dot{x}&amp;=\\sigma(y-x)">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="\\dot{x}">
           <mover>
@@ -612,7 +612,7 @@ exports[`Ams Complex The Lorenz Equations 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\dot{y}&amp;=\\rho x-y-x z">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="\\dot{y}">
           <mover>
@@ -635,7 +635,7 @@ exports[`Ams Complex The Lorenz Equations 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\dot{z}&amp;=-\\beta z+x y">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="\\dot{z}">
           <mover>
@@ -760,7 +760,7 @@ exports[`Ams Display Sub Fraction 1`] = `
 exports[`Ams Environments Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}">
-    <mtr>
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -772,7 +772,7 @@ exports[`Ams Environments Align 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -791,7 +791,7 @@ exports[`Ams Environments Align 1`] = `
 exports[`Ams Environments Align Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -803,7 +803,7 @@ exports[`Ams Environments Align Star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -822,7 +822,7 @@ exports[`Ams Environments Align Star 1`] = `
 exports[`Ams Environments Alignat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -834,7 +834,7 @@ exports[`Ams Environments Alignat 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -853,7 +853,7 @@ exports[`Ams Environments Alignat 1`] = `
 exports[`Ams Environments Alignat Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat*}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{alignat*}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat*}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -865,7 +865,7 @@ exports[`Ams Environments Alignat Star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -884,7 +884,7 @@ exports[`Ams Environments Alignat Star 1`] = `
 exports[`Ams Environments Aligned 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{aligned} r&amp;=s\\\\ &amp; =t \\end{aligned} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{aligned} r&amp;=s\\\\ &amp; =t \\end{aligned} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{aligned}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -894,7 +894,7 @@ exports[`Ams Environments Aligned 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="{aligned}">
-            <mtr data-latex=" ">
+            <mtr data-latex="r&amp;=s">
               <mtd>
                 <mi data-latex="r">r</mi>
               </mtd>
@@ -906,7 +906,7 @@ exports[`Ams Environments Aligned 1`] = `
                 </mstyle>
               </mtd>
             </mtr>
-            <mtr data-latex=" ">
+            <mtr data-latex="&amp;=t">
               <mtd></mtd>
               <mtd>
                 <mstyle indentshift="2em">
@@ -920,7 +920,7 @@ exports[`Ams Environments Aligned 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -939,7 +939,7 @@ exports[`Ams Environments Aligned 1`] = `
 exports[`Ams Environments Alignedat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{alignedat}{2} r&amp;=s\\\\ &amp; =t \\end{alignedat} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{alignedat}{2} r&amp;=s\\\\ &amp; =t \\end{alignedat} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{alignedat}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -949,7 +949,7 @@ exports[`Ams Environments Alignedat 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="{alignedat}">
-            <mtr data-latex="{2}">
+            <mtr data-latex="r&amp;=s">
               <mtd>
                 <mi data-latex="r">r</mi>
               </mtd>
@@ -961,7 +961,7 @@ exports[`Ams Environments Alignedat 1`] = `
                 </mstyle>
               </mtd>
             </mtr>
-            <mtr data-latex="{2}">
+            <mtr data-latex="&amp;=t">
               <mtd></mtd>
               <mtd>
                 <mstyle indentshift="2em">
@@ -975,7 +975,7 @@ exports[`Ams Environments Alignedat 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -996,7 +996,7 @@ exports[`Ams Environments Bmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix} a &amp; b \\\\ c &amp; d \\end{Bmatrix}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -1004,7 +1004,7 @@ exports[`Ams Environments Bmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -1021,7 +1021,7 @@ exports[`Ams Environments Bmatrix 1`] = `
 exports[`Ams Environments Eqnarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1035,7 +1035,7 @@ exports[`Ams Environments Eqnarray 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1056,7 +1056,7 @@ exports[`Ams Environments Eqnarray 1`] = `
 exports[`Ams Environments Eqnarray Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray*} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray*}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray*} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray*}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1070,7 +1070,7 @@ exports[`Ams Environments Eqnarray Star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1103,14 +1103,14 @@ exports[`Ams Environments Equation Star 1`] = `
 exports[`Ams Environments Gather 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}">
-    <mtr>
+    <mtr data-latex="a=b">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c=d">
       <mtd>
         <mi data-latex="c">c</mi>
         <mo data-latex="=">=</mo>
@@ -1124,14 +1124,14 @@ exports[`Ams Environments Gather 1`] = `
 exports[`Ams Environments Gather Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather*} a=b \\\\ c=d \\end{gather*}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="\\begin{gather*} a=b \\\\ c=d \\end{gather*}">
-    <mtr>
+    <mtr data-latex="a=b">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c=d">
       <mtd>
         <mi data-latex="c">c</mi>
         <mo data-latex="=">=</mo>
@@ -1145,7 +1145,7 @@ exports[`Ams Environments Gather Star 1`] = `
 exports[`Ams Environments Gathered 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{gathered} r=s\\\\  =t \\end{gathered} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{gathered} r=s\\\\  =t \\end{gathered} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{gathered}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1155,14 +1155,14 @@ exports[`Ams Environments Gathered 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="{gathered}">
-            <mtr data-latex=" ">
+            <mtr data-latex="r=s">
               <mtd>
                 <mi data-latex="r">r</mi>
                 <mo data-latex="=">=</mo>
                 <mi data-latex="s">s</mi>
               </mtd>
             </mtr>
-            <mtr data-latex=" ">
+            <mtr data-latex="=t">
               <mtd>
                 <mo data-latex="=">=</mo>
                 <mi data-latex="t">t</mi>
@@ -1172,7 +1172,7 @@ exports[`Ams Environments Gathered 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1236,7 +1236,7 @@ exports[`Ams Environments Small Matrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -1249,7 +1249,7 @@ exports[`Ams Environments Small Matrix 1`] = `
 exports[`Ams Environments Split 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{split} r&amp;=s\\\\ &amp; =t \\end{split} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{split} r&amp;=s\\\\ &amp; =t \\end{split} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{split}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1259,7 +1259,7 @@ exports[`Ams Environments Split 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="{split}">
-            <mtr>
+            <mtr data-latex="r&amp;=s">
               <mtd>
                 <mi data-latex="r">r</mi>
               </mtd>
@@ -1271,7 +1271,7 @@ exports[`Ams Environments Split 1`] = `
                 </mstyle>
               </mtd>
             </mtr>
-            <mtr>
+            <mtr data-latex="&amp;=t">
               <mtd></mtd>
               <mtd>
                 <mstyle indentshift="2em">
@@ -1285,7 +1285,7 @@ exports[`Ams Environments Split 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1305,7 +1305,7 @@ exports[`Ams Environments Subarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{subarray}{c}a\\end{subarray}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{subarray}{c}a\\end{subarray}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em">
-      <mtr data-latex="{c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -1320,7 +1320,7 @@ exports[`Ams Environments Vmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix} a &amp; b \\\\ c &amp; d \\end{Vmatrix}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -1328,7 +1328,7 @@ exports[`Ams Environments Vmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -1347,7 +1347,7 @@ exports[`Ams Environments bmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix} a &amp; b \\\\ c &amp; d \\end{bmatrix}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -1355,7 +1355,7 @@ exports[`Ams Environments bmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -1379,7 +1379,7 @@ exports[`Ams Environments cases 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="{cases}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left">
-      <mtr>
+      <mtr data-latex="1&amp;\\text{if $x &gt; 1$}">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1394,7 +1394,7 @@ exports[`Ams Environments cases 1`] = `
           </mrow>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="0&amp;\\text{otherwise}">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -1411,7 +1411,7 @@ exports[`Ams Environments cases 1`] = `
 exports[`Ams Environments flalign 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{flalign} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{flalign}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="right left center right" columnspacing="0em" columnwidth="auto auto fit auto" rowspacing="3pt" data-break-align="bottom top middle bottom" data-width-includes-label="true" data-latex="\\begin{flalign} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{flalign}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1426,7 +1426,7 @@ exports[`Ams Environments flalign 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1448,7 +1448,7 @@ exports[`Ams Environments flalign 1`] = `
 exports[`Ams Environments flalign small 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{flalign} a&amp;b \\end{flalign}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" columnwidth="auto auto" rowspacing="3pt" data-break-align="bottom top" data-width-includes-label="true" data-latex="\\begin{flalign} a&amp;b \\end{flalign}">
-    <mtr>
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1465,7 +1465,7 @@ exports[`Ams Environments flalign small 1`] = `
 exports[`Ams Environments matrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{matrix} a &amp; b \\\\ c &amp; d \\end{matrix}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{matrix} a &amp; b \\\\ c &amp; d \\end{matrix}">
-    <mtr>
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1473,7 +1473,7 @@ exports[`Ams Environments matrix 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1490,7 +1490,7 @@ exports[`Ams Environments pmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -1498,7 +1498,7 @@ exports[`Ams Environments pmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -1515,7 +1515,7 @@ exports[`Ams Environments pmatrix 1`] = `
 exports[`Ams Environments xalign tagged 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center right left center" columnspacing="0em" columnwidth="fit auto auto fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}">
-    <mlabeledtr data-latex="{2}">
+    <mlabeledtr data-latex="a&amp;\\tag{1}">
       <mtd id="mjx-eqn:1">
         <mpadded width="0" lspace="-1width">
           <mtext data-latex="\\text{(}">(</mtext>
@@ -1546,7 +1546,7 @@ exports[`Ams Environments xalign tagged 1`] = `
 exports[`Ams Environments xalignat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{2} a&amp;b &amp; c&amp;d \\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center right left center" columnspacing="0em" columnwidth="fit auto auto fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{2} a&amp;b &amp; c&amp;d \\end{xalignat}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="a&amp;b&amp;c&amp;d">
       <mtd></mtd>
       <mtd>
         <mi data-latex="a">a</mi>
@@ -1574,7 +1574,7 @@ exports[`Ams Environments xalignat 1`] = `
 exports[`Ams Environments xalignat padding 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{2} a&amp;b \\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center right left center" columnspacing="0em" columnwidth="fit auto auto fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{2} a&amp;b \\end{xalignat}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="a&amp;b">
       <mtd></mtd>
       <mtd>
         <mi data-latex="a">a</mi>
@@ -1598,7 +1598,7 @@ exports[`Ams Environments xalignat padding 1`] = `
 exports[`Ams Environments xxalignat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xxalignat}{2} a&amp;b &amp; c&amp;d \\end{xxalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="right left center right left" columnspacing="0em" columnwidth="auto auto fit auto auto" rowspacing="3pt" data-break-align="bottom top middle bottom top" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xxalignat}{2} a&amp;b &amp; c&amp;d \\end{xxalignat}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="a&amp;b&amp;c&amp;d">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2006,7 +2006,7 @@ exports[`Ams Symbol 1`] = `
 exports[`Ams Tagged Environments Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2023,7 +2023,7 @@ exports[`Ams Tagged Environments Align 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2047,7 +2047,7 @@ exports[`Ams Tagged Environments Align 1`] = `
 exports[`Ams Tagged Environments Align Notag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align} a&amp;=b \\\\ &amp;=c \\notag \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b \\\\ &amp;=c \\notag \\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2064,7 +2064,7 @@ exports[`Ams Tagged Environments Align Notag 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mtr>
+    <mtr data-latex="&amp;=\\notag">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2081,7 +2081,7 @@ exports[`Ams Tagged Environments Align Notag 1`] = `
 exports[`Ams Tagged Environments Align Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2093,7 +2093,7 @@ exports[`Ams Tagged Environments Align Star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2112,7 +2112,7 @@ exports[`Ams Tagged Environments Align Star 1`] = `
 exports[`Ams Tagged Environments Alignat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}">
-    <mlabeledtr data-latex="{2}">
+    <mlabeledtr data-latex="a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2129,7 +2129,7 @@ exports[`Ams Tagged Environments Alignat 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="{2}">
+    <mlabeledtr data-latex="c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2153,7 +2153,7 @@ exports[`Ams Tagged Environments Alignat 1`] = `
 exports[`Ams Tagged Environments Alignat Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat*}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{alignat*}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat*}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2165,7 +2165,7 @@ exports[`Ams Tagged Environments Alignat Star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2184,7 +2184,7 @@ exports[`Ams Tagged Environments Alignat Star 1`] = `
 exports[`Ams Tagged Environments Aligned 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{aligned} r&amp;=s\\\\ &amp; =t \\end{aligned} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{aligned} r&amp;=s\\\\ &amp; =t \\end{aligned} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{aligned}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2194,7 +2194,7 @@ exports[`Ams Tagged Environments Aligned 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="{aligned}">
-            <mtr data-latex=" ">
+            <mtr data-latex="r&amp;=s">
               <mtd>
                 <mi data-latex="r">r</mi>
               </mtd>
@@ -2206,7 +2206,7 @@ exports[`Ams Tagged Environments Aligned 1`] = `
                 </mstyle>
               </mtd>
             </mtr>
-            <mtr data-latex=" ">
+            <mtr data-latex="&amp;=t">
               <mtd></mtd>
               <mtd>
                 <mstyle indentshift="2em">
@@ -2220,7 +2220,7 @@ exports[`Ams Tagged Environments Aligned 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2239,7 +2239,7 @@ exports[`Ams Tagged Environments Aligned 1`] = `
 exports[`Ams Tagged Environments Alignedat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{alignedat}{2} r&amp;=s\\\\ &amp; =t \\end{alignedat} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{alignedat}{2} r&amp;=s\\\\ &amp; =t \\end{alignedat} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{alignedat}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2249,7 +2249,7 @@ exports[`Ams Tagged Environments Alignedat 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="{alignedat}">
-            <mtr data-latex="{2}">
+            <mtr data-latex="r&amp;=s">
               <mtd>
                 <mi data-latex="r">r</mi>
               </mtd>
@@ -2261,7 +2261,7 @@ exports[`Ams Tagged Environments Alignedat 1`] = `
                 </mstyle>
               </mtd>
             </mtr>
-            <mtr data-latex="{2}">
+            <mtr data-latex="&amp;=t">
               <mtd></mtd>
               <mtd>
                 <mstyle indentshift="2em">
@@ -2275,7 +2275,7 @@ exports[`Ams Tagged Environments Alignedat 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2294,7 +2294,7 @@ exports[`Ams Tagged Environments Alignedat 1`] = `
 exports[`Ams Tagged Environments Eqnarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;=&amp;b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2313,7 +2313,7 @@ exports[`Ams Tagged Environments Eqnarray 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c&amp;=&amp;d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2339,7 +2339,7 @@ exports[`Ams Tagged Environments Eqnarray 1`] = `
 exports[`Ams Tagged Environments Eqnarray Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray*} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray*}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray*} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray*}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2353,7 +2353,7 @@ exports[`Ams Tagged Environments Eqnarray Star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2397,7 +2397,7 @@ exports[`Ams Tagged Environments Equation Star 1`] = `
 exports[`Ams Tagged Environments Gather 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2409,7 +2409,7 @@ exports[`Ams Tagged Environments Gather 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2428,14 +2428,14 @@ exports[`Ams Tagged Environments Gather 1`] = `
 exports[`Ams Tagged Environments Gather Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather*} a=b \\\\ c=d \\end{gather*}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="\\begin{gather*} a=b \\\\ c=d \\end{gather*}">
-    <mtr>
+    <mtr data-latex="a=b">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c=d">
       <mtd>
         <mi data-latex="c">c</mi>
         <mo data-latex="=">=</mo>
@@ -2449,7 +2449,7 @@ exports[`Ams Tagged Environments Gather Star 1`] = `
 exports[`Ams Tagged Environments Gathered 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{gathered} r=s\\\\  =t \\end{gathered} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{gathered} r=s\\\\  =t \\end{gathered} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{gathered}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2459,14 +2459,14 @@ exports[`Ams Tagged Environments Gathered 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="{gathered}">
-            <mtr data-latex=" ">
+            <mtr data-latex="r=s">
               <mtd>
                 <mi data-latex="r">r</mi>
                 <mo data-latex="=">=</mo>
                 <mi data-latex="s">s</mi>
               </mtd>
             </mtr>
-            <mtr data-latex=" ">
+            <mtr data-latex="=t">
               <mtd>
                 <mo data-latex="=">=</mo>
                 <mi data-latex="t">t</mi>
@@ -2476,7 +2476,7 @@ exports[`Ams Tagged Environments Gathered 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2495,7 +2495,7 @@ exports[`Ams Tagged Environments Gathered 1`] = `
 exports[`Ams Tagged Environments Left Gather Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather}\\begin{align} a &amp;= b \\end{align}\\end{gather}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" side="left" data-latex="\\begin{gather}\\begin{align} a &amp;= b \\end{align}\\end{gather}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="{align}">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2503,7 +2503,7 @@ exports[`Ams Tagged Environments Left Gather Align 1`] = `
       </mtd>
       <mtd>
         <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" side="left" data-latex="{align}">
-          <mlabeledtr>
+          <mlabeledtr data-latex="a&amp;=b">
             <mtd id="mjx-eqn:1">
               <mtext data-latex="\\text{(}">(</mtext>
               <mtext data-latex="\\text{1}">1</mtext>
@@ -2547,7 +2547,7 @@ exports[`Ams Tagged Environments Left multline tagged left 1`] = `
 exports[`Ams Tagged Environments Left xalign tagged left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center right left center" columnspacing="0em" columnwidth="fit auto auto fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle bottom top middle" side="left" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}">
-    <mlabeledtr data-latex="{2}">
+    <mlabeledtr data-latex="a&amp;\\tag{1}">
       <mtd id="mjx-eqn:1">
         <mpadded width="0">
           <mtext data-latex="\\text{(}">(</mtext>
@@ -2628,7 +2628,7 @@ exports[`Ams Tagged Environments Small Matrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -2641,7 +2641,7 @@ exports[`Ams Tagged Environments Small Matrix 1`] = `
 exports[`Ams Tagged Environments Split 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*} a&amp;=b \\begin{split} r&amp;=s\\\\ &amp; =t \\end{split} \\\\ c&amp;=d \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align*} a&amp;=b \\begin{split} r&amp;=s\\\\ &amp; =t \\end{split} \\\\ c&amp;=d \\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b{split}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2651,7 +2651,7 @@ exports[`Ams Tagged Environments Split 1`] = `
           <mo data-latex="=">=</mo>
           <mi data-latex="b">b</mi>
           <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="{split}">
-            <mtr>
+            <mtr data-latex="r&amp;=s">
               <mtd>
                 <mi data-latex="r">r</mi>
               </mtd>
@@ -2663,7 +2663,7 @@ exports[`Ams Tagged Environments Split 1`] = `
                 </mstyle>
               </mtd>
             </mtr>
-            <mtr>
+            <mtr data-latex="&amp;=t">
               <mtd></mtd>
               <mtd>
                 <mstyle indentshift="2em">
@@ -2677,7 +2677,7 @@ exports[`Ams Tagged Environments Split 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c&amp;=d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2697,7 +2697,7 @@ exports[`Ams Tagged Environments Subarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{subarray}{c}a\\end{subarray}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{subarray}{c}a\\end{subarray}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em">
-      <mtr data-latex="{c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -2710,12 +2710,12 @@ exports[`Ams Tagged Environments Subarray 1`] = `
 exports[`Ams Tagged Environments aligned [b] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{aligned} [b] a \\\\ b \\end{aligned}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" align="baseline -1" data-latex="\\begin{aligned} [b] a \\\\ b \\end{aligned}">
-    <mtr data-latex=" [b]">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex=" [b]">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -2727,7 +2727,7 @@ exports[`Ams Tagged Environments aligned [b] 1`] = `
 exports[`Ams Tagged Environments aligned [x] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{aligned} [x] a \\\\ b \\end{aligned}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="[x] a \\\\ b \\end{aligned}">
-    <mtr>
+    <mtr data-latex="[x]a">
       <mtd>
         <mo data-latex="[" stretchy="false">[</mo>
         <mi data-latex="x">x</mi>
@@ -2735,7 +2735,7 @@ exports[`Ams Tagged Environments aligned [x] 1`] = `
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -2747,7 +2747,7 @@ exports[`Ams Tagged Environments aligned [x] 1`] = `
 exports[`Ams Tagged Environments flalign 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{flalign} a&amp;b &amp; \\end{flalign}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="right left center right" columnspacing="0em" columnwidth="auto auto fit auto" rowspacing="3pt" data-break-align="bottom top middle bottom" data-width-includes-label="true" data-latex="\\begin{flalign} a&amp;b &amp; \\end{flalign}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;b&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2771,7 +2771,7 @@ exports[`Ams Tagged Environments flalign 1`] = `
 exports[`Ams Tagged Environments xalignet 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{1} a&amp;b \\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center" columnspacing="0em" columnwidth="fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{1} a&amp;b \\end{xalignat}">
-    <mlabeledtr data-latex="{1}">
+    <mlabeledtr data-latex="a&amp;b">
       <mtd id="mjx-eqn:1">
         <mpadded width="0" lspace="-1width">
           <mtext data-latex="\\text{(}">(</mtext>
@@ -2797,7 +2797,7 @@ exports[`Ams Tagged Environments xalignet 1`] = `
 exports[`Ams Tagged Environments xalignet star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat*}{1} a&amp;b \\end{xalignat*}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center" columnspacing="0em" columnwidth="fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat*}{1} a&amp;b \\end{xalignat*}">
-    <mtr data-latex="{1}">
+    <mtr data-latex="a&amp;b">
       <mtd></mtd>
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2816,7 +2816,7 @@ exports[`Ams Tagged Environments xalignet star 1`] = `
 exports[`Ams Tagged Environments xalignet star 2`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{flalign*} a&amp;b &amp; \\end{flalign*}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="right left center right" columnspacing="0em" columnwidth="auto auto fit auto" rowspacing="3pt" data-break-align="bottom top middle bottom" data-width-includes-label="true" data-latex="\\begin{flalign*} a&amp;b &amp; \\end{flalign*}">
-    <mtr>
+    <mtr data-latex="a&amp;b&amp;">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3231,12 +3231,12 @@ exports[`Ams symbols substack 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\substack{a\\\\b}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{subarray}{c}a\\\\b\\end{subarray}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em">
-      <mtr data-latex="{c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{c}">
+      <mtr data-latex="b">
         <mtd>
           <mi data-latex="b">b</mi>
         </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Amscd.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Amscd.test.ts.snap
index 47dc8e819..3594791d1 100644
--- a/testsuite/tests/input/tex/__snapshots__/Amscd.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Amscd.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`AmsCD AmsCD-1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -20,7 +20,7 @@ exports[`AmsCD AmsCD-1 1`] = `
         <mi data-latex="B">B</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;">
       <mtd>
         <mrow>
           <mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
@@ -60,7 +60,7 @@ exports[`AmsCD AmsCD-1 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;&amp;D">
       <mtd>
         <mi data-latex="C">C</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -84,7 +84,7 @@ exports[`AmsCD AmsCD-1 1`] = `
 exports[`AmsCD AmsCD-2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&lt;&lt;&lt; B @&gt;&gt;&gt; C\\\\@. @| @AAA\\\\@. D @= E\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&lt;&lt;&lt; B @&gt;&gt;&gt; C\\\\@. @| @AAA\\\\@. D @= E\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B&amp;&amp;C">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -112,7 +112,7 @@ exports[`AmsCD AmsCD-2 1`] = `
         <mi data-latex="C">C</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;&amp;&amp;">
       <mtd></mtd>
       <mtd></mtd>
       <mtd>
@@ -124,7 +124,7 @@ exports[`AmsCD AmsCD-2 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;D&amp;&amp;E">
       <mtd>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
       </mtd>
@@ -146,7 +146,7 @@ exports[`AmsCD AmsCD-2 1`] = `
 exports[`AmsCD AmsCD-3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&gt;a&gt;b&gt; B\\\\@VlVrV @AlArA\\\\C @&lt;a&lt;b&lt; D\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&gt;a&gt;b&gt; B\\\\@VlVrV @AlArA\\\\C @&lt;a&lt;b&lt; D\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -166,7 +166,7 @@ exports[`AmsCD AmsCD-3 1`] = `
         <mi data-latex="B">B</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;">
       <mtd>
         <mrow>
           <mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\llap{l}}}">
@@ -232,7 +232,7 @@ exports[`AmsCD AmsCD-3 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;&amp;D">
       <mtd>
         <mi data-latex="C">C</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -259,7 +259,7 @@ exports[`AmsCD AmsCD-3 1`] = `
 exports[`AmsCD AmsCD-4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&gt;&gt;&gt; B@&gt;\\text{very long label}&gt;&gt;C\\\\@VVV @VVV @VVV\\\\D @&gt;&gt;&gt; E@&gt;&gt;&gt; F\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&gt;&gt;&gt; B@&gt;\\text{very long label}&gt;&gt;C\\\\@VVV @VVV @VVV\\\\D @&gt;&gt;&gt; E@&gt;&gt;&gt; F\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B&amp;&amp;C">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -287,7 +287,7 @@ exports[`AmsCD AmsCD-4 1`] = `
         <mi data-latex="C">C</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;&amp;&amp;">
       <mtd>
         <mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
       </mtd>
@@ -301,7 +301,7 @@ exports[`AmsCD AmsCD-4 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="D&amp;&amp;E&amp;&amp;F">
       <mtd>
         <mi data-latex="D">D</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -336,7 +336,7 @@ exports[`AmsCD AmsCD-4 1`] = `
 exports[`AmsCD AmsCD-5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&gt;&gt;&gt; B @&gt;{\\text{very long label}}&gt;&gt; C \\\\@VVV @VVV @VVV \\\\D @&gt;&gt;&gt; E @&gt;{\\phantom{\\text{very long label}}}&gt;&gt; F\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&gt;&gt;&gt; B @&gt;{\\text{very long label}}&gt;&gt; C \\\\@VVV @VVV @VVV \\\\D @&gt;&gt;&gt; E @&gt;{\\phantom{\\text{very long label}}}&gt;&gt; F\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B&amp;&amp;C">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -366,7 +366,7 @@ exports[`AmsCD AmsCD-5 1`] = `
         <mi data-latex="C">C</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;&amp;&amp;">
       <mtd>
         <mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
       </mtd>
@@ -380,7 +380,7 @@ exports[`AmsCD AmsCD-5 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="D&amp;&amp;E&amp;&amp;F">
       <mtd>
         <mi data-latex="D">D</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -421,7 +421,7 @@ exports[`AmsCD AmsCD-5 1`] = `
 exports[`AmsCD AmsCD-6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&gt;&gt;&gt; B @&gt;{\\text{very long label}}&gt;&gt; C \\\\@VVV @VVV @VVV \\\\D @&gt;&gt;&gt; E @&gt;{\\rlap{\\scriptstyle{\\ \\ \\ \\text{shorter}}}\\phantom{\\text{very long label}}}&gt;&gt; F\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&gt;&gt;&gt; B @&gt;{\\text{very long label}}&gt;&gt; C \\\\@VVV @VVV @VVV \\\\D @&gt;&gt;&gt; E @&gt;{\\rlap{\\scriptstyle{\\ \\ \\ \\text{shorter}}}\\phantom{\\text{very long label}}}&gt;&gt; F\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B&amp;&amp;C">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -451,7 +451,7 @@ exports[`AmsCD AmsCD-6 1`] = `
         <mi data-latex="C">C</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;&amp;&amp;">
       <mtd>
         <mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
       </mtd>
@@ -465,7 +465,7 @@ exports[`AmsCD AmsCD-6 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="D&amp;&amp;E&amp;&amp;F">
       <mtd>
         <mi data-latex="D">D</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -516,7 +516,7 @@ exports[`AmsCD AmsCD-6 1`] = `
 exports[`AmsCD AmsCD-both 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\minCDarrowheight{4cm}\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\minCDarrowheight{4cm}\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -533,7 +533,7 @@ exports[`AmsCD AmsCD-both 1`] = `
         <mi data-latex="B">B</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;">
       <mtd>
         <mrow>
           <mo minsize="4cm" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
@@ -573,7 +573,7 @@ exports[`AmsCD AmsCD-both 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;&amp;D">
       <mtd>
         <mi data-latex="C">C</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -597,7 +597,7 @@ exports[`AmsCD AmsCD-both 1`] = `
 exports[`AmsCD AmsCD-height 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\minCDarrowheight{4cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\minCDarrowheight{4cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -614,7 +614,7 @@ exports[`AmsCD AmsCD-height 1`] = `
         <mi data-latex="B">B</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;">
       <mtd>
         <mrow>
           <mo minsize="4cm" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
@@ -654,7 +654,7 @@ exports[`AmsCD AmsCD-height 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;&amp;D">
       <mtd>
         <mi data-latex="C">C</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -678,7 +678,7 @@ exports[`AmsCD AmsCD-height 1`] = `
 exports[`AmsCD AmsCD-width 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -695,7 +695,7 @@ exports[`AmsCD AmsCD-width 1`] = `
         <mi data-latex="B">B</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;">
       <mtd>
         <mrow>
           <mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
@@ -735,7 +735,7 @@ exports[`AmsCD AmsCD-width 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;&amp;D">
       <mtd>
         <mi data-latex="C">C</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -759,7 +759,7 @@ exports[`AmsCD AmsCD-width 1`] = `
 exports[`AmsCD Entry with prime (#3373) 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A' @&gt;&gt;&gt; B\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A' @&gt;&gt;&gt; B\\end{CD}">
-    <mtr>
+    <mtr data-latex="&amp;&amp;B">
       <mtd>
         <msup>
           <mi data-latex="A">A</mi>
@@ -786,7 +786,7 @@ exports[`AmsCD Entry with prime (#3373) 1`] = `
 exports[`AmsCD Options Hide Horizontal Labels 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -805,7 +805,7 @@ exports[`AmsCD Options Hide Horizontal Labels 1`] = `
         <mi data-latex="B">B</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;&amp;">
       <mtd>
         <mrow>
           <mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
@@ -845,7 +845,7 @@ exports[`AmsCD Options Hide Horizontal Labels 1`] = `
       </mtd>
       <mtd></mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;&amp;D">
       <mtd>
         <mi data-latex="C">C</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -871,7 +871,7 @@ exports[`AmsCD Options Hide Horizontal Labels 1`] = `
 exports[`AmsCD Spaces 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @ &gt; x &gt; &gt; B \\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @ &gt; x &gt; &gt; B \\end{CD}">
-    <mtr>
+    <mtr data-latex="A&amp;&amp;B">
       <mtd>
         <mi data-latex="A">A</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
@@ -895,7 +895,7 @@ exports[`AmsCD Spaces 1`] = `
 exports[`AmsCD Suspicious Return 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @Ra&gt;&gt; BaD\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD}A @Ra&gt;&gt; BaD\\end{CD}">
-    <mtr>
+    <mtr data-latex="A@R a&gt;&gt;B a D">
       <mtd>
         <mi data-latex="A">A</mi>
         <mo data-latex="@">@</mo>
diff --git a/testsuite/tests/input/tex/__snapshots__/Autoload.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Autoload.test.ts.snap
index d0a71584f..fd4799027 100644
--- a/testsuite/tests/input/tex/__snapshots__/Autoload.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Autoload.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Autoload Autoload environment 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD} a @&gt;&gt;&gt; b\\end{CD}" display="block">
   <mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex="\\begin{CD} a @&gt;&gt;&gt; b\\end{CD}">
-    <mtr>
+    <mtr data-latex="a&amp;&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
         <mpadded height="8.5pt" depth="2pt"></mpadded>
diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index 23cf581c2..4d91b7da5 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -194,7 +194,7 @@ exports[`Accents widetilde 1`] = `
 exports[`Array Array Single 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}a\\end{array}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -206,7 +206,7 @@ exports[`Array Array Single 1`] = `
 exports[`Array Array aligned 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}[b]{c}a\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" align="baseline -1" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}[b]{c}a\\end{array}">
-    <mtr data-latex="[b]{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -218,7 +218,7 @@ exports[`Array Array aligned 1`] = `
 exports[`Array Array aligned invalid 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}[x]{c}a\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" align="x" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}[x]{c}a\\end{array}">
-    <mtr data-latex="[x]{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -230,7 +230,7 @@ exports[`Array Array aligned invalid 1`] = `
 exports[`Array Array dashed column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c:c}a&amp;c\\\\b&amp;d\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="dashed" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c:c}a&amp;c\\\\b&amp;d\\end{array}">
-    <mtr data-latex="{c:c}">
+    <mtr data-latex="a&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -238,7 +238,7 @@ exports[`Array Array dashed column 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c:c}">
+    <mtr data-latex="b&amp;d">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -253,12 +253,12 @@ exports[`Array Array dashed column 1`] = `
 exports[`Array Array dashed row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a\\\\\\hdashline b\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" rowlines="dashed" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}a\\\\\\hdashline b\\end{array}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c}">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -270,7 +270,7 @@ exports[`Array Array dashed row 1`] = `
 exports[`Array Array solid column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c|c}a&amp;c\\\\b&amp;d\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c|c}a&amp;c\\\\b&amp;d\\end{array}">
-    <mtr data-latex="{c|c}">
+    <mtr data-latex="a&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -278,7 +278,7 @@ exports[`Array Array solid column 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|c}">
+    <mtr data-latex="b&amp;d">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -293,12 +293,12 @@ exports[`Array Array solid column 1`] = `
 exports[`Array Array solid row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a\\\\\\hline b\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" rowlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}a\\\\\\hline b\\end{array}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c}">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -310,7 +310,7 @@ exports[`Array Array solid row 1`] = `
 exports[`Array Column+Rowlines Solid Dashed None 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c|c:cc}0&amp;a&amp;b&amp;c\\\\\\hline 1&amp;d&amp;e&amp;f\\\\\\hdashline 2&amp;g&amp;h&amp;i\\\\ 3&amp;j&amp;k&amp;l \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center center" columnlines="solid dashed none" rowlines="solid dashed none" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c|c:cc}0&amp;a&amp;b&amp;c\\\\\\hline 1&amp;d&amp;e&amp;f\\\\\\hdashline 2&amp;g&amp;h&amp;i\\\\ 3&amp;j&amp;k&amp;l \\end{array}">
-    <mtr data-latex="{c|c:cc}">
+    <mtr data-latex="0&amp;a&amp;b&amp;c">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -324,7 +324,7 @@ exports[`Array Column+Rowlines Solid Dashed None 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|c:cc}">
+    <mtr data-latex="1&amp;d&amp;e&amp;f">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -338,7 +338,7 @@ exports[`Array Column+Rowlines Solid Dashed None 1`] = `
         <mi data-latex="f">f</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|c:cc}">
+    <mtr data-latex="2&amp;g&amp;h&amp;i">
       <mtd>
         <mn data-latex="2">2</mn>
       </mtd>
@@ -352,7 +352,7 @@ exports[`Array Column+Rowlines Solid Dashed None 1`] = `
         <mi data-latex="i">i</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|c:cc}">
+    <mtr data-latex="3&amp;j&amp;k&amp;l">
       <mtd>
         <mn data-latex="3">3</mn>
       </mtd>
@@ -373,7 +373,7 @@ exports[`Array Column+Rowlines Solid Dashed None 1`] = `
 exports[`Array Column+Rowlines Solid None 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c|cc}a&amp;b&amp;c\\\\\\hline d&amp;e&amp;f\\\\ g&amp;h&amp;i \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnlines="solid none" rowlines="solid none" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c|cc}a&amp;b&amp;c\\\\\\hline d&amp;e&amp;f\\\\ g&amp;h&amp;i \\end{array}">
-    <mtr data-latex="{c|cc}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -384,7 +384,7 @@ exports[`Array Column+Rowlines Solid None 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|cc}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -395,7 +395,7 @@ exports[`Array Column+Rowlines Solid None 1`] = `
         <mi data-latex="f">f</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|cc}">
+    <mtr data-latex="g&amp;h&amp;i">
       <mtd>
         <mi data-latex="g">g</mi>
       </mtd>
@@ -413,7 +413,7 @@ exports[`Array Column+Rowlines Solid None 1`] = `
 exports[`Array Columnlines Solid None 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c|cc}a&amp;b&amp;c\\\\d&amp;e&amp;f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c|cc}a&amp;b&amp;c\\\\d&amp;e&amp;f\\end{array}">
-    <mtr data-latex="{c|cc}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -424,7 +424,7 @@ exports[`Array Columnlines Solid None 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c|cc}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -449,7 +449,7 @@ exports[`Array Enclosed bottom 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c} a\\\\\\hline\\end{array}" display="block">
   <menclose notation="bottom" data-padding="0" data-latex="\\begin{array}{c} a\\\\\\hline\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -463,7 +463,7 @@ exports[`Array Enclosed dashed column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c:c|}a&amp;c\\\\b&amp;d\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c:c|}a&amp;c\\\\b&amp;d\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="dashed" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c:c|}">
+      <mtr data-latex="a&amp;c">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -471,7 +471,7 @@ exports[`Array Enclosed dashed column 1`] = `
           <mi data-latex="c">c</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{|c:c|}">
+      <mtr data-latex="b&amp;d">
         <mtd>
           <mi data-latex="b">b</mi>
         </mtd>
@@ -488,12 +488,12 @@ exports[`Array Enclosed dashed row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}a\\\\\\hdashline b\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|}a\\\\\\hdashline b\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" rowlines="dashed" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c|}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{|c|}">
+      <mtr data-latex="b">
         <mtd>
           <mi data-latex="b">b</mi>
         </mtd>
@@ -506,7 +506,7 @@ exports[`Array Enclosed dashed row 1`] = `
 exports[`Array Enclosed frame dashed 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{:c:}\\hline a\\\\\\hline\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="solid dashed solid dashed" framespacing=".5em .125em" data-latex="\\begin{array}{:c:}\\hline a\\\\\\hline\\end{array}">
-    <mtr data-latex="{:c:}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -518,7 +518,7 @@ exports[`Array Enclosed frame dashed 1`] = `
 exports[`Array Enclosed frame solid 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}\\hline a\\\\\\hline\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" framespacing=".5em .125em" frame="solid" data-latex="\\begin{array}{|c|}\\hline a\\\\\\hline\\end{array}">
-    <mtr data-latex="{|c|}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -531,7 +531,7 @@ exports[`Array Enclosed left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c}a\\end{array}" display="block">
   <menclose notation="left" data-padding="0" data-latex="\\begin{array}{|c}a\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -545,7 +545,7 @@ exports[`Array Enclosed left right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}a\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|}a\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c|}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -559,7 +559,7 @@ exports[`Array Enclosed right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c|}a\\end{array}" display="block">
   <menclose notation="right" data-padding="0" data-latex="\\begin{array}{c|}a\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{c|}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -573,7 +573,7 @@ exports[`Array Enclosed solid column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|c|}a&amp;c\\\\b&amp;d\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|c|}a&amp;c\\\\b&amp;d\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c|c|}">
+      <mtr data-latex="a&amp;c">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -581,7 +581,7 @@ exports[`Array Enclosed solid column 1`] = `
           <mi data-latex="c">c</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{|c|c|}">
+      <mtr data-latex="b&amp;d">
         <mtd>
           <mi data-latex="b">b</mi>
         </mtd>
@@ -597,7 +597,7 @@ exports[`Array Enclosed solid column 1`] = `
 exports[`Array Enclosed solid dashed 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c:} a\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="none dashed none solid" framespacing=".5em .125em" data-latex="\\begin{array}{|c:} a\\end{array}">
-    <mtr data-latex="{|c:}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -610,12 +610,12 @@ exports[`Array Enclosed solid row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}a\\\\\\hline b\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|}a\\\\\\hline b\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" rowlines="solid" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c|}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{|c|}">
+      <mtr data-latex="b">
         <mtd>
           <mi data-latex="b">b</mi>
         </mtd>
@@ -629,7 +629,7 @@ exports[`Array Enclosed top 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}\\hline a\\end{array}" display="block">
   <menclose notation="top" data-padding="0" data-latex="\\begin{array}{c}\\hline a\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -643,7 +643,7 @@ exports[`Array Enclosed top bottom 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}\\hline a\\\\\\hline\\end{array}" display="block">
   <menclose notation="top bottom" data-padding="0" data-latex="\\begin{array}{c}\\hline a\\\\\\hline\\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{c}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -656,7 +656,7 @@ exports[`Array Enclosed top bottom 1`] = `
 exports[`Array Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\eqalignno{a &amp;  &amp; {\\hbox{(3)}}}" display="block">
   <mtable rowspacing=".5em" columnspacing="0.278em" displaystyle="true" columnalign="right left" data-latex="\\eqalignno{a &amp;  &amp; {\\hbox{(3)}}}">
-    <mlabeledtr data-latex="{">
+    <mlabeledtr data-latex="a&amp;&amp;{\\hbox{(3)}}">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="{\\hbox{(3)}}">
           <mstyle displaystyle="false" data-latex="\\hbox{(3)}">
@@ -678,7 +678,7 @@ exports[`Array Matrix Test 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left( \\begin{array}{ccc}a &amp; b &amp; c \\\\d &amp; e &amp; f \\\\g &amp; h &amp; i \\end{array} \\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{ccc}">
+      <mtr data-latex="a&amp;b&amp;c">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -689,7 +689,7 @@ exports[`Array Matrix Test 1`] = `
           <mi data-latex="c">c</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{ccc}">
+      <mtr data-latex="d&amp;e&amp;f">
         <mtd>
           <mi data-latex="d">d</mi>
         </mtd>
@@ -700,7 +700,7 @@ exports[`Array Matrix Test 1`] = `
           <mi data-latex="f">f</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{ccc}">
+      <mtr data-latex="g&amp;h&amp;i">
         <mtd>
           <mi data-latex="g">g</mi>
         </mtd>
@@ -720,7 +720,7 @@ exports[`Array Matrix Test 1`] = `
 exports[`Array Newcolumntype 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newcolumntype{a}{c}\\begin{array}{a|a}a&amp;b\\\\c&amp;d\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\newcolumntype{a}{c}\\begin{array}{a|a}a&amp;b\\\\c&amp;d\\end{array}">
-    <mtr data-latex="{a|a}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -728,7 +728,7 @@ exports[`Array Newcolumntype 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{a|a}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -743,7 +743,7 @@ exports[`Array Newcolumntype 1`] = `
 exports[`Array Newcolumntype Option 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newcolumntype{a}[1]{m{#1}}\\begin{array}{a{1em}|a{2em}}a&amp;b\\\\c&amp;d\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left" columnwidth="1em 2em" columnlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{d}\\end{array}">
-    <mtr>
+    <mtr data-latex="&amp;">
       <mtd>
         <mpadded data-mjx-vbox="middle" width="1em" data-overflow="auto" data-align="left" data-vertical-align="middle">
           <mtext data-latex="\\text{a}">a</mtext>
@@ -755,7 +755,7 @@ exports[`Array Newcolumntype Option 1`] = `
         </mpadded>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;">
       <mtd>
         <mpadded data-mjx-vbox="middle" width="1em" data-overflow="auto" data-align="left" data-vertical-align="middle">
           <mtext data-latex="\\text{c}">c</mtext>
@@ -774,7 +774,7 @@ exports[`Array Newcolumntype Option 1`] = `
 exports[`Array Rowlines Solid None 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{ccc}a&amp;b&amp;c\\\\\\hline d&amp;e&amp;f\\\\ g&amp;h&amp;i \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" rowlines="solid none" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{ccc}a&amp;b&amp;c\\\\\\hline d&amp;e&amp;f\\\\ g&amp;h&amp;i \\end{array}">
-    <mtr data-latex="{ccc}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -785,7 +785,7 @@ exports[`Array Rowlines Solid None 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{ccc}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -796,7 +796,7 @@ exports[`Array Rowlines Solid None 1`] = `
         <mi data-latex="f">f</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{ccc}">
+    <mtr data-latex="g&amp;h&amp;i">
       <mtd>
         <mi data-latex="g">g</mi>
       </mtd>
@@ -1525,7 +1525,7 @@ exports[`Boxes Vtop Hsize 1`] = `
 exports[`BreakAlign BreakAlign Case c 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}\\breakAlign{c}{t}a&amp;=&amp;b\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}\\breakAlign{c}{t}a&amp;=&amp;b\\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd data-vertical-align="top">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1546,7 +1546,7 @@ exports[`BreakAlign BreakAlign Case c 1`] = `
 exports[`BreakAlign BreakAlign Case c second cell 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}a&amp;\\breakAlign{c}{t}=&amp;b\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}a&amp;\\breakAlign{c}{t}=&amp;b\\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1567,7 +1567,7 @@ exports[`BreakAlign BreakAlign Case c second cell 1`] = `
 exports[`BreakAlign BreakAlign Case r 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}\\breakAlign{r}{t}a&amp;=&amp;b\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}\\breakAlign{r}{t}a&amp;=&amp;b\\end{eqnarray}">
-    <mtr data-break-align="top">
+    <mtr data-break-align="top" data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1588,7 +1588,7 @@ exports[`BreakAlign BreakAlign Case r 1`] = `
 exports[`BreakAlign BreakAlign Case r multi split 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}\\breakAlign{r}{tbmc}a&amp;=&amp;b\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}\\breakAlign{r}{tbmc}a&amp;=&amp;b\\end{eqnarray}">
-    <mtr data-break-align="top bottom middle center">
+    <mtr data-break-align="top bottom middle center" data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1609,7 +1609,7 @@ exports[`BreakAlign BreakAlign Case r multi split 1`] = `
 exports[`BreakAlign BreakAlign Case r second row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}\\breakAlign{r}{t}a&amp;=&amp;b\\\\\\breakAlign{r}{t}c&amp;=&amp;d\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}\\breakAlign{r}{t}a&amp;=&amp;b\\\\\\breakAlign{r}{t}c&amp;=&amp;d\\end{eqnarray}">
-    <mtr data-break-align="top">
+    <mtr data-break-align="top" data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1623,7 +1623,7 @@ exports[`BreakAlign BreakAlign Case r second row 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-break-align="top">
+    <mtr data-break-align="top" data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1644,7 +1644,7 @@ exports[`BreakAlign BreakAlign Case r second row 1`] = `
 exports[`BreakAlign BreakAlign Case t 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}\\breakAlign{t}{t}a&amp;=&amp;b\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-latex="\\begin{eqnarray}\\breakAlign{t}{t}a&amp;=&amp;b\\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1804,7 +1804,7 @@ exports[`Character Class Changes mathpunct 1`] = `
 exports[`Complete Array column ! | @ 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{!{a}|@{b}c} X\\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-array-padding=".5em .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="b&amp;X\\end{array}">
-    <mtr>
+    <mtr data-latex="a\\hspace{.25em}&amp;b&amp;X">
       <mtd>
         <mi data-latex="a">a</mi>
         <mspace width=".25em" data-latex="\\hspace{.25em}"></mspace>
@@ -1823,7 +1823,7 @@ exports[`Complete Array column ! | @ 1`] = `
 exports[`Complete Array column > > c < < 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{a}&gt;{b}c&lt;{x}&lt;{y}} X \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="baXyx\\end{array}">
-    <mtr>
+    <mtr data-latex="b a X y x">
       <mtd>
         <mi data-latex="b">b</mi>
         <mi data-latex="a">a</mi>
@@ -1839,7 +1839,7 @@ exports[`Complete Array column > > c < < 1`] = `
 exports[`Complete Array column > space 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt; {x} c} X \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="xX\\end{array}">
-    <mtr>
+    <mtr data-latex="x X">
       <mtd>
         <mi data-latex="x">x</mi>
         <mi data-latex="X">X</mi>
@@ -1852,7 +1852,7 @@ exports[`Complete Array column > space 1`] = `
 exports[`Complete Array column @ | ! c 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{@{}|!{x}c} X \\end{array}" display="block">
   <mtable columnspacing="0 .5em" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-array-padding="0 .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.25em}x&amp;X\\end{array}">
-    <mtr>
+    <mtr data-latex="&amp;\\hspace{.25em}x&amp;X">
       <mtd></mtd>
       <mtd>
         <mspace width=".25em" data-latex="\\hspace{.25em}"></mspace>
@@ -1869,7 +1869,7 @@ exports[`Complete Array column @ | ! c 1`] = `
 exports[`Complete Array column @ p m 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{@{x}p{1em}m{1em}} X &amp; Y \\end{array}" display="block">
   <mtable columnspacing="0 1em" rowspacing="4pt" columnalign="center left left" columnwidth="auto 1em 1em" data-array-padding="0 .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{Y}\\end{array}">
-    <mtr>
+    <mtr data-latex="x&amp;&amp;">
       <mtd>
         <mi data-latex="x">x</mi>
       </mtd>
@@ -1891,7 +1891,7 @@ exports[`Complete Array column @ p m 1`] = `
 exports[`Complete Array column {{c}} 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{{{c}}} X \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{{{c}}} X \\end{array}">
-    <mtr data-latex="{{{c}}}">
+    <mtr data-latex="X">
       <mtd>
         <mi data-latex="X">X</mi>
       </mtd>
@@ -1903,7 +1903,7 @@ exports[`Complete Array column {{c}} 1`] = `
 exports[`Complete Array column {c} 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c{c}} X Y \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c{c}} X Y \\end{array}">
-    <mtr data-latex="{c{c}}">
+    <mtr data-latex="X Y">
       <mtd>
         <mi data-latex="X">X</mi>
         <mi data-latex="Y">Y</mi>
@@ -1916,7 +1916,7 @@ exports[`Complete Array column {c} 1`] = `
 exports[`Complete Array column {cc} 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{{cc}} X Y \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{{cc}} X Y \\end{array}">
-    <mtr data-latex="{{cc}}">
+    <mtr data-latex="X Y">
       <mtd>
         <mi data-latex="X">X</mi>
         <mi data-latex="Y">Y</mi>
@@ -1929,7 +1929,7 @@ exports[`Complete Array column {cc} 1`] = `
 exports[`Complete Array column {r}c{l} 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{{r}c{l}} X &amp; Y &amp; Z \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{{r}c{l}} X &amp; Y &amp; Z \\end{array}">
-    <mtr data-latex="{{r}c{l}}">
+    <mtr data-latex="X&amp;Y&amp;Z">
       <mtd>
         <mi data-latex="X">X</mi>
       </mtd>
@@ -1947,7 +1947,7 @@ exports[`Complete Array column {r}c{l} 1`] = `
 exports[`Complete Array column b  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{b{1cm}b{1cm}b{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{f}\\end{array}">
-    <mtr>
+    <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="bottom" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="bottom">
           <mtext data-latex="\\text{a}">a</mtext>
@@ -1964,7 +1964,7 @@ exports[`Complete Array column b  1`] = `
         </mpadded>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="bottom" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="bottom">
           <mtext data-latex="\\text{d}">d</mtext>
@@ -1988,13 +1988,13 @@ exports[`Complete Array column b  1`] = `
 exports[`Complete Array column c < 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&lt;{A}}a\\\\ d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="dA\\end{array}">
-    <mtr>
+    <mtr data-latex="a A">
       <mtd>
         <mi data-latex="a">a</mi>
         <mi data-latex="A">A</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d A">
       <mtd>
         <mi data-latex="d">d</mi>
         <mi data-latex="A">A</mi>
@@ -2007,13 +2007,13 @@ exports[`Complete Array column c < 1`] = `
 exports[`Complete Array column c > 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{A}c}a \\\\ d\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="Ad\\end{array}">
-    <mtr>
+    <mtr data-latex="A a">
       <mtd>
         <mi data-latex="A">A</mi>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="A d">
       <mtd>
         <mi data-latex="A">A</mi>
         <mi data-latex="d">d</mi>
@@ -2026,7 +2026,7 @@ exports[`Complete Array column c > 1`] = `
 exports[`Complete Array column c @ end 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c@{h}}a\\\\ d \\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center" data-array-padding=".5em 0" data-frame-styles="" framespacing=".5em .125em" data-latex="h\\end{array}">
-    <mtr>
+    <mtr data-latex="a&amp;h">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2034,7 +2034,7 @@ exports[`Complete Array column c @ end 1`] = `
         <mi data-latex="h">h</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d&amp;h">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2049,7 +2049,7 @@ exports[`Complete Array column c @ end 1`] = `
 exports[`Complete Array column c @& 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c@{\\alpha}c}a&amp;\\hfill&amp;b\\\\ d&amp;\\hfill&amp;e \\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hfill\\alpha&amp;&amp;e \\end{array}">
-    <mtr>
+    <mtr data-latex="a&amp;\\alpha&amp;&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2061,7 +2061,7 @@ exports[`Complete Array column c @& 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d&amp;\\alpha&amp;&amp;e">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2080,7 +2080,7 @@ exports[`Complete Array column c @& 1`] = `
 exports[`Complete Array column c @& hfil 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c@{\\alpha}c}a&amp;&amp;b\\\\ d&amp;&amp;e\\hfil \\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\alpha&amp;&amp;e\\hfil \\end{array}">
-    <mtr>
+    <mtr data-latex="a&amp;\\alpha&amp;&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2092,7 +2092,7 @@ exports[`Complete Array column c @& hfil 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d&amp;\\alpha&amp;&amp;\\hfil">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2111,7 +2111,7 @@ exports[`Complete Array column c @& hfil 1`] = `
 exports[`Complete Array column c W 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cW{c}{1cm}c}a&amp;b&amp;c\\\\ d&amp;e&amp;f \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnwidth="auto 1cm auto" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{e}&amp;f \\end{array}">
-    <mtr data-latex="{cW{c}{1cm}c}">
+    <mtr data-latex="a&amp;&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2124,7 +2124,7 @@ exports[`Complete Array column c W 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cW{c}{1cm}c}">
+    <mtr data-latex="d&amp;&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2144,7 +2144,7 @@ exports[`Complete Array column c W 1`] = `
 exports[`Complete Array column c c @ 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc@{x}} X &amp; Y \\end{array}" display="block">
   <mtable columnspacing="1em 0 0" rowspacing="4pt" columnalign="center center center" data-array-padding=".5em 0" data-frame-styles="" framespacing=".5em .125em" data-latex="x\\end{array}">
-    <mtr data-latex="{cc@{x}}">
+    <mtr data-latex="X&amp;Y&amp;x">
       <mtd>
         <mi data-latex="X">X</mi>
       </mtd>
@@ -2162,7 +2162,7 @@ exports[`Complete Array column c c @ 1`] = `
 exports[`Complete Array column c c | c 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc|c} X &amp; Y &amp; Z \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnlines="none solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc|c} X &amp; Y &amp; Z \\end{array}">
-    <mtr data-latex="{cc|c}">
+    <mtr data-latex="X&amp;Y&amp;Z">
       <mtd>
         <mi data-latex="X">X</mi>
       </mtd>
@@ -2180,7 +2180,7 @@ exports[`Complete Array column c c | c 1`] = `
 exports[`Complete Array column c w 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cw{c}{1cm}c}a&amp;b&amp;c\\\\ d&amp;e&amp;f \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnwidth="auto 1cm auto" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{e}&amp;f \\end{array}">
-    <mtr data-latex="{cw{c}{1cm}c}">
+    <mtr data-latex="a&amp;&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2193,7 +2193,7 @@ exports[`Complete Array column c w 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cw{c}{1cm}c}">
+    <mtr data-latex="d&amp;&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2213,7 +2213,7 @@ exports[`Complete Array column c w 1`] = `
 exports[`Complete Array column m  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{m{1cm}m{1cm}m{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{f}\\end{array}">
-    <mtr>
+    <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="middle" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="middle">
           <mtext data-latex="\\text{a}">a</mtext>
@@ -2230,7 +2230,7 @@ exports[`Complete Array column m  1`] = `
         </mpadded>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="middle" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="middle">
           <mtext data-latex="\\text{d}">d</mtext>
@@ -2256,8 +2256,7 @@ exports[`Complete Array column newline 1`] = `
 c} X &amp; Y\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c
 c} X &amp; Y\\end{array}">
-    <mtr data-latex="{c
-c}">
+    <mtr data-latex="X&amp;Y">
       <mtd>
         <mi data-latex="X">X</mi>
       </mtd>
@@ -2272,7 +2271,7 @@ c}">
 exports[`Complete Array column p  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{p{1cm}p{1cm}p{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{f}\\end{array}">
-    <mtr>
+    <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="top" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="top">
           <mtext data-latex="\\text{a}">a</mtext>
@@ -2289,7 +2288,7 @@ exports[`Complete Array column p  1`] = `
         </mpadded>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="top" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="top">
           <mtext data-latex="\\text{d}">d</mtext>
@@ -2313,7 +2312,7 @@ exports[`Complete Array column p  1`] = `
 exports[`Complete Array column r c l !  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r!{h}c!{h}l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing=".5em .5em .5em .5em" rowspacing="4pt" columnalign="right center center center left" data-frame-styles="" framespacing=".5em .125em" data-latex="h&amp;f\\end{array}">
-    <mtr>
+    <mtr data-latex="a&amp;h&amp;b&amp;h&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2330,7 +2329,7 @@ exports[`Complete Array column r c l !  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d&amp;h&amp;e&amp;h&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2354,7 +2353,7 @@ exports[`Complete Array column r c l !  1`] = `
 exports[`Complete Array column r c l :  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r:c:l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" columnlines="dashed dashed" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r:c:l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
-    <mtr data-latex="{r:c:l}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2365,7 +2364,7 @@ exports[`Complete Array column r c l :  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{r:c:l}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2383,7 +2382,7 @@ exports[`Complete Array column r c l :  1`] = `
 exports[`Complete Array column r c l < 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r&lt;{A}cl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="dA&amp; e &amp; f\\end{array}">
-    <mtr>
+    <mtr data-latex="a A&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mi data-latex="A">A</mi>
@@ -2395,7 +2394,7 @@ exports[`Complete Array column r c l < 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d A&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
         <mi data-latex="A">A</mi>
@@ -2414,7 +2413,7 @@ exports[`Complete Array column r c l < 1`] = `
 exports[`Complete Array column r c l > 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{A}rcl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="Ad&amp; e &amp; f\\end{array}">
-    <mtr>
+    <mtr data-latex="A a&amp;b&amp;c">
       <mtd>
         <mi data-latex="A">A</mi>
         <mi data-latex="a">a</mi>
@@ -2426,7 +2425,7 @@ exports[`Complete Array column r c l > 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="A d&amp;e&amp;f">
       <mtd>
         <mi data-latex="A">A</mi>
         <mi data-latex="d">d</mi>
@@ -2445,7 +2444,7 @@ exports[`Complete Array column r c l > 1`] = `
 exports[`Complete Array column r c l @  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r@{h}c@{h}l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="0 0 0 0" rowspacing="4pt" columnalign="right center center center left" data-frame-styles="" framespacing=".5em .125em" data-latex="h&amp;f\\end{array}">
-    <mtr>
+    <mtr data-latex="a&amp;h&amp;b&amp;h&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2462,7 +2461,7 @@ exports[`Complete Array column r c l @  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d&amp;h&amp;e&amp;h&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2486,7 +2485,7 @@ exports[`Complete Array column r c l @  1`] = `
 exports[`Complete Array column r c l |  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r|c|l}a &amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r|c|l}a &amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
-    <mtr data-latex="{r|c|l}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2497,7 +2496,7 @@ exports[`Complete Array column r c l |  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{r|c|l}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2515,7 +2514,7 @@ exports[`Complete Array column r c l |  1`] = `
 exports[`Complete Array column r c l 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{rcl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{rcl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2526,7 +2525,7 @@ exports[`Complete Array column r c l 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2544,7 +2543,7 @@ exports[`Complete Array column r c l 1`] = `
 exports[`Complete Array column r c repeat |  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
-    <mtr>
+    <mtr data-latex="a\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mspace width=".5em" data-latex="\\hspace{.5em}"></mspace>
@@ -2560,7 +2559,7 @@ exports[`Complete Array column r c repeat |  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
         <mspace width=".5em" data-latex="\\hspace{.5em}"></mspace>
@@ -2583,7 +2582,7 @@ exports[`Complete Array column r c repeat |  1`] = `
 exports[`Complete Array column r c repeat | {} 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a {\\hbox{(3)}}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
-    <mtr>
+    <mtr data-latex="a{\\hbox{(3)}}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mrow data-mjx-texclass="ORD" data-latex="{\\hbox{(3)}}">
@@ -2602,7 +2601,7 @@ exports[`Complete Array column r c repeat | {} 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
         <mspace width=".5em" data-latex="\\hspace{.5em}"></mspace>
@@ -2625,12 +2624,12 @@ exports[`Complete Array column r c repeat | {} 1`] = `
 exports[`Complete Array column r c repeat | {} 2`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a {\\begin{array}{c}Q\\end{array}}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
-    <mtr>
+    <mtr data-latex="a{{array}}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mrow data-mjx-texclass="ORD" data-latex="{{array}}">
           <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-            <mtr data-latex="{c}">
+            <mtr data-latex="Q">
               <mtd>
                 <mi data-latex="Q">Q</mi>
               </mtd>
@@ -2650,7 +2649,7 @@ exports[`Complete Array column r c repeat | {} 2`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
         <mspace width=".5em" data-latex="\\hspace{.5em}"></mspace>
@@ -2673,11 +2672,11 @@ exports[`Complete Array column r c repeat | {} 2`] = `
 exports[`Complete Array column r c repeat | {} 3`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a \\begin{array}{c}Q\\end{array}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
-    <mtr>
+    <mtr data-latex="a{array}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-          <mtr data-latex="{c}">
+          <mtr data-latex="Q">
             <mtd>
               <mi data-latex="Q">Q</mi>
             </mtd>
@@ -2696,7 +2695,7 @@ exports[`Complete Array column r c repeat | {} 3`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
         <mspace width=".5em" data-latex="\\hspace{.5em}"></mspace>
@@ -2719,7 +2718,7 @@ exports[`Complete Array column r c repeat | {} 3`] = `
 exports[`Complete Array column r repeat c  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}c}a &amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r*{2}c}a &amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
-    <mtr data-latex="{r*{2}c}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2730,7 +2729,7 @@ exports[`Complete Array column r repeat c  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{r*{2}c}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2748,7 +2747,7 @@ exports[`Complete Array column r repeat c  1`] = `
 exports[`Complete Array column repeat r c  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{*{2}rc}a &amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right right center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{*{2}rc}a &amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
-    <mtr data-latex="{*{2}rc}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2759,7 +2758,7 @@ exports[`Complete Array column repeat r c  1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{*{2}rc}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2777,12 +2776,12 @@ exports[`Complete Array column repeat r c  1`] = `
 exports[`Complete Array end row hline c 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}\\hline a\\\\\\hline b\\\\\\hline\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" rowlines="solid" framespacing=".5em .125em" frame="solid" data-latex="\\begin{array}{|c|}\\hline a\\\\\\hline b\\\\\\hline\\end{array}">
-    <mtr data-latex="{|c|}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{|c|}">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -2794,7 +2793,7 @@ exports[`Complete Array end row hline c 1`] = `
 exports[`Complete Array end row spacing r c l 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{rcl}a &amp; b &amp;c\\\\[2cm] d &amp; e &amp; f\\\\[2cm] \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="6.069em 6.069em" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{rcl}a &amp; b &amp;c\\\\[2cm] d &amp; e &amp; f\\\\[2cm] \\end{array}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2805,7 +2804,7 @@ exports[`Complete Array end row spacing r c l 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="d&amp;e&amp;f">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2823,7 +2822,7 @@ exports[`Complete Array end row spacing r c l 1`] = `
 exports[`Complete Array eqnarray extend last row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}{rcl}a &amp; b \\\\d&amp;c&amp;c&amp;c \\\\\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left right" columnspacing="0em 0.278em 0em" rowspacing="3pt" data-break-align="bottom middle top bottom" data-latex="\\begin{eqnarray}{rcl}a &amp; b \\\\d&amp;c&amp;c&amp;c \\\\\\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="{r c l}a&amp;b">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="{r c l}">
           <mi data-latex="r">r</mi>
@@ -2836,7 +2835,7 @@ exports[`Complete Array eqnarray extend last row 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="d&amp;c&amp;c&amp;c">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -3333,7 +3332,7 @@ exports[`Dots vdots 1`] = `
 exports[`Environments Array Center 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}a\\end{array}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3345,12 +3344,12 @@ exports[`Environments Array Center 1`] = `
 exports[`Environments Array Center Lines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a\\\\b\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}a\\\\b\\end{array}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c}">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -3362,7 +3361,7 @@ exports[`Environments Array Center Lines 1`] = `
 exports[`Environments Array RCL 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{rcl}a&amp;=&amp;b\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{rcl}a&amp;=&amp;b\\end{array}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3380,7 +3379,7 @@ exports[`Environments Array RCL 1`] = `
 exports[`Environments Array RCL Lines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{rcl}a&amp;=&amp;b\\\\c&amp;=&amp;d\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{rcl}a&amp;=&amp;b\\\\c&amp;=&amp;d\\end{array}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3391,7 +3390,7 @@ exports[`Environments Array RCL Lines 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3409,7 +3408,7 @@ exports[`Environments Array RCL Lines 1`] = `
 exports[`Environments Display Array Center 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{darray}{c}a\\end{darray}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" displaystyle="true" data-latex="\\begin{darray}{c}a\\end{darray}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3421,12 +3420,12 @@ exports[`Environments Display Array Center 1`] = `
 exports[`Environments Display Array Center Lines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{darray}{c}a\\\\b\\end{darray}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" displaystyle="true" data-latex="\\begin{darray}{c}a\\\\b\\end{darray}">
-    <mtr data-latex="{c}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c}">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -3438,7 +3437,7 @@ exports[`Environments Display Array Center Lines 1`] = `
 exports[`Environments Display Array RCL 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{darray}{rcl}a&amp;=&amp;b\\end{darray}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" displaystyle="true" data-latex="\\begin{darray}{rcl}a&amp;=&amp;b\\end{darray}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3456,7 +3455,7 @@ exports[`Environments Display Array RCL 1`] = `
 exports[`Environments Display Array RCL Lines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{darray}{rcl}a&amp;=&amp;b\\\\c&amp;=&amp;d\\end{darray}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" displaystyle="true" data-latex="\\begin{darray}{rcl}a&amp;=&amp;b\\\\c&amp;=&amp;d\\end{darray}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3467,7 +3466,7 @@ exports[`Environments Display Array RCL Lines 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="c&amp;=&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3491,7 +3490,7 @@ exports[`Environments Displaymath 1`] = `
 exports[`Environments Eqnarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}a&amp;=&amp;b\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray}a&amp;=&amp;b\\end{eqnarray}">
-    <mtr>
+    <mtr data-latex="a&amp;=&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3544,7 +3543,7 @@ exports[`Environments IndentAlign Single 1`] = `
 exports[`Environments Nested array 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{rcl}a&amp;{}{b}&amp;c\\begin{array}{cc}f&amp;h\\\\g\\end{array}\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{rcl}a&amp;{}{b}&amp;c\\begin{array}{cc}f&amp;h\\\\g\\end{array}\\end{array}">
-    <mtr data-latex="{rcl}">
+    <mtr data-latex="a&amp;{}{b}&amp;c{array}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -3557,7 +3556,7 @@ exports[`Environments Nested array 1`] = `
       <mtd>
         <mi data-latex="c">c</mi>
         <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-          <mtr data-latex="{cc}">
+          <mtr data-latex="f&amp;h">
             <mtd>
               <mi data-latex="f">f</mi>
             </mtd>
@@ -3565,7 +3564,7 @@ exports[`Environments Nested array 1`] = `
               <mi data-latex="h">h</mi>
             </mtd>
           </mtr>
-          <mtr data-latex="{cc}">
+          <mtr data-latex="g">
             <mtd>
               <mi data-latex="g">g</mi>
             </mtd>
@@ -4498,12 +4497,12 @@ exports[`InternalMath Unicode text 1`] = `
 exports[`Linebreaks Array Custom Linebreak 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\array{a\\\\[1cm] b}" display="block">
   <mtable rowspacing="3.235em 0.4em" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\array{a\\\\[1cm] b}">
-    <mtr data-latex="{">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -4515,12 +4514,12 @@ exports[`Linebreaks Array Custom Linebreak 1`] = `
 exports[`Linebreaks Cr Linebreak 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\array{a\\cr b}" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\array{a\\cr b}">
-    <mtr data-latex="{">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -5823,12 +5822,12 @@ exports[`Mathchoice Pmod 1`] = `
 exports[`Matrix Displaylines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\displaylines{a\\\\ b}" display="block">
   <mtable rowspacing=".5em" columnspacing="1em" displaystyle="true" data-latex="\\displaylines{a\\\\ b}">
-    <mtr data-latex="{">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{">
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -5840,7 +5839,7 @@ exports[`Matrix Displaylines 1`] = `
 exports[`Matrix Matrix Arg 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrix a" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="a}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -5852,7 +5851,7 @@ exports[`Matrix Matrix Arg 1`] = `
 exports[`Matrix Matrix Braces 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrix{a}" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\matrix{a}">
-    <mtr data-latex="{">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -5866,7 +5865,7 @@ exports[`Matrix Matrix Cases 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\cases{a}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left left" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -5882,7 +5881,7 @@ exports[`Matrix Matrix Cases 2`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\cases{a}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left left" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -5898,7 +5897,7 @@ exports[`Matrix Matrix Cases text 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\cases{a &amp; \\text{b}}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left left" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a&amp;\\text{b}">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -5917,7 +5916,7 @@ exports[`Matrix Matrix Cases two columns 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\cases{a &amp; b}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left left" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -5936,7 +5935,7 @@ exports[`Matrix Matrix Cases two columns braces 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\cases{a &amp; {b}}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left left" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a&amp;{b}">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -5955,7 +5954,7 @@ exports[`Matrix Matrix Cases two rows 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\cases{a &amp; b\\\\ c &amp; d}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left left" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -5963,7 +5962,7 @@ exports[`Matrix Matrix Cases two rows 1`] = `
           <mtext data-latex="b">b</mtext>
         </mtd>
       </mtr>
-      <mtr data-latex="{">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -5980,7 +5979,7 @@ exports[`Matrix Matrix Cases two rows 1`] = `
 exports[`Matrix Matrix Columns 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\array{a&amp;b}" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\array{a&amp;b}">
-    <mtr data-latex="{">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -5997,7 +5996,7 @@ exports[`Matrix Matrix Font Entry 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\pmatrix{\\bf a&amp;b}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi mathvariant="bold" data-latex="a">a</mi>
         </mtd>
@@ -6014,7 +6013,7 @@ exports[`Matrix Matrix Font Entry 1`] = `
 exports[`Matrix Matrix Not Numbered 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\eqalign{a&amp;b&amp;c}" display="block">
   <mtable rowspacing=".5em" columnspacing="0.278em" displaystyle="true" columnalign="right left" data-latex="\\eqalign{a&amp;b&amp;c}">
-    <mtr data-latex="{">
+    <mtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -6032,7 +6031,7 @@ exports[`Matrix Matrix Not Numbered 1`] = `
 exports[`Matrix Matrix Numbered 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\eqalignno{a&amp;b&amp;c}" display="block">
   <mtable rowspacing=".5em" columnspacing="0.278em" displaystyle="true" columnalign="right left" data-latex="\\eqalignno{a&amp;b&amp;c}">
-    <mlabeledtr data-latex="{">
+    <mlabeledtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -6050,7 +6049,7 @@ exports[`Matrix Matrix Numbered 1`] = `
 exports[`Matrix Matrix Numbered Left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\leqalignno{a&amp;b&amp;c}" display="block">
   <mtable rowspacing=".5em" columnspacing="0.278em" side="left" displaystyle="true" columnalign="right left" data-latex="\\leqalignno{a&amp;b&amp;c}">
-    <mlabeledtr data-latex="{">
+    <mlabeledtr data-latex="a&amp;b&amp;c">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -6070,7 +6069,7 @@ exports[`Matrix Matrix Parens 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\pmatrix{a&amp;b}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -6092,7 +6091,7 @@ exports[`Matrix Matrix Parens Subscript 1`] = `
       <mrow data-mjx-texclass="INNER" data-latex="{}">
         <mo data-mjx-texclass="OPEN">(</mo>
         <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em">
-          <mtr data-latex="{">
+          <mtr data-latex="a&amp;b">
             <mtd>
               <mi data-latex="a">a</mi>
             </mtd>
@@ -6111,7 +6110,7 @@ exports[`Matrix Matrix Parens Subscript 1`] = `
 exports[`Matrix Matrix Rows 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\array{a&amp;b\\\\ c&amp;d}" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\array{a&amp;b\\\\ c&amp;d}">
-    <mtr data-latex="{">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -6119,7 +6118,7 @@ exports[`Matrix Matrix Rows 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -6137,7 +6136,7 @@ exports[`Matrix Matrix Subscript 1`] = `
     <mi data-latex="X">X</mi>
     <mrow data-mjx-texclass="ORD" data-latex="{{}}">
       <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="{}">
-        <mtr data-latex="{">
+        <mtr data-latex="a&amp;b">
           <mtd>
             <mi data-latex="a">a</mi>
           </mtd>
@@ -7608,7 +7607,7 @@ exports[`Referencing Label Empty 1`] = `
 exports[`Referencing Label Multiple 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}a\\label{A}\\\\c\\label{B}\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{eqnarray}a\\label{A}\\\\c\\label{B}\\end{eqnarray}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -7618,7 +7617,7 @@ exports[`Referencing Label Multiple 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -7635,7 +7634,7 @@ exports[`Referencing Label Multiple 1`] = `
 exports[`Referencing Nonumber 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}a\\\\c\\nonumber\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{eqnarray}a\\\\c\\nonumber\\end{eqnarray}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -7645,7 +7644,7 @@ exports[`Referencing Nonumber 1`] = `
         <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr>
+    <mtr data-latex="\\nonumber">
       <mtd>
         <mi data-latex="\\nonumber">c</mi>
       </mtd>
@@ -7831,7 +7830,7 @@ exports[`Setting sizes tiny 1`] = `
 exports[`Spaces Hfil 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc}a&amp;\\hfil b\\\\d&amp;ccc\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc}a&amp;\\hfil b\\\\d&amp;ccc\\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -7839,7 +7838,7 @@ exports[`Spaces Hfil 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="d&amp;c c c">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -7856,7 +7855,7 @@ exports[`Spaces Hfil 1`] = `
 exports[`Spaces Hfil Centering 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{l} \\hfil x\\hfil \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{l} \\hfil x\\hfil \\end{array}">
-    <mtr data-latex="{l}">
+    <mtr data-latex="\\hfil">
       <mtd columnalign="center">
         <mi data-latex="\\hfil">x</mi>
       </mtd>
@@ -7868,7 +7867,7 @@ exports[`Spaces Hfil Centering 1`] = `
 exports[`Spaces Hfill 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc}a&amp;\\hfill b\\\\d&amp;ccc\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc}a&amp;\\hfill b\\\\d&amp;ccc\\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -7876,7 +7875,7 @@ exports[`Spaces Hfill 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="d&amp;c c c">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -7893,7 +7892,7 @@ exports[`Spaces Hfill 1`] = `
 exports[`Spaces Hfilll 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc}a&amp;\\hfilll b\\\\d&amp;ccc\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc}a&amp;\\hfilll b\\\\d&amp;ccc\\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -7901,7 +7900,7 @@ exports[`Spaces Hfilll 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="d&amp;c c c">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -9027,7 +9026,7 @@ exports[`Sub and Superscripts SubSup 1`] = `
 exports[`Tagged Environments EqnTest 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="1em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -9068,7 +9067,7 @@ exports[`User Defined Environments Cases star 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{mmtool} a &amp; test a\\\\ b &amp; test b \\end{mmtool}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left">
-      <mtr>
+      <mtr data-latex="a&amp;test a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9076,7 +9075,7 @@ exports[`User Defined Environments Cases star 1`] = `
           <mtext data-latex="test a">test a</mtext>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="b&amp;test b">
         <mtd>
           <mi data-latex="b">b</mi>
         </mtd>
@@ -9094,7 +9093,7 @@ exports[`User Defined Environments Crampedsubarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{crampedsubarray}{cc} a &amp; b \\\\ c &amp; d \\end{crampedsubarray}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{crampedsubarray}{cc} a &amp; b \\\\ c &amp; d \\end{crampedsubarray}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" columnalign="center center" data-cramped="true">
-      <mtr data-latex="{cc}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9102,7 +9101,7 @@ exports[`User Defined Environments Crampedsubarray 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{cc}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -9118,7 +9117,7 @@ exports[`User Defined Environments Crampedsubarray 1`] = `
 exports[`User Defined Environments EqnTest 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="1em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}">
-    <mtr>
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -9135,7 +9134,7 @@ exports[`User Defined Environments EqnTest 1`] = `
 exports[`User Defined Environments Gather 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather}a\\end{gather}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="\\begin{gather}a\\end{gather}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -9157,7 +9156,7 @@ exports[`User Defined Environments pmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9165,7 +9164,7 @@ exports[`User Defined Environments pmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -9183,7 +9182,7 @@ exports[`User Defined Environments smallmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}">
     <mtable data-mjx-smallmatrix="true" columnspacing="1" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9191,7 +9190,7 @@ exports[`User Defined Environments smallmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap
index f62320187..f6514ec86 100644
--- a/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Cases Numcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{numcases}">
-    <mlabeledtr data-latex="{f(x)=}">
+    <mlabeledtr data-latex="1&amp;&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -22,7 +22,7 @@ exports[`Cases Numcases 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="{f(x)=}">
+                  <mlabeledtr data-latex="1&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -48,7 +48,7 @@ exports[`Cases Numcases 1`] = `
                       <mstyle indentshift="2em"></mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="{f(x)=}">
+                  <mlabeledtr data-latex="0&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -73,7 +73,7 @@ exports[`Cases Numcases 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="{f(x)=}">
+                <mlabeledtr data-latex="1&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -124,7 +124,7 @@ exports[`Cases Numcases 1`] = `
         <mstyle indentshift="2em"></mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="{f(x)=}">
+    <mlabeledtr data-latex="0&amp;&amp;">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -150,7 +150,7 @@ exports[`Cases Numcases 1`] = `
 exports[`Cases Numcases with macro 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{A=} 1 &amp; if {x\\\\y}\\$ \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{A=} 1 &amp; if {x\\\\y}\\$ \\end{numcases}">
-    <mlabeledtr data-latex="{A=}">
+    <mlabeledtr data-latex="1&amp;&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -166,7 +166,7 @@ exports[`Cases Numcases with macro 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="{A=}">
+                  <mlabeledtr data-latex="1&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -191,7 +191,7 @@ exports[`Cases Numcases with macro 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="{A=}">
+                <mlabeledtr data-latex="1&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -233,7 +233,7 @@ exports[`Cases Numcases with macro 1`] = `
 exports[`Cases entry not in numcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} x &amp; y \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} x &amp; y \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="x&amp;y">
       <mtd>
         <mi data-latex="x">x</mi>
       </mtd>
@@ -248,7 +248,7 @@ exports[`Cases entry not in numcases 1`] = `
 exports[`Cases numcases with explicit tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{A=} x\\tag{A} &amp; y \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{A=} x\\tag{A} &amp; y \\end{numcases}">
-    <mlabeledtr data-latex="{A=}">
+    <mlabeledtr data-latex="\\tag{A}&amp;&amp;">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -264,7 +264,7 @@ exports[`Cases numcases with explicit tag 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="{A=}">
+                  <mlabeledtr data-latex="\\tag{A}&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{A}">A</mtext>
@@ -289,7 +289,7 @@ exports[`Cases numcases with explicit tag 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="{A=}">
+                <mlabeledtr data-latex="\\tag{A}&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{A}">A</mtext>
@@ -331,7 +331,7 @@ exports[`Cases numcases with explicit tag 1`] = `
 exports[`Cases subnumcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{subnumcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{subnumcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{subnumcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{subnumcases}">
-    <mlabeledtr data-latex="{f(x)=}">
+    <mlabeledtr data-latex="1&amp;&amp;">
       <mtd id="mjx-eqn:1a">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1a}">1a</mtext>
@@ -350,7 +350,7 @@ exports[`Cases subnumcases 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="{f(x)=}">
+                  <mlabeledtr data-latex="1&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1a}">1a</mtext>
@@ -376,7 +376,7 @@ exports[`Cases subnumcases 1`] = `
                       <mstyle indentshift="2em"></mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="{f(x)=}">
+                  <mlabeledtr data-latex="0&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1b}">1b</mtext>
@@ -401,7 +401,7 @@ exports[`Cases subnumcases 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="{f(x)=}">
+                <mlabeledtr data-latex="1&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1a}">1a</mtext>
@@ -452,7 +452,7 @@ exports[`Cases subnumcases 1`] = `
         <mstyle indentshift="2em"></mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="{f(x)=}">
+    <mlabeledtr data-latex="0&amp;&amp;">
       <mtd id="mjx-eqn:1b">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1b}">1b</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
index ea5e43856..e006254e7 100644
--- a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Colortbl cellcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\cellcolor{red} b \\\\ \\cellcolor{yellow} c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\cellcolor{red} b \\\\ \\cellcolor{yellow} c &amp; d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -11,7 +11,7 @@ exports[`Colortbl cellcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -28,7 +28,7 @@ exports[`Colortbl cellcolor in pmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\pmatrix{ \\cellcolor{red} a }">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="{">
+      <mtr data-latex="a">
         <mtd mathbackground="red">
           <mi data-latex="a">a</mi>
         </mtd>
@@ -42,7 +42,7 @@ exports[`Colortbl cellcolor in pmatrix 1`] = `
 exports[`Colortbl cellcolor in preamble 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&gt;{\\cellcolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\cellcolor{yellow}d\\end{array}">
-    <mtr data-latex="{c&gt;{\\cellcolor{yellow}}c}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -50,7 +50,7 @@ exports[`Colortbl cellcolor in preamble 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c&gt;{\\cellcolor{yellow}}c}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -65,7 +65,7 @@ exports[`Colortbl cellcolor in preamble 1`] = `
 exports[`Colortbl cellcolor late 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; b \\cellcolor{red} \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; b \\cellcolor{red} \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;\\cellcolor{red}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -80,7 +80,7 @@ exports[`Colortbl cellcolor late 1`] = `
 exports[`Colortbl cellcolor with color model 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }">
-    <mtr data-latex="{">
+    <mtr data-latex="a">
       <mtd mathbackground="#ff0000">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -92,7 +92,7 @@ exports[`Colortbl cellcolor with color model 1`] = `
 exports[`Colortbl cellcolor with columncolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ c &amp; \\cellcolor{yellow} d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ c &amp; \\cellcolor{yellow} d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -100,7 +100,7 @@ exports[`Colortbl cellcolor with columncolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -115,7 +115,7 @@ exports[`Colortbl cellcolor with columncolor 1`] = `
 exports[`Colortbl cellcolor with columncolor and rowcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; \\cellcolor{green} d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; \\cellcolor{green} d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -123,7 +123,7 @@ exports[`Colortbl cellcolor with columncolor and rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -139,7 +139,7 @@ exports[`Colortbl cellcolor with frame 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="{|c|}">
+      <mtr data-latex="a">
         <mtd mathbackground="red">
           <mi data-latex="a">a</mi>
         </mtd>
@@ -152,7 +152,7 @@ exports[`Colortbl cellcolor with frame 1`] = `
 exports[`Colortbl cellcolor with rowcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; b \\\\ \\rowcolor{red} c &amp; \\cellcolor{yellow} d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; b \\\\ \\rowcolor{red} c &amp; \\cellcolor{yellow} d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -160,7 +160,7 @@ exports[`Colortbl cellcolor with rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd mathbackground="red">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -175,7 +175,7 @@ exports[`Colortbl cellcolor with rowcolor 1`] = `
 exports[`Colortbl color with no frame 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }">
-    <mtr data-latex="{">
+    <mtr data-latex="a">
       <mtd mathbackground="#ff0000">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -187,7 +187,7 @@ exports[`Colortbl color with no frame 1`] = `
 exports[`Colortbl columncolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{yellow} b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{yellow} b \\\\ c &amp; d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -195,7 +195,7 @@ exports[`Colortbl columncolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -210,7 +210,7 @@ exports[`Colortbl columncolor 1`] = `
 exports[`Colortbl columncolor and rowcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -218,7 +218,7 @@ exports[`Colortbl columncolor and rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -233,7 +233,7 @@ exports[`Colortbl columncolor and rowcolor 1`] = `
 exports[`Colortbl columncolor ignore overlap 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red}[ignore][ignore] b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red}[ignore][ignore] b \\\\ c &amp; d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -241,7 +241,7 @@ exports[`Colortbl columncolor ignore overlap 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -256,7 +256,7 @@ exports[`Colortbl columncolor ignore overlap 1`] = `
 exports[`Colortbl columncolor in preamble 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&gt;{\\columncolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\columncolor{yellow}d\\end{array}">
-    <mtr data-latex="{c&gt;{\\columncolor{yellow}}c}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -264,7 +264,7 @@ exports[`Colortbl columncolor in preamble 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{c&gt;{\\columncolor{yellow}}c}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -279,7 +279,7 @@ exports[`Colortbl columncolor in preamble 1`] = `
 exports[`Colortbl rowcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; b \\\\ \\rowcolor{yellow} c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; b \\\\ \\rowcolor{yellow} c &amp; d \\end{array}">
-    <mtr data-latex="{cc}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -287,7 +287,7 @@ exports[`Colortbl rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{cc}">
+    <mtr data-latex="c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap
index d3a200fc1..dd632401a 100644
--- a/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap
@@ -225,7 +225,7 @@ exports[`Empheq Characters empheqrvert 1`] = `
 exports[`Empheq Empheq Left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}[left=L\\Rightarrow]{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right right left" columnspacing="0em 0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -239,7 +239,7 @@ exports[`Empheq Empheq Left 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top">
-                  <mlabeledtr>
+                  <mlabeledtr data-latex="a&amp;=b">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -256,7 +256,7 @@ exports[`Empheq Empheq Left 1`] = `
                       </mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr>
+                  <mlabeledtr data-latex="c&amp;=d">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -280,7 +280,7 @@ exports[`Empheq Empheq Left 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" align="baseline 1">
-                <mlabeledtr>
+                <mlabeledtr data-latex="a&amp;=b">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -313,7 +313,7 @@ exports[`Empheq Empheq Left 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -338,7 +338,7 @@ exports[`Empheq Empheq Left 1`] = `
 exports[`Empheq Empheq Right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}[right=\\Leftarrow R]{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right left left" columnspacing="0em 0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -362,7 +362,7 @@ exports[`Empheq Empheq Right 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top">
-                  <mlabeledtr>
+                  <mlabeledtr data-latex="a&amp;=b">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -379,7 +379,7 @@ exports[`Empheq Empheq Right 1`] = `
                       </mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr>
+                  <mlabeledtr data-latex="c&amp;=d">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -403,7 +403,7 @@ exports[`Empheq Empheq Right 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" align="baseline 1">
-                <mlabeledtr>
+                <mlabeledtr data-latex="a&amp;=b">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -426,7 +426,7 @@ exports[`Empheq Empheq Right 1`] = `
         </mpadded>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -450,7 +450,7 @@ exports[`Empheq Empheq Right 1`] = `
 exports[`Empheq Numcases  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}[right=x]{align} a \\\\ b&amp;=c \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right left left" columnspacing="0em 0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a \\\\ b&amp;=c \\end{empheq}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -467,7 +467,7 @@ exports[`Empheq Numcases  1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top">
-                  <mlabeledtr>
+                  <mlabeledtr data-latex="a">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -477,7 +477,7 @@ exports[`Empheq Numcases  1`] = `
                       <mi data-latex="a">a</mi>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr>
+                  <mlabeledtr data-latex="b&amp;=c">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -501,7 +501,7 @@ exports[`Empheq Numcases  1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" align="baseline 1">
-                <mlabeledtr>
+                <mlabeledtr data-latex="a">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -517,7 +517,7 @@ exports[`Empheq Numcases  1`] = `
         </mpadded>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="b&amp;=c">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -541,7 +541,7 @@ exports[`Empheq Numcases  1`] = `
 exports[`Empheq Numcases alignedat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}{alignat=2} a &amp; b &amp; c &amp; d \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right left right left" columnspacing="0em 0em 0em" rowspacing="3pt" data-break-align="bottom top bottom top" data-latex="\\begin{alignat}{2} a &amp; b &amp; c &amp; d \\end{empheq}">
-    <mlabeledtr data-latex="{2}">
+    <mlabeledtr data-latex="a&amp;b&amp;c&amp;d">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -623,7 +623,7 @@ exports[`Empheq Numcases empty right 1`] = `
 exports[`Empheq Numcases with label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{A=\\label{test}} a&amp;=b \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{A=\\label{test}} a&amp;=b \\end{numcases}">
-    <mlabeledtr data-latex="{A=\\label{test}}">
+    <mlabeledtr data-latex="a&amp;&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -639,7 +639,7 @@ exports[`Empheq Numcases with label 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="{A=\\label{test}}">
+                  <mlabeledtr data-latex="a&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -664,7 +664,7 @@ exports[`Empheq Numcases with label 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="{A=\\label{test}}">
+                <mlabeledtr data-latex="a&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
index a2d6de709..a844809e3 100644
--- a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Mathtools Boxed Equations Aboxed 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*}\\Aboxed{ a &amp; = b} \\\\ &amp; = c \\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\rlap{\\boxed{a{}= b}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em \\\\ &amp; = c \\end{align*}">
-    <mtr>
+    <mtr data-latex="\\rlap{\\boxed{a{}= b}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="\\rlap{\\boxed{a{}= b}}">
           <mpadded width="0">
@@ -39,7 +39,7 @@ exports[`Mathtools Boxed Equations Aboxed 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;=c">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -56,7 +56,7 @@ exports[`Mathtools Boxed Equations Aboxed 1`] = `
 exports[`Mathtools Boxed Equations Aboxed odd column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{aligned} &amp; \\Aboxed{ a &amp; = b} \\end{aligned}" display="block">
   <mtable displaystyle="true" columnalign="right left right left" columnspacing="0em 2em 0em" rowspacing="3pt" data-break-align="bottom top bottom top" data-latex="\\rlap{\\boxed{a{}= b}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em \\end{aligned}">
-    <mtr data-latex=" ">
+    <mtr data-latex="&amp;\\rlap{\\boxed{a{}= b}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em"></mstyle>
@@ -103,7 +103,7 @@ exports[`Mathtools Boxed Equations Aboxed odd column 1`] = `
 exports[`Mathtools Boxed Equations MakeAboxedCommand 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\MakeAboxedCommand\\Afbox\\fbox \\begin{align}\\Afbox{a &amp;= b}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\rlap{\\fbox{$\\displaystyle{a{}= b}$}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em\\end{align}">
-    <mtr>
+    <mtr data-latex="\\rlap{\\fbox{$\\displaystyle{a{}= b}$}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="\\rlap{\\fbox{$\\displaystyle{a{}= b}$}}">
           <mpadded width="0">
@@ -146,7 +146,7 @@ exports[`Mathtools Boxed Equations MakeAboxedCommand 1`] = `
 exports[`Mathtools Boxed Equations MakeAboxedCommand star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\def\\mybox#1{\\bbox[yellow, 5px, border:2px solid]{#1}}\\MakeAboxedCommand*\\Afbox\\mybox \\begin{align}\\Afbox{a &amp;= b}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\rlap{\\mybox{a{}= b}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em\\end{align}">
-    <mtr>
+    <mtr data-latex="\\rlap{\\mybox{a{}= b}}\\kern.267em\\phantom{a}&amp;\\phantom{{}= b}\\kern.267em">
       <mtd>
         <mrow data-mjx-texclass="ORD" data-latex="\\rlap{\\mybox{a{}= b}}">
           <mpadded width="0">
@@ -529,7 +529,7 @@ exports[`Mathtools Matrix Environments Bmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex=" ">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -538,7 +538,7 @@ exports[`Mathtools Matrix Environments Bmatrix* 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex=" ">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -558,7 +558,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex="[c]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -567,7 +567,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[c] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[c]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -587,7 +587,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
-      <mtr data-latex="[l]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -596,7 +596,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[l] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[l]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -616,7 +616,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
-      <mtr data-latex="[r]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -625,7 +625,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[r] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[r]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -645,7 +645,7 @@ exports[`Mathtools Matrix Environments Vmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex=" ">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -654,7 +654,7 @@ exports[`Mathtools Matrix Environments Vmatrix* 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex=" ">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -674,7 +674,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex="[c]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -683,7 +683,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[c] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[c]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -703,7 +703,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
-      <mtr data-latex="[l]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -712,7 +712,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[l] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[l]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -732,7 +732,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
-      <mtr data-latex="[r]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -741,7 +741,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[r] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[r]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -761,7 +761,7 @@ exports[`Mathtools Matrix Environments bmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex=" ">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -770,7 +770,7 @@ exports[`Mathtools Matrix Environments bmatrix* 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex=" ">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -790,7 +790,7 @@ exports[`Mathtools Matrix Environments bmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex="[c]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -799,7 +799,7 @@ exports[`Mathtools Matrix Environments bmatrix*[c] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[c]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -819,7 +819,7 @@ exports[`Mathtools Matrix Environments bmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
-      <mtr data-latex="[l]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -828,7 +828,7 @@ exports[`Mathtools Matrix Environments bmatrix*[l] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[l]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -848,7 +848,7 @@ exports[`Mathtools Matrix Environments bmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
-      <mtr data-latex="[r]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -857,7 +857,7 @@ exports[`Mathtools Matrix Environments bmatrix*[r] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[r]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -875,7 +875,7 @@ exports[`Mathtools Matrix Environments bmatrix*[r] 1`] = `
 exports[`Mathtools Matrix Environments matrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{matrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{matrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}">
-    <mtr data-latex=" ">
+    <mtr data-latex="-1&amp;3">
       <mtd>
         <mo data-latex="-">&#x2212;</mo>
         <mn data-latex="1">1</mn>
@@ -884,7 +884,7 @@ exports[`Mathtools Matrix Environments matrix* 1`] = `
         <mn data-latex="3">3</mn>
       </mtd>
     </mtr>
-    <mtr data-latex=" ">
+    <mtr data-latex="2&amp;-4">
       <mtd>
         <mn data-latex="2">2</mn>
       </mtd>
@@ -900,7 +900,7 @@ exports[`Mathtools Matrix Environments matrix* 1`] = `
 exports[`Mathtools Matrix Environments matrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{matrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{matrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}">
-    <mtr data-latex="[c]">
+    <mtr data-latex="-1&amp;3">
       <mtd>
         <mo data-latex="-">&#x2212;</mo>
         <mn data-latex="1">1</mn>
@@ -909,7 +909,7 @@ exports[`Mathtools Matrix Environments matrix*[c] 1`] = `
         <mn data-latex="3">3</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="[c]">
+    <mtr data-latex="2&amp;-4">
       <mtd>
         <mn data-latex="2">2</mn>
       </mtd>
@@ -925,7 +925,7 @@ exports[`Mathtools Matrix Environments matrix*[c] 1`] = `
 exports[`Mathtools Matrix Environments matrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{matrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-latex="\\begin{matrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}">
-    <mtr data-latex="[l]">
+    <mtr data-latex="-1&amp;3">
       <mtd>
         <mo data-latex="-">&#x2212;</mo>
         <mn data-latex="1">1</mn>
@@ -934,7 +934,7 @@ exports[`Mathtools Matrix Environments matrix*[l] 1`] = `
         <mn data-latex="3">3</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="[l]">
+    <mtr data-latex="2&amp;-4">
       <mtd>
         <mn data-latex="2">2</mn>
       </mtd>
@@ -950,7 +950,7 @@ exports[`Mathtools Matrix Environments matrix*[l] 1`] = `
 exports[`Mathtools Matrix Environments matrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{matrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right" data-latex="\\begin{matrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{matrix*}">
-    <mtr data-latex="[r]">
+    <mtr data-latex="-1&amp;3">
       <mtd>
         <mo data-latex="-">&#x2212;</mo>
         <mn data-latex="1">1</mn>
@@ -959,7 +959,7 @@ exports[`Mathtools Matrix Environments matrix*[r] 1`] = `
         <mn data-latex="3">3</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="[r]">
+    <mtr data-latex="2&amp;-4">
       <mtd>
         <mn data-latex="2">2</mn>
       </mtd>
@@ -977,7 +977,7 @@ exports[`Mathtools Matrix Environments pmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex=" ">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -986,7 +986,7 @@ exports[`Mathtools Matrix Environments pmatrix* 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex=" ">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1006,7 +1006,7 @@ exports[`Mathtools Matrix Environments pmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex="[c]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1015,7 +1015,7 @@ exports[`Mathtools Matrix Environments pmatrix*[c] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[c]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1035,7 +1035,7 @@ exports[`Mathtools Matrix Environments pmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
-      <mtr data-latex="[l]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1044,7 +1044,7 @@ exports[`Mathtools Matrix Environments pmatrix*[l] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[l]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1064,7 +1064,7 @@ exports[`Mathtools Matrix Environments pmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
-      <mtr data-latex="[r]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1073,7 +1073,7 @@ exports[`Mathtools Matrix Environments pmatrix*[r] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[r]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1093,7 +1093,7 @@ exports[`Mathtools Matrix Environments vmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex=" ">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1102,7 +1102,7 @@ exports[`Mathtools Matrix Environments vmatrix* 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex=" ">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1122,7 +1122,7 @@ exports[`Mathtools Matrix Environments vmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt">
-      <mtr data-latex="[c]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1131,7 +1131,7 @@ exports[`Mathtools Matrix Environments vmatrix*[c] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[c]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1151,7 +1151,7 @@ exports[`Mathtools Matrix Environments vmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
-      <mtr data-latex="[l]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1160,7 +1160,7 @@ exports[`Mathtools Matrix Environments vmatrix*[l] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[l]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1180,7 +1180,7 @@ exports[`Mathtools Matrix Environments vmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
-      <mtr data-latex="[r]">
+      <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1189,7 +1189,7 @@ exports[`Mathtools Matrix Environments vmatrix*[r] 1`] = `
           <mn data-latex="3">3</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="[r]">
+      <mtr data-latex="2&amp;-4">
         <mtd>
           <mn data-latex="2">2</mn>
         </mtd>
@@ -1207,7 +1207,7 @@ exports[`Mathtools Matrix Environments vmatrix*[r] 1`] = `
 exports[`Mathtools More Environments ArrowBetweenLines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat*}{2}&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[3cm]{} \\\\\\ArrowBetweenLines&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[2cm]{}\\end{alignat*}" display="block">
   <mtable displaystyle="true" columnalign="right left right left" columnspacing="0em 0em 0em" rowspacing="3pt" data-break-align="bottom top bottom top" data-latex="\\begin{alignat*}{2}&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[3cm]{} \\\\\\ArrowBetweenLines&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[2cm]{}\\end{alignat*}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="&amp;&amp;\\framebox[1.5cm]{}&amp;=\\framebox[3cm]{}">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em"></mstyle>
@@ -1231,13 +1231,13 @@ exports[`Mathtools More Environments ArrowBetweenLines 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="\\Updownarrow\\quad">
       <mtd>
         <mo stretchy="false" data-latex="\\Updownarrow">&#x21D5;</mo>
         <mspace width="1em" data-latex="\\quad"></mspace>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="&amp;&amp;\\framebox[1.5cm]{}&amp;=\\framebox[2cm]{}">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em"></mstyle>
@@ -1268,7 +1268,7 @@ exports[`Mathtools More Environments ArrowBetweenLines 1`] = `
 exports[`Mathtools More Environments ArrowBetweenLines* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat*}{2}&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[3cm]{} &amp;&amp;\\\\\\ArrowBetweenLines*[\\Downarrow]&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[2cm]{} &amp;&amp;\\end{alignat*}" display="block">
   <mtable displaystyle="true" columnalign="right left right left right left" columnspacing="0em 0em 0em 0em 0em" rowspacing="3pt" data-break-align="bottom top bottom top bottom top" data-latex="\\begin{alignat*}{2}&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[3cm]{} &amp;&amp;\\\\\\ArrowBetweenLines*[\\Downarrow]&amp;&amp; \\framebox[1.5cm]{} &amp;= \\framebox[2cm]{} &amp;&amp;\\end{alignat*}">
-    <mtr data-latex="{2}">
+    <mtr data-latex="&amp;&amp;\\framebox[1.5cm]{}&amp;=\\framebox[3cm]{}&amp;&amp;">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em"></mstyle>
@@ -1296,7 +1296,7 @@ exports[`Mathtools More Environments ArrowBetweenLines* 1`] = `
         <mstyle indentshift="2em"></mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="&amp;&amp;\\quad\\Downarrow">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em"></mstyle>
@@ -1306,7 +1306,7 @@ exports[`Mathtools More Environments ArrowBetweenLines* 1`] = `
         <mo stretchy="false" data-latex="\\Downarrow">&#x21D3;</mo>
       </mtd>
     </mtr>
-    <mtr data-latex="{2}">
+    <mtr data-latex="&amp;&amp;\\framebox[1.5cm]{}&amp;=\\framebox[2cm]{}&amp;&amp;">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em"></mstyle>
@@ -1341,7 +1341,7 @@ exports[`Mathtools More Environments ArrowBetweenLines* 1`] = `
 exports[`Mathtools More Environments MoveEqLeft 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*}\\MoveEqLeft \\framebox[10cm][c]{Long first line} \\\\  &amp; = \\framebox[6cm][c]{ \\vphantom{g} 2nd line} \\\\  &amp; \\leq \\dots\\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\hspace{2em}&amp;\\hspace{-2em}\\framebox[10cm][c]{Long first line} \\\\  &amp; = \\framebox[6cm][c]{ \\vphantom{g} 2nd line} \\\\  &amp; \\leq \\dots\\end{align*}">
-    <mtr>
+    <mtr data-latex="\\hspace{2em}&amp;\\hspace{-2em}\\framebox[10cm][c]{Long first line}">
       <mtd>
         <mspace width="2em" data-latex="\\hspace{2em}"></mspace>
       </mtd>
@@ -1358,7 +1358,7 @@ exports[`Mathtools More Environments MoveEqLeft 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;=\\framebox[6cm][c]{ \\vphantom{g} 2nd line}">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -1374,7 +1374,7 @@ exports[`Mathtools More Environments MoveEqLeft 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;\\leq">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -1391,14 +1391,14 @@ exports[`Mathtools More Environments MoveEqLeft 1`] = `
 exports[`Mathtools More Environments Spreadlines 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{spreadlines}{20pt}\\begin{gather}a=b\\\\c=d\\end{gather}\\end{spreadlines}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="2.3em" data-break-align="middle" data-latex="\\begin{spreadlines}{20pt}\\begin{gather}a=b\\\\c=d\\end{gather}\\end{spreadlines}">
-    <mtr>
+    <mtr data-latex="a=b">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c=d">
       <mtd>
         <mi data-latex="c">c</mi>
         <mo data-latex="=">=</mo>
@@ -1412,14 +1412,14 @@ exports[`Mathtools More Environments Spreadlines 1`] = `
 exports[`Mathtools More Environments Spreadlines multiple environments 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{spreadlines}{20pt}\\begin{gather}a=b\\\\c=d\\end{gather}\\\\\\begin{gather}x=y\\\\z\\end{gather}\\end{spreadlines}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="2.3em" data-break-align="middle" data-latex="{gather}">
-    <mtr>
+    <mtr data-latex="a=b">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c=d">
       <mtd>
         <mi data-latex="c">c</mi>
         <mo data-latex="=">=</mo>
@@ -1429,14 +1429,14 @@ exports[`Mathtools More Environments Spreadlines multiple environments 1`] = `
   </mtable>
   <mspace linebreak="newline" data-latex="\\\\"></mspace>
   <mtable displaystyle="true" columnspacing="1em" rowspacing="2.3em" data-break-align="middle" data-latex="{gather}">
-    <mtr>
+    <mtr data-latex="x=y">
       <mtd>
         <mi data-latex="x">x</mi>
         <mo data-latex="=">=</mo>
         <mi data-latex="y">y</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="z">
       <mtd>
         <mi data-latex="z">z</mi>
       </mtd>
@@ -1458,7 +1458,7 @@ exports[`Mathtools More Environments cases* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{cases*} 1 &amp; if $x&gt;0$ \\\\ -1 &amp; otherwise \\end{cases*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left">
-      <mtr>
+      <mtr data-latex="1&amp;if $x&gt;0$">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1473,7 +1473,7 @@ exports[`Mathtools More Environments cases* 1`] = `
           </mstyle>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;otherwise">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1493,7 +1493,7 @@ exports[`Mathtools More Environments dcases 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{dcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{dcases}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" displaystyle="true">
-      <mtr>
+      <mtr data-latex="1&amp;x&gt;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1503,7 +1503,7 @@ exports[`Mathtools More Environments dcases 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;x\\le0">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1525,7 +1525,7 @@ exports[`Mathtools More Environments dcases* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{dcases*} 1 &amp; if $x&gt;0$ \\\\ -1 &amp; otherwise \\end{dcases*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left" displaystyle="true">
-      <mtr>
+      <mtr data-latex="1&amp;if $x&gt;0$">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1540,7 +1540,7 @@ exports[`Mathtools More Environments dcases* 1`] = `
           </mstyle>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;otherwise">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1562,7 +1562,7 @@ exports[`Mathtools More Environments drcases 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{drcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{drcases}">
     <mo data-mjx-texclass="OPEN" fence="true" stretchy="true" symmetric="true"></mo>
     <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" displaystyle="true">
-      <mtr>
+      <mtr data-latex="1&amp;x&gt;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1572,7 +1572,7 @@ exports[`Mathtools More Environments drcases 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;x\\le0">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1594,7 +1594,7 @@ exports[`Mathtools More Environments drcases* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{drcases*} 1 &amp; if $x&gt;0$ \\\\ -1 &amp; otherwise \\end{drcases*}">
     <mo data-mjx-texclass="OPEN" fence="true" stretchy="true" symmetric="true"></mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left" displaystyle="true">
-      <mtr>
+      <mtr data-latex="1&amp;if $x&gt;0$">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1609,7 +1609,7 @@ exports[`Mathtools More Environments drcases* 1`] = `
           </mstyle>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;otherwise">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1629,7 +1629,7 @@ exports[`Mathtools More Environments drcases* 1`] = `
 exports[`Mathtools More Environments lgathered 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{lgathered} a+b+c \\\\ d \\end{lgathered}" display="block">
   <mtable displaystyle="true" columnalign="left" columnspacing="1em" rowspacing="3pt" data-latex="\\begin{lgathered} a+b+c \\\\ d \\end{lgathered}">
-    <mtr data-latex=" ">
+    <mtr data-latex="a+b+c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="+">+</mo>
@@ -1638,7 +1638,7 @@ exports[`Mathtools More Environments lgathered 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex=" ">
+    <mtr data-latex="d">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -1940,7 +1940,7 @@ exports[`Mathtools More Environments rcases 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{rcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{rcases}">
     <mo data-mjx-texclass="OPEN" fence="true" stretchy="true" symmetric="true"></mo>
     <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left">
-      <mtr>
+      <mtr data-latex="1&amp;x&gt;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1950,7 +1950,7 @@ exports[`Mathtools More Environments rcases 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;x\\le0">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -1972,7 +1972,7 @@ exports[`Mathtools More Environments rcases* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{rcases*} 1 &amp; if $x&gt;0$ \\\\ -1 &amp; otherwise \\end{rcases*}">
     <mo data-mjx-texclass="OPEN" fence="true" stretchy="true" symmetric="true"></mo>
     <mtable rowspacing=".2em" columnspacing="1em" columnalign="left">
-      <mtr>
+      <mtr data-latex="1&amp;if $x&gt;0$">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1987,7 +1987,7 @@ exports[`Mathtools More Environments rcases* 1`] = `
           </mstyle>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="-1&amp;otherwise">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mn data-latex="1">1</mn>
@@ -2005,7 +2005,7 @@ exports[`Mathtools More Environments rcases* 1`] = `
 exports[`Mathtools More Environments rgathered 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{rgathered} a+b+c \\\\ d \\end{rgathered}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="1em" rowspacing="3pt" data-latex="\\begin{rgathered} a+b+c \\\\ d \\end{rgathered}">
-    <mtr data-latex=" ">
+    <mtr data-latex="a+b+c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="+">+</mo>
@@ -2014,7 +2014,7 @@ exports[`Mathtools More Environments rgathered 1`] = `
         <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
-    <mtr data-latex=" ">
+    <mtr data-latex="d">
       <mtd>
         <mi data-latex="d">d</mi>
       </mtd>
@@ -2026,7 +2026,7 @@ exports[`Mathtools More Environments rgathered 1`] = `
 exports[`Mathtools More Environments smallvdotswithin star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{aligned}A&amp;+ B \\\\&amp;\\shortvdotswithin*{+}C &amp;+ D\\end{aligned}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="0.1em 0.1em 0.30000000000000004em" data-break-align="bottom top" data-latex="\\begin{aligned}A&amp;+ B \\\\&amp;\\shortvdotswithin*{+}C &amp;+ D\\end{aligned}">
-    <mtr>
+    <mtr data-latex="A&amp;+B">
       <mtd>
         <mi data-latex="A">A</mi>
       </mtd>
@@ -2038,7 +2038,7 @@ exports[`Mathtools More Environments smallvdotswithin star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2055,7 +2055,7 @@ exports[`Mathtools More Environments smallvdotswithin star 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="C&amp;+D">
       <mtd>
         <mi data-latex="C">C</mi>
       </mtd>
@@ -2074,7 +2074,7 @@ exports[`Mathtools More Environments smallvdotswithin star 1`] = `
 exports[`Mathtools More Environments vdotswithin smallvdotswithin 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align*}a &amp;= b \\\\&amp; \\vdotswithin{=} \\\\&amp; = c \\\\\\shortvdotswithin{=}&amp; = d\\end{align*}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt 0.3em 0.1em 0.1em 0.30000000000000004em" data-break-align="bottom top" data-latex="\\begin{align*}a &amp;= b \\\\&amp; \\vdotswithin{=} \\\\&amp; = c \\\\\\shortvdotswithin{=}&amp; = d\\end{align*}">
-    <mtr>
+    <mtr data-latex="a&amp;=b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -2086,7 +2086,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;\\vdotswithin{=}">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2103,7 +2103,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;=c">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2113,7 +2113,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2130,7 +2130,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 1`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="&amp;=d">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2147,7 +2147,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 1`] = `
 exports[`Mathtools More Environments vdotswithin smallvdotswithin 2`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat*}{3}A&amp;+ B &amp;&amp;= C &amp;&amp;+ D \\\\\\MTFlushSpaceAbove&amp;\\vdotswithin{+} &amp;&amp;&amp;&amp; \\vdotswithin{+}\\MTFlushSpaceBelow C &amp;+ D &amp;&amp;= Y &amp;&amp;+K\\end{alignat*}" display="block">
   <mtable displaystyle="true" columnalign="right left right left right left" columnspacing="0em 0em 0em 0em 0em" rowspacing="0.1em 0.1em 0.30000000000000004em" data-break-align="bottom top bottom top bottom top" data-latex="\\begin{alignat*}{3}A&amp;+ B &amp;&amp;= C &amp;&amp;+ D \\\\\\MTFlushSpaceAbove&amp;\\vdotswithin{+} &amp;&amp;&amp;&amp; \\vdotswithin{+}\\MTFlushSpaceBelow C &amp;+ D &amp;&amp;= Y &amp;&amp;+K\\end{alignat*}">
-    <mtr data-latex="{3}">
+    <mtr data-latex="A&amp;+B&amp;&amp;=C&amp;&amp;+D">
       <mtd>
         <mi data-latex="A">A</mi>
       </mtd>
@@ -2175,7 +2175,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 2`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{3}">
+    <mtr data-latex="&amp;\\vdotswithin{+}&amp;&amp;&amp;&amp;\\vdotswithin{+}">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -2211,7 +2211,7 @@ exports[`Mathtools More Environments vdotswithin smallvdotswithin 2`] = `
         </mstyle>
       </mtd>
     </mtr>
-    <mtr data-latex="{3}">
+    <mtr data-latex="C&amp;+D&amp;&amp;=Y&amp;&amp;+K">
       <mtd>
         <mi data-latex="C">C</mi>
       </mtd>
@@ -2444,7 +2444,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix 1`] = `
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2453,7 +2453,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2475,7 +2475,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix* 1`] = `
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex=" ">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2484,7 +2484,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix* 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex=" ">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2506,7 +2506,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[c] 1`] = `
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex="[c]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2515,7 +2515,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[c] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[c]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2537,7 +2537,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[l] 1`] = `
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
-        <mtr data-latex="[l]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2546,7 +2546,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[l] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[l]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2568,7 +2568,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[r] 1`] = `
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-        <mtr data-latex="[r]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2577,7 +2577,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[r] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[r]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2599,7 +2599,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix 1`] = `
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2608,7 +2608,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2630,7 +2630,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix* 1`] = `
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex=" ">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2639,7 +2639,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix* 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex=" ">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2661,7 +2661,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[c] 1`] = `
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex="[c]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2670,7 +2670,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[c] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[c]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2692,7 +2692,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[l] 1`] = `
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
-        <mtr data-latex="[l]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2701,7 +2701,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[l] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[l]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2723,7 +2723,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[r] 1`] = `
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-        <mtr data-latex="[r]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2732,7 +2732,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[r] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[r]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2754,7 +2754,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix 1`] = `
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2763,7 +2763,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2785,7 +2785,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix* 1`] = `
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex=" ">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2794,7 +2794,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix* 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex=" ">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2816,7 +2816,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[c] 1`] = `
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex="[c]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2825,7 +2825,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[c] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[c]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2847,7 +2847,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[l] 1`] = `
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
-        <mtr data-latex="[l]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2856,7 +2856,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[l] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[l]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2878,7 +2878,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[r] 1`] = `
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-        <mtr data-latex="[r]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2887,7 +2887,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[r] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[r]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2909,7 +2909,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix 1`] = `
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2918,7 +2918,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2940,7 +2940,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix* 1`] = `
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex=" ">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2949,7 +2949,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix* 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex=" ">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -2971,7 +2971,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[c] 1`] = `
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex="[c]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -2980,7 +2980,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[c] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[c]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3002,7 +3002,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[l] 1`] = `
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
-        <mtr data-latex="[l]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3011,7 +3011,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[l] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[l]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3033,7 +3033,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[r] 1`] = `
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-        <mtr data-latex="[r]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3042,7 +3042,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[r] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[r]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3062,7 +3062,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mi data-latex="a">a</mi>
@@ -3071,7 +3071,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;-d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -3089,7 +3089,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix 2`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mi data-latex="a">a</mi>
@@ -3098,7 +3098,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix 2`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;-d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -3116,7 +3116,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr data-latex=" ">
+      <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mi data-latex="a">a</mi>
@@ -3125,7 +3125,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix* 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex=" ">
+      <mtr data-latex="c&amp;-d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -3143,7 +3143,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr data-latex="[c]">
+      <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mi data-latex="a">a</mi>
@@ -3152,7 +3152,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[c] 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="[c]">
+      <mtr data-latex="c&amp;-d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -3170,7 +3170,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
-      <mtr data-latex="[l]">
+      <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mi data-latex="a">a</mi>
@@ -3179,7 +3179,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[l] 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="[l]">
+      <mtr data-latex="c&amp;-d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -3197,7 +3197,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-      <mtr data-latex="[r]">
+      <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
           <mi data-latex="a">a</mi>
@@ -3206,7 +3206,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[r] 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="[r]">
+      <mtr data-latex="c&amp;-d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -3226,7 +3226,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix 1`] = `
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3235,7 +3235,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3257,7 +3257,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix* 1`] = `
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex=" ">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3266,7 +3266,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix* 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex=" ">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3288,7 +3288,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[c] 1`] = `
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr data-latex="[c]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3297,7 +3297,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[c] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[c]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3319,7 +3319,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[l] 1`] = `
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
-        <mtr data-latex="[l]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3328,7 +3328,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[l] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[l]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3350,7 +3350,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[r] 1`] = `
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-        <mtr data-latex="[r]">
+        <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="a">a</mi>
@@ -3359,7 +3359,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[r] 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr data-latex="[r]">
+        <mtr data-latex="c&amp;-d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -3571,7 +3571,7 @@ exports[`Mathtools Spacing Control crampedsubstack 1`] = `
     <mo data-latex="\\sum">&#x2211;</mo>
     <mrow data-mjx-texclass="ORD" data-latex="{{crampedsubarray}}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" data-cramped="true" data-latex="{crampedsubarray}">
-        <mtr data-latex="{c}">
+        <mtr data-latex="x^2">
           <mtd>
             <msup data-latex="x^2">
               <mi data-latex="x">x</mi>
@@ -3579,7 +3579,7 @@ exports[`Mathtools Spacing Control crampedsubstack 1`] = `
             </msup>
           </mtd>
         </mtr>
-        <mtr data-latex="{c}">
+        <mtr data-latex="y^2">
           <mtd>
             <msup data-latex="y^2">
               <mi data-latex="y">y</mi>
@@ -3978,7 +3978,7 @@ exports[`Mathtools Tagging newtagform styled 1`] = `
 exports[`Mathtools Tagging refeq 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}E=mc^2\\label{test}\\tag*{\\textsf{A}}\\\\ \\refeq{test}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}E=mc^2 \\label{test}\\tag*{\\textsf{A}}\\\\ \\refeq{test}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="E=m c^2">
       <mtd id="mjx-eqn:test">
         <mtext data-latex="\\text{\\textsf{A}}">\\textsf{A}</mtext>
       </mtd>
@@ -3992,7 +3992,7 @@ exports[`Mathtools Tagging refeq 1`] = `
         </msup>
       </mtd>
     </mlabeledtr>
-    <mtr>
+    <mtr data-latex="\\refeq{test}">
       <mtd>
         <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\refeq{test}">
           <mtext>\\textsf{A}</mtext>
@@ -4415,12 +4415,12 @@ exports[`Mathtools setoptions smallmatrix-align 1`] = `
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
-        <mtr data-latex=" ">
+        <mtr data-latex="a">
           <mtd>
             <mi data-latex="a">a</mi>
           </mtd>
         </mtr>
-        <mtr data-latex=" ">
+        <mtr data-latex="-b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
             <mi data-latex="b">b</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap
index a0b254542..7b6d7af71 100644
--- a/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap
@@ -15,10 +15,10 @@ exports[`Nested Environments Environments Intermixed 1`] = `
 exports[`Nested Environments Environments Nested 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newenvironment{boxed}{\\begin{array}{|c|c|}\\hline}{\\\\\\hline\\end{array}}\\begin{boxed}\\begin{boxed}a&amp;b\\\\c&amp;d\\end{boxed} &amp; X \\end{boxed}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="{array}">
-    <mtr data-latex="{|c|c|}">
+    <mtr data-latex="{array}&amp;X">
       <mtd>
         <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="{array}">
-          <mtr data-latex="{|c|c|}">
+          <mtr data-latex="a&amp;b">
             <mtd>
               <mi data-latex="a">a</mi>
             </mtd>
@@ -26,7 +26,7 @@ exports[`Nested Environments Environments Nested 1`] = `
               <mi data-latex="b">b</mi>
             </mtd>
           </mtr>
-          <mtr data-latex="{|c|c|}">
+          <mtr data-latex="c&amp;d">
             <mtd>
               <mi data-latex="c">c</mi>
             </mtd>
@@ -57,7 +57,7 @@ exports[`Nested Environments Nested Begins 1`] = `
 exports[`Nested Environments Newenvironment with Begin 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newenvironment{boxed}{\\begin{array}{|c|c|}\\hline}{\\\\\\hline\\end{array}}\\begin{boxed}a&amp;b\\\\c&amp;d\\end{boxed}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="{array}">
-    <mtr data-latex="{|c|c|}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -65,7 +65,7 @@ exports[`Nested Environments Newenvironment with Begin 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{|c|c|}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
index fb892c287..9c643e5bf 100644
--- a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
@@ -902,11 +902,11 @@ exports[`Matrix Macros Rest antidiagonalmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\antidiagonalmatrix{0,1\\\\2&amp;3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 0\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 0\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="0">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
@@ -914,15 +914,15 @@ exports[`Matrix Macros Rest antidiagonalmatrix 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\\\2&amp;3\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\\\2&amp;3\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -944,10 +944,10 @@ exports[`Matrix Macros Rest diagonalmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\diagonalmatrix{0,1\\\\2&amp;3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 0\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 0\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="0">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
@@ -955,16 +955,16 @@ exports[`Matrix Macros Rest diagonalmatrix 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 1\\\\2&amp;3\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\\\2&amp;3\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -986,7 +986,7 @@ exports[`Matrix Macros Rest paulimatrix 0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{0})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -994,7 +994,7 @@ exports[`Matrix Macros Rest paulimatrix 0 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -1013,7 +1013,7 @@ exports[`Matrix Macros Rest paulimatrix 1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -1021,7 +1021,7 @@ exports[`Matrix Macros Rest paulimatrix 1 1`] = `
           <mn data-latex="1">1</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1040,7 +1040,7 @@ exports[`Matrix Macros Rest paulimatrix 2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{2})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;-i">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -1049,7 +1049,7 @@ exports[`Matrix Macros Rest paulimatrix 2 1`] = `
           <mi data-latex="i">i</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="i&amp;0">
         <mtd>
           <mi data-latex="i">i</mi>
         </mtd>
@@ -1068,7 +1068,7 @@ exports[`Matrix Macros Rest paulimatrix 3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -1076,7 +1076,7 @@ exports[`Matrix Macros Rest paulimatrix 3 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;-1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -1106,7 +1106,7 @@ exports[`Matrix Macros Rest zeromatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\zeromatrix{2}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;0&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -1117,7 +1117,7 @@ exports[`Matrix Macros Rest zeromatrix 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;0&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -7979,7 +7979,7 @@ exports[`Physics6_4 BraKet_MatrixEl_7 1`] = `
 exports[`Physics7_0 Matrices_Quantity_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixquantity{Q}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\matrixquantity{Q}">
-    <mtr data-latex="{}">
+    <mtr data-latex="Q">
       <mtd>
         <mi data-latex="Q">Q</mi>
       </mtd>
@@ -7991,7 +7991,7 @@ exports[`Physics7_0 Matrices_Quantity_0 1`] = `
 exports[`Physics7_0 Matrices_Quantity_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixquantity*{a &amp; b \\\\ c &amp; d}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\matrixquantity*{a &amp; b \\\\ c &amp; d}">
-    <mtr data-latex="{}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -7999,7 +7999,7 @@ exports[`Physics7_0 Matrices_Quantity_1 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -8016,7 +8016,7 @@ exports[`Physics7_0 Matrices_Quantity_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8024,7 +8024,7 @@ exports[`Physics7_0 Matrices_Quantity_2 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8043,7 +8043,7 @@ exports[`Physics7_0 Matrices_Quantity_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8051,7 +8051,7 @@ exports[`Physics7_0 Matrices_Quantity_3 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8070,7 +8070,7 @@ exports[`Physics7_0 Matrices_Quantity_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8078,7 +8078,7 @@ exports[`Physics7_0 Matrices_Quantity_4 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8097,7 +8097,7 @@ exports[`Physics7_0 Matrices_Quantity_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8105,7 +8105,7 @@ exports[`Physics7_0 Matrices_Quantity_5 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8122,7 +8122,7 @@ exports[`Physics7_0 Matrices_Quantity_5 1`] = `
 exports[`Physics7_0 Matrices_Quantity_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{a &amp; b \\\\ c &amp; d}">
-    <mtr data-latex="{}">
+    <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -8130,7 +8130,7 @@ exports[`Physics7_0 Matrices_Quantity_6 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="c&amp;d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -8147,7 +8147,7 @@ exports[`Physics7_0 Matrices_Quantity_7 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8155,7 +8155,7 @@ exports[`Physics7_0 Matrices_Quantity_7 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8174,7 +8174,7 @@ exports[`Physics7_0 Matrices_Quantity_8 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8182,7 +8182,7 @@ exports[`Physics7_0 Matrices_Quantity_8 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8201,7 +8201,7 @@ exports[`Physics7_0 Matrices_Quantity_9 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8209,7 +8209,7 @@ exports[`Physics7_0 Matrices_Quantity_9 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8228,7 +8228,7 @@ exports[`Physics7_0 Matrices_Quantity_10 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8236,7 +8236,7 @@ exports[`Physics7_0 Matrices_Quantity_10 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8255,7 +8255,7 @@ exports[`Physics7_0 Matrices_Quantity_11 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty*|a &amp; b\\\\ c&amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8263,7 +8263,7 @@ exports[`Physics7_0 Matrices_Quantity_11 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8282,7 +8282,7 @@ exports[`Physics7_1 Matrices_Fenced_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} Q\\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
         </mtd>
@@ -8293,7 +8293,7 @@ exports[`Physics7_1 Matrices_Fenced_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} R\\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
         </mtd>
@@ -8309,7 +8309,7 @@ exports[`Physics7_1 Matrices_Fenced_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left\\lgroup\\begin{array}{} Q\\end{array}\\right\\rgroup">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
         </mtd>
@@ -8320,7 +8320,7 @@ exports[`Physics7_1 Matrices_Fenced_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left\\lgroup\\begin{array}{} R\\end{array}\\right\\rgroup">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
         </mtd>
@@ -8336,7 +8336,7 @@ exports[`Physics7_1 Matrices_Fenced_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left[\\begin{array}{} Q\\end{array}\\right]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
         </mtd>
@@ -8347,7 +8347,7 @@ exports[`Physics7_1 Matrices_Fenced_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left[\\begin{array}{} R\\end{array}\\right]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
         </mtd>
@@ -8363,7 +8363,7 @@ exports[`Physics7_1 Matrices_Fenced_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} Q\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
         </mtd>
@@ -8374,7 +8374,7 @@ exports[`Physics7_1 Matrices_Fenced_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} R\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
         </mtd>
@@ -8390,7 +8390,7 @@ exports[`Physics7_1 Matrices_Fenced_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8398,7 +8398,7 @@ exports[`Physics7_1 Matrices_Fenced_4 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8417,7 +8417,7 @@ exports[`Physics7_1 Matrices_Fenced_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8425,7 +8425,7 @@ exports[`Physics7_1 Matrices_Fenced_5 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8444,7 +8444,7 @@ exports[`Physics7_1 Matrices_Fenced_6 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8452,7 +8452,7 @@ exports[`Physics7_1 Matrices_Fenced_6 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8471,7 +8471,7 @@ exports[`Physics7_1 Matrices_Fenced_7 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -8479,7 +8479,7 @@ exports[`Physics7_1 Matrices_Fenced_7 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8497,7 +8497,7 @@ exports[`Physics7_2 Matrices_Small_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smallmatrixquantity{Q}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smallmatrixquantity{Q}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="{}Q">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
           <mi data-latex="Q">Q</mi>
@@ -8512,7 +8512,7 @@ exports[`Physics7_2 Matrices_Small_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smallmatrixquantity*{a &amp; b \\\\ c &amp; d}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smallmatrixquantity*{a &amp; b \\\\ c &amp; d}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="{}a&amp;b">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
           <mi data-latex="a">a</mi>
@@ -8521,7 +8521,7 @@ exports[`Physics7_2 Matrices_Small_1 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8540,7 +8540,7 @@ exports[`Physics7_2 Matrices_Small_2 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8549,7 +8549,7 @@ exports[`Physics7_2 Matrices_Small_2 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8570,7 +8570,7 @@ exports[`Physics7_2 Matrices_Small_3 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8579,7 +8579,7 @@ exports[`Physics7_2 Matrices_Small_3 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8600,7 +8600,7 @@ exports[`Physics7_2 Matrices_Small_5 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8609,7 +8609,7 @@ exports[`Physics7_2 Matrices_Small_5 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8628,7 +8628,7 @@ exports[`Physics7_2 Matrices_Small_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smqty{a &amp; b \\\\ c &amp; d}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="{}a&amp;b">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
           <mi data-latex="a">a</mi>
@@ -8637,7 +8637,7 @@ exports[`Physics7_2 Matrices_Small_6 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -8656,7 +8656,7 @@ exports[`Physics7_2 Matrices_Small_7 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8665,7 +8665,7 @@ exports[`Physics7_2 Matrices_Small_7 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8686,7 +8686,7 @@ exports[`Physics7_2 Matrices_Small_8 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8695,7 +8695,7 @@ exports[`Physics7_2 Matrices_Small_8 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8716,7 +8716,7 @@ exports[`Physics7_2 Matrices_Small_9 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8725,7 +8725,7 @@ exports[`Physics7_2 Matrices_Small_9 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8746,7 +8746,7 @@ exports[`Physics7_2 Matrices_Small_10 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8755,7 +8755,7 @@ exports[`Physics7_2 Matrices_Small_10 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8776,7 +8776,7 @@ exports[`Physics7_3 Matrices_SmallFenced_0 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="Q">Q</mi>
@@ -8790,7 +8790,7 @@ exports[`Physics7_3 Matrices_SmallFenced_0 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="R">R</mi>
@@ -8809,7 +8809,7 @@ exports[`Physics7_3 Matrices_SmallFenced_1 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="Q">Q</mi>
@@ -8823,7 +8823,7 @@ exports[`Physics7_3 Matrices_SmallFenced_1 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="R">R</mi>
@@ -8842,7 +8842,7 @@ exports[`Physics7_3 Matrices_SmallFenced_2 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="Q">Q</mi>
@@ -8856,7 +8856,7 @@ exports[`Physics7_3 Matrices_SmallFenced_2 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="R">R</mi>
@@ -8875,7 +8875,7 @@ exports[`Physics7_3 Matrices_SmallFenced_3 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="Q">Q</mi>
@@ -8889,7 +8889,7 @@ exports[`Physics7_3 Matrices_SmallFenced_3 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="R">R</mi>
@@ -8908,7 +8908,7 @@ exports[`Physics7_3 Matrices_SmallFenced_4 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8917,7 +8917,7 @@ exports[`Physics7_3 Matrices_SmallFenced_4 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8938,7 +8938,7 @@ exports[`Physics7_3 Matrices_SmallFenced_5 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8947,7 +8947,7 @@ exports[`Physics7_3 Matrices_SmallFenced_5 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8968,7 +8968,7 @@ exports[`Physics7_3 Matrices_SmallFenced_6 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -8977,7 +8977,7 @@ exports[`Physics7_3 Matrices_SmallFenced_6 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -8998,7 +8998,7 @@ exports[`Physics7_3 Matrices_SmallFenced_7 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9007,7 +9007,7 @@ exports[`Physics7_3 Matrices_SmallFenced_7 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -9027,7 +9027,7 @@ exports[`Physics7_4 Matrices_Det_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9035,7 +9035,7 @@ exports[`Physics7_4 Matrices_Det_0 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -9054,7 +9054,7 @@ exports[`Physics7_4 Matrices_Det_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9062,7 +9062,7 @@ exports[`Physics7_4 Matrices_Det_1 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -9082,7 +9082,7 @@ exports[`Physics7_4 Matrices_Det_2 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9091,7 +9091,7 @@ exports[`Physics7_4 Matrices_Det_2 1`] = `
             <mi data-latex="b">b</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="c&amp;d">
           <mtd>
             <mi data-latex="c">c</mi>
           </mtd>
@@ -9111,7 +9111,7 @@ exports[`Physics7_4 Matrices_Det_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} a\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9128,7 +9128,7 @@ exports[`Physics7_4 Matrices_Det_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} a\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -9146,7 +9146,7 @@ exports[`Physics7_4 Matrices_Det_5 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9163,7 +9163,7 @@ exports[`Physics7_4 Matrices_Det_5 1`] = `
 exports[`Physics7_5 Matrices_Identity_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\imat{3}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\imat{3}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -9174,7 +9174,7 @@ exports[`Physics7_5 Matrices_Identity_0 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;1&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -9185,7 +9185,7 @@ exports[`Physics7_5 Matrices_Identity_0 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -9205,7 +9205,7 @@ exports[`Physics7_5 Matrices_Identity_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{5}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0&amp;0&amp;0&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -9222,7 +9222,7 @@ exports[`Physics7_5 Matrices_Identity_1 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1&amp;0&amp;0&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9239,7 +9239,7 @@ exports[`Physics7_5 Matrices_Identity_1 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;0&amp;1&amp;0&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9256,7 +9256,7 @@ exports[`Physics7_5 Matrices_Identity_1 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;0&amp;0&amp;1&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9273,7 +9273,7 @@ exports[`Physics7_5 Matrices_Identity_1 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;0&amp;0&amp;0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9301,7 +9301,7 @@ exports[`Physics7_5 Matrices_Identity_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{0}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -9317,7 +9317,7 @@ exports[`Physics7_5 Matrices_Identity_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{1}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -9333,7 +9333,7 @@ exports[`Physics7_5 Matrices_Identity_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{-1}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -9349,7 +9349,7 @@ exports[`Physics7_5 Matrices_Identity_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\imat{3}\\pmat{0})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -9360,7 +9360,7 @@ exports[`Physics7_5 Matrices_Identity_5 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9371,7 +9371,7 @@ exports[`Physics7_5 Matrices_Identity_5 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;0&amp;11&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9386,7 +9386,7 @@ exports[`Physics7_5 Matrices_Identity_5 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -9406,7 +9406,7 @@ exports[`Physics7_6 Matrices_XMatrix_0 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}1&amp;1&amp;1">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mn data-latex="1">1</mn>
@@ -9418,7 +9418,7 @@ exports[`Physics7_6 Matrices_XMatrix_0 1`] = `
             <mn data-latex="1">1</mn>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="1&amp;1&amp;1">
           <mtd>
             <mn data-latex="1">1</mn>
           </mtd>
@@ -9442,7 +9442,7 @@ exports[`Physics7_6 Matrices_XMatrix_1 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;a&amp;a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9454,7 +9454,7 @@ exports[`Physics7_6 Matrices_XMatrix_1 1`] = `
             <mi data-latex="a">a</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a&amp;a&amp;a">
           <mtd>
             <mi data-latex="a">a</mi>
           </mtd>
@@ -9465,7 +9465,7 @@ exports[`Physics7_6 Matrices_XMatrix_1 1`] = `
             <mi data-latex="a">a</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a&amp;a&amp;a">
           <mtd>
             <mi data-latex="a">a</mi>
           </mtd>
@@ -9489,18 +9489,18 @@ exports[`Physics7_6 Matrices_XMatrix_2 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a">
           <mtd>
             <mi data-latex="a">a</mi>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a">
           <mtd>
             <mi data-latex="a">a</mi>
           </mtd>
@@ -9518,7 +9518,7 @@ exports[`Physics7_6 Matrices_XMatrix_3 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a&amp;a&amp;a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9543,7 +9543,7 @@ exports[`Physics7_6 Matrices_XMatrix_4 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}1_{{1}{1}}&amp;1_{{1}{2}}&amp;1_{{1}{3}}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <msub data-latex="1_{{1}{1}}">
@@ -9585,7 +9585,7 @@ exports[`Physics7_6 Matrices_XMatrix_4 1`] = `
             </msub>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="1_{{2}{1}}&amp;1_{{2}{2}}&amp;1_{{2}{3}}">
           <mtd>
             <msub data-latex="1_{{2}{1}}">
               <mn data-latex="1">1</mn>
@@ -9639,7 +9639,7 @@ exports[`Physics7_6 Matrices_XMatrix_5 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a_{{1}{1}}&amp;a_{{1}{2}}&amp;a_{{1}{3}}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <msub data-latex="a_{{1}{1}}">
@@ -9681,7 +9681,7 @@ exports[`Physics7_6 Matrices_XMatrix_5 1`] = `
             </msub>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a_{{2}{1}}&amp;a_{{2}{2}}&amp;a_{{2}{3}}">
           <mtd>
             <msub data-latex="a_{{2}{1}}">
               <mi data-latex="a">a</mi>
@@ -9722,7 +9722,7 @@ exports[`Physics7_6 Matrices_XMatrix_5 1`] = `
             </msub>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a_{{3}{1}}&amp;a_{{3}{2}}&amp;a_{{3}{3}}">
           <mtd>
             <msub data-latex="a_{{3}{1}}">
               <mi data-latex="a">a</mi>
@@ -9776,7 +9776,7 @@ exports[`Physics7_6 Matrices_XMatrix_6 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a_{1}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <msub data-latex="a_{1}">
@@ -9787,7 +9787,7 @@ exports[`Physics7_6 Matrices_XMatrix_6 1`] = `
             </msub>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a_{2}">
           <mtd>
             <msub data-latex="a_{2}">
               <mi data-latex="a">a</mi>
@@ -9797,7 +9797,7 @@ exports[`Physics7_6 Matrices_XMatrix_6 1`] = `
             </msub>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="a_{3}">
           <mtd>
             <msub data-latex="a_{3}">
               <mi data-latex="a">a</mi>
@@ -9820,7 +9820,7 @@ exports[`Physics7_6 Matrices_XMatrix_7 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a_{1}&amp;a_{2}&amp;a_{3}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <msub data-latex="a_{1}">
@@ -9860,7 +9860,7 @@ exports[`Physics7_6 Matrices_XMatrix_8 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9879,7 +9879,7 @@ exports[`Physics7_6 Matrices_XMatrix_9 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mi data-latex="a">a</mi>
@@ -9898,7 +9898,7 @@ exports[`Physics7_6 Matrices_XMatrix_10 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}0&amp;0&amp;0">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mn data-latex="0">0</mn>
@@ -9923,7 +9923,7 @@ exports[`Physics7_6 Matrices_XMatrix_11 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}0&amp;0&amp;0">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mn data-latex="0">0</mn>
@@ -9935,7 +9935,7 @@ exports[`Physics7_6 Matrices_XMatrix_11 1`] = `
             <mn data-latex="0">0</mn>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="0&amp;0&amp;0">
           <mtd>
             <mn data-latex="0">0</mn>
           </mtd>
@@ -9959,18 +9959,18 @@ exports[`Physics7_6 Matrices_XMatrix_12 1`] = `
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
       <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-        <mtr>
+        <mtr data-latex="{}0">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
             <mn data-latex="0">0</mn>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="0">
           <mtd>
             <mn data-latex="0">0</mn>
           </mtd>
         </mtr>
-        <mtr>
+        <mtr data-latex="0">
           <mtd>
             <mn data-latex="0">0</mn>
           </mtd>
@@ -9985,7 +9985,7 @@ exports[`Physics7_6 Matrices_XMatrix_12 1`] = `
 exports[`Physics7_7 Matrices_Pauli_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{0}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{0}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -9993,7 +9993,7 @@ exports[`Physics7_7 Matrices_Pauli_0 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10010,7 +10010,7 @@ exports[`Physics7_7 Matrices_Pauli_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{0})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10018,7 +10018,7 @@ exports[`Physics7_7 Matrices_Pauli_1 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10035,7 +10035,7 @@ exports[`Physics7_7 Matrices_Pauli_1 1`] = `
 exports[`Physics7_7 Matrices_Pauli_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{1}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{1}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10043,7 +10043,7 @@ exports[`Physics7_7 Matrices_Pauli_2 1`] = `
         <mn data-latex="1">1</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -10058,7 +10058,7 @@ exports[`Physics7_7 Matrices_Pauli_2 1`] = `
 exports[`Physics7_7 Matrices_Pauli_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{2}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{2}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;-i">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10067,7 +10067,7 @@ exports[`Physics7_7 Matrices_Pauli_3 1`] = `
         <mi data-latex="i">i</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="i&amp;0">
       <mtd>
         <mi data-latex="i">i</mi>
       </mtd>
@@ -10082,7 +10082,7 @@ exports[`Physics7_7 Matrices_Pauli_3 1`] = `
 exports[`Physics7_7 Matrices_Pauli_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{3}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{3}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -10090,7 +10090,7 @@ exports[`Physics7_7 Matrices_Pauli_4 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;-1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10112,7 +10112,7 @@ exports[`Physics7_7 Matrices_Pauli_5 1`] = `
 exports[`Physics7_7 Matrices_Pauli_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{x}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{x}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10120,7 +10120,7 @@ exports[`Physics7_7 Matrices_Pauli_6 1`] = `
         <mn data-latex="1">1</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -10135,7 +10135,7 @@ exports[`Physics7_7 Matrices_Pauli_6 1`] = `
 exports[`Physics7_7 Matrices_Pauli_7 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{y}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{y}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;-i">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10144,7 +10144,7 @@ exports[`Physics7_7 Matrices_Pauli_7 1`] = `
         <mi data-latex="i">i</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="i&amp;0">
       <mtd>
         <mi data-latex="i">i</mi>
       </mtd>
@@ -10159,7 +10159,7 @@ exports[`Physics7_7 Matrices_Pauli_7 1`] = `
 exports[`Physics7_7 Matrices_Pauli_8 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{z}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{z}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -10167,7 +10167,7 @@ exports[`Physics7_7 Matrices_Pauli_8 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;-1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -10199,7 +10199,7 @@ exports[`Physics7_7 Matrices_Pauli_10 1`] = `
 exports[`Physics7_7 Matrices_Pauli_11 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\pmat{aa}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\pmat{aa}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -10213,7 +10213,7 @@ exports[`Physics7_7 Matrices_Pauli_12 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{0.a})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex=".a1&amp;0">
         <mtd>
           <mo data-latex=".">.</mo>
           <mi data-latex="a">a</mi>
@@ -10223,7 +10223,7 @@ exports[`Physics7_7 Matrices_Pauli_12 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10242,7 +10242,7 @@ exports[`Physics7_8 Matrices_PauliFenced_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10250,7 +10250,7 @@ exports[`Physics7_8 Matrices_PauliFenced_0 1`] = `
           <mn data-latex="1">1</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10269,7 +10269,7 @@ exports[`Physics7_8 Matrices_PauliFenced_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{2})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;-i">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10278,7 +10278,7 @@ exports[`Physics7_8 Matrices_PauliFenced_1 1`] = `
           <mi data-latex="i">i</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="i&amp;0">
         <mtd>
           <mi data-latex="i">i</mi>
         </mtd>
@@ -10297,7 +10297,7 @@ exports[`Physics7_8 Matrices_PauliFenced_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10305,7 +10305,7 @@ exports[`Physics7_8 Matrices_PauliFenced_2 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;-1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10335,7 +10335,7 @@ exports[`Physics7_8 Matrices_PauliFenced_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{x})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10343,7 +10343,7 @@ exports[`Physics7_8 Matrices_PauliFenced_4 1`] = `
           <mn data-latex="1">1</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10362,7 +10362,7 @@ exports[`Physics7_8 Matrices_PauliFenced_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{y})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;-i">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10371,7 +10371,7 @@ exports[`Physics7_8 Matrices_PauliFenced_5 1`] = `
           <mi data-latex="i">i</mi>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="i&amp;0">
         <mtd>
           <mi data-latex="i">i</mi>
         </mtd>
@@ -10390,7 +10390,7 @@ exports[`Physics7_8 Matrices_PauliFenced_6 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{z})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10398,7 +10398,7 @@ exports[`Physics7_8 Matrices_PauliFenced_6 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="0&amp;-1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -10418,7 +10418,7 @@ exports[`Physics7_8 Matrices_PauliFenced_7 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{aa})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -10434,10 +10434,10 @@ exports[`Physics7_9 Matrices_Diag_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10445,11 +10445,11 @@ exports[`Physics7_9 Matrices_Diag_0 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -10457,7 +10457,7 @@ exports[`Physics7_9 Matrices_Diag_0 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -10479,7 +10479,7 @@ exports[`Physics7_9 Matrices_Diag_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat 1)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10495,7 +10495,7 @@ exports[`Physics7_9 Matrices_Diag_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat 1,2)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1,2">
         <mtd>
           <mn data-latex="1">1</mn>
           <mo data-latex=",">,</mo>
@@ -10513,10 +10513,10 @@ exports[`Physics7_9 Matrices_Diag_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10524,11 +10524,11 @@ exports[`Physics7_9 Matrices_Diag_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -10536,7 +10536,7 @@ exports[`Physics7_9 Matrices_Diag_3 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5&amp;6">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -10550,12 +10550,12 @@ exports[`Physics7_9 Matrices_Diag_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -10563,13 +10563,13 @@ exports[`Physics7_9 Matrices_Diag_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 8\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -10588,10 +10588,10 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5,6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10599,11 +10599,11 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -10611,7 +10611,7 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -10622,12 +10622,12 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 6\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="6">
               <mtd>
                 <mn data-latex="6">6</mn>
               </mtd>
@@ -10635,13 +10635,13 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -10649,14 +10649,14 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 8\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -10675,10 +10675,10 @@ exports[`Physics7_9 Matrices_Diag_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2\\\\3\\\\4\\\\5\\\\6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10686,31 +10686,31 @@ exports[`Physics7_9 Matrices_Diag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2\\\\3\\\\4\\\\5\\\\6\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2\\\\3\\\\4\\\\5\\\\6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="3">
               <mtd>
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="5">
               <mtd>
                 <mn data-latex="5">5</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="6">
               <mtd>
                 <mn data-latex="6">6</mn>
               </mtd>
@@ -10718,12 +10718,12 @@ exports[`Physics7_9 Matrices_Diag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -10731,13 +10731,13 @@ exports[`Physics7_9 Matrices_Diag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 8\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -10756,10 +10756,10 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10767,11 +10767,11 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -10779,7 +10779,7 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5&amp;6">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -10793,12 +10793,12 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -10806,13 +10806,13 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 8\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -10820,17 +10820,17 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="\\begin{array}{} 9\\end{array}">
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 9\\end{array}">
-                  <mtr data-latex="{}">
+                  <mtr data-latex="9">
                     <mtd>
                       <mn data-latex="9">9</mn>
                     </mtd>
@@ -10838,11 +10838,11 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
                 </mtable>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="&amp;\\begin{array}{} 10\\end{array}">
               <mtd></mtd>
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 10\\end{array}">
-                  <mtr data-latex="{}">
+                  <mtr data-latex="10">
                     <mtd>
                       <mn data-latex="10">10</mn>
                     </mtd>
@@ -10864,11 +10864,11 @@ exports[`Physics7_10 Matrices_Adiag_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10876,10 +10876,10 @@ exports[`Physics7_10 Matrices_Adiag_0 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -10887,7 +10887,7 @@ exports[`Physics7_10 Matrices_Adiag_0 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -10909,7 +10909,7 @@ exports[`Physics7_10 Matrices_Adiag_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat 1)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
         </mtd>
@@ -10925,7 +10925,7 @@ exports[`Physics7_10 Matrices_Adiag_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat 1,2)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="1,2">
         <mtd>
           <mn data-latex="1">1</mn>
           <mo data-latex=",">,</mo>
@@ -10943,13 +10943,13 @@ exports[`Physics7_10 Matrices_Adiag_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -10957,12 +10957,12 @@ exports[`Physics7_10 Matrices_Adiag_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -10970,7 +10970,7 @@ exports[`Physics7_10 Matrices_Adiag_3 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5&amp;6">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -10984,11 +10984,11 @@ exports[`Physics7_10 Matrices_Adiag_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -10996,10 +10996,10 @@ exports[`Physics7_10 Matrices_Adiag_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 8\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -11018,14 +11018,14 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5,6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11033,13 +11033,13 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -11047,7 +11047,7 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11058,12 +11058,12 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 6\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="6">
               <mtd>
                 <mn data-latex="6">6</mn>
               </mtd>
@@ -11071,11 +11071,11 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -11083,10 +11083,10 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 8\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -11105,14 +11105,14 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11120,13 +11120,13 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -11134,7 +11134,7 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5&amp;6">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11148,12 +11148,12 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -11161,11 +11161,11 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 8\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -11173,13 +11173,13 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="\\begin{array}{} 9\\end{array}">
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 9\\end{array}">
-                  <mtr data-latex="{}">
+                  <mtr data-latex="9">
                     <mtd>
                       <mn data-latex="9">9</mn>
                     </mtd>
@@ -11187,11 +11187,11 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
                 </mtable>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="&amp;\\begin{array}{} 10\\end{array}">
               <mtd></mtd>
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 10\\end{array}">
-                  <mtr data-latex="{}">
+                  <mtr data-latex="10">
                     <mtd>
                       <mn data-latex="10">10</mn>
                     </mtd>
@@ -11235,7 +11235,7 @@ exports[`Physics7_11 Matrices_Other_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} *\\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="*">
         <mtd>
           <mo data-latex="*">&#x2217;</mo>
         </mtd>
@@ -11252,10 +11252,10 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3,4&amp;4&amp;5\\\\4&amp;5,33,4,5,7,8\\\\0\\\\10&amp;20\\\\3,200})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11263,11 +11263,11 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -11278,12 +11278,12 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} 4&amp;4&amp;5\\\\4&amp;5\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 4&amp;4&amp;5\\\\4&amp;5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11294,7 +11294,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
                 <mn data-latex="5">5</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11305,13 +11305,13 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 33\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 33\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="33">
               <mtd>
                 <mn data-latex="33">33</mn>
               </mtd>
@@ -11319,14 +11319,14 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 4\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 4\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="4">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11334,7 +11334,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;\\begin{array}{} 5\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11342,7 +11342,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="5">
               <mtd>
                 <mn data-latex="5">5</mn>
               </mtd>
@@ -11350,7 +11350,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11359,7 +11359,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -11367,7 +11367,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;&amp;&amp;\\begin{array}{} 8\\\\0\\\\10&amp;20\\\\3\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11377,17 +11377,17 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\\\0\\\\10&amp;20\\\\3\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="0">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="10&amp;20">
               <mtd>
                 <mn data-latex="10">10</mn>
               </mtd>
@@ -11395,7 +11395,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
                 <mn data-latex="20">20</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="3">
               <mtd>
                 <mn data-latex="3">3</mn>
               </mtd>
@@ -11403,7 +11403,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;\\begin{array}{} 200\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11414,7 +11414,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 200\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="200">
               <mtd>
                 <mn data-latex="200">200</mn>
               </mtd>
@@ -11433,10 +11433,10 @@ exports[`Physics7_11 Matrices_Other_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11444,11 +11444,11 @@ exports[`Physics7_11 Matrices_Other_4 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -11456,7 +11456,7 @@ exports[`Physics7_11 Matrices_Other_4 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11478,10 +11478,10 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,\\imat{3},7,8,\\dmat{9,10}})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11489,11 +11489,11 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2&amp;3\\\\4&amp;5&amp;6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -11501,7 +11501,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5&amp;6">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11515,12 +11515,12 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1&amp;0&amp;0">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11531,7 +11531,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
                 <mn data-latex="0">0</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="0&amp;1&amp;0">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
@@ -11542,7 +11542,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
                 <mn data-latex="0">0</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="0&amp;0&amp;1">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
@@ -11556,13 +11556,13 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -11570,14 +11570,14 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 8\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 8\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="8">
               <mtd>
                 <mn data-latex="8">8</mn>
               </mtd>
@@ -11585,7 +11585,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11593,10 +11593,10 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="\\begin{array}{} 9\\end{array}">
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 9\\end{array}">
-                  <mtr data-latex="{}">
+                  <mtr data-latex="9">
                     <mtd>
                       <mn data-latex="9">9</mn>
                     </mtd>
@@ -11604,11 +11604,11 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
                 </mtable>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="&amp;\\begin{array}{} 10\\end{array}">
               <mtd></mtd>
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 10\\end{array}">
-                  <mtr data-latex="{}">
+                  <mtr data-latex="10">
                     <mtd>
                       <mn data-latex="10">10</mn>
                     </mtd>
@@ -11630,10 +11630,10 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\mqty{1}\\\\ &amp; \\mqty{2 &amp; 3\\\\ 4 &amp; 5 &amp; 6}\\\\ &amp; &amp; \\mqty{\\imat{3}} \\\\ &amp; &amp; &amp; \\mqty{7})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
-      <mtr data-latex="{}">
+      <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11641,11 +11641,11 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;\\begin{array}{} 2 &amp; 3\\\\ 4 &amp; 5 &amp; 6\\end{array}">
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 2 &amp; 3\\\\ 4 &amp; 5 &amp; 6\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="2&amp;3">
               <mtd>
                 <mn data-latex="2">2</mn>
               </mtd>
@@ -11653,7 +11653,7 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
                 <mn data-latex="3">3</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="4&amp;5&amp;6">
               <mtd>
                 <mn data-latex="4">4</mn>
               </mtd>
@@ -11667,12 +11667,12 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="1&amp;0&amp;0">
               <mtd>
                 <mn data-latex="1">1</mn>
               </mtd>
@@ -11683,7 +11683,7 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
                 <mn data-latex="0">0</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="0&amp;1&amp;0">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
@@ -11694,7 +11694,7 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
                 <mn data-latex="0">0</mn>
               </mtd>
             </mtr>
-            <mtr data-latex="{}">
+            <mtr data-latex="0&amp;0&amp;1">
               <mtd>
                 <mn data-latex="0">0</mn>
               </mtd>
@@ -11708,13 +11708,13 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="{}">
+      <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 7\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 7\\end{array}">
-            <mtr data-latex="{}">
+            <mtr data-latex="7">
               <mtd>
                 <mn data-latex="7">7</mn>
               </mtd>
@@ -11745,7 +11745,7 @@ exports[`Physics7_11 Matrices_Other_8 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
         </mtd>
@@ -11753,7 +11753,7 @@ exports[`Physics7_11 Matrices_Other_8 1`] = `
           <mi data-latex="b">b</mi>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="c&amp;d">
         <mtd>
           <mi data-latex="c">c</mi>
         </mtd>
@@ -11770,7 +11770,7 @@ exports[`Physics7_11 Matrices_Other_9 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smqty{\\imat{3}}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smqty{\\imat{3}}">
     <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
-      <mtr>
+      <mtr data-latex="{}1&amp;0&amp;0">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
           <mn data-latex="1">1</mn>
@@ -11782,7 +11782,7 @@ exports[`Physics7_11 Matrices_Other_9 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="0&amp;1&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -11793,7 +11793,7 @@ exports[`Physics7_11 Matrices_Other_9 1`] = `
           <mn data-latex="0">0</mn>
         </mtd>
       </mtr>
-      <mtr>
+      <mtr data-latex="0&amp;0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
         </mtd>
@@ -11812,7 +11812,7 @@ exports[`Physics7_11 Matrices_Other_9 1`] = `
 exports[`Physics7_11 Matrices_Other_10 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty{\\imat{10}}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{\\imat{10}}">
-    <mtr data-latex="{}">
+    <mtr data-latex="1&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="1">1</mn>
       </mtd>
@@ -11844,7 +11844,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;1&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -11876,7 +11876,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;1&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -11908,7 +11908,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;1&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -11940,7 +11940,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;0&amp;1&amp;0&amp;0&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -11972,7 +11972,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;0&amp;0&amp;1&amp;0&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -12004,7 +12004,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;1&amp;0&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -12036,7 +12036,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;1&amp;0&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -12068,7 +12068,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;1&amp;0">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
@@ -12100,7 +12100,7 @@ exports[`Physics7_11 Matrices_Other_10 1`] = `
         <mn data-latex="0">0</mn>
       </mtd>
     </mtr>
-    <mtr data-latex="{}">
+    <mtr data-latex="0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;0&amp;1">
       <mtd>
         <mn data-latex="0">0</mn>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
index 79660e10a..832cdf8f9 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
@@ -72,7 +72,7 @@ exports[`Page References LabelIds 1`] = `
 exports[`TagAll Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -89,7 +89,7 @@ exports[`TagAll Align 1`] = `
 exports[`TagAll Align Two labels 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a=\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -101,7 +101,7 @@ exports[`TagAll Align Two labels 1`] = `
         <mi data-latex="\\label{A}">b</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c&amp;=\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -125,7 +125,7 @@ exports[`TagAll Align Two labels 1`] = `
 exports[`TagAll Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\eqref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -145,7 +145,7 @@ exports[`TagAll Eqref 1`] = `
 exports[`TagAll Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -162,7 +162,7 @@ exports[`TagAll Label 1`] = `
 exports[`TagAll Label Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -179,7 +179,7 @@ exports[`TagAll Label Default 1`] = `
 exports[`TagAll Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{}">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -196,7 +196,7 @@ exports[`TagAll Label Empty 1`] = `
 exports[`TagAll Label Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -213,7 +213,7 @@ exports[`TagAll Label Named 1`] = `
 exports[`TagAll Label Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -223,7 +223,7 @@ exports[`TagAll Label Named Default 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -240,7 +240,7 @@ exports[`TagAll Label Named Default 1`] = `
 exports[`TagAll Label Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -250,7 +250,7 @@ exports[`TagAll Label Named Named 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -294,7 +294,7 @@ exports[`TagAll MultLine 1`] = `
 exports[`TagAll Notag Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\notag\\end{align}">
-    <mtr>
+    <mtr data-latex="\\notag">
       <mtd>
         <mi data-latex="\\notag">a</mi>
       </mtd>
@@ -328,7 +328,7 @@ exports[`TagAll Notag Multline 1`] = `
 exports[`TagAll Notag Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}">
-    <mtr>
+    <mtr data-latex="\\notag">
       <mtd>
         <mi data-latex="\\notag">a</mi>
       </mtd>
@@ -340,7 +340,7 @@ exports[`TagAll Notag Tag 1`] = `
 exports[`TagAll Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -360,7 +360,7 @@ exports[`TagAll Ref 1`] = `
 exports[`TagAll Ref Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -380,7 +380,7 @@ exports[`TagAll Ref Default 1`] = `
 exports[`TagAll Ref Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -400,7 +400,7 @@ exports[`TagAll Ref Named 1`] = `
 exports[`TagAll Ref Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -410,7 +410,7 @@ exports[`TagAll Ref Named Default 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -433,7 +433,7 @@ exports[`TagAll Ref Named Default 1`] = `
 exports[`TagAll Ref Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -443,7 +443,7 @@ exports[`TagAll Ref Named Named 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -466,7 +466,7 @@ exports[`TagAll Ref Named Named 1`] = `
 exports[`TagAll Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -503,7 +503,7 @@ exports[`TagAll Single Expression 1`] = `
 exports[`TagAll Tag Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -520,7 +520,7 @@ exports[`TagAll Tag Default 1`] = `
 exports[`TagAll Tag Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -537,7 +537,7 @@ exports[`TagAll Tag Named 1`] = `
 exports[`TagAll Tag Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -547,7 +547,7 @@ exports[`TagAll Tag Named Default 1`] = `
         <mi data-latex="\\tag{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -564,7 +564,7 @@ exports[`TagAll Tag Named Default 1`] = `
 exports[`TagAll Tag Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -574,7 +574,7 @@ exports[`TagAll Tag Named Named 1`] = `
         <mi data-latex="\\tag{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -591,7 +591,7 @@ exports[`TagAll Tag Named Named 1`] = `
 exports[`TagAms Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -608,7 +608,7 @@ exports[`TagAms Align 1`] = `
 exports[`TagAms Align Two labels 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a=\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -620,7 +620,7 @@ exports[`TagAms Align Two labels 1`] = `
         <mi data-latex="\\label{A}">b</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="c&amp;=\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -644,7 +644,7 @@ exports[`TagAms Align Two labels 1`] = `
 exports[`TagAms Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\eqref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -664,7 +664,7 @@ exports[`TagAms Eqref 1`] = `
 exports[`TagAms Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -681,7 +681,7 @@ exports[`TagAms Label 1`] = `
 exports[`TagAms Label Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -698,7 +698,7 @@ exports[`TagAms Label Default 1`] = `
 exports[`TagAms Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{}">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -715,7 +715,7 @@ exports[`TagAms Label Empty 1`] = `
 exports[`TagAms Label Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -732,7 +732,7 @@ exports[`TagAms Label Named 1`] = `
 exports[`TagAms Label Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -742,7 +742,7 @@ exports[`TagAms Label Named Default 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -759,7 +759,7 @@ exports[`TagAms Label Named Default 1`] = `
 exports[`TagAms Label Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -769,7 +769,7 @@ exports[`TagAms Label Named Named 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -813,7 +813,7 @@ exports[`TagAms MultLine 1`] = `
 exports[`TagAms Notag Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\notag\\end{align}">
-    <mtr>
+    <mtr data-latex="\\notag">
       <mtd>
         <mi data-latex="\\notag">a</mi>
       </mtd>
@@ -847,7 +847,7 @@ exports[`TagAms Notag Multline 1`] = `
 exports[`TagAms Notag Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}">
-    <mtr>
+    <mtr data-latex="\\notag">
       <mtd>
         <mi data-latex="\\notag">a</mi>
       </mtd>
@@ -859,7 +859,7 @@ exports[`TagAms Notag Tag 1`] = `
 exports[`TagAms Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -879,7 +879,7 @@ exports[`TagAms Ref 1`] = `
 exports[`TagAms Ref Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -899,7 +899,7 @@ exports[`TagAms Ref Default 1`] = `
 exports[`TagAms Ref Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -919,7 +919,7 @@ exports[`TagAms Ref Named 1`] = `
 exports[`TagAms Ref Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -929,7 +929,7 @@ exports[`TagAms Ref Named Default 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -952,7 +952,7 @@ exports[`TagAms Ref Named Default 1`] = `
 exports[`TagAms Ref Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -962,7 +962,7 @@ exports[`TagAms Ref Named Named 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -985,7 +985,7 @@ exports[`TagAms Ref Named Named 1`] = `
 exports[`TagAms Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -1011,7 +1011,7 @@ exports[`TagAms Single Expression 1`] = `
 exports[`TagAms Split 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{split}a\\end{split}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="0em" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{split}a\\end{split}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1023,7 +1023,7 @@ exports[`TagAms Split 1`] = `
 exports[`TagAms Tag Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -1040,7 +1040,7 @@ exports[`TagAms Tag Default 1`] = `
 exports[`TagAms Tag Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1057,7 +1057,7 @@ exports[`TagAms Tag Named 1`] = `
 exports[`TagAms Tag Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1067,7 +1067,7 @@ exports[`TagAms Tag Named Default 1`] = `
         <mi data-latex="\\tag{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -1084,7 +1084,7 @@ exports[`TagAms Tag Named Default 1`] = `
 exports[`TagAms Tag Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1094,7 +1094,7 @@ exports[`TagAms Tag Named Named 1`] = `
         <mi data-latex="\\tag{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -1111,7 +1111,7 @@ exports[`TagAms Tag Named Named 1`] = `
 exports[`TagNone Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1123,7 +1123,7 @@ exports[`TagNone Align 1`] = `
 exports[`TagNone Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\eqref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr>
+    <mtr data-latex="\\label{A}">
       <mtd>
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
@@ -1138,7 +1138,7 @@ exports[`TagNone Eqref 1`] = `
 exports[`TagNone Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mtr>
+    <mtr data-latex="\\label{A}">
       <mtd>
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
@@ -1150,7 +1150,7 @@ exports[`TagNone Label 1`] = `
 exports[`TagNone Label Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mtr>
+    <mtr data-latex="\\label{A}">
       <mtd>
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
@@ -1162,7 +1162,7 @@ exports[`TagNone Label Default 1`] = `
 exports[`TagNone Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{}\\end{align}">
-    <mtr>
+    <mtr data-latex="\\label{}">
       <mtd>
         <mi data-latex="\\label{}">a</mi>
       </mtd>
@@ -1174,7 +1174,7 @@ exports[`TagNone Label Empty 1`] = `
 exports[`TagNone Label Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1191,7 +1191,7 @@ exports[`TagNone Label Named 1`] = `
 exports[`TagNone Label Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1201,7 +1201,7 @@ exports[`TagNone Label Named Default 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr>
+    <mtr data-latex="\\label{B}">
       <mtd>
         <mi data-latex="\\label{B}">b</mi>
       </mtd>
@@ -1213,7 +1213,7 @@ exports[`TagNone Label Named Default 1`] = `
 exports[`TagNone Label Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1223,7 +1223,7 @@ exports[`TagNone Label Named Named 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -1262,7 +1262,7 @@ exports[`TagNone MultLine 1`] = `
 exports[`TagNone Notag Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\notag\\end{align}">
-    <mtr>
+    <mtr data-latex="\\notag">
       <mtd>
         <mi data-latex="\\notag">a</mi>
       </mtd>
@@ -1296,7 +1296,7 @@ exports[`TagNone Notag Multline 1`] = `
 exports[`TagNone Notag Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}">
-    <mtr>
+    <mtr data-latex="\\notag">
       <mtd>
         <mi data-latex="\\notag">a</mi>
       </mtd>
@@ -1308,7 +1308,7 @@ exports[`TagNone Notag Tag 1`] = `
 exports[`TagNone Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr>
+    <mtr data-latex="\\label{A}">
       <mtd>
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
@@ -1323,7 +1323,7 @@ exports[`TagNone Ref 1`] = `
 exports[`TagNone Ref Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr>
+    <mtr data-latex="\\label{A}">
       <mtd>
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
@@ -1338,7 +1338,7 @@ exports[`TagNone Ref Default 1`] = `
 exports[`TagNone Ref Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1358,7 +1358,7 @@ exports[`TagNone Ref Named 1`] = `
 exports[`TagNone Ref Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1368,7 +1368,7 @@ exports[`TagNone Ref Named Default 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr>
+    <mtr data-latex="\\label{B}">
       <mtd>
         <mi data-latex="\\label{B}">b</mi>
       </mtd>
@@ -1386,7 +1386,7 @@ exports[`TagNone Ref Named Default 1`] = `
 exports[`TagNone Ref Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1396,7 +1396,7 @@ exports[`TagNone Ref Named Named 1`] = `
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\label{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
@@ -1419,7 +1419,7 @@ exports[`TagNone Ref Named Named 1`] = `
 exports[`TagNone Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr>
+    <mtr data-latex="\\label{A}">
       <mtd>
         <mi data-latex="\\label{A}">a</mi>
       </mtd>
@@ -1457,7 +1457,7 @@ exports[`TagNone Single Expression 1`] = `
 exports[`TagNone Split 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{split}a\\end{split}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="0em" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{split}a\\end{split}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1469,7 +1469,7 @@ exports[`TagNone Split 1`] = `
 exports[`TagNone Tag Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1481,7 +1481,7 @@ exports[`TagNone Tag Default 1`] = `
 exports[`TagNone Tag Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1498,7 +1498,7 @@ exports[`TagNone Tag Named 1`] = `
 exports[`TagNone Tag Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1508,7 +1508,7 @@ exports[`TagNone Tag Named Default 1`] = `
         <mi data-latex="\\tag{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
@@ -1520,7 +1520,7 @@ exports[`TagNone Tag Named Default 1`] = `
 exports[`TagNone Tag Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -1530,7 +1530,7 @@ exports[`TagNone Tag Named Named 1`] = `
         <mi data-latex="\\tag{A}">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{B}">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
index d32e09fc4..4d61726e7 100644
--- a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
@@ -69,7 +69,7 @@ exports[`Tagformat Basic tag 1`] = `
 exports[`Tagformat Custom ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{x}">
       <mtd id="mjx-eqn:test">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
@@ -79,7 +79,7 @@ exports[`Tagformat Custom ref 1`] = `
         <mi data-latex="\\tag{x}">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\eqref{test}">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -98,7 +98,7 @@ exports[`Tagformat Custom ref 1`] = `
 exports[`Tagformat Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{x}">
       <mtd id="my-tag:test">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
@@ -108,7 +108,7 @@ exports[`Tagformat Eqref 1`] = `
         <mi data-latex="\\tag{x}">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\eqref{test}">
       <mtd id="my-tag:A1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{A1}">A1</mtext>
@@ -127,7 +127,7 @@ exports[`Tagformat Eqref 1`] = `
 exports[`Tagformat Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\ref{test} \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\ref{test} \\end{align}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\tag{x}">
       <mtd id="my-tag:test">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
@@ -137,7 +137,7 @@ exports[`Tagformat Ref 1`] = `
         <mi data-latex="\\tag{x}">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\ref{test}">
       <mtd id="my-tag:A1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{A1}">A1</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap
index 3c6ca50f5..ea428f42a 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap
@@ -94,7 +94,7 @@ exports[`TexParser GetBrackets nested [ 1`] = `
 exports[`TexParser Removed delimiter 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\let\\vert=x \\begin{vmatrix} a \\end{vmatrix}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\let\\vert=x \\begin{vmatrix} a \\end{vmatrix}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>

From fd5569dc32a9159ee856ab4fc9f57a67ed99e33c Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Tue, 14 Jul 2026 16:59:36 +0200
Subject: [PATCH 03/11] ensure labels will get the right latex attribute

---
 .../input/tex/__snapshots__/Ams.test.ts.snap  |  42 +--
 .../input/tex/__snapshots__/Base.test.ts.snap |  36 +-
 .../tex/__snapshots__/Cases.test.ts.snap      |  38 +-
 .../tex/__snapshots__/Empheq.test.ts.snap     |  40 +--
 .../tex/__snapshots__/Mathtools.test.ts.snap  |  20 +-
 .../tex/__snapshots__/SetOptions.test.ts.snap |   4 +-
 .../input/tex/__snapshots__/Tag.test.ts.snap  | 328 +++++++++---------
 .../tex/__snapshots__/TagFormat.test.ts.snap  |  38 +-
 ts/input/tex/NodeUtil.ts                      |  26 ++
 ts/input/tex/Tags.ts                          |  10 +
 ts/input/tex/TexParser.ts                     |  19 +
 ts/input/tex/ams/AmsMethods.ts                |   1 +
 ts/input/tex/base/BaseItems.ts                |  14 +-
 ts/input/tex/base/BaseMethods.ts              |   3 +
 14 files changed, 334 insertions(+), 285 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
index 15f1f6d89..1259e3178 100644
--- a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
@@ -1515,7 +1515,7 @@ exports[`Ams Environments pmatrix 1`] = `
 exports[`Ams Environments xalign tagged 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center right left center" columnspacing="0em" columnwidth="fit auto auto fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}">
-    <mlabeledtr data-latex="a&amp;\\tag{1}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;b">
       <mtd id="mjx-eqn:1">
         <mpadded width="0" lspace="-1width">
           <mtext data-latex="\\text{(}">(</mtext>
@@ -1529,7 +1529,7 @@ exports[`Ams Environments xalign tagged 1`] = `
       </mtd>
       <mtd>
         <mstyle indentshift="2em">
-          <mi data-latex="\\tag{1}">b</mi>
+          <mi data-latex="b">b</mi>
         </mstyle>
       </mtd>
       <mtd></mtd>
@@ -2006,7 +2006,7 @@ exports[`Ams Symbol 1`] = `
 exports[`Ams Tagged Environments Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}">
-    <mlabeledtr data-latex="a&amp;=b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2023,7 +2023,7 @@ exports[`Ams Tagged Environments Align 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=d">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2047,7 +2047,7 @@ exports[`Ams Tagged Environments Align 1`] = `
 exports[`Ams Tagged Environments Align Notag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align} a&amp;=b \\\\ &amp;=c \\notag \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b \\\\ &amp;=c \\notag \\end{align}">
-    <mlabeledtr data-latex="a&amp;=b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2064,13 +2064,13 @@ exports[`Ams Tagged Environments Align Notag 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mtr data-latex="&amp;=\\notag">
+    <mtr data-latex="&amp;=c">
       <mtd></mtd>
       <mtd>
         <mstyle indentshift="2em">
           <mi></mi>
           <mo data-latex="=">=</mo>
-          <mi data-latex="\\notag">c</mi>
+          <mi data-latex="c">c</mi>
         </mstyle>
       </mtd>
     </mtr>
@@ -2112,7 +2112,7 @@ exports[`Ams Tagged Environments Align Star 1`] = `
 exports[`Ams Tagged Environments Alignat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}">
-    <mlabeledtr data-latex="a&amp;=b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2129,7 +2129,7 @@ exports[`Ams Tagged Environments Alignat 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=d">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2294,7 +2294,7 @@ exports[`Ams Tagged Environments Alignedat 1`] = `
 exports[`Ams Tagged Environments Eqnarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}">
-    <mlabeledtr data-latex="a&amp;=&amp;b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=&amp;b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2313,7 +2313,7 @@ exports[`Ams Tagged Environments Eqnarray 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=&amp;d">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=&amp;d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2374,7 +2374,7 @@ exports[`Ams Tagged Environments Eqnarray Star 1`] = `
 exports[`Ams Tagged Environments Equation 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{equation} a \\end{equation}" display="block">
   <mtable displaystyle="true" data-latex="\\begin{equation} a \\end{equation}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2397,7 +2397,7 @@ exports[`Ams Tagged Environments Equation Star 1`] = `
 exports[`Ams Tagged Environments Gather 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}">
-    <mlabeledtr data-latex="a=b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2409,7 +2409,7 @@ exports[`Ams Tagged Environments Gather 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c=d">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2495,7 +2495,7 @@ exports[`Ams Tagged Environments Gathered 1`] = `
 exports[`Ams Tagged Environments Left Gather Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{gather}\\begin{align} a &amp;= b \\end{align}\\end{gather}" display="block">
   <mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" side="left" data-latex="\\begin{gather}\\begin{align} a &amp;= b \\end{align}\\end{gather}">
-    <mlabeledtr data-latex="{align}">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;{align}">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -2503,7 +2503,7 @@ exports[`Ams Tagged Environments Left Gather Align 1`] = `
       </mtd>
       <mtd>
         <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" side="left" data-latex="{align}">
-          <mlabeledtr data-latex="a&amp;=b">
+          <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
             <mtd id="mjx-eqn:1">
               <mtext data-latex="\\text{(}">(</mtext>
               <mtext data-latex="\\text{1}">1</mtext>
@@ -2537,7 +2537,7 @@ exports[`Ams Tagged Environments Left multline tagged left 1`] = `
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd columnalign="left">
-        <mi data-latex="\\tag{1}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -2547,7 +2547,7 @@ exports[`Ams Tagged Environments Left multline tagged left 1`] = `
 exports[`Ams Tagged Environments Left xalign tagged left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center right left center" columnspacing="0em" columnwidth="fit auto auto fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle bottom top middle" side="left" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{2} a &amp; b \\tag{1}\\end{xalignat}">
-    <mlabeledtr data-latex="a&amp;\\tag{1}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;b">
       <mtd id="mjx-eqn:1">
         <mpadded width="0">
           <mtext data-latex="\\text{(}">(</mtext>
@@ -2561,7 +2561,7 @@ exports[`Ams Tagged Environments Left xalign tagged left 1`] = `
       </mtd>
       <mtd>
         <mstyle indentshift="2em">
-          <mi data-latex="\\tag{1}">b</mi>
+          <mi data-latex="b">b</mi>
         </mstyle>
       </mtd>
       <mtd></mtd>
@@ -2747,7 +2747,7 @@ exports[`Ams Tagged Environments aligned [x] 1`] = `
 exports[`Ams Tagged Environments flalign 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{flalign} a&amp;b &amp; \\end{flalign}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="right left center right" columnspacing="0em" columnwidth="auto auto fit auto" rowspacing="3pt" data-break-align="bottom top middle bottom" data-width-includes-label="true" data-latex="\\begin{flalign} a&amp;b &amp; \\end{flalign}">
-    <mlabeledtr data-latex="a&amp;b&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;b&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2771,7 +2771,7 @@ exports[`Ams Tagged Environments flalign 1`] = `
 exports[`Ams Tagged Environments xalignet 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{xalignat}{1} a&amp;b \\end{xalignat}" display="block">
   <mtable width="100%" displaystyle="true" columnalign="center right left center" columnspacing="0em" columnwidth="fit auto auto fit" rowspacing="3pt" data-break-align="middle bottom top middle" minlabelspacing="0" data-width-includes-label="true" data-latex="\\begin{xalignat}{1} a&amp;b \\end{xalignat}">
-    <mlabeledtr data-latex="a&amp;b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;b">
       <mtd id="mjx-eqn:1">
         <mpadded width="0" lspace="-1width">
           <mtext data-latex="\\text{(}">(</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index 4d91b7da5..021808512 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -7573,14 +7573,14 @@ exports[`Primes Triple Prime 1`] = `
 exports[`Referencing Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{A}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -7590,14 +7590,14 @@ exports[`Referencing Label 1`] = `
 exports[`Referencing Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -7607,24 +7607,24 @@ exports[`Referencing Label Empty 1`] = `
 exports[`Referencing Label Multiple 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}a\\label{A}\\\\c\\label{B}\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{eqnarray}a\\label{A}\\\\c\\label{B}\\end{eqnarray}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">c</mi>
+        <mi data-latex="c">c</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -7634,7 +7634,7 @@ exports[`Referencing Label Multiple 1`] = `
 exports[`Referencing Nonumber 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqnarray}a\\\\c\\nonumber\\end{eqnarray}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{eqnarray}a\\\\c\\nonumber\\end{eqnarray}">
-    <mlabeledtr data-latex="a">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -7644,9 +7644,9 @@ exports[`Referencing Nonumber 1`] = `
         <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr data-latex="\\nonumber">
+    <mtr data-latex="c">
       <mtd>
-        <mi data-latex="\\nonumber">c</mi>
+        <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -7656,14 +7656,14 @@ exports[`Referencing Nonumber 1`] = `
 exports[`Referencing Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\ref{A}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{A}\\ref{A}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a\\ref{A}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
         <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
           <mtext>???</mtext>
         </mrow>
@@ -7676,14 +7676,14 @@ exports[`Referencing Ref 1`] = `
 exports[`Referencing Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\ref{B}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{A}\\ref{B}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a\\ref{B}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
         <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
           <mtext>???</mtext>
         </mrow>
@@ -9026,7 +9026,7 @@ exports[`Sub and Superscripts SubSup 1`] = `
 exports[`Tagged Environments EqnTest 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="1em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}">
-    <mlabeledtr data-latex="a&amp;b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -9048,7 +9048,7 @@ exports[`Tagged Environments EqnTest 1`] = `
 exports[`Tagged Environments Equation 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{equation} x \\end{equation}" display="block">
   <mtable displaystyle="true" data-latex="\\begin{equation} x \\end{equation}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;x">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -9205,7 +9205,7 @@ exports[`User Defined Environments smallmatrix 1`] = `
 
 exports[`User Defined Macros EqRef 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\eqref{A}" display="block">
-  <mi data-latex="\\label{A}">a</mi>
+  <mi data-latex="a">a</mi>
   <mrow href="#" class="MathJax_ref" data-latex="\\eqref{A}">
     <mtext>(???)</mtext>
   </mrow>
diff --git a/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap
index f6514ec86..3b66bcd75 100644
--- a/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Cases.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Cases Numcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{numcases}">
-    <mlabeledtr data-latex="1&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;1&amp;&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -22,7 +22,7 @@ exports[`Cases Numcases 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="1&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;1&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -48,7 +48,7 @@ exports[`Cases Numcases 1`] = `
                       <mstyle indentshift="2em"></mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="0&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;0&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -73,7 +73,7 @@ exports[`Cases Numcases 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="1&amp;&amp;">
+                <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;1&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -124,7 +124,7 @@ exports[`Cases Numcases 1`] = `
         <mstyle indentshift="2em"></mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="0&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;0&amp;&amp;">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -150,7 +150,7 @@ exports[`Cases Numcases 1`] = `
 exports[`Cases Numcases with macro 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{A=} 1 &amp; if {x\\\\y}\\$ \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{A=} 1 &amp; if {x\\\\y}\\$ \\end{numcases}">
-    <mlabeledtr data-latex="1&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;1&amp;&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -166,7 +166,7 @@ exports[`Cases Numcases with macro 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="1&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;1&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -191,7 +191,7 @@ exports[`Cases Numcases with macro 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="1&amp;&amp;">
+                <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;1&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -248,7 +248,7 @@ exports[`Cases entry not in numcases 1`] = `
 exports[`Cases numcases with explicit tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{A=} x\\tag{A} &amp; y \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{A=} x\\tag{A} &amp; y \\end{numcases}">
-    <mlabeledtr data-latex="\\tag{A}&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;x&amp;&amp;">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
@@ -264,14 +264,14 @@ exports[`Cases numcases with explicit tag 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="\\tag{A}&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;x&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{A}">A</mtext>
                       <mtext data-latex="\\text{)}">)</mtext>
                     </mtd>
                     <mtd>
-                      <mi data-latex="\\tag{A}">x</mi>
+                      <mi data-latex="x">x</mi>
                     </mtd>
                     <mtd>
                       <mstyle indentshift="2em">
@@ -289,14 +289,14 @@ exports[`Cases numcases with explicit tag 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="\\tag{A}&amp;&amp;">
+                <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;x&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{A}">A</mtext>
                     <mtext data-latex="\\text{)}">)</mtext>
                   </mtd>
                   <mtd>
-                    <mi data-latex="\\tag{A}">x</mi>
+                    <mi data-latex="x">x</mi>
                   </mtd>
                   <mtd>
                     <mstyle indentshift="2em">
@@ -313,7 +313,7 @@ exports[`Cases numcases with explicit tag 1`] = `
         </mpadded>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
       <mtd>
         <mstyle indentshift="2em">
@@ -331,7 +331,7 @@ exports[`Cases numcases with explicit tag 1`] = `
 exports[`Cases subnumcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{subnumcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{subnumcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{subnumcases}{f(x)=} 1 &amp; if $x &gt; 0$ \\\\ 0 &amp; otherwise \\end{subnumcases}">
-    <mlabeledtr data-latex="1&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{1a}\\text{)}&amp;1&amp;&amp;">
       <mtd id="mjx-eqn:1a">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1a}">1a</mtext>
@@ -350,7 +350,7 @@ exports[`Cases subnumcases 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="1&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{1a}\\text{)}&amp;1&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1a}">1a</mtext>
@@ -376,7 +376,7 @@ exports[`Cases subnumcases 1`] = `
                       <mstyle indentshift="2em"></mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="0&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{1b}\\text{)}&amp;0&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1b}">1b</mtext>
@@ -401,7 +401,7 @@ exports[`Cases subnumcases 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="1&amp;&amp;">
+                <mlabeledtr data-latex="\\text{(}\\text{1a}\\text{)}&amp;1&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1a}">1a</mtext>
@@ -452,7 +452,7 @@ exports[`Cases subnumcases 1`] = `
         <mstyle indentshift="2em"></mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="0&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{1b}\\text{)}&amp;0&amp;&amp;">
       <mtd id="mjx-eqn:1b">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1b}">1b</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap
index dd632401a..326041006 100644
--- a/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Empheq.test.ts.snap
@@ -225,7 +225,7 @@ exports[`Empheq Characters empheqrvert 1`] = `
 exports[`Empheq Empheq Left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}[left=L\\Rightarrow]{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right right left" columnspacing="0em 0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}">
-    <mlabeledtr data-latex="a&amp;=b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -239,7 +239,7 @@ exports[`Empheq Empheq Left 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top">
-                  <mlabeledtr data-latex="a&amp;=b">
+                  <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -256,7 +256,7 @@ exports[`Empheq Empheq Left 1`] = `
                       </mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="c&amp;=d">
+                  <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -280,7 +280,7 @@ exports[`Empheq Empheq Left 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" align="baseline 1">
-                <mlabeledtr data-latex="a&amp;=b">
+                <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -313,7 +313,7 @@ exports[`Empheq Empheq Left 1`] = `
         </mstyle>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=d">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -338,7 +338,7 @@ exports[`Empheq Empheq Left 1`] = `
 exports[`Empheq Empheq Right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}[right=\\Leftarrow R]{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right left left" columnspacing="0em 0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a&amp;=b\\\\ c&amp;=d \\end{empheq}">
-    <mlabeledtr data-latex="a&amp;=b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -362,7 +362,7 @@ exports[`Empheq Empheq Right 1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top">
-                  <mlabeledtr data-latex="a&amp;=b">
+                  <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -379,7 +379,7 @@ exports[`Empheq Empheq Right 1`] = `
                       </mstyle>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="c&amp;=d">
+                  <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -403,7 +403,7 @@ exports[`Empheq Empheq Right 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" align="baseline 1">
-                <mlabeledtr data-latex="a&amp;=b">
+                <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;=b">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -426,7 +426,7 @@ exports[`Empheq Empheq Right 1`] = `
         </mpadded>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=d">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -450,7 +450,7 @@ exports[`Empheq Empheq Right 1`] = `
 exports[`Empheq Numcases  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}[right=x]{align} a \\\\ b&amp;=c \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right left left" columnspacing="0em 0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align} a \\\\ b&amp;=c \\end{empheq}">
-    <mlabeledtr data-latex="a">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -467,7 +467,7 @@ exports[`Empheq Numcases  1`] = `
             <mphantom>
               <mpadded width="0">
                 <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top">
-                  <mlabeledtr data-latex="a">
+                  <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -477,7 +477,7 @@ exports[`Empheq Numcases  1`] = `
                       <mi data-latex="a">a</mi>
                     </mtd>
                   </mlabeledtr>
-                  <mlabeledtr data-latex="b&amp;=c">
+                  <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;b&amp;=c">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{2}">2</mtext>
@@ -501,7 +501,7 @@ exports[`Empheq Numcases  1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" align="baseline 1">
-                <mlabeledtr data-latex="a">
+                <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
@@ -517,7 +517,7 @@ exports[`Empheq Numcases  1`] = `
         </mpadded>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="b&amp;=c">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;b&amp;=c">
       <mtd id="mjx-eqn:2">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -541,7 +541,7 @@ exports[`Empheq Numcases  1`] = `
 exports[`Empheq Numcases alignedat 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{empheq}{alignat=2} a &amp; b &amp; c &amp; d \\end{empheq}" display="block">
   <mtable displaystyle="true" columnalign="right left right left" columnspacing="0em 0em 0em" rowspacing="3pt" data-break-align="bottom top bottom top" data-latex="\\begin{alignat}{2} a &amp; b &amp; c &amp; d \\end{empheq}">
-    <mlabeledtr data-latex="a&amp;b&amp;c&amp;d">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;b&amp;c&amp;d">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -623,7 +623,7 @@ exports[`Empheq Numcases empty right 1`] = `
 exports[`Empheq Numcases with label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{numcases}{A=\\label{test}} a&amp;=b \\end{numcases}" display="block">
   <mtable columnalign="right left left left" columnspacing="0em 1em" rowspacing=".2em" data-break-align="top top top" data-latex="\\begin{numcases}{A=\\label{test}} a&amp;=b \\end{numcases}">
-    <mlabeledtr data-latex="a&amp;&amp;">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;&amp;">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -633,13 +633,13 @@ exports[`Empheq Numcases with label 1`] = `
         <mpadded height="0" depth="0" voffset="height">
           <mpadded height="0" depth="0" voffset="-1height">
             <mi data-latex="A">A</mi>
-            <mo data-latex="\\label{test}">=</mo>
+            <mo data-latex="=">=</mo>
             <mo data-latex="\\mmlToken{mo}{\\U{7B}}">{</mo>
             <mspace width="0.167em" data-latex="\\,"></mspace>
             <mphantom>
               <mpadded width="0">
                 <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top">
-                  <mlabeledtr data-latex="a&amp;&amp;">
+                  <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;&amp;">
                     <mtd>
                       <mtext data-latex="\\text{(}">(</mtext>
                       <mtext data-latex="\\text{1}">1</mtext>
@@ -664,7 +664,7 @@ exports[`Empheq Numcases with label 1`] = `
           <mphantom>
             <mpadded width="0">
               <mtable columnalign="left left left" columnspacing="1em" rowspacing=".2em" data-break-align="top top top" align="baseline 1">
-                <mlabeledtr data-latex="a&amp;&amp;">
+                <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a&amp;&amp;">
                   <mtd>
                     <mtext data-latex="\\text{(}">(</mtext>
                     <mtext data-latex="\\text{1}">1</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
index a844809e3..949b5ba8c 100644
--- a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
@@ -3915,14 +3915,14 @@ exports[`Mathtools Symbols Other 1`] = `
 exports[`Mathtools Tagging Tags add 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newtagform{bars}||\\usetagform{bars} x\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="\\newtagform{bars}||\\usetagform{bars} x\\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{|}\\text{1}\\text{|}&amp;x">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{|}">|</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{|}">|</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -3932,7 +3932,7 @@ exports[`Mathtools Tagging Tags add 1`] = `
 exports[`Mathtools Tagging newtagform 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newtagform{brackets}{[}{]}\\usetagform{brackets} E=mc^2\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="\\newtagform{brackets}{[}{]}\\usetagform{brackets} E=mc^2 \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{[}\\text{1}\\text{]}&amp;E=m c^2">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -3955,7 +3955,7 @@ exports[`Mathtools Tagging newtagform 1`] = `
 exports[`Mathtools Tagging newtagform styled 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newtagform{bfbrackets}[\\textbf]{[}{]}\\usetagform{bfbrackets} E=mc^2\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="\\newtagform{bfbrackets}[\\textbf]{[}{]}\\usetagform{bfbrackets} E=mc^2 \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{[}\\text{\\textbf{1}}\\text{]}&amp;E=m c^2">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{\\textbf{1}}">\\textbf{1}</mtext>
@@ -3978,7 +3978,7 @@ exports[`Mathtools Tagging newtagform styled 1`] = `
 exports[`Mathtools Tagging refeq 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}E=mc^2\\label{test}\\tag*{\\textsf{A}}\\\\ \\refeq{test}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}E=mc^2 \\label{test}\\tag*{\\textsf{A}}\\\\ \\refeq{test}\\end{align}">
-    <mlabeledtr data-latex="E=m c^2">
+    <mlabeledtr data-latex="\\text{\\textsf{A}}&amp;E=m c^2">
       <mtd id="mjx-eqn:test">
         <mtext data-latex="\\text{\\textsf{A}}">\\textsf{A}</mtext>
       </mtd>
@@ -4006,7 +4006,7 @@ exports[`Mathtools Tagging refeq 1`] = `
 exports[`Mathtools Tagging renewtagform 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newtagform{a}{(}{)}\\renewtagform{a}{((}{))}\\usetagform{a} E=mc^2\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="\\newtagform{a}{(}{)}\\renewtagform{a}{((}{))}\\usetagform{a} E=mc^2 \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{((}\\text{1}\\text{))}&amp;E=m c^2">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{((}">((</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -4247,7 +4247,7 @@ exports[`Mathtools options pairedDelimiters 3`] = `
 exports[`Mathtools options tagforms 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\usetagform{bold} a=b\\tag{x}" display="block">
   <mtable displaystyle="true" data-latex="\\usetagform{bold} a=b\\tag{x}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{[[}\\text{\\mathbf{x}}\\text{]]}&amp;a=b">
       <mtd id="mjx-eqn:x">
         <mtext data-latex="\\text{[[}">[[</mtext>
         <mtext data-latex="\\text{\\mathbf{x}}">\\mathbf{x}</mtext>
@@ -4256,7 +4256,7 @@ exports[`Mathtools options tagforms 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
-        <mi data-latex="\\tag{x}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -4266,14 +4266,14 @@ exports[`Mathtools options tagforms 1`] = `
 exports[`Mathtools options tagforms reset 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\usetagform{bold} \\usetagform{} a\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="\\usetagform{bold} \\usetagform{} a\\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
diff --git a/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
index c73a13af8..cf9c3ea9a 100644
--- a/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
@@ -24,7 +24,7 @@ exports[`Setoptions Require Require with option 1`] = `
 exports[`Setoptions Set TeX option 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions{tagSide=left} a=b\\tag{1}" display="block">
   <mtable side="left" displaystyle="true" data-latex="\\setOptions{tagSide=left} a=b\\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a=b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -33,7 +33,7 @@ exports[`Setoptions Set TeX option 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
-        <mi data-latex="\\tag{1}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
index 832cdf8f9..3f2274324 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
@@ -4,7 +4,7 @@ exports[`Page References Forward Reference 1`] = `
 [
   "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a=b\\label{eq1}\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="a=b\\label{eq1}\\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a=b">
       <mtd id="mjx-eqn:eq1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -13,7 +13,7 @@ exports[`Page References Forward Reference 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
-        <mi data-latex="\\tag{1}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -35,7 +35,7 @@ exports[`Page References Forward Reference 2`] = `
 </math>",
   "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a=b\\label{eq1}\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="a=b\\label{eq1}\\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a=b">
       <mtd id="mjx-eqn:eq1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -44,7 +44,7 @@ exports[`Page References Forward Reference 2`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
-        <mi data-latex="\\tag{1}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -55,14 +55,14 @@ exports[`Page References Forward Reference 2`] = `
 exports[`Page References LabelIds 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{eq1}\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{eq1}\\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -72,7 +72,7 @@ exports[`Page References LabelIds 1`] = `
 exports[`TagAll Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr data-latex="a">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -89,7 +89,7 @@ exports[`TagAll Align 1`] = `
 exports[`TagAll Align Two labels 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}">
-    <mlabeledtr data-latex="a=\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a=b">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -98,10 +98,10 @@ exports[`TagAll Align Two labels 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
-        <mi data-latex="\\label{A}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -114,7 +114,7 @@ exports[`TagAll Align Two labels 1`] = `
         <mstyle indentshift="2em">
           <mi></mi>
           <mo data-latex="=">=</mo>
-          <mi data-latex="\\label{B}">d</mi>
+          <mi data-latex="d">d</mi>
         </mstyle>
       </mtd>
     </mlabeledtr>
@@ -125,14 +125,14 @@ exports[`TagAll Align Two labels 1`] = `
 exports[`TagAll Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\eqref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -145,14 +145,14 @@ exports[`TagAll Eqref 1`] = `
 exports[`TagAll Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -162,14 +162,14 @@ exports[`TagAll Label 1`] = `
 exports[`TagAll Label Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -179,14 +179,14 @@ exports[`TagAll Label Default 1`] = `
 exports[`TagAll Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{}\\end{align}">
-    <mlabeledtr data-latex="\\label{}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -196,14 +196,14 @@ exports[`TagAll Label Empty 1`] = `
 exports[`TagAll Label Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -213,24 +213,24 @@ exports[`TagAll Label Named 1`] = `
 exports[`TagAll Label Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -240,24 +240,24 @@ exports[`TagAll Label Named Default 1`] = `
 exports[`TagAll Label Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -294,9 +294,9 @@ exports[`TagAll MultLine 1`] = `
 exports[`TagAll Notag Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\notag\\end{align}">
-    <mtr data-latex="\\notag">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\notag">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -318,7 +318,7 @@ exports[`TagAll Notag Multline 1`] = `
     </mtr>
     <mtr>
       <mtd columnalign="right">
-        <mi data-latex="\\notag">c</mi>
+        <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -328,9 +328,9 @@ exports[`TagAll Notag Multline 1`] = `
 exports[`TagAll Notag Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}">
-    <mtr data-latex="\\notag">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\notag">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -340,14 +340,14 @@ exports[`TagAll Notag Tag 1`] = `
 exports[`TagAll Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -360,14 +360,14 @@ exports[`TagAll Ref 1`] = `
 exports[`TagAll Ref Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -380,14 +380,14 @@ exports[`TagAll Ref Default 1`] = `
 exports[`TagAll Ref Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -400,24 +400,24 @@ exports[`TagAll Ref Named 1`] = `
 exports[`TagAll Ref Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -433,24 +433,24 @@ exports[`TagAll Ref Named Default 1`] = `
 exports[`TagAll Ref Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -466,14 +466,14 @@ exports[`TagAll Ref Named Named 1`] = `
 exports[`TagAll Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -486,7 +486,7 @@ exports[`TagAll Ref Unknown 1`] = `
 exports[`TagAll Single Expression 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a" display="block">
   <mtable displaystyle="true" data-latex="a">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -503,7 +503,7 @@ exports[`TagAll Single Expression 1`] = `
 exports[`TagAll Tag Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr data-latex="a">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -520,14 +520,14 @@ exports[`TagAll Tag Default 1`] = `
 exports[`TagAll Tag Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -537,17 +537,17 @@ exports[`TagAll Tag Named 1`] = `
 exports[`TagAll Tag Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -564,24 +564,24 @@ exports[`TagAll Tag Named Default 1`] = `
 exports[`TagAll Tag Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\tag{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -591,7 +591,7 @@ exports[`TagAll Tag Named Named 1`] = `
 exports[`TagAms Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr data-latex="a">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -608,7 +608,7 @@ exports[`TagAms Align 1`] = `
 exports[`TagAms Align Two labels 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex="\\begin{align}a=b\\label{A}\\\\ c&amp;=d \\label{B}\\end{align}">
-    <mlabeledtr data-latex="a=\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a=b">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -617,10 +617,10 @@ exports[`TagAms Align Two labels 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mo data-latex="=">=</mo>
-        <mi data-latex="\\label{A}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="c&amp;=\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{2}\\text{)}&amp;c&amp;=d">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{2}">2</mtext>
@@ -633,7 +633,7 @@ exports[`TagAms Align Two labels 1`] = `
         <mstyle indentshift="2em">
           <mi></mi>
           <mo data-latex="=">=</mo>
-          <mi data-latex="\\label{B}">d</mi>
+          <mi data-latex="d">d</mi>
         </mstyle>
       </mtd>
     </mlabeledtr>
@@ -644,14 +644,14 @@ exports[`TagAms Align Two labels 1`] = `
 exports[`TagAms Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\eqref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -664,14 +664,14 @@ exports[`TagAms Eqref 1`] = `
 exports[`TagAms Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -681,14 +681,14 @@ exports[`TagAms Label 1`] = `
 exports[`TagAms Label Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -698,14 +698,14 @@ exports[`TagAms Label Default 1`] = `
 exports[`TagAms Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{}\\end{align}">
-    <mlabeledtr data-latex="\\label{}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -715,14 +715,14 @@ exports[`TagAms Label Empty 1`] = `
 exports[`TagAms Label Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -732,24 +732,24 @@ exports[`TagAms Label Named 1`] = `
 exports[`TagAms Label Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -759,24 +759,24 @@ exports[`TagAms Label Named Default 1`] = `
 exports[`TagAms Label Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -813,9 +813,9 @@ exports[`TagAms MultLine 1`] = `
 exports[`TagAms Notag Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\notag\\end{align}">
-    <mtr data-latex="\\notag">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\notag">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -837,7 +837,7 @@ exports[`TagAms Notag Multline 1`] = `
     </mtr>
     <mtr>
       <mtd columnalign="right">
-        <mi data-latex="\\notag">c</mi>
+        <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -847,9 +847,9 @@ exports[`TagAms Notag Multline 1`] = `
 exports[`TagAms Notag Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}">
-    <mtr data-latex="\\notag">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\notag">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -859,14 +859,14 @@ exports[`TagAms Notag Tag 1`] = `
 exports[`TagAms Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -879,14 +879,14 @@ exports[`TagAms Ref 1`] = `
 exports[`TagAms Ref Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -899,14 +899,14 @@ exports[`TagAms Ref Default 1`] = `
 exports[`TagAms Ref Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -919,24 +919,24 @@ exports[`TagAms Ref Named 1`] = `
 exports[`TagAms Ref Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -952,24 +952,24 @@ exports[`TagAms Ref Named Default 1`] = `
 exports[`TagAms Ref Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -985,14 +985,14 @@ exports[`TagAms Ref Named Named 1`] = `
 exports[`TagAms Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1023,7 +1023,7 @@ exports[`TagAms Split 1`] = `
 exports[`TagAms Tag Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\end{align}">
-    <mlabeledtr data-latex="a">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -1040,14 +1040,14 @@ exports[`TagAms Tag Default 1`] = `
 exports[`TagAms Tag Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1057,17 +1057,17 @@ exports[`TagAms Tag Named 1`] = `
 exports[`TagAms Tag Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="b">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;b">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -1084,24 +1084,24 @@ exports[`TagAms Tag Named Default 1`] = `
 exports[`TagAms Tag Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\tag{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1123,9 +1123,9 @@ exports[`TagNone Align 1`] = `
 exports[`TagNone Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\eqref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr data-latex="\\label{A}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1138,9 +1138,9 @@ exports[`TagNone Eqref 1`] = `
 exports[`TagNone Label 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mtr data-latex="\\label{A}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1150,9 +1150,9 @@ exports[`TagNone Label 1`] = `
 exports[`TagNone Label Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{A}\\end{align}">
-    <mtr data-latex="\\label{A}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1162,9 +1162,9 @@ exports[`TagNone Label Default 1`] = `
 exports[`TagNone Label Empty 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\label{}\\end{align}">
-    <mtr data-latex="\\label{}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1174,14 +1174,14 @@ exports[`TagNone Label Empty 1`] = `
 exports[`TagNone Label Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1191,19 +1191,19 @@ exports[`TagNone Label Named 1`] = `
 exports[`TagNone Label Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr data-latex="\\label{B}">
+    <mtr data-latex="b">
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1213,24 +1213,24 @@ exports[`TagNone Label Named Default 1`] = `
 exports[`TagNone Label Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1262,9 +1262,9 @@ exports[`TagNone MultLine 1`] = `
 exports[`TagNone Notag Align 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\notag\\end{align}">
-    <mtr data-latex="\\notag">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\notag">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1286,7 +1286,7 @@ exports[`TagNone Notag Multline 1`] = `
     </mtr>
     <mtr>
       <mtd columnalign="right">
-        <mi data-latex="\\notag">c</mi>
+        <mi data-latex="c">c</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1296,9 +1296,9 @@ exports[`TagNone Notag Multline 1`] = `
 exports[`TagNone Notag Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\notag\\end{align}">
-    <mtr data-latex="\\notag">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\notag">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1308,9 +1308,9 @@ exports[`TagNone Notag Tag 1`] = `
 exports[`TagNone Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr data-latex="\\label{A}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1323,9 +1323,9 @@ exports[`TagNone Ref 1`] = `
 exports[`TagNone Ref Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr data-latex="\\label{A}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1338,14 +1338,14 @@ exports[`TagNone Ref Default 1`] = `
 exports[`TagNone Ref Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\end{align}\\ref{A}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1358,19 +1358,19 @@ exports[`TagNone Ref Named 1`] = `
 exports[`TagNone Ref Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mtr data-latex="\\label{B}">
+    <mtr data-latex="b">
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1386,24 +1386,24 @@ exports[`TagNone Ref Named Default 1`] = `
 exports[`TagNone Ref Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\label{A}\\\\b\\tag{B}\\label{B}\\end{align}\\ref{A}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mlabeledtr data-latex="\\label{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\label{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\label{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1419,9 +1419,9 @@ exports[`TagNone Ref Named Named 1`] = `
 exports[`TagNone Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\label{A}\\end{align}\\ref{B}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="{align}">
-    <mtr data-latex="\\label{A}">
+    <mtr data-latex="a">
       <mtd>
-        <mi data-latex="\\label{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -1434,14 +1434,14 @@ exports[`TagNone Ref Unknown 1`] = `
 exports[`TagNone Simple Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\tag{0}" display="block">
   <mtable displaystyle="true" data-latex="a\\tag{0}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{0}\\text{)}&amp;a">
       <mtd id="mjx-eqn:0">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{0}">0</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{0}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1481,14 +1481,14 @@ exports[`TagNone Tag Default 1`] = `
 exports[`TagNone Tag Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -1498,14 +1498,14 @@ exports[`TagNone Tag Named 1`] = `
 exports[`TagNone Tag Named Default 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
     <mtr data-latex="b">
@@ -1520,24 +1520,24 @@ exports[`TagNone Tag Named Default 1`] = `
 exports[`TagNone Tag Named Named 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}a\\tag{A}\\\\b\\tag{B}\\end{align}">
-    <mlabeledtr data-latex="\\tag{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{A}\\text{)}&amp;a">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{A}">A</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{A}">a</mi>
+        <mi data-latex="a">a</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\tag{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{B}\\text{)}&amp;b">
       <mtd id="mjx-eqn:B">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{B}">B</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{B}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
diff --git a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
index 4d61726e7..ef45268a7 100644
--- a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
@@ -3,14 +3,14 @@
 exports[`Tagformat Array tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="x \\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="x \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{|}\\text{1}\\text{|}&amp;x">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{|}">|</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{|}">|</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -20,13 +20,13 @@ exports[`Tagformat Array tag 1`] = `
 exports[`Tagformat Array tag with empty entry 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="x \\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="x \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{1}\\text{.}&amp;x">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{.}">.</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -36,13 +36,13 @@ exports[`Tagformat Array tag with empty entry 1`] = `
 exports[`Tagformat Array tag with null entry 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="x \\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="x \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{1}\\text{.}&amp;x">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{.}">.</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -52,14 +52,14 @@ exports[`Tagformat Array tag with null entry 1`] = `
 exports[`Tagformat Basic tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="x \\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="x \\tag{1}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{[}\\text{1}\\text{]}&amp;x">
       <mtd id="my-tag:1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{]}">]</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{1}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
@@ -69,17 +69,17 @@ exports[`Tagformat Basic tag 1`] = `
 exports[`Tagformat Custom ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}">
-    <mlabeledtr data-latex="\\tag{x}">
+    <mlabeledtr data-latex="\\text{(}\\text{x}\\text{)}&amp;x">
       <mtd id="mjx-eqn:test">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{x}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\eqref{test}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;\\eqref{test}">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -98,17 +98,17 @@ exports[`Tagformat Custom ref 1`] = `
 exports[`Tagformat Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\eqref{test} \\end{align}">
-    <mlabeledtr data-latex="\\tag{x}">
+    <mlabeledtr data-latex="\\text{[}\\text{x}\\text{]}&amp;x">
       <mtd id="my-tag:test">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
         <mtext data-latex="\\text{]}">]</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{x}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\eqref{test}">
+    <mlabeledtr data-latex="\\text{[}\\text{A1}\\text{]}&amp;\\eqref{test}">
       <mtd id="my-tag:A1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{A1}">A1</mtext>
@@ -127,17 +127,17 @@ exports[`Tagformat Eqref 1`] = `
 exports[`Tagformat Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\ref{test} \\end{align}" display="block">
   <mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex="\\begin{align}x \\label{test}\\tag{x}\\\\ \\ref{test} \\end{align}">
-    <mlabeledtr data-latex="\\tag{x}">
+    <mlabeledtr data-latex="\\text{[}\\text{x}\\text{]}&amp;x">
       <mtd id="my-tag:test">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
         <mtext data-latex="\\text{]}">]</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{x}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\ref{test}">
+    <mlabeledtr data-latex="\\text{[}\\text{A1}\\text{]}&amp;\\ref{test}">
       <mtd id="my-tag:A1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{A1}">A1</mtext>
@@ -156,14 +156,14 @@ exports[`Tagformat Ref 1`] = `
 exports[`Tagformat Text tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="x \\tag{x}" display="block">
   <mtable displaystyle="true" data-latex="x \\tag{x}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{[}\\text{x}\\text{]}&amp;x">
       <mtd id="my-tag:x">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{x}">x</mtext>
         <mtext data-latex="\\text{]}">]</mtext>
       </mtd>
       <mtd>
-        <mi data-latex="\\tag{x}">x</mi>
+        <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
   </mtable>
diff --git a/ts/input/tex/NodeUtil.ts b/ts/input/tex/NodeUtil.ts
index d04028da2..b4e458ad4 100644
--- a/ts/input/tex/NodeUtil.ts
+++ b/ts/input/tex/NodeUtil.ts
@@ -32,6 +32,7 @@ import { MmlMo } from '../../core/MmlTree/MmlNodes/mo.js';
 import { Property, PropertyList } from '../../core/Tree/Node.js';
 import { Args } from './Types.js';
 import { OperatorDef } from '../../core/MmlTree/OperatorDictionary.js';
+import { TexConstant } from './TexConstants.js';
 
 const NodeUtil = {
   attrs: new Set<string>([
@@ -78,6 +79,31 @@ const NodeUtil = {
     return node.getText();
   },
 
+  /**
+   * Reconstructs the LaTeX source of a node (e.g., an mtd) from the
+   * `data-latex` attributes of the children of its first child (e.g., to
+   * rebuild the source of a table cell from its content nodes).
+   *
+   * @param {MmlNode} node The node whose content's LaTeX source should be
+   *     reconstructed.
+   * @returns {string} The reconstructed LaTeX source.
+   */
+  getChildrenLatex(node: MmlNode): string {
+    const children = node.childNodes[0]?.childNodes || [];
+    let expr = '';
+    for (const child of children) {
+      const att = ((child as MmlNode)?.attributes?.get(
+        TexConstant.Attr.LATEX
+      ) || '') as string;
+      if (!att) continue;
+      expr +=
+        expr && expr.match(/[a-zA-Z]$/) && att.match(/^[a-zA-Z]/)
+          ? ' ' + att
+          : att;
+    }
+    return expr;
+  },
+
   /**
    * Append children to a node.
    *
diff --git a/ts/input/tex/Tags.ts b/ts/input/tex/Tags.ts
index 0f62b716a..08a7c68bc 100644
--- a/ts/input/tex/Tags.ts
+++ b/ts/input/tex/Tags.ts
@@ -26,6 +26,8 @@ import { MmlNode } from '../../core/MmlTree/MmlNode.js';
 import { MathItem } from '../../core/MathItem.js';
 import { EnvList } from './StackItem.js';
 import ParseOptions from './ParseOptions.js';
+import NodeUtil from './NodeUtil.js';
+import { TexConstant } from './TexConstants.js';
 
 /**
  *  Simple class for label objects.
@@ -535,6 +537,14 @@ export class AbstractTags implements Tags {
     const nf = this.configuration.nodeFactory;
     const cell = nf.create('node', 'mtd', [node]);
     const row = nf.create('node', 'mlabeledtr', [tag, cell]);
+    const latex = [
+      NodeUtil.getChildrenLatex(tag),
+      NodeUtil.getChildrenLatex(cell),
+    ].join('&');
+    if (latex) {
+      row.attributes.set(TexConstant.Attr.LATEXITEM, latex);
+      row.attributes.set(TexConstant.Attr.LATEX, latex);
+    }
     const table = nf.create('node', 'mtable', [row], {
       side: this.configuration.options['tagSide'],
       minlabelspacing: this.configuration.options['tagIndent'],
diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts
index 48f27addc..f996115b6 100644
--- a/ts/input/tex/TexParser.ts
+++ b/ts/input/tex/TexParser.ts
@@ -73,6 +73,12 @@ export default class TexParser {
    */
   private saveI: number = 0;
 
+  /**
+   * Set by skipLatex() to tell the next call to updateResult() that LaTeX
+   * sources of the current macro does not produce an Mml node.
+   */
+  private _skipLatex: boolean = false;
+
   /**
    * @class
    * @param {string} _string The string to parse.
@@ -245,6 +251,15 @@ export default class TexParser {
     }
   }
 
+  /**
+   * Marks the LaTeX source as skippable, so macros producing no Mml node (e.g.,
+   * \label, \tag, \notag) do not have their source code attached to the
+   * `data-latex` attribute of the most recently created node.
+   */
+  public skipLatex() {
+    this._skipLatex = true;
+  }
+
   /**
    * @returns {MmlNode} The internal Mathml structure.
    */
@@ -643,6 +658,10 @@ export default class TexParser {
    */
   // Currently works without translating environments that generate typesetting.
   private updateResult(input: string, old: number) {
+    if (this._skipLatex) {
+      this._skipLatex = false;
+      return;
+    }
     const node = this.stack.Prev(true) as MmlNode;
     if (!node) {
       return;
diff --git a/ts/input/tex/ams/AmsMethods.ts b/ts/input/tex/ams/AmsMethods.ts
index 976a0ed45..f55e9737e 100644
--- a/ts/input/tex/ams/AmsMethods.ts
+++ b/ts/input/tex/ams/AmsMethods.ts
@@ -779,6 +779,7 @@ export const AmsMethods: { [key: string]: ParseMethod } = {
     const tagId = UnitUtil.trimSpaces(parser.GetArgument(name));
     parser.tags.tag(tagId, star);
     parser.Push(parser.itemFactory.create('null'));
+    parser.skipLatex();
   },
 
   HandleNoTag: BaseMethods.HandleNoTag,
diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts
index f3f99016d..309bbe8ca 100644
--- a/ts/input/tex/base/BaseItems.ts
+++ b/ts/input/tex/base/BaseItems.ts
@@ -1394,18 +1394,7 @@ export class ArrayItem extends BaseItem {
    * @returns {string} The LaTeX source of the cell content.
    */
   public cellLatex(mtd: MmlNode): string {
-    const children = mtd.childNodes[0]?.childNodes || [];
-    let expr = '';
-    for (const child of children) {
-      const att = (child?.attributes?.get(TexConstant.Attr.LATEX) ||
-        '') as string;
-      if (!att) continue;
-      expr +=
-        expr && expr.match(/[a-zA-Z]$/) && att.match(/^[a-zA-Z]/)
-          ? ' ' + att
-          : att;
-    }
-    return expr;
+    return NodeUtil.getChildrenLatex(mtd);
   }
 
   /**
@@ -1536,6 +1525,7 @@ export class EqnArrayItem extends ArrayItem {
     const tag = this.factory.configuration.tags.getTag();
     if (tag) {
       this.row = [tag].concat(this.row);
+      this.rowLatex = [this.cellLatex(tag)].concat(this.rowLatex);
       this.setProperty('isLabeled', true);
     }
     this.factory.configuration.tags.clearTag();
diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts
index 4fcf2badb..4ea0b9f16 100644
--- a/ts/input/tex/base/BaseMethods.ts
+++ b/ts/input/tex/base/BaseMethods.ts
@@ -2162,6 +2162,7 @@ const BaseMethods: { [key: string]: ParseMethod } = {
    */
   HandleNoTag(parser: TexParser, _name: string) {
     parser.tags.notag();
+    parser.skipLatex();
   },
 
   /**
@@ -2175,6 +2176,7 @@ const BaseMethods: { [key: string]: ParseMethod } = {
     const label = parser.GetArgument(name);
     if (label === '') {
       // @test Label Empty
+      parser.skipLatex();
       return;
     }
     // @test Label, Ref, Ref Unknown
@@ -2198,6 +2200,7 @@ const BaseMethods: { [key: string]: ParseMethod } = {
       // TODO: This should be set in the tags structure!
       parser.tags.labels[label] = new Label(); // will be replaced by tag value later
     }
+    parser.skipLatex();
   },
 
   /**

From 388383620d375922d07f3aa88a13ec3c3deb7975 Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Tue, 14 Jul 2026 19:15:04 +0200
Subject: [PATCH 04/11] extend correct row handling to multline environments

---
 .../input/tex/__snapshots__/Ams.test.ts.snap  | 80 +++++++++----------
 .../tex/__snapshots__/Mathtools.test.ts.snap  | 56 ++++++-------
 .../tex/__snapshots__/SetOptions.test.ts.snap | 12 +--
 .../input/tex/__snapshots__/Tag.test.ts.snap  | 36 ++++-----
 ts/input/tex/ams/AmsItems.ts                  | 13 +++
 5 files changed, 105 insertions(+), 92 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
index 1259e3178..2d3785a41 100644
--- a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
@@ -1191,17 +1191,17 @@ exports[`Ams Environments Gathered 1`] = `
 exports[`Ams Environments Multline 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\ b \\\\ c \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\ b \\\\ c \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1213,17 +1213,17 @@ exports[`Ams Environments Multline 1`] = `
 exports[`Ams Environments Multline Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline*} a\\\\ b \\\\ c \\end{multline*}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline*} a\\\\ b \\\\ c \\end{multline*}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -2530,7 +2530,7 @@ exports[`Ams Tagged Environments Left Gather Align 1`] = `
 exports[`Ams Tagged Environments Left multline tagged left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\tag{1} \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" side="left" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\tag{1} \\end{multline}">
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2578,17 +2578,17 @@ exports[`Ams Tagged Environments Left xalign tagged left 1`] = `
 exports[`Ams Tagged Environments Multline 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\ b \\\\ c \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\ b \\\\ c \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;c">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -2605,17 +2605,17 @@ exports[`Ams Tagged Environments Multline 1`] = `
 exports[`Ams Tagged Environments Multline Star 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline*} a\\\\ b \\\\ c \\end{multline*}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline*} a\\\\ b \\\\ c \\end{multline*}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3330,17 +3330,17 @@ exports[`Multirel Preset Rspace Lspace 1`] = `
 exports[`MultlineShove Shove Left Bottom 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\ b\\\\\\shoveleft c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\ b\\\\\\shoveleft c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="left">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3352,17 +3352,17 @@ exports[`MultlineShove Shove Left Bottom 1`] = `
 exports[`MultlineShove Shove Left Middle 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\\\shoveleft b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\\\shoveleft b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="left">
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3374,17 +3374,17 @@ exports[`MultlineShove Shove Left Middle 1`] = `
 exports[`MultlineShove Shove Left Right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\\\shoveleft\\shoveright b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\\\shoveleft\\shoveright b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="right">
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3396,17 +3396,17 @@ exports[`MultlineShove Shove Left Right 1`] = `
 exports[`MultlineShove Shove Left Top 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}\\shoveleft a\\\\ b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}\\shoveleft a\\\\ b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3418,17 +3418,17 @@ exports[`MultlineShove Shove Left Top 1`] = `
 exports[`MultlineShove Shove None 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\ b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\ b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3440,17 +3440,17 @@ exports[`MultlineShove Shove None 1`] = `
 exports[`MultlineShove Shove Right Bottom 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\ b\\\\\\shoveright c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\ b\\\\\\shoveright c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3462,17 +3462,17 @@ exports[`MultlineShove Shove Right Bottom 1`] = `
 exports[`MultlineShove Shove Right Left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\\\shoveright\\shoveleft b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\\\shoveright\\shoveleft b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="left">
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3484,17 +3484,17 @@ exports[`MultlineShove Shove Right Left 1`] = `
 exports[`MultlineShove Shove Right Middle 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline} a\\\\\\shoveright b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline} a\\\\\\shoveright b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="right">
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -3506,17 +3506,17 @@ exports[`MultlineShove Shove Right Middle 1`] = `
 exports[`MultlineShove Shove Right Top 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}\\shoveright a\\\\ b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}\\shoveright a\\\\ b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="right">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
index 949b5ba8c..b76a42e37 100644
--- a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
@@ -1650,7 +1650,7 @@ exports[`Mathtools More Environments lgathered 1`] = `
 exports[`Mathtools More Environments multlined [b] width 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined}[b][7cm]\\framebox[4cm]{first}\\\\\\framebox[4cm]{last}\\end{multlined} = B" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="7cm" columnwidth="100%" align="baseline -1" data-latex="{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1662,7 +1662,7 @@ exports[`Mathtools More Environments multlined [b] width 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -1683,7 +1683,7 @@ exports[`Mathtools More Environments multlined [b] width 1`] = `
 exports[`Mathtools More Environments multlined [c] width 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined}[c][7cm]\\framebox[4cm]{first}\\\\\\framebox[4cm]{last}\\end{multlined} = B" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="7cm" columnwidth="100%" data-latex="{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1695,7 +1695,7 @@ exports[`Mathtools More Environments multlined [c] width 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -1716,7 +1716,7 @@ exports[`Mathtools More Environments multlined [c] width 1`] = `
 exports[`Mathtools More Environments multlined [t] width 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined}[t][7cm]\\framebox[4cm]{first}\\\\\\framebox[4cm]{last}\\end{multlined} = B" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="7cm" columnwidth="100%" align="baseline 1" data-latex="{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1728,7 +1728,7 @@ exports[`Mathtools More Environments multlined [t] width 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -1751,7 +1751,7 @@ exports[`Mathtools More Environments multlined 1`] = `
   <mi data-latex="A">A</mi>
   <mo data-latex="=">=</mo>
   <mtable displaystyle="true" rowspacing=".5em" columnwidth="100%" align="baseline 1" data-latex="{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1763,7 +1763,7 @@ exports[`Mathtools More Environments multlined 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -1783,7 +1783,7 @@ exports[`Mathtools More Environments multlined 1`] = `
 exports[`Mathtools More Environments multlined empty row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined} a \\\\ \\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnwidth="100%" data-latex="\\begin{multlined} a \\\\ \\end{multlined}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -1795,7 +1795,7 @@ exports[`Mathtools More Environments multlined empty row 1`] = `
 exports[`Mathtools More Environments multlined shoved 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined}[c][7cm]\\framebox[4cm]{first} \\\\\\shoveright{\\framebox[4cm]{second}} \\\\\\shoveleft{\\framebox[4cm]{third}} \\\\\\framebox[4cm]{last}\\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="7cm" columnwidth="100%" data-latex="\\begin{multlined}[c][7cm]\\framebox[4cm]{first} \\\\\\shoveright{\\framebox[4cm]{second}} \\\\\\shoveleft{\\framebox[4cm]{third}} \\\\\\framebox[4cm]{last}\\end{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1807,7 +1807,7 @@ exports[`Mathtools More Environments multlined shoved 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\shoveright{\\framebox[4cm]{second}}">
       <mtd columnalign="right">
         <mrow data-mjx-texclass="ORD" data-latex="\\shoveright{\\framebox[4cm]{second}}">
           <menclose notation="box">
@@ -1818,7 +1818,7 @@ exports[`Mathtools More Environments multlined shoved 1`] = `
         </mrow>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\shoveleft{\\framebox[4cm]{third}}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\shoveleft{\\framebox[4cm]{third}}">
           <menclose notation="box">
@@ -1829,7 +1829,7 @@ exports[`Mathtools More Environments multlined shoved 1`] = `
         </mrow>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -1848,7 +1848,7 @@ exports[`Mathtools More Environments multlined shoved 1`] = `
 exports[`Mathtools More Environments multlined shoved distance 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined}[c][7cm]\\framebox[4cm]{first} \\\\\\shoveright[1cm]{\\framebox[4cm]{second}} \\\\\\shoveleft[1cm]{\\framebox[4cm]{third}} \\\\\\framebox[4cm]{last}\\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="7cm" columnwidth="100%" data-latex="\\begin{multlined}[c][7cm]\\framebox[4cm]{first} \\\\\\shoveright[1cm]{\\framebox[4cm]{second}} \\\\\\shoveleft[1cm]{\\framebox[4cm]{third}} \\\\\\framebox[4cm]{last}\\end{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1860,7 +1860,7 @@ exports[`Mathtools More Environments multlined shoved distance 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\shoveright[1cm]{\\framebox[4cm]{second}}">
       <mtd columnalign="right">
         <mrow data-latex="\\shoveright[1cm]{\\framebox[4cm]{second}}">
           <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{second}">
@@ -1874,7 +1874,7 @@ exports[`Mathtools More Environments multlined shoved distance 1`] = `
         </mrow>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\shoveleft[1cm]{\\framebox[4cm]{third}}">
       <mtd columnalign="left">
         <mrow data-latex="\\shoveleft[1cm]{\\framebox[4cm]{third}}">
           <mspace width="1cm"></mspace>
@@ -1888,7 +1888,7 @@ exports[`Mathtools More Environments multlined shoved distance 1`] = `
         </mrow>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -1907,7 +1907,7 @@ exports[`Mathtools More Environments multlined shoved distance 1`] = `
 exports[`Mathtools More Environments multlined width 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multlined}[7cm]\\framebox[4cm]{first}\\\\\\framebox[4cm]{last}\\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="7cm" columnwidth="100%" data-latex="\\begin{multlined}[7cm]\\framebox[4cm]{first}\\\\\\framebox[4cm]{last}\\end{multlined}">
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{first}">
       <mtd columnalign="left">
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{first}">
           <menclose notation="box">
@@ -1919,7 +1919,7 @@ exports[`Mathtools More Environments multlined width 1`] = `
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="\\framebox[4cm]{last}">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mrow data-mjx-texclass="ORD" data-latex="\\framebox[4cm]{last}">
@@ -4107,7 +4107,7 @@ exports[`Mathtools options legacycolonsymbols option 2`] = `
 exports[`Mathtools options mathtoolsset 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mathtoolsset{multlined-pos={}}\\begin{multlined} a \\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnwidth="100%" data-latex="\\mathtoolsset{multlined-pos={}}\\begin{multlined} a \\end{multlined}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -4307,13 +4307,13 @@ exports[`Mathtools setoptions multlined gap and pos 1`] = `
   <mi data-latex="a">a</mi>
   <mo data-latex="+">+</mo>
   <mtable displaystyle="true" rowspacing=".5em" columnwidth="100%" align="baseline -1" data-latex="{multlined}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
         <mspace width="2em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="right">
         <mspace width="2em"></mspace>
         <mi data-latex="b">b</mi>
@@ -4328,13 +4328,13 @@ exports[`Mathtools setoptions multlined gap and pos 1`] = `
 exports[`Mathtools setoptions multlined skips 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mathtoolsset{multlined-gap=2em,firstline-afterskip=3em,lastline-preskip=1em}\\begin{multlined}[b] a \\\\ b \\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnwidth="100%" align="baseline -1" data-latex="\\mathtoolsset{multlined-gap=2em,firstline-afterskip=3em,lastline-preskip=1em}\\begin{multlined}[b] a \\\\ b \\end{multlined}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
         <mspace width="3em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mi data-latex="b">b</mi>
@@ -4347,13 +4347,13 @@ exports[`Mathtools setoptions multlined skips 1`] = `
 exports[`Mathtools setoptions multlined width 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mathtoolsset{multlined-width=5em}\\begin{multlined} a \\\\ b \\end{multlined}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" width="5em" columnwidth="100%" data-latex="\\mathtoolsset{multlined-width=5em}\\begin{multlined} a \\\\ b \\end{multlined}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
         <mspace width="1em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="right">
         <mspace width="1em"></mspace>
         <mi data-latex="b">b</mi>
@@ -4368,13 +4368,13 @@ exports[`Mathtools setoptions multlined-pos override 1`] = `
   <mi data-latex="a">a</mi>
   <mo data-latex="+">+</mo>
   <mtable displaystyle="true" rowspacing=".5em" columnwidth="100%" align="baseline -1" data-latex="{multlined}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
         <mspace width="2em"></mspace>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd columnalign="right">
         <mspace width="2em"></mspace>
         <mi data-latex="b">b</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
index cf9c3ea9a..bb3c9a361 100644
--- a/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
@@ -59,7 +59,7 @@ exports[`Setoptions Set package boolean option 1`] = `
 exports[`Setoptions Set package string option 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="50%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -77,7 +77,7 @@ exports[`Setoptions Set regexp option with flags 1`] = `
 exports[`Setoptions options allowOptionsDefault false ams multlineWidth true 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="50%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -89,7 +89,7 @@ exports[`Setoptions options allowOptionsDefault false ams multlineWidth true 1`]
 exports[`Setoptions options allowPackageDefault false ams true 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="50%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -101,7 +101,7 @@ exports[`Setoptions options allowPackageDefault false ams true 1`] = `
 exports[`Setoptions options filterOption 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -113,7 +113,7 @@ exports[`Setoptions options filterOption 1`] = `
 exports[`Setoptions options filterPackage 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -125,7 +125,7 @@ exports[`Setoptions options filterPackage 1`] = `
 exports[`Setoptions options filterValue 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="25%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
index 3f2274324..75e1a507c 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
@@ -267,17 +267,17 @@ exports[`TagAll Label Named Named 1`] = `
 exports[`TagAll MultLine 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}a\\\\ b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}a\\\\ b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;c">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -306,17 +306,17 @@ exports[`TagAll Notag Align 1`] = `
 exports[`TagAll Notag Multline 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}a\\\\ b\\\\ c\\notag\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}a\\\\ b\\\\ c\\notag\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -786,17 +786,17 @@ exports[`TagAms Label Named Named 1`] = `
 exports[`TagAms MultLine 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}a\\\\ b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}a\\\\ b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mlabeledtr>
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;c">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -825,17 +825,17 @@ exports[`TagAms Notag Align 1`] = `
 exports[`TagAms Notag Multline 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}a\\\\ b\\\\ c\\notag\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}a\\\\ b\\\\ c\\notag\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1240,17 +1240,17 @@ exports[`TagNone Label Named Named 1`] = `
 exports[`TagNone MultLine 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}a\\\\ b\\\\ c\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}a\\\\ b\\\\ c\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -1274,17 +1274,17 @@ exports[`TagNone Notag Align 1`] = `
 exports[`TagNone Notag Multline 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{multline}a\\\\ b\\\\ c\\notag\\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\begin{multline}a\\\\ b\\\\ c\\notag\\end{multline}">
-    <mtr>
+    <mtr data-latex="a">
       <mtd columnalign="left">
         <mi data-latex="a">a</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="b">
       <mtd>
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr>
+    <mtr data-latex="c">
       <mtd columnalign="right">
         <mi data-latex="c">c</mi>
       </mtd>
diff --git a/ts/input/tex/ams/AmsItems.ts b/ts/input/tex/ams/AmsItems.ts
index 6368b47d2..6db8a6585 100644
--- a/ts/input/tex/ams/AmsItems.ts
+++ b/ts/input/tex/ams/AmsItems.ts
@@ -68,6 +68,7 @@ export class MultlineItem extends ArrayItem {
     );
     this.setProperty('shove', null);
     this.row.push(mtd);
+    this.rowLatex.push(this.cellLatex(mtd));
     this.Clear();
   }
 
@@ -84,8 +85,10 @@ export class MultlineItem extends ArrayItem {
       );
     }
     const row = this.create('node', 'mtr', this.row);
+    this.setRowLatex(row);
     this.table.push(row);
     this.row = [];
+    this.rowLatex = [];
   }
 
   /**
@@ -133,6 +136,16 @@ export class MultlineItem extends ArrayItem {
           [tag].concat(NodeUtil.getChildren(mtr))
         );
         NodeUtil.copyAttributes(mtr, mlabel);
+        const latex = [
+          this.cellLatex(tag),
+          mtr.attributes.get(TexConstant.Attr.LATEX),
+        ]
+          .filter((x) => x)
+          .join('&');
+        if (latex) {
+          mlabel.attributes.set(TexConstant.Attr.LATEXITEM, latex);
+          mlabel.attributes.set(TexConstant.Attr.LATEX, latex);
+        }
         this.table[label] = mlabel;
       }
     }

From cb86ab3ff0fed33e194621b397549c0f3f32492c Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Tue, 21 Jul 2026 10:40:39 +0200
Subject: [PATCH 05/11] fixes missing color elements in rows

---
 .../tex/__snapshots__/Colortbl.test.ts.snap   | 44 +++++++++----------
 .../tex/colortbl/ColortblConfiguration.ts     | 41 +++++++++++++++--
 2 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
index e006254e7..b100c0509 100644
--- a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`Colortbl cellcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\cellcolor{red} b \\\\ \\cellcolor{yellow} c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\cellcolor{red} b \\\\ \\cellcolor{yellow} c &amp; d \\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\cellcolor{red}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -11,7 +11,7 @@ exports[`Colortbl cellcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="\\cellcolor{yellow}c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -28,7 +28,7 @@ exports[`Colortbl cellcolor in pmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\pmatrix{ \\cellcolor{red} a }">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em">
-      <mtr data-latex="a">
+      <mtr data-latex="\\cellcolor{red}a">
         <mtd mathbackground="red">
           <mi data-latex="a">a</mi>
         </mtd>
@@ -42,7 +42,7 @@ exports[`Colortbl cellcolor in pmatrix 1`] = `
 exports[`Colortbl cellcolor in preamble 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&gt;{\\cellcolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\cellcolor{yellow}d\\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\cellcolor{yellow}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -50,7 +50,7 @@ exports[`Colortbl cellcolor in preamble 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="c&amp;\\cellcolor{yellow}d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -65,12 +65,12 @@ exports[`Colortbl cellcolor in preamble 1`] = `
 exports[`Colortbl cellcolor late 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; b \\cellcolor{red} \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; b \\cellcolor{red} \\end{array}">
-    <mtr data-latex="a&amp;\\cellcolor{red}">
+    <mtr data-latex="a&amp;\\cellcolor{red}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
       <mtd mathbackground="red">
-        <mi data-latex="\\cellcolor{red}">b</mi>
+        <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
   </mtable>
@@ -80,7 +80,7 @@ exports[`Colortbl cellcolor late 1`] = `
 exports[`Colortbl cellcolor with color model 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" framespacing=".2em .125em" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }">
-    <mtr data-latex="a">
+    <mtr data-latex="\\cellcolor[rgb]{1,0,0}a">
       <mtd mathbackground="#ff0000">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -92,7 +92,7 @@ exports[`Colortbl cellcolor with color model 1`] = `
 exports[`Colortbl cellcolor with columncolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ c &amp; \\cellcolor{yellow} d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ c &amp; \\cellcolor{yellow} d \\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\columncolor{red}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -100,7 +100,7 @@ exports[`Colortbl cellcolor with columncolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="c&amp;\\cellcolor{yellow}d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -115,7 +115,7 @@ exports[`Colortbl cellcolor with columncolor 1`] = `
 exports[`Colortbl cellcolor with columncolor and rowcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; \\cellcolor{green} d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; \\cellcolor{green} d \\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\columncolor{red}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -123,7 +123,7 @@ exports[`Colortbl cellcolor with columncolor and rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="\\rowcolor{yellow}c&amp;\\cellcolor{green}d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -139,7 +139,7 @@ exports[`Colortbl cellcolor with frame 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}">
     <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
-      <mtr data-latex="a">
+      <mtr data-latex="\\cellcolor{red}a">
         <mtd mathbackground="red">
           <mi data-latex="a">a</mi>
         </mtd>
@@ -160,7 +160,7 @@ exports[`Colortbl cellcolor with rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="\\rowcolor{red}c&amp;\\cellcolor{yellow}d">
       <mtd mathbackground="red">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -175,7 +175,7 @@ exports[`Colortbl cellcolor with rowcolor 1`] = `
 exports[`Colortbl color with no frame 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }" display="block">
   <mtable rowspacing="4pt" columnspacing="1em" data-frame-styles="" data-latex="\\matrix{ \\cellcolor[rgb]{1,0,0} a }">
-    <mtr data-latex="a">
+    <mtr data-latex="\\cellcolor[rgb]{1,0,0}a">
       <mtd mathbackground="#ff0000">
         <mi data-latex="a">a</mi>
       </mtd>
@@ -187,7 +187,7 @@ exports[`Colortbl color with no frame 1`] = `
 exports[`Colortbl columncolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{yellow} b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{yellow} b \\\\ c &amp; d \\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\columncolor{yellow}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -210,7 +210,7 @@ exports[`Colortbl columncolor 1`] = `
 exports[`Colortbl columncolor and rowcolor 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red} b \\\\ \\rowcolor{yellow} c &amp; d \\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\columncolor{red}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -218,7 +218,7 @@ exports[`Colortbl columncolor and rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="\\rowcolor{yellow}c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
@@ -233,7 +233,7 @@ exports[`Colortbl columncolor and rowcolor 1`] = `
 exports[`Colortbl columncolor ignore overlap 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red}[ignore][ignore] b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc} a &amp; \\columncolor{red}[ignore][ignore] b \\\\ c &amp; d \\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\columncolor{red}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -256,7 +256,7 @@ exports[`Colortbl columncolor ignore overlap 1`] = `
 exports[`Colortbl columncolor in preamble 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&gt;{\\columncolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\columncolor{yellow}d\\end{array}">
-    <mtr data-latex="a&amp;b">
+    <mtr data-latex="a&amp;\\columncolor{yellow}b">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
@@ -264,7 +264,7 @@ exports[`Colortbl columncolor in preamble 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="c&amp;\\columncolor{yellow}d">
       <mtd>
         <mi data-latex="c">c</mi>
       </mtd>
@@ -287,7 +287,7 @@ exports[`Colortbl rowcolor 1`] = `
         <mi data-latex="b">b</mi>
       </mtd>
     </mtr>
-    <mtr data-latex="c&amp;d">
+    <mtr data-latex="\\rowcolor{yellow}c&amp;d">
       <mtd mathbackground="yellow">
         <mi data-latex="c">c</mi>
       </mtd>
diff --git a/ts/input/tex/colortbl/ColortblConfiguration.ts b/ts/input/tex/colortbl/ColortblConfiguration.ts
index 67496ffcf..fdfac34f3 100644
--- a/ts/input/tex/colortbl/ColortblConfiguration.ts
+++ b/ts/input/tex/colortbl/ColortblConfiguration.ts
@@ -56,6 +56,18 @@ export class ColorArrayItem extends ArrayItem {
     col: [],
   };
 
+  /**
+   * The LaTeX source of a pending \cellcolor, \rowcolor, or \columncolor
+   * macro, used to include the macro itself in the `data-latex` attribute
+   * of the mtr/mlabeledtr row it belongs to (it produces no Mml node of its
+   * own, so it does not appear in the data-latex of any content node).
+   */
+  public colorLatex: ColorData = {
+    cell: '',
+    row: '',
+    col: [],
+  };
+
   /**
    * True if any cell is colored (we will make sure the edge cells are full sized).
    */
@@ -66,14 +78,23 @@ export class ColorArrayItem extends ArrayItem {
    */
   public EndEntry() {
     super.EndEntry();
-    const cell = this.row[this.row.length - 1];
-    const color =
-      this.color.cell || this.color.row || this.color.col[this.row.length - 1];
+    const n = this.row.length - 1;
+    const cell = this.row[n];
+    const color = this.color.cell || this.color.row || this.color.col[n];
     if (color) {
       cell.attributes.set('mathbackground', color);
       this.color.cell = '';
       this.hasColor = true;
     }
+    const colorLatex =
+      this.colorLatex.cell || this.colorLatex.row || this.colorLatex.col[n];
+    if (colorLatex) {
+      const i = this.rowLatex.length - 1;
+      this.rowLatex[i] = colorLatex + this.rowLatex[i];
+      this.colorLatex.cell = '';
+      this.colorLatex.row = '';
+      delete this.colorLatex.col[n];
+    }
   }
 
   /**
@@ -82,6 +103,7 @@ export class ColorArrayItem extends ArrayItem {
   public EndRow() {
     super.EndRow();
     this.color.row = '';
+    this.colorLatex.row = '';
   }
 
   /**
@@ -124,7 +146,9 @@ export class ColorArrayItem extends ArrayItem {
 function TableColor(parser: TexParser, name: string, type: keyof ColorData) {
   const lookup = parser.configuration.packageData.get('color').model; // use the color extension's color model
   const model = parser.GetBrackets(name, '');
-  const color = lookup.getColor(model, parser.GetArgument(name));
+  const arg = parser.GetArgument(name);
+  const color = lookup.getColor(model, arg);
+  const latex = `${name}${model ? `[${model}]` : ''}{${arg}}`;
   //
   // Check that we are in a colorable array.
   //
@@ -148,6 +172,7 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) {
       );
     }
     top.color.col[top.row.length] = color;
+    top.colorLatex.col[top.row.length] = latex;
     //
     // Ignore the left and right overlap options.
     //
@@ -156,6 +181,7 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) {
     }
   } else {
     top.color[type] = color;
+    top.colorLatex[type] = latex;
     if (type === 'row' && (top.Size() || top.row.length)) {
       throw new TexError(
         'RowColorNotFirst',
@@ -164,6 +190,13 @@ function TableColor(parser: TexParser, name: string, type: keyof ColorData) {
       );
     }
   }
+  //
+  // This macro produces no Mml node of its own, so don't let its source
+  // text be attached as the data-latex of whatever node precedes it.  Its
+  // own source is instead folded into the data-latex of the mtr/mlabeledtr
+  // row it belongs to (see ColorArrayItem.EndEntry).
+  //
+  parser.skipLatex();
 }
 
 //

From 85591c79f8cd884be0ec21c540cc6f6048f1924e Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Tue, 21 Jul 2026 13:20:40 +0200
Subject: [PATCH 06/11] fixes issue with column template that garbles
 data-latex attribute

---
 .../input/tex/__snapshots__/Base.test.ts.snap | 40 ++++----
 .../tex/__snapshots__/Colortbl.test.ts.snap   |  4 +-
 ts/input/tex/StackItem.ts                     |  5 +
 ts/input/tex/TexParser.ts                     | 10 +-
 ts/input/tex/base/BaseItems.ts                | 94 +++++++++++++++++++
 ts/input/tex/base/BaseMethods.ts              |  3 +-
 6 files changed, 130 insertions(+), 26 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index 021808512..5ab212e76 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -441,7 +441,7 @@ exports[`Array Columnlines Solid None 1`] = `
 
 exports[`Array Empty Array with Template 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{x}c} \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\end{array}"></mtable>
+  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{&gt;{x}c} \\end{array}"></mtable>
 </math>"
 `;
 
@@ -1803,7 +1803,7 @@ exports[`Character Class Changes mathpunct 1`] = `
 
 exports[`Complete Array column ! | @ 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{!{a}|@{b}c} X\\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-array-padding=".5em .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="b&amp;X\\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-array-padding=".5em .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{!{a}|@{b}c} X\\end{array}">
     <mtr data-latex="a\\hspace{.25em}&amp;b&amp;X">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -1822,7 +1822,7 @@ exports[`Complete Array column ! | @ 1`] = `
 
 exports[`Complete Array column > > c < < 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{a}&gt;{b}c&lt;{x}&lt;{y}} X \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="baXyx\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{&gt;{a}&gt;{b}c&lt;{x}&lt;{y}} X \\end{array}">
     <mtr data-latex="b a X y x">
       <mtd>
         <mi data-latex="b">b</mi>
@@ -1838,7 +1838,7 @@ exports[`Complete Array column > > c < < 1`] = `
 
 exports[`Complete Array column > space 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt; {x} c} X \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="xX\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{&gt; {x} c} X \\end{array}">
     <mtr data-latex="x X">
       <mtd>
         <mi data-latex="x">x</mi>
@@ -1851,7 +1851,7 @@ exports[`Complete Array column > space 1`] = `
 
 exports[`Complete Array column @ | ! c 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{@{}|!{x}c} X \\end{array}" display="block">
-  <mtable columnspacing="0 .5em" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-array-padding="0 .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.25em}x&amp;X\\end{array}">
+  <mtable columnspacing="0 .5em" rowspacing="4pt" columnalign="center center center" columnlines="solid none" data-array-padding="0 .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{@{}|!{x}c} X \\end{array}">
     <mtr data-latex="&amp;\\hspace{.25em}x&amp;X">
       <mtd></mtd>
       <mtd>
@@ -1868,7 +1868,7 @@ exports[`Complete Array column @ | ! c 1`] = `
 
 exports[`Complete Array column @ p m 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{@{x}p{1em}m{1em}} X &amp; Y \\end{array}" display="block">
-  <mtable columnspacing="0 1em" rowspacing="4pt" columnalign="center left left" columnwidth="auto 1em 1em" data-array-padding="0 .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{Y}\\end{array}">
+  <mtable columnspacing="0 1em" rowspacing="4pt" columnalign="center left left" columnwidth="auto 1em 1em" data-array-padding="0 .5em" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{@{x}p{1em}m{1em}} X &amp; Y \\end{array}">
     <mtr data-latex="x&amp;&amp;">
       <mtd>
         <mi data-latex="x">x</mi>
@@ -1987,7 +1987,7 @@ exports[`Complete Array column b  1`] = `
 
 exports[`Complete Array column c < 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&lt;{A}}a\\\\ d \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="dA\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c&lt;{A}}a\\\\ d \\end{array}">
     <mtr data-latex="a A">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2006,7 +2006,7 @@ exports[`Complete Array column c < 1`] = `
 
 exports[`Complete Array column c > 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{A}c}a \\\\ d\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="Ad\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{&gt;{A}c}a \\\\ d\\end{array}">
     <mtr data-latex="A a">
       <mtd>
         <mi data-latex="A">A</mi>
@@ -2025,7 +2025,7 @@ exports[`Complete Array column c > 1`] = `
 
 exports[`Complete Array column c @ end 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c@{h}}a\\\\ d \\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center" data-array-padding=".5em 0" data-frame-styles="" framespacing=".5em .125em" data-latex="h\\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center" data-array-padding=".5em 0" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c@{h}}a\\\\ d \\end{array}">
     <mtr data-latex="a&amp;h">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2048,7 +2048,7 @@ exports[`Complete Array column c @ end 1`] = `
 
 exports[`Complete Array column c @& 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c@{\\alpha}c}a&amp;\\hfill&amp;b\\\\ d&amp;\\hfill&amp;e \\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hfill\\alpha&amp;&amp;e \\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c@{\\alpha}c}a&amp;\\hfill&amp;b\\\\ d&amp;\\hfill&amp;e \\end{array}">
     <mtr data-latex="a&amp;\\alpha&amp;&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2079,7 +2079,7 @@ exports[`Complete Array column c @& 1`] = `
 
 exports[`Complete Array column c @& hfil 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c@{\\alpha}c}a&amp;&amp;b\\\\ d&amp;&amp;e\\hfil \\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\alpha&amp;&amp;e\\hfil \\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c@{\\alpha}c}a&amp;&amp;b\\\\ d&amp;&amp;e\\hfil \\end{array}">
     <mtr data-latex="a&amp;\\alpha&amp;&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2143,7 +2143,7 @@ exports[`Complete Array column c W 1`] = `
 
 exports[`Complete Array column c c @ 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cc@{x}} X &amp; Y \\end{array}" display="block">
-  <mtable columnspacing="1em 0 0" rowspacing="4pt" columnalign="center center center" data-array-padding=".5em 0" data-frame-styles="" framespacing=".5em .125em" data-latex="x\\end{array}">
+  <mtable columnspacing="1em 0 0" rowspacing="4pt" columnalign="center center center" data-array-padding=".5em 0" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc@{x}} X &amp; Y \\end{array}">
     <mtr data-latex="X&amp;Y&amp;x">
       <mtd>
         <mi data-latex="X">X</mi>
@@ -2311,7 +2311,7 @@ exports[`Complete Array column p  1`] = `
 
 exports[`Complete Array column r c l !  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r!{h}c!{h}l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing=".5em .5em .5em .5em" rowspacing="4pt" columnalign="right center center center left" data-frame-styles="" framespacing=".5em .125em" data-latex="h&amp;f\\end{array}">
+  <mtable columnspacing=".5em .5em .5em .5em" rowspacing="4pt" columnalign="right center center center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r!{h}c!{h}l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a&amp;h&amp;b&amp;h&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2381,7 +2381,7 @@ exports[`Complete Array column r c l :  1`] = `
 
 exports[`Complete Array column r c l < 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r&lt;{A}cl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="dA&amp; e &amp; f\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r&lt;{A}cl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a A&amp;b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2412,7 +2412,7 @@ exports[`Complete Array column r c l < 1`] = `
 
 exports[`Complete Array column r c l > 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{&gt;{A}rcl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="Ad&amp; e &amp; f\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{&gt;{A}rcl}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="A a&amp;b&amp;c">
       <mtd>
         <mi data-latex="A">A</mi>
@@ -2443,7 +2443,7 @@ exports[`Complete Array column r c l > 1`] = `
 
 exports[`Complete Array column r c l @  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r@{h}c@{h}l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="0 0 0 0" rowspacing="4pt" columnalign="right center center center left" data-frame-styles="" framespacing=".5em .125em" data-latex="h&amp;f\\end{array}">
+  <mtable columnspacing="0 0 0 0" rowspacing="4pt" columnalign="right center center center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r@{h}c@{h}l}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a&amp;h&amp;b&amp;h&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2542,7 +2542,7 @@ exports[`Complete Array column r c l 1`] = `
 
 exports[`Complete Array column r c repeat |  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r*{2}|c}a&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2581,7 +2581,7 @@ exports[`Complete Array column r c repeat |  1`] = `
 
 exports[`Complete Array column r c repeat | {} 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a {\\hbox{(3)}}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r*{2}|c}a {\\hbox{(3)}}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a{\\hbox{(3)}}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2623,7 +2623,7 @@ exports[`Complete Array column r c repeat | {} 1`] = `
 
 exports[`Complete Array column r c repeat | {} 2`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a {\\begin{array}{c}Q\\end{array}}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r*{2}|c}a {\\begin{array}{c}Q\\end{array}}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a{{array}}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2671,7 +2671,7 @@ exports[`Complete Array column r c repeat | {} 2`] = `
 
 exports[`Complete Array column r c repeat | {} 3`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a \\begin{array}{c}Q\\end{array}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\hspace{.5em}e&amp; f\\end{array}">
+  <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r*{2}|c}a \\begin{array}{c}Q\\end{array}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
     <mtr data-latex="a{array}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
index b100c0509..958267778 100644
--- a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
@@ -41,7 +41,7 @@ exports[`Colortbl cellcolor in pmatrix 1`] = `
 
 exports[`Colortbl cellcolor in preamble 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&gt;{\\cellcolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\cellcolor{yellow}d\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c&gt;{\\cellcolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}">
     <mtr data-latex="a&amp;\\cellcolor{yellow}b">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -255,7 +255,7 @@ exports[`Colortbl columncolor ignore overlap 1`] = `
 
 exports[`Colortbl columncolor in preamble 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c&gt;{\\columncolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\columncolor{yellow}d\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c&gt;{\\columncolor{yellow}}c} a &amp; b \\\\ c &amp; d \\end{array}">
     <mtr data-latex="a&amp;\\columncolor{yellow}b">
       <mtd>
         <mi data-latex="a">a</mi>
diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts
index 95b84ccba..57a7938f2 100644
--- a/ts/input/tex/StackItem.ts
+++ b/ts/input/tex/StackItem.ts
@@ -580,6 +580,11 @@ export abstract class BaseItem extends MmlStack implements StackItem {
    * @param {string=} prefix A prefix for the LaTeX command.
    */
   public addLatexItem(node: MmlNode, prefix: string = '') {
+    // If the node already has a LaTeX source (e.g., an mtable reconstructed
+    // data-latex ), don't overwrite it with a new one.
+    if (node.getProperty('fixedLatex') !== undefined) {
+      return;
+    }
     const str = this.startStr.slice(this.startI, this.stopI);
     if (str) {
       const tex = prefix ? prefix + str : str;
diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts
index f996115b6..6a2cabe7d 100644
--- a/ts/input/tex/TexParser.ts
+++ b/ts/input/tex/TexParser.ts
@@ -269,9 +269,13 @@ export default class TexParser {
       return null;
     }
     const node = this.stack.Top().First;
-    const latex = this.trimTex(this.string);
-    if (latex) {
-      node.attributes.set(TexConstant.Attr.LATEX, latex);
+    // Only overwrite the LaTeX source if it hasn't been set already (e.g., an
+    // mtable produced by an array-like environment)
+    if (node.getProperty('fixedLatex') === undefined) {
+      const latex = this.trimTex(this.string);
+      if (latex) {
+        node.attributes.set(TexConstant.Attr.LATEX, latex);
+      }
     }
     return node;
   }
diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts
index 309bbe8ca..16ea15cb2 100644
--- a/ts/input/tex/base/BaseItems.ts
+++ b/ts/input/tex/base/BaseItems.ts
@@ -1134,6 +1134,7 @@ export class ArrayItem extends BaseItem {
         this.getProperty('close') as string
       );
     }
+    this.setTableLatex(mml);
     return mml;
   }
 
@@ -1397,6 +1398,99 @@ export class ArrayItem extends BaseItem {
     return NodeUtil.getChildrenLatex(mtd);
   }
 
+  /**
+   * Captures the LaTeX source of this array/table environment (e.g., `>{...}`,
+   * `<{...}`, `@{...}`, or `!{...}`) before any entry-template substitutions
+   * are made.
+   *
+   * @param {TexParser} parser The current parser, positioned right after
+   *     `\begin{name}`, before the column-alignment argument (if any) has
+   *     been read.
+   * @param {string} name The environment name (e.g., `array`, `matrix`).
+   */
+  public captureLatex(parser: TexParser, name: string) {
+    const source = parser.string.slice(parser.i);
+    const end = ArrayItem.findEnvEnd(source, name);
+    // If no matching \end{name} could be found (e.g., an environment produced
+    // by macro expansion \newenvironment.
+    if (end < 0) return;
+    this.setProperty('rawLatex', `\\begin{${name}}${source.slice(0, end)}`);
+  }
+
+  /**
+   * Sets `data-latex` attribute of the mtable node from captured source. This
+   * is only needed when column templates are in play.
+   *
+   * @param {MmlNode} mml The mtable node.
+   */
+  public setTableLatex(mml: MmlNode) {
+    const hasTemplate = (list: (string | boolean)[]) =>
+      list && list.some((x) => x);
+    if (
+      !hasTemplate(this.cstart) &&
+      !hasTemplate(this.cend) &&
+      !hasTemplate(this.cextra)
+    ) {
+      return;
+    }
+    const tex = this.getProperty('rawLatex') as string;
+    if (!tex) return;
+    mml.attributes.set(TexConstant.Attr.LATEXITEM, tex);
+    mml.attributes.set(TexConstant.Attr.LATEX, tex);
+    mml.setProperty('fixedLatex', true);
+  }
+
+  /**
+   * Find the position of the corresponding `\end{name}` in the string starting
+   * right after the corresponding `\begin{name}` (skipping nested environments
+   * of that name).
+   *
+   * @param {string} str The string to search.
+   * @param {string} name The environment name to look for.
+   * @returns {number} The index right after the matching `\end{name}`, or
+   *     -1 if no matching end was found.
+   */
+  private static findEnvEnd(str: string, name: string): number {
+    const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const begin = new RegExp(`^\\\\begin\\s*\\{${escaped}\\}`);
+    const end = new RegExp(`^\\\\end\\s*\\{${escaped}\\}`);
+    let depth = 0;
+    let nested = 0;
+    let i = 0;
+    while (i < str.length) {
+      const c = str.charAt(i);
+      if (c === '\\') {
+        const rest = str.slice(i);
+        const mBegin = rest.match(begin);
+        if (mBegin) {
+          if (depth === 0) nested++;
+          i += mBegin[0].length;
+          continue;
+        }
+        const mEnd = rest.match(end);
+        if (mEnd) {
+          if (depth === 0) {
+            if (!nested) {
+              return i + mEnd[0].length;
+            }
+            nested--;
+          }
+          i += mEnd[0].length;
+          continue;
+        }
+        i += 2;
+        continue;
+      }
+      if (c === '{') {
+        depth++;
+      } else if (c === '}' && depth > 0) {
+        depth--;
+      }
+      i++;
+    }
+    return -1;
+  }
+
   /**
    * Sets the `data-latex` attribute of a row node by joining the LaTeX source
    * of its content cells with `&`.
diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts
index 4ea0b9f16..467b5bc06 100644
--- a/ts/input/tex/base/BaseMethods.ts
+++ b/ts/input/tex/base/BaseMethods.ts
@@ -1934,11 +1934,12 @@ const BaseMethods: { [key: string]: ParseMethod } = {
     style: string,
     raggedHeight: boolean
   ): ParseResult {
+    const array = parser.itemFactory.create('array') as sitem.ArrayItem;
+    array.captureLatex(parser, begin.getName());
     if (!align) {
       // @test Array Single
       align = parser.GetArgument('\\begin{' + begin.getName() + '}');
     }
-    const array = parser.itemFactory.create('array') as sitem.ArrayItem;
     if (begin.getName() === 'array') {
       array.setProperty('arrayPadding', '.5em .125em');
     }

From ee4d3609f17c9195f95619390f7e187b75c3143e Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Tue, 21 Jul 2026 20:26:09 +0200
Subject: [PATCH 07/11] fixes also the nested array issue

---
 testsuite/tests/input/tex/Ams.test.ts         |   8 +
 .../input/tex/__snapshots__/Ams.test.ts.snap  |  45 +++-
 .../input/tex/__snapshots__/Base.test.ts.snap |  46 ++--
 .../tex/__snapshots__/Colortbl.test.ts.snap   |   2 +-
 .../tex/__snapshots__/Mathtools.test.ts.snap  | 112 ++++-----
 .../tex/__snapshots__/Physics.test.ts.snap    | 226 +++++++++---------
 ts/input/tex.ts                               |   1 +
 ts/input/tex/FilterUtil.ts                    |  56 +++++
 ts/input/tex/StackItem.ts                     |   5 -
 ts/input/tex/TexParser.ts                     |  10 +-
 ts/input/tex/base/BaseItems.ts                |  22 +-
 11 files changed, 302 insertions(+), 231 deletions(-)

diff --git a/testsuite/tests/input/tex/Ams.test.ts b/testsuite/tests/input/tex/Ams.test.ts
index dce2117cb..66c089ce9 100644
--- a/testsuite/tests/input/tex/Ams.test.ts
+++ b/testsuite/tests/input/tex/Ams.test.ts
@@ -1038,4 +1038,12 @@ describe('Ams symbols', () => {
 
 /**********************************************************************************/
 
+describe('Ams Issues', () => {
+  it('Array with Tag', () => {
+    expect(tex2mml('\\begin{array}{c}a \\end{array}\\tag{1}')).toMatchSnapshot();
+  });
+});
+
+/**********************************************************************************/
+
 afterAll(() => getTokens('ams'));
diff --git a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
index 2d3785a41..bee5dcb82 100644
--- a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
@@ -184,7 +184,7 @@ exports[`Ams Complex A Cross Product Formula 1`] = `
   <mo data-latex="=">=</mo>
   <mrow data-mjx-texclass="INNER" data-latex="{vmatrix}">
     <mo data-mjx-texclass="OPEN">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{vmatrix} \\mathbf{i} &amp; \\mathbf{j} &amp; \\mathbf{k} \\\\    \\frac{\\partial X}{\\partial u} &amp; \\frac{\\partial Y}{\\partial u} &amp; 0 \\\\    \\frac{\\partial X}{\\partial v} &amp; \\frac{\\partial Y}{\\partial v} &amp; 0 \\\\   \\end{vmatrix}">
       <mtr data-latex="\\mathbf{i}&amp;\\mathbf{j}&amp;\\mathbf{k}">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="\\mathbf{i}">
@@ -995,7 +995,7 @@ exports[`Ams Environments Bmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Bmatrix} a &amp; b \\\\ c &amp; d \\end{Bmatrix}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix} a &amp; b \\\\ c &amp; d \\end{Bmatrix}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{Bmatrix} a &amp; b \\\\ c &amp; d \\end{Bmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -1235,7 +1235,7 @@ exports[`Ams Environments Multline Star 1`] = `
 exports[`Ams Environments Small Matrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -1304,7 +1304,7 @@ exports[`Ams Environments Split 1`] = `
 exports[`Ams Environments Subarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{subarray}{c}a\\end{subarray}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{subarray}{c}a\\end{subarray}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" data-latex="\\begin{subarray}{c}a\\end{subarray}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -1319,7 +1319,7 @@ exports[`Ams Environments Vmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Vmatrix} a &amp; b \\\\ c &amp; d \\end{Vmatrix}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix} a &amp; b \\\\ c &amp; d \\end{Vmatrix}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{Vmatrix} a &amp; b \\\\ c &amp; d \\end{Vmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -1346,7 +1346,7 @@ exports[`Ams Environments bmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{bmatrix} a &amp; b \\\\ c &amp; d \\end{bmatrix}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix} a &amp; b \\\\ c &amp; d \\end{bmatrix}">
     <mo data-mjx-texclass="OPEN">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{bmatrix} a &amp; b \\\\ c &amp; d \\end{bmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -1378,7 +1378,7 @@ exports[`Ams Environments cases 1`] = `
   <mo data-latex="=">=</mo>
   <mrow data-mjx-texclass="INNER" data-latex="{cases}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left">
+    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" data-latex="\\begin{cases} 1 &amp; \\text{if $x &gt; 1$} \\\\ 0 &amp; \\text{otherwise} \\end{cases}">
       <mtr data-latex="1&amp;\\text{if $x &gt; 1$}">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -1489,7 +1489,7 @@ exports[`Ams Environments pmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}">
     <mo data-mjx-texclass="OPEN">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -1651,6 +1651,29 @@ exports[`Ams Genfrac no delimiters 1`] = `
 </math>"
 `;
 
+exports[`Ams Issues Array with Tag 1`] = `
+"<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a \\end{array}\\tag{1}" display="block">
+  <mtable displaystyle="true" data-latex="\\begin{array}{c}a \\end{array}\\tag{1}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;{array}">
+      <mtd id="mjx-eqn:1">
+        <mtext data-latex="\\text{(}">(</mtext>
+        <mtext data-latex="\\text{1}">1</mtext>
+        <mtext data-latex="\\text{)}">)</mtext>
+      </mtd>
+      <mtd>
+        <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}a \\end{array}">
+          <mtr data-latex="a">
+            <mtd>
+              <mi data-latex="a">a</mi>
+            </mtd>
+          </mtr>
+        </mtable>
+      </mtd>
+    </mlabeledtr>
+  </mtable>
+</math>"
+`;
+
 exports[`Ams Left Fraction 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\cfrac[l]{a}{bbb}" display="block">
   <mfrac numalign="left" denomalign="left" data-latex="\\cfrac[l]{a}{bbb}">
@@ -2627,7 +2650,7 @@ exports[`Ams Tagged Environments Multline Star 1`] = `
 exports[`Ams Tagged Environments Small Matrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}a\\end{smallmatrix}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -2696,7 +2719,7 @@ exports[`Ams Tagged Environments Split 1`] = `
 exports[`Ams Tagged Environments Subarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{subarray}{c}a\\end{subarray}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{subarray}{c}a\\end{subarray}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" data-latex="\\begin{subarray}{c}a\\end{subarray}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -3230,7 +3253,7 @@ exports[`Ams symbols math0mo 19 1`] = `
 exports[`Ams symbols substack 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\substack{a\\\\b}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{subarray}{c}a\\\\b\\end{subarray}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" data-latex="\\begin{subarray}{c}a\\\\b\\end{subarray}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index 5ab212e76..ac2c37d4a 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -448,7 +448,7 @@ exports[`Array Empty Array with Template 1`] = `
 exports[`Array Enclosed bottom 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c} a\\\\\\hline\\end{array}" display="block">
   <menclose notation="bottom" data-padding="0" data-latex="\\begin{array}{c} a\\\\\\hline\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c} a\\\\\\hline\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -462,7 +462,7 @@ exports[`Array Enclosed bottom 1`] = `
 exports[`Array Enclosed dashed column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c:c|}a&amp;c\\\\b&amp;d\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c:c|}a&amp;c\\\\b&amp;d\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="dashed" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="dashed" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c:c|}a&amp;c\\\\b&amp;d\\end{array}">
       <mtr data-latex="a&amp;c">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -487,7 +487,7 @@ exports[`Array Enclosed dashed column 1`] = `
 exports[`Array Enclosed dashed row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}a\\\\\\hdashline b\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|}a\\\\\\hdashline b\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" rowlines="dashed" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" rowlines="dashed" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c|}a\\\\\\hdashline b\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -530,7 +530,7 @@ exports[`Array Enclosed frame solid 1`] = `
 exports[`Array Enclosed left 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c}a\\end{array}" display="block">
   <menclose notation="left" data-padding="0" data-latex="\\begin{array}{|c}a\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c}a\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -544,7 +544,7 @@ exports[`Array Enclosed left 1`] = `
 exports[`Array Enclosed left right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}a\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|}a\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c|}a\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -558,7 +558,7 @@ exports[`Array Enclosed left right 1`] = `
 exports[`Array Enclosed right 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c|}a\\end{array}" display="block">
   <menclose notation="right" data-padding="0" data-latex="\\begin{array}{c|}a\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c|}a\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -572,7 +572,7 @@ exports[`Array Enclosed right 1`] = `
 exports[`Array Enclosed solid column 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|c|}a&amp;c\\\\b&amp;d\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|c|}a&amp;c\\\\b&amp;d\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c|c|}a&amp;c\\\\b&amp;d\\end{array}">
       <mtr data-latex="a&amp;c">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -609,7 +609,7 @@ exports[`Array Enclosed solid dashed 1`] = `
 exports[`Array Enclosed solid row 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|}a\\\\\\hline b\\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|}a\\\\\\hline b\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" rowlines="solid" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" rowlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c|}a\\\\\\hline b\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -628,7 +628,7 @@ exports[`Array Enclosed solid row 1`] = `
 exports[`Array Enclosed top 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}\\hline a\\end{array}" display="block">
   <menclose notation="top" data-padding="0" data-latex="\\begin{array}{c}\\hline a\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}\\hline a\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -642,7 +642,7 @@ exports[`Array Enclosed top 1`] = `
 exports[`Array Enclosed top bottom 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}\\hline a\\\\\\hline\\end{array}" display="block">
   <menclose notation="top bottom" data-padding="0" data-latex="\\begin{array}{c}\\hline a\\\\\\hline\\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}\\hline a\\\\\\hline\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -677,7 +677,7 @@ exports[`Array Matrix Test 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\left( \\begin{array}{ccc}a &amp; b &amp; c \\\\d &amp; e &amp; f \\\\g &amp; h &amp; i \\end{array} \\right)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left( \\begin{array}{ccc}a &amp; b &amp; c \\\\d &amp; e &amp; f \\\\g &amp; h &amp; i \\end{array} \\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{ccc}a &amp; b &amp; c \\\\d &amp; e &amp; f \\\\g &amp; h &amp; i \\end{array}">
       <mtr data-latex="a&amp;b&amp;c">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -742,7 +742,7 @@ exports[`Array Newcolumntype 1`] = `
 
 exports[`Array Newcolumntype Option 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newcolumntype{a}[1]{m{#1}}\\begin{array}{a{1em}|a{2em}}a&amp;b\\\\c&amp;d\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left" columnwidth="1em 2em" columnlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{d}\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left" columnwidth="1em 2em" columnlines="solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{a{1em}|a{2em}}a&amp;b\\\\c&amp;d\\end{array}">
     <mtr data-latex="&amp;">
       <mtd>
         <mpadded data-mjx-vbox="middle" width="1em" data-overflow="auto" data-align="left" data-vertical-align="middle">
@@ -1946,7 +1946,7 @@ exports[`Complete Array column {r}c{l} 1`] = `
 
 exports[`Complete Array column b  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{b{1cm}b{1cm}b{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{f}\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{b{1cm}b{1cm}b{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="bottom" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="bottom">
@@ -2110,7 +2110,7 @@ exports[`Complete Array column c @& hfil 1`] = `
 
 exports[`Complete Array column c W 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cW{c}{1cm}c}a&amp;b&amp;c\\\\ d&amp;e&amp;f \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnwidth="auto 1cm auto" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{e}&amp;f \\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnwidth="auto 1cm auto" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cW{c}{1cm}c}a&amp;b&amp;c\\\\ d&amp;e&amp;f \\end{array}">
     <mtr data-latex="a&amp;&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2179,7 +2179,7 @@ exports[`Complete Array column c c | c 1`] = `
 
 exports[`Complete Array column c w 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{cw{c}{1cm}c}a&amp;b&amp;c\\\\ d&amp;e&amp;f \\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnwidth="auto 1cm auto" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{e}&amp;f \\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center center" columnwidth="auto 1cm auto" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cw{c}{1cm}c}a&amp;b&amp;c\\\\ d&amp;e&amp;f \\end{array}">
     <mtr data-latex="a&amp;&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
@@ -2212,7 +2212,7 @@ exports[`Complete Array column c w 1`] = `
 
 exports[`Complete Array column m  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{m{1cm}m{1cm}m{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{f}\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{m{1cm}m{1cm}m{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="middle" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="middle">
@@ -2270,7 +2270,7 @@ c} X &amp; Y\\end{array}">
 
 exports[`Complete Array column p  1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{p{1cm}p{1cm}p{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\text{f}\\end{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="left left left" columnwidth="1cm 1cm 1cm" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{p{1cm}p{1cm}p{1cm}}a &amp; b &amp;c\\\\ d &amp; e &amp; f\\end{array}">
     <mtr data-latex="&amp;&amp;">
       <mtd>
         <mpadded data-mjx-vbox="top" width="1cm" data-overflow="auto" data-align="left" data-vertical-align="top">
@@ -2628,7 +2628,7 @@ exports[`Complete Array column r c repeat | {} 2`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mrow data-mjx-texclass="ORD" data-latex="{{array}}">
-          <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+          <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}Q\\end{array}">
             <mtr data-latex="Q">
               <mtd>
                 <mi data-latex="Q">Q</mi>
@@ -2675,7 +2675,7 @@ exports[`Complete Array column r c repeat | {} 3`] = `
     <mtr data-latex="a{array}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
-        <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+        <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}Q\\end{array}">
           <mtr data-latex="Q">
             <mtd>
               <mi data-latex="Q">Q</mi>
@@ -3555,7 +3555,7 @@ exports[`Environments Nested array 1`] = `
       </mtd>
       <mtd>
         <mi data-latex="c">c</mi>
-        <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+        <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{cc}f&amp;h\\\\g\\end{array}">
           <mtr data-latex="f&amp;h">
             <mtd>
               <mi data-latex="f">f</mi>
@@ -9092,7 +9092,7 @@ exports[`User Defined Environments Cases star 1`] = `
 exports[`User Defined Environments Crampedsubarray 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{crampedsubarray}{cc} a &amp; b \\\\ c &amp; d \\end{crampedsubarray}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{crampedsubarray}{cc} a &amp; b \\\\ c &amp; d \\end{crampedsubarray}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" columnalign="center center" data-cramped="true">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" columnalign="center center" data-cramped="true" data-latex="\\begin{crampedsubarray}{cc} a &amp; b \\\\ c &amp; d \\end{crampedsubarray}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -9155,7 +9155,7 @@ exports[`User Defined Environments pmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}">
     <mo data-mjx-texclass="OPEN">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{pmatrix} a &amp; b \\\\ c &amp; d \\end{pmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -9181,7 +9181,7 @@ exports[`User Defined Environments pmatrix 1`] = `
 exports[`User Defined Environments smallmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="1" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="1" rowspacing=".2em" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
index 958267778..e00f9bbb4 100644
--- a/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Colortbl.test.ts.snap
@@ -138,7 +138,7 @@ exports[`Colortbl cellcolor with columncolor and rowcolor 1`] = `
 exports[`Colortbl cellcolor with frame 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}" display="block">
   <menclose notation="left right" data-padding="0" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}">
-    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em">
+    <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{|c|} \\cellcolor{red} a \\end{array}">
       <mtr data-latex="\\cellcolor{red}a">
         <mtd mathbackground="red">
           <mi data-latex="a">a</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
index b76a42e37..374db4e51 100644
--- a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
@@ -528,7 +528,7 @@ exports[`Mathtools Matrix Environments Bmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{Bmatrix*}-1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -557,7 +557,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Bmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{Bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -586,7 +586,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Bmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-latex="\\begin{Bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -615,7 +615,7 @@ exports[`Mathtools Matrix Environments Bmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Bmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right" data-latex="\\begin{Bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -644,7 +644,7 @@ exports[`Mathtools Matrix Environments Vmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{Vmatrix*}-1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -673,7 +673,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Vmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{Vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -702,7 +702,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Vmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-latex="\\begin{Vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -731,7 +731,7 @@ exports[`Mathtools Matrix Environments Vmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{Vmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right" data-latex="\\begin{Vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{Vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -760,7 +760,7 @@ exports[`Mathtools Matrix Environments bmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{bmatrix*}-1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -789,7 +789,7 @@ exports[`Mathtools Matrix Environments bmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{bmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -818,7 +818,7 @@ exports[`Mathtools Matrix Environments bmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{bmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-latex="\\begin{bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -847,7 +847,7 @@ exports[`Mathtools Matrix Environments bmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{bmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right" data-latex="\\begin{bmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{bmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -976,7 +976,7 @@ exports[`Mathtools Matrix Environments pmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{pmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{pmatrix*}-1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1005,7 +1005,7 @@ exports[`Mathtools Matrix Environments pmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{pmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{pmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1034,7 +1034,7 @@ exports[`Mathtools Matrix Environments pmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{pmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-latex="\\begin{pmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1063,7 +1063,7 @@ exports[`Mathtools Matrix Environments pmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{pmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{pmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right" data-latex="\\begin{pmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{pmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1092,7 +1092,7 @@ exports[`Mathtools Matrix Environments vmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{vmatrix*}-1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1121,7 +1121,7 @@ exports[`Mathtools Matrix Environments vmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{vmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*}[c] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt">
+    <mtable columnspacing="1em" rowspacing="4pt" data-latex="\\begin{vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1150,7 +1150,7 @@ exports[`Mathtools Matrix Environments vmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{vmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*}[l] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="left" data-latex="\\begin{vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1179,7 +1179,7 @@ exports[`Mathtools Matrix Environments vmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{vmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vmatrix*}[r] -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="right" data-latex="\\begin{vmatrix*} -1 &amp; 3 \\\\ 2 &amp; -4 \\end{vmatrix*}">
       <mtr data-latex="-1&amp;3">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -1492,7 +1492,7 @@ exports[`Mathtools More Environments dcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{dcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{dcases}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{dcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{dcases}">
     <mo data-mjx-texclass="OPEN">{</mo>
-    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" displaystyle="true">
+    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" displaystyle="true" data-latex="\\begin{dcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{dcases}">
       <mtr data-latex="1&amp;x&gt;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -1561,7 +1561,7 @@ exports[`Mathtools More Environments drcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{drcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{drcases}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{drcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{drcases}">
     <mo data-mjx-texclass="OPEN" fence="true" stretchy="true" symmetric="true"></mo>
-    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" displaystyle="true">
+    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" displaystyle="true" data-latex="\\begin{drcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{drcases}">
       <mtr data-latex="1&amp;x&gt;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -1939,7 +1939,7 @@ exports[`Mathtools More Environments rcases 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{rcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{rcases}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{rcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{rcases}">
     <mo data-mjx-texclass="OPEN" fence="true" stretchy="true" symmetric="true"></mo>
-    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left">
+    <mtable columnspacing="1em" rowspacing=".2em" columnalign="left left" data-latex="\\begin{rcases} 1 &amp; x&gt;0 \\\\ -1 &amp; x\\le 0 \\end{rcases}">
       <mtr data-latex="1&amp;x&gt;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -2443,7 +2443,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{Bsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2474,7 +2474,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{Bsmallmatrix*}-a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2505,7 +2505,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bsmallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{Bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2536,7 +2536,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bsmallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left" data-latex="\\begin{Bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2567,7 +2567,7 @@ exports[`Mathtools Small Matrix Environments Bsmallmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Bsmallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">{</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{Bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2598,7 +2598,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{Vsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2629,7 +2629,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{Vsmallmatrix*}-a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2660,7 +2660,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vsmallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{Vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2691,7 +2691,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vsmallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left" data-latex="\\begin{Vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2722,7 +2722,7 @@ exports[`Mathtools Small Matrix Environments Vsmallmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{Vsmallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">&#x2016;</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{Vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{Vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2753,7 +2753,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{bsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2784,7 +2784,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{bsmallmatrix*}-a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2815,7 +2815,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bsmallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2846,7 +2846,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bsmallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left" data-latex="\\begin{bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2877,7 +2877,7 @@ exports[`Mathtools Small Matrix Environments bsmallmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{bsmallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">[</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{bsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{bsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2908,7 +2908,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{psmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{psmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2939,7 +2939,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{psmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{psmallmatrix*}-a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -2970,7 +2970,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{psmallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{psmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3001,7 +3001,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{psmallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left" data-latex="\\begin{psmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3032,7 +3032,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{psmallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{psmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{psmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3061,7 +3061,7 @@ exports[`Mathtools Small Matrix Environments psmallmatrix*[r] 1`] = `
 exports[`Mathtools Small Matrix Environments smallmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}">
       <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -3088,7 +3088,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix 1`] = `
 exports[`Mathtools Small Matrix Environments smallmatrix 2`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix}">
       <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -3115,7 +3115,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix 2`] = `
 exports[`Mathtools Small Matrix Environments smallmatrix* 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix*}-a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
       <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -3142,7 +3142,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix* 1`] = `
 exports[`Mathtools Small Matrix Environments smallmatrix*[c] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
       <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -3169,7 +3169,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[c] 1`] = `
 exports[`Mathtools Small Matrix Environments smallmatrix*[l] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
       <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -3196,7 +3196,7 @@ exports[`Mathtools Small Matrix Environments smallmatrix*[l] 1`] = `
 exports[`Mathtools Small Matrix Environments smallmatrix*[r] 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{smallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{smallmatrix*}">
       <mtr data-latex="-a&amp;b">
         <mtd>
           <mo data-latex="-">&#x2212;</mo>
@@ -3225,7 +3225,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{vsmallmatrix} -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3256,7 +3256,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix* 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{vsmallmatrix*}-a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3287,7 +3287,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[c] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vsmallmatrix*}[c] -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3318,7 +3318,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[l] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vsmallmatrix*}[l] -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="left" data-latex="\\begin{vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3349,7 +3349,7 @@ exports[`Mathtools Small Matrix Environments vsmallmatrix*[r] 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\begin{vsmallmatrix*}[r] -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
     <mo data-mjx-texclass="OPEN">|</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{vsmallmatrix*} -a &amp; b \\\\ c &amp; -d \\end{vsmallmatrix*}">
         <mtr data-latex="-a&amp;b">
           <mtd>
             <mo data-latex="-">&#x2212;</mo>
@@ -3570,7 +3570,7 @@ exports[`Mathtools Spacing Control crampedsubstack 1`] = `
   <munder data-latex="\\begin{crampedsubarray}{c}x^2 \\\\y^2 \\end{crampedsubarray}}">
     <mo data-latex="\\sum">&#x2211;</mo>
     <mrow data-mjx-texclass="ORD" data-latex="{{crampedsubarray}}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" data-cramped="true" data-latex="{crampedsubarray}">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0em" rowspacing="0.1em" data-cramped="true" data-latex="\\begin{crampedsubarray}{c}x^2\\\\y^2\\end{crampedsubarray}">
         <mtr data-latex="x^2">
           <mtd>
             <msup data-latex="x^2">
@@ -4414,7 +4414,7 @@ exports[`Mathtools setoptions smallmatrix-align 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\mathtoolsset{smallmatrix-align=r}\\begin{psmallmatrix*} a \\\\ -b \\end{psmallmatrix*}">
     <mo data-mjx-texclass="OPEN">(</mo>
     <mstyle scriptlevel="1">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" columnalign="right" data-latex="\\begin{psmallmatrix*}a \\\\ -b \\end{psmallmatrix*}">
         <mtr data-latex="a">
           <mtd>
             <mi data-latex="a">a</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
index 9c643e5bf..c15069e31 100644
--- a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
@@ -901,7 +901,7 @@ exports[`Matrix Macros Rest antidiagonalmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\antidiagonalmatrix{0,1\\\\2&amp;3}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\antidiagonalmatrix{0,1\\\\2&amp;3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\antidiagonalmatrix{0,1\\\\2&amp;3}\\end{array}">
       <mtr data-latex="&amp;\\begin{array}{} 0\\end{array}">
         <mtd></mtd>
         <mtd>
@@ -943,7 +943,7 @@ exports[`Matrix Macros Rest diagonalmatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\diagonalmatrix{0,1\\\\2&amp;3}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\diagonalmatrix{0,1\\\\2&amp;3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\diagonalmatrix{0,1\\\\2&amp;3}\\end{array}">
       <mtr data-latex="\\begin{array}{} 0\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 0\\end{array}">
@@ -985,7 +985,7 @@ exports[`Matrix Macros Rest paulimatrix 0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\paulimatrix{0}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{0})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\paulimatrix{0}\\end{array}">
       <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -1012,7 +1012,7 @@ exports[`Matrix Macros Rest paulimatrix 1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\paulimatrix{1}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\paulimatrix{1}\\end{array}">
       <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -1039,7 +1039,7 @@ exports[`Matrix Macros Rest paulimatrix 2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\paulimatrix{2}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{2})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\paulimatrix{2}\\end{array}">
       <mtr data-latex="0&amp;-i">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -1067,7 +1067,7 @@ exports[`Matrix Macros Rest paulimatrix 3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\paulimatrix{3}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\paulimatrix{3}\\end{array}">
       <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -1095,7 +1095,7 @@ exports[`Matrix Macros Rest paulimatrix 4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\paulimatrix{4}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\paulimatrix{4})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}"></mtable>
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\paulimatrix{4}\\end{array}"></mtable>
     <mo data-mjx-texclass="CLOSE" data-latex="\\right)">)</mo>
   </mrow>
 </math>"
@@ -1105,7 +1105,7 @@ exports[`Matrix Macros Rest zeromatrix 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\zeromatrix{2}{3}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\zeromatrix{2}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\zeromatrix{2}{3}\\end{array}">
       <mtr data-latex="0&amp;0&amp;0">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -8015,7 +8015,7 @@ exports[`Physics7_0 Matrices_Quantity_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixquantity*(a &amp; b \\\\ c &amp; d)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8042,7 +8042,7 @@ exports[`Physics7_0 Matrices_Quantity_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixquantity(a &amp; b \\\\ c &amp; d)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8069,7 +8069,7 @@ exports[`Physics7_0 Matrices_Quantity_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixquantity[a &amp; b \\\\ c &amp; d]" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8096,7 +8096,7 @@ exports[`Physics7_0 Matrices_Quantity_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixquantity|a &amp; b \\\\ c &amp; d|" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\matrixquantity|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8146,7 +8146,7 @@ exports[`Physics7_0 Matrices_Quantity_7 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(a &amp; b \\\\ c &amp; d)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8173,7 +8173,7 @@ exports[`Physics7_0 Matrices_Quantity_8 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty*(a &amp; b \\\\ c &amp; d)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8200,7 +8200,7 @@ exports[`Physics7_0 Matrices_Quantity_9 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty[a &amp; b \\\\ c &amp; d]" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8227,7 +8227,7 @@ exports[`Physics7_0 Matrices_Quantity_10 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8254,7 +8254,7 @@ exports[`Physics7_0 Matrices_Quantity_11 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty*|a &amp; b\\\\ c&amp; d|" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty*|a &amp; b\\\\ c&amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b\\\\ c&amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8281,7 +8281,7 @@ exports[`Physics7_1 Matrices_Fenced_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{Q} \\mqty(R)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} Q\\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} Q\\end{array}">
       <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
@@ -8292,7 +8292,7 @@ exports[`Physics7_1 Matrices_Fenced_0 1`] = `
   </mrow>
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} R\\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} R\\end{array}">
       <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
@@ -8308,7 +8308,7 @@ exports[`Physics7_1 Matrices_Fenced_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\Pmqty{Q} \\mqty*(R)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left\\lgroup\\begin{array}{} Q\\end{array}\\right\\rgroup">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} Q\\end{array}">
       <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
@@ -8319,7 +8319,7 @@ exports[`Physics7_1 Matrices_Fenced_1 1`] = `
   </mrow>
   <mrow data-mjx-texclass="INNER" data-latex="\\left\\lgroup\\begin{array}{} R\\end{array}\\right\\rgroup">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} R\\end{array}">
       <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
@@ -8335,7 +8335,7 @@ exports[`Physics7_1 Matrices_Fenced_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\bmqty{Q} \\mqty[R]" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left[\\begin{array}{} Q\\end{array}\\right]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} Q\\end{array}">
       <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
@@ -8346,7 +8346,7 @@ exports[`Physics7_1 Matrices_Fenced_2 1`] = `
   </mrow>
   <mrow data-mjx-texclass="INNER" data-latex="\\left[\\begin{array}{} R\\end{array}\\right]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} R\\end{array}">
       <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
@@ -8362,7 +8362,7 @@ exports[`Physics7_1 Matrices_Fenced_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\vmqty{Q} \\mqty|R|" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} Q\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} Q\\end{array}">
       <mtr data-latex="Q">
         <mtd>
           <mi data-latex="Q">Q</mi>
@@ -8373,7 +8373,7 @@ exports[`Physics7_1 Matrices_Fenced_3 1`] = `
   </mrow>
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} R\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} R\\end{array}">
       <mtr data-latex="R">
         <mtd>
           <mi data-latex="R">R</mi>
@@ -8389,7 +8389,7 @@ exports[`Physics7_1 Matrices_Fenced_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8416,7 +8416,7 @@ exports[`Physics7_1 Matrices_Fenced_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\Pmqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8443,7 +8443,7 @@ exports[`Physics7_1 Matrices_Fenced_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\bmqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8470,7 +8470,7 @@ exports[`Physics7_1 Matrices_Fenced_7 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\vmqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -8496,7 +8496,7 @@ exports[`Physics7_1 Matrices_Fenced_7 1`] = `
 exports[`Physics7_2 Matrices_Small_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smallmatrixquantity{Q}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smallmatrixquantity{Q}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} Q\\end{smallmatrix}">
       <mtr data-latex="{}Q">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8511,7 +8511,7 @@ exports[`Physics7_2 Matrices_Small_0 1`] = `
 exports[`Physics7_2 Matrices_Small_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smallmatrixquantity*{a &amp; b \\\\ c &amp; d}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smallmatrixquantity*{a &amp; b \\\\ c &amp; d}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
       <mtr data-latex="{}a&amp;b">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8539,7 +8539,7 @@ exports[`Physics7_2 Matrices_Small_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smallmatrixquantity*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8569,7 +8569,7 @@ exports[`Physics7_2 Matrices_Small_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smallmatrixquantity(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8599,7 +8599,7 @@ exports[`Physics7_2 Matrices_Small_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smallmatrixquantity|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8627,7 +8627,7 @@ exports[`Physics7_2 Matrices_Small_5 1`] = `
 exports[`Physics7_2 Matrices_Small_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smqty{a &amp; b \\\\ c &amp; d}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smqty{a &amp; b \\\\ c &amp; d}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
       <mtr data-latex="{}a&amp;b">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8655,7 +8655,7 @@ exports[`Physics7_2 Matrices_Small_7 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8685,7 +8685,7 @@ exports[`Physics7_2 Matrices_Small_8 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8715,7 +8715,7 @@ exports[`Physics7_2 Matrices_Small_9 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8745,7 +8745,7 @@ exports[`Physics7_2 Matrices_Small_10 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8775,7 +8775,7 @@ exports[`Physics7_3 Matrices_SmallFenced_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{smallmatrix}{} Q\\end{smallmatrix}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} Q\\end{smallmatrix}">
         <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8789,7 +8789,7 @@ exports[`Physics7_3 Matrices_SmallFenced_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{smallmatrix}{} R\\end{smallmatrix}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} R\\end{smallmatrix}">
         <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8808,7 +8808,7 @@ exports[`Physics7_3 Matrices_SmallFenced_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left\\lgroup\\begin{smallmatrix}{} Q\\end{smallmatrix}\\right\\rgroup">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} Q\\end{smallmatrix}">
         <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8822,7 +8822,7 @@ exports[`Physics7_3 Matrices_SmallFenced_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left\\lgroup\\begin{smallmatrix}{} R\\end{smallmatrix}\\right\\rgroup">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} R\\end{smallmatrix}">
         <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8841,7 +8841,7 @@ exports[`Physics7_3 Matrices_SmallFenced_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left[\\begin{smallmatrix}{} Q\\end{smallmatrix}\\right]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} Q\\end{smallmatrix}">
         <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8855,7 +8855,7 @@ exports[`Physics7_3 Matrices_SmallFenced_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left[\\begin{smallmatrix}{} R\\end{smallmatrix}\\right]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} R\\end{smallmatrix}">
         <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8874,7 +8874,7 @@ exports[`Physics7_3 Matrices_SmallFenced_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{smallmatrix}{} Q\\end{smallmatrix}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} Q\\end{smallmatrix}">
         <mtr data-latex="{}Q">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8888,7 +8888,7 @@ exports[`Physics7_3 Matrices_SmallFenced_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{smallmatrix}{} R\\end{smallmatrix}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} R\\end{smallmatrix}">
         <mtr data-latex="{}R">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8907,7 +8907,7 @@ exports[`Physics7_3 Matrices_SmallFenced_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8937,7 +8937,7 @@ exports[`Physics7_3 Matrices_SmallFenced_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty*(a &amp; b \\\\ c &amp; d)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left\\lgroup">&#x27EE;</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8967,7 +8967,7 @@ exports[`Physics7_3 Matrices_SmallFenced_6 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty[a &amp; b \\\\ c &amp; d]">
     <mo data-mjx-texclass="OPEN" data-latex="\\left[">[</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -8997,7 +8997,7 @@ exports[`Physics7_3 Matrices_SmallFenced_7 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9026,7 +9026,7 @@ exports[`Physics7_4 Matrices_Det_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixdeterminant{a &amp; b \\\\ c &amp; d}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -9053,7 +9053,7 @@ exports[`Physics7_4 Matrices_Det_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mdet{a &amp; b \\\\ c &amp; d}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a &amp; b \\\\ c &amp; d\\end{array}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -9081,7 +9081,7 @@ exports[`Physics7_4 Matrices_Det_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty|a &amp; b \\\\ c &amp; d|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a &amp; b \\\\ c &amp; d\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;b">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9110,7 +9110,7 @@ exports[`Physics7_4 Matrices_Det_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\matrixdeterminant a b" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} a\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -9127,7 +9127,7 @@ exports[`Physics7_4 Matrices_Det_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mdet a b" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{array}{} a\\end{array}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} a\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -9145,7 +9145,7 @@ exports[`Physics7_4 Matrices_Det_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\left|\\begin{smallmatrix}{} a\\end{smallmatrix}\\right|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} a\\end{smallmatrix}">
         <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9204,7 +9204,7 @@ exports[`Physics7_5 Matrices_Identity_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\vmqty{\\imat{5}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{5}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{5}\\end{array}">
       <mtr data-latex="1&amp;0&amp;0&amp;0&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -9300,7 +9300,7 @@ exports[`Physics7_5 Matrices_Identity_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\vmqty{\\imat{0}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{0}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{0}\\end{array}">
       <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -9316,7 +9316,7 @@ exports[`Physics7_5 Matrices_Identity_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\vmqty{\\imat{1}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{1}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{1}\\end{array}">
       <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -9332,7 +9332,7 @@ exports[`Physics7_5 Matrices_Identity_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\vmqty{\\imat{-1}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty|\\imat{-1}|">
     <mo data-mjx-texclass="OPEN" data-latex="\\left|">|</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{-1}\\end{array}">
       <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -9348,7 +9348,7 @@ exports[`Physics7_5 Matrices_Identity_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\imat{3}\\pmat{0}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\imat{3}\\pmat{0})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{3}\\pmat{0}\\end{array}">
       <mtr data-latex="1&amp;0&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -9405,7 +9405,7 @@ exports[`Physics7_6 Matrices_XMatrix_0 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat{1}{2}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat{1}{2}{3}\\end{smallmatrix}">
         <mtr data-latex="{}1&amp;1&amp;1">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9441,7 +9441,7 @@ exports[`Physics7_6 Matrices_XMatrix_1 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat{a}{3}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat{a}{3}{3}\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;a&amp;a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9488,7 +9488,7 @@ exports[`Physics7_6 Matrices_XMatrix_2 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat{a}{3}{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat{a}{3}{1}\\end{smallmatrix}">
         <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9517,7 +9517,7 @@ exports[`Physics7_6 Matrices_XMatrix_3 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat{a}{1}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat{a}{1}{3}\\end{smallmatrix}">
         <mtr data-latex="{}a&amp;a&amp;a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9542,7 +9542,7 @@ exports[`Physics7_6 Matrices_XMatrix_4 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat*{1}{2}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat*{1}{2}{3}\\end{smallmatrix}">
         <mtr data-latex="{}1_{{1}{1}}&amp;1_{{1}{2}}&amp;1_{{1}{3}}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9638,7 +9638,7 @@ exports[`Physics7_6 Matrices_XMatrix_5 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat*{a}{3}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat*{a}{3}{3}\\end{smallmatrix}">
         <mtr data-latex="{}a_{{1}{1}}&amp;a_{{1}{2}}&amp;a_{{1}{3}}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9775,7 +9775,7 @@ exports[`Physics7_6 Matrices_XMatrix_6 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat*{a}{3}{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat*{a}{3}{1}\\end{smallmatrix}">
         <mtr data-latex="{}a_{1}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9819,7 +9819,7 @@ exports[`Physics7_6 Matrices_XMatrix_7 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat*{a}{1}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat*{a}{1}{3}\\end{smallmatrix}">
         <mtr data-latex="{}a_{1}&amp;a_{2}&amp;a_{3}">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9859,7 +9859,7 @@ exports[`Physics7_6 Matrices_XMatrix_8 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat*{a}{1}{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat*{a}{1}{1}\\end{smallmatrix}">
         <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9878,7 +9878,7 @@ exports[`Physics7_6 Matrices_XMatrix_9 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\xmat*{a}{-1}{-1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\xmat*{a}{-1}{-1}\\end{smallmatrix}">
         <mtr data-latex="{}a">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9897,7 +9897,7 @@ exports[`Physics7_6 Matrices_XMatrix_10 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\zmat{1}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\zmat{1}{3}\\end{smallmatrix}">
         <mtr data-latex="{}0&amp;0&amp;0">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9922,7 +9922,7 @@ exports[`Physics7_6 Matrices_XMatrix_11 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\zmat{2}{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\zmat{2}{3}\\end{smallmatrix}">
         <mtr data-latex="{}0&amp;0&amp;0">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -9958,7 +9958,7 @@ exports[`Physics7_6 Matrices_XMatrix_12 1`] = `
   <mrow data-mjx-texclass="INNER" data-latex="\\smqty(\\zmat{3}{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
     <mstyle scriptlevel="1" data-latex="{smallmatrix}">
-      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+      <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\zmat{3}{1}\\end{smallmatrix}">
         <mtr data-latex="{}0">
           <mtd>
             <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
@@ -10009,7 +10009,7 @@ exports[`Physics7_7 Matrices_Pauli_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{0}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{0})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{0}\\end{array}">
       <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10190,7 +10190,7 @@ exports[`Physics7_7 Matrices_Pauli_10 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{a}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{a})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}"></mtable>
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{a}\\end{array}"></mtable>
     <mo data-mjx-texclass="CLOSE" data-latex="\\right)">)</mo>
   </mrow>
 </math>"
@@ -10212,7 +10212,7 @@ exports[`Physics7_7 Matrices_Pauli_12 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{0.a}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{0.a})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{0.a}\\end{array}">
       <mtr data-latex=".a1&amp;0">
         <mtd>
           <mo data-latex=".">.</mo>
@@ -10241,7 +10241,7 @@ exports[`Physics7_8 Matrices_PauliFenced_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{1}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{1})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{1}\\end{array}">
       <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -10268,7 +10268,7 @@ exports[`Physics7_8 Matrices_PauliFenced_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{2}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{2})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{2}\\end{array}">
       <mtr data-latex="0&amp;-i">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -10296,7 +10296,7 @@ exports[`Physics7_8 Matrices_PauliFenced_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{3}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{3})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{3}\\end{array}">
       <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10324,7 +10324,7 @@ exports[`Physics7_8 Matrices_PauliFenced_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{4}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{4})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}"></mtable>
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{4}\\end{array}"></mtable>
     <mo data-mjx-texclass="CLOSE" data-latex="\\right)">)</mo>
   </mrow>
 </math>"
@@ -10334,7 +10334,7 @@ exports[`Physics7_8 Matrices_PauliFenced_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{x}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{x})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{x}\\end{array}">
       <mtr data-latex="0&amp;1">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -10361,7 +10361,7 @@ exports[`Physics7_8 Matrices_PauliFenced_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{y}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{y})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{y}\\end{array}">
       <mtr data-latex="0&amp;-i">
         <mtd>
           <mn data-latex="0">0</mn>
@@ -10389,7 +10389,7 @@ exports[`Physics7_8 Matrices_PauliFenced_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{z}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{z})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{z}\\end{array}">
       <mtr data-latex="1&amp;0">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10417,7 +10417,7 @@ exports[`Physics7_8 Matrices_PauliFenced_7 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty{\\pmat{aa}}" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\pmat{aa})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\pmat{aa}\\end{array}">
       <mtr data-latex="a">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -10433,7 +10433,7 @@ exports[`Physics7_9 Matrices_Diag_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3\\\\4&amp;5}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -10478,7 +10478,7 @@ exports[`Physics7_9 Matrices_Diag_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat 1)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat 1)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat 1\\end{array}">
       <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10494,7 +10494,7 @@ exports[`Physics7_9 Matrices_Diag_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat 1,2)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat 1,2)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat 1,2\\end{array}">
       <mtr data-latex="1,2">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10512,7 +10512,7 @@ exports[`Physics7_9 Matrices_Diag_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -10587,7 +10587,7 @@ exports[`Physics7_9 Matrices_Diag_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5,6,7,8})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5,6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3\\\\4&amp;5,6,7,8}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -10674,7 +10674,7 @@ exports[`Physics7_9 Matrices_Diag_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2\\\\3\\\\4\\\\5\\\\6,7,8})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2\\\\3\\\\4\\\\5\\\\6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2\\\\3\\\\4\\\\5\\\\6,7,8}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -10755,7 +10755,7 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -10826,7 +10826,7 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
-          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
+          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{9,10}\\end{array}">
             <mtr data-latex="\\begin{array}{} 9\\end{array}">
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 9\\end{array}">
@@ -10863,7 +10863,7 @@ exports[`Physics7_10 Matrices_Adiag_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\admat{1,2&amp;3\\\\4&amp;5}\\end{array}">
       <mtr data-latex="&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd>
@@ -10908,7 +10908,7 @@ exports[`Physics7_10 Matrices_Adiag_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\admat 1)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat 1)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\admat 1\\end{array}">
       <mtr data-latex="1">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10924,7 +10924,7 @@ exports[`Physics7_10 Matrices_Adiag_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\admat 1,2)" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat 1,2)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\admat 1,2\\end{array}">
       <mtr data-latex="1,2">
         <mtd>
           <mn data-latex="1">1</mn>
@@ -10942,7 +10942,7 @@ exports[`Physics7_10 Matrices_Adiag_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8}\\end{array}">
       <mtr data-latex="&amp;&amp;&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
@@ -11017,7 +11017,7 @@ exports[`Physics7_10 Matrices_Adiag_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5,6,7,8})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5,6,7,8})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\admat{1,2&amp;3\\\\4&amp;5,6,7,8}\\end{array}">
       <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
@@ -11104,7 +11104,7 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\admat{1,2&amp;3\\\\4&amp;5&amp;6,7,8,\\dmat{9,10}}\\end{array}">
       <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} 1\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
@@ -11175,7 +11175,7 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
       </mtr>
       <mtr data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
         <mtd>
-          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
+          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{9,10}\\end{array}">
             <mtr data-latex="\\begin{array}{} 9\\end{array}">
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 9\\end{array}">
@@ -11212,7 +11212,7 @@ exports[`Physics7_11 Matrices_Other_0 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty a" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} \\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}"></mtable>
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\end{array}"></mtable>
     <mo data-mjx-texclass="CLOSE" data-latex="\\right)">)</mo>
   </mrow>
   <mi data-latex="a">a</mi>
@@ -11223,7 +11223,7 @@ exports[`Physics7_11 Matrices_Other_1 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty1" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} \\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}"></mtable>
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\end{array}"></mtable>
     <mo data-mjx-texclass="CLOSE" data-latex="\\right)">)</mo>
   </mrow>
   <mn data-latex="1">1</mn>
@@ -11234,7 +11234,7 @@ exports[`Physics7_11 Matrices_Other_2 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\pmqty* 34" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\left(\\begin{array}{} *\\end{array}\\right)">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} *\\end{array}">
       <mtr data-latex="*">
         <mtd>
           <mo data-latex="*">&#x2217;</mo>
@@ -11251,7 +11251,7 @@ exports[`Physics7_11 Matrices_Other_3 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3,4&amp;4&amp;5\\\\4&amp;5,33,4,5,7,8\\\\0\\\\10&amp;20\\\\3,200}) " display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3,4&amp;4&amp;5\\\\4&amp;5,33,4,5,7,8\\\\0\\\\10&amp;20\\\\3,200})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3,4&amp;4&amp;5\\\\4&amp;5,33,4,5,7,8\\\\0\\\\10&amp;20\\\\3,200}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -11432,7 +11432,7 @@ exports[`Physics7_11 Matrices_Other_4 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5}) " display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3\\\\4&amp;5}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -11477,7 +11477,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,\\imat{3},7,8,\\dmat{9,10}})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\dmat{1,2&amp;3\\\\4&amp;5&amp;6,\\imat{3},7,8,\\dmat{9,10}})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{1,2&amp;3\\\\4&amp;5&amp;6,\\imat{3},7,8,\\dmat{9,10}}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -11519,7 +11519,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
-          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
+          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{3}\\end{array}">
             <mtr data-latex="1&amp;0&amp;0">
               <mtd>
                 <mn data-latex="1">1</mn>
@@ -11592,7 +11592,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
-          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
+          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{9,10}\\end{array}">
             <mtr data-latex="\\begin{array}{} 9\\end{array}">
               <mtd>
                 <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 9\\end{array}">
@@ -11629,7 +11629,7 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\mqty(\\mqty{1}\\\\ &amp; \\mqty{2 &amp; 3\\\\ 4 &amp; 5 &amp; 6}\\\\ &amp; &amp; \\mqty{\\imat{3}} \\\\ &amp; &amp; &amp; \\mqty{7})" display="block">
   <mrow data-mjx-texclass="INNER" data-latex="\\mqty(\\mqty{1}\\\\ &amp; \\mqty{2 &amp; 3\\\\ 4 &amp; 5 &amp; 6}\\\\ &amp; &amp; \\mqty{\\imat{3}} \\\\ &amp; &amp; &amp; \\mqty{7})">
     <mo data-mjx-texclass="OPEN" data-latex="\\left(">(</mo>
-    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="{array}">
+    <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\mqty{1}\\\\ &amp; \\mqty{2 &amp; 3\\\\ 4 &amp; 5 &amp; 6}\\\\ &amp; &amp; \\mqty{\\imat{3}} \\\\ &amp; &amp; &amp; \\mqty{7}\\end{array}">
       <mtr data-latex="\\begin{array}{} 1\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} 1\\end{array}">
@@ -11671,7 +11671,7 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
-          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
+          <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\imat{3}\\end{array}">
             <mtr data-latex="1&amp;0&amp;0">
               <mtd>
                 <mn data-latex="1">1</mn>
@@ -11744,7 +11744,7 @@ exports[`Physics7_11 Matrices_Other_7 1`] = `
 exports[`Physics7_11 Matrices_Other_8 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}" display="block">
   <mstyle scriptlevel="1" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix} a &amp; b \\\\ c &amp; d \\end{smallmatrix}">
       <mtr data-latex="a&amp;b">
         <mtd>
           <mi data-latex="a">a</mi>
@@ -11769,7 +11769,7 @@ exports[`Physics7_11 Matrices_Other_8 1`] = `
 exports[`Physics7_11 Matrices_Other_9 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\smqty{\\imat{3}}" display="block">
   <mstyle scriptlevel="1" data-latex="\\smqty{\\imat{3}}">
-    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em">
+    <mtable data-mjx-smallmatrix="true" columnspacing="0.333em" rowspacing=".2em" data-latex="\\begin{smallmatrix}{} \\imat{3}\\end{smallmatrix}">
       <mtr data-latex="{}1&amp;0&amp;0">
         <mtd>
           <mrow data-mjx-texclass="ORD" data-latex="{}"></mrow>
diff --git a/ts/input/tex.ts b/ts/input/tex.ts
index 205ecd4ff..5b27367a2 100644
--- a/ts/input/tex.ts
+++ b/ts/input/tex.ts
@@ -161,6 +161,7 @@ export class TeX<N, T, D> extends AbstractInputJax<N, T, D> {
       [FilterUtil.cleanSubSup, -7],
       [FilterUtil.setInherited, -6],
       [FilterUtil.checkScriptlevel, -5],
+      [FilterUtil.fixArrayLatex, -4.5],
       [FilterUtil.moveLimits, -4],
       [FilterUtil.cleanStretchy, -3],
       [FilterUtil.cleanAttributes, -2],
diff --git a/ts/input/tex/FilterUtil.ts b/ts/input/tex/FilterUtil.ts
index 0252d8b0f..51826dd91 100644
--- a/ts/input/tex/FilterUtil.ts
+++ b/ts/input/tex/FilterUtil.ts
@@ -341,6 +341,62 @@ const FilterUtil = {
     }
     options.removeFromList('mstyle', remove);
   },
+
+  /**
+   * Fixes the `data-latex` attribute of mtable nodes produced by array-like
+   * environments, in the cases where the parser's string was rewritten during
+   * parsing:
+   *
+   * - Column templates rewrite the parser's string entry by entry, so we end up
+   *   using a leftover fragment instead of the actual source.
+   *
+   * - When the table is nested inside another environment (e.g., inside a
+   *   tagged equation, or another array), `addLatexItem` sets `data-latex` from
+   *   the `\end{name}` argument alone (e.g., `{array}`), which is wrong.
+   *
+   * This filter only replace a `data-latex` value that looks missing or
+   * broken, so that already-correct values (e.g., the literal source of a bare
+   * top-level array, or the macro call for macros that build their own
+   * array-like content) are left alone.
+   *
+   * @param {object} arg The argument object.
+   * @param {ParseOptions} arg.data The parse options.
+   */
+  fixArrayLatex(arg: { data: ParseOptions }) {
+    const LATEX = TexConstant.Attr.LATEX;
+    for (const mml of arg.data.getList('mtable')) {
+      const tex = mml.getProperty('rawLatex') as string;
+      if (!tex) continue;
+      const name = mml.getProperty('rawLatexName') as string;
+      const current = mml.attributes.getExplicit(LATEX) as string;
+      if (!current || FilterUtil.isBrokenArrayLatex(current, name)) {
+        mml.attributes.set(TexConstant.Attr.LATEXITEM, tex);
+        mml.attributes.set(LATEX, tex);
+      }
+    }
+  },
+
+  /**
+   * Checks whether a `data-latex` value looks like one of the broken fragments,
+   * rather than a genuine, complete piece of LaTeX source.
+   *
+   * This could be fragile or incomplete!
+   *
+   * @param {string} current The current `data-latex` value.
+   * @param {string} name The environment name (e.g., `array`, `matrix`).
+   * @returns {boolean} True if the value looks broken.
+   */
+  isBrokenArrayLatex(current: string, name: string): boolean {
+    if (current === `{${name}}`) {
+      // @test Ams Issues Array with Tag
+      return true;
+    }
+    // @test Complete Array column r c l >
+    return (
+      current.includes(`\\end{${name}}`) &&
+      !current.includes(`\\begin{${name}}`)
+    );
+  },
 };
 
 export default FilterUtil;
diff --git a/ts/input/tex/StackItem.ts b/ts/input/tex/StackItem.ts
index 57a7938f2..95b84ccba 100644
--- a/ts/input/tex/StackItem.ts
+++ b/ts/input/tex/StackItem.ts
@@ -580,11 +580,6 @@ export abstract class BaseItem extends MmlStack implements StackItem {
    * @param {string=} prefix A prefix for the LaTeX command.
    */
   public addLatexItem(node: MmlNode, prefix: string = '') {
-    // If the node already has a LaTeX source (e.g., an mtable reconstructed
-    // data-latex ), don't overwrite it with a new one.
-    if (node.getProperty('fixedLatex') !== undefined) {
-      return;
-    }
     const str = this.startStr.slice(this.startI, this.stopI);
     if (str) {
       const tex = prefix ? prefix + str : str;
diff --git a/ts/input/tex/TexParser.ts b/ts/input/tex/TexParser.ts
index 6a2cabe7d..f996115b6 100644
--- a/ts/input/tex/TexParser.ts
+++ b/ts/input/tex/TexParser.ts
@@ -269,13 +269,9 @@ export default class TexParser {
       return null;
     }
     const node = this.stack.Top().First;
-    // Only overwrite the LaTeX source if it hasn't been set already (e.g., an
-    // mtable produced by an array-like environment)
-    if (node.getProperty('fixedLatex') === undefined) {
-      const latex = this.trimTex(this.string);
-      if (latex) {
-        node.attributes.set(TexConstant.Attr.LATEX, latex);
-      }
+    const latex = this.trimTex(this.string);
+    if (latex) {
+      node.attributes.set(TexConstant.Attr.LATEX, latex);
     }
     return node;
   }
diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts
index 16ea15cb2..a7457af5f 100644
--- a/ts/input/tex/base/BaseItems.ts
+++ b/ts/input/tex/base/BaseItems.ts
@@ -1107,6 +1107,7 @@ export class ArrayItem extends BaseItem {
     const scriptlevel = this.arraydef['scriptlevel'];
     delete this.arraydef['scriptlevel'];
     let mml = this.create('node', 'mtable', this.table, this.arraydef);
+    this.setTableLatex(mml);
     if (scriptlevel) {
       mml.setProperty('smallmatrix', true);
     }
@@ -1134,7 +1135,6 @@ export class ArrayItem extends BaseItem {
         this.getProperty('close') as string
       );
     }
-    this.setTableLatex(mml);
     return mml;
   }
 
@@ -1415,29 +1415,21 @@ export class ArrayItem extends BaseItem {
     // by macro expansion \newenvironment.
     if (end < 0) return;
     this.setProperty('rawLatex', `\\begin{${name}}${source.slice(0, end)}`);
+    this.setProperty('rawLatexName', name);
   }
 
   /**
-   * Sets `data-latex` attribute of the mtable node from captured source. This
-   * is only needed when column templates are in play.
+   * Stashes the original source when a table is opened as a fall-back value for
+   * `data-latex` if the the postprocessing filter decides the attribute is
+   * incorrect.
    *
    * @param {MmlNode} mml The mtable node.
    */
   public setTableLatex(mml: MmlNode) {
-    const hasTemplate = (list: (string | boolean)[]) =>
-      list && list.some((x) => x);
-    if (
-      !hasTemplate(this.cstart) &&
-      !hasTemplate(this.cend) &&
-      !hasTemplate(this.cextra)
-    ) {
-      return;
-    }
     const tex = this.getProperty('rawLatex') as string;
     if (!tex) return;
-    mml.attributes.set(TexConstant.Attr.LATEXITEM, tex);
-    mml.attributes.set(TexConstant.Attr.LATEX, tex);
-    mml.setProperty('fixedLatex', true);
+    mml.setProperty('rawLatex', tex);
+    mml.setProperty('rawLatexName', this.getProperty('rawLatexName') as string);
   }
 
   /**

From a304ee35a3c3417bba65bcddc96868e171ad42a2 Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Mon, 27 Jul 2026 20:09:15 +0200
Subject: [PATCH 08/11] ensure that ref elements actually get a data-latex
 attribute

---
 .../input/tex/__snapshots__/Ams.test.ts.snap  |  2 +-
 .../input/tex/__snapshots__/Base.test.ts.snap |  6 +-
 .../tex/__snapshots__/Mathtools.test.ts.snap  |  2 +-
 .../input/tex/__snapshots__/Tag.test.ts.snap  | 58 +++++++++----------
 .../tex/__snapshots__/TagFormat.test.ts.snap  |  6 +-
 .../input/tex/__snapshots__/Tex.test.ts.snap  |  2 +-
 .../tex/__snapshots__/Textmacros.test.ts.snap |  6 +-
 ts/input/tex/base/BaseMethods.ts              | 19 +++---
 8 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
index bee5dcb82..c208fae9e 100644
--- a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
@@ -3276,7 +3276,7 @@ exports[`InternalMath Mbox Eqref 1`] = `
     <mtext>&#xA0;</mtext>
     <mrow data-mjx-texclass="ORD">
       <mrow href="#" class="MathJax_ref" data-latex="\\eqref{1}">
-        <mtext>(???)</mtext>
+        <mtext data-latex="\\text{(???)}">(???)</mtext>
       </mrow>
     </mrow>
     <mtext>&#xA0;</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index ac2c37d4a..52ea4bd67 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -7665,7 +7665,7 @@ exports[`Referencing Ref 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
-          <mtext>???</mtext>
+          <mtext data-latex="\\text{???}">???</mtext>
         </mrow>
       </mtd>
     </mlabeledtr>
@@ -7685,7 +7685,7 @@ exports[`Referencing Ref Unknown 1`] = `
       <mtd>
         <mi data-latex="a">a</mi>
         <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
-          <mtext>???</mtext>
+          <mtext data-latex="\\text{???}">???</mtext>
         </mrow>
       </mtd>
     </mlabeledtr>
@@ -9207,7 +9207,7 @@ exports[`User Defined Macros EqRef 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\eqref{A}" display="block">
   <mi data-latex="a">a</mi>
   <mrow href="#" class="MathJax_ref" data-latex="\\eqref{A}">
-    <mtext>(???)</mtext>
+    <mtext data-latex="\\text{(???)}">(???)</mtext>
   </mrow>
 </math>"
 `;
diff --git a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
index 374db4e51..f0c2b3240 100644
--- a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
@@ -3995,7 +3995,7 @@ exports[`Mathtools Tagging refeq 1`] = `
     <mtr data-latex="\\refeq{test}">
       <mtd>
         <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\refeq{test}">
-          <mtext>\\textsf{A}</mtext>
+          <mtext data-latex="\\text{\\textsf{A}}">\\textsf{A}</mtext>
         </mrow>
       </mtd>
     </mtr>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
index 75e1a507c..de738fff0 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
@@ -20,7 +20,7 @@ exports[`Page References Forward Reference 1`] = `
 </math>",
   "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\eqref{eq1}">
   <mrow href="#mjx-eqn%3Aeq1" class="MathJax_ref" data-latex="\\eqref{eq1}">
-    <mtext>(1)</mtext>
+    <mtext data-latex="\\text{(1)}">(1)</mtext>
   </mrow>
 </math>",
 ]
@@ -30,7 +30,7 @@ exports[`Page References Forward Reference 2`] = `
 [
   "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\eqref{eq1}">
   <mrow href="#mjx-eqn%3Aeq1" class="MathJax_ref" data-latex="\\eqref{eq1}">
-    <mtext>(1)</mtext>
+    <mtext data-latex="\\text{(1)}">(1)</mtext>
   </mrow>
 </math>",
   "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a=b\\label{eq1}\\tag{1}" display="block">
@@ -137,7 +137,7 @@ exports[`TagAll Eqref 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\eqref{A}">
-    <mtext>(1)</mtext>
+    <mtext data-latex="\\text{(1)}">(1)</mtext>
   </mrow>
 </math>"
 `;
@@ -352,7 +352,7 @@ exports[`TagAll Ref 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>1</mtext>
+    <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
 `;
@@ -372,7 +372,7 @@ exports[`TagAll Ref Default 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>1</mtext>
+    <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
 `;
@@ -392,7 +392,7 @@ exports[`TagAll Ref Named 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
 </math>"
 `;
@@ -422,10 +422,10 @@ exports[`TagAll Ref Named Default 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
   <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>1</mtext>
+    <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
 `;
@@ -455,10 +455,10 @@ exports[`TagAll Ref Named Named 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
   <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>B</mtext>
+    <mtext data-latex="\\text{B}">B</mtext>
   </mrow>
 </math>"
 `;
@@ -478,7 +478,7 @@ exports[`TagAll Ref Unknown 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
 `;
@@ -656,7 +656,7 @@ exports[`TagAms Eqref 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\eqref{A}">
-    <mtext>(1)</mtext>
+    <mtext data-latex="\\text{(1)}">(1)</mtext>
   </mrow>
 </math>"
 `;
@@ -871,7 +871,7 @@ exports[`TagAms Ref 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>1</mtext>
+    <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
 `;
@@ -891,7 +891,7 @@ exports[`TagAms Ref Default 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>1</mtext>
+    <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
 `;
@@ -911,7 +911,7 @@ exports[`TagAms Ref Named 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
 </math>"
 `;
@@ -941,10 +941,10 @@ exports[`TagAms Ref Named Default 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
   <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>1</mtext>
+    <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
 `;
@@ -974,10 +974,10 @@ exports[`TagAms Ref Named Named 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
   <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>B</mtext>
+    <mtext data-latex="\\text{B}">B</mtext>
   </mrow>
 </math>"
 `;
@@ -997,7 +997,7 @@ exports[`TagAms Ref Unknown 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
 `;
@@ -1130,7 +1130,7 @@ exports[`TagNone Eqref 1`] = `
     </mtr>
   </mtable>
   <mrow href="#" class="MathJax_ref" data-latex="\\eqref{A}">
-    <mtext>(???)</mtext>
+    <mtext data-latex="\\text{(???)}">(???)</mtext>
   </mrow>
 </math>"
 `;
@@ -1315,7 +1315,7 @@ exports[`TagNone Ref 1`] = `
     </mtr>
   </mtable>
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
 `;
@@ -1330,7 +1330,7 @@ exports[`TagNone Ref Default 1`] = `
     </mtr>
   </mtable>
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
 `;
@@ -1350,7 +1350,7 @@ exports[`TagNone Ref Named 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
 </math>"
 `;
@@ -1375,10 +1375,10 @@ exports[`TagNone Ref Named Default 1`] = `
     </mtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
 `;
@@ -1408,10 +1408,10 @@ exports[`TagNone Ref Named Named 1`] = `
     </mlabeledtr>
   </mtable>
   <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
-    <mtext>A</mtext>
+    <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
   <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>B</mtext>
+    <mtext data-latex="\\text{B}">B</mtext>
   </mrow>
 </math>"
 `;
@@ -1426,7 +1426,7 @@ exports[`TagNone Ref Unknown 1`] = `
     </mtr>
   </mtable>
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
 `;
diff --git a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
index ef45268a7..a37860a18 100644
--- a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
@@ -87,7 +87,7 @@ exports[`Tagformat Custom ref 1`] = `
       </mtd>
       <mtd>
         <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\eqref{test}">
-          <mtext>**x**</mtext>
+          <mtext data-latex="\\text{**x**}">**x**</mtext>
         </mrow>
       </mtd>
     </mlabeledtr>
@@ -116,7 +116,7 @@ exports[`Tagformat Eqref 1`] = `
       </mtd>
       <mtd>
         <mrow href="[[#my-tag%3Atest]]" class="MathJax_ref" data-latex="\\eqref{test}">
-          <mtext>[x]</mtext>
+          <mtext data-latex="\\text{[x]}">[x]</mtext>
         </mrow>
       </mtd>
     </mlabeledtr>
@@ -145,7 +145,7 @@ exports[`Tagformat Ref 1`] = `
       </mtd>
       <mtd>
         <mrow href="[[#my-tag%3Atest]]" class="MathJax_ref" data-latex="\\ref{test}">
-          <mtext>x</mtext>
+          <mtext data-latex="\\text{x}">x</mtext>
         </mrow>
       </mtd>
     </mlabeledtr>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap
index ea428f42a..01b104ff7 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tex.test.ts.snap
@@ -46,7 +46,7 @@ exports[`FindTeX ref undefined 1`] = `
 [
   "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\ref{x}">
   <mrow href="#" class="MathJax_ref" data-latex="\\ref{x}">
-    <mtext>???</mtext>
+    <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>",
 ]
diff --git a/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap
index c876abb13..1d223fae8 100644
--- a/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap
@@ -182,10 +182,10 @@ exports[`Textmacros Macros Ref and Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\text{\\ref{a}\\eqref{b}}" display="block">
   <mrow data-latex="\\text{\\ref{a}\\eqref{b}}">
     <mrow href="#" class="MathJax_ref">
-      <mtext>???</mtext>
+      <mtext data-latex="\\text{???}">???</mtext>
     </mrow>
     <mrow href="#" class="MathJax_ref">
-      <mtext>(???)</mtext>
+      <mtext data-latex="\\text{(???)}">(???)</mtext>
     </mrow>
   </mrow>
 </math>"
@@ -594,7 +594,7 @@ exports[`Textmacros Text ref 1`] = `
   <mrow data-latex="\\textbf{a \\ref{a}}">
     <mtext mathvariant="bold">a&#xA0;</mtext>
     <mrow href="#" class="MathJax_ref">
-      <mtext>???</mtext>
+      <mtext data-latex="\\text{???}">???</mtext>
     </mrow>
   </mrow>
 </math>"
diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts
index 467b5bc06..8ba1f15ed 100644
--- a/ts/input/tex/base/BaseMethods.ts
+++ b/ts/input/tex/base/BaseMethods.ts
@@ -2227,15 +2227,16 @@ const BaseMethods: { [key: string]: ParseMethod } = {
       // @test Eqref
       tag = parser.tags.formatRef(tag);
     }
-    const node = parser.create(
-      'node',
-      'mrow',
-      ParseUtil.internalMath(parser, Array.isArray(tag) ? tag.join('') : tag),
-      {
-        href: parser.tags.formatUrl(ref.id, parser.options.baseURL),
-        class: 'MathJax_ref',
-      }
-    );
+    const tagStr = Array.isArray(tag) ? tag.join('') : tag;
+    const mml = new TexParser(
+      `\\text{${tagStr}}`,
+      {},
+      parser.tags.configuration
+    ).mml();
+    const node = parser.create('node', 'mrow', [mml], {
+      href: parser.tags.formatUrl(ref.id, parser.options.baseURL),
+      class: 'MathJax_ref',
+    });
     parser.Push(node);
   },
 

From 43ad772e0e73c75586495a2de6643dcae2895631 Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Mon, 27 Jul 2026 20:57:10 +0200
Subject: [PATCH 09/11] mrows with ref commands get the correct data-latex

---
 .../input/tex/__snapshots__/Base.test.ts.snap | 10 ++--
 .../tex/__snapshots__/Mathtools.test.ts.snap  |  4 +-
 .../input/tex/__snapshots__/Tag.test.ts.snap  | 54 +++++++++----------
 .../tex/__snapshots__/TagFormat.test.ts.snap  | 12 ++---
 .../tex/__snapshots__/Textmacros.test.ts.snap |  6 +--
 ts/input/tex/base/BaseMethods.ts              |  9 ++++
 6 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index 52ea4bd67..bfe84ecbd 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -7656,7 +7656,7 @@ exports[`Referencing Nonumber 1`] = `
 exports[`Referencing Ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\ref{A}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{A}\\ref{A}">
-    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a\\ref{A}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a\\text{???}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -7664,7 +7664,7 @@ exports[`Referencing Ref 1`] = `
       </mtd>
       <mtd>
         <mi data-latex="a">a</mi>
-        <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
+        <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
           <mtext data-latex="\\text{???}">???</mtext>
         </mrow>
       </mtd>
@@ -7676,7 +7676,7 @@ exports[`Referencing Ref 1`] = `
 exports[`Referencing Ref Unknown 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\ref{B}" display="block">
   <mtable displaystyle="true" data-latex="a\\label{A}\\ref{B}">
-    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a\\ref{B}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;a\\text{???}">
       <mtd id="mjx-eqn:A">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
@@ -7684,7 +7684,7 @@ exports[`Referencing Ref Unknown 1`] = `
       </mtd>
       <mtd>
         <mi data-latex="a">a</mi>
-        <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
+        <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
           <mtext data-latex="\\text{???}">???</mtext>
         </mrow>
       </mtd>
@@ -9206,7 +9206,7 @@ exports[`User Defined Environments smallmatrix 1`] = `
 exports[`User Defined Macros EqRef 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a\\label{A}\\eqref{A}" display="block">
   <mi data-latex="a">a</mi>
-  <mrow href="#" class="MathJax_ref" data-latex="\\eqref{A}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{(???)}">
     <mtext data-latex="\\text{(???)}">(???)</mtext>
   </mrow>
 </math>"
diff --git a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
index f0c2b3240..7af85c919 100644
--- a/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Mathtools.test.ts.snap
@@ -3992,9 +3992,9 @@ exports[`Mathtools Tagging refeq 1`] = `
         </msup>
       </mtd>
     </mlabeledtr>
-    <mtr data-latex="\\refeq{test}">
+    <mtr data-latex="\\text{\\textsf{A}}">
       <mtd>
-        <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\refeq{test}">
+        <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\text{\\textsf{A}}">
           <mtext data-latex="\\text{\\textsf{A}}">\\textsf{A}</mtext>
         </mrow>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
index de738fff0..7a5d585bb 100644
--- a/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Tag.test.ts.snap
@@ -136,7 +136,7 @@ exports[`TagAll Eqref 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\eqref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{(1)}">
     <mtext data-latex="\\text{(1)}">(1)</mtext>
   </mrow>
 </math>"
@@ -351,7 +351,7 @@ exports[`TagAll Ref 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{1}">
     <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
@@ -371,7 +371,7 @@ exports[`TagAll Ref Default 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{1}">
     <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
@@ -391,7 +391,7 @@ exports[`TagAll Ref Named 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
 </math>"
@@ -421,10 +421,10 @@ exports[`TagAll Ref Named Default 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
-  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\text{1}">
     <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
@@ -454,10 +454,10 @@ exports[`TagAll Ref Named Named 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
-  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\text{B}">
     <mtext data-latex="\\text{B}">B</mtext>
   </mrow>
 </math>"
@@ -477,7 +477,7 @@ exports[`TagAll Ref Unknown 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
     <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
@@ -655,7 +655,7 @@ exports[`TagAms Eqref 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\eqref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{(1)}">
     <mtext data-latex="\\text{(1)}">(1)</mtext>
   </mrow>
 </math>"
@@ -870,7 +870,7 @@ exports[`TagAms Ref 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{1}">
     <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
@@ -890,7 +890,7 @@ exports[`TagAms Ref Default 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{1}">
     <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
@@ -910,7 +910,7 @@ exports[`TagAms Ref Named 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
 </math>"
@@ -940,10 +940,10 @@ exports[`TagAms Ref Named Default 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
-  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\text{1}">
     <mtext data-latex="\\text{1}">1</mtext>
   </mrow>
 </math>"
@@ -973,10 +973,10 @@ exports[`TagAms Ref Named Named 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
-  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\text{B}">
     <mtext data-latex="\\text{B}">B</mtext>
   </mrow>
 </math>"
@@ -996,7 +996,7 @@ exports[`TagAms Ref Unknown 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
     <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
@@ -1129,7 +1129,7 @@ exports[`TagNone Eqref 1`] = `
       </mtd>
     </mtr>
   </mtable>
-  <mrow href="#" class="MathJax_ref" data-latex="\\eqref{A}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{(???)}">
     <mtext data-latex="\\text{(???)}">(???)</mtext>
   </mrow>
 </math>"
@@ -1314,7 +1314,7 @@ exports[`TagNone Ref 1`] = `
       </mtd>
     </mtr>
   </mtable>
-  <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
     <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
@@ -1329,7 +1329,7 @@ exports[`TagNone Ref Default 1`] = `
       </mtd>
     </mtr>
   </mtable>
-  <mrow href="#" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
     <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
@@ -1349,7 +1349,7 @@ exports[`TagNone Ref Named 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
 </math>"
@@ -1374,10 +1374,10 @@ exports[`TagNone Ref Named Default 1`] = `
       </mtd>
     </mtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
-  <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
     <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
@@ -1407,10 +1407,10 @@ exports[`TagNone Ref Named Named 1`] = `
       </mtd>
     </mlabeledtr>
   </mtable>
-  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\ref{A}">
+  <mrow href="#mjx-eqn%3AA" class="MathJax_ref" data-latex="\\text{A}">
     <mtext data-latex="\\text{A}">A</mtext>
   </mrow>
-  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#mjx-eqn%3AB" class="MathJax_ref" data-latex="\\text{B}">
     <mtext data-latex="\\text{B}">B</mtext>
   </mrow>
 </math>"
@@ -1425,7 +1425,7 @@ exports[`TagNone Ref Unknown 1`] = `
       </mtd>
     </mtr>
   </mtable>
-  <mrow href="#" class="MathJax_ref" data-latex="\\ref{B}">
+  <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
     <mtext data-latex="\\text{???}">???</mtext>
   </mrow>
 </math>"
diff --git a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
index a37860a18..2714b6037 100644
--- a/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/TagFormat.test.ts.snap
@@ -79,14 +79,14 @@ exports[`Tagformat Custom ref 1`] = `
         <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;\\eqref{test}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;\\text{**x**}">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
         <mtext data-latex="\\text{)}">)</mtext>
       </mtd>
       <mtd>
-        <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\eqref{test}">
+        <mrow href="#mjx-eqn%3Atest" class="MathJax_ref" data-latex="\\text{**x**}">
           <mtext data-latex="\\text{**x**}">**x**</mtext>
         </mrow>
       </mtd>
@@ -108,14 +108,14 @@ exports[`Tagformat Eqref 1`] = `
         <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\text{[}\\text{A1}\\text{]}&amp;\\eqref{test}">
+    <mlabeledtr data-latex="\\text{[}\\text{A1}\\text{]}&amp;\\text{[x]}">
       <mtd id="my-tag:A1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{A1}">A1</mtext>
         <mtext data-latex="\\text{]}">]</mtext>
       </mtd>
       <mtd>
-        <mrow href="[[#my-tag%3Atest]]" class="MathJax_ref" data-latex="\\eqref{test}">
+        <mrow href="[[#my-tag%3Atest]]" class="MathJax_ref" data-latex="\\text{[x]}">
           <mtext data-latex="\\text{[x]}">[x]</mtext>
         </mrow>
       </mtd>
@@ -137,14 +137,14 @@ exports[`Tagformat Ref 1`] = `
         <mi data-latex="x">x</mi>
       </mtd>
     </mlabeledtr>
-    <mlabeledtr data-latex="\\text{[}\\text{A1}\\text{]}&amp;\\ref{test}">
+    <mlabeledtr data-latex="\\text{[}\\text{A1}\\text{]}&amp;\\text{x}">
       <mtd id="my-tag:A1">
         <mtext data-latex="\\text{[}">[</mtext>
         <mtext data-latex="\\text{A1}">A1</mtext>
         <mtext data-latex="\\text{]}">]</mtext>
       </mtd>
       <mtd>
-        <mrow href="[[#my-tag%3Atest]]" class="MathJax_ref" data-latex="\\ref{test}">
+        <mrow href="[[#my-tag%3Atest]]" class="MathJax_ref" data-latex="\\text{x}">
           <mtext data-latex="\\text{x}">x</mtext>
         </mrow>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap
index 1d223fae8..ab7400a49 100644
--- a/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Textmacros.test.ts.snap
@@ -181,10 +181,10 @@ exports[`Textmacros Macros Quoted Specials 1`] = `
 exports[`Textmacros Macros Ref and Eqref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\text{\\ref{a}\\eqref{b}}" display="block">
   <mrow data-latex="\\text{\\ref{a}\\eqref{b}}">
-    <mrow href="#" class="MathJax_ref">
+    <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
       <mtext data-latex="\\text{???}">???</mtext>
     </mrow>
-    <mrow href="#" class="MathJax_ref">
+    <mrow href="#" class="MathJax_ref" data-latex="\\text{(???)}">
       <mtext data-latex="\\text{(???)}">(???)</mtext>
     </mrow>
   </mrow>
@@ -593,7 +593,7 @@ exports[`Textmacros Text ref 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\textbf{a \\ref{a}}" display="block">
   <mrow data-latex="\\textbf{a \\ref{a}}">
     <mtext mathvariant="bold">a&#xA0;</mtext>
-    <mrow href="#" class="MathJax_ref">
+    <mrow href="#" class="MathJax_ref" data-latex="\\text{???}">
       <mtext data-latex="\\text{???}">???</mtext>
     </mrow>
   </mrow>
diff --git a/ts/input/tex/base/BaseMethods.ts b/ts/input/tex/base/BaseMethods.ts
index 8ba1f15ed..b301bfb96 100644
--- a/ts/input/tex/base/BaseMethods.ts
+++ b/ts/input/tex/base/BaseMethods.ts
@@ -2237,6 +2237,15 @@ const BaseMethods: { [key: string]: ParseMethod } = {
       href: parser.tags.formatUrl(ref.id, parser.options.baseURL),
       class: 'MathJax_ref',
     });
+    const latex = (mml.attributes.get(TexConstant.Attr.LATEX) || '') as string;
+    if (latex) {
+      // Protects the latex from being overwritten by the generic
+      // source-tracking in TexParser.updateResult, which would otherwise
+      // record the raw `\ref{...}`/`\eqref{...}` call instead of the
+      // latex that was actually used to build the reference's content.
+      node.attributes.set(TexConstant.Attr.LATEXITEM, latex);
+      node.attributes.set(TexConstant.Attr.LATEX, latex);
+    }
     parser.Push(node);
   },
 

From 546c77fc1ccd3389601a6bddc061386d0eba5ad4 Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Thu, 30 Jul 2026 14:46:21 +0200
Subject: [PATCH 10/11] fixes nested table problem

---
 testsuite/tests/input/tex/SetOptions.test.ts  |  2 +-
 .../input/tex/__snapshots__/Ams.test.ts.snap  |  2 +-
 .../input/tex/__snapshots__/Base.test.ts.snap |  4 +-
 .../tex/__snapshots__/Newcommand.test.ts.snap |  8 +-
 .../tex/__snapshots__/Physics.test.ts.snap    | 10 +--
 .../tex/__snapshots__/SetOptions.test.ts.snap | 12 +--
 ts/input/tex/NodeUtil.ts                      |  7 +-
 ts/input/tex/base/BaseItems.ts                | 77 +++++++++++++++----
 ts/input/tex/newcommand/NewcommandMethods.ts  | 41 ++++++----
 9 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/testsuite/tests/input/tex/SetOptions.test.ts b/testsuite/tests/input/tex/SetOptions.test.ts
index a292a8495..d5ec59894 100644
--- a/testsuite/tests/input/tex/SetOptions.test.ts
+++ b/testsuite/tests/input/tex/SetOptions.test.ts
@@ -54,7 +54,7 @@ describe('Setoptions', () => {
     ).toMatchSnapshot();
   });
 
-  test('Set pacjage regexp option', () => {
+  test('Set package regexp option', () => {
     expect(
       tex2mml(
         '\\setOptions[ams]{operatornamePattern=/^[a-z0-9]+/} \\operatorname{ab1}'
diff --git a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
index c208fae9e..dfd63ceba 100644
--- a/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Ams.test.ts.snap
@@ -1654,7 +1654,7 @@ exports[`Ams Genfrac no delimiters 1`] = `
 exports[`Ams Issues Array with Tag 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{c}a \\end{array}\\tag{1}" display="block">
   <mtable displaystyle="true" data-latex="\\begin{array}{c}a \\end{array}\\tag{1}">
-    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;{array}">
+    <mlabeledtr data-latex="\\text{(}\\text{1}\\text{)}&amp;\\begin{array}{c}a \\end{array}">
       <mtd id="mjx-eqn:1">
         <mtext data-latex="\\text{(}">(</mtext>
         <mtext data-latex="\\text{1}">1</mtext>
diff --git a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
index bfe84ecbd..dd4850496 100644
--- a/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Base.test.ts.snap
@@ -2672,7 +2672,7 @@ exports[`Complete Array column r c repeat | {} 2`] = `
 exports[`Complete Array column r c repeat | {} 3`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{r*{2}|c}a \\begin{array}{c}Q\\end{array}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}" display="block">
   <mtable columnspacing="0 0" rowspacing="4pt" columnalign="right center center" columnlines="solid solid" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{r*{2}|c}a \\begin{array}{c}Q\\end{array}&amp; b &amp; c\\\\d &amp; e &amp; f\\end{array}">
-    <mtr data-latex="a{array}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
+    <mtr data-latex="a\\begin{array}{c}Q\\end{array}\\hspace{.5em}&amp;\\,&amp;\\hspace{.5em}b&amp;c">
       <mtd>
         <mi data-latex="a">a</mi>
         <mtable columnspacing="1em" rowspacing="4pt" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{c}Q\\end{array}">
@@ -3543,7 +3543,7 @@ exports[`Environments IndentAlign Single 1`] = `
 exports[`Environments Nested array 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{array}{rcl}a&amp;{}{b}&amp;c\\begin{array}{cc}f&amp;h\\\\g\\end{array}\\end{array}" display="block">
   <mtable columnspacing="1em" rowspacing="4pt" columnalign="right center left" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{rcl}a&amp;{}{b}&amp;c\\begin{array}{cc}f&amp;h\\\\g\\end{array}\\end{array}">
-    <mtr data-latex="a&amp;{}{b}&amp;c{array}">
+    <mtr data-latex="a&amp;{}{b}&amp;c\\begin{array}{cc}f&amp;h\\\\g\\end{array}">
       <mtd>
         <mi data-latex="a">a</mi>
       </mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap
index 7b6d7af71..3e5af71fa 100644
--- a/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Newcommand.test.ts.snap
@@ -14,10 +14,10 @@ exports[`Nested Environments Environments Intermixed 1`] = `
 
 exports[`Nested Environments Environments Nested 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newenvironment{boxed}{\\begin{array}{|c|c|}\\hline}{\\\\\\hline\\end{array}}\\begin{boxed}\\begin{boxed}a&amp;b\\\\c&amp;d\\end{boxed} &amp; X \\end{boxed}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="{array}">
-    <mtr data-latex="{array}&amp;X">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="\\begin{array}\\begin{array}{|c|c|}\\hline a&amp;b\\\\c&amp;d \\\\\\hline\\end{array}&amp;X\\end{array}">
+    <mtr data-latex="\\begin{array}{|c|c|}\\hline a&amp;b\\\\c&amp;d \\\\\\hline\\end{array}&amp;X">
       <mtd>
-        <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="{array}">
+        <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="\\begin{array}{|c|c|}\\hline a&amp;b\\\\c&amp;d \\\\\\hline\\end{array}">
           <mtr data-latex="a&amp;b">
             <mtd>
               <mi data-latex="a">a</mi>
@@ -56,7 +56,7 @@ exports[`Nested Environments Nested Begins 1`] = `
 
 exports[`Nested Environments Newenvironment with Begin 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\newenvironment{boxed}{\\begin{array}{|c|c|}\\hline}{\\\\\\hline\\end{array}}\\begin{boxed}a&amp;b\\\\c&amp;d\\end{boxed}" display="block">
-  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="{array}">
+  <mtable columnspacing="1em" rowspacing="4pt" columnalign="center center" columnlines="solid" framespacing=".5em .125em" frame="solid" data-latex="\\begin{array}{|c|c|}\\hline a&amp;b\\\\c&amp;d \\\\\\hline\\end{array}">
     <mtr data-latex="a&amp;b">
       <mtd>
         <mi data-latex="a">a</mi>
diff --git a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
index c15069e31..21b22bc45 100644
--- a/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/Physics.test.ts.snap
@@ -10820,7 +10820,7 @@ exports[`Physics7_9 Matrices_Diag_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="&amp;&amp;&amp;&amp;\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;\\begin{array}{} \\dmat{9,10}\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11173,7 +11173,7 @@ exports[`Physics7_10 Matrices_Adiag_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
+      <mtr data-latex="\\begin{array}{} \\dmat{9,10}\\end{array}">
         <mtd>
           <mtable columnspacing="1em" rowspacing="4pt" columnalign="" data-frame-styles="" framespacing=".5em .125em" data-latex="\\begin{array}{} \\dmat{9,10}\\end{array}">
             <mtr data-latex="\\begin{array}{} 9\\end{array}">
@@ -11515,7 +11515,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="&amp;&amp;1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} \\imat{3}\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
@@ -11585,7 +11585,7 @@ exports[`Physics7_11 Matrices_Other_5 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;\\mqty{9}\\\\ &amp;\\mqty{10}\\end{array}">
+      <mtr data-latex="&amp;&amp;&amp;&amp;&amp;\\begin{array}{} \\dmat{9,10}\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd></mtd>
@@ -11667,7 +11667,7 @@ exports[`Physics7_11 Matrices_Other_6 1`] = `
           </mtable>
         </mtd>
       </mtr>
-      <mtr data-latex="&amp;&amp;1 &amp; 0 &amp; 0\\\\ 0 &amp; 1 &amp; 0\\\\ 0 &amp; 0 &amp; 1\\end{array}">
+      <mtr data-latex="&amp;&amp;\\begin{array}{} \\imat{3}\\end{array}">
         <mtd></mtd>
         <mtd></mtd>
         <mtd>
diff --git a/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap b/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
index bb3c9a361..3db061637 100644
--- a/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
+++ b/testsuite/tests/input/tex/__snapshots__/SetOptions.test.ts.snap
@@ -40,12 +40,6 @@ exports[`Setoptions Set TeX option 1`] = `
 </math>"
 `;
 
-exports[`Setoptions Set pacjage regexp option 1`] = `
-"<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{operatornamePattern=/^[a-z0-9]+/} \\operatorname{ab1}" display="block">
-  <mi data-latex="\\setOptions[ams]{operatornamePattern=/^[a-z0-9]+/} \\operatorname{ab1}">ab1</mi>
-</math>"
-`;
-
 exports[`Setoptions Set package boolean option 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[units]{loose=true} \\units[1]{kg}" display="block">
   <mn data-latex="1">1</mn>
@@ -56,6 +50,12 @@ exports[`Setoptions Set package boolean option 1`] = `
 </math>"
 `;
 
+exports[`Setoptions Set package regexp option 1`] = `
+"<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{operatornamePattern=/^[a-z0-9]+/} \\operatorname{ab1}" display="block">
+  <mi data-latex="\\setOptions[ams]{operatornamePattern=/^[a-z0-9]+/} \\operatorname{ab1}">ab1</mi>
+</math>"
+`;
+
 exports[`Setoptions Set package string option 1`] = `
 "<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}" display="block">
   <mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="50%" data-array-padding="1em 1em" data-width-includes-label="true" data-latex="\\setOptions[ams]{multlineWidth=50%} \\begin{multline} a \\end{multline}">
diff --git a/ts/input/tex/NodeUtil.ts b/ts/input/tex/NodeUtil.ts
index b4e458ad4..fb678c393 100644
--- a/ts/input/tex/NodeUtil.ts
+++ b/ts/input/tex/NodeUtil.ts
@@ -92,9 +92,10 @@ const NodeUtil = {
     const children = node.childNodes[0]?.childNodes || [];
     let expr = '';
     for (const child of children) {
-      const att = ((child as MmlNode)?.attributes?.get(
-        TexConstant.Attr.LATEX
-      ) || '') as string;
+      // For table child we prefer the `rawLatex` property.
+      const att = ((child as MmlNode)?.getProperty?.('rawLatex') ||
+        (child as MmlNode)?.attributes?.get(TexConstant.Attr.LATEX) ||
+        '') as string;
       if (!att) continue;
       expr +=
         expr && expr.match(/[a-zA-Z]$/) && att.match(/^[a-zA-Z]/)
diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts
index a7457af5f..463e6a0c3 100644
--- a/ts/input/tex/base/BaseItems.ts
+++ b/ts/input/tex/base/BaseItems.ts
@@ -772,7 +772,7 @@ export class FnItem extends BaseItem {
           (NodeUtil.isType(mml, 'mstyle') &&
             mml.childNodes.length &&
             NodeUtil.isType(mml.childNodes[0].childNodes[0], 'mspace')) ||
-          NodeUtil.isType(mml, 'mspace')
+            NodeUtil.isType(mml, 'mspace')
         ) {
           // @test Fn Pos Space, Fn Neg Space
           return [[top, item], true];
@@ -832,16 +832,16 @@ export class NotItem extends BaseItem {
     }
     if (
       item.isKind('mml') &&
-      (NodeUtil.isType(item.First, 'mo') ||
-        NodeUtil.isType(item.First, 'mi') ||
-        NodeUtil.isType(item.First, 'mtext'))
+        (NodeUtil.isType(item.First, 'mo') ||
+          NodeUtil.isType(item.First, 'mi') ||
+          NodeUtil.isType(item.First, 'mtext'))
     ) {
       mml = item.First;
       c = NodeUtil.getText(mml as TextNode);
       if (
         c.length === 1 &&
-        !NodeUtil.getProperty(mml, 'movesupsub') &&
-        NodeUtil.getChildren(mml).length === 1
+          !NodeUtil.getProperty(mml, 'movesupsub') &&
+          NodeUtil.getChildren(mml).length === 1
       ) {
         if (this.remap.contains(c)) {
           // @test Negation Simple, Negation Complex
@@ -1124,7 +1124,13 @@ export class ArrayItem extends BaseItem {
     }
     mml = this.handleFrame(mml);
     if (scriptlevel !== undefined) {
+      const table = mml;
       mml = this.create('node', 'mstyle', [mml], { scriptlevel });
+      const rawLatex = table.getProperty('rawLatex');
+      if (rawLatex) {
+        mml.setProperty('rawLatex', rawLatex);
+        mml.setProperty('rawLatexName', table.getProperty('rawLatexName'));
+      }
     }
     if (this.getProperty('open') || this.getProperty('close')) {
       // @test Cross Product Formula
@@ -1232,7 +1238,7 @@ export class ArrayItem extends BaseItem {
       if (start || end || ralign) {
         if (
           ++this.templateSubs >
-          parser.configuration.options.maxTemplateSubtitutions
+            parser.configuration.options.maxTemplateSubtitutions
         ) {
           throw new TexError(
             'MaxTemplateSubs',
@@ -1292,7 +1298,7 @@ export class ArrayItem extends BaseItem {
             envs--;
             break;
           }
-        // fall through if not closing a nested array environment
+          // fall through if not closing a nested array environment
         default: {
           if (braces || envs) continue;
           i -= match[2].length;
@@ -1409,13 +1415,21 @@ export class ArrayItem extends BaseItem {
    * @param {string} name The environment name (e.g., `array`, `matrix`).
    */
   public captureLatex(parser: TexParser, name: string) {
+    this.setProperty('rawLatexName', name);
     const source = parser.string.slice(parser.i);
     const end = ArrayItem.findEnvEnd(source, name);
-    // If no matching \end{name} could be found (e.g., an environment produced
-    // by macro expansion \newenvironment.
-    if (end < 0) return;
-    this.setProperty('rawLatex', `\\begin{${name}}${source.slice(0, end)}`);
-    this.setProperty('rawLatexName', name);
+    if (end >= 0) {
+      this.setProperty('rawLatex', `\\begin{${name}}${source.slice(0, end)}`);
+      return;
+    }
+    // No matching \end{name} could be found (e.g., produced by
+    // \newenvironment), save the start position instead, so the raw source can
+    // be taken from the parser's string once the table actually closes.
+    this.setProperty('rawLatexStart', parser.i);
+    this.setProperty(
+      'rawLatexGen',
+      (parser.stack.global['envSplice'] as number) || 0
+    );
   }
 
   /**
@@ -1426,10 +1440,39 @@ export class ArrayItem extends BaseItem {
    * @param {MmlNode} mml The mtable node.
    */
   public setTableLatex(mml: MmlNode) {
-    const tex = this.getProperty('rawLatex') as string;
+    const name = this.getProperty('rawLatexName') as string;
+    let tex = this.getProperty('rawLatex') as string;
+    if (!tex && name) {
+      const start = this.getProperty('rawLatexStart') as number;
+      const gen = this.getProperty('rawLatexGen') as number;
+      const currentGen = this.parser
+        ? (this.parser.stack.global['envSplice'] as number) || 0
+        : -1;
+      if (start != null && this.parser && gen === currentGen) {
+        // The environment's closing text is now in the parser's string, so the
+        // full source can finally be recovered. Expanded environment's
+        // can leave extra whitespace, so collapse.
+        // @test Environments Nested
+        const body = this.parser.string
+          .slice(start, this.parser.i)
+          .replace(/ {2,}/g, ' ');
+        tex = `\\begin{${name}}${body}`;
+      }
+    }
+    if (!tex && name) {
+      // Last resort: reconstruct the source from the table's own rows,
+      // whose `data-latex` is always tracked correctly.
+      const LATEX = TexConstant.Attr.LATEX;
+      const rows = this.table
+        .map((row) => (row.attributes.get(LATEX) as string) || '')
+        .filter((row) => row);
+      if (rows.length) {
+        tex = `\\begin{${name}}${rows.join('\\\\')}\\end{${name}}`;
+      }
+    }
     if (!tex) return;
     mml.setProperty('rawLatex', tex);
-    mml.setProperty('rawLatexName', this.getProperty('rawLatexName') as string);
+    mml.setProperty('rawLatexName', name);
   }
 
   /**
@@ -1592,8 +1635,8 @@ export class EqnArrayItem extends ArrayItem {
     const calign = (this.arraydef.columnalign as string).split(/ /);
     const align =
       this.row.length && calign.length
-        ? calign[this.row.length % calign.length]
-        : 'right';
+      ? calign[this.row.length % calign.length]
+      : 'right';
     if (align !== 'right') {
       ParseUtil.fixInitialMO(this.factory.configuration, this.nodes);
     }
diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts
index 545c0f6d9..b18c8b80f 100644
--- a/ts/input/tex/newcommand/NewcommandMethods.ts
+++ b/ts/input/tex/newcommand/NewcommandMethods.ts
@@ -87,17 +87,17 @@ const NewcommandMethods: { [key: string]: ParseMethod } = {
     const def = parser.GetArgument(name);
     !(params instanceof Array)
       ? // @test Def DoubleLet, DefReDef
-        NewcommandUtil.addMacro(parser, cs, NewcommandMethods.Macro, [
-          def,
-          params,
-        ])
+      NewcommandUtil.addMacro(parser, cs, NewcommandMethods.Macro, [
+        def,
+        params,
+      ])
       : // @test Def Let
-        NewcommandUtil.addMacro(
-          parser,
-          cs,
-          NewcommandMethods.MacroWithTemplate,
-          [def].concat(params)
-        );
+      NewcommandUtil.addMacro(
+        parser,
+        cs,
+        NewcommandMethods.MacroWithTemplate,
+        [def].concat(params)
+      );
     parser.Push(parser.itemFactory.create('null'));
   },
 
@@ -269,11 +269,20 @@ const NewcommandMethods: { [key: string]: ParseMethod } = {
         if (edef) {
           // Parse the commands in the end environment definition.
           const rest = parser.string.slice(parser.i);
-          parser.string = ParseUtil.addArgs(
-            parser,
-            parser.string.substring(0, parser.i),
-            edef
+          let prefix = parser.string.substring(0, parser.i);
+          // Here `\end{name}` has already been parsed, but left in place it
+          // ends up in the LaTeX source. Remove it using whitespace to keep the
+          // counter correct.
+          const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+          const endTag = prefix.match(
+            new RegExp(`\\\\end\\s*\\{\\s*${escaped}\\s*\\}$`)
           );
+          if (endTag) {
+            prefix =
+              prefix.slice(0, prefix.length - endTag[0].length) +
+              ' '.repeat(endTag[0].length);
+          }
+          parser.string = ParseUtil.addArgs(parser, prefix, edef);
           parser.Parse();
           // Reset to parsing the remainder of the expression.
           parser.string = rest;
@@ -306,6 +315,10 @@ const NewcommandMethods: { [key: string]: ParseMethod } = {
       parser.string.slice(parser.i)
     );
     parser.i = 0;
+    // This destroys any absolute positions recorded by an enclosing environment
+    // This counter allows to detect that.
+    parser.stack.global['envSplice'] =
+      ((parser.stack.global['envSplice'] as number) || 0) + 1;
     parser.stack.global['beginEnv'] =
       ((parser.stack.global['beginEnv'] as number) || 0) + 1;
     return parser.itemFactory.create('beginEnv').setProperty('name', name);

From 4a091656e0e2dd68c47818d30a104f3f8946305c Mon Sep 17 00:00:00 2001
From: zorkow <volker.sorge@gmail.com>
Date: Wed, 12 Aug 2026 12:44:36 +0200
Subject: [PATCH 11/11] incorporate review suggestions except for parsing loop

---
 ts/input/tex/FilterUtil.ts                   |  4 ++--
 ts/input/tex/base/BaseItems.ts               | 23 ++++++++++----------
 ts/input/tex/newcommand/NewcommandMethods.ts | 23 ++++++++++----------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/ts/input/tex/FilterUtil.ts b/ts/input/tex/FilterUtil.ts
index 51826dd91..bc21e0828 100644
--- a/ts/input/tex/FilterUtil.ts
+++ b/ts/input/tex/FilterUtil.ts
@@ -354,8 +354,8 @@ const FilterUtil = {
    *   tagged equation, or another array), `addLatexItem` sets `data-latex` from
    *   the `\end{name}` argument alone (e.g., `{array}`), which is wrong.
    *
-   * This filter only replace a `data-latex` value that looks missing or
-   * broken, so that already-correct values (e.g., the literal source of a bare
+   * This filter only replaces a `data-latex` value that looks missing or
+   * broken, so that already correct values (e.g., the literal source of a bare
    * top-level array, or the macro call for macros that build their own
    * array-like content) are left alone.
    *
diff --git a/ts/input/tex/base/BaseItems.ts b/ts/input/tex/base/BaseItems.ts
index e37609c57..4f4ee73a7 100644
--- a/ts/input/tex/base/BaseItems.ts
+++ b/ts/input/tex/base/BaseItems.ts
@@ -38,6 +38,7 @@ import StackItemFactory from '../StackItemFactory.js';
 import { CheckType, BaseItem, StackItem, EnvList } from '../StackItem.js';
 import { TRBL } from '../../../util/Styles.js';
 import { TexConstant } from '../TexConstants.js';
+import { quotePattern } from '../../../util/string.js';
 
 import { COMPONENT as TEX_COMPONENT } from '../__locales__/Component.js';
 import { COMPONENT } from './__locales__/Component.js';
@@ -768,7 +769,7 @@ export class FnItem extends BaseItem {
           (NodeUtil.isType(mml, 'mstyle') &&
             mml.childNodes.length &&
             NodeUtil.isType(mml.childNodes[0].childNodes[0], 'mspace')) ||
-            NodeUtil.isType(mml, 'mspace')
+          NodeUtil.isType(mml, 'mspace')
         ) {
           // @test Fn Pos Space, Fn Neg Space
           return [[top, item], true];
@@ -828,16 +829,16 @@ export class NotItem extends BaseItem {
     }
     if (
       item.isKind('mml') &&
-        (NodeUtil.isType(item.First, 'mo') ||
-          NodeUtil.isType(item.First, 'mi') ||
-          NodeUtil.isType(item.First, 'mtext'))
+      (NodeUtil.isType(item.First, 'mo') ||
+        NodeUtil.isType(item.First, 'mi') ||
+        NodeUtil.isType(item.First, 'mtext'))
     ) {
       mml = item.First;
       c = NodeUtil.getText(mml as TextNode);
       if (
         c.length === 1 &&
-          !NodeUtil.getProperty(mml, 'movesupsub') &&
-          NodeUtil.getChildren(mml).length === 1
+        !NodeUtil.getProperty(mml, 'movesupsub') &&
+        NodeUtil.getChildren(mml).length === 1
       ) {
         if (this.remap.contains(c)) {
           // @test Negation Simple, Negation Complex
@@ -1234,7 +1235,7 @@ export class ArrayItem extends BaseItem {
       if (start || end || ralign) {
         if (
           ++this.templateSubs >
-            parser.configuration.options.maxTemplateSubtitutions
+          parser.configuration.options.maxTemplateSubtitutions
         ) {
           texError(COMPONENT, 'MaxTemplateSubs');
         }
@@ -1290,7 +1291,7 @@ export class ArrayItem extends BaseItem {
             envs--;
             break;
           }
-          // fall through if not closing a nested array environment
+        // fall through if not closing a nested array environment
         default: {
           if (braces || envs) continue;
           i -= match[2].length;
@@ -1478,7 +1479,7 @@ export class ArrayItem extends BaseItem {
    *     -1 if no matching end was found.
    */
   private static findEnvEnd(str: string, name: string): number {
-    const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const escaped = quotePattern(name);
     const begin = new RegExp(`^\\\\begin\\s*\\{${escaped}\\}`);
     const end = new RegExp(`^\\\\end\\s*\\{${escaped}\\}`);
     let depth = 0;
@@ -1627,8 +1628,8 @@ export class EqnArrayItem extends ArrayItem {
     const calign = (this.arraydef.columnalign as string).split(/ /);
     const align =
       this.row.length && calign.length
-      ? calign[this.row.length % calign.length]
-      : 'right';
+        ? calign[this.row.length % calign.length]
+        : 'right';
     if (align !== 'right') {
       ParseUtil.fixInitialMO(this.factory.configuration, this.nodes);
     }
diff --git a/ts/input/tex/newcommand/NewcommandMethods.ts b/ts/input/tex/newcommand/NewcommandMethods.ts
index 62d67f545..305f92cc6 100644
--- a/ts/input/tex/newcommand/NewcommandMethods.ts
+++ b/ts/input/tex/newcommand/NewcommandMethods.ts
@@ -32,6 +32,7 @@ import { ParseUtil } from '../ParseUtil.js';
 import { UnitUtil } from '../UnitUtil.js';
 import { StackItem } from '../StackItem.js';
 import { NewcommandUtil } from './NewcommandUtil.js';
+import { quotePattern } from '../../../util/string.js';
 
 import { COMPONENT } from './__locales__/Component.js';
 
@@ -89,17 +90,17 @@ const NewcommandMethods: { [key: string]: ParseMethod } = {
     const def = parser.GetArgument(name);
     !(params instanceof Array)
       ? // @test Def DoubleLet, DefReDef
-      NewcommandUtil.addMacro(parser, cs, NewcommandMethods.Macro, [
-        def,
-        params,
-      ])
+        NewcommandUtil.addMacro(parser, cs, NewcommandMethods.Macro, [
+          def,
+          params,
+        ])
       : // @test Def Let
-      NewcommandUtil.addMacro(
-        parser,
-        cs,
-        NewcommandMethods.MacroWithTemplate,
-        [def].concat(params)
-      );
+        NewcommandUtil.addMacro(
+          parser,
+          cs,
+          NewcommandMethods.MacroWithTemplate,
+          [def].concat(params)
+        );
     parser.Push(parser.itemFactory.create('null'));
   },
 
@@ -271,7 +272,7 @@ const NewcommandMethods: { [key: string]: ParseMethod } = {
           // Here `\end{name}` has already been parsed, but left in place it
           // ends up in the LaTeX source. Remove it using whitespace to keep the
           // counter correct.
-          const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+          const escaped = quotePattern(name);
           const endTag = prefix.match(
             new RegExp(`\\\\end\\s*\\{\\s*${escaped}\\s*\\}$`)
           );