Skip to content

Commit

Permalink
OMML writer: fix order of dPr attributes.
Browse files Browse the repository at this point in the history 
They must come in the order: `begChr`, `sepChr`, `endChr`.

Closes #243.
  • Loading branch information
@jgm
jgm committed Nov 13, 2024
1 parent 1703b41 commit 95b3f28
Show file tree
Hide file tree
Showing 101 changed files with 468 additions and 468 deletions.
2 changes: 1 addition & 1 deletion src/Text/TeXMath/Writers/OMML.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ showExp props e =
EDelimited start end xs ->
[ mnode "d" $ mnode "dPr"
[ mnodeA "begChr" (T.unpack start) ()
, mnodeA "endChr" (T.unpack end) ()
, mnodeA "sepChr" (T.unpack sepchr) ()
, mnodeA "endChr" (T.unpack end) ()
, mnode "grow" () ]
: map (mnode "e" . concatMap (showExp props)) es
]
Expand Down
4 changes: 2 additions & 2 deletions test/writer/omml/02.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -53,8 +53,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
2 changes: 1 addition & 1 deletion test/writer/omml/04.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
6 changes: 3 additions & 3 deletions test/writer/omml/05.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -149,8 +149,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -162,8 +162,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
2 changes: 1 addition & 1 deletion test/writer/omml/06.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
6 changes: 3 additions & 3 deletions test/writer/omml/07.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -78,8 +78,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -103,8 +103,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
14 changes: 7 additions & 7 deletions test/writer/omml/08.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="|" />
<m:endChr m:val="|" />
<m:sepChr m:val="" />
<m:endChr m:val="|" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -65,8 +65,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="|" />
<m:endChr m:val="|" />
<m:sepChr m:val="" />
<m:endChr m:val="|" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -84,8 +84,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="|" />
<m:endChr m:val="|" />
<m:sepChr m:val="" />
<m:endChr m:val="|" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -94,8 +94,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -131,8 +131,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="|" />
<m:endChr m:val="|" />
<m:sepChr m:val="" />
<m:endChr m:val="|" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -163,8 +163,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -200,8 +200,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
4 changes: 2 additions & 2 deletions test/writer/omml/09.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -82,8 +82,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
8 changes: 4 additions & 4 deletions test/writer/omml/10.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -153,8 +153,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -205,8 +205,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="[" />
<m:endChr m:val="]" />
<m:sepChr m:val="" />
<m:endChr m:val="]" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -248,8 +248,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
2 changes: 1 addition & 1 deletion test/writer/omml/11.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
4 changes: 2 additions & 2 deletions test/writer/omml/12.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand All @@ -61,8 +61,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="{" />
<m:endChr m:val="" />
<m:sepChr m:val="" />
<m:endChr m:val="" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
10 changes: 5 additions & 5 deletions test/writer/omml/13.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -239,8 +239,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -276,8 +276,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -309,8 +309,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -346,8 +346,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
10 changes: 5 additions & 5 deletions test/writer/omml/19.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="[" />
<m:endChr m:val="]" />
<m:sepChr m:val="" />
<m:endChr m:val="]" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -318,8 +318,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -372,8 +372,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="{" />
<m:endChr m:val="}" />
<m:sepChr m:val="" />
<m:endChr m:val="}" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -426,8 +426,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="∣" />
<m:endChr m:val="∣" />
<m:sepChr m:val="" />
<m:endChr m:val="∣" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -480,8 +480,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="∥" />
<m:endChr m:val="∥" />
<m:sepChr m:val="" />
<m:endChr m:val="∥" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
2 changes: 1 addition & 1 deletion test/writer/omml/abs1.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="|" />
<m:endChr m:val="|" />
<m:sepChr m:val="" />
<m:endChr m:val="|" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
4 changes: 2 additions & 2 deletions test/writer/omml/axiom_of_power_set.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="[" />
<m:endChr m:val="]" />
<m:sepChr m:val="" />
<m:endChr m:val="]" />
<m:grow />
</m:dPr>
<m:e>
Expand Down Expand Up @@ -116,8 +116,8 @@
<m:d>
<m:dPr>
<m:begChr m:val="(" />
<m:endChr m:val=")" />
<m:sepChr m:val="" />
<m:endChr m:val=")" />
<m:grow />
</m:dPr>
<m:e>
Expand Down
Loading

0 comments on commit 95b3f28

Please sign in to comment.