diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs --- a/Text/TeXMath/Parser.hs +++ b/Text/TeXMath/Parser.hs @@ -260,10 +260,10 @@ subSup :: Maybe Bool -> Exp -> TP Exp subSup limits a = try $ do - symbol "_" - b <- expr1 - symbol "^" - c <- expr + let sub1 = symbol "_" >> expr1 + let sup1 = symbol "^" >> expr1 + (b,c) <- try (do {m <- sub1; n <- sup1; return (m,n)}) + <|> (do {n <- sup1; m <- sub1; return (m,n)}) return $ case limits of Just True -> EUnderover a b c Nothing | isConvertible a -> EDownup a b c diff --git a/tests/subsup.omml b/tests/subsup.omml new file mode 100644 --- /dev/null +++ b/tests/subsup.omml @@ -0,0 +1,52 @@ + + + + + + + + + + + x + + + + + + a + + + + + + b + + + + + + = + + + + + + x + + + + + + b + + + + + + a + + + + + diff --git a/tests/subsup.tex b/tests/subsup.tex new file mode 100644 --- /dev/null +++ b/tests/subsup.tex @@ -0,0 +1,1 @@ +x_a^b = x^a_b diff --git a/tests/subsup.xhtml b/tests/subsup.xhtml new file mode 100644 --- /dev/null +++ b/tests/subsup.xhtml @@ -0,0 +1,23 @@ + + + + + + + + + + x + a + b + + = + + x + b + a + + + + + diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.6.0.4 +Version: 0.6.0.5 Cabal-Version: >= 1.6 Build-type: Custom Synopsis: Conversion of LaTeX math formulas to MathML or OMML. @@ -59,7 +59,8 @@ tests/sphere_volume.tex, tests/sphere_volume.xhtml, tests/sphere_volume.omml, tests/unicode.tex, tests/unicode.xhtml, tests/unicode.omml, tests/ensuremath.tex, tests/ensuremath.xhtml, tests/ensuremath.omml, - tests/macros.tex, tests/macros.xhtml, tests/macros.omml + tests/macros.tex, tests/macros.xhtml, tests/macros.omml, + tests/subsup.tex, tests/subsup.xhtml, tests/subsup.omml Source-repository head type: git