diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +texmath (0.8.5) + + * TeX parser: Support limited styling inside \DeclareMathOperator (#85). + * TeX reader: Correctly parse \mbox. Its argument is text mode. + * Updated mathml tests to use mo for operators. + * TeX reader: support mathopen, mathclose, mathpunct. + * MathML writer: render EMathOperator as mo, not mi (#86). + * MathML: handle leading space in EText (#87). + * Take --version in executable from cabal metadata. + * Added Paths_texmath to other-modules. + texmath (0.8.4.2) * Fixed overbrace, underbrace (#82). Previously we were using the wrong diff --git a/extra/texmath.hs b/extra/texmath.hs --- a/extra/texmath.hs +++ b/extra/texmath.hs @@ -17,6 +17,8 @@ import Data.Aeson (encode, (.=), object) import qualified Data.ByteString.Lazy as B import qualified Data.Text as T +import Data.Version ( showVersion ) +import Paths_texmath (version) inHtml :: Element -> Element inHtml e = @@ -77,7 +79,7 @@ ("Output format: " ++ (concat $ intersperse ", " (map fst writers))) , Option "v" ["version"] (NoArg (\_ -> do - hPutStrLn stderr "Version 0.7" + hPutStrLn stderr $ "Version " ++ showVersion version exitWith ExitSuccess)) "Print version" 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 @@ -158,9 +158,17 @@ ESymbol _ "\x02B9" -> Just "'" ESymbol _ s -> Just s ENumber s -> Just s - EStyled sty [EIdentifier s] -> - Just (toUnicode sty s) + EStyled sty xs -> 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 _) = Just $ " " + toStr _ (EStyled sty' exps) = concat <$> + sequence (map (toStr sty') exps) + toStr _ _ = Nothing bareSubSup :: TP Exp bareSubSup = subSup Nothing False (EIdentifier "") @@ -482,7 +490,6 @@ styleOps = M.fromList [ ("\\mathrm", EStyled TextNormal) , ("\\mathup", EStyled TextNormal) - , ("\\mbox", EStyled TextNormal) , ("\\mathbf", EStyled TextBold) , ("\\boldsymbol", EStyled TextBold) , ("\\mathbfup", EStyled TextBold) @@ -531,6 +538,7 @@ , ("\\textit", (EText TextItalic)) , ("\\texttt", (EText TextMonospace)) , ("\\textsf", (EText TextSansSerif)) + , ("\\mbox", (EText TextNormal)) ] styled :: TP Exp @@ -567,6 +575,9 @@ <|> mathopWith "mathrel" Rel <|> mathopWith "mathbin" Bin <|> mathopWith "mathord" Ord + <|> mathopWith "mathopen" Open + <|> mathopWith "mathclose" Close + <|> mathopWith "mathpunct" Pun mathopWith :: String -> TeXSymbolType -> TP Exp mathopWith name ty = try $ do 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 @@ -93,12 +93,15 @@ -- Note: Converts strings to unicode directly, as few renderers support those mathvariants. makeText :: TextType -> String -> Element -makeText a s = if trailingSp - then mrow [s', sp] - else s' +makeText a s = case (leadingSp, trailingSp) of + (False, False) -> s' + (True, False) -> mrow [sp, s'] + (False, True) -> mrow [s', sp] + (True, True) -> mrow [sp, s', sp] where sp = spaceWidth (1/3) s' = withAttribute "mathvariant" attr $ unode "mtext" $ toUnicode a s trailingSp = not (null s) && last s `elem` " \t" + leadingSp = not (null s) && head s `elem` " \t" attr = getMMLType a makeArray :: TextType -> [Alignment] -> [ArrayLine] -> Element @@ -151,7 +154,7 @@ map (either (makeStretchy FInfix . unode "mo") (showExp tt)) xs ++ [ makeStretchy FPostfix (unode "mo" end) | not (null end) ] EIdentifier x -> unode "mi" $ toUnicode tt x - EMathOperator x -> unode "mi" x + EMathOperator x -> unode "mo" x ESymbol Accent x -> accent x ESymbol Open x -> makeFence FPrefix $ op x ESymbol Close x -> makeFence FPostfix $ op x diff --git a/tests/readers/tex/12.native b/tests/readers/tex/12.native --- a/tests/readers/tex/12.native +++ b/tests/readers/tex/12.native @@ -1,1 +1,1 @@ -[EIdentifier "f",ESymbol Open "(",EIdentifier "x",ESymbol Close ")",ESymbol Rel "=",EDelimited "{" "" [Right (EArray [AlignDefault,AlignDefault] [[[ENumber "1"],[ESymbol Bin "\8722",ENumber "1",ESymbol Rel "\8804",EIdentifier "x",ESymbol Rel "<",ENumber "0"]],[[EFraction NormalFrac (ENumber "1") (ENumber "2")],[EIdentifier "x",ESymbol Rel "=",ENumber "0"]],[[ENumber "1",ESymbol Bin "\8722",ESuper (EIdentifier "x") (ENumber "2")],[EStyled TextNormal [EIdentifier "o",EIdentifier "t",EIdentifier "h",EIdentifier "e",EIdentifier "r",EIdentifier "w",EIdentifier "i",EIdentifier "s",EIdentifier "e"]]]])]] +[EIdentifier "f",ESymbol Open "(",EIdentifier "x",ESymbol Close ")",ESymbol Rel "=",EDelimited "{" "" [Right (EArray [AlignDefault,AlignDefault] [[[ENumber "1"],[ESymbol Bin "\8722",ENumber "1",ESymbol Rel "\8804",EIdentifier "x",ESymbol Rel "<",ENumber "0"]],[[EFraction NormalFrac (ENumber "1") (ENumber "2")],[EIdentifier "x",ESymbol Rel "=",ENumber "0"]],[[ENumber "1",ESymbol Bin "\8722",ESuper (EIdentifier "x") (ENumber "2")],[EText TextNormal "otherwise"]]])]] diff --git a/tests/readers/tex/22.native b/tests/readers/tex/22.native --- a/tests/readers/tex/22.native +++ b/tests/readers/tex/22.native @@ -1,1 +1,1 @@ -[EArray [AlignLeft,AlignLeft] [[[EText TextMonospace "textrm"],[EText TextNormal "ABCabc"]],[[EText TextMonospace "mathrm"],[EStyled TextNormal [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathup"],[EStyled TextNormal [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "text"],[EText TextNormal "ABCabc"]],[[EText TextMonospace "mbox"],[EStyled TextNormal [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbf"],[EStyled TextBold [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfup"],[EStyled TextBold [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "textbf"],[EText TextBold "ABCabc"]],[[EText TextMonospace "mathit"],[EStyled TextItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "textit"],[EText TextItalic "ABCabc"]],[[EText TextMonospace "mathtt"],[EStyled TextMonospace [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "texttt"],[EText TextMonospace "ABCabc"]],[[EText TextMonospace "mathsf"],[EStyled TextSansSerif [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathsfup"],[EStyled TextSansSerif [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbb"],[EStyled TextDoubleStruck [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathcal"],[EStyled TextScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathscr"],[EStyled TextScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathfrak"],[EStyled TextFraktur [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfit"],[EStyled TextBoldItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfsfup"],[EStyled TextSansSerifBold [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfsfit"],[EStyled TextSansSerifBoldItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfscr"],[EStyled TextBoldScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbffrak"],[EStyled TextBoldFraktur [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfcal"],[EStyled TextBoldScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathsfit"],[EStyled TextSansSerifItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]]]] +[EArray [AlignLeft,AlignLeft] [[[EText TextMonospace "textrm"],[EText TextNormal "ABCabc"]],[[EText TextMonospace "mathrm"],[EStyled TextNormal [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathup"],[EStyled TextNormal [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "text"],[EText TextNormal "ABCabc"]],[[EText TextMonospace "mbox"],[EText TextNormal "ABCabc"]],[[EText TextMonospace "mathbf"],[EStyled TextBold [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfup"],[EStyled TextBold [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "textbf"],[EText TextBold "ABCabc"]],[[EText TextMonospace "mathit"],[EStyled TextItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "textit"],[EText TextItalic "ABCabc"]],[[EText TextMonospace "mathtt"],[EStyled TextMonospace [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "texttt"],[EText TextMonospace "ABCabc"]],[[EText TextMonospace "mathsf"],[EStyled TextSansSerif [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathsfup"],[EStyled TextSansSerif [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbb"],[EStyled TextDoubleStruck [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathcal"],[EStyled TextScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathscr"],[EStyled TextScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathfrak"],[EStyled TextFraktur [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfit"],[EStyled TextBoldItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfsfup"],[EStyled TextSansSerifBold [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfsfit"],[EStyled TextSansSerifBoldItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfscr"],[EStyled TextBoldScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbffrak"],[EStyled TextBoldFraktur [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathbfcal"],[EStyled TextBoldScript [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]],[[EText TextMonospace "mathsfit"],[EStyled TextSansSerifItalic [EIdentifier "A",EIdentifier "B",EIdentifier "C",EIdentifier "a",EIdentifier "b",EIdentifier "c"]]]]] diff --git a/tests/writers/00000_C0_Controls_and_Basic_Latin.mml b/tests/writers/00000_C0_Controls_and_Basic_Latin.mml --- a/tests/writers/00000_C0_Controls_and_Basic_Latin.mml +++ b/tests/writers/00000_C0_Controls_and_Basic_Latin.mml @@ -39,7 +39,7 @@ * - + 0 diff --git a/tests/writers/08.mml b/tests/writers/08.mml --- a/tests/writers/08.mml +++ b/tests/writers/08.mml @@ -31,7 +31,7 @@ n , - arg + arg ( z @@ -40,7 +40,7 @@ ) = n - arg + arg ( z ) diff --git a/tests/writers/09.mml b/tests/writers/09.mml --- a/tests/writers/09.mml +++ b/tests/writers/09.mml @@ -2,7 +2,7 @@ - lim + lim z → diff --git a/tests/writers/10.mml b/tests/writers/10.mml --- a/tests/writers/10.mml +++ b/tests/writers/10.mml @@ -30,7 +30,7 @@ - sin + sin ( κ R diff --git a/tests/writers/12.mml b/tests/writers/12.mml --- a/tests/writers/12.mml +++ b/tests/writers/12.mml @@ -45,17 +45,7 @@ - - o - t - h - e - r - w - i - s - e - + otherwise diff --git a/tests/writers/12.omml b/tests/writers/12.omml --- a/tests/writers/12.omml +++ b/tests/writers/12.omml @@ -152,55 +152,7 @@ - o - - - - - - t - - - - - - h - - - - - - e - - - - - - r - - - - - - w - - - - - - i - - - - - - s - - - - - - e + otherwise diff --git a/tests/writers/12.tex b/tests/writers/12.tex --- a/tests/writers/12.tex +++ b/tests/writers/12.tex @@ -1,5 +1,5 @@ f(x) = \begin{cases} 1 & - 1 \leq x < 0 \\ \frac{1}{2} & x = 0 \\ -1 - x^{2} & \mathrm{otherwise} \\ +1 - x^{2} & \text{otherwise} \\ \end{cases} diff --git a/tests/writers/22.mml b/tests/writers/22.mml --- a/tests/writers/22.mml +++ b/tests/writers/22.mml @@ -52,14 +52,7 @@ 𝚖𝚋𝚘𝚡 - - A - B - C - a - b - c - + ABCabc diff --git a/tests/writers/22.omml b/tests/writers/22.omml --- a/tests/writers/22.omml +++ b/tests/writers/22.omml @@ -287,37 +287,7 @@ - A - - - - - - B - - - - - - C - - - - - - a - - - - - - b - - - - - - c + ABCabc diff --git a/tests/writers/22.tex b/tests/writers/22.tex --- a/tests/writers/22.tex +++ b/tests/writers/22.tex @@ -3,7 +3,7 @@ \texttt{mathrm} & \mathrm{ABCabc} \\ \texttt{mathup} & \mathrm{ABCabc} \\ \texttt{text} & \text{ABCabc} \\ -\texttt{mbox} & \mathrm{ABCabc} \\ +\texttt{mbox} & \text{ABCabc} \\ \texttt{mathbf} & \mathbf{ABCabc} \\ \texttt{mathbfup} & \mathbf{ABCabc} \\ \texttt{textbf} & \textbf{ABCabc} \\ diff --git a/tests/writers/a.mml b/tests/writers/a.mml --- a/tests/writers/a.mml +++ b/tests/writers/a.mml @@ -54,7 +54,7 @@ acE - ∾̳ + ∾̳ diff --git a/tests/writers/b.mml b/tests/writers/b.mml --- a/tests/writers/b.mml +++ b/tests/writers/b.mml @@ -430,7 +430,7 @@ bne - =⃥ + =⃥ @@ -438,7 +438,7 @@ bnequiv - ≡⃥ + ≡⃥ diff --git a/tests/writers/c.mml b/tests/writers/c.mml --- a/tests/writers/c.mml +++ b/tests/writers/c.mml @@ -86,7 +86,7 @@ caps - ∩︀ + ∩︀ @@ -886,7 +886,7 @@ cups - ∪︀ + ∪︀ diff --git a/tests/writers/complex3.mml b/tests/writers/complex3.mml --- a/tests/writers/complex3.mml +++ b/tests/writers/complex3.mml @@ -48,9 +48,9 @@ + - sin + sin ⁡ - cos + cos ⁡ θ @@ -213,7 +213,7 @@ - lim + lim n → @@ -1445,7 +1445,7 @@ ⁢ - sin + sin ⁡ y @@ -1501,7 +1501,7 @@ = - sin + sin ⁡ x @@ -2691,7 +2691,7 @@ ⁢ - cos + cos ⁡ @@ -2741,7 +2741,7 @@ 2 ⁢ - tan + tan ⁡ ( @@ -3668,7 +3668,7 @@ - sin + sin ⁡ θ @@ -3677,7 +3677,7 @@ - cos + cos ⁡ γ @@ -3810,7 +3810,7 @@ - ∇× + ∇× F = @@ -3822,7 +3822,7 @@ - ∇· + ∇· F @@ -3832,7 +3832,7 @@ - ∇·∇ + ∇·∇ F = @@ -3857,7 +3857,7 @@ - ∇× + ∇× ( @@ -3921,7 +3921,7 @@ - ∇× + ∇× ( @@ -4557,7 +4557,7 @@ ( - arccos + arccos ⁡ @@ -4608,7 +4608,7 @@ ( - arccos + arccos ⁡ @@ -4680,7 +4680,7 @@ - det + det ( @@ -4788,7 +4788,7 @@ - cos + cos ⁡ θ @@ -4797,7 +4797,7 @@ − - sin + sin ⁡ θ @@ -4807,14 +4807,14 @@ - sin + sin ⁡ θ - cos + cos ⁡ θ @@ -4830,14 +4830,14 @@ - cos + cos ⁡ θ - sin + sin ⁡ θ @@ -4848,7 +4848,7 @@ − - sin + sin ⁡ θ @@ -4856,7 +4856,7 @@ - cos + cos ⁡ θ @@ -5004,7 +5004,7 @@ - det + det ( @@ -5161,7 +5161,7 @@ = - max + max x ≠ @@ -5524,7 +5524,7 @@ = - lim + lim x = @@ -5573,7 +5573,7 @@ = - lim + lim ∥ @@ -5654,7 +5654,7 @@ = - lim + lim n → @@ -5960,7 +5960,7 @@ - lim + lim x → @@ -5968,7 +5968,7 @@ - sin + sin ⁡ ( @@ -6180,7 +6180,7 @@ ( - max + max { @@ -6333,7 +6333,7 @@ - lim + lim a → @@ -6345,7 +6345,7 @@ - log + log a ⁡ @@ -6396,7 +6396,7 @@ = - lim + lim a → @@ -6408,7 +6408,7 @@ - log + log a ⁡ @@ -6480,7 +6480,7 @@ = - exp + exp ⁡ ( @@ -6543,7 +6543,7 @@ - Aut + Aut ( @@ -6658,7 +6658,7 @@    - tan + tan ⁡ θ @@ -6705,7 +6705,7 @@ 2 + - sin + sin ⁡ t @@ -6716,7 +6716,7 @@ 10 ⁢ - cos + cos ⁡ t @@ -6729,7 +6729,7 @@ 2 + - cos + cos ⁡ t @@ -6740,7 +6740,7 @@ 10 ⁢ - sin + sin ⁡ t @@ -6750,7 +6750,7 @@ 3 ⁢ - sin + sin ⁡ 3 @@ -7336,7 +7336,7 @@ - mod + mod a @@ -7347,7 +7347,7 @@ 5 - mod + mod 3 = @@ -7369,7 +7369,7 @@ ) - mod + mod 3 = @@ -7398,7 +7398,7 @@ ( - mod + mod 13 ) @@ -7426,7 +7426,7 @@ / 5 - mod + mod 7 = @@ -7473,7 +7473,7 @@ ) - mod + mod 3 = @@ -7638,7 +7638,7 @@ - Pr + Pr ( @@ -7680,7 +7680,7 @@ k = - max + max { @@ -7741,7 +7741,7 @@ = - lim + lim x @@ -8636,7 +8636,7 @@ 13 ⁢ - cos + cos ⁡ x @@ -8659,7 +8659,7 @@ 9 - cos + cos 2 ⁡ @@ -8671,14 +8671,14 @@ 60 - cos + cos ⁡ x ⁢ - sin + sin ⁡ ( @@ -8716,7 +8716,7 @@ ∫ - cos + cos ⁡ ( @@ -8730,7 +8730,7 @@ ⁢ - sin + sin ⁡ ( @@ -8755,7 +8755,7 @@ − - cos + cos ⁡ @@ -8791,7 +8791,7 @@ − - cos + cos ⁡ @@ -8850,7 +8850,7 @@ - max + max − @@ -8950,7 +8950,7 @@ n - sin + sin ⁡ x @@ -9048,7 +9048,7 @@ 13 ⁢ - cos + cos ⁡ x @@ -9071,7 +9071,7 @@ 9 - cos + cos 2 ⁡ @@ -9083,14 +9083,14 @@ 60 - cos + cos ⁡ x ⁢ - sin + sin ⁡ ( @@ -9207,7 +9207,7 @@ ( - ∇× + ∇× 𝐅 @@ -9422,7 +9422,7 @@ - sin + sin ⁡ θ @@ -9623,7 +9623,7 @@ - sin + sin ⁡ θ @@ -9731,7 +9731,7 @@ - sin + sin 3 ⁡ @@ -9743,7 +9743,7 @@ + - sin + sin ⁡ x @@ -9752,12 +9752,12 @@ ⁢ - sin + sin ⁡ ( - sin + sin ⁡ x @@ -10562,7 +10562,7 @@ ( - csc + csc − 1 @@ -10609,7 +10609,7 @@ - tanh + tanh − 1 @@ -10626,7 +10626,7 @@ ⁢ - ln + ln ⁡ ( @@ -11029,9 +11029,9 @@ x - ≰⃥ + ≰⃥ y - ≰⃥ + ≰⃥ z @@ -11041,7 +11041,7 @@ - lim + lim ¯ x @@ -11053,7 +11053,7 @@ - lim + lim ̲ x @@ -11065,7 +11065,7 @@ - lim + lim → x @@ -11077,7 +11077,7 @@ - lim + lim ← x @@ -11925,7 +11925,7 @@ ( - sin + sin ⁡ θ @@ -11942,7 +11942,7 @@ ( - sin + sin ⁡ θ @@ -11959,7 +11959,7 @@ ( - sin + sin ⁡ θ @@ -11976,7 +11976,7 @@ ( - sin + sin ⁡ θ @@ -11993,7 +11993,7 @@ ( - sin + sin ⁡ θ @@ -12010,7 +12010,7 @@ ( - sin + sin ⁡ θ @@ -12027,7 +12027,7 @@ ( - sin + sin ⁡ θ @@ -12044,7 +12044,7 @@ ( - sin + sin ⁡ θ @@ -12061,7 +12061,7 @@ ( - sin + sin ⁡ θ @@ -12076,7 +12076,7 @@ - sin + sin ⁡ θ @@ -12089,7 +12089,7 @@ - sin + sin ⁡ θ @@ -12102,7 +12102,7 @@ - sin + sin ⁡ θ @@ -12115,7 +12115,7 @@ - sin + sin ⁡ θ @@ -12128,7 +12128,7 @@ - sin + sin ⁡ θ @@ -12141,7 +12141,7 @@ - sin + sin ⁡ θ @@ -12154,7 +12154,7 @@ - sin + sin ⁡ θ @@ -12167,7 +12167,7 @@ - sin + sin ⁡ θ @@ -12180,7 +12180,7 @@ - sin + sin ⁡ θ diff --git a/tests/writers/differentiable_manifold.mml b/tests/writers/differentiable_manifold.mml --- a/tests/writers/differentiable_manifold.mml +++ b/tests/writers/differentiable_manifold.mml @@ -35,6 +35,7 @@ p , + and diff --git a/tests/writers/emptyContent1.mml b/tests/writers/emptyContent1.mml --- a/tests/writers/emptyContent1.mml +++ b/tests/writers/emptyContent1.mml @@ -2,6 +2,6 @@ - + diff --git a/tests/writers/f.mml b/tests/writers/f.mml --- a/tests/writers/f.mml +++ b/tests/writers/f.mml @@ -102,7 +102,7 @@ fjlig - fj + fj diff --git a/tests/writers/g.mml b/tests/writers/g.mml --- a/tests/writers/g.mml +++ b/tests/writers/g.mml @@ -222,7 +222,7 @@ gesl - ⋛︀ + ⋛︀ @@ -622,7 +622,7 @@ gvertneqq - ≩︀ + ≩︀ @@ -630,7 +630,7 @@ gvnE - ≩︀ + ≩︀ diff --git a/tests/writers/invChars.mml b/tests/writers/invChars.mml --- a/tests/writers/invChars.mml +++ b/tests/writers/invChars.mml @@ -2,7 +2,7 @@ - + ⁢ diff --git a/tests/writers/l.mml b/tests/writers/l.mml --- a/tests/writers/l.mml +++ b/tests/writers/l.mml @@ -238,7 +238,7 @@ lates - ⪭︀ + ⪭︀ @@ -806,7 +806,7 @@ lesg - ⋚︀ + ⋚︀ @@ -1654,7 +1654,7 @@ lvertneqq - ≨︀ + ≨︀ @@ -1662,7 +1662,7 @@ lvnE - ≨︀ + ≨︀ diff --git a/tests/writers/mfencedAempty.mml b/tests/writers/mfencedAempty.mml --- a/tests/writers/mfencedAempty.mml +++ b/tests/writers/mfencedAempty.mml @@ -5,6 +5,6 @@ x y - + diff --git a/tests/writers/mfracZcomp-01.mml b/tests/writers/mfracZcomp-01.mml --- a/tests/writers/mfracZcomp-01.mml +++ b/tests/writers/mfracZcomp-01.mml @@ -4,7 +4,7 @@ Inline, auto, normal line  - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-02.mml b/tests/writers/mfracZcomp-02.mml --- a/tests/writers/mfracZcomp-02.mml +++ b/tests/writers/mfracZcomp-02.mml @@ -4,7 +4,7 @@ Inline, display style, normal line  - ln + ln ⁡ x diff --git a/tests/writers/mfracZcomp-03.mml b/tests/writers/mfracZcomp-03.mml --- a/tests/writers/mfracZcomp-03.mml +++ b/tests/writers/mfracZcomp-03.mml @@ -4,7 +4,7 @@ Inline, text style, normal line  - tan + tan ⁡ θ diff --git a/tests/writers/mfracZcomp-12.mml b/tests/writers/mfracZcomp-12.mml --- a/tests/writers/mfracZcomp-12.mml +++ b/tests/writers/mfracZcomp-12.mml @@ -6,7 +6,7 @@ ( - log + log ⁡ x diff --git a/tests/writers/mfracZcomp-13.mml b/tests/writers/mfracZcomp-13.mml --- a/tests/writers/mfracZcomp-13.mml +++ b/tests/writers/mfracZcomp-13.mml @@ -6,7 +6,7 @@ | - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-14.mml b/tests/writers/mfracZcomp-14.mml --- a/tests/writers/mfracZcomp-14.mml +++ b/tests/writers/mfracZcomp-14.mml @@ -6,7 +6,7 @@ ↑ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-15.mml b/tests/writers/mfracZcomp-15.mml --- a/tests/writers/mfracZcomp-15.mml +++ b/tests/writers/mfracZcomp-15.mml @@ -6,7 +6,7 @@ ↓ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-16.mml b/tests/writers/mfracZcomp-16.mml --- a/tests/writers/mfracZcomp-16.mml +++ b/tests/writers/mfracZcomp-16.mml @@ -6,7 +6,7 @@ ⌊ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-17.mml b/tests/writers/mfracZcomp-17.mml --- a/tests/writers/mfracZcomp-17.mml +++ b/tests/writers/mfracZcomp-17.mml @@ -6,7 +6,7 @@ ⌈ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-18.mml b/tests/writers/mfracZcomp-18.mml --- a/tests/writers/mfracZcomp-18.mml +++ b/tests/writers/mfracZcomp-18.mml @@ -6,7 +6,7 @@ ↕ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-19.mml b/tests/writers/mfracZcomp-19.mml --- a/tests/writers/mfracZcomp-19.mml +++ b/tests/writers/mfracZcomp-19.mml @@ -6,7 +6,7 @@ ⇑ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-20.mml b/tests/writers/mfracZcomp-20.mml --- a/tests/writers/mfracZcomp-20.mml +++ b/tests/writers/mfracZcomp-20.mml @@ -6,7 +6,7 @@ ⇓ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-21.mml b/tests/writers/mfracZcomp-21.mml --- a/tests/writers/mfracZcomp-21.mml +++ b/tests/writers/mfracZcomp-21.mml @@ -6,7 +6,7 @@ ⇕ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-24.mml b/tests/writers/mfracZcomp-24.mml --- a/tests/writers/mfracZcomp-24.mml +++ b/tests/writers/mfracZcomp-24.mml @@ -12,7 +12,7 @@ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-25.mml b/tests/writers/mfracZcomp-25.mml --- a/tests/writers/mfracZcomp-25.mml +++ b/tests/writers/mfracZcomp-25.mml @@ -12,7 +12,7 @@ - sin + sin ⁡ θ diff --git a/tests/writers/mfracZcomp-33.mml b/tests/writers/mfracZcomp-33.mml --- a/tests/writers/mfracZcomp-33.mml +++ b/tests/writers/mfracZcomp-33.mml @@ -19,7 +19,7 @@ 2 i   - cos + cos ( diff --git a/tests/writers/mi2.mml b/tests/writers/mi2.mml --- a/tests/writers/mi2.mml +++ b/tests/writers/mi2.mml @@ -1,7 +1,7 @@ - sin + sin ⁡ x diff --git a/tests/writers/mo6.mml b/tests/writers/mo6.mml --- a/tests/writers/mo6.mml +++ b/tests/writers/mo6.mml @@ -1,14 +1,14 @@ - there exists + there exists δ > 0 - such that + such that f diff --git a/tests/writers/n.mml b/tests/writers/n.mml --- a/tests/writers/n.mml +++ b/tests/writers/n.mml @@ -30,7 +30,7 @@ nang - ∠⃒ + ∠⃒ @@ -46,7 +46,7 @@ napE - ⩰̸ + ⩰̸ @@ -54,7 +54,7 @@ napid - ≋̸ + ≋̸ @@ -174,7 +174,7 @@ ncongdot - ⩭̸ + ⩭̸ @@ -254,7 +254,7 @@ nedot - ≐̸ + ≐̸ @@ -334,7 +334,7 @@ NewLine - + @@ -382,7 +382,7 @@ ngE - ≧̸ + ≧̸ @@ -398,7 +398,7 @@ ngeqq - ≧̸ + ≧̸ @@ -422,7 +422,7 @@ nGg - ⋙̸ + ⋙̸ @@ -446,7 +446,7 @@ nGt - ≫⃒ + ≫⃒ @@ -654,7 +654,7 @@ nLl - ⋘̸ + ⋘̸ @@ -678,7 +678,7 @@ nLt - ≪⃒ + ≪⃒ @@ -838,7 +838,7 @@ NotGreaterFullEqual - ≧̸ + ≧̸ @@ -902,7 +902,7 @@ notindot - ⋵̸ + ⋵̸ @@ -910,7 +910,7 @@ notinE - ⋹̸ + ⋹̸ @@ -1270,7 +1270,7 @@ nparsl - ⫽⃥ + ⫽⃥ @@ -1278,7 +1278,7 @@ npart - ∂̸ + ∂̸ @@ -1350,7 +1350,7 @@ nrarrc - ⤳̸ + ⤳̸ @@ -1358,7 +1358,7 @@ nrarrw - ↝̸ + ↝̸ @@ -1526,7 +1526,7 @@ nsubE - ⫅̸ + ⫅̸ @@ -1550,7 +1550,7 @@ nsubseteqq - ⫅̸ + ⫅̸ @@ -1590,7 +1590,7 @@ nsupE - ⫆̸ + ⫆̸ @@ -1614,7 +1614,7 @@ nsupseteqq - ⫆̸ + ⫆̸ @@ -1718,7 +1718,7 @@ nvap - ≍⃒ + ≍⃒ @@ -1758,7 +1758,7 @@ nvge - ≥⃒ + ≥⃒ @@ -1766,7 +1766,7 @@ nvgt - >⃒ + >⃒ @@ -1798,7 +1798,7 @@ nvle - ≤⃒ + ≤⃒ @@ -1806,7 +1806,7 @@ nvlt - <⃒ + <⃒ @@ -1814,7 +1814,7 @@ nvltrie - ⊴⃒ + ⊴⃒ @@ -1830,7 +1830,7 @@ nvrtrie - ⊵⃒ + ⊵⃒ @@ -1838,7 +1838,7 @@ nvsim - ∼⃒ + ∼⃒ diff --git a/tests/writers/operatorname.mml b/tests/writers/operatorname.mml --- a/tests/writers/operatorname.mml +++ b/tests/writers/operatorname.mml @@ -6,23 +6,23 @@ - div + div x u - div + div x u - div + div x y u - div + div x y @@ -35,7 +35,7 @@ - ⋆-lim'sup + ⋆-lim'sup x → @@ -44,12 +44,12 @@ u - ⋆-lim'sup + ⋆-lim'sup w u - ⋆-lim'sup + ⋆-lim'sup x → @@ -59,7 +59,7 @@ u - ⋆-lim'sup + ⋆-lim'sup x → @@ -76,7 +76,7 @@ - ⋆-lim'sup + ⋆-lim'sup x → @@ -85,12 +85,12 @@ u - ⋆-lim'sup + ⋆-lim'sup w u - ⋆-lim'sup + ⋆-lim'sup x → @@ -100,7 +100,7 @@ u - ⋆-lim'sup + ⋆-lim'sup x → @@ -117,12 +117,12 @@ - curl + curl x v - argmax + argmax K u diff --git a/tests/writers/primes1.mml b/tests/writers/primes1.mml --- a/tests/writers/primes1.mml +++ b/tests/writers/primes1.mml @@ -23,7 +23,7 @@ + x - '' + '' + x diff --git a/tests/writers/s.mml b/tests/writers/s.mml --- a/tests/writers/s.mml +++ b/tests/writers/s.mml @@ -582,7 +582,7 @@ smtes - ⪬︀ + ⪬︀ @@ -678,7 +678,7 @@ sqcaps - ⊓︀ + ⊓︀ @@ -694,7 +694,7 @@ sqcups - ⊔︀ + ⊔︀ diff --git a/tests/writers/simplePres.mml b/tests/writers/simplePres.mml --- a/tests/writers/simplePres.mml +++ b/tests/writers/simplePres.mml @@ -10,7 +10,7 @@ , - sin + sin x . diff --git a/tests/writers/sphere_volume.mml b/tests/writers/sphere_volume.mml --- a/tests/writers/sphere_volume.mml +++ b/tests/writers/sphere_volume.mml @@ -48,7 +48,7 @@ ρ 2 - sin + sin θ @@ -91,7 +91,7 @@ π - sin + sin θ @@ -131,7 +131,7 @@ ( − - cos + cos θ ) diff --git a/tests/writers/subsup.mml b/tests/writers/subsup.mml --- a/tests/writers/subsup.mml +++ b/tests/writers/subsup.mml @@ -14,27 +14,27 @@ - min + min A - max + max B - det + det C - Pr + Pr A - gcd + gcd A diff --git a/tests/writers/t.mml b/tests/writers/t.mml --- a/tests/writers/t.mml +++ b/tests/writers/t.mml @@ -6,7 +6,7 @@ Tab - + @@ -182,7 +182,7 @@ ThickSpace -    +    diff --git a/tests/writers/v.mml b/tests/writers/v.mml --- a/tests/writers/v.mml +++ b/tests/writers/v.mml @@ -94,7 +94,7 @@ varsubsetneq - ⊊︀ + ⊊︀ @@ -102,7 +102,7 @@ varsubsetneqq - ⫋︀ + ⫋︀ @@ -110,7 +110,7 @@ varsupsetneq - ⊋︀ + ⊋︀ @@ -118,7 +118,7 @@ varsupsetneqq - ⫌︀ + ⫌︀ @@ -430,7 +430,7 @@ vsubne - ⊊︀ + ⊊︀ @@ -438,7 +438,7 @@ vsubnE - ⫋︀ + ⫋︀ @@ -446,7 +446,7 @@ vsupne - ⊋︀ + ⊋︀ @@ -454,7 +454,7 @@ vsupnE - ⫌︀ + ⫌︀ diff --git a/tests/writers/white10.mml b/tests/writers/white10.mml --- a/tests/writers/white10.mml +++ b/tests/writers/white10.mml @@ -10,15 +10,15 @@ H   H -  ︀ +  ︀ H -  ︀ +  ︀ H -  ︀ +  ︀ H -  ︀ +  ︀ H - + H diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.8.4.2 +Version: 0.8.5 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics. @@ -104,7 +104,8 @@ Text.TeXMath.Unicode.ToASCII Other-modules: Text.TeXMath.Compat, Text.TeXMath.Shared, - Text.TeXMath.TeX + Text.TeXMath.TeX, + Paths_texmath if impl(ghc >= 6.12) Ghc-Options: -Wall -fno-warn-unused-do-bind else