Skip to content

Commit 5ff1790

Browse files
dpvcdpvc
authored
Merge branch 'develop' into script-defaults
2 parents 3c6429a + bacc102 commit 5ff1790

34 files changed

Lines changed: 5017 additions & 5684 deletions

‎eslint.config.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export default tseslint.config({
1919
files: ['ts/**/*.ts'],
2020
ignores: ["**/*.d.ts", "**/*.js", "**/cjs/*"],
2121
"rules": {
22+
"@typescript-eslint/prefer-includes": "error",
2223
"@typescript-eslint/no-explicit-any": "off",
2324
"@typescript-eslint/no-unused-vars": ["error",
2425
{ "varsIgnorePattern": "^_", "argsIgnorePattern": "^_",

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"scripts": {
6969
"=============================================================================== code hygene": "",
7070
"lint": "check() { eslint ${1:-ts/}; }; check",
71-
"lint:fix": "fix() { eslint --fix ${1:-ts/}; }; fix",
71+
"lint:fix": "fix() { eslint --fix ${1:-ts/}; -- format unix}; fix",
7272
"format": "check() { prettier --check ${1:-\"ts/**/*.{ts,tsx}\"}; }; check",
7373
"format:fix": "fix() { prettier --write ${1:-\"ts/**/*.{ts,tsx}\"}; }; fix",
7474
"=============================================================================== clean": "",
@@ -149,7 +149,8 @@
149149
},
150150
"lint-staged": {
151151
"ts/**/*.ts": [
152-
"pnpm format:fix"
152+
"pnpm format:fix",
153+
"pnpm lint:fix"
153154
]
154155
},
155156
"dependencies": {

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

Lines changed: 184 additions & 226 deletions
Large diffs are not rendered by default.

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

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('AmsCD', () => {
99
toXmlMatch(
1010
tex2mml('\\begin{CD}A @>a>> B\\\\@VVbV @VVcV\\\\C @>d>> D\\end{CD}'),
1111
`<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">
12-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
12+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
1313
<mtr>
1414
<mtd>
1515
<mi data-latex="A">A</mi>
@@ -79,7 +79,7 @@ describe('AmsCD', () => {
7979
toXmlMatch(
8080
tex2mml('\\begin{CD}A @<<< B @>>> C\\\\@. @| @AAA\\\\@. D @= E\\end{CD}'),
8181
`<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">
82-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\begin{CD}A @&lt;&lt;&lt; B @&gt;&gt;&gt; C\\\\@. @| @AAA\\\\@. D @= E\\end{CD}">
82+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\begin{CD}A @&lt;&lt;&lt; B @&gt;&gt;&gt; C\\\\@. @| @AAA\\\\@. D @= E\\end{CD}">
8383
<mtr>
8484
<mtd>
8585
<mi data-latex="A">A</mi>
@@ -142,7 +142,7 @@ describe('AmsCD', () => {
142142
toXmlMatch(
143143
tex2mml('\\begin{CD}A @>a>b> B\\\\@VlVrV @AlArA\\\\C @<a<b< D\\end{CD}'),
144144
`<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">
145-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\begin{CD}A @&gt;a&gt;b&gt; B\\\\@VlVrV @AlArA\\\\C @&lt;a&lt;b&lt; D\\end{CD}">
145+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\begin{CD}A @&gt;a&gt;b&gt; B\\\\@VlVrV @AlArA\\\\C @&lt;a&lt;b&lt; D\\end{CD}">
146146
<mtr>
147147
<mtd>
148148
<mi data-latex="A">A</mi>
@@ -234,7 +234,7 @@ describe('AmsCD', () => {
234234
'\\begin{CD}A @>>> B@>\\text{very long label}>>C\\\\@VVV @VVV @VVV\\\\D @>>> E@>>> F\\end{CD}'
235235
),
236236
`<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">
237-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" 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}">
237+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" 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}">
238238
<mtr>
239239
<mtd>
240240
<mi data-latex="A">A</mi>
@@ -314,7 +314,7 @@ describe('AmsCD', () => {
314314
'\\begin{CD}A @>>> B @>{\\text{very long label}}>> C \\\\@VVV @VVV @VVV \\\\D @>>> E @>{\\phantom{\\text{very long label}}}>> F\\end{CD}'
315315
),
316316
`<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">
317-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" 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}">
317+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" 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}">
318318
<mtr>
319319
<mtd>
320320
<mi data-latex="A">A</mi>
@@ -402,7 +402,7 @@ describe('AmsCD', () => {
402402
'\\begin{CD}A @>>> B @>{\\text{very long label}}>> C \\\\@VVV @VVV @VVV \\\\D @>>> E @>{\\rlap{\\scriptstyle{\\ \\ \\ \\text{shorter}}}\\phantom{\\text{very long label}}}>> F\\end{CD}'
403403
),
404404
`<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">
405-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" 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}">
405+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" 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}">
406406
<mtr>
407407
<mtd>
408408
<mi data-latex="A">A</mi>
@@ -470,14 +470,12 @@ describe('AmsCD', () => {
470470
<mrow data-mjx-texclass="ORD" data-latex="{\\rlap{\\scriptstyle{\\ \\ \\ \\text{shorter}}}\\phantom{\\text{very long label}}}">
471471
<mrow data-mjx-texclass="ORD" data-latex="\\rlap{\\scriptstyle{\\ \\ \\ \\text{shorter}}}">
472472
<mpadded width="0">
473-
<mstyle displaystyle="false" scriptlevel="1" data-latex="\\scriptstyle{\\ \\ \\ \\text{shorter}}">
474-
<mrow data-mjx-texclass="ORD" data-latex="{\\text{shorter}}">
475-
<mtext>&#xA0;</mtext>
476-
<mtext>&#xA0;</mtext>
477-
<mtext>&#xA0;</mtext>
478-
<mtext data-latex="\\text{shorter}">shorter</mtext>
479-
</mrow>
480-
</mstyle>
473+
<mrow data-mjx-texclass="ORD" data-latex="\\scriptstyle{\\ \\ \\ \\text{shorter}}">
474+
<mtext>&#xA0;</mtext>
475+
<mtext>&#xA0;</mtext>
476+
<mtext>&#xA0;</mtext>
477+
<mtext data-latex="\\text{shorter}">shorter</mtext>
478+
</mrow>
481479
</mpadded>
482480
</mrow>
483481
<mrow data-mjx-texclass="ORD" data-latex="\\phantom{\\text{very long label}}">
@@ -502,7 +500,7 @@ describe('AmsCD', () => {
502500
'\\minCDarrowwidth{5cm}\\begin{CD}A @>a>> B\\\\@VVbV @VVcV\\\\C @>d>> D\\end{CD}'
503501
),
504502
`<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">
505-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
503+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
506504
<mtr>
507505
<mtd>
508506
<mi data-latex="A">A</mi>
@@ -574,7 +572,7 @@ describe('AmsCD', () => {
574572
'\\minCDarrowheight{4cm}\\begin{CD}A @>a>> B\\\\@VVbV @VVcV\\\\C @>d>> D\\end{CD}'
575573
),
576574
`<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">
577-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\minCDarrowheight{4cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
575+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\minCDarrowheight{4cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
578576
<mtr>
579577
<mtd>
580578
<mi data-latex="A">A</mi>
@@ -646,7 +644,7 @@ describe('AmsCD', () => {
646644
'\\minCDarrowheight{4cm}\\minCDarrowwidth{5cm}\\begin{CD}A @>a>> B\\\\@VVbV @VVcV\\\\C @>d>> D\\end{CD}'
647645
),
648646
`<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">
649-
<mtable columnspacing="5pt" rowspacing="5pt" displaystyle="true" data-latex-item="{CD}" data-latex="\\minCDarrowheight{4cm}\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
647+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\minCDarrowheight{4cm}\\minCDarrowwidth{5cm}\\begin{CD}A @&gt;a&gt;&gt; B\\\\@VVbV @VVcV\\\\C @&gt;d&gt;&gt; D\\end{CD}">
650648
<mtr>
651649
<mtd>
652650
<mi data-latex="A">A</mi>
@@ -715,20 +713,20 @@ describe('AmsCD', () => {
715713
it('Suspicious Return', () =>
716714
toXmlMatch(
717715
tex2mml('\\begin{CD}A @Ra>> BaD\\end{CD}'),
718-
`<math xmlns=\"http://www.w3.org/1998/Math/MathML\" data-latex=\"\\begin{CD}A @Ra&gt;&gt; BaD\\end{CD}\" display=\"block\">
719-
<mtable columnspacing=\"5pt\" rowspacing=\"5pt\" displaystyle=\"true\" data-latex-item=\"{CD}\" data-latex=\"\\begin{CD}A @Ra&gt;&gt; BaD\\end{CD}\">
716+
`<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\begin{CD}A @Ra&gt;&gt; BaD\\end{CD}" display="block">
717+
<mtable columnspacing="5pt" rowspacing="5pt" data-latex-item="{CD}" data-latex="\\begin{CD}A @Ra&gt;&gt; BaD\\end{CD}">
720718
<mtr>
721719
<mtd>
722-
<mi data-latex=\"A\">A</mi>
723-
<mrow data-mjx-texclass=\"ORD\">
724-
<mo data-latex=\"@\">@</mo>
720+
<mi data-latex="A">A</mi>
721+
<mrow data-mjx-texclass="ORD">
722+
<mo data-latex="@">@</mo>
725723
</mrow>
726-
<mi data-latex=\"R\">R</mi>
727-
<mi data-latex=\"a\">a</mi>
728-
<mo data-latex=\"&gt;\">&gt;&gt;</mo>
729-
<mi data-latex=\"B\">B</mi>
730-
<mi data-latex=\"a\">a</mi>
731-
<mi data-latex=\"D\">D</mi>
724+
<mi data-latex="R">R</mi>
725+
<mi data-latex="a">a</mi>
726+
<mo data-latex="&gt;">&gt;&gt;</mo>
727+
<mi data-latex="B">B</mi>
728+
<mi data-latex="a">a</mi>
729+
<mi data-latex="D">D</mi>
732730
</mtd>
733731
</mtr>
734732
</mtable>

0 commit comments

Comments
 (0)