diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,24 @@
+texmath (0.13.1)
+
+ * MathML writer: Keep mathvariant attribute in addition to finding
+ unicode substitutes (#280). Previously, renderers didn't support
+ mathvariant consistently, so we omitted this attribute. Tested in
+ Safari, Firefox, and Chrome.
+
+ * OMML writer: properly handle bold/italics on identifiers (#280).
+ Identifiers marked as bold need to be marked as bold-italic.
+ Special exception for uppercase Greek.
+
+ * MathML writer: fix handling of italic (#280).
+
+ * OMML reader: handle w:ins elements in math (#278).
+ Previously we skipped these, which meant that content
+ would disappear.
+
+ * TeX reader: handle space commands in `\text{..}` (#277).
+
+ * TeX reader: Allow text operators to take an unbracketed argument (#276).
+
texmath (0.13.0.2)
* Escape ; in typst output (#275).
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
@@ -95,6 +95,7 @@
data OMathRunElem = TextRun T.Text
| LnBrk
| Tab
+ | Inserted [OMathRunElem]
deriving Show
data OMathRunTextStyle = NoStyle
@@ -165,6 +166,7 @@
| isElem "w" "br" element = Just LnBrk
| isElem "w" "tab" element = Just Tab
| isElem "w" "sym" element = Just $ TextRun $ getSymChar element
+ | isElem "w" "ins" element = Just $ Inserted $ mapMaybe elemToOMathRunElem (elChildren element)
| otherwise = Nothing
elemToOMathRunElems :: Element -> Maybe [OMathRunElem]
@@ -180,6 +182,7 @@
oMathRunElemToText (TextRun s) = s
oMathRunElemToText (LnBrk) = "\n"
oMathRunElemToText (Tab) = "\t"
+oMathRunElemToText (Inserted es) = mconcat $ map oMathRunElemToText es
oMathRunElemsToText :: [OMathRunElem] -> T.Text
oMathRunElemsToText = T.concat . map oMathRunElemToText
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
@@ -662,14 +662,35 @@
"\\xcancel" -> ECancel XSlash <$> texToken
_ -> mzero
+textContents :: (Text -> Exp) -> TP [Exp]
+textContents op = char '{' *> manyTill chunk (char '}')
+ where
+ chunk = (op . T.concat <$> many1 textual)
+ <|> textSpaceCommand
+ <|> (char '{' *> (asGroup <$> manyTill chunk (char '}')))
+ <|> innermath
+
+textSpaceCommand :: TP Exp
+textSpaceCommand = try $ do
+ char '\\'
+ choice
+ [ ESpace (2 % 9) <$ char ' '
+ , ESpace ((-1) % 6) <$ char '!'
+ , ESpace (1 % 6) <$ char ','
+ , ESpace (2 % 9) <$ char ':'
+ , ESpace (5 % 18) <$ char ';'
+ , ESpace (2 % 9) <$ char '>'
+ ]
+
text :: Text -> TP Exp
text c = do
op <- maybe mzero return $ M.lookup c textOps
- char '{'
- let chunk = ((op . T.concat) <$> many1 textual)
- <|> (char '{' *> (asGroup <$> manyTill chunk (char '}')))
- <|> innermath
- contents <- manyTill chunk (char '}')
+ contents <- textContents op -- braced
+ <|> ((:[]) <$> -- nonbraced token
+ ( (op <$> textCommand)
+ <|> textSpaceCommand
+ <|> (op . T.singleton <$> noneOf "\n\t\r \\{}")
+ ))
spaces
case contents of
[] -> return (op "")
diff --git a/src/Text/TeXMath/Writers/MathML.hs b/src/Text/TeXMath/Writers/MathML.hs
--- a/src/Text/TeXMath/Writers/MathML.hs
+++ b/src/Text/TeXMath/Writers/MathML.hs
@@ -26,8 +26,8 @@
import Text.XML.Light
import Text.TeXMath.Types
-import Text.TeXMath.Unicode.ToUnicode
import Data.Generics (everywhere, mkT)
+import Text.TeXMath.Unicode.ToUnicode (toUnicode)
import Text.TeXMath.Shared (getMMLType, handleDownup,
isUppercaseGreek, isRLSequence)
import Text.TeXMath.Readers.MathML.MMLDict (getMathMLOperator)
@@ -80,7 +80,7 @@
fromForm FPrefix = "prefix"
makeScaled :: Rational -> Element -> Element
-makeScaled x = withAttribute "minsize" p . withAttribute "maxsize" p
+makeScaled x = withAttribute "minsize" p . withAttribute "maxsize" p
. setAttribute "stretchy" "true"
where p = T.pack $ printf "%d%%" (round (100*x) :: Int)
@@ -94,7 +94,6 @@
Just (_, '.') -> T.snoc x '0'
_ -> x
--- Note: Converts strings to unicode directly, as few renderers support those mathvariants.
makeText :: TextType -> T.Text -> Element
makeText a s = case (leadingSp, trailingSp) of
(False, False) -> s'
@@ -102,14 +101,15 @@
(False, True) -> mrow [s', sp]
(True, True) -> mrow [sp, s', sp]
where sp = spaceWidth (1/3)
- s' = withAttribute "mathvariant" attr $ tunode "mtext" $ toUnicode a s
+ s' = withAttribute "mathvariant" (getMMLType a) $
+ -- use Unicode characters as few browsers support the mathvariants
+ tunode "mtext" $ toUnicode a s
trailingSp = case T.unsnoc s of
Just (_, c) -> T.any (== c) " \t"
_ -> False
leadingSp = case T.uncons s of
Just (c, _) -> T.any (== c) " \t"
_ -> False
- attr = getMMLType a
makeArray :: Maybe TextType -> [Alignment] -> [ArrayLine] -> Element
makeArray tt as ls = unode "mtable" $
@@ -144,11 +144,11 @@
newAttr = Attr (unqual a) (T.unpack v)
update [] = [newAttr]
update (x:xs)
- | qName (attrKey x) == a =
+ | qName (attrKey x) == a =
newAttr : xs
- | otherwise =
+ | otherwise =
x : update xs
-
+
accent :: T.Text -> Element
accent = add_attr (Attr (unqual "accent") "true") .
tunode "mo"
@@ -187,10 +187,7 @@
showExp :: Maybe TextType -> Exp -> Element
showExp tt e =
- let toUnicodeMaybe :: TextType -> T.Text -> Maybe T.Text
- toUnicodeMaybe textStyle t =
- T.pack <$> mapM (toUnicodeChar . (textStyle,)) (T.unpack t)
- -- variant node: tries to convert text to appropriate unicode
+ let -- variant node: tries to convert text to appropriate unicode
-- characters depending on style
vnode :: String -> T.Text -> Element
vnode elname t
@@ -201,12 +198,17 @@
else tunode elname t
Just TextNormal -> withAttribute "mathvariant" "normal" $
tunode elname t
- Just textStyle ->
- case toUnicodeMaybe textStyle t of
- -- if we can't find unicode equivalents, rely on mathvariant:
- Nothing -> withAttribute "mathvariant" (getMMLType textStyle) $
- tunode elname t
- Just t' -> tunode elname t'
+ Just TextBold
+ | elname == "mi" && not (isUppercaseGreek t) -- #255, #280
+ -> withAttribute "mathvariant" "bold-italic" $
+ tunode elname (toUnicode TextBoldItalic t)
+ | otherwise
+ -> withAttribute "mathvariant" "bold" $
+ tunode elname (toUnicode TextBold t)
+ Just textStyle -> withAttribute "mathvariant" (getMMLType textStyle) $
+ -- we use unicode chars because browsers don't
+ -- completely support mathvariant:
+ tunode elname (toUnicode textStyle t)
in case e of
ENumber x -> vnode "mn" x
EGrouped [x] -> showExp tt x
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
@@ -233,6 +233,10 @@
EIdentifier x
| isUppercaseGreek x
, null props -> [str [mnodeA "sty" "p" ()] x]
+ | not (isUppercaseGreek x)
+ , [Element{ elName = QName "sty" _ _
+ , elAttribs = [Attr (QName "val" Nothing (Just "m")) "b"] }] <- props
+ -> [str [mnodeA "sty" "bi" ()] x] -- #280
| otherwise -> [str props x]
EMathOperator x -> [str (mnodeA "sty" "p" () : props) x]
ESymbol ty xs
diff --git a/test/regression/276.test b/test/regression/276.test
new file mode 100644
--- /dev/null
+++ b/test/regression/276.test
@@ -0,0 +1,9 @@
+<<< tex
+x = y\text.x
+>>> native
+[ EIdentifier "x"
+, ESymbol Rel "="
+, EIdentifier "y"
+, EText TextNormal "."
+, EIdentifier "x"
+]
diff --git a/test/regression/277.test b/test/regression/277.test
new file mode 100644
--- /dev/null
+++ b/test/regression/277.test
@@ -0,0 +1,4 @@
+<<< tex
+\text{\:\;}
+>>> native
+[ ESpace (2 % 9) , ESpace (5 % 18) ]
diff --git a/test/regression/278.test b/test/regression/278.test
new file mode 100644
--- /dev/null
+++ b/test/regression/278.test
@@ -0,0 +1,4 @@
+<<< omml
+โF/F0
+>>> tex
+\mathrm{\Delta}F/F_{0}
diff --git a/test/regression/280.test b/test/regression/280.test
new file mode 100644
--- /dev/null
+++ b/test/regression/280.test
@@ -0,0 +1,13 @@
+<<< tex
+\boldsymbol{\Gamma + b + \alpha}
+>>> mml
+
+
diff --git a/test/regression/280b.test b/test/regression/280b.test
new file mode 100644
--- /dev/null
+++ b/test/regression/280b.test
@@ -0,0 +1,41 @@
+<<< tex
+\boldsymbol{\Gamma + b + \alpha}
+>>> omml
+
+
+
+
+
+
+
+
+
+
+ ฮ
+
+
+
+
+
+ +
+
+
+
+
+
+ b
+
+
+
+
+
+ +
+
+
+
+
+
+ ฮฑ
+
+
+
diff --git a/test/writer/mml/20.test b/test/writer/mml/20.test
--- a/test/writer/mml/20.test
+++ b/test/writer/mml/20.test
@@ -119,120 +119,120 @@
diff --git a/test/writer/mml/22.test b/test/writer/mml/22.test
--- a/test/writer/mml/22.test
+++ b/test/writer/mml/22.test
@@ -313,12 +313,12 @@
- ๐
- ๐
- ๐
- ๐
- ๐
- ๐
+ ๐จ
+ ๐ฉ
+ ๐ช
+ ๐
+ ๐
+ ๐
@@ -328,12 +328,12 @@
- ๐
- ๐
- ๐
- ๐
- ๐
- ๐
+ ๐จ
+ ๐ฉ
+ ๐ช
+ ๐
+ ๐
+ ๐
@@ -351,12 +351,12 @@
- ๐ด
- ๐ต
- ๐ถ
- ๐
- ๐
- ๐
+ ๐ด
+ ๐ต
+ ๐ถ
+ ๐
+ ๐
+ ๐
@@ -374,12 +374,12 @@
- ๐ฐ
- ๐ฑ
- ๐ฒ
- ๐
- ๐
- ๐
+ ๐ฐ
+ ๐ฑ
+ ๐ฒ
+ ๐
+ ๐
+ ๐
@@ -397,12 +397,12 @@
- ๐
- ๐ก
- ๐ข
- ๐บ
- ๐ป
- ๐ผ
+ ๐
+ ๐ก
+ ๐ข
+ ๐บ
+ ๐ป
+ ๐ผ
@@ -412,12 +412,12 @@
- ๐
- ๐ก
- ๐ข
- ๐บ
- ๐ป
- ๐ผ
+ ๐
+ ๐ก
+ ๐ข
+ ๐บ
+ ๐ป
+ ๐ผ
@@ -427,12 +427,12 @@
- ๐ธ
- ๐น
- โ
- ๐
- ๐
- ๐
+ ๐ธ
+ ๐น
+ โ
+ ๐
+ ๐
+ ๐
@@ -442,12 +442,12 @@
- ๐
- โฌ
- ๐
- ๐ถ
- ๐ท
- ๐ธ
+ ๐
+ โฌ
+ ๐
+ ๐ถ
+ ๐ท
+ ๐ธ
@@ -457,12 +457,12 @@
- ๐
- โฌ
- ๐
- ๐ถ
- ๐ท
- ๐ธ
+ ๐
+ โฌ
+ ๐
+ ๐ถ
+ ๐ท
+ ๐ธ
@@ -472,12 +472,12 @@
- ๐
- ๐
- โญ
- ๐
- ๐
- ๐
+ ๐
+ ๐
+ โญ
+ ๐
+ ๐
+ ๐
@@ -487,12 +487,12 @@
- ๐จ
- ๐ฉ
- ๐ช
- ๐
- ๐
- ๐
+ ๐จ
+ ๐ฉ
+ ๐ช
+ ๐
+ ๐
+ ๐
@@ -502,12 +502,12 @@
- ๐
- ๐
- ๐
- ๐ฎ
- ๐ฏ
- ๐ฐ
+ ๐
+ ๐
+ ๐
+ ๐ฎ
+ ๐ฏ
+ ๐ฐ
@@ -517,12 +517,12 @@
- ๐ผ
- ๐ฝ
- ๐พ
- ๐
- ๐
- ๐
+ ๐ผ
+ ๐ฝ
+ ๐พ
+ ๐
+ ๐
+ ๐
@@ -532,12 +532,12 @@
- ๐
- ๐
- ๐
- ๐ช
- ๐ซ
- ๐ฌ
+ ๐
+ ๐
+ ๐
+ ๐ช
+ ๐ซ
+ ๐ฌ
@@ -547,12 +547,12 @@
- ๐ฌ
- ๐ญ
- ๐ฎ
- ๐
- ๐
- ๐
+ ๐ฌ
+ ๐ญ
+ ๐ฎ
+ ๐
+ ๐
+ ๐
@@ -562,12 +562,12 @@
- ๐
- ๐
- ๐
- ๐ช
- ๐ซ
- ๐ฌ
+ ๐
+ ๐
+ ๐
+ ๐ช
+ ๐ซ
+ ๐ฌ
@@ -577,12 +577,12 @@
- ๐
- ๐
- ๐
- ๐ข
- ๐ฃ
- ๐ค
+ ๐
+ ๐
+ ๐
+ ๐ข
+ ๐ฃ
+ ๐ค
diff --git a/test/writer/mml/binomial_coefficient.test b/test/writer/mml/binomial_coefficient.test
--- a/test/writer/mml/binomial_coefficient.test
+++ b/test/writer/mml/binomial_coefficient.test
@@ -43,7 +43,7 @@
diff --git a/test/writer/mml/schwinger_dyson.test b/test/writer/mml/schwinger_dyson.test
--- a/test/writer/mml/schwinger_dyson.test
+++ b/test/writer/mml/schwinger_dyson.test
@@ -62,7 +62,7 @@
ฯ
|
- ๐ฏ
+ ๐ฏ
{
@@ -93,7 +93,7 @@
ฯ
|
- ๐ฏ
+ ๐ฏ
{
F
diff --git a/test/writer/mml/stretchAccents2.test b/test/writer/mml/stretchAccents2.test
--- a/test/writer/mml/stretchAccents2.test
+++ b/test/writer/mml/stretchAccents2.test
@@ -16,7 +16,7 @@
=
- ๐ฅ๐ฅ๐ฅ
+ ๐ฅ๐ฅ๐ฅ
ยฏ
diff --git a/test/writer/omml/22.test b/test/writer/omml/22.test
--- a/test/writer/omml/22.test
+++ b/test/writer/omml/22.test
@@ -452,37 +452,37 @@
-
+
A
-
+
B
-
+
C
-
+
a
-
+
b
-
+
c
@@ -502,37 +502,37 @@
-
+
A
-
+
B
-
+
C
-
+
a
-
+
b
-
+
c
diff --git a/test/writer/omml/binomial_coefficient.test b/test/writer/omml/binomial_coefficient.test
--- a/test/writer/omml/binomial_coefficient.test
+++ b/test/writer/omml/binomial_coefficient.test
@@ -48,7 +48,7 @@
-
+
C
@@ -84,7 +84,7 @@
-
+
C
@@ -122,7 +122,7 @@
-
+
C
diff --git a/test/writer/omml/complex3.test b/test/writer/omml/complex3.test
--- a/test/writer/omml/complex3.test
+++ b/test/writer/omml/complex3.test
@@ -17527,7 +17527,7 @@
-
+
a
@@ -17539,7 +17539,7 @@
-
+
b
@@ -17551,7 +17551,7 @@
-
+
c
@@ -17603,7 +17603,7 @@
-
+
x
@@ -17851,7 +17851,7 @@
-
+
o
@@ -17863,7 +17863,7 @@
-
+
v
@@ -17875,7 +17875,7 @@
-
+
e
@@ -17887,7 +17887,7 @@
-
+
r
@@ -18759,7 +18759,7 @@
-
+
u
@@ -24005,7 +24005,7 @@
-
+
I
@@ -30415,7 +30415,7 @@
-
+
R
@@ -30620,7 +30620,7 @@
-
+
F
@@ -30634,7 +30634,7 @@
-
+
k
diff --git a/test/writer/omml/miequivalents11.test b/test/writer/omml/miequivalents11.test
--- a/test/writer/omml/miequivalents11.test
+++ b/test/writer/omml/miequivalents11.test
@@ -153,7 +153,7 @@
-
+
A
diff --git a/test/writer/omml/mimathvariant13.test b/test/writer/omml/mimathvariant13.test
--- a/test/writer/omml/mimathvariant13.test
+++ b/test/writer/omml/mimathvariant13.test
@@ -177,7 +177,7 @@
-
+
a
@@ -291,7 +291,7 @@
-
+
ab
@@ -311,7 +311,7 @@
-
+
A
@@ -425,7 +425,7 @@
-
+
ฮฑ
diff --git a/texmath.cabal b/texmath.cabal
--- a/texmath.cabal
+++ b/texmath.cabal
@@ -1,5 +1,5 @@
Name: texmath
-Version: 0.13.0.2
+Version: 0.13.1
Cabal-Version: >= 1.10
Build-type: Simple
Synopsis: Conversion between math formats.