diff --git a/Text/TeXMath/MathMLWriter.hs b/Text/TeXMath/MathMLWriter.hs
--- a/Text/TeXMath/MathMLWriter.hs
+++ b/Text/TeXMath/MathMLWriter.hs
@@ -134,8 +134,7 @@
showExp :: Exp -> Element
showExp e =
case e of
- EInteger x -> unode "mn" $ show x
- EFloat x -> unode "mn" $ show x
+ ENumber x -> unode "mn" x
EGrouped [x] -> showExp x
EGrouped xs -> mrow $ map showExp xs
EIdentifier x -> unode "mi" x
diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs
--- a/Text/TeXMath/Parser.hs
+++ b/Text/TeXMath/Parser.hs
@@ -38,8 +38,7 @@
type ArrayLine = [[Exp]]
data Exp =
- EInteger Integer
- | EFloat Double
+ ENumber String
| EGrouped [Exp]
| EIdentifier String
| ESymbol TeXSymbolType String
@@ -65,9 +64,9 @@
, commentLine = "%"
, nestedComments = False
, identStart = letter
- , identLetter = alphaNum
+ , identLetter = letter
, opStart = opLetter texMathDef
- , opLetter = oneOf ":_+/=^-(),;.?'~[]<>!"
+ , opLetter = oneOf ":_+*/=^-(),;.?'~[]<>!"
, reservedOpNames= []
, reservedNames = []
, caseSensitive = True
@@ -108,8 +107,7 @@
inbrackets = liftM EGrouped (brackets $ many $ notFollowedBy (char ']') >> expr)
number :: GenParser Char st Exp
-number = try (liftM EFloat float)
- <|> liftM EInteger decimal
+number = lexeme $ liftM ENumber $ many1 digit
enclosure :: GenParser Char st Exp
enclosure = basicEnclosure <|> leftright <|> scaledEnclosure
@@ -316,12 +314,6 @@
operator = lexeme $ liftM (:[]) (opLetter texMathDef)
<|> many1 (char '\'')
-decimal :: CharParser st Integer
-decimal = lexeme (P.decimal lexer)
-
-float :: CharParser st Double
-float = lexeme (P.float lexer)
-
symbol :: String -> CharParser st String
symbol = lexeme . P.symbol lexer
@@ -375,6 +367,7 @@
symbols = M.fromList [
("+", ESymbol Bin "+")
, ("-", ESymbol Bin "-")
+ , ("*", ESymbol Bin "*")
, (",", ESymbol Pun ",")
, (".", ESymbol Pun ".")
, (";", ESymbol Pun ";")
diff --git a/cgi/texmath.xhtml b/cgi/texmath.xhtml
--- a/cgi/texmath.xhtml
+++ b/cgi/texmath.xhtml
@@ -9,7 +9,7 @@
pre#xml { font-size: small; color: blue; }
]]>
-
+