Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 170 additions & 86 deletions testsuite/tests/input/tex/Amscd.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,37 @@ describe('AmsCD', () => {
<mtd>
<mrow>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{b}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{b}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{b}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
<mtd></mtd>
<mtd>
<mrow>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{c}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{c}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{c}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
Expand Down Expand Up @@ -180,40 +192,64 @@ describe('AmsCD', () => {
<mtr>
<mtd>
<mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\llap{l}">
<mrow data-mjx-texclass="ORD" data-latex="\\llap{l}">
<mpadded width="0" lspace="-1width">
<mi data-latex="l">l</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\llap{l}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\llap{l}}">
<mrow data-mjx-texclass="ORD" data-latex="\\llap{l}">
<mpadded width="0" lspace="-1width">
<mi data-latex="l">l</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{r}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{r}">
<mpadded width="0">
<mi data-latex="r">r</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{r}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{r}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{r}">
<mpadded width="0">
<mi data-latex="r">r</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
<mtd></mtd>
<mtd>
<mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\llap{l}">
<mrow data-mjx-texclass="ORD" data-latex="\\llap{l}">
<mpadded width="0" lspace="-1width">
<mi data-latex="l">l</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\llap{l}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\llap{l}}">
<mrow data-mjx-texclass="ORD" data-latex="\\llap{l}">
<mpadded width="0" lspace="-1width">
<mi data-latex="l">l</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2191;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{r}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{r}">
<mpadded width="0">
<mi data-latex="r">r</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{r}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{r}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{r}">
<mpadded width="0">
<mi data-latex="r">r</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
Expand Down Expand Up @@ -552,25 +588,37 @@ describe('AmsCD', () => {
<mtd>
<mrow>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{b}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{b}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{b}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
<mtd></mtd>
<mtd>
<mrow>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{c}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{c}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{c}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
Expand Down Expand Up @@ -628,25 +676,37 @@ describe('AmsCD', () => {
<mtd>
<mrow>
<mo minsize="4cm" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{b}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{b}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{b}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
<mtd></mtd>
<mtd>
<mrow>
<mo minsize="4cm" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{c}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{c}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{c}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
Expand Down Expand Up @@ -704,25 +764,37 @@ describe('AmsCD', () => {
<mtd>
<mrow>
<mo minsize="4cm" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{b}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{b}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{b}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
<mtd></mtd>
<mtd>
<mrow>
<mo minsize="4cm" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{c}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{c}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{c}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
Expand Down Expand Up @@ -849,25 +921,37 @@ describe('AmsCD Options', () => {
<mtd>
<mrow>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{b}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{b}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{b}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{b}">
<mpadded width="0">
<mi data-latex="b">b</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
<mtd></mtd>
<mtd>
<mrow>
<mo minsize="1.75em" symmetric="true" lspace="0" rspace="0">&#x2193;</mo>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\rlap{c}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle\\raise.125em{\\vcenter{\\rlap{c}}}">
<mpadded height="+.125em" depth="-.125em" voffset="+.125em" data-latex="{}">
<mrow data-mjx-texclass="ORD">
<mpadded data-mjx-vbox="center" data-mjx-texclass="ORD" data-vertical-align="center" data-latex="\\vcenter{\\rlap{c}}">
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{c}">
<mpadded width="0">
<mi data-latex="c">c</mi>
</mpadded>
</mrow>
</mpadded>
</mrow>
</mpadded>
</mstyle>
</mrow>
</mtd>
Expand All @@ -892,8 +976,8 @@ describe('AmsCD Options', () => {
<mi data-latex="D">D</mi>
</mtd>
</mtr>
</mtable>
</math>`
</mtable>
</math>`
);
});

Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/input/tex/Tag.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('TagAll', () => {
toXmlMatch(
tex2mml('a'),
`<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="a" display="block">
<mtable displaystyle="true" data-latex="a">
<mtable displaystyle="true" data-latex="a">
<mlabeledtr>
<mtd id="mjx-eqn:1">
<mtext data-latex="\\text{(1)}">(1)</mtext>
Expand Down
4 changes: 2 additions & 2 deletions ts/input/tex/amscd/AmsCdMethods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ const AmsCdMethods: { [key: string]: ParseMethod } = {
if (a) {
NodeUtil.appendChildren(mml, [
new TexParser(
'\\scriptstyle\\llap{' + a + '}',
'\\scriptstyle\\raise.125em{\\vcenter{\\llap{' + a + '}}}',
parser.stack.env,
parser.configuration
).mml(),
Expand All @@ -174,7 +174,7 @@ const AmsCdMethods: { [key: string]: ParseMethod } = {
if (b) {
NodeUtil.appendChildren(mml, [
new TexParser(
'\\scriptstyle\\rlap{' + b + '}',
'\\scriptstyle\\raise.125em{\\vcenter{\\rlap{' + b + '}}}',
parser.stack.env,
parser.configuration
).mml(),
Expand Down