diff --git a/Text/TeXMath/MathML.hs b/Text/TeXMath/MathML.hs --- a/Text/TeXMath/MathML.hs +++ b/Text/TeXMath/MathML.hs @@ -83,7 +83,7 @@ , ("\\dfrac", withAttribute "displaystyle" "true" . unode "mstyle" . unode "mfrac") , ("\\sqrt", unode "mroot") - , ("\\stackrel", unode "mover") + , ("\\stackrel", unode "mover" . reverse) , ("\\overset", unode "mover") , ("\\underset", unode "munder") , ("\\binom", showBinom) diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs --- a/Text/TeXMath/Parser.hs +++ b/Text/TeXMath/Parser.hs @@ -246,18 +246,25 @@ isConvertible :: Exp -> Bool isConvertible (EMathOperator x) = x `elem` convertibleOps - where convertibleOps = ["lim","liminf","limsup","inf","sup"] + where convertibleOps = [ "lim","liminf","limsup","inf","sup" + , "min","max","Pr","det","gcd" + ] isConvertible (ESymbol Rel _) = True isConvertible (ESymbol Bin _) = True -isConvertible (EUnder _ _) = True -isConvertible (EOver _ _) = True -isConvertible (EUnderover _ _ _) = True isConvertible (ESymbol Op x) = x `elem` convertibleSyms where convertibleSyms = ["\x2211","\x220F","\x22C2", "\x22C3","\x22C0","\x22C1","\x2A05","\x2A06", "\x2210","\x2A01","\x2A02","\x2A00","\x2A04"] isConvertible _ = False +-- check if sub/superscripts should always be under and over the expression +isUnderover :: Exp -> Bool +isUnderover (EOver _ (ESymbol Accent "\xFE37")) = True -- \overbrace +isUnderover (EOver _ (ESymbol Accent "\x23B4")) = True -- \overbracket +isUnderover (EUnder _ (ESymbol Accent "\xFE38")) = True -- \underbrace +isUnderover (EUnder _ (ESymbol Accent "\x23B5")) = True -- \underbracket +isUnderover _ = False + subSup :: Maybe Bool -> Exp -> TP Exp subSup limits a = try $ do let sub1 = symbol "_" >> expr1 @@ -267,6 +274,7 @@ return $ case limits of Just True -> EUnderover a b c Nothing | isConvertible a -> EDownup a b c + | isUnderover a -> EUnderover a b c _ -> ESubsup a b c superOrSubscripted :: Maybe Bool -> Exp -> TP Exp @@ -278,10 +286,12 @@ '^' -> return $ case limits of Just True -> EOver a b Nothing | isConvertible a -> EUp a b + | isUnderover a -> EOver a b _ -> ESuper a b '_' -> return $ case limits of Just True -> EUnder a b Nothing | isConvertible a -> EDown a b + | isUnderover a -> EUnder a b _ -> ESub a b _ -> pzero @@ -531,8 +541,8 @@ , ("\\nu", EIdentifier "\x03BD") , ("\\omega", EIdentifier "\x03C9") , ("\\Omega", ESymbol Op "\x03A9") - , ("\\phi", EIdentifier "\x03C6") - , ("\\varphi", EIdentifier "\x03D5") + , ("\\phi", EIdentifier "\x03D5") + , ("\\varphi", EIdentifier "\x03C6") , ("\\Phi", ESymbol Op "\x03A6") , ("\\pi", EIdentifier "\x03C0") , ("\\Pi", ESymbol Op "\x03A0") diff --git a/tests/10.omml b/tests/10.omml --- a/tests/10.omml +++ b/tests/10.omml @@ -8,7 +8,7 @@ - φ + ϕ diff --git a/tests/10.xhtml b/tests/10.xhtml --- a/tests/10.xhtml +++ b/tests/10.xhtml @@ -7,7 +7,7 @@ - φ + ϕ n ( diff --git a/tests/11.omml b/tests/11.omml --- a/tests/11.omml +++ b/tests/11.omml @@ -8,7 +8,7 @@ - φ + ϕ diff --git a/tests/11.xhtml b/tests/11.xhtml --- a/tests/11.xhtml +++ b/tests/11.xhtml @@ -7,7 +7,7 @@ - φ + ϕ n ( diff --git a/tests/differentiable_manifold.omml b/tests/differentiable_manifold.omml --- a/tests/differentiable_manifold.omml +++ b/tests/differentiable_manifold.omml @@ -177,7 +177,7 @@ - φ + ϕ @@ -267,7 +267,7 @@ - φ + ϕ diff --git a/tests/differentiable_manifold.xhtml b/tests/differentiable_manifold.xhtml --- a/tests/differentiable_manifold.xhtml +++ b/tests/differentiable_manifold.xhtml @@ -56,7 +56,7 @@ t - φ + ϕ ∘ γ @@ -84,7 +84,7 @@ t - φ + ϕ ∘ γ diff --git a/tests/schwinger_dyson.omml b/tests/schwinger_dyson.omml --- a/tests/schwinger_dyson.omml +++ b/tests/schwinger_dyson.omml @@ -50,7 +50,7 @@ - φ + ϕ @@ -64,7 +64,7 @@ - φ + ϕ @@ -133,7 +133,7 @@ - φ + ϕ @@ -156,7 +156,7 @@ - φ + ϕ @@ -170,7 +170,7 @@ - φ + ϕ diff --git a/tests/schwinger_dyson.xhtml b/tests/schwinger_dyson.xhtml --- a/tests/schwinger_dyson.xhtml +++ b/tests/schwinger_dyson.xhtml @@ -18,12 +18,12 @@ δ δ - φ + ϕ F [ - φ + ϕ ] } @@ -45,18 +45,18 @@ { F [ - φ + ϕ ] δ δ - φ + ϕ S [ - φ + ϕ ] } diff --git a/tests/sphere_volume.omml b/tests/sphere_volume.omml --- a/tests/sphere_volume.omml +++ b/tests/sphere_volume.omml @@ -26,7 +26,7 @@ - φ + ϕ @@ -225,7 +225,7 @@ - φ + ϕ @@ -270,7 +270,7 @@ - φ + ϕ @@ -381,7 +381,7 @@ - φ + ϕ diff --git a/tests/sphere_volume.xhtml b/tests/sphere_volume.xhtml --- a/tests/sphere_volume.xhtml +++ b/tests/sphere_volume.xhtml @@ -11,7 +11,7 @@ { 0 ≤ - φ + ϕ ≤ 2 π @@ -56,7 +56,7 @@ θ d - φ + ϕ @@ -73,7 +73,7 @@ d - φ + ϕ ∫ @@ -105,7 +105,7 @@ = - φ + ϕ ∣ 0 diff --git a/tests/stackrel.omml b/tests/stackrel.omml new file mode 100644 --- /dev/null +++ b/tests/stackrel.omml @@ -0,0 +1,40 @@ + + + + + + + + + + + u + + + + + + n + + + + + + + + w + + + + + + → + + + + + + u + + + diff --git a/tests/stackrel.tex b/tests/stackrel.tex new file mode 100644 --- /dev/null +++ b/tests/stackrel.tex @@ -0,0 +1,2 @@ +u_n \stackrel{w}{\to} u + diff --git a/tests/stackrel.xhtml b/tests/stackrel.xhtml new file mode 100644 --- /dev/null +++ b/tests/stackrel.xhtml @@ -0,0 +1,21 @@ + + + + + + + + + + u + n + + + → + w + + u + + + + diff --git a/tests/subsup.omml b/tests/subsup.omml --- a/tests/subsup.omml +++ b/tests/subsup.omml @@ -14,20 +14,16 @@ - a + b - b + a - - - = - @@ -48,5 +44,268 @@ + + + + + min + + + + + + A + + + + + + + + max + + + + + + B + + + + + + + + det + + + + + + C + + + + + + + + Pr + + + + + + A + + + + + + + + gcd + + + + + + A + + + + + + + + + + + + + u + + + + + + + + 2 + + + + + + + + + + + + + u + + + + + + + + ɛ + + + + + + + + + + + + + u + + + + + + + + b + + + + + + a + + + + + + + + + + + + + a + + + + + + + + + b + + + + + + + + + + term + + + + + + + + + + + + + a + + + + + + + + + b + + + + + + + + c + + + + + + + + + + a + + + + + + + + + b + + + + + + ︸ + + + + + + + + c + + + + + + + + + + a + + + + + + + + + b + + + + + + ⎵ + + + + + + + + c + + + diff --git a/tests/subsup.tex b/tests/subsup.tex --- a/tests/subsup.tex +++ b/tests/subsup.tex @@ -1,1 +1,4 @@ -x_a^b = x^a_b + x^a_b x_b^a \min_A \max_B \det_C \Pr_A \gcd_A + \dot{u}^2 \overline{u}_\varepsilon \underline{u}^a_b + \overbrace{a+b}^{\text{term}} \overbracket{a+b}^{c} + \underbrace{a+b}_{c} \underbracket{a+b}_{c} diff --git a/tests/subsup.xhtml b/tests/subsup.xhtml --- a/tests/subsup.xhtml +++ b/tests/subsup.xhtml @@ -8,15 +8,100 @@ x - a b + a - = x b a + + min + A + + + max + B + + + det + C + + + Pr + A + + + gcd + A + + + + u + . + + 2 + + + + u + ¯ + + ɛ + + + + u + ¯ + + b + a + + + + + a + + + b + + ︷ + + term + + + + + a + + + b + + ⎴ + + c + + + + + a + + + b + + ︸ + + c + + + + + a + + + b + + ⎵ + + c + diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.6.0.5 +Version: 0.6.0.6 Cabal-Version: >= 1.6 Build-type: Custom Synopsis: Conversion of LaTeX math formulas to MathML or OMML. @@ -60,7 +60,8 @@ 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/subsup.tex, tests/subsup.xhtml, tests/subsup.omml + tests/subsup.tex, tests/subsup.xhtml, tests/subsup.omml, + tests/stackrel.tex, tests/stackrel.xhtml, tests/stackrel.omml Source-repository head type: git