diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs --- a/Text/TeXMath/Parser.hs +++ b/Text/TeXMath/Parser.hs @@ -392,8 +392,8 @@ identifier = lexeme (P.identifier lexer) operator :: CharParser st String -operator = lexeme $ liftM (:[]) (opLetter texMathDef) - <|> many1 (char '\'') +operator = lexeme $ many1 (char '\'') + <|> liftM (:[]) (opLetter texMathDef) symbol :: String -> CharParser st String symbol = lexeme . P.symbol lexer @@ -459,7 +459,7 @@ symbols :: M.Map String Exp symbols = M.fromList [ ("+", ESymbol Bin "+") - , ("-", ESymbol Bin "-") + , ("-", ESymbol Bin "\x2212") , ("*", ESymbol Bin "*") , (",", ESymbol Pun ",") , (".", ESymbol Pun ".") diff --git a/tests/01.xhtml b/tests/01.xhtml --- a/tests/01.xhtml +++ b/tests/01.xhtml @@ -10,7 +10,7 @@ = - - + − b ± @@ -19,7 +19,7 @@ b 2 - - + − 4 a c diff --git a/tests/02.xhtml b/tests/02.xhtml --- a/tests/02.xhtml +++ b/tests/02.xhtml @@ -15,7 +15,7 @@ ( 3 - - + − x ) @@ -24,7 +24,7 @@ 3 - - + − x diff --git a/tests/04.xhtml b/tests/04.xhtml --- a/tests/04.xhtml +++ b/tests/04.xhtml @@ -15,13 +15,13 @@ S old - - + − ( 5 - - + − T ) diff --git a/tests/05.xhtml b/tests/05.xhtml --- a/tests/05.xhtml +++ b/tests/05.xhtml @@ -41,7 +41,7 @@ ) ( x - - + − y ) diff --git a/tests/07.xhtml b/tests/07.xhtml --- a/tests/07.xhtml +++ b/tests/07.xhtml @@ -7,8 +7,7 @@ u - ʹ - ʹ + ʺ + p ( diff --git a/tests/11.xhtml b/tests/11.xhtml --- a/tests/11.xhtml +++ b/tests/11.xhtml @@ -25,7 +25,7 @@ κ - - + − 11 / 3 diff --git a/tests/12.xhtml b/tests/12.xhtml --- a/tests/12.xhtml +++ b/tests/12.xhtml @@ -19,7 +19,7 @@ 1 - - + − 1 ≤ x @@ -43,7 +43,7 @@ 1 - - + − x 2 diff --git a/tests/binomial_coefficient.xhtml b/tests/binomial_coefficient.xhtml --- a/tests/binomial_coefficient.xhtml +++ b/tests/binomial_coefficient.xhtml @@ -46,7 +46,7 @@ ( n - - + − k ) ! diff --git a/tests/moore_determinant.xhtml b/tests/moore_determinant.xhtml --- a/tests/moore_determinant.xhtml +++ b/tests/moore_determinant.xhtml @@ -36,7 +36,7 @@ q n - - + − 1 @@ -68,7 +68,7 @@ q n - - + − 1 @@ -114,7 +114,7 @@ q n - - + − 1 diff --git a/tests/quadratic_formula.xhtml b/tests/quadratic_formula.xhtml --- a/tests/quadratic_formula.xhtml +++ b/tests/quadratic_formula.xhtml @@ -10,7 +10,7 @@ = - - + − b ± @@ -19,7 +19,7 @@ b 2 - - + − 4 a c diff --git a/tests/schwinger_dyson.xhtml b/tests/schwinger_dyson.xhtml --- a/tests/schwinger_dyson.xhtml +++ b/tests/schwinger_dyson.xhtml @@ -33,7 +33,7 @@ ⟩ = - - + − i ⟨ diff --git a/tests/sophomores_dream.xhtml b/tests/sophomores_dream.xhtml --- a/tests/sophomores_dream.xhtml +++ b/tests/sophomores_dream.xhtml @@ -30,7 +30,7 @@ ( - - + − 1 ) @@ -44,7 +44,7 @@ n - - + − n diff --git a/tests/sphere_volume.xhtml b/tests/sphere_volume.xhtml --- a/tests/sphere_volume.xhtml +++ b/tests/sphere_volume.xhtml @@ -116,7 +116,7 @@ ( - - + − cos θ ) diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.5.0.1 +Version: 0.5.0.2 Cabal-version: >= 1.2 Build-type: Custom Synopsis: Conversion of LaTeX math formulas to MathML. diff --git a/texmath.hs b/texmath.hs --- a/texmath.hs +++ b/texmath.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module Main where import Text.TeXMath @@ -15,9 +16,17 @@ unode "meta" () , unode "body" x ] +getUTF8Contents :: IO String +getUTF8Contents = +#if MIN_VERSION_base(4,2,0) + hSetEncoding stdin utf8 >> hGetContents stdin +#else + hGetContents stdin +#endif + main :: IO () main = do - inp <- getContents + inp <- getUTF8Contents let (ms, rest) = parseMacroDefinitions inp case (texMathToMathML DisplayBlock $! applyMacros ms rest) of Left err -> hPutStrLn stderr err