diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -26,14 +26,6 @@ By default, the executable will be installed in `~/.cabal/bin`. -Alternatively, texmath can be installed using -[stack](https://github.com/commercialhaskell/stack). Install -the stack binary somewhere in your path. Then, in the texmath -repository, - - stack setup - stack install --flag texmath:executable - The `texmath` binary will be put in `~/.local/bin`. Macro definitions may be included before a LaTeX formula. @@ -46,7 +38,7 @@ But it is also possible to compile a full webserver with a JSON API. To do this, set the `server` cabal flag, e.g. - stack install --flag texmath:server + cabal install -fserver To run the server on port 3000: @@ -145,7 +137,7 @@ # The test suite -To run the test suite, do `cabal test` or `stack test`. +To run the test suite, do `cabal test`. In its standard mode, the test suite will run golden tests of the individual readers and writers. Reader tests can be found @@ -160,12 +152,12 @@ If many tests fail as a result of changes, but the test failures are all because of improvements in the output, you can pass `--accept` to the test suite (e.g., with -`--test-arguments=--accept` on `stack test`), and the existing +`--test-option=--accept` on `cabal test`), and the existing golden files will be overwritten. If you do this, inspect the outputs very carefully to make sure they are correct. If you pass the `--roundtrip` option into the test suite -(e.g., using `--test-arguments=--roundtrip` with `stack test`), +(e.g., using `--test-option=--roundtrip` with `cabal test`), round-trip tests will be run instead. Many of these will fail. In these tests, the native inputs in `test/roundtrip/*.native` will be converted to (respectively) `mml`, `omml`, or `tex`, diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,65 @@ +texmath (0.13.1.2) + + * Typst writer: Avoid using deprecated symbols (#287). + This requires depending on typst-symbols 0.2.*. + +texmath (0.13.1.1) + + * Typst writer: don't add extra spaces around `|` or escaped + symbols (#286). + +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). + + * Update tests for latest typst symbols. + + * Require typst-symbols 0.1.9.1. + +texmath (0.13.0.1) + + * TeX reader: fix parsing of primes (#273). + We previously misparsed `a_i'` as `a_{i'}` rather than `{a_i}'`. + + * Typst writer: fix position of primes with ESubSup. + In typst, unlike tex, the primes must come after the base. + +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 @@ -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 @@ -278,7 +281,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 @@ -52,28 +52,22 @@ -- The parser -expr1 :: TP Exp -expr1 = do - e <- expr2 - -- check for primes and add them as a subscript - -- in TeX ' is shorthand for ^{\prime} - primes <- many (char '\'') - let getPrimes cs = case cs of - "" -> "" - "'" -> "\x2032" - "''" -> "\x2033" - "'''" -> "\x2034" - "''''" -> "\x2057" - _ -> "\x2057" ++ getPrimes (drop 4 cs) - ignorable - case getPrimes primes of - "" -> return e - cs -> return $ case e of - ESub b sub -> ESubsup b sub (ESymbol Pun (T.pack cs)) - _ -> ESuper e (ESymbol Pun (T.pack cs)) +primes :: TP Exp +primes = do + ESymbol Pun . getPrimes <$> (many1 (char '\'') <* ignorable) -expr2 :: TP Exp -expr2 = choice +getPrimes :: [Char] -> Text +getPrimes cs = + case cs of + "" -> "" + "'" -> "\x2032" + "''" -> "\x2033" + "'''" -> "\x2034" + "''''" -> "\x2057" + _ -> "\x2057" <> getPrimes (drop 4 cs) + +expr1 :: TP Exp +expr1 = choice [ inbraces , variable , number @@ -229,6 +223,7 @@ , mathop c , phantom c , boxed c + , cancel c , binary c , genfrac c , substack c @@ -254,7 +249,7 @@ ctrlseq "operatorname" -- these are slightly different but we won't worry about that here... convertible <- (char '*' >> spaces >> return True) <|> return False - tok' <- texSymbol <|> braces (manyExp expr2) <|> texChar + tok' <- texSymbol <|> braces (manyExp expr1) <|> texChar tok'' <- (EMathOperator <$> (expToOperatorName tok')) <|> return (EStyled TextNormal [tok']) return (tok'', convertible) @@ -612,8 +607,8 @@ subSup :: Maybe Bool -> Bool -> Exp -> TP Exp subSup limits convertible a = try $ do - let sub1 = symbol "_" >> expr1 - let sup1 = symbol "^" >> expr1 + let sub1 = symbol "_" >> expr1 -- see #273 + let sup1 = (symbol "^" >> expr1) <|> primes (b,c) <- try (do {m <- sub1; n <- sup1; return (m,n)}) <|> (do {n <- sup1; m <- sub1; return (m,n)}) return $ case limits of @@ -624,9 +619,8 @@ superOrSubscripted :: Maybe Bool -> Bool -> Exp -> TP Exp superOrSubscripted limits convertible a = try $ do - c <- oneOf "^_" - spaces - b <- expr + (c,b) <- ((,) <$> oneOf "^_" <*> (spaces >> expr)) + <|> (('^',) <$> primes) case c of '^' -> return $ case limits of Just True -> EOver False a b @@ -660,14 +654,43 @@ 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 + +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/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 @@ -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 @@ -217,7 +219,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 +243,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 @@ -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 @@ -300,6 +304,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 +347,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 @@ -25,7 +25,7 @@ import qualified Data.Text as T import Text.TeXMath.Types import qualified Text.TeXMath.Shared as S -import Typst.Symbols (typstSymbols) +import qualified Typst.Symbols as TS import Data.Generics (everywhere, mkT) import Data.Text (Text) import Data.Char (isDigit, isAlpha, isAscii) @@ -43,7 +43,11 @@ writeExps = go . map writeExp where go (a : b : es) - | T.take 1 b == "'" -- avoid space before a prime #239 + | Just (bstart, _) <- T.uncons b + , Just (astart, _) <- T.uncons a + , Just (_, aend) <- T.unsnoc a + , bstart == '\'' -- avoid space before a prime #239 + || bstart == '|' || aend == '|' || bstart == '\\' || astart == '\\' -- #286 = a <> go (b:es) go (a : as) = a <> if null as @@ -74,12 +78,12 @@ needsEscape '(' = True needsEscape ')' = True needsEscape '_' = True - needsEscape '*' = True needsEscape '^' = True needsEscape '"' = True needsEscape '/' = True needsEscape '\\' = True needsEscape ',' = True -- #242 + needsEscape ';' = True -- #275 needsEscape _ = False escInQuotes :: Text -> Text @@ -142,11 +146,12 @@ writeExp (ESuper b e1) = writeExpB b <> case S.toPrimes e1 of Just ps -> ps - _ -> "^" <> writeExpS e1 -writeExp (ESubsup b e1 e2) = writeExpB b <> "_" <> writeExpS e1 <> - case S.toPrimes e2 of - Just ps -> ps - _ -> "^" <> writeExpS e2 + Nothing -> "^" <> writeExpS e1 +writeExp (ESubsup b e1 e2) = + writeExpB b <> + case S.toPrimes e2 of + Just ps -> ps <> "_" <> writeExpS e1 + Nothing -> "_" <> writeExpS e1 <> "^" <> writeExpS e2 writeExp (EOver _ (EOver _ b (ESymbol TOver "\9182")) e1) = "overbrace(" <> writeExp b <> ", " <> writeExp e1 <> ")" writeExp (EOver _ (EOver _ b (ESymbol TOver "\9140")) e1) = @@ -226,6 +231,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) <> @@ -302,7 +310,10 @@ typstSymbolMap :: M.Map Text Text typstSymbolMap = M.fromList $ ("\776", "dot.double") -- see #231 - : [(s,name) | (name, _, s) <- typstSymbols] + : [(s,name) | TS.Sym { TS.symName = name + , TS.symText = s + , TS.symDeprecation = Nothing + } <- TS.typstSymbols] getAccentCommand :: Text -> Maybe Text getAccentCommand ac = do 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 @@ -102,9 +102,9 @@ upright("^\\backprime") x^prime.rev\ upright("^\\backdprime") x^prime.double.rev\ upright("^\\backtrprime") x^prime.triple.rev\ -upright("^\\hyphenbullet") x^(โƒ)\ -upright("^\\ast") x^(\*)\ +upright("^\\hyphenbullet") x^bullet.hyph\ +upright("^\\ast") x^(*)\ upright("^\\vysmwhtcircle") x^compose\ upright("^\\vysmblkcircle") x^circle.filled.small\ -upright("^\\llcorner") x^\โŒž\ -upright("^\\ulcorner") x^\โŒœ\ +upright("^\\llcorner") x^corner.l.b\ +upright("^\\ulcorner") x^corner.l.t\ diff --git a/test/regression/273.test b/test/regression/273.test new file mode 100644 --- /dev/null +++ b/test/regression/273.test @@ -0,0 +1,5 @@ +<<< tex +a_i' +>>> native +[ ESubsup (EIdentifier "a") (EIdentifier "i") (ESymbol Pun "\8242") +] diff --git a/test/regression/275.test b/test/regression/275.test new file mode 100644 --- /dev/null +++ b/test/regression/275.test @@ -0,0 +1,14 @@ +<<< native +[ EDelimited + "{" + "" + [ Right + (EArray + [ AlignLeft , AlignLeft ] + [ [ [ EIdentifier "a" ] , [ ESymbol Pun ";" ] ] + , [ [ EIdentifier "b" ] , [ EIdentifier "c" ] ] + ]) + ] +] +>>> typst +cases(delim: "{", a & \;, b & c) 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/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/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/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/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 @@ - ๐‚ + ๐‘ช ( n @@ -53,7 +53,7 @@ = - ๐‚ + ๐‘ช k n @@ -63,7 +63,7 @@ n - ๐‚ + ๐‘ช k = 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 ⁡ @@ -11336,7 +11336,7 @@ = - ๐’ฉ + ๐’ฉ ⁡ ( @@ -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 @@ - โˆ‡ร— + โˆ‡ร— ⁡ @@ -11695,12 +11695,12 @@ - ๐š + ๐’‚ + - ๐› + ๐’ƒ = - ๐œ + ๐’„ @@ -11726,7 +11726,7 @@ ⁡ ( - ๐ฑ + ๐’™ ) @@ -11743,21 +11743,21 @@ - ๐‘‡ + ๐‘‡ ⁢ - โ„Ž + โ„Ž ⁢ - ๐‘’ + ๐‘’ ⁢ - ๐‘ž + ๐‘ž ⁢ - ๐‘ข + ๐‘ข ⁢ - ๐‘– + ๐‘– ⁢ - ๐‘ + ๐‘ ⁢ - ๐‘˜ + ๐‘˜ ⁢ b ⁢ @@ -11785,13 +11785,13 @@ ⁢ s ⁢ - ๐จ + ๐’ ⁢ - ๐ฏ + ๐’— ⁢ - ๐ž + ๐’† ⁢ - ๐ซ + ๐’“ ⁢ t ⁢ @@ -11799,19 +11799,19 @@ ⁢ e ⁢ - ๐—… + ๐—… ⁢ - ๐–บ + ๐–บ ⁢ - ๐—“ + ๐—“ ⁢ - ๐—’ + ๐—’ ⁢ - ๐š + ๐š ⁢ - ๐š˜ + ๐š˜ ⁢ - ๐š + ๐š . @@ -12085,7 +12085,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,12 +14249,12 @@ - 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 ⁡ @@ -16898,7 +16898,7 @@ - ๐‘ + ๐‘น 3 @@ -16976,15 +16976,15 @@ ( - โˆ‡ร— + โˆ‡ร— ⁡ - ๐… + ๐‘ญ ) โ‹… - ๐ค + ๐’Œ = @@ -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/miAtoken5.test b/test/writer/mml/miAtoken5.test --- a/test/writer/mml/miAtoken5.test +++ b/test/writer/mml/miAtoken5.test @@ -64,7 +64,7 @@ - ๐’œ + ๐’œ + A + @@ -77,7 +77,7 @@ - ๐’œ + ๐’œ + A + diff --git a/test/writer/mml/miequivalents11.test b/test/writer/mml/miequivalents11.test --- a/test/writer/mml/miequivalents11.test +++ b/test/writer/mml/miequivalents11.test @@ -122,7 +122,7 @@ ๐€ = - ๐€ + ๐‘จ @@ -131,7 +131,7 @@ ๐ด = - ๐ด + ๐ด @@ -140,7 +140,7 @@ ๐‘จ = - ๐‘จ + ๐‘จ @@ -149,7 +149,7 @@ ๐”ธ = - ๐”ธ + ๐”ธ = ๐”ธ @@ -160,7 +160,7 @@ ๐’œ = - ๐’œ + ๐’œ = ๐’œ @@ -171,7 +171,7 @@ ๐“ = - ๐“ + ๐“ @@ -180,7 +180,7 @@ ๐”„ = - ๐”„ + ๐”„ = ๐”„ @@ -191,7 +191,7 @@ ๐•ฌ = - ๐•ฌ + ๐•ฌ @@ -200,7 +200,7 @@ ๐–  = - ๐–  + ๐–  @@ -209,7 +209,7 @@ ๐—” = - ๐—” + ๐—” @@ -218,7 +218,7 @@ ๐˜ˆ = - ๐˜ˆ + ๐˜ˆ @@ -227,7 +227,7 @@ ๐˜ผ = - ๐˜ผ + ๐˜ผ @@ -236,7 +236,7 @@ ๐™ฐ = - ๐™ฐ + ๐™ฐ diff --git a/test/writer/mml/mimathvariant13.test b/test/writer/mml/mimathvariant13.test --- a/test/writer/mml/mimathvariant13.test +++ b/test/writer/mml/mimathvariant13.test @@ -65,46 +65,46 @@ a - ๐š + ๐’‚ - ๐‘Ž + ๐‘Ž - ๐’‚ + ๐’‚ - ๐•’ + ๐•’ - ๐–† + ๐–† - ๐’ถ + ๐’ถ - ๐“ช + ๐“ช - ๐”ž + ๐”ž - ๐–บ + ๐–บ - ๐—ฎ + ๐—ฎ - ๐˜ข + ๐˜ข - ๐™– + ๐™– - ๐šŠ + ๐šŠ - ๐š๐› + ๐’‚๐’ƒ @@ -115,46 +115,46 @@ A - ๐€ + ๐‘จ - ๐ด + ๐ด - ๐‘จ + ๐‘จ - ๐”ธ + ๐”ธ - ๐•ฌ + ๐•ฌ - ๐’œ + ๐’œ - ๐“ + ๐“ - ๐”„ + ๐”„ - ๐–  + ๐–  - ๐—” + ๐—” - ๐˜ˆ + ๐˜ˆ - ๐˜ผ + ๐˜ผ - ๐™ฐ + ๐™ฐ - ๐›‚ + ๐œถ diff --git a/test/writer/mml/mimathvariant14.test b/test/writer/mml/mimathvariant14.test --- a/test/writer/mml/mimathvariant14.test +++ b/test/writer/mml/mimathvariant14.test @@ -46,40 +46,40 @@ - ๐”„๐”…โ„ญ๐”‡๐”ˆ๐”‰๐”Šโ„Œโ„‘๐”๐”Ž๐”๐”๐”‘๐”’๐”“๐””โ„œ๐”–๐”—๐”˜๐”™๐”š๐”›๐”œโ„จ - ๐”ž๐”Ÿ๐” ๐”ก๐”ข๐”ฃ๐”ค๐”ฅ๐”ฆ๐”ง๐”จ๐”ฉ๐”ช๐”ซ๐”ฌ๐”ญ๐”ฎ๐”ฏ๐”ฐ๐”ฑ๐”ฒ๐”ณ๐”ด๐”ต๐”ถ๐”ท + ๐”„๐”…โ„ญ๐”‡๐”ˆ๐”‰๐”Šโ„Œโ„‘๐”๐”Ž๐”๐”๐”‘๐”’๐”“๐””โ„œ๐”–๐”—๐”˜๐”™๐”š๐”›๐”œโ„จ + ๐”ž๐”Ÿ๐” ๐”ก๐”ข๐”ฃ๐”ค๐”ฅ๐”ฆ๐”ง๐”จ๐”ฉ๐”ช๐”ซ๐”ฌ๐”ญ๐”ฎ๐”ฏ๐”ฐ๐”ฑ๐”ฒ๐”ณ๐”ด๐”ต๐”ถ๐”ท - ๐•ฌ๐•ญ๐•ฎ๐•ฏ๐•ฐ๐•ฑ๐•ฒ๐•ณ๐•ด๐•ต๐•ถ๐•ท๐•ธ๐•น๐•บ๐•ป๐•ผ๐•ฝ๐•พ๐•ฟ๐–€๐–๐–‚๐–ƒ๐–„๐–… - ๐–†๐–‡๐–ˆ๐–‰๐–Š๐–‹๐–Œ๐–๐–Ž๐–๐–๐–‘๐–’๐–“๐–”๐–•๐––๐–—๐–˜๐–™๐–š๐–›๐–œ๐–๐–ž๐–Ÿ + ๐•ฌ๐•ญ๐•ฎ๐•ฏ๐•ฐ๐•ฑ๐•ฒ๐•ณ๐•ด๐•ต๐•ถ๐•ท๐•ธ๐•น๐•บ๐•ป๐•ผ๐•ฝ๐•พ๐•ฟ๐–€๐–๐–‚๐–ƒ๐–„๐–… + ๐–†๐–‡๐–ˆ๐–‰๐–Š๐–‹๐–Œ๐–๐–Ž๐–๐–๐–‘๐–’๐–“๐–”๐–•๐––๐–—๐–˜๐–™๐–š๐–›๐–œ๐–๐–ž๐–Ÿ - ๐”ธ๐”นโ„‚๐”ป๐”ผ๐”ฝ๐”พโ„๐•€๐•๐•‚๐•ƒ๐•„โ„•๐•†โ„™โ„šโ„๐•Š๐•‹๐•Œ๐•๐•Ž๐•๐•โ„ค - ๐•’๐•“๐•”๐••๐•–๐•—๐•˜๐•™๐•š๐•›๐•œ๐•๐•ž๐•Ÿ๐• ๐•ก๐•ข๐•ฃ๐•ค๐•ฅ๐•ฆ๐•ง๐•จ๐•ฉ๐•ช๐•ซ + ๐”ธ๐”นโ„‚๐”ป๐”ผ๐”ฝ๐”พโ„๐•€๐•๐•‚๐•ƒ๐•„โ„•๐•†โ„™โ„šโ„๐•Š๐•‹๐•Œ๐•๐•Ž๐•๐•โ„ค + ๐•’๐•“๐•”๐••๐•–๐•—๐•˜๐•™๐•š๐•›๐•œ๐•๐•ž๐•Ÿ๐• ๐•ก๐•ข๐•ฃ๐•ค๐•ฅ๐•ฆ๐•ง๐•จ๐•ฉ๐•ช๐•ซ - ๐’œโ„ฌ๐’ž๐’Ÿโ„ฐโ„ฑ๐’ขโ„‹โ„๐’ฅ๐’ฆโ„’โ„ณ๐’ฉ๐’ช๐’ซ๐’ฌโ„›๐’ฎ๐’ฏ๐’ฐ๐’ฑ๐’ฒ๐’ณ๐’ด๐’ต - ๐’ถ๐’ท๐’ธ๐’นโ„ฏ๐’ปโ„Š๐’ฝ๐’พ๐’ฟ๐“€๐“๐“‚๐“ƒโ„ด๐“…๐“†๐“‡๐“ˆ๐“‰๐“Š๐“‹๐“Œ๐“๐“Ž๐“ + ๐’œโ„ฌ๐’ž๐’Ÿโ„ฐโ„ฑ๐’ขโ„‹โ„๐’ฅ๐’ฆโ„’โ„ณ๐’ฉ๐’ช๐’ซ๐’ฌโ„›๐’ฎ๐’ฏ๐’ฐ๐’ฑ๐’ฒ๐’ณ๐’ด๐’ต + ๐’ถ๐’ท๐’ธ๐’นโ„ฏ๐’ปโ„Š๐’ฝ๐’พ๐’ฟ๐“€๐“๐“‚๐“ƒโ„ด๐“…๐“†๐“‡๐“ˆ๐“‰๐“Š๐“‹๐“Œ๐“๐“Ž๐“ - ๐“๐“‘๐“’๐““๐“”๐“•๐“–๐“—๐“˜๐“™๐“š๐“›๐“œ๐“๐“ž๐“Ÿ๐“ ๐“ก๐“ข๐“ฃ๐“ค๐“ฅ๐“ฆ๐“ง๐“จ๐“ฉ - ๐“ช๐“ซ๐“ฌ๐“ญ๐“ฎ๐“ฏ๐“ฐ๐“ฑ๐“ฒ๐“ณ๐“ด๐“ต๐“ถ๐“ท๐“ธ๐“น๐“บ๐“ป๐“ผ๐“ฝ๐“พ๐“ฟ๐”€๐”๐”‚๐”ƒ + ๐“๐“‘๐“’๐““๐“”๐“•๐“–๐“—๐“˜๐“™๐“š๐“›๐“œ๐“๐“ž๐“Ÿ๐“ ๐“ก๐“ข๐“ฃ๐“ค๐“ฅ๐“ฆ๐“ง๐“จ๐“ฉ + ๐“ช๐“ซ๐“ฌ๐“ญ๐“ฎ๐“ฏ๐“ฐ๐“ฑ๐“ฒ๐“ณ๐“ด๐“ต๐“ถ๐“ท๐“ธ๐“น๐“บ๐“ป๐“ผ๐“ฝ๐“พ๐“ฟ๐”€๐”๐”‚๐”ƒ 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/mstyleA2.test b/test/writer/mml/mstyleA2.test --- a/test/writer/mml/mstyleA2.test +++ b/test/writer/mml/mstyleA2.test @@ -9,6 +9,6 @@ 2 + - ๐’™ + ๐’™ 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/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/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/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/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/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/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/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/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/07.test b/test/writer/typst/07.test --- a/test/writer/typst/07.test +++ b/test/writer/typst/07.test @@ -20,4 +20,4 @@ , EIdentifier "a" ] >>> typst -u'' + p (x) u' + q (x) u = f (x) \, quad x > a +u'' + p (x) u' + q (x) u = f (x)\,quad x > a diff --git a/test/writer/typst/08.test b/test/writer/typst/08.test --- a/test/writer/typst/08.test +++ b/test/writer/typst/08.test @@ -30,4 +30,4 @@ , EDelimited "(" ")" [ Right (EIdentifier "z") ] ] >>> typst -lr(|macron(z)|) = lr(|z|) \, lr(|(macron(z))^n|) = lr(|z|)^n \, arg (z^n) = n arg (z) +lr(|macron(z)|) = lr(|z|)\,lr(|(macron(z))^n|) = lr(|z|)^n\,arg (z^n) = n arg (z) diff --git a/test/writer/typst/11.test b/test/writer/typst/11.test --- a/test/writer/typst/11.test +++ b/test/writer/typst/11.test @@ -23,4 +23,4 @@ NormalFrac (ENumber "1") (ESub (EIdentifier "l") (ENumber "0")) ] >>> typst -phi.alt_n (kappa) = 0.033 C_n^2 kappa^(- 11 \/ 3) \, quad 1 / L_0 lt.double kappa lt.double 1 / l_0 +phi.alt_n (kappa) = 0.033 C_n^2 kappa^(- 11\/3)\,quad 1 / L_0 lt.double kappa lt.double 1 / l_0 diff --git a/test/writer/typst/13.test b/test/writer/typst/13.test --- a/test/writer/typst/13.test +++ b/test/writer/typst/13.test @@ -54,4 +54,4 @@ (EGrouped [ EIdentifier "n" , ESymbol Ord "!" ]) ] >>> typst -zws_p F_q (a_1 \, dots.h \, a_p ; c_1 \, dots.h \, c_q ; z) = sum_(n = 0)^oo frac((a_1)_n dots.h.c (a_p)_n, (c_1)_n dots.h.c (c_q)_n) frac(z^n, n !) +zws_p F_q (a_1 \, dots.h \, a_p \; c_1 \, dots.h \, c_q \; z) = sum_(n = 0)^oo frac((a_1)_n dots.h.c (a_p)_n, (c_1)_n dots.h.c (c_q)_n) frac(z^n, n !) 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/complex1.test b/test/writer/typst/complex1.test --- a/test/writer/typst/complex1.test +++ b/test/writer/typst/complex1.test @@ -601,12 +601,12 @@ ] ] >>> typst -upright("Bernoulli Trials") & P \( E \) = (n / k) p_()^k \( 1 - p \)_()^(n - k)\ +upright("Bernoulli Trials") & P\(E\) = (n / k) p_()^k\(1 - p\)_()^(n - k)\ upright("Cauchy-Schwarz Inequality") & (sum_(k = 1)^n a_k^() b_k^())_()^2 lt.eq (sum_(k = 1)^n a_k^2) (sum_(k = 1)^n b_k^2)\ -upright("Cauchy Formula") & f \( z \) thin dot.c "Ind"_gamma^() \( z \) = frac(1, 2 pi i) integral.cont_gamma^() frac(f \( xi \), xi - z) thin d xi\ +upright("Cauchy Formula") & f\(z\)thin dot.c "Ind"_gamma^()\(z\)= frac(1, 2 pi i) integral.cont_gamma^() frac(f\(xi\), xi - z) thin d xi\ upright("Cross Product") & V_1^() times V_2^() = mat(delim: "|", i, j, k; frac(partial X, partial u), frac(partial Y, partial u), 0; frac(partial X, partial v), frac(partial Y, partial v), 0)\ -upright("Vandermonde Determinant") & mat(delim: "|", 1, 1, dots.h.c, 1; v_1^(), v_2^(), dots.h.c, v_n^(); v_1^2, v_2^2, dots.h.c, v_n^2; dots.v, dots.v, dots.down, dots.v; v_1^(n - 1), v_2^(n - 1), dots.h.c, v_n^(n - 1)) = product_(1 lt.eq i < j lt.eq n)^() \( v_j^() - v_i^() \)\ -upright("Lorenz Equations") & accent(x, ห™)_() & = & sigma \( y - x \)\ +upright("Vandermonde Determinant") & mat(delim: "|", 1, 1, dots.h.c, 1; v_1^(), v_2^(), dots.h.c, v_n^(); v_1^2, v_2^2, dots.h.c, v_n^2; dots.v, dots.v, dots.down, dots.v; v_1^(n - 1), v_2^(n - 1), dots.h.c, v_n^(n - 1)) = product_(1 lt.eq i < j lt.eq n)^()\(v_j^() - v_i^()\)\ +upright("Lorenz Equations") & accent(x, ห™)_() & = & sigma\(y - x\)\ accent(y, ห™)_() & = & rho x - y - x z\ accent(z, ห™)_() & = & - beta z + x y\ upright("Maxwell's Equations") & {nabla zws times accent(B, โ†ผ)_() - thin 1 / c thin frac(partial zws accent(E, โ†ผ)_(), partial zws t) & = & frac(4 pi, c) thin accent(j, โ†ผ)_()\ @@ -614,9 +614,9 @@ nabla zws times accent(E, โ†ผ)_() thin + thin 1 / c thin frac(partial zws accent(B, โ†ผ)_(), partial zws t) & = & accent(0, โ†ผ)_()\ nabla zws dot.c accent(B, โ†ผ)_() & = & 0\ upright("Einstein Field Equations") & R_(mu nu)^() - 1 / 2 thin g_(mu nu)^() thin R = frac(8 pi G, c_()^4) thin T_(mu nu)^()\ -upright("Ramanujan Identity") & frac(1, \( sqrt(phi sqrt(5)) - phi \) e_()^(25 / pi)) = 1 + frac(e_()^(- 2 pi), 1 + frac(e_()^(- 4 pi), 1 + frac(e_()^(- 6 pi), 1 + frac(e_()^(- 8 pi), 1 + dots.h))))\ +upright("Ramanujan Identity") & frac(1, \(sqrt(phi sqrt(5)) - phi\)e_()^(25 / pi)) = 1 + frac(e_()^(- 2 pi), 1 + frac(e_()^(- 4 pi), 1 + frac(e_()^(- 6 pi), 1 + frac(e_()^(- 8 pi), 1 + dots.h))))\ upright("Another Ramanujan identity") & sum_(k = 1)^oo 1 / 2_()^(floor.l k dot.c zws phi floor.r) = frac(1, 2_()^0 + frac(1, 2_()^1 + dots.h.c))\ -upright("Rogers-Ramanujan Identity") & 1 + sum_(k = 1)^oo frac(q_()^(k_()^2 + k), \( 1 - q \) \( 1 - q_()^2 \) dots.h.c \( 1 - q_()^k \)) = product_(j = 0)^oo frac(1, \( 1 - q_()^(5 j + 2) \) \( 1 - q_()^(5 j + 3) \)) \, upright("โŸโ€Š") upright("โŸโ€Š") f o r med \| q \| < 1 .\ +upright("Rogers-Ramanujan Identity") & 1 + sum_(k = 1)^oo frac(q_()^(k_()^2 + k), \(1 - q\)\(1 - q_()^2\)dots.h.c\(1 - q_()^k\)) = product_(j = 0)^oo frac(1, \(1 - q_()^(5 j + 2)\)\(1 - q_()^(5 j + 3)\))\,upright("โŸโ€Š") upright("โŸโ€Š") f o r med\|q\|< 1 .\ upright("Commutative Diagram") & H & arrow.l & K\ arrow.b & zws & arrow.t\ H & arrow.r & K diff --git a/test/writer/typst/complex2.test b/test/writer/typst/complex2.test --- a/test/writer/typst/complex2.test +++ b/test/writer/typst/complex2.test @@ -393,16 +393,16 @@ >>> typst upright("Quadratic Equation") & x = frac(- b plus.minus sqrt(b_()^2 - 4 a c), 2 a)\ upright("DisplayQuadratic Equation") & x = frac(- b plus.minus sqrt(b_()^2 - 4 a c), 2 a)\ -upright("Rational Function") & f \( x \) = frac(1 - x_()^2, 1 - x_()^3)\ -upright("Rational Function") & f \( x \) = frac(\( 1 - x_()^2 \) x_()^3, 1 - x_()^3)\ -upright("Rational Function") & f \( x \) = frac(\( 1 - x_()^2 \) \( x_()^3 - 5 x \), 1 - x_()^3)\ -upright("Parametrize Rational Function") & f \( x \) = frac(\( a_i^() - x_()^2 \)_()^5, 1 - x_()^3)\ -upright("Stacked exponents") & g \( z \) = e_()^(- x_()^2)\ -upright("Stacked exponents") & g \( z \) = e_()^(- \( z - a \)_()^2)\ -upright("Stacked exponents") & g \( z \) = e_()^(- sum_(i = 0)^oo z_i^2)\ -upright("Stacked exponents") & g \( y \) = e_()^(- sum_(i = 0)^oo y_i^2)\ -upright("Stacked exponents") & g \( z \) = e_()^(- sum_(i = 0)^oo z_()^(frac(2, a - i)))\ +upright("Rational Function") & f\(x\)= frac(1 - x_()^2, 1 - x_()^3)\ +upright("Rational Function") & f\(x\)= frac(\(1 - x_()^2\)x_()^3, 1 - x_()^3)\ +upright("Rational Function") & f\(x\)= frac(\(1 - x_()^2\)\(x_()^3 - 5 x\), 1 - x_()^3)\ +upright("Parametrize Rational Function") & f\(x\)= frac(\(a_i^() - x_()^2\)_()^5, 1 - x_()^3)\ +upright("Stacked exponents") & g\(z\)= e_()^(- x_()^2)\ +upright("Stacked exponents") & g\(z\)= e_()^(-\(z - a\)_()^2)\ +upright("Stacked exponents") & g\(z\)= e_()^(- sum_(i = 0)^oo z_i^2)\ +upright("Stacked exponents") & g\(y\)= e_()^(- sum_(i = 0)^oo y_i^2)\ +upright("Stacked exponents") & g\(z\)= e_()^(- sum_(i = 0)^oo z_()^(frac(2, a - i)))\ upright("Cross Product") & frac(x_1^() - x_2^(), x_3^() - x_4^()) frac(x_1^() - x_4^(), x_2^() - x_3^())\ -upright("Cross Product") & \( frac(x_1^() - x_2^(), x_3^() - x_4^()) \) \( frac(x_1^() - x_4^(), x_2^() - x_3^()) \)\ +upright("Cross Product") & \(frac(x_1^() - x_2^(), x_3^() - x_4^())\)\(frac(x_1^() - x_4^(), x_2^() - x_3^())\)\ upright("Cross Product") & (frac(x_1^() - x_2^(), x_3^() - x_4^())) (frac(x_1^() - x_4^(), x_2^() - x_3^()))\ -upright("Cross Product") & frac(\( x_1^() - x_2^() \) \( x_3^() - x_4^() \), \( x_1^() - x_4^() \) \( x_2^() - x_3^() \)) +upright("Cross Product") & frac(\(x_1^() - x_2^()\)\(x_3^() - x_4^()\), \(x_1^() - x_4^()\)\(x_2^() - x_3^()\)) diff --git a/test/writer/typst/deMorgans_law.test b/test/writer/typst/deMorgans_law.test --- a/test/writer/typst/deMorgans_law.test +++ b/test/writer/typst/deMorgans_law.test @@ -36,4 +36,4 @@ (ESymbol TOver "\175") ] >>> typst -not (p and q) arrow.l.r.double (not p) or (not q) overline(union.big_(i = 1)^n A_i) = sect.big_(i = 1)^n overline(A_i) +not (p and q) arrow.l.r.double (not p) or (not q) overline(union.big_(i = 1)^n A_i) = inter.big_(i = 1)^n overline(A_i) diff --git a/test/writer/typst/differentiable_manifold.test b/test/writer/typst/differentiable_manifold.test --- a/test/writer/typst/differentiable_manifold.test +++ b/test/writer/typst/differentiable_manifold.test @@ -59,5 +59,5 @@ ] ] >>> typst -gamma_1 equiv gamma_2 arrow.l.r.double {gamma_1 (0) = gamma_2 (0) = p \, upright(" and ")\ +gamma_1 equiv gamma_2 arrow.l.r.double {gamma_1 (0) = gamma_2 (0) = p\,upright(" and ")\ frac(upright(d), upright(d) t) phi.alt compose gamma_1 (t)\|_(t = 0) = frac(upright(d), upright(d) t) phi.alt compose gamma_2 (t)\|_(t = 0) diff --git a/test/writer/typst/largeop1.test b/test/writer/typst/largeop1.test --- a/test/writer/typst/largeop1.test +++ b/test/writer/typst/largeop1.test @@ -76,9 +76,9 @@ ] ] >>> typst -upright("displaystyle: false largeop: false") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: false largeop: true") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: true largeop: false") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: true largeop: true") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: false largeop: default") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: true largeop: default") & and.big or.big integral sum product union.big sect.big +upright("displaystyle: false largeop: false") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: false largeop: true") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: true largeop: false") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: true largeop: true") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: false largeop: default") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: true largeop: default") & and.big or.big integral sum product union.big inter.big diff --git a/test/writer/typst/largeopPos3.test b/test/writer/typst/largeopPos3.test --- a/test/writer/typst/largeopPos3.test +++ b/test/writer/typst/largeopPos3.test @@ -8,4 +8,4 @@ [ EIdentifier "A" , ESymbol Bin "\8745" , EIdentifier "B" ] ] >>> typst -sect.big_(i = 0)^oo A sect B +inter.big_(i = 0)^oo A inter B 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/test/writer/typst/sphere_volume.test b/test/writer/typst/sphere_volume.test --- a/test/writer/typst/sphere_volume.test +++ b/test/writer/typst/sphere_volume.test @@ -126,7 +126,7 @@ ] ] >>> typst -S = { 0 lt.eq phi.alt lt.eq 2 pi \, med 0 lt.eq theta lt.eq pi \, med 0 lt.eq rho lt.eq R } upright(V o l u m e) & = integral.triple_S #h(-1em) rho^2 sin theta thin upright(d) rho thin upright(d) theta thin upright(d) phi.alt\ +S = { 0 lt.eq phi.alt lt.eq 2 pi\,med 0 lt.eq theta lt.eq pi\,med 0 lt.eq rho lt.eq R } upright(V o l u m e) & = integral.triple_S #h(-1em) rho^2 sin theta thin upright(d) rho thin upright(d) theta thin upright(d) phi.alt\ & = integral_0^(2 pi) #h(-1em) upright(d) phi.alt thin integral_0^pi #h(-1em) sin theta thin upright(d) theta thin integral_0^R #h(-1em) rho^2 upright(d) rho\ & = phi.alt #scale(x: 180%, y: 180%)[\|]_0^(2 pi) med (- cos theta) #scale(x: 180%, y: 180%)[\|]_0^pi med 1 / 3 rho^3 #scale(x: 180%, y: 180%)[\|]_0^R\ & = 2 pi times 2 times 1 / 3 R^3\ 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.1.2 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between math formats. @@ -80,7 +80,7 @@ pandoc-types >= 1.20 && < 1.24, mtl >= 2.2.1, text, - typst-symbols >= 0.1.8.1 && < 0.1.9, + typst-symbols >= 0.2 && < 0.2.1, split Exposed-modules: Text.TeXMath,