+
+
diff --git a/src/Text/TeXMath/Readers/OMML.hs b/src/Text/TeXMath/Readers/OMML.hs
--- a/src/Text/TeXMath/Readers/OMML.hs
+++ b/src/Text/TeXMath/Readers/OMML.hs
@@ -250,15 +250,16 @@
elemToBase
return $ [EOver False baseExp (ESymbol Accent chr')]
elemToExps' element | isElem "m" "bar" element = do
- pos <- filterChildName (hasElemName "m" "barPr") element >>=
+ let pos = filterChildName (hasElemName "m" "barPr") element >>=
filterChildName (hasElemName "m" "pos") >>=
findAttrBy (hasElemName "m" "val")
baseExp <- filterChildName (hasElemName "m" "e") element >>=
elemToBase
+ -- According to OMML Specification, the default value of pos (whether it exists or not) is "bot"
+ -- see https://github.com/jgm/texmath/issues/187
case pos of
- "top" -> Just [EOver False baseExp (ESymbol TOver "\773")]
- "bot" -> Just [EUnder False baseExp (ESymbol TUnder "\818")]
- _ -> Nothing
+ Just "top" -> Just [EOver False baseExp (ESymbol TOver "\773")]
+ _ -> Just [EUnder False baseExp (ESymbol TUnder "\818")]
elemToExps' element | isElem "m" "box" element = do
baseExp <- filterChildName (hasElemName "m" "e") element >>=
elemToBase
@@ -299,9 +300,14 @@
elemToExps' element | isElem "m" "f" element = do
num <- filterChildName (hasElemName "m" "num") element
den <- filterChildName (hasElemName "m" "den") element
+ let barType = filterChildName (hasElemName "m" "fPr") element >>=
+ filterChildName (hasElemName "m" "type") >>=
+ findAttrBy (hasElemName "m" "val")
let numExp = EGrouped $ concat $ mapMaybe (elemToExps) (elChildren num)
denExp = EGrouped $ concat $ mapMaybe (elemToExps) (elChildren den)
- return $ [EFraction NormalFrac numExp denExp]
+ case barType of
+ Just "noBar" -> Just [EFraction NoLineFrac numExp denExp]
+ _ -> Just [EFraction NormalFrac numExp denExp]
elemToExps' element | isElem "m" "func" element = do
fName <- filterChildName (hasElemName "m" "fName") element
baseExp <- filterChildName (hasElemName "m" "e") element >>=
diff --git a/src/Text/TeXMath/Readers/TeX.hs b/src/Text/TeXMath/Readers/TeX.hs
--- a/src/Text/TeXMath/Readers/TeX.hs
+++ b/src/Text/TeXMath/Readers/TeX.hs
@@ -213,37 +213,34 @@
ctrlseq "operatorname"
-- these are slightly different but we won't worry about that here...
convertible <- (char '*' >> spaces >> return True) <|> return False
- op <- expToOperatorName <$> texToken
- maybe mzero (\s -> return (EMathOperator s, convertible)) op
+ tok' <- texToken
+ tok'' <- (EMathOperator <$> (expToOperatorName tok'))
+ <|> return (EStyled TextNormal [tok'])
+ return (tok'', convertible)
-- | Converts identifiers, symbols and numbers to a flat string.
--- Returns Nothing if the expression contains anything else.
-expToOperatorName :: Exp -> Maybe Text
+-- Fails if the expression contains anything else.
+expToOperatorName :: MonadPlus m => Exp -> m Text
expToOperatorName e = case e of
- EGrouped xs -> T.concat <$> mapM fl xs
- _ -> fl e
- where fl f = case f of
- EIdentifier s -> Just s
- -- handle special characters
- ESymbol _ "\x2212" -> Just "-"
- ESymbol _ "\x2032" -> Just "'"
- ESymbol _ "\x2033" -> Just "''"
- ESymbol _ "\x2034" -> Just "'''"
- ESymbol _ "\x2057" -> Just "''''"
- ESymbol _ "\x02B9" -> Just "'"
- ESymbol _ s -> Just s
- ENumber s -> Just s
- EStyled sty xs -> T.concat <$> sequence (map (toStr sty) xs)
- _ -> Nothing
- toStr sty (EIdentifier s) = Just $ toUnicode sty s
- toStr _ (EText sty' s) = Just $ toUnicode sty' s
- toStr sty (ENumber s) = Just $ toUnicode sty s
- toStr sty (EMathOperator s) = Just $ toUnicode sty s
- toStr sty (ESymbol _ s) = Just $ toUnicode sty s
- toStr _ (ESpace n) = Just $ getSpaceChars n
- toStr _ (EStyled sty' exps) = T.concat <$>
+ EGrouped xs -> T.concat <$> mapM (toStr TextNormal) xs
+ _ -> toStr TextNormal e
+ where
+ toStr sty (EIdentifier s) = return $ toUnicode sty s
+ toStr _ (EText sty' s) = return $ toUnicode sty' s
+ toStr sty (ENumber s) = return $ toUnicode sty s
+ toStr sty (EMathOperator s) = return $ toUnicode sty s
+ -- handle special characters
+ toStr _ (ESymbol _ "\x2212") = return "-"
+ toStr _ (ESymbol _ "\x2032") = return "'"
+ toStr _ (ESymbol _ "\x2033") = return "''"
+ toStr _ (ESymbol _ "\x2034") = return "'''"
+ toStr _ (ESymbol _ "\x2057") = return "''''"
+ toStr _ (ESymbol _ "\x02B9") = return "'"
+ toStr sty (ESymbol _ s) = return $ toUnicode sty s
+ toStr _ (ESpace n) = return $ getSpaceChars n
+ toStr _ (EStyled sty' exps) = T.concat <$>
sequence (map (toStr sty') exps)
- toStr _ _ = Nothing
+ toStr _ _ = mzero
bareSubSup :: TP Exp
bareSubSup = subSup Nothing False (EIdentifier "")
diff --git a/src/Text/TeXMath/Readers/TeX/Commands.hs b/src/Text/TeXMath/Readers/TeX/Commands.hs
--- a/src/Text/TeXMath/Readers/TeX/Commands.hs
+++ b/src/Text/TeXMath/Readers/TeX/Commands.hs
@@ -292,10 +292,22 @@
, ("\\unrhd",ESymbol Bin "\8885")
, ("\\upUpsilon",ESymbol Alpha "\978")
, ("\\upsilon",EIdentifier "\965")
+ , ("\\varDelta",EIdentifier "\120549")
+ , ("\\varGamma",EIdentifier "\120548")
+ , ("\\varLambda",EIdentifier "\120556")
+ , ("\\varOmega",EIdentifier "\120570")
+ , ("\\varPhi",EIdentifier "\120567")
+ , ("\\varPi",EIdentifier "\120561")
+ , ("\\varPsi",EIdentifier "\120569")
+ , ("\\varSigma",EIdentifier "\120564")
+ , ("\\varTheta",EIdentifier "\120553")
+ , ("\\varUpsilon",EIdentifier "\120566")
+ , ("\\varXi",EIdentifier "\120559")
, ("\\varepsilon",EIdentifier "\949")
, ("\\varnothing",ESymbol Ord "\8960")
, ("\\varphi",EIdentifier "\966")
, ("\\varrho",ESymbol Alpha "\120602")
+ , ("\\varsigma",ESymbol Alpha "\120589")
, ("\\vartheta",EIdentifier "\977")
, ("\\vdots",ESymbol Ord "\8942")
, ("\\vec",ESymbol Accent "\8407")
diff --git a/src/Text/TeXMath/Writers/OMML.hs b/src/Text/TeXMath/Writers/OMML.hs
--- a/src/Text/TeXMath/Writers/OMML.hs
+++ b/src/Text/TeXMath/Writers/OMML.hs
@@ -37,6 +37,7 @@
writeOMML dt = container . concatMap (showExp [])
. everywhere (mkT $ handleDownup dt)
. everywhere (mkT $ handleDownup' dt)
+ . everywhere (mkT $ handleScaledDelims)
where container = case dt of
DisplayBlock -> \x -> mnode "oMathPara"
[ mnode "oMathParaPr"
@@ -123,6 +124,18 @@
TextSansSerifBoldItalic -> [sty "bi", scr "sans-serif"]
where sty x = mnodeA "sty" x ()
scr x = mnodeA "scr" x ()
+
+handleScaledDelims :: [Exp] -> [Exp]
+handleScaledDelims (x@(EScaled scale (ESymbol Open op)) : xs) =
+ case break isCloser xs of
+ (ys, EScaled scale' (ESymbol Close cl) : zs) | scale' == scale ->
+ EDelimited op cl (map Right ys) : zs
+ _ -> x:xs
+ where
+ isCloser (EScaled _ (ESymbol Close _)) = True
+ isCloser _ = False
+handleScaledDelims xs = xs
+
handleDownup :: DisplayType -> [Exp] -> [Exp]
handleDownup dt (exp' : xs) =
diff --git a/test/reader/mml/00000_C0_Controls_and_Basic_Latin.test b/test/reader/mml/00000_C0_Controls_and_Basic_Latin.test
new file mode 100644
--- /dev/null
+++ b/test/reader/mml/00000_C0_Controls_and_Basic_Latin.test
@@ -0,0 +1,680 @@
+<<< mml
+
+
+