diff --git a/Text/TeXMath/OMML.hs b/Text/TeXMath/OMML.hs
--- a/Text/TeXMath/OMML.hs
+++ b/Text/TeXMath/OMML.hs
@@ -228,7 +228,6 @@
mnode "nary" [ mnode "naryPr"
[ mnodeA "chr" s ()
, mnodeA "limLoc" t ()
- , mnode "grow" ()
, mnodeA "supHide"
(if y == EGrouped [] then "on" else "off") ()
, mnodeA "supHide"
diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs
--- a/Text/TeXMath/Parser.hs
+++ b/Text/TeXMath/Parser.hs
@@ -61,6 +61,7 @@
, unary
, binary
, enclosure
+ , bareSubSup
, environment
, diacritical
, escaped
@@ -87,6 +88,10 @@
a <- expr1
limits <- limitsIndicator
subSup limits a <|> superOrSubscripted limits a <|> return a
+
+bareSubSup :: TP Exp
+bareSubSup = subSup Nothing (EIdentifier "")
+ <|> superOrSubscripted Nothing (EIdentifier "")
limitsIndicator :: TP (Maybe Bool)
limitsIndicator =
diff --git a/cgi/texmath-cgi.hs b/cgi/texmath-cgi.hs
--- a/cgi/texmath-cgi.hs
+++ b/cgi/texmath-cgi.hs
@@ -6,7 +6,7 @@
import Data.Maybe (fromMaybe)
import Control.Monad
import Text.JSON
-import Codec.Binary.UTF8.String (decodeString)
+import Codec.Binary.UTF8.String (decodeString, encodeString)
cgiMain :: CGI CGIResult
cgiMain = do
@@ -19,7 +19,7 @@
Left e -> toJSObject [("success", JSBool False)
, ("error", JSString $ toJSString e)]
Right v -> toJSObject [("success", JSBool True)
- , ("mathml", JSString $ toJSString $
+ , ("mathml", JSString $ toJSString $ encodeString $
ppElement v)]
main :: IO ()
diff --git a/tests/05.omml b/tests/05.omml
--- a/tests/05.omml
+++ b/tests/05.omml
@@ -8,7 +8,6 @@
-
@@ -30,7 +29,6 @@
-
@@ -97,7 +95,6 @@
-
diff --git a/tests/06.omml b/tests/06.omml
--- a/tests/06.omml
+++ b/tests/06.omml
@@ -8,7 +8,6 @@
-
@@ -17,7 +16,6 @@
-
diff --git a/tests/10.omml b/tests/10.omml
--- a/tests/10.omml
+++ b/tests/10.omml
@@ -83,7 +83,6 @@
-
diff --git a/tests/13.omml b/tests/13.omml
--- a/tests/13.omml
+++ b/tests/13.omml
@@ -135,7 +135,6 @@
-
diff --git a/tests/deMorgans_law.omml b/tests/deMorgans_law.omml
--- a/tests/deMorgans_law.omml
+++ b/tests/deMorgans_law.omml
@@ -77,7 +77,6 @@
-
@@ -128,7 +127,6 @@
-
diff --git a/tests/sophomores_dream.omml b/tests/sophomores_dream.omml
--- a/tests/sophomores_dream.omml
+++ b/tests/sophomores_dream.omml
@@ -8,7 +8,6 @@
-
@@ -63,7 +62,6 @@
-
diff --git a/tests/sphere_volume.omml b/tests/sphere_volume.omml
--- a/tests/sphere_volume.omml
+++ b/tests/sphere_volume.omml
@@ -150,7 +150,6 @@
-
@@ -242,7 +241,6 @@
-
@@ -282,7 +280,6 @@
-
@@ -332,7 +329,6 @@
-
diff --git a/tests/subsup.omml b/tests/subsup.omml
--- a/tests/subsup.omml
+++ b/tests/subsup.omml
@@ -24,6 +24,10 @@
+
+
+
+
@@ -44,6 +48,10 @@
+
+
+
+
@@ -60,6 +68,10 @@
+
+
+
+
@@ -76,6 +88,10 @@
+
+
+
+
@@ -92,6 +108,10 @@
+
+
+
+
@@ -108,6 +128,10 @@
+
+
+
+
@@ -124,6 +148,10 @@
+
+
+
+
@@ -145,6 +173,10 @@
+
+
+
+
@@ -166,6 +198,10 @@
+
+
+
+
@@ -193,6 +229,10 @@
+
+
+
+
@@ -224,6 +264,10 @@
+
+
+
+
@@ -253,6 +297,10 @@
+
+
+
+
@@ -285,6 +333,10 @@
+
+
+
+
@@ -317,5 +369,65 @@
+
+
+
+
+
+
+
+
+
+
+ H
+
+
+
+
+
+ e
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+ x
+
+
+
+
+
+ A
+
+
+
+
+
+
+
+
+
+
+
+ x
+
+
+
+
+
+ 3
+
+
+
diff --git a/tests/subsup.tex b/tests/subsup.tex
--- a/tests/subsup.tex
+++ b/tests/subsup.tex
@@ -1,4 +1,17 @@
- 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}
+ x^a_b\quad
+ x_b^a\quad
+ \min_A\quad
+ \max_B\quad
+ \det_C\quad
+ \Pr_A\quad
+ \gcd_A\quad
+ \dot{u}^2\quad
+ \overline{u}_\varepsilon\quad
+ \underline{u}^a_b\quad
+ \overbrace{a+b}^{\text{term}}\quad
+ \overbracket{a+b}^{c}\quad
+ \underbrace{a+b}_{c}\quad
+ \underbracket{a+b}_{c}\quad
+ ^He3\quad
+ _xA\quad
+ _x^3
diff --git a/tests/subsup.xhtml b/tests/subsup.xhtml
--- a/tests/subsup.xhtml
+++ b/tests/subsup.xhtml
@@ -11,31 +11,38 @@
b
a
+
x
b
a
+
min
A
+
max
B
+
det
C
+
Pr
A
+
gcd
A
+
u
@@ -43,6 +50,7 @@
2
+
u
@@ -50,6 +58,7 @@
ɛ
+
u
@@ -58,6 +67,7 @@
b
a
+
@@ -69,6 +79,7 @@
term
+
@@ -80,6 +91,7 @@
c
+
@@ -91,6 +103,7 @@
c
+
@@ -102,6 +115,22 @@
c
+
+
+ H
+
+ e
+ 3
+
+
+ x
+
+ A
+
+
+ x
+ 3
+
diff --git a/texmath.cabal b/texmath.cabal
--- a/texmath.cabal
+++ b/texmath.cabal
@@ -1,5 +1,5 @@
Name: texmath
-Version: 0.6.1.5
+Version: 0.6.3
Cabal-Version: >= 1.6
Build-type: Custom
Synopsis: Conversion of LaTeX math formulas to MathML or OMML.