Skip to content

Commit 037f876

Browse files
dpvcdpvc
authored
Merge pull request #1345 from mathjax/feature/tag-texts
Feature/tag texts
2 parents c143fa6 + 85abf0b commit 037f876

File tree

14 files changed

+467
-169
lines changed

14 files changed

+467
-169
lines changed

‎testsuite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"@jest/globals": "^29.7.0",
17-
"@mathjax/mathjax-bbm-font-extension": "0.4.2-beta.8",
17+
"@mathjax/mathjax-bbm-font-extension": "^4.0.0",
1818
"@types/jest": "^29.5.14",
1919
"jest": "^29.7.0",
2020
"ts-jest": "^29.3.4",

‎testsuite/pnpm-lock.yaml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎testsuite/tests/input/tex/Ams.test.ts‎

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,9 @@ describe('Ams Environments', () => {
15631563
<mlabeledtr data-latex-item="{2}" data-latex="{2}">
15641564
<mtd id="mjx-eqn:1">
15651565
<mpadded width="0" lspace="-1width">
1566-
<mtext data-latex="\\text{(1)}">(1)</mtext>
1566+
<mtext data-latex="\\text{(}">(</mtext>
1567+
<mtext data-latex="\\text{1}">1</mtext>
1568+
<mtext data-latex="\\text{)}">)</mtext>
15671569
</mpadded>
15681570
</mtd>
15691571
<mtd></mtd>
@@ -1866,7 +1868,9 @@ describe('Ams Tagged Environments', () => {
18661868
<mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex-item="{align}" data-latex="\\begin{align} a&amp;=b \\\\ c&amp;=d \\end{align}">
18671869
<mlabeledtr>
18681870
<mtd id="mjx-eqn:1">
1869-
<mtext data-latex="\\text{(1)}">(1)</mtext>
1871+
<mtext data-latex="\\text{(}">(</mtext>
1872+
<mtext data-latex="\\text{1}">1</mtext>
1873+
<mtext data-latex="\\text{)}">)</mtext>
18701874
</mtd>
18711875
<mtd>
18721876
<mi data-latex="a">a</mi>
@@ -1881,7 +1885,9 @@ describe('Ams Tagged Environments', () => {
18811885
</mlabeledtr>
18821886
<mlabeledtr>
18831887
<mtd id="mjx-eqn:2">
1884-
<mtext data-latex="\\text{(2)}">(2)</mtext>
1888+
<mtext data-latex="\\text{(}">(</mtext>
1889+
<mtext data-latex="\\text{2}">2</mtext>
1890+
<mtext data-latex="\\text{)}">)</mtext>
18851891
</mtd>
18861892
<mtd>
18871893
<mi data-latex="c">c</mi>
@@ -1954,7 +1960,9 @@ describe('Ams Tagged Environments', () => {
19541960
</mtr>
19551961
<mlabeledtr>
19561962
<mtd id="mjx-eqn:1">
1957-
<mtext data-latex="\\text{(1)}">(1)</mtext>
1963+
<mtext data-latex="\\text{(}">(</mtext>
1964+
<mtext data-latex="\\text{1}">1</mtext>
1965+
<mtext data-latex="\\text{)}">)</mtext>
19581966
</mtd>
19591967
<mtd columnalign="right">
19601968
<mi data-latex="c">c</mi>
@@ -2063,7 +2071,9 @@ describe('Ams Tagged Environments', () => {
20632071
<mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" data-latex-item="{gather}" data-latex="\\begin{gather} a=b \\\\ c=d \\end{gather}">
20642072
<mlabeledtr>
20652073
<mtd id="mjx-eqn:1">
2066-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2074+
<mtext data-latex="\\text{(}">(</mtext>
2075+
<mtext data-latex="\\text{1}">1</mtext>
2076+
<mtext data-latex="\\text{)}">)</mtext>
20672077
</mtd>
20682078
<mtd>
20692079
<mi data-latex="a">a</mi>
@@ -2073,7 +2083,9 @@ describe('Ams Tagged Environments', () => {
20732083
</mlabeledtr>
20742084
<mlabeledtr>
20752085
<mtd id="mjx-eqn:2">
2076-
<mtext data-latex="\\text{(2)}">(2)</mtext>
2086+
<mtext data-latex="\\text{(}">(</mtext>
2087+
<mtext data-latex="\\text{2}">2</mtext>
2088+
<mtext data-latex="\\text{)}">)</mtext>
20772089
</mtd>
20782090
<mtd>
20792091
<mi data-latex="c">c</mi>
@@ -2121,7 +2133,9 @@ describe('Ams Tagged Environments', () => {
21212133
<mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex-item="{alignat}" data-latex="\\begin{alignat}{2} a&amp;=b \\\\ c&amp;=d \\end{alignat}">
21222134
<mlabeledtr data-latex-item="{2}" data-latex="{2}">
21232135
<mtd id="mjx-eqn:1">
2124-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2136+
<mtext data-latex="\\text{(}">(</mtext>
2137+
<mtext data-latex="\\text{1}">1</mtext>
2138+
<mtext data-latex="\\text{)}">)</mtext>
21252139
</mtd>
21262140
<mtd>
21272141
<mi data-latex="a">a</mi>
@@ -2136,7 +2150,9 @@ describe('Ams Tagged Environments', () => {
21362150
</mlabeledtr>
21372151
<mlabeledtr data-latex-item="{2}" data-latex="{2}">
21382152
<mtd id="mjx-eqn:2">
2139-
<mtext data-latex="\\text{(2)}">(2)</mtext>
2153+
<mtext data-latex="\\text{(}">(</mtext>
2154+
<mtext data-latex="\\text{2}">2</mtext>
2155+
<mtext data-latex="\\text{)}">)</mtext>
21402156
</mtd>
21412157
<mtd>
21422158
<mi data-latex="c">c</mi>
@@ -2376,7 +2392,9 @@ describe('Ams Tagged Environments', () => {
23762392
<mtable displaystyle="true" data-latex-item="{equation}" data-latex="\\begin{equation} a \\end{equation}">
23772393
<mlabeledtr>
23782394
<mtd id="mjx-eqn:1">
2379-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2395+
<mtext data-latex="\\text{(}">(</mtext>
2396+
<mtext data-latex="\\text{1}">1</mtext>
2397+
<mtext data-latex="\\text{)}">)</mtext>
23802398
</mtd>
23812399
<mtd>
23822400
<mi data-latex="a">a</mi>
@@ -2407,7 +2425,9 @@ describe('Ams Tagged Environments', () => {
24072425
<mtable displaystyle="true" columnalign="right center left" columnspacing="0em 0.278em" rowspacing="3pt" data-break-align="bottom middle top" data-latex-item="{eqnarray}" data-latex="\\begin{eqnarray} a &amp; = &amp; b\\\\ c &amp; = &amp; d \\end{eqnarray}">
24082426
<mlabeledtr>
24092427
<mtd id="mjx-eqn:1">
2410-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2428+
<mtext data-latex="\\text{(}">(</mtext>
2429+
<mtext data-latex="\\text{1}">1</mtext>
2430+
<mtext data-latex="\\text{)}">)</mtext>
24112431
</mtd>
24122432
<mtd>
24132433
<mi data-latex="a">a</mi>
@@ -2424,7 +2444,9 @@ describe('Ams Tagged Environments', () => {
24242444
</mlabeledtr>
24252445
<mlabeledtr>
24262446
<mtd id="mjx-eqn:2">
2427-
<mtext data-latex="\\text{(2)}">(2)</mtext>
2447+
<mtext data-latex="\\text{(}">(</mtext>
2448+
<mtext data-latex="\\text{2}">2</mtext>
2449+
<mtext data-latex="\\text{)}">)</mtext>
24282450
</mtd>
24292451
<mtd>
24302452
<mi data-latex="c">c</mi>
@@ -2493,7 +2515,9 @@ describe('Ams Tagged Environments', () => {
24932515
<mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" data-latex-item="{align}" data-latex="\\begin{align} a&amp;=b \\\\ &amp;=c \\notag \\end{align}">
24942516
<mlabeledtr>
24952517
<mtd id="mjx-eqn:1">
2496-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2518+
<mtext data-latex="\\text{(}">(</mtext>
2519+
<mtext data-latex="\\text{1}">1</mtext>
2520+
<mtext data-latex="\\text{)}">)</mtext>
24972521
</mtd>
24982522
<mtd>
24992523
<mi data-latex="a">a</mi>
@@ -2531,7 +2555,9 @@ describe('Ams Tagged Environments', () => {
25312555
<mlabeledtr data-latex-item="{1}" data-latex="{1}">
25322556
<mtd id="mjx-eqn:1">
25332557
<mpadded width="0" lspace="-1width">
2534-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2558+
<mtext data-latex="\\text{(}">(</mtext>
2559+
<mtext data-latex="\\text{1}">1</mtext>
2560+
<mtext data-latex="\\text{)}">)</mtext>
25352561
</mpadded>
25362562
</mtd>
25372563
<mtd></mtd>
@@ -2583,7 +2609,9 @@ describe('Ams Tagged Environments', () => {
25832609
<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-item="{flalign}" data-latex="\\begin{flalign} a&amp;b &amp; \\end{flalign}">
25842610
<mlabeledtr>
25852611
<mtd id="mjx-eqn:1">
2586-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2612+
<mtext data-latex="\\text{(}">(</mtext>
2613+
<mtext data-latex="\\text{1}">1</mtext>
2614+
<mtext data-latex="\\text{)}">)</mtext>
25872615
</mtd>
25882616
<mtd>
25892617
<mi data-latex="a">a</mi>
@@ -2692,7 +2720,9 @@ describe('Ams Tagged Environments Left', () => {
26922720
<mlabeledtr data-latex-item="{2}" data-latex="{2}">
26932721
<mtd id="mjx-eqn:1">
26942722
<mpadded width="0">
2695-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2723+
<mtext data-latex="\\text{(}">(</mtext>
2724+
<mtext data-latex="\\text{1}">1</mtext>
2725+
<mtext data-latex="\\text{)}">)</mtext>
26962726
</mpadded>
26972727
</mtd>
26982728
<mtd></mtd>
@@ -2725,7 +2755,9 @@ describe('Ams Tagged Environments Left', () => {
27252755
<mtable displaystyle="true" rowspacing=".5em" columnspacing="100%" width="100%" side="left" data-array-padding="1em 1em" data-width-includes-label="true" data-latex-item="{multline}" data-latex="\\begin{multline} a\\tag{1} \\end{multline}">
27262756
<mlabeledtr>
27272757
<mtd id="mjx-eqn:1">
2728-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2758+
<mtext data-latex="\\text{(}">(</mtext>
2759+
<mtext data-latex="\\text{1}">1</mtext>
2760+
<mtext data-latex="\\text{)}">)</mtext>
27292761
</mtd>
27302762
<mtd columnalign="left">
27312763
<mi data-latex="\\tag{1}">a</mi>
@@ -2752,13 +2784,17 @@ describe('Ams Tagged Environments Left', () => {
27522784
<mtable displaystyle="true" columnspacing="1em" rowspacing="3pt" data-break-align="middle" side="left" data-latex-item="{gather}" data-latex="\\begin{gather}\\begin{align} a &amp;= b \\end{align}\\end{gather}">
27532785
<mlabeledtr>
27542786
<mtd id="mjx-eqn:2">
2755-
<mtext data-latex="\\text{(2)}">(2)</mtext>
2787+
<mtext data-latex="\\text{(}">(</mtext>
2788+
<mtext data-latex="\\text{2}">2</mtext>
2789+
<mtext data-latex="\\text{)}">)</mtext>
27562790
</mtd>
27572791
<mtd>
27582792
<mtable displaystyle="true" columnalign="right left" columnspacing="0em" rowspacing="3pt" data-break-align="bottom top" side="left" data-latex-item="{align}" data-latex="{align}">
27592793
<mlabeledtr>
27602794
<mtd id="mjx-eqn:1">
2761-
<mtext data-latex="\\text{(1)}">(1)</mtext>
2795+
<mtext data-latex="\\text{(}">(</mtext>
2796+
<mtext data-latex="\\text{1}">1</mtext>
2797+
<mtext data-latex="\\text{)}">)</mtext>
27622798
</mtd>
27632799
<mtd>
27642800
<mi data-latex="a">a</mi>

‎testsuite/tests/input/tex/Base.test.ts‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12509,7 +12509,9 @@ describe('Referencing', () => {
1250912509
<mtable displaystyle="true" data-latex="a\\label{A}">
1251012510
<mlabeledtr>
1251112511
<mtd id="mjx-eqn:A">
12512-
<mtext data-latex="\\text{(1)}">(1)</mtext>
12512+
<mtext data-latex="\\text{(}">(</mtext>
12513+
<mtext data-latex="\\text{1}">1</mtext>
12514+
<mtext data-latex="\\text{)}">)</mtext>
1251312515
</mtd>
1251412516
<mtd>
1251512517
<mi data-latex="\\label{A}">a</mi>
@@ -12529,7 +12531,9 @@ describe('Referencing', () => {
1252912531
<mtable displaystyle="true" data-latex="a\\label{}">
1253012532
<mlabeledtr>
1253112533
<mtd id="mjx-eqn:1">
12532-
<mtext data-latex="\\text{(1)}">(1)</mtext>
12534+
<mtext data-latex="\\text{(}">(</mtext>
12535+
<mtext data-latex="\\text{1}">1</mtext>
12536+
<mtext data-latex="\\text{)}">)</mtext>
1253312537
</mtd>
1253412538
<mtd>
1253512539
<mi data-latex="\\label{}">a</mi>
@@ -12549,15 +12553,19 @@ describe('Referencing', () => {
1254912553
<mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex-item="{eqnarray}" data-latex="\\begin{eqnarray}a\\label{A}\\\\c\\label{B}\\end{eqnarray}">
1255012554
<mlabeledtr>
1255112555
<mtd id="mjx-eqn:A">
12552-
<mtext data-latex="\\text{(1)}">(1)</mtext>
12556+
<mtext data-latex="\\text{(}">(</mtext>
12557+
<mtext data-latex="\\text{1}">1</mtext>
12558+
<mtext data-latex="\\text{)}">)</mtext>
1255312559
</mtd>
1255412560
<mtd>
1255512561
<mi data-latex="\\label{A}">a</mi>
1255612562
</mtd>
1255712563
</mlabeledtr>
1255812564
<mlabeledtr>
1255912565
<mtd id="mjx-eqn:B">
12560-
<mtext data-latex="\\text{(2)}">(2)</mtext>
12566+
<mtext data-latex="\\text{(}">(</mtext>
12567+
<mtext data-latex="\\text{2}">2</mtext>
12568+
<mtext data-latex="\\text{)}">)</mtext>
1256112569
</mtd>
1256212570
<mtd>
1256312571
<mi data-latex="\\label{B}">c</mi>
@@ -12591,7 +12599,9 @@ describe('Referencing', () => {
1259112599
<mtable displaystyle="true" data-latex="a\\label{A}\\ref{A}">
1259212600
<mlabeledtr>
1259312601
<mtd id="mjx-eqn:A">
12594-
<mtext data-latex="\\text{(1)}">(1)</mtext>
12602+
<mtext data-latex="\\text{(}">(</mtext>
12603+
<mtext data-latex="\\text{1}">1</mtext>
12604+
<mtext data-latex="\\text{)}">)</mtext>
1259512605
</mtd>
1259612606
<mtd>
1259712607
<mi data-latex="\\label{A}">a</mi>
@@ -12614,7 +12624,9 @@ describe('Referencing', () => {
1261412624
<mtable displaystyle="true" data-latex="a\\label{A}\\ref{B}">
1261512625
<mlabeledtr>
1261612626
<mtd id="mjx-eqn:A">
12617-
<mtext data-latex="\\text{(1)}">(1)</mtext>
12627+
<mtext data-latex="\\text{(}">(</mtext>
12628+
<mtext data-latex="\\text{1}">1</mtext>
12629+
<mtext data-latex="\\text{)}">)</mtext>
1261812630
</mtd>
1261912631
<mtd>
1262012632
<mi data-latex="\\label{A}">a</mi>
@@ -12637,7 +12649,9 @@ describe('Referencing', () => {
1263712649
<mtable displaystyle="true" columnalign="right" columnspacing="" rowspacing="3pt" data-break-align="bottom" data-latex-item="{eqnarray}" data-latex="\\begin{eqnarray}a\\\\c\\nonumber\\end{eqnarray}">
1263812650
<mlabeledtr>
1263912651
<mtd id="mjx-eqn:1">
12640-
<mtext data-latex="\\text{(1)}">(1)</mtext>
12652+
<mtext data-latex="\\text{(}">(</mtext>
12653+
<mtext data-latex="\\text{1}">1</mtext>
12654+
<mtext data-latex="\\text{)}">)</mtext>
1264112655
</mtd>
1264212656
<mtd>
1264312657
<mi data-latex="a">a</mi>
@@ -14148,7 +14162,7 @@ describe('User Defined Environments', () => {
1414814162
it('Cases star', () => {
1414914163
toXmlMatch(
1415014164
tex2mml('\\begin{mmtool} a & test a\\\\ b & test b \\end{mmtool}'),
14151-
`<math xmlns=\"http://www.w3.org/1998/Math/MathML\" data-latex=\"\\begin{mmtool} a &amp; test a\\\\ b &amp; test b \\end{mmtool}\" display=\"block\">
14165+
`<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{mmtool} a &amp; test a\\\\ b &amp; test b \\end{mmtool}" display="block">
1415214166
<mrow data-mjx-texclass="INNER" data-latex-item="{mmtool}" data-latex="\\begin{mmtool} a &amp; test a\\\\ b &amp; test b \\end{mmtool}">
1415314167
<mo data-mjx-texclass="OPEN">{</mo>
1415414168
<mtable rowspacing=".2em" columnspacing="1em" columnalign="left">
@@ -14212,11 +14226,13 @@ describe('Tagged Environments', () => {
1421214226
it('EqnTest', () => {
1421314227
toXmlMatch(
1421414228
tex2mml('\\begin{eqntest} a & b \\end{eqntest}'),
14215-
`<math xmlns=\"http://www.w3.org/1998/Math/MathML\" data-latex=\"\\begin{eqntest} a &amp; b \\end{eqntest}\" display=\"block\">
14229+
`<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}" display="block">
1421614230
<mtable displaystyle="true" columnalign="right left" columnspacing="1em" rowspacing="3pt" data-break-align="bottom top" data-latex-item="{eqntest}" data-latex="\\begin{eqntest} a &amp; b \\end{eqntest}">
1421714231
<mlabeledtr>
1421814232
<mtd id="mjx-eqn:1">
14219-
<mtext data-latex="\\text{(1)}">(1)</mtext>
14233+
<mtext data-latex="\\text{(}">(</mtext>
14234+
<mtext data-latex="\\text{1}">1</mtext>
14235+
<mtext data-latex="\\text{)}">)</mtext>
1422014236
</mtd>
1422114237
<mtd>
1422214238
<mi data-latex="a">a</mi>
@@ -14241,7 +14257,9 @@ describe('Tagged Environments', () => {
1424114257
<mtable displaystyle="true" data-latex-item="{equation}" data-latex="\\begin{equation} x \\end{equation}">
1424214258
<mlabeledtr>
1424314259
<mtd id="mjx-eqn:1">
14244-
<mtext data-latex="\\text{(1)}">(1)</mtext>
14260+
<mtext data-latex="\\text{(}">(</mtext>
14261+
<mtext data-latex="\\text{1}">1</mtext>
14262+
<mtext data-latex="\\text{)}">)</mtext>
1424514263
</mtd>
1424614264
<mtd>
1424714265
<mi data-latex="x">x</mi>

0 commit comments

Comments
 (0)