diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +texmath (0.8.5.1) + + * OMML writer: Fixed order of elements in nary formulas to conform + to OMML spec (#88, Niko Weh). `` must follow the `` and `` + parts of ``. This fixes rendering issues in LibreOffice + (though Word copes with the incorrect order). + * Added Paths_texmath to Other-Modules for texmath executable. + texmath (0.8.5) * TeX parser: Support limited styling inside \DeclareMathOperator (#85). diff --git a/src/Text/TeXMath/Writers/OMML.hs b/src/Text/TeXMath/Writers/OMML.hs --- a/src/Text/TeXMath/Writers/OMML.hs +++ b/src/Text/TeXMath/Writers/OMML.hs @@ -223,7 +223,7 @@ , mnodeA "supHide" (if z == EGrouped [] then "on" else "off") () ] - , mnode "e" $ showExp props w , mnode "sub" $ showExp props y - , mnode "sup" $ showExp props z ] + , mnode "sup" $ showExp props z + , mnode "e" $ showExp props w ] diff --git a/tests/readers/tex/simple_sum_formula.native b/tests/readers/tex/simple_sum_formula.native new file mode 100644 --- /dev/null +++ b/tests/readers/tex/simple_sum_formula.native @@ -0,0 +1,1 @@ +[EUnderover True (ESymbol Op "\8721") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (ENumber "100"),EIdentifier "x",ESymbol Rel "=",EFraction NormalFrac (EGrouped [ENumber "100",ESymbol Bin "*",ENumber "101"]) (ENumber "2")] diff --git a/tests/src/simple_sum_formula.tex b/tests/src/simple_sum_formula.tex new file mode 100644 --- /dev/null +++ b/tests/src/simple_sum_formula.tex @@ -0,0 +1,1 @@ +\sum_{i=1}^100 x = \frac{100*101}{2} diff --git a/tests/writers/05.omml b/tests/writers/05.omml --- a/tests/writers/05.omml +++ b/tests/writers/05.omml @@ -11,7 +11,6 @@ - @@ -24,6 +23,7 @@ x + @@ -32,12 +32,6 @@ - - - - f - - @@ -50,6 +44,12 @@ s + + + + f + + @@ -98,12 +98,6 @@ - - - - f - - @@ -116,6 +110,12 @@ x + + + + f + + diff --git a/tests/writers/06.omml b/tests/writers/06.omml --- a/tests/writers/06.omml +++ b/tests/writers/06.omml @@ -11,6 +11,26 @@ + + + + m + + + + = + + + + 1 + + + + + + ∞ + + @@ -19,6 +39,26 @@ + + + + n + + + + = + + + + 1 + + + + + + ∞ + + @@ -123,48 +163,8 @@ - - - - n - - - - = - - - - 1 - - - - - - ∞ - - - - - - m - - - - = - - - - 1 - - - - - - ∞ - - diff --git a/tests/writers/10.omml b/tests/writers/10.omml --- a/tests/writers/10.omml +++ b/tests/writers/10.omml @@ -86,6 +86,18 @@ + + + + 0 + + + + + + ∞ + + @@ -127,18 +139,6 @@ - - - - 0 - - - - - - ∞ - - diff --git a/tests/writers/13.omml b/tests/writers/13.omml --- a/tests/writers/13.omml +++ b/tests/writers/13.omml @@ -138,6 +138,26 @@ + + + + n + + + + = + + + + 0 + + + + + + ∞ + + @@ -285,26 +305,6 @@ - - - - n - - - - = - - - - 0 - - - - - - ∞ - - diff --git a/tests/writers/chain1.omml b/tests/writers/chain1.omml --- a/tests/writers/chain1.omml +++ b/tests/writers/chain1.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + @@ -66,22 +66,6 @@ - - - - - - x - - - - - - i - - - - @@ -102,18 +86,6 @@ ∞ - - - - = - - - - - - - - @@ -130,6 +102,18 @@ + + + + = + + + + + + + + @@ -150,18 +134,6 @@ ∞ - - - - = - - - - - - - - @@ -178,6 +150,18 @@ + + + + = + + + + + + + + @@ -198,6 +182,22 @@ ∞ + + + + + + x + + + + + + i + + + + @@ -210,12 +210,6 @@ - - - - f - - @@ -228,6 +222,12 @@ 1 + + + + f + + @@ -265,12 +265,6 @@ - - - - f - - @@ -283,6 +277,12 @@ 1 + + + + f + + @@ -320,12 +320,6 @@ - - - - f - - @@ -338,6 +332,12 @@ 1 + + + + f + + diff --git a/tests/writers/chain2.omml b/tests/writers/chain2.omml --- a/tests/writers/chain2.omml +++ b/tests/writers/chain2.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + @@ -66,22 +66,6 @@ - - - - - - x - - - - - - i - - - - @@ -102,18 +86,6 @@ ∞ - - - - = - - - - - - - - @@ -130,6 +102,18 @@ + + + + = + + + + + + + + @@ -150,18 +134,6 @@ ∞ - - - - = - - - - - - - - @@ -178,6 +150,18 @@ + + + + = + + + + + + + + @@ -198,6 +182,22 @@ ∞ + + + + + + x + + + + + + i + + + + @@ -210,12 +210,6 @@ - - - - f - - @@ -228,6 +222,12 @@ 1 + + + + f + + @@ -265,12 +265,6 @@ - - - - f - - @@ -283,6 +277,12 @@ 1 + + + + f + + @@ -320,12 +320,6 @@ - - - - f - - @@ -338,6 +332,12 @@ 1 + + + + f + + diff --git a/tests/writers/complex1.omml b/tests/writers/complex1.omml --- a/tests/writers/complex1.omml +++ b/tests/writers/complex1.omml @@ -500,6 +500,13 @@ + + + + γ + + + @@ -539,13 +546,6 @@ - - - - γ - - - @@ -1133,12 +1133,6 @@ - - - - ( - - @@ -1170,6 +1164,12 @@ + + + + ( + + @@ -2262,6 +2262,26 @@ + + + + k + + + + = + + + + 1 + + + + + + ∞ + + @@ -2308,26 +2328,6 @@ - - - - k - - - - = - - - - 1 - - - - - - ∞ - - @@ -2428,6 +2428,26 @@ + + + + k + + + + = + + + + 1 + + + + + + ∞ + + @@ -2559,10 +2579,22 @@ + + + + = + + + + + + + + - k + j @@ -2570,7 +2602,7 @@ - 1 + 0 @@ -2579,18 +2611,6 @@ ∞ - - - - = - - - - - - - - @@ -2692,26 +2712,6 @@ - - - - j - - - - = - - - - 0 - - - - - - ∞ - - diff --git a/tests/writers/complex2.omml b/tests/writers/complex2.omml --- a/tests/writers/complex2.omml +++ b/tests/writers/complex2.omml @@ -896,6 +896,26 @@ + + + + i + + + + = + + + + 0 + + + + + + ∞ + + @@ -918,26 +938,6 @@ - - - - i - - - - = - - - - 0 - - - - - - ∞ - - @@ -993,6 +993,26 @@ + + + + i + + + + = + + + + 0 + + + + + + ∞ + + @@ -1015,26 +1035,6 @@ - - - - i - - - - = - - - - 0 - - - - - - ∞ - - @@ -1090,6 +1090,26 @@ + + + + i + + + + = + + + + 0 + + + + + + ∞ + + @@ -1128,26 +1148,6 @@ - - - - i - - - - = - - - - 0 - - - - - - ∞ - - diff --git a/tests/writers/complex3.omml b/tests/writers/complex3.omml --- a/tests/writers/complex3.omml +++ b/tests/writers/complex3.omml @@ -1587,6 +1587,26 @@ + + + + n + + + + = + + + + 0 + + + + + + ∞ + + @@ -1621,26 +1641,6 @@ - - - - n - - - - = - - - - 0 - - - - - - ∞ - - @@ -1728,6 +1728,26 @@ + + + + n + + + + = + + + + 0 + + + + + + ∞ + + @@ -1762,26 +1782,6 @@ - - - - n - - - - = - - - - 0 - - - - - - ∞ - - @@ -1810,6 +1810,26 @@ + + + + n + + + + = + + + + 0 + + + + + + ∞ + + @@ -1874,26 +1894,6 @@ - - - - n - - - - = - - - - 0 - - - - - - ∞ - - @@ -1985,6 +1985,26 @@ + + + + k + + + + = + + + + 0 + + + + + + n + + @@ -2019,26 +2039,6 @@ - - - - k - - - - = - - - - 0 - - - - - - n - - @@ -2148,6 +2148,26 @@ + + + + k + + + + = + + + + 0 + + + + + + n + + @@ -2182,26 +2202,6 @@ - - - - k - - - - = - - - - 0 - - - - - - n - - @@ -7005,14 +7005,14 @@ + + x - - @@ -7026,30 +7026,6 @@ - - - - - - 2 - - - - - - i - - - - + - - - - j - - - - @@ -7119,6 +7095,30 @@ + + + + + + 2 + + + + + + i + + + + + + + + + j + + + + @@ -14590,12 +14590,6 @@ - - - - a - - @@ -14608,6 +14602,12 @@ 2 + + + + a + + @@ -14621,6 +14621,18 @@ + + + + a + + + + + + b + + @@ -14655,18 +14667,6 @@ x - - - - a - - - - - - b - - @@ -14711,6 +14711,26 @@ + + + + i + + + + = + + + + 1 + + + + + + n + + @@ -14773,26 +14793,6 @@ - - - - i - - - - = - - - - 1 - - - - - - n - - @@ -14806,6 +14806,18 @@ + + + + a + + + + + + b + + @@ -14840,18 +14852,6 @@ x - - - - a - - - - - - b - - @@ -14917,6 +14917,26 @@ + + + + i + + + + = + + + + 1 + + + + + + n + + @@ -14977,26 +14997,6 @@ - - - - i - - - - = - - - - 1 - - - - - - n - - @@ -15010,6 +15010,18 @@ + + + + 0 + + + + + + 2 + + @@ -15072,18 +15084,6 @@ x - - - - 0 - - - - - - 2 - - @@ -15096,6 +15096,18 @@ + + + + 1 + + + + + + 3 + + @@ -15376,18 +15388,6 @@ u - - - - 1 - - - - - - 3 - - @@ -15558,56 +15558,56 @@ - + n - ⁢ + = - ( + 1 + + - n + 100 + + - − + n - 1 + ⁢ - ) + ( - - n - = + − 1 - - - 100 + ) - + @@ -19195,6 +19195,26 @@ + + + + k + + + + = + + + + 0 + + + + + + x + + @@ -19267,26 +19287,6 @@ - - - - k - - - - = - - - - 0 - - - - - - x - - diff --git a/tests/writers/coprod1.omml b/tests/writers/coprod1.omml --- a/tests/writers/coprod1.omml +++ b/tests/writers/coprod1.omml @@ -11,22 +11,6 @@ - - - - - - x - - - - - - i - - - - @@ -47,6 +31,22 @@ ∞ + + + + + + x + + + + + + i + + + + diff --git a/tests/writers/coprod2.omml b/tests/writers/coprod2.omml --- a/tests/writers/coprod2.omml +++ b/tests/writers/coprod2.omml @@ -11,22 +11,6 @@ - - - - - - x - - - - - - i - - - - @@ -47,6 +31,22 @@ ∞ + + + + + + x + + + + + + i + + + + diff --git a/tests/writers/deMorgans_law.omml b/tests/writers/deMorgans_law.omml --- a/tests/writers/deMorgans_law.omml +++ b/tests/writers/deMorgans_law.omml @@ -80,22 +80,6 @@ - - - - - - A - - - - - - i - - - - @@ -116,25 +100,6 @@ n - - - - - - = - - - - - - - - - - - - - @@ -151,8 +116,20 @@ - + + + + + = + + + + + + + + @@ -173,6 +150,29 @@ n + + + + + + + + + + + A + + + + + + i + + + + + + diff --git a/tests/writers/doubleint1.omml b/tests/writers/doubleint1.omml --- a/tests/writers/doubleint1.omml +++ b/tests/writers/doubleint1.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/doubleint2.omml b/tests/writers/doubleint2.omml --- a/tests/writers/doubleint2.omml +++ b/tests/writers/doubleint2.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/int10.omml b/tests/writers/int10.omml --- a/tests/writers/int10.omml +++ b/tests/writers/int10.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/int3.omml b/tests/writers/int3.omml --- a/tests/writers/int3.omml +++ b/tests/writers/int3.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/int4.omml b/tests/writers/int4.omml --- a/tests/writers/int4.omml +++ b/tests/writers/int4.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/int7.omml b/tests/writers/int7.omml --- a/tests/writers/int7.omml +++ b/tests/writers/int7.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/int8.omml b/tests/writers/int8.omml --- a/tests/writers/int8.omml +++ b/tests/writers/int8.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/int9.omml b/tests/writers/int9.omml --- a/tests/writers/int9.omml +++ b/tests/writers/int9.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/largeopPos3.omml b/tests/writers/largeopPos3.omml --- a/tests/writers/largeopPos3.omml +++ b/tests/writers/largeopPos3.omml @@ -11,40 +11,40 @@ - + - A + i - ∩ + = - B + 0 - - + + - i + ∞ + + - = + A - 0 + ∩ - - - ∞ + B - + diff --git a/tests/writers/mfracZcomp-30.omml b/tests/writers/mfracZcomp-30.omml --- a/tests/writers/mfracZcomp-30.omml +++ b/tests/writers/mfracZcomp-30.omml @@ -60,6 +60,26 @@ + + + + k + + + + = + + + + 0 + + + + + + x + + @@ -169,26 +189,6 @@ - - - - k - - - - = - - - - 0 - - - - - - x - - diff --git a/tests/writers/mfracZcomp-33.omml b/tests/writers/mfracZcomp-33.omml --- a/tests/writers/mfracZcomp-33.omml +++ b/tests/writers/mfracZcomp-33.omml @@ -109,6 +109,13 @@ + + + + C + + + @@ -197,13 +204,6 @@ - - - - C - - - diff --git a/tests/writers/moAmovable15.omml b/tests/writers/moAmovable15.omml --- a/tests/writers/moAmovable15.omml +++ b/tests/writers/moAmovable15.omml @@ -11,12 +11,6 @@ - - - - = - - @@ -29,6 +23,12 @@ 0 + + + + = + + @@ -37,12 +37,6 @@ - - - - = - - @@ -55,6 +49,12 @@ 0 + + + + = + + @@ -63,12 +63,6 @@ - - - - = - - @@ -81,6 +75,12 @@ 0 + + + + = + + @@ -89,12 +89,6 @@ - - - - = - - @@ -107,6 +101,12 @@ 0 + + + + = + + @@ -115,12 +115,6 @@ - - - - = - - @@ -133,6 +127,12 @@ 0 + + + + = + + @@ -141,7 +141,6 @@ - @@ -154,6 +153,7 @@ 0 + diff --git a/tests/writers/msubsup1.omml b/tests/writers/msubsup1.omml --- a/tests/writers/msubsup1.omml +++ b/tests/writers/msubsup1.omml @@ -11,6 +11,18 @@ + + + + 0 + + + + + + 1 + + @@ -39,18 +51,6 @@ x - - - - 0 - - - - - - 1 - - diff --git a/tests/writers/msubsupBsize2.omml b/tests/writers/msubsupBsize2.omml --- a/tests/writers/msubsupBsize2.omml +++ b/tests/writers/msubsupBsize2.omml @@ -11,12 +11,6 @@ - - - - + - - @@ -29,6 +23,12 @@ 1 + + + + + + + @@ -111,7 +111,6 @@ - @@ -124,6 +123,7 @@ a + diff --git a/tests/writers/msupBsize3.omml b/tests/writers/msupBsize3.omml --- a/tests/writers/msupBsize3.omml +++ b/tests/writers/msupBsize3.omml @@ -11,12 +11,6 @@ - - - - + - - @@ -24,6 +18,12 @@ 1 + + + + + + + @@ -94,12 +94,6 @@ - - - - + - - @@ -107,6 +101,12 @@ a + + + + + + + @@ -115,7 +115,6 @@ - @@ -123,6 +122,7 @@ a + diff --git a/tests/writers/oint1.omml b/tests/writers/oint1.omml --- a/tests/writers/oint1.omml +++ b/tests/writers/oint1.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/oint2.omml b/tests/writers/oint2.omml --- a/tests/writers/oint2.omml +++ b/tests/writers/oint2.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/prod1.omml b/tests/writers/prod1.omml --- a/tests/writers/prod1.omml +++ b/tests/writers/prod1.omml @@ -11,22 +11,6 @@ - - - - - - x - - - - - - i - - - - @@ -47,6 +31,22 @@ ∞ + + + + + + x + + + + + + i + + + + diff --git a/tests/writers/prod2.omml b/tests/writers/prod2.omml --- a/tests/writers/prod2.omml +++ b/tests/writers/prod2.omml @@ -11,22 +11,6 @@ - - - - - - x - - - - - - i - - - - @@ -47,6 +31,22 @@ ∞ + + + + + + x + + + + + + i + + + + diff --git a/tests/writers/simple_sum_formula.mml b/tests/writers/simple_sum_formula.mml new file mode 100644 --- /dev/null +++ b/tests/writers/simple_sum_formula.mml @@ -0,0 +1,24 @@ + + + + + ∑ + + i + = + 1 + + 100 + + x + = + + + 100 + * + 101 + + 2 + + + diff --git a/tests/writers/simple_sum_formula.omml b/tests/writers/simple_sum_formula.omml new file mode 100644 --- /dev/null +++ b/tests/writers/simple_sum_formula.omml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + i + + + + = + + + + 1 + + + + + + 100 + + + + + + x + + + + + + = + + + + + + + + + 100 + + + + * + + + + 101 + + + + + + 2 + + + + + diff --git a/tests/writers/simple_sum_formula.tex b/tests/writers/simple_sum_formula.tex new file mode 100644 --- /dev/null +++ b/tests/writers/simple_sum_formula.tex @@ -0,0 +1,1 @@ +\sum_{i = 1}^{100}x = \frac{100 * 101}{2} diff --git a/tests/writers/sophomores_dream.omml b/tests/writers/sophomores_dream.omml --- a/tests/writers/sophomores_dream.omml +++ b/tests/writers/sophomores_dream.omml @@ -11,6 +11,18 @@ + + + + 0 + + + + + + 1 + + @@ -27,18 +39,6 @@ - - - - 0 - - - - - - 1 - - @@ -65,6 +65,26 @@ + + + + n + + + + = + + + + 1 + + + + + + ∞ + + @@ -123,26 +143,6 @@ - - - - n - - - - = - - - - 1 - - - - - - ∞ - - diff --git a/tests/writers/sphere_volume.omml b/tests/writers/sphere_volume.omml --- a/tests/writers/sphere_volume.omml +++ b/tests/writers/sphere_volume.omml @@ -183,7 +183,6 @@ - @@ -191,6 +190,7 @@ S + @@ -274,7 +274,6 @@ - @@ -291,6 +290,7 @@ π + @@ -313,7 +313,6 @@ - @@ -326,6 +325,7 @@ π + @@ -362,7 +362,6 @@ - @@ -375,6 +374,7 @@ R + diff --git a/tests/writers/substack.omml b/tests/writers/substack.omml --- a/tests/writers/substack.omml +++ b/tests/writers/substack.omml @@ -11,12 +11,6 @@ - - - - P - - @@ -86,6 +80,12 @@ + + + + P + + diff --git a/tests/writers/sum1.omml b/tests/writers/sum1.omml --- a/tests/writers/sum1.omml +++ b/tests/writers/sum1.omml @@ -11,22 +11,6 @@ - - - - - - x - - - - - - i - - - - @@ -47,6 +31,22 @@ ∞ + + + + + + x + + + + + + i + + + + diff --git a/tests/writers/sum2.omml b/tests/writers/sum2.omml --- a/tests/writers/sum2.omml +++ b/tests/writers/sum2.omml @@ -11,22 +11,6 @@ - - - - - - x - - - - - - i - - - - @@ -47,6 +31,22 @@ ∞ + + + + + + x + + + + + + i + + + + diff --git a/tests/writers/tripleint1.omml b/tests/writers/tripleint1.omml --- a/tests/writers/tripleint1.omml +++ b/tests/writers/tripleint1.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/tests/writers/tripleint2.omml b/tests/writers/tripleint2.omml --- a/tests/writers/tripleint2.omml +++ b/tests/writers/tripleint2.omml @@ -11,12 +11,6 @@ - - - - f - - @@ -29,6 +23,12 @@ 1 + + + + f + + diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.8.5 +Version: 0.8.5.1 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics. @@ -121,6 +121,7 @@ Executable texmath Default-Language: Haskell2010 Main-is: texmath.hs + Other-Modules: Paths_texmath Hs-Source-Dirs: extra if impl(ghc >= 6.12) Ghc-Options: -Wall -fno-warn-unused-do-bind