Skip to content

Commit 3b02735

Browse files
teepeemmteepeemm
authored
expl syntax in siunitx options (#2751)
siunitx options are entered in expl. This matters for a few options
1 parent 7050832 commit 3b02735

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎lib/LaTeXML/Package/siunitx.sty.ltxml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,12 +1564,12 @@ RawTeX(<<'EoTeX');
15641564
number-unit-product = \, ,
15651565
product-units = repeat,
15661566
1567-
list-final-separator = { ~ and ~ } ,
1568-
list-pair-separator = { ~ and ~ } ,
1569-
list-separator = { , ~ } ,
1567+
list-final-separator = { and } ,
1568+
list-pair-separator = { and } ,
1569+
list-separator = {, } ,
15701570
list-units = repeat,
15711571
1572-
range-phrase = { ~ to ~ },
1572+
range-phrase = { to },
15731573
range-units = repeat,
15741574
15751575
table-unit-alignment = center,

‎t/complex/si.xml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
9090
</XMApp>
9191
<XMWrap>
9292
<XMTok color="#0000FF" meaning="1" role="NUMBER" xml:id="p1.m4.1">1</XMTok>
93-
<XMText role="PUNCT"><text color="#0000FF"> ,   </text></XMText>
93+
<XMText role="PUNCT"><text color="#0000FF">, </text></XMText>
9494
<XMTok color="#0000FF" meaning="2" role="NUMBER" xml:id="p1.m4.2">2</XMTok>
95-
<XMText role="PUNCT"><text color="#0000FF"> ,   </text></XMText>
95+
<XMText role="PUNCT"><text color="#0000FF">, </text></XMText>
9696
<XMTok color="#0000FF" meaning="3" role="NUMBER" xml:id="p1.m4.3">3</XMTok>
97-
<XMText role="PUNCT"><text color="#0000FF">   and   </text></XMText>
97+
<XMText role="PUNCT"><text color="#0000FF"> and </text></XMText>
9898
<XMTok color="#0000FF" meaning="4" role="NUMBER" xml:id="p1.m4.4">4</XMTok>
9999
</XMWrap>
100100
</XMDual>
@@ -2261,9 +2261,9 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
22612261
</XMApp>
22622262
<XMWrap>
22632263
<XMTok meaning="0.1" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m1.1">0.1</XMTok>
2264-
<XMText role="PUNCT"> ,   </XMText>
2264+
<XMText role="PUNCT">, </XMText>
22652265
<XMTok meaning="0.2" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m1.2">0.2</XMTok>
2266-
<XMText role="PUNCT">   and   </XMText>
2266+
<XMText role="PUNCT"> and </XMText>
22672267
<XMTok meaning="0.3" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m1.3">0.3</XMTok>
22682268
</XMWrap>
22692269
</XMDual>
@@ -2279,9 +2279,9 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
22792279
</XMApp>
22802280
<XMWrap>
22812281
<XMTok color="#0000FF" meaning="0.1" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m2.1">0.1</XMTok>
2282-
<XMText role="PUNCT"><text color="#0000FF"> ,   </text></XMText>
2282+
<XMText role="PUNCT"><text color="#0000FF">, </text></XMText>
22832283
<XMTok color="#0000FF" meaning="0.2" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m2.2">0.2</XMTok>
2284-
<XMText role="PUNCT"><text color="#0000FF">   and   </text></XMText>
2284+
<XMText role="PUNCT"><text color="#0000FF"> and </text></XMText>
22852285
<XMTok color="#0000FF" meaning="0.3" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m2.3">0.3</XMTok>
22862286
</XMWrap>
22872287
</XMDual>
@@ -2299,7 +2299,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
22992299
<XMTok meaning="0.1" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m3.1">0.1</XMTok>
23002300
<XMText role="PUNCT">; </XMText>
23012301
<XMTok meaning="0.2" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m3.2">0.2</XMTok>
2302-
<XMText role="PUNCT">   and   </XMText>
2302+
<XMText role="PUNCT"> and </XMText>
23032303
<XMTok meaning="0.3" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m3.3">0.3</XMTok>
23042304
</XMWrap>
23052305
</XMDual>
@@ -2315,7 +2315,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
23152315
</XMApp>
23162316
<XMWrap>
23172317
<XMTok meaning="0.1" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m4.1">0.1</XMTok>
2318-
<XMText role="PUNCT"> ,   </XMText>
2318+
<XMText role="PUNCT">, </XMText>
23192319
<XMTok meaning="0.2" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m4.2">0.2</XMTok>
23202320
<XMText role="PUNCT">, </XMText>
23212321
<XMTok meaning="0.3" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m4.3">0.3</XMTok>
@@ -2350,7 +2350,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
23502350
</XMApp>
23512351
<XMWrap>
23522352
<XMTok meaning="0.1" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m6.1">0.1</XMTok>
2353-
<XMText role="PUNCT">   and   </XMText>
2353+
<XMText role="PUNCT"> and </XMText>
23542354
<XMTok meaning="0.2" role="NUMBER" xml:id="S1.SS6.SSS1.p1.m6.2">0.2</XMTok>
23552355
</XMWrap>
23562356
</XMDual>
@@ -2392,7 +2392,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
23922392
</XMApp>
23932393
<XMWrap>
23942394
<XMTok meaning="5" role="NUMBER" xml:id="S1.SS7.p1.m1.1">5</XMTok>
2395-
<XMText role="PUNCT">   to   </XMText>
2395+
<XMText role="PUNCT"> to </XMText>
23962396
<XMTok meaning="100" role="NUMBER" xml:id="S1.SS7.p1.m1.2">100</XMTok>
23972397
</XMWrap>
23982398
</XMDual>
@@ -6645,19 +6645,19 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
66456645
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m1.1.1">2</XMTok>
66466646
<XMTok class="ltx_unit" meaning="tesla" role="ID" xml:id="S2.SS2.SSS5.p1.m1.1.3">T</XMTok>
66476647
</XMApp>
6648-
<XMText role="PUNCT"> ,   </XMText>
6648+
<XMText role="PUNCT">, </XMText>
66496649
<XMApp xml:id="S2.SS2.SSS5.p1.m1.2">
66506650
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m1.2.2"> </XMText>
66516651
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m1.2.1">4</XMTok>
66526652
<XMTok class="ltx_unit" meaning="tesla" role="ID" xml:id="S2.SS2.SSS5.p1.m1.2.3">T</XMTok>
66536653
</XMApp>
6654-
<XMText role="PUNCT"> ,   </XMText>
6654+
<XMText role="PUNCT">, </XMText>
66556655
<XMApp xml:id="S2.SS2.SSS5.p1.m1.3">
66566656
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m1.3.2"> </XMText>
66576657
<XMTok meaning="6" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m1.3.1">6</XMTok>
66586658
<XMTok class="ltx_unit" meaning="tesla" role="ID" xml:id="S2.SS2.SSS5.p1.m1.3.3">T</XMTok>
66596659
</XMApp>
6660-
<XMText role="PUNCT">   and   </XMText>
6660+
<XMText role="PUNCT"> and </XMText>
66616661
<XMApp xml:id="S2.SS2.SSS5.p1.m1.4">
66626662
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m1.4.2"> </XMText>
66636663
<XMTok meaning="8" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m1.4.1">8</XMTok>
@@ -6681,11 +6681,11 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
66816681
<XMWrap>
66826682
<XMText role="OPEN">(</XMText>
66836683
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m2.1.1">2</XMTok>
6684-
<XMText role="PUNCT"> ,   </XMText>
6684+
<XMText role="PUNCT">, </XMText>
66856685
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m2.1.2">4</XMTok>
6686-
<XMText role="PUNCT"> ,   </XMText>
6686+
<XMText role="PUNCT">, </XMText>
66876687
<XMTok meaning="6" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m2.1.3">6</XMTok>
6688-
<XMText role="PUNCT">   and   </XMText>
6688+
<XMText role="PUNCT"> and </XMText>
66896689
<XMTok meaning="8" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m2.1.4">8</XMTok>
66906690
<XMText role="CLOSE">)</XMText>
66916691
</XMWrap>
@@ -6709,19 +6709,19 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
67096709
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m3.1.1">2</XMTok>
67106710
<XMTok class="ltx_unit" meaning="tesla" role="ID" xml:id="S2.SS2.SSS5.p1.m3.1.3">T</XMTok>
67116711
</XMApp>
6712-
<XMText role="PUNCT"> ,   </XMText>
6712+
<XMText role="PUNCT">, </XMText>
67136713
<XMApp xml:id="S2.SS2.SSS5.p1.m3.2">
67146714
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m3.2.2"> </XMText>
67156715
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m3.2.1">4</XMTok>
67166716
<XMTok class="ltx_unit" meaning="tesla" role="ID" xml:id="S2.SS2.SSS5.p1.m3.2.3">T</XMTok>
67176717
</XMApp>
6718-
<XMText role="PUNCT"> ,   </XMText>
6718+
<XMText role="PUNCT">, </XMText>
67196719
<XMApp xml:id="S2.SS2.SSS5.p1.m3.3">
67206720
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m3.3.2"> </XMText>
67216721
<XMTok meaning="6" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m3.3.1">6</XMTok>
67226722
<XMTok class="ltx_unit" meaning="tesla" role="ID" xml:id="S2.SS2.SSS5.p1.m3.3.3">T</XMTok>
67236723
</XMApp>
6724-
<XMText role="PUNCT">   and   </XMText>
6724+
<XMText role="PUNCT"> and </XMText>
67256725
<XMApp xml:id="S2.SS2.SSS5.p1.m3.4">
67266726
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m3.4.2"> </XMText>
67276727
<XMTok meaning="8" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m3.4.1">8</XMTok>
@@ -6744,11 +6744,11 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
67446744
</XMApp>
67456745
<XMWrap>
67466746
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m4.1.1">2</XMTok>
6747-
<XMText role="PUNCT"> ,   </XMText>
6747+
<XMText role="PUNCT">, </XMText>
67486748
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m4.1.2">4</XMTok>
6749-
<XMText role="PUNCT"> ,   </XMText>
6749+
<XMText role="PUNCT">, </XMText>
67506750
<XMTok meaning="6" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m4.1.3">6</XMTok>
6751-
<XMText role="PUNCT">   and   </XMText>
6751+
<XMText role="PUNCT"> and </XMText>
67526752
<XMTok meaning="8" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m4.1.4">8</XMTok>
67536753
</XMWrap>
67546754
</XMDual>
@@ -6769,7 +6769,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
67696769
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m5.1.1">2</XMTok>
67706770
<XMTok class="ltx_unit" meaning="degreeCelsius" name="SIUnitSymbolCelsius" role="ID" xml:id="S2.SS2.SSS5.p1.m5.1.3">°C</XMTok>
67716771
</XMApp>
6772-
<XMText role="PUNCT">   to   </XMText>
6772+
<XMText role="PUNCT"> to </XMText>
67736773
<XMApp xml:id="S2.SS2.SSS5.p1.m5.2">
67746774
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m5.2.2"> </XMText>
67756775
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m5.2.1">4</XMTok>
@@ -6791,7 +6791,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
67916791
<XMWrap>
67926792
<XMText role="OPEN">(</XMText>
67936793
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m6.1.1">2</XMTok>
6794-
<XMText role="PUNCT">   to   </XMText>
6794+
<XMText role="PUNCT"> to </XMText>
67956795
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m6.1.2">4</XMTok>
67966796
<XMText role="CLOSE">)</XMText>
67976797
</XMWrap>
@@ -6813,7 +6813,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
68136813
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m7.1.1">2</XMTok>
68146814
<XMTok class="ltx_unit" meaning="degreeCelsius" name="SIUnitSymbolCelsius" role="ID" xml:id="S2.SS2.SSS5.p1.m7.1.3">°C</XMTok>
68156815
</XMApp>
6816-
<XMText role="PUNCT">   to   </XMText>
6816+
<XMText role="PUNCT"> to </XMText>
68176817
<XMApp xml:id="S2.SS2.SSS5.p1.m7.2">
68186818
<XMText meaning="times" role="MULOP" xml:id="S2.SS2.SSS5.p1.m7.2.2"> </XMText>
68196819
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m7.2.1">4</XMTok>
@@ -6834,7 +6834,7 @@ Some text <break/><Math mode="inline" tex="4\text{\,}\mathrm{m}\text{\,}{\mathrm
68346834
</XMApp>
68356835
<XMWrap>
68366836
<XMTok meaning="2" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m8.1.1">2</XMTok>
6837-
<XMText role="PUNCT">   to   </XMText>
6837+
<XMText role="PUNCT"> to </XMText>
68386838
<XMTok meaning="4" role="NUMBER" xml:id="S2.SS2.SSS5.p1.m8.1.2">4</XMTok>
68396839
</XMWrap>
68406840
</XMDual>

0 commit comments

Comments
 (0)