diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,18 @@ +texmath (0.13) + + * Add cancellation of terms for most formats. (#271, #251, #269). + This adds support for LaTeX `\cancel`, `\bcancel`, `\xcancel`, + and their equivalents in OMML, MathML, and Typst. + + [API change]: add StrokeType and ECancel constructor on Exp. + + * MathML writer: add `mathvariant="normal"` on math operators, + unless a different style is specifically called for (#270). + + * Don't escape `*` in typst math output (#268). + + * TeX writer: Use `\underbracket` instead of `\underset` U+23B5 (#267). + texmath (0.12.10.3) * MathML writer: fix rendering of EScaled (#264, Ewan Davies). diff --git a/src/Text/TeXMath/Readers/MathML.hs b/src/Text/TeXMath/Readers/MathML.hs --- a/src/Text/TeXMath/Readers/MathML.hs +++ b/src/Text/TeXMath/Readers/MathML.hs @@ -392,6 +392,9 @@ mbNotation <- findAttrQ "notation" e case mbNotation of Just "box" -> EBoxed <$> row e + Just "updiagonalstrike" -> ECancel ForwardSlash <$> row e + Just "downdiagonalstrike" -> ECancel BackSlash <$> row e + Just "updiagonalstrike downdiagonalstrike" -> ECancel XSlash <$> row e _ -> row e action :: Element -> MML Exp 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 @@ -278,7 +278,18 @@ elemToExps' element | isElem "m" "borderBox" element = do baseExp <- filterChildName (hasElemName "m" "e") element >>= elemToBase - return [EBoxed baseExp] + let bbPr = filterChildName (hasElemName "m" "borderBoxPr") element + bltr = bbPr >>= filterChildName (hasElemName "m" "strikeBLTR") >>= + findAttrBy (hasElemName "m" "val") + tlbr = bbPr >>= filterChildName (hasElemName "m" "strikeTLBR") >>= + findAttrBy (hasElemName "m" "val") + return $ + case (bltr, tlbr) of + (Just "1", Just "1") -> [ECancel XSlash baseExp] + (Just "1", _) -> [ECancel ForwardSlash baseExp] + (_, Just "1") -> [ECancel BackSlash baseExp] + _ -> [EBoxed baseExp] + elemToExps' element | isElem "m" "d" element = let baseExps = mapMaybe elemToBases 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 @@ -229,6 +229,7 @@ , mathop c , phantom c , boxed c + , cancel c , binary c , genfrac c , substack c @@ -659,6 +660,14 @@ boxed :: Text -> TP Exp boxed "\\boxed" = EBoxed <$> texToken boxed _ = mzero + +cancel :: Text -> TP Exp +cancel c = do + case c of + "\\cancel" -> ECancel ForwardSlash <$> texToken + "\\bcancel" -> ECancel BackSlash <$> texToken + "\\xcancel" -> ECancel XSlash <$> texToken + _ -> mzero text :: Text -> TP Exp text c = do diff --git a/src/Text/TeXMath/Shared.hs b/src/Text/TeXMath/Shared.hs --- a/src/Text/TeXMath/Shared.hs +++ b/src/Text/TeXMath/Shared.hs @@ -110,7 +110,6 @@ getDiacriticalCommand :: Position -> T.Text -> Maybe T.Text getDiacriticalCommand pos symbol = do command <- M.lookup symbol diaMap - guard (not $ command `elem` unavailable) let below = command `elem` under case pos of Under -> if below then Just command else Nothing @@ -288,11 +287,6 @@ -- Accents which go under the character under :: [T.Text] under = ["\\underbrace", "\\underline", "\\underbar", "\\underbracket"] - --- We want to parse these but we can't represent them in LaTeX -unavailable :: [T.Text] -unavailable = ["\\overbracket", "\\underbracket"] - -- | Mapping between unicode combining character and LaTeX accent command diacriticals :: [(T.Text, T.Text)] diff --git a/src/Text/TeXMath/Types.hs b/src/Text/TeXMath/Types.hs --- a/src/Text/TeXMath/Types.hs +++ b/src/Text/TeXMath/Types.hs @@ -24,8 +24,8 @@ FractionType(..), TextType(..), Alignment(..), DisplayType(..), Operator(..), FormType(..), Record(..), - Property, Position(..), Env, defaultEnv, - InEDelimited) + Property, Position(..), StrokeType(..), + Env, defaultEnv, InEDelimited) where import Data.Generics @@ -44,6 +44,9 @@ | NoLineFrac -- ^ No line between top and bottom deriving (Show, Read, Eq, Ord, Data, Typeable) +data StrokeType = ForwardSlash | BackSlash | XSlash + deriving (Show, Read, Eq, Ord, Data, Typeable) + type ArrayLine = [[Exp]] data Exp = @@ -79,6 +82,7 @@ -- something under it. | EPhantom Exp -- ^ A "phantom" operator that takes space but doesn't display. | EBoxed Exp -- ^ A boxed expression. + | ECancel StrokeType Exp -- ^ A cancelled expression. | EFraction FractionType Exp Exp -- ^ A fraction. First argument is -- numerator, second denominator. | ERoot Exp Exp -- ^ An nth root. First argument is index, second is base. diff --git a/src/Text/TeXMath/Writers/Eqn.hs b/src/Text/TeXMath/Writers/Eqn.hs --- a/src/Text/TeXMath/Writers/Eqn.hs +++ b/src/Text/TeXMath/Writers/Eqn.hs @@ -187,6 +187,7 @@ writeExp (ERoot i e) = "\"\" sup " <> writeExp' i <> " sqrt " <> writeExp' e writeExp (EPhantom e) = "hphantom " <> writeExp' e writeExp (EBoxed e) = writeExp e -- TODO: any way to do this? +writeExp (ECancel _ e) = writeExp e -- TODO writeExp (EScaled _size e) = writeExp e -- TODO: any way? writeExp (EText ttype s) = let quoted = "\"" <> s <> "\"" 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 @@ -217,7 +217,10 @@ [ makeStretchy FPostfix (vnode "mo" end) | not (T.null end) ] EIdentifier x -> vnode "mi" x - EMathOperator x -> vnode "mi" x -- see #257 + EMathOperator x -> -- see #257, #270 + case tt of + Nothing -> withAttribute "mathvariant" "normal" $ tunode "mi" x + _ -> vnode "mi" x ESymbol Open x -> makeFence FPrefix $ vnode "mo" x ESymbol Close x -> makeFence FPostfix $ vnode "mo" x ESymbol Ord x @@ -238,6 +241,12 @@ EPhantom x -> unode "mphantom" $ showExps tt [x] EBoxed x -> withAttribute "notation" "box" . unode "menclose" $ showExp tt x + ECancel ForwardSlash x -> withAttribute "notation" "updiagonalstrike" . + unode "menclose" $ showExp tt x + ECancel BackSlash x -> withAttribute "notation" "downdiagonalstrike" . + unode "menclose" $ showExp tt x + ECancel XSlash x -> withAttribute "notation" "updiagonalstrike downdiagonalstrike" . + unode "menclose" $ showExp tt x ESqrt x -> unode "msqrt" $ showExp tt x ERoot i x -> unode "mroot" [showExp tt x, showExp tt i] EScaled s x -> makeScaled s $ 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 @@ -300,6 +300,7 @@ [ mnodeA "show" "off" () ] , mnode "e" $ showExp props x]] EBoxed x -> [mnode "borderBox" [ mnode "e" $ showExp props x]] + ECancel st x -> [makeCancel props st x] EScaled _ x -> showExp props x -- no support for scaler? EArray as ls -> [makeArray props as ls] EText a s -> [makeText a s] @@ -342,3 +343,16 @@ , mnode "sup" $ showExp props z , mnode "e" $ showExp props w ] +makeCancel :: [Element] -> StrokeType -> Exp -> Element +makeCancel props st x = do + let sn = case st of + ForwardSlash -> [ mnodeA "strikeBLTR" "1" () ] + BackSlash -> [ mnodeA "strikeTLBR" "1" () ] + XSlash -> [ mnodeA "strikeBLTR" "1" () + , mnodeA "strikeTLBR" "1" () ] + mnode "borderBox" [ mnode "borderBoxPr" $ + [ mnodeA "hideTop" "1" () + , mnodeA "hideBot" "1" () + , mnodeA "hideLeft" "1" () + , mnodeA "hideRight" "1" () ] ++ sn + , mnode "e" $ showExp props x ] diff --git a/src/Text/TeXMath/Writers/Pandoc.hs b/src/Text/TeXMath/Writers/Pandoc.hs --- a/src/Text/TeXMath/Writers/Pandoc.hs +++ b/src/Text/TeXMath/Writers/Pandoc.hs @@ -156,4 +156,5 @@ expToInlines _ (EUnderover _ _ _ _) = Nothing expToInlines _ (EPhantom _) = Nothing expToInlines _ (EBoxed _) = Nothing +expToInlines _ (ECancel _ _) = Nothing expToInlines _ (EArray _ _) = Nothing diff --git a/src/Text/TeXMath/Writers/TeX.hs b/src/Text/TeXMath/Writers/TeX.hs --- a/src/Text/TeXMath/Writers/TeX.hs +++ b/src/Text/TeXMath/Writers/TeX.hs @@ -37,7 +37,7 @@ -- tr' x = trace (show x) x -- | Transforms an expression tree to equivalent LaTeX with the default --- packages (amsmath and amssymb) +-- packages (amsmath, amssymb, and cancel) writeTeX :: [Exp] -> T.Text writeTeX = writeTeXWith defaultEnv @@ -262,6 +262,12 @@ tell [ControlSeq "\\boxed"] tellGroup (writeExp e) else writeExp e +writeExp (ECancel st e) = do + case st of + ForwardSlash -> tell [ControlSeq "\\cancel"] + BackSlash -> tell [ControlSeq "\\bcancel"] + XSlash -> tell [ControlSeq "\\xcancel"] + tellGroup (writeExp e) writeExp (EScaled size e) | case e of (ESymbol Open _) -> True diff --git a/src/Text/TeXMath/Writers/Typst.hs b/src/Text/TeXMath/Writers/Typst.hs --- a/src/Text/TeXMath/Writers/Typst.hs +++ b/src/Text/TeXMath/Writers/Typst.hs @@ -74,7 +74,6 @@ needsEscape '(' = True needsEscape ')' = True needsEscape '_' = True - needsEscape '*' = True needsEscape '^' = True needsEscape '"' = True needsEscape '/' = True @@ -226,6 +225,9 @@ TextBoldFraktur -> "bold" <> inParens ("frak" <> inParens contents) TextSansSerifItalic -> "italic" <> inParens ("sans" <> inParens contents) writeExp (EBoxed e) = "#box(stroke: black, inset: 3pt, [$ " <> writeExp e <> " $])" +writeExp (ECancel ForwardSlash e) = "cancel(" <> writeExp e <> ")" +writeExp (ECancel BackSlash e) = "cancel(" <> writeExp e <> ", inverted: #true)" +writeExp (ECancel XSlash e) = "cancel(" <> writeExp e <> ", cross: #true)" writeExp (EPhantom e) = "#hide[" <> writeExp e <> "]" writeExp (EScaled size e) = "#scale(x: " <> tshow (floor (100 * size) :: Int) <> diff --git a/test/reader/mml/menclose.test b/test/reader/mml/menclose.test new file mode 100644 --- /dev/null +++ b/test/reader/mml/menclose.test @@ -0,0 +1,23 @@ +<<< mml + + + + + 0 + + + 1 + + + 2 + + + 3 + + +>>> native +[ EBoxed (ENumber "0") +, ECancel ForwardSlash (ENumber "1") +, ECancel BackSlash (ENumber "2") +, ECancel XSlash (ENumber "3") +] diff --git a/test/reader/omml/cancel.test b/test/reader/omml/cancel.test new file mode 100644 --- /dev/null +++ b/test/reader/omml/cancel.test @@ -0,0 +1,86 @@ +<<< omml + + + + + + + + + + + + + + abc + + + + + d+ + + + + + + + + + + + + + + x + + + + + 2 + + + + + + + =d+ + + + + + + + + + + + + + + + x + + + + + 2 + + + + + + + + +>>> native +[ ECancel + ForwardSlash + (EGrouped [ EIdentifier "a" , EIdentifier "b" , EIdentifier "c" ]) +, EIdentifier "d" +, ESymbol Bin "+" +, ECancel BackSlash (ESuper (EIdentifier "x") (ENumber "2")) +, ESymbol Rel "=" +, EIdentifier "d" +, ESymbol Bin "+" +, ECancel XSlash (ESuper (EIdentifier "x") (ENumber "2")) +] diff --git a/test/reader/tex/cancel.test b/test/reader/tex/cancel.test new file mode 100644 --- /dev/null +++ b/test/reader/tex/cancel.test @@ -0,0 +1,13 @@ +<<< tex +\boxed{\cancel{x} + \bcancel{y} = \xcancel{z}} + +>>> native +[ EBoxed + (EGrouped + [ ECancel ForwardSlash (EIdentifier "x") + , ESymbol Bin "+" + , ECancel BackSlash (EIdentifier "y") + , ESymbol Rel "=" + , ECancel XSlash (EIdentifier "z") + ]) +] diff --git a/test/regression/245b.test b/test/regression/245b.test --- a/test/regression/245b.test +++ b/test/regression/245b.test @@ -103,7 +103,7 @@ upright("^\\backdprime") x^prime.double.rev\ upright("^\\backtrprime") x^prime.triple.rev\ upright("^\\hyphenbullet") x^(⁃)\ -upright("^\\ast") x^(\*)\ +upright("^\\ast") x^(*)\ upright("^\\vysmwhtcircle") x^compose\ upright("^\\vysmblkcircle") x^circle.filled.small\ upright("^\\llcorner") x^\⌞\ diff --git a/test/roundtrip/cancel.native b/test/roundtrip/cancel.native new file mode 100644 --- /dev/null +++ b/test/roundtrip/cancel.native @@ -0,0 +1,6 @@ +[ ECancel ForwardSlash (EIdentifier "x") +, ESymbol Bin "+" +, ECancel BackSlash (EIdentifier "y") +, ESymbol Rel "=" +, ECancel XSlash (EIdentifier "z") +] diff --git a/test/writer/eqn/cancel.test b/test/writer/eqn/cancel.test new file mode 100644 --- /dev/null +++ b/test/writer/eqn/cancel.test @@ -0,0 +1,8 @@ +<<< native +[ EBoxed (ENumber "0") +, ECancel ForwardSlash (ENumber "1") +, ECancel BackSlash (ENumber "2") +, ECancel XSlash (ENumber "3") +] +>>> eqn +0 1 2 3 diff --git a/test/writer/mml/00000_C0_Controls_and_Basic_Latin.test b/test/writer/mml/00000_C0_Controls_and_Basic_Latin.test --- a/test/writer/mml/00000_C0_Controls_and_Basic_Latin.test +++ b/test/writer/mml/00000_C0_Controls_and_Basic_Latin.test @@ -224,7 +224,7 @@ * - + 0 diff --git a/test/writer/mml/08.test b/test/writer/mml/08.test --- a/test/writer/mml/08.test +++ b/test/writer/mml/08.test @@ -74,7 +74,7 @@ , - arg + arg ⁡ @@ -88,7 +88,7 @@ = n - arg + arg ⁡ diff --git a/test/writer/mml/09.test b/test/writer/mml/09.test --- a/test/writer/mml/09.test +++ b/test/writer/mml/09.test @@ -19,7 +19,7 @@ - lim + lim z → diff --git a/test/writer/mml/10.test b/test/writer/mml/10.test --- a/test/writer/mml/10.test +++ b/test/writer/mml/10.test @@ -77,7 +77,7 @@ - sin + sin ⁡ diff --git a/test/writer/mml/a.test b/test/writer/mml/a.test --- a/test/writer/mml/a.test +++ b/test/writer/mml/a.test @@ -138,7 +138,7 @@ acE - ∾̳ + ∾̳ diff --git a/test/writer/mml/b.test b/test/writer/mml/b.test --- a/test/writer/mml/b.test +++ b/test/writer/mml/b.test @@ -577,7 +577,7 @@ bne - =⃥ + =⃥ @@ -585,7 +585,7 @@ bnequiv - ≡⃥ + ≡⃥ diff --git a/test/writer/mml/c.test b/test/writer/mml/c.test --- a/test/writer/mml/c.test +++ b/test/writer/mml/c.test @@ -237,7 +237,7 @@ caps - ∩︀ + ∩︀ @@ -1037,7 +1037,7 @@ cups - ∪︀ + ∪︀ diff --git a/test/writer/mml/complex3.test b/test/writer/mml/complex3.test --- a/test/writer/mml/complex3.test +++ b/test/writer/mml/complex3.test @@ -7734,11 +7734,11 @@ + - sin + sin ⁡ - cos + cos ⁡ θ @@ -7902,7 +7902,7 @@ - lim + lim n → @@ -9135,7 +9135,7 @@ ⁢ - sin + sin ⁡ y @@ -9193,7 +9193,7 @@ = - sin + sin ⁡ x @@ -10385,7 +10385,7 @@ ⁢ - cos + cos ⁡ @@ -10437,7 +10437,7 @@ ⁢ - tan + tan ⁡ @@ -11364,7 +11364,7 @@ - sin + sin ⁡ θ @@ -11375,7 +11375,7 @@ - cos + cos ⁡ γ @@ -11510,7 +11510,7 @@ - ∇× + ∇× ⁡ F @@ -11525,7 +11525,7 @@ - ∇· + ∇· ⁡ F @@ -11538,7 +11538,7 @@ - ∇·∇ + ∇·∇ ⁡ F @@ -11566,7 +11566,7 @@ - ∇× + ∇× ⁡ @@ -11633,7 +11633,7 @@ - ∇× + ∇× ⁡ @@ -12224,7 +12224,7 @@ ( - arccos + arccos ⁡ @@ -12277,7 +12277,7 @@ ( - arccos + arccos ⁡ @@ -12351,7 +12351,7 @@ - det + det ⁡ @@ -12462,7 +12462,7 @@ - cos + cos ⁡ θ @@ -12473,7 +12473,7 @@ − - sin + sin ⁡ θ @@ -12485,7 +12485,7 @@ - sin + sin ⁡ θ @@ -12494,7 +12494,7 @@ - cos + cos ⁡ θ @@ -12512,7 +12512,7 @@ - cos + cos ⁡ θ @@ -12521,7 +12521,7 @@ - sin + sin ⁡ θ @@ -12534,7 +12534,7 @@ − - sin + sin ⁡ θ @@ -12544,7 +12544,7 @@ - cos + cos ⁡ θ @@ -12694,7 +12694,7 @@ - det + det ⁡ @@ -12853,7 +12853,7 @@ = - max + max x ≠ @@ -13216,7 +13216,7 @@ = - lim + lim x = @@ -13265,7 +13265,7 @@ = - lim + lim ∥ @@ -13346,7 +13346,7 @@ = - lim + lim n → @@ -13652,7 +13652,7 @@ - lim + lim x → @@ -13661,7 +13661,7 @@ - sin + sin ⁡ @@ -13875,7 +13875,7 @@ ( - max + max ⁡ @@ -14030,7 +14030,7 @@ - lim + lim a → @@ -14043,7 +14043,7 @@ - log + log ⁡ a @@ -14096,7 +14096,7 @@ = - lim + lim a → @@ -14109,7 +14109,7 @@ - log + log ⁡ a @@ -14184,7 +14184,7 @@ = - exp + exp ⁡ @@ -14249,7 +14249,7 @@ - Aut + Aut ⁡ @@ -14365,7 +14365,7 @@ - tan + tan ⁡ θ @@ -14414,7 +14414,7 @@ + - sin + sin ⁡ t @@ -14427,7 +14427,7 @@ ⁢ - cos + cos ⁡ t @@ -14442,7 +14442,7 @@ + - cos + cos ⁡ t @@ -14455,7 +14455,7 @@ ⁢ - sin + sin ⁡ t @@ -14467,7 +14467,7 @@ ⁢ - sin + sin ⁡ @@ -15055,7 +15055,7 @@ - mod + mod ⁡ a @@ -15069,7 +15069,7 @@ 5 - mod + mod ⁡ 3 @@ -15094,7 +15094,7 @@ - mod + mod ⁡ 3 @@ -15126,7 +15126,7 @@ ( - mod + mod ⁡ 13 @@ -15157,7 +15157,7 @@ 5 - mod + mod ⁡ 7 @@ -15207,7 +15207,7 @@ - mod + mod ⁡ 3 @@ -15375,7 +15375,7 @@ - Pr + Pr ⁡ @@ -15420,7 +15420,7 @@ = - max + max ⁡ @@ -15483,7 +15483,7 @@ = - lim + lim x @@ -16379,7 +16379,7 @@ ⁢ - cos + cos ⁡ x @@ -16404,7 +16404,7 @@ - cos + cos ⁡ 2 @@ -16419,7 +16419,7 @@ 60 - cos + cos ⁡ x @@ -16428,7 +16428,7 @@ ⁢ - sin + sin ⁡ @@ -16468,7 +16468,7 @@ - cos + cos ⁡ @@ -16484,7 +16484,7 @@ ⁢ - sin + sin ⁡ @@ -16511,7 +16511,7 @@ − - cos + cos ⁡ @@ -16549,7 +16549,7 @@ − - cos + cos ⁡ @@ -16609,7 +16609,7 @@ - max + max − @@ -16710,7 +16710,7 @@ - sin + sin ⁡ x @@ -16810,7 +16810,7 @@ ⁢ - cos + cos ⁡ x @@ -16835,7 +16835,7 @@ - cos + cos ⁡ 2 @@ -16850,7 +16850,7 @@ 60 - cos + cos ⁡ x @@ -16859,7 +16859,7 @@ ⁢ - sin + sin ⁡ @@ -16976,7 +16976,7 @@ ( - ∇× + ∇× ⁡ 𝐅 @@ -17190,7 +17190,7 @@ - sin + sin ⁡ θ @@ -17393,7 +17393,7 @@ - sin + sin ⁡ θ @@ -17503,7 +17503,7 @@ - sin + sin ⁡ 3 @@ -17518,7 +17518,7 @@ - sin + sin ⁡ @@ -17529,14 +17529,14 @@ ⁢ - sin + sin ⁡ ( - sin + sin ⁡ @@ -18343,7 +18343,7 @@ - csc + csc ⁡ @@ -18393,7 +18393,7 @@ - tanh + tanh ⁡ @@ -18413,7 +18413,7 @@ ⁢ - ln + ln ⁡ @@ -18818,12 +18818,12 @@ x - ≰⃥ + ≰⃥ ⁡ y - ≰⃥ + ≰⃥ ⁡ z @@ -18835,7 +18835,7 @@ - lim + lim ¯ x @@ -18847,7 +18847,7 @@ - lim + lim ̲ x @@ -18859,7 +18859,7 @@ - lim + lim → x @@ -18871,7 +18871,7 @@ - lim + lim ← x @@ -19720,7 +19720,7 @@ - sin + sin ⁡ θ @@ -19739,7 +19739,7 @@ - sin + sin ⁡ θ @@ -19758,7 +19758,7 @@ - sin + sin ⁡ θ @@ -19777,7 +19777,7 @@ - sin + sin ⁡ θ @@ -19796,7 +19796,7 @@ - sin + sin ⁡ θ @@ -19815,7 +19815,7 @@ - sin + sin ⁡ θ @@ -19834,7 +19834,7 @@ - sin + sin ⁡ θ @@ -19853,7 +19853,7 @@ - sin + sin ⁡ θ @@ -19872,7 +19872,7 @@ - sin + sin ⁡ θ @@ -19889,7 +19889,7 @@ - sin + sin ⁡ θ @@ -19904,7 +19904,7 @@ - sin + sin ⁡ θ @@ -19919,7 +19919,7 @@ - sin + sin ⁡ θ @@ -19934,7 +19934,7 @@ - sin + sin ⁡ θ @@ -19949,7 +19949,7 @@ - sin + sin ⁡ θ @@ -19964,7 +19964,7 @@ - sin + sin ⁡ θ @@ -19979,7 +19979,7 @@ - sin + sin ⁡ θ @@ -19994,7 +19994,7 @@ - sin + sin ⁡ θ @@ -20009,7 +20009,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/emptyContent1.test b/test/writer/mml/emptyContent1.test --- a/test/writer/mml/emptyContent1.test +++ b/test/writer/mml/emptyContent1.test @@ -5,6 +5,6 @@ - + diff --git a/test/writer/mml/f.test b/test/writer/mml/f.test --- a/test/writer/mml/f.test +++ b/test/writer/mml/f.test @@ -157,7 +157,7 @@ fjlig - fj + fj diff --git a/test/writer/mml/g.test b/test/writer/mml/g.test --- a/test/writer/mml/g.test +++ b/test/writer/mml/g.test @@ -317,7 +317,7 @@ gesl - ⋛︀ + ⋛︀ @@ -717,7 +717,7 @@ gvertneqq - ≩︀ + ≩︀ @@ -725,7 +725,7 @@ gvnE - ≩︀ + ≩︀ diff --git a/test/writer/mml/invChars.test b/test/writer/mml/invChars.test --- a/test/writer/mml/invChars.test +++ b/test/writer/mml/invChars.test @@ -13,7 +13,7 @@ - + ⁡ diff --git a/test/writer/mml/l.test b/test/writer/mml/l.test --- a/test/writer/mml/l.test +++ b/test/writer/mml/l.test @@ -548,7 +548,7 @@ lates - ⪭︀ + ⪭︀ @@ -1116,7 +1116,7 @@ lesg - ⋚︀ + ⋚︀ @@ -1964,7 +1964,7 @@ lvertneqq - ≨︀ + ≨︀ @@ -1972,7 +1972,7 @@ lvnE - ≨︀ + ≨︀ diff --git a/test/writer/mml/menclose.test b/test/writer/mml/menclose.test new file mode 100644 --- /dev/null +++ b/test/writer/mml/menclose.test @@ -0,0 +1,25 @@ +<<< native +[ EBoxed (ENumber "0") +, ECancel ForwardSlash (ENumber "1") +, ECancel BackSlash (ENumber "2") +, ECancel XSlash (ENumber "3") +] + +>>> mml + + + + + 0 + + + 1 + + + 2 + + + 3 + + + diff --git a/test/writer/mml/mfencedAempty.test b/test/writer/mml/mfencedAempty.test --- a/test/writer/mml/mfencedAempty.test +++ b/test/writer/mml/mfencedAempty.test @@ -10,6 +10,6 @@ x y - + diff --git a/test/writer/mml/mfracZcomp-01.test b/test/writer/mml/mfracZcomp-01.test --- a/test/writer/mml/mfracZcomp-01.test +++ b/test/writer/mml/mfracZcomp-01.test @@ -16,7 +16,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-02.test b/test/writer/mml/mfracZcomp-02.test --- a/test/writer/mml/mfracZcomp-02.test +++ b/test/writer/mml/mfracZcomp-02.test @@ -16,7 +16,7 @@ - ln + ln ⁡ x diff --git a/test/writer/mml/mfracZcomp-03.test b/test/writer/mml/mfracZcomp-03.test --- a/test/writer/mml/mfracZcomp-03.test +++ b/test/writer/mml/mfracZcomp-03.test @@ -16,7 +16,7 @@ - tan + tan ⁡ θ diff --git a/test/writer/mml/mfracZcomp-12.test b/test/writer/mml/mfracZcomp-12.test --- a/test/writer/mml/mfracZcomp-12.test +++ b/test/writer/mml/mfracZcomp-12.test @@ -22,7 +22,7 @@ - log + log ⁡ x diff --git a/test/writer/mml/mfracZcomp-13.test b/test/writer/mml/mfracZcomp-13.test --- a/test/writer/mml/mfracZcomp-13.test +++ b/test/writer/mml/mfracZcomp-13.test @@ -22,7 +22,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-14.test b/test/writer/mml/mfracZcomp-14.test --- a/test/writer/mml/mfracZcomp-14.test +++ b/test/writer/mml/mfracZcomp-14.test @@ -24,7 +24,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-15.test b/test/writer/mml/mfracZcomp-15.test --- a/test/writer/mml/mfracZcomp-15.test +++ b/test/writer/mml/mfracZcomp-15.test @@ -24,7 +24,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-16.test b/test/writer/mml/mfracZcomp-16.test --- a/test/writer/mml/mfracZcomp-16.test +++ b/test/writer/mml/mfracZcomp-16.test @@ -22,7 +22,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-17.test b/test/writer/mml/mfracZcomp-17.test --- a/test/writer/mml/mfracZcomp-17.test +++ b/test/writer/mml/mfracZcomp-17.test @@ -22,7 +22,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-18.test b/test/writer/mml/mfracZcomp-18.test --- a/test/writer/mml/mfracZcomp-18.test +++ b/test/writer/mml/mfracZcomp-18.test @@ -25,7 +25,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-19.test b/test/writer/mml/mfracZcomp-19.test --- a/test/writer/mml/mfracZcomp-19.test +++ b/test/writer/mml/mfracZcomp-19.test @@ -24,7 +24,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-20.test b/test/writer/mml/mfracZcomp-20.test --- a/test/writer/mml/mfracZcomp-20.test +++ b/test/writer/mml/mfracZcomp-20.test @@ -26,7 +26,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-21.test b/test/writer/mml/mfracZcomp-21.test --- a/test/writer/mml/mfracZcomp-21.test +++ b/test/writer/mml/mfracZcomp-21.test @@ -26,7 +26,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-24.test b/test/writer/mml/mfracZcomp-24.test --- a/test/writer/mml/mfracZcomp-24.test +++ b/test/writer/mml/mfracZcomp-24.test @@ -56,7 +56,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-25.test b/test/writer/mml/mfracZcomp-25.test --- a/test/writer/mml/mfracZcomp-25.test +++ b/test/writer/mml/mfracZcomp-25.test @@ -56,7 +56,7 @@ - sin + sin ⁡ θ diff --git a/test/writer/mml/mfracZcomp-33.test b/test/writer/mml/mfracZcomp-33.test --- a/test/writer/mml/mfracZcomp-33.test +++ b/test/writer/mml/mfracZcomp-33.test @@ -74,7 +74,7 @@ i   - cos + cos ⁡ diff --git a/test/writer/mml/mi2.test b/test/writer/mml/mi2.test --- a/test/writer/mml/mi2.test +++ b/test/writer/mml/mi2.test @@ -5,7 +5,7 @@ - sin + sin ⁡ x diff --git a/test/writer/mml/mo6.test b/test/writer/mml/mo6.test --- a/test/writer/mml/mo6.test +++ b/test/writer/mml/mo6.test @@ -19,7 +19,7 @@ - there exists + there exists ⁡ @@ -29,7 +29,7 @@ 0 - such that + such that ⁡ diff --git a/test/writer/mml/n.test b/test/writer/mml/n.test --- a/test/writer/mml/n.test +++ b/test/writer/mml/n.test @@ -405,7 +405,7 @@ nang - ∠⃒ + ∠⃒ @@ -421,7 +421,7 @@ napE - ⩰̸ + ⩰̸ @@ -429,7 +429,7 @@ napid - ≋̸ + ≋̸ @@ -549,7 +549,7 @@ ncongdot - ⩭̸ + ⩭̸ @@ -629,7 +629,7 @@ nedot - ≐̸ + ≐̸ @@ -709,7 +709,7 @@ NewLine - + @@ -757,7 +757,7 @@ ngE - ≧̸ + ≧̸ @@ -773,7 +773,7 @@ ngeqq - ≧̸ + ≧̸ @@ -797,7 +797,7 @@ nGg - ⋙̸ + ⋙̸ @@ -821,7 +821,7 @@ nGt - ≫⃒ + ≫⃒ @@ -1029,7 +1029,7 @@ nLl - ⋘̸ + ⋘̸ @@ -1053,7 +1053,7 @@ nLt - ≪⃒ + ≪⃒ @@ -1213,7 +1213,7 @@ NotGreaterFullEqual - ≧̸ + ≧̸ @@ -1277,7 +1277,7 @@ notindot - ⋵̸ + ⋵̸ @@ -1285,7 +1285,7 @@ notinE - ⋹̸ + ⋹̸ @@ -1645,7 +1645,7 @@ nparsl - ⫽⃥ + ⫽⃥ @@ -1653,7 +1653,7 @@ npart - ∂̸ + ∂̸ @@ -1725,7 +1725,7 @@ nrarrc - ⤳̸ + ⤳̸ @@ -1733,7 +1733,7 @@ nrarrw - ↝̸ + ↝̸ @@ -1901,7 +1901,7 @@ nsubE - ⫅̸ + ⫅̸ @@ -1925,7 +1925,7 @@ nsubseteqq - ⫅̸ + ⫅̸ @@ -1965,7 +1965,7 @@ nsupE - ⫆̸ + ⫆̸ @@ -1989,7 +1989,7 @@ nsupseteqq - ⫆̸ + ⫆̸ @@ -2093,7 +2093,7 @@ nvap - ≍⃒ + ≍⃒ @@ -2133,7 +2133,7 @@ nvge - ≥⃒ + ≥⃒ @@ -2141,7 +2141,7 @@ nvgt - >⃒ + >⃒ @@ -2173,7 +2173,7 @@ nvle - ≤⃒ + ≤⃒ @@ -2181,7 +2181,7 @@ nvlt - <⃒ + <⃒ @@ -2189,7 +2189,7 @@ nvltrie - ⊴⃒ + ⊴⃒ @@ -2205,7 +2205,7 @@ nvrtrie - ⊵⃒ + ⊵⃒ @@ -2213,7 +2213,7 @@ nvsim - ∼⃒ + ∼⃒ diff --git a/test/writer/mml/operatorname.test b/test/writer/mml/operatorname.test --- a/test/writer/mml/operatorname.test +++ b/test/writer/mml/operatorname.test @@ -77,7 +77,7 @@ - div + div ⁡ x @@ -85,7 +85,7 @@ u - div + div ⁡ x @@ -93,7 +93,7 @@ u - div + div ⁡ x @@ -102,7 +102,7 @@ u - div + div ⁡ x @@ -117,7 +117,7 @@ - ⋆-lim'sup + ⋆-lim'sup x → @@ -126,12 +126,12 @@ u - ⋆-lim'sup + ⋆-lim'sup w u - ⋆-lim'sup + ⋆-lim'sup x → @@ -141,7 +141,7 @@ u - ⋆-lim'sup + ⋆-lim'sup x → @@ -159,7 +159,7 @@ - ⋆-lim'sup + ⋆-lim'sup ⁡ @@ -171,7 +171,7 @@ u - ⋆-lim'sup + ⋆-lim'sup ⁡ w @@ -179,7 +179,7 @@ u - ⋆-lim'sup + ⋆-lim'sup ⁡ @@ -192,7 +192,7 @@ u - ⋆-lim'sup + ⋆-lim'sup ⁡ @@ -212,14 +212,14 @@ - curl + curl ⁡ x v - argmax + argmax K u diff --git a/test/writer/mml/primes1.test b/test/writer/mml/primes1.test --- a/test/writer/mml/primes1.test +++ b/test/writer/mml/primes1.test @@ -62,7 +62,7 @@ + x - '' + '' + x diff --git a/test/writer/mml/s.test b/test/writer/mml/s.test --- a/test/writer/mml/s.test +++ b/test/writer/mml/s.test @@ -812,7 +812,7 @@ smtes - ⪬︀ + ⪬︀ @@ -908,7 +908,7 @@ sqcaps - ⊓︀ + ⊓︀ @@ -924,7 +924,7 @@ sqcups - ⊔︀ + ⊔︀ diff --git a/test/writer/mml/simplePres.test b/test/writer/mml/simplePres.test --- a/test/writer/mml/simplePres.test +++ b/test/writer/mml/simplePres.test @@ -48,7 +48,7 @@ , - sin + sin ⁡ x diff --git a/test/writer/mml/sphere_volume.test b/test/writer/mml/sphere_volume.test --- a/test/writer/mml/sphere_volume.test +++ b/test/writer/mml/sphere_volume.test @@ -177,7 +177,7 @@ 2 - sin + sin ⁡ θ @@ -215,7 +215,7 @@ - sin + sin ⁡ θ @@ -254,7 +254,7 @@ ( − - cos + cos θ ) diff --git a/test/writer/mml/subsup.test b/test/writer/mml/subsup.test --- a/test/writer/mml/subsup.test +++ b/test/writer/mml/subsup.test @@ -81,27 +81,27 @@ - min + min A - max + max B - det + det C - Pr + Pr A - gcd + gcd A diff --git a/test/writer/mml/t.test b/test/writer/mml/t.test --- a/test/writer/mml/t.test +++ b/test/writer/mml/t.test @@ -101,7 +101,7 @@ Tab - + @@ -277,7 +277,7 @@ ThickSpace -    +    diff --git a/test/writer/mml/v.test b/test/writer/mml/v.test --- a/test/writer/mml/v.test +++ b/test/writer/mml/v.test @@ -185,7 +185,7 @@ varsubsetneq - ⊊︀ + ⊊︀ @@ -193,7 +193,7 @@ varsubsetneqq - ⫋︀ + ⫋︀ @@ -201,7 +201,7 @@ varsupsetneq - ⊋︀ + ⊋︀ @@ -209,7 +209,7 @@ varsupsetneqq - ⫌︀ + ⫌︀ @@ -521,7 +521,7 @@ vsubne - ⊊︀ + ⊊︀ @@ -529,7 +529,7 @@ vsubnE - ⫋︀ + ⫋︀ @@ -537,7 +537,7 @@ vsupne - ⊋︀ + ⊋︀ @@ -545,7 +545,7 @@ vsupnE - ⫌︀ + ⫌︀ diff --git a/test/writer/mml/white10.test b/test/writer/mml/white10.test --- a/test/writer/mml/white10.test +++ b/test/writer/mml/white10.test @@ -33,27 +33,27 @@   H -  ︀ +  ︀ ⁡ H -  ︀ +  ︀ ⁡ H -  ︀ +  ︀ ⁡ H -  ︀ +  ︀ ⁡ H - + ⁡ H diff --git a/test/writer/omml/cancel.test b/test/writer/omml/cancel.test new file mode 100644 --- /dev/null +++ b/test/writer/omml/cancel.test @@ -0,0 +1,113 @@ +<<< native +[ ECancel + ForwardSlash + (EGrouped [ EIdentifier "a" , EIdentifier "b" , EIdentifier "c" ]) +, EIdentifier "d" +, ESymbol Bin "+" +, ECancel BackSlash (ESuper (EIdentifier "x") (ENumber "2")) +, ESymbol Rel "=" +, EIdentifier "d" +, ESymbol Bin "+" +, ECancel XSlash (ESuper (EIdentifier "x") (ENumber "2")) +] + +>>> omml + + + + + + + + + + + + + + + + + a + + + b + + + c + + + + + d + + + + + + + + + + + + + + + + + + + + + x + + + + + 2 + + + + + + + + + + = + + + d + + + + + + + + + + + + + + + + + + + + + + x + + + + + 2 + + + + + + + diff --git a/test/writer/tex/accents1.test b/test/writer/tex/accents1.test --- a/test/writer/tex/accents1.test +++ b/test/writer/tex/accents1.test @@ -88,7 +88,7 @@ >>> tex \begin{array}{l} \text{default: (accent=true)} \\ -{\overset{'}{H}\hat{H}\overset{\_}{H}\grave{H}\overset{\sim}{H}\overset{¨}{H}\overline{H}\acute{H}\overset{¸}{H}\widehat{H}\check{H}\breve{H}\overset{˙}{H}\overset{˚}{H}\widetilde{H}\overset{˝}{H}\widehat{H}\overset{̑}{H}\bar{H}\dddot{H}\ddddot{H}\overset{\leftarrow}{H}\overset{\rightarrow}{H}\overset{\leftrightarrow}{H}\overset{\leftharpoonup}{H}\overset{\leftharpoondown}{H}\overset{\rightharpoonup}{H}\overset{\rightharpoondown}{H}\overset{⎴}{H}\overset{⎵}{H}\overset{⏜}{H}\overset{⏝}{H}\overbrace{H}\overset{\underbrace{}}{H}\overset{⥎}{H}\overset{⥐}{H}} \\ +{\overset{'}{H}\hat{H}\overset{\_}{H}\grave{H}\overset{\sim}{H}\overset{¨}{H}\overline{H}\acute{H}\overset{¸}{H}\widehat{H}\check{H}\breve{H}\overset{˙}{H}\overset{˚}{H}\widetilde{H}\overset{˝}{H}\widehat{H}\overset{̑}{H}\bar{H}\dddot{H}\ddddot{H}\overset{\leftarrow}{H}\overset{\rightarrow}{H}\overset{\leftrightarrow}{H}\overset{\leftharpoonup}{H}\overset{\leftharpoondown}{H}\overset{\rightharpoonup}{H}\overset{\rightharpoondown}{H}\overbracket{H}\overset{⎵}{H}\overset{⏜}{H}\overset{⏝}{H}\overbrace{H}\overset{\underbrace{}}{H}\overset{⥎}{H}\overset{⥐}{H}} \\ \text{accent=false:} \\ -{\overset{'}{H}\overset{\hat{}}{H}\overset{\_}{H}\overset{`}{H}\overset{\sim}{H}\overset{¨}{H}\overset{¯}{H}\overset{´}{H}\overset{¸}{H}\overset{\hat{}}{H}\overset{ˇ}{H}\overset{˘}{H}\overset{˙}{H}\overset{˚}{H}\overset{˜}{H}\overset{˝}{H}\widehat{H}\overset{̑}{H}\overset{‾}{H}\dddot{H}\ddddot{H}\overset{\leftarrow}{H}\overset{\rightarrow}{H}\overset{\leftrightarrow}{H}\overset{\leftharpoonup}{H}\overset{\leftharpoondown}{H}\overset{\rightharpoonup}{H}\overset{\rightharpoondown}{H}\overset{⎴}{H}\overset{⎵}{H}\overset{⏜}{H}\overset{⏝}{H}\overbrace{H}\overset{\underbrace{}}{H}\overset{⥎}{H}\overset{⥐}{H}} +{\overset{'}{H}\overset{\hat{}}{H}\overset{\_}{H}\overset{`}{H}\overset{\sim}{H}\overset{¨}{H}\overset{¯}{H}\overset{´}{H}\overset{¸}{H}\overset{\hat{}}{H}\overset{ˇ}{H}\overset{˘}{H}\overset{˙}{H}\overset{˚}{H}\overset{˜}{H}\overset{˝}{H}\widehat{H}\overset{̑}{H}\overset{‾}{H}\dddot{H}\ddddot{H}\overset{\leftarrow}{H}\overset{\rightarrow}{H}\overset{\leftrightarrow}{H}\overset{\leftharpoonup}{H}\overset{\leftharpoondown}{H}\overset{\rightharpoonup}{H}\overset{\rightharpoondown}{H}\overbracket{H}\overset{⎵}{H}\overset{⏜}{H}\overset{⏝}{H}\overbrace{H}\overset{\underbrace{}}{H}\overset{⥎}{H}\overset{⥐}{H}} \end{array} diff --git a/test/writer/tex/accents2.test b/test/writer/tex/accents2.test --- a/test/writer/tex/accents2.test +++ b/test/writer/tex/accents2.test @@ -88,7 +88,7 @@ >>> tex \begin{array}{l} \text{default: (accent=true)} \\ -{\overset{'}{x}\hat{x}\overset{\_}{x}\grave{x}\overset{\sim}{x}\overset{¨}{x}\overline{x}\acute{x}\overset{¸}{x}\widehat{x}\check{x}\breve{x}\overset{˙}{x}\overset{˚}{x}\widetilde{x}\overset{˝}{x}\widehat{x}\overset{̑}{x}\bar{x}\dddot{x}\ddddot{x}\overset{\leftarrow}{x}\overset{\rightarrow}{x}\overset{\leftrightarrow}{x}\overset{\leftharpoonup}{x}\overset{\leftharpoondown}{x}\overset{\rightharpoonup}{x}\overset{\rightharpoondown}{x}\overset{⎴}{x}\overset{⎵}{x}\overset{⏜}{x}\overset{⏝}{x}\overbrace{x}\overset{\underbrace{}}{x}\overset{⥎}{x}\overset{⥐}{x}} \\ +{\overset{'}{x}\hat{x}\overset{\_}{x}\grave{x}\overset{\sim}{x}\overset{¨}{x}\overline{x}\acute{x}\overset{¸}{x}\widehat{x}\check{x}\breve{x}\overset{˙}{x}\overset{˚}{x}\widetilde{x}\overset{˝}{x}\widehat{x}\overset{̑}{x}\bar{x}\dddot{x}\ddddot{x}\overset{\leftarrow}{x}\overset{\rightarrow}{x}\overset{\leftrightarrow}{x}\overset{\leftharpoonup}{x}\overset{\leftharpoondown}{x}\overset{\rightharpoonup}{x}\overset{\rightharpoondown}{x}\overbracket{x}\overset{⎵}{x}\overset{⏜}{x}\overset{⏝}{x}\overbrace{x}\overset{\underbrace{}}{x}\overset{⥎}{x}\overset{⥐}{x}} \\ \text{accent=false:} \\ -{\overset{'}{x}\overset{\hat{}}{x}\overset{\_}{x}\overset{`}{x}\overset{\sim}{x}\overset{¨}{x}\overset{¯}{x}\overset{´}{x}\overset{¸}{x}\overset{\hat{}}{x}\overset{ˇ}{x}\overset{˘}{x}\overset{˙}{x}\overset{˚}{x}\overset{˜}{x}\overset{˝}{x}\widehat{x}\overset{̑}{x}\overset{‾}{x}\dddot{x}\ddddot{x}\overset{\leftarrow}{x}\overset{\rightarrow}{x}\overset{\leftrightarrow}{x}\overset{\leftharpoonup}{x}\overset{\leftharpoondown}{x}\overset{\rightharpoonup}{x}\overset{\rightharpoondown}{x}\overset{⎴}{x}\overset{⎵}{x}\overset{⏜}{x}\overset{⏝}{x}\overbrace{x}\overset{\underbrace{}}{x}\overset{⥎}{x}\overset{⥐}{x}} +{\overset{'}{x}\overset{\hat{}}{x}\overset{\_}{x}\overset{`}{x}\overset{\sim}{x}\overset{¨}{x}\overset{¯}{x}\overset{´}{x}\overset{¸}{x}\overset{\hat{}}{x}\overset{ˇ}{x}\overset{˘}{x}\overset{˙}{x}\overset{˚}{x}\overset{˜}{x}\overset{˝}{x}\widehat{x}\overset{̑}{x}\overset{‾}{x}\dddot{x}\ddddot{x}\overset{\leftarrow}{x}\overset{\rightarrow}{x}\overset{\leftrightarrow}{x}\overset{\leftharpoonup}{x}\overset{\leftharpoondown}{x}\overset{\rightharpoonup}{x}\overset{\rightharpoondown}{x}\overbracket{x}\overset{⎵}{x}\overset{⏜}{x}\overset{⏝}{x}\overbrace{x}\overset{\underbrace{}}{x}\overset{⥎}{x}\overset{⥐}{x}} \end{array} diff --git a/test/writer/tex/accents3.test b/test/writer/tex/accents3.test --- a/test/writer/tex/accents3.test +++ b/test/writer/tex/accents3.test @@ -88,7 +88,7 @@ >>> tex \begin{array}{l} \text{default: (accent=true)} \\ -{\underset{'}{H}\underset{\hat{}}{H}\underline{H}\underset{`}{H}\underset{\sim}{H}\underset{¨}{H}\underset{¯}{H}\underset{´}{H}\underset{¸}{H}\underset{\hat{}}{H}\underset{ˇ}{H}\underset{˘}{H}\underset{˙}{H}\underset{˚}{H}\underset{˜}{H}\underset{˝}{H}\underset{\hat{}}{H}\underset{̑}{H}\underset{‾}{H}\underset{\dddot{}}{H}\underset{\ddddot{}}{H}\underset{\leftarrow}{H}\underset{\rightarrow}{H}\underset{\leftrightarrow}{H}\underset{\leftharpoonup}{H}\underset{\leftharpoondown}{H}\underset{\rightharpoonup}{H}\underset{\rightharpoondown}{H}\underset{⎴}{H}\underset{⎵}{H}\underset{⏜}{H}\underset{⏝}{H}\underset{\overbrace{}}{H}\underbrace{H}\underset{⥎}{H}\underset{⥐}{H}} \\ +{\underset{'}{H}\underset{\hat{}}{H}\underline{H}\underset{`}{H}\underset{\sim}{H}\underset{¨}{H}\underset{¯}{H}\underset{´}{H}\underset{¸}{H}\underset{\hat{}}{H}\underset{ˇ}{H}\underset{˘}{H}\underset{˙}{H}\underset{˚}{H}\underset{˜}{H}\underset{˝}{H}\underset{\hat{}}{H}\underset{̑}{H}\underset{‾}{H}\underset{\dddot{}}{H}\underset{\ddddot{}}{H}\underset{\leftarrow}{H}\underset{\rightarrow}{H}\underset{\leftrightarrow}{H}\underset{\leftharpoonup}{H}\underset{\leftharpoondown}{H}\underset{\rightharpoonup}{H}\underset{\rightharpoondown}{H}\underset{⎴}{H}\underbracket{H}\underset{⏜}{H}\underset{⏝}{H}\underset{\overbrace{}}{H}\underbrace{H}\underset{⥎}{H}\underset{⥐}{H}} \\ \text{accent=false:} \\ -{\underset{'}{H}\underset{\hat{}}{H}\underset{\_}{H}\underset{`}{H}\underset{\sim}{H}\underset{¨}{H}\underset{¯}{H}\underset{´}{H}\underset{¸}{H}\underset{\hat{}}{H}\underset{ˇ}{H}\underset{˘}{H}\underset{˙}{H}\underset{˚}{H}\underset{˜}{H}\underset{˝}{H}\underset{\hat{}}{H}\underset{̑}{H}\underset{‾}{H}\underset{\dddot{}}{H}\underset{\ddddot{}}{H}\underset{\leftarrow}{H}\underset{\rightarrow}{H}\underset{\leftrightarrow}{H}\underset{\leftharpoonup}{H}\underset{\leftharpoondown}{H}\underset{\rightharpoonup}{H}\underset{\rightharpoondown}{H}\underset{⎴}{H}\underset{⎵}{H}\underset{⏜}{H}\underset{⏝}{H}\underset{\overbrace{}}{H}\underbrace{H}\underset{⥎}{H}\underset{⥐}{H}} +{\underset{'}{H}\underset{\hat{}}{H}\underset{\_}{H}\underset{`}{H}\underset{\sim}{H}\underset{¨}{H}\underset{¯}{H}\underset{´}{H}\underset{¸}{H}\underset{\hat{}}{H}\underset{ˇ}{H}\underset{˘}{H}\underset{˙}{H}\underset{˚}{H}\underset{˜}{H}\underset{˝}{H}\underset{\hat{}}{H}\underset{̑}{H}\underset{‾}{H}\underset{\dddot{}}{H}\underset{\ddddot{}}{H}\underset{\leftarrow}{H}\underset{\rightarrow}{H}\underset{\leftrightarrow}{H}\underset{\leftharpoonup}{H}\underset{\leftharpoondown}{H}\underset{\rightharpoonup}{H}\underset{\rightharpoondown}{H}\underset{⎴}{H}\underbracket{H}\underset{⏜}{H}\underset{⏝}{H}\underset{\overbrace{}}{H}\underbrace{H}\underset{⥎}{H}\underset{⥐}{H}} \end{array} diff --git a/test/writer/tex/accents4.test b/test/writer/tex/accents4.test --- a/test/writer/tex/accents4.test +++ b/test/writer/tex/accents4.test @@ -88,7 +88,7 @@ >>> tex \begin{array}{l} \text{default: (accent=true)} \\ -{\underset{'}{x}\underset{\hat{}}{x}\underline{x}\underset{`}{x}\underset{\sim}{x}\underset{¨}{x}\underset{¯}{x}\underset{´}{x}\underset{¸}{x}\underset{\hat{}}{x}\underset{ˇ}{x}\underset{˘}{x}\underset{˙}{x}\underset{˚}{x}\underset{˜}{x}\underset{˝}{x}\underset{\hat{}}{x}\underset{̑}{x}\underset{‾}{x}\underset{\dddot{}}{x}\underset{\ddddot{}}{x}\underset{\leftarrow}{x}\underset{\rightarrow}{x}\underset{\leftrightarrow}{x}\underset{\leftharpoonup}{x}\underset{\leftharpoondown}{x}\underset{\rightharpoonup}{x}\underset{\rightharpoondown}{x}\underset{⎴}{x}\underset{⎵}{x}\underset{⏜}{x}\underset{⏝}{x}\underset{\overbrace{}}{x}\underbrace{x}\underset{⥎}{x}\underset{⥐}{x}} \\ +{\underset{'}{x}\underset{\hat{}}{x}\underline{x}\underset{`}{x}\underset{\sim}{x}\underset{¨}{x}\underset{¯}{x}\underset{´}{x}\underset{¸}{x}\underset{\hat{}}{x}\underset{ˇ}{x}\underset{˘}{x}\underset{˙}{x}\underset{˚}{x}\underset{˜}{x}\underset{˝}{x}\underset{\hat{}}{x}\underset{̑}{x}\underset{‾}{x}\underset{\dddot{}}{x}\underset{\ddddot{}}{x}\underset{\leftarrow}{x}\underset{\rightarrow}{x}\underset{\leftrightarrow}{x}\underset{\leftharpoonup}{x}\underset{\leftharpoondown}{x}\underset{\rightharpoonup}{x}\underset{\rightharpoondown}{x}\underset{⎴}{x}\underbracket{x}\underset{⏜}{x}\underset{⏝}{x}\underset{\overbrace{}}{x}\underbrace{x}\underset{⥎}{x}\underset{⥐}{x}} \\ \text{accent=false:} \\ -{\underset{'}{x}\underset{\hat{}}{x}\underset{\_}{x}\underset{`}{x}\underset{\sim}{x}\underset{¨}{x}\underset{¯}{x}\underset{´}{x}\underset{¸}{x}\underset{\hat{}}{x}\underset{ˇ}{x}\underset{˘}{x}\underset{˙}{x}\underset{˚}{x}\underset{˜}{x}\underset{˝}{x}\underset{\hat{}}{x}\underset{̑}{x}\underset{‾}{x}\underset{\dddot{}}{x}\underset{\ddddot{}}{x}\underset{\leftarrow}{x}\underset{\rightarrow}{x}\underset{\leftrightarrow}{x}\underset{\leftharpoonup}{x}\underset{\leftharpoondown}{x}\underset{\rightharpoonup}{x}\underset{\rightharpoondown}{x}\underset{⎴}{x}\underset{⎵}{x}\underset{⏜}{x}\underset{⏝}{x}\underset{\overbrace{}}{x}\underbrace{x}\underset{⥎}{x}\underset{⥐}{x}} +{\underset{'}{x}\underset{\hat{}}{x}\underset{\_}{x}\underset{`}{x}\underset{\sim}{x}\underset{¨}{x}\underset{¯}{x}\underset{´}{x}\underset{¸}{x}\underset{\hat{}}{x}\underset{ˇ}{x}\underset{˘}{x}\underset{˙}{x}\underset{˚}{x}\underset{˜}{x}\underset{˝}{x}\underset{\hat{}}{x}\underset{̑}{x}\underset{‾}{x}\underset{\dddot{}}{x}\underset{\ddddot{}}{x}\underset{\leftarrow}{x}\underset{\rightarrow}{x}\underset{\leftrightarrow}{x}\underset{\leftharpoonup}{x}\underset{\leftharpoondown}{x}\underset{\rightharpoonup}{x}\underset{\rightharpoondown}{x}\underset{⎴}{x}\underbracket{x}\underset{⏜}{x}\underset{⏝}{x}\underset{\overbrace{}}{x}\underbrace{x}\underset{⥎}{x}\underset{⥐}{x}} \end{array} diff --git a/test/writer/tex/accents5.test b/test/writer/tex/accents5.test --- a/test/writer/tex/accents5.test +++ b/test/writer/tex/accents5.test @@ -295,7 +295,7 @@ >>> tex \begin{array}{l} \text{default: (accent=true)} \\ -{\underset{'}{\overset{'}{H}}\underset{\hat{}}{\hat{H}}\underline{\overset{\_}{H}}\underset{`}{\grave{H}}\underset{\sim}{\overset{\sim}{H}}\underset{¨}{\overset{¨}{H}}\underset{¯}{\overline{H}}\underset{´}{\acute{H}}\underset{¸}{\overset{¸}{H}}\underset{\hat{}}{\widehat{H}}\underset{ˇ}{\check{H}}\underset{˘}{\breve{H}}\underset{˙}{\overset{˙}{H}}\underset{˚}{\overset{˚}{H}}\underset{˜}{\widetilde{H}}\underset{˝}{\overset{˝}{H}}\underset{\hat{}}{\widehat{H}}\underset{̑}{\overset{̑}{H}}\underset{‾}{\bar{H}}\underset{\dddot{}}{\dddot{H}}\underset{\ddddot{}}{\ddddot{H}}\underset{\leftarrow}{\overset{\leftarrow}{H}}\underset{\rightarrow}{\overset{\rightarrow}{H}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{H}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{H}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{H}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{H}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{H}}\underset{⎴}{\overset{⎴}{H}}\underset{⎵}{\overset{⎵}{H}}\underset{⏜}{\overset{⏜}{H}}\underset{⏝}{\overset{⏝}{H}}\underset{\overbrace{}}{\overbrace{H}}\underbrace{\overset{\underbrace{}}{H}}\underset{⥎}{\overset{⥎}{H}}\underset{⥐}{\overset{⥐}{H}}} \\ +{\underset{'}{\overset{'}{H}}\underset{\hat{}}{\hat{H}}\underline{\overset{\_}{H}}\underset{`}{\grave{H}}\underset{\sim}{\overset{\sim}{H}}\underset{¨}{\overset{¨}{H}}\underset{¯}{\overline{H}}\underset{´}{\acute{H}}\underset{¸}{\overset{¸}{H}}\underset{\hat{}}{\widehat{H}}\underset{ˇ}{\check{H}}\underset{˘}{\breve{H}}\underset{˙}{\overset{˙}{H}}\underset{˚}{\overset{˚}{H}}\underset{˜}{\widetilde{H}}\underset{˝}{\overset{˝}{H}}\underset{\hat{}}{\widehat{H}}\underset{̑}{\overset{̑}{H}}\underset{‾}{\bar{H}}\underset{\dddot{}}{\dddot{H}}\underset{\ddddot{}}{\ddddot{H}}\underset{\leftarrow}{\overset{\leftarrow}{H}}\underset{\rightarrow}{\overset{\rightarrow}{H}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{H}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{H}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{H}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{H}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{H}}\underset{⎴}{\overbracket{H}}\underbracket{\overset{⎵}{H}}\underset{⏜}{\overset{⏜}{H}}\underset{⏝}{\overset{⏝}{H}}\underset{\overbrace{}}{\overbrace{H}}\underbrace{\overset{\underbrace{}}{H}}\underset{⥎}{\overset{⥎}{H}}\underset{⥐}{\overset{⥐}{H}}} \\ \text{accent=false:} \\ -{\underset{'}{\overset{'}{H}}\underset{\hat{}}{\overset{\hat{}}{H}}\underset{\_}{\overset{\_}{H}}\underset{`}{\overset{`}{H}}\underset{\sim}{\overset{\sim}{H}}\underset{¨}{\overset{¨}{H}}\underset{¯}{\overset{¯}{H}}\underset{´}{\overset{´}{H}}\underset{¸}{\overset{¸}{H}}\underset{\hat{}}{\overset{\hat{}}{H}}\underset{ˇ}{\overset{ˇ}{H}}\underset{˘}{\overset{˘}{H}}\underset{˙}{\overset{˙}{H}}\underset{˚}{\overset{˚}{H}}\underset{˜}{\overset{˜}{H}}\underset{˝}{\overset{˝}{H}}\underset{\hat{}}{\widehat{H}}\underset{̑}{\overset{̑}{H}}\underset{‾}{\overset{‾}{H}}\underset{\dddot{}}{\dddot{H}}\underset{\ddddot{}}{\ddddot{H}}\underset{\leftarrow}{\overset{\leftarrow}{H}}\underset{\rightarrow}{\overset{\rightarrow}{H}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{H}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{H}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{H}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{H}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{H}}\underset{⎴}{\overset{⎴}{H}}\underset{⎵}{\overset{⎵}{H}}\underset{⏜}{\overset{⏜}{H}}\underset{⏝}{\overset{⏝}{H}}\underset{\overbrace{}}{\overbrace{H}}\underbrace{\overset{\underbrace{}}{H}}\underset{⥎}{\overset{⥎}{H}}\underset{⥐}{\overset{⥐}{H}}} +{\underset{'}{\overset{'}{H}}\underset{\hat{}}{\overset{\hat{}}{H}}\underset{\_}{\overset{\_}{H}}\underset{`}{\overset{`}{H}}\underset{\sim}{\overset{\sim}{H}}\underset{¨}{\overset{¨}{H}}\underset{¯}{\overset{¯}{H}}\underset{´}{\overset{´}{H}}\underset{¸}{\overset{¸}{H}}\underset{\hat{}}{\overset{\hat{}}{H}}\underset{ˇ}{\overset{ˇ}{H}}\underset{˘}{\overset{˘}{H}}\underset{˙}{\overset{˙}{H}}\underset{˚}{\overset{˚}{H}}\underset{˜}{\overset{˜}{H}}\underset{˝}{\overset{˝}{H}}\underset{\hat{}}{\widehat{H}}\underset{̑}{\overset{̑}{H}}\underset{‾}{\overset{‾}{H}}\underset{\dddot{}}{\dddot{H}}\underset{\ddddot{}}{\ddddot{H}}\underset{\leftarrow}{\overset{\leftarrow}{H}}\underset{\rightarrow}{\overset{\rightarrow}{H}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{H}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{H}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{H}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{H}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{H}}\underset{⎴}{\overbracket{H}}\underbracket{\overset{⎵}{H}}\underset{⏜}{\overset{⏜}{H}}\underset{⏝}{\overset{⏝}{H}}\underset{\overbrace{}}{\overbrace{H}}\underbrace{\overset{\underbrace{}}{H}}\underset{⥎}{\overset{⥎}{H}}\underset{⥐}{\overset{⥐}{H}}} \end{array} diff --git a/test/writer/tex/accents6.test b/test/writer/tex/accents6.test --- a/test/writer/tex/accents6.test +++ b/test/writer/tex/accents6.test @@ -295,7 +295,7 @@ >>> tex \begin{array}{l} \text{default: (accent=true)} \\ -{\underset{'}{\overset{'}{x}}\underset{\hat{}}{\hat{x}}\underline{\overset{\_}{x}}\underset{`}{\grave{x}}\underset{\sim}{\overset{\sim}{x}}\underset{¨}{\overset{¨}{x}}\underset{¯}{\overline{x}}\underset{´}{\acute{x}}\underset{¸}{\overset{¸}{x}}\underset{\hat{}}{\widehat{x}}\underset{ˇ}{\check{x}}\underset{˘}{\breve{x}}\underset{˙}{\overset{˙}{x}}\underset{˚}{\overset{˚}{x}}\underset{˜}{\widetilde{x}}\underset{˝}{\overset{˝}{x}}\underset{\hat{}}{\widehat{x}}\underset{̑}{\overset{̑}{x}}\underset{‾}{\bar{x}}\underset{\dddot{}}{\dddot{x}}\underset{\ddddot{}}{\ddddot{x}}\underset{\leftarrow}{\overset{\leftarrow}{x}}\underset{\rightarrow}{\overset{\rightarrow}{x}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{x}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{x}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{x}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{x}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{x}}\underset{⎴}{\overset{⎴}{x}}\underset{⎵}{\overset{⎵}{x}}\underset{⏜}{\overset{⏜}{x}}\underset{⏝}{\overset{⏝}{x}}\underset{\overbrace{}}{\overbrace{x}}\underbrace{\overset{\underbrace{}}{x}}\underset{⥎}{\overset{⥎}{x}}\underset{⥐}{\overset{⥐}{x}}} \\ +{\underset{'}{\overset{'}{x}}\underset{\hat{}}{\hat{x}}\underline{\overset{\_}{x}}\underset{`}{\grave{x}}\underset{\sim}{\overset{\sim}{x}}\underset{¨}{\overset{¨}{x}}\underset{¯}{\overline{x}}\underset{´}{\acute{x}}\underset{¸}{\overset{¸}{x}}\underset{\hat{}}{\widehat{x}}\underset{ˇ}{\check{x}}\underset{˘}{\breve{x}}\underset{˙}{\overset{˙}{x}}\underset{˚}{\overset{˚}{x}}\underset{˜}{\widetilde{x}}\underset{˝}{\overset{˝}{x}}\underset{\hat{}}{\widehat{x}}\underset{̑}{\overset{̑}{x}}\underset{‾}{\bar{x}}\underset{\dddot{}}{\dddot{x}}\underset{\ddddot{}}{\ddddot{x}}\underset{\leftarrow}{\overset{\leftarrow}{x}}\underset{\rightarrow}{\overset{\rightarrow}{x}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{x}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{x}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{x}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{x}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{x}}\underset{⎴}{\overbracket{x}}\underbracket{\overset{⎵}{x}}\underset{⏜}{\overset{⏜}{x}}\underset{⏝}{\overset{⏝}{x}}\underset{\overbrace{}}{\overbrace{x}}\underbrace{\overset{\underbrace{}}{x}}\underset{⥎}{\overset{⥎}{x}}\underset{⥐}{\overset{⥐}{x}}} \\ \text{accent=false:} \\ -{\underset{'}{\overset{'}{x}}\underset{\hat{}}{\overset{\hat{}}{x}}\underset{\_}{\overset{\_}{x}}\underset{`}{\overset{`}{x}}\underset{\sim}{\overset{\sim}{x}}\underset{¨}{\overset{¨}{x}}\underset{¯}{\overset{¯}{x}}\underset{´}{\overset{´}{x}}\underset{¸}{\overset{¸}{x}}\underset{\hat{}}{\overset{\hat{}}{x}}\underset{ˇ}{\overset{ˇ}{x}}\underset{˘}{\overset{˘}{x}}\underset{˙}{\overset{˙}{x}}\underset{˚}{\overset{˚}{x}}\underset{˜}{\overset{˜}{x}}\underset{˝}{\overset{˝}{x}}\underset{\hat{}}{\widehat{x}}\underset{̑}{\overset{̑}{x}}\underset{‾}{\overset{‾}{x}}\underset{\dddot{}}{\dddot{x}}\underset{\ddddot{}}{\ddddot{x}}\underset{\leftarrow}{\overset{\leftarrow}{x}}\underset{\rightarrow}{\overset{\rightarrow}{x}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{x}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{x}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{x}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{x}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{x}}\underset{⎴}{\overset{⎴}{x}}\underset{⎵}{\overset{⎵}{x}}\underset{⏜}{\overset{⏜}{x}}\underset{⏝}{\overset{⏝}{x}}\underset{\overbrace{}}{\overbrace{x}}\underbrace{\overset{\underbrace{}}{x}}\underset{⥎}{\overset{⥎}{x}}\underset{⥐}{\overset{⥐}{x}}} +{\underset{'}{\overset{'}{x}}\underset{\hat{}}{\overset{\hat{}}{x}}\underset{\_}{\overset{\_}{x}}\underset{`}{\overset{`}{x}}\underset{\sim}{\overset{\sim}{x}}\underset{¨}{\overset{¨}{x}}\underset{¯}{\overset{¯}{x}}\underset{´}{\overset{´}{x}}\underset{¸}{\overset{¸}{x}}\underset{\hat{}}{\overset{\hat{}}{x}}\underset{ˇ}{\overset{ˇ}{x}}\underset{˘}{\overset{˘}{x}}\underset{˙}{\overset{˙}{x}}\underset{˚}{\overset{˚}{x}}\underset{˜}{\overset{˜}{x}}\underset{˝}{\overset{˝}{x}}\underset{\hat{}}{\widehat{x}}\underset{̑}{\overset{̑}{x}}\underset{‾}{\overset{‾}{x}}\underset{\dddot{}}{\dddot{x}}\underset{\ddddot{}}{\ddddot{x}}\underset{\leftarrow}{\overset{\leftarrow}{x}}\underset{\rightarrow}{\overset{\rightarrow}{x}}\underset{\leftrightarrow}{\overset{\leftrightarrow}{x}}\underset{\leftharpoonup}{\overset{\leftharpoonup}{x}}\underset{\leftharpoondown}{\overset{\leftharpoondown}{x}}\underset{\rightharpoonup}{\overset{\rightharpoonup}{x}}\underset{\rightharpoondown}{\overset{\rightharpoondown}{x}}\underset{⎴}{\overbracket{x}}\underbracket{\overset{⎵}{x}}\underset{⏜}{\overset{⏜}{x}}\underset{⏝}{\overset{⏝}{x}}\underset{\overbrace{}}{\overbrace{x}}\underbrace{\overset{\underbrace{}}{x}}\underset{⥎}{\overset{⥎}{x}}\underset{⥐}{\overset{⥐}{x}}} \end{array} diff --git a/test/writer/tex/cancel.test b/test/writer/tex/cancel.test new file mode 100644 --- /dev/null +++ b/test/writer/tex/cancel.test @@ -0,0 +1,13 @@ +<<< native +[ EBoxed + (EGrouped + [ ECancel ForwardSlash (EIdentifier "x") + , ESymbol Bin "+" + , ECancel BackSlash (EIdentifier "y") + , ESymbol Rel "=" + , ECancel XSlash (EIdentifier "z") + ]) +] + +>>> tex +\boxed{\cancel{x} + \bcancel{y} = \xcancel{z}} diff --git a/test/writer/tex/subsup.test b/test/writer/tex/subsup.test --- a/test/writer/tex/subsup.test +++ b/test/writer/tex/subsup.test @@ -65,4 +65,4 @@ , ESubsup (ESpace (1 % 1)) (EIdentifier "x") (ENumber "3") ] >>> tex -x_{b}^{a}\quad x_{b}^{a}\quad\min_{A}\quad\max_{B}\quad\det_{C}\quad\Pr_{A}\quad\gcd_{A}\quad{\dot{u}}^{2}\quad{\overline{u}}_{\varepsilon}\quad{\underline{u}}_{b}^{a}\quad\overset{\text{term}}{\overbrace{a + b}}\quad\overset{c}{\overset{⎴}{a + b}}\quad\underset{c}{\underbrace{a + b}}\quad\underset{c}{\underset{⎵}{a + b}}\quad^{H}e3\quad_{x}A\quad_{x}^{3} +x_{b}^{a}\quad x_{b}^{a}\quad\min_{A}\quad\max_{B}\quad\det_{C}\quad\Pr_{A}\quad\gcd_{A}\quad{\dot{u}}^{2}\quad{\overline{u}}_{\varepsilon}\quad{\underline{u}}_{b}^{a}\quad\overset{\text{term}}{\overbrace{a + b}}\quad\overset{c}{\overbracket{a + b}}\quad\underset{c}{\underbrace{a + b}}\quad\underset{c}{\underbracket{a + b}}\quad^{H}e3\quad_{x}A\quad_{x}^{3} diff --git a/test/writer/typst/17.test b/test/writer/typst/17.test --- a/test/writer/typst/17.test +++ b/test/writer/typst/17.test @@ -8,4 +8,4 @@ , EIdentifier "x" ] >>> typst -x \* 4 = 4 \* x +x * 4 = 4 * x diff --git a/test/writer/typst/cancel.test b/test/writer/typst/cancel.test new file mode 100644 --- /dev/null +++ b/test/writer/typst/cancel.test @@ -0,0 +1,9 @@ +<<< native +[ ECancel ForwardSlash (EIdentifier "x") +, ESymbol Bin "+" +, ECancel BackSlash (EIdentifier "y") +, ESymbol Rel "=" +, ECancel XSlash (EIdentifier "z") +] +>>> typst +cancel(x) + cancel(y, inverted: #true) = cancel(z, cross: #true) diff --git a/test/writer/typst/primes2.test b/test/writer/typst/primes2.test --- a/test/writer/typst/primes2.test +++ b/test/writer/typst/primes2.test @@ -27,4 +27,4 @@ , ESuper (EIdentifier "H") (ESymbol Accent "\8279") ] >>> typst -H^(\") H^(') H^(\*) H^(`) H^ª H^degree H^(²) H^(³) H^acute H^(¹) H^º H^quote.l.single H^quote.r.single H^quote.low.single H^quote.high.single H^quote.l.double H^quote.r.double H^quote.low.double H^quote.high.double H' H^('') H^(''') H^prime.rev H^prime.double.rev H^prime.triple.rev H^('''') +H^(\") H^(') H^(*) H^(`) H^ª H^degree H^(²) H^(³) H^acute H^(¹) H^º H^quote.l.single H^quote.r.single H^quote.low.single H^quote.high.single H^quote.l.double H^quote.r.double H^quote.low.double H^quote.high.double H' H^('') H^(''') H^prime.rev H^prime.double.rev H^prime.triple.rev H^('''') diff --git a/test/writer/typst/simple_sum_formula.test b/test/writer/typst/simple_sum_formula.test --- a/test/writer/typst/simple_sum_formula.test +++ b/test/writer/typst/simple_sum_formula.test @@ -12,4 +12,4 @@ (ENumber "2") ] >>> typst -sum_(i = 1)^100 x = frac(100 \* 101, 2) +sum_(i = 1)^100 x = frac(100 * 101, 2) diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.12.10.3 +Version: 0.13 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between math formats.