diff --git a/cgi/texmath.html b/cgi/texmath.html --- a/cgi/texmath.html +++ b/cgi/texmath.html @@ -14,7 +14,7 @@ } }); - + diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +texmath (0.9.4.1) + + * Improved handling of accents and upper/lower delimiters (#98). + * cgi: use cloudflare cdn for mathjax. + texmath (0.9.4) * Added writer for GNU eqn format (used with *roff). 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 @@ -232,7 +232,7 @@ Just . head chr' = case chr of Just c -> c - Nothing -> '^' -- default to hat. + Nothing -> '\x302' -- default to wide hat. baseExp <- filterChildName (hasElemName "m" "e") element >>= elemToBase return $ [EOver False baseExp (ESymbol Accent [chr'])] @@ -243,8 +243,8 @@ baseExp <- filterChildName (hasElemName "m" "e") element >>= elemToBase case pos of - "top" -> Just [EOver False baseExp (ESymbol Accent "\175")] - "bot" -> Just [EUnder False baseExp (ESymbol Accent "\818")] + "top" -> Just [EOver False baseExp (ESymbol TOver "\773")] + "bot" -> Just [EUnder False baseExp (ESymbol TUnder "\818")] _ -> Nothing elemToExps' element | isElem "m" "box" element = do baseExp <- filterChildName (hasElemName "m" "e") element >>= @@ -315,13 +315,13 @@ Just (c:_) -> c _ -> '\65079' -- default to overbrace in - return [EOver False baseExp (ESymbol Accent [chr'])] + return [EOver False baseExp (ESymbol TOver [chr'])] Just "bot" -> let chr' = case chr of Just (c:_) -> c _ -> '\65080' -- default to underbrace in - return [EUnder False baseExp (ESymbol Accent [chr'])] + return [EUnder False baseExp (ESymbol TUnder [chr'])] _ -> Nothing elemToExps' element | isElem "m" "limLow" element = do baseExp <- filterChildName (hasElemName "m" "e") element diff --git a/src/Text/TeXMath/Readers/TeX.hs b/src/Text/TeXMath/Readers/TeX.hs --- a/src/Text/TeXMath/Readers/TeX.hs +++ b/src/Text/TeXMath/Readers/TeX.hs @@ -60,7 +60,6 @@ , substack , bareSubSup , environment - , diacritical , unicode , ensuremath , enclosure @@ -455,12 +454,12 @@ -- check if sub/superscripts should always be under and over the expression isUnderover :: Exp -> Bool -isUnderover (EOver _ _ (ESymbol Accent "\xFE37")) = True -- \overbrace -isUnderover (EOver _ _ (ESymbol Accent "\x23B4")) = True -- \overbracket -isUnderover (EUnder _ _ (ESymbol Accent "\xFE38")) = True -- \underbrace -isUnderover (EUnder _ _ (ESymbol Accent "\x23B5")) = True -- \underbracket -isUnderover (EOver _ _ (ESymbol Accent "\x23DE")) = True -- \overbrace -isUnderover (EUnder _ _ (ESymbol Accent "\x23DF")) = True -- \underbrace +isUnderover (EOver _ _ (ESymbol TOver "\xFE37")) = True -- \overbrace +isUnderover (EOver _ _ (ESymbol TOver "\x23B4")) = True -- \overbracket +isUnderover (EOver _ _ (ESymbol TOver "\x23DE")) = True -- \overbrace +isUnderover (EUnder _ _ (ESymbol TUnder "\xFE38")) = True -- \underbrace +isUnderover (EUnder _ _ (ESymbol TUnder "\x23B5")) = True -- \underbracket +isUnderover (EUnder _ _ (ESymbol TUnder "\x23DF")) = True -- \underbrace isUnderover _ = False subSup :: Maybe Bool -> Bool -> Exp -> TP Exp @@ -533,14 +532,6 @@ , ("\\mathsfit", EStyled TextSansSerifItalic) ] -diacritical :: TP Exp -diacritical = do - c <- oneOfCommands (map snd S.diacriticals) - case S.getDiacriticalCons c of - Just r -> r <$> texToken - Nothing -> mzero - - phantom :: TP Exp phantom = EPhantom <$> (ctrlseq "phantom" *> texToken) @@ -702,6 +693,12 @@ tSymbol = try $ do sym <- anyCtrlSeq case M.lookup sym symbols of + Just acc@(ESymbol Accent _) -> + (\t -> EOver False t acc) <$> texToken + Just acc@(ESymbol TUnder _) -> + (\t -> EUnder False t acc) <$> texToken + Just acc@(ESymbol TOver _) -> + (\t -> EOver False t acc) <$> texToken Just x -> return x Nothing -> mzero @@ -1339,7 +1336,7 @@ , ("\\bagmember",ESymbol Rel "\8959") , ("\\ballotcheck",ESymbol Ord "\10003") , ("\\ballotx",ESymbol Ord "\10007") - , ("\\bar",ESymbol Accent "\772") + , ("\\bar",ESymbol Accent "\8254") , ("\\barV",ESymbol Rel "\10986") , ("\\barcap",ESymbol Bin "\10819") , ("\\barcup",ESymbol Bin "\10818") @@ -1582,7 +1579,6 @@ , ("\\divslash",ESymbol Bin "\8725") , ("\\dlsh",ESymbol Rel "\8626") , ("\\dot",ESymbol Accent "\775") - , ("\\dot",ESymbol Ord "\10625") , ("\\doteqdot",ESymbol Rel "\8785") , ("\\dotequal",ESymbol Rel "\8784") , ("\\dotequiv",ESymbol Rel "\10855") @@ -3099,12 +3095,13 @@ , ("\\otimeslhrim",ESymbol Bin "\10804") , ("\\otimesrhrim",ESymbol Bin "\10805") , ("\\oturnedcomma",ESymbol Accent "\786") - , ("\\overbar",ESymbol Accent "\773") + , ("\\overbar",ESymbol Accent "\175") , ("\\overbrace",ESymbol TOver "\9182") , ("\\overbracket",ESymbol TOver "\9140") , ("\\overleftarrow",ESymbol Accent "\8406") + , ("\\overrightarrow",ESymbol Accent "\8407") , ("\\overleftrightarrow",ESymbol Accent "\8417") - , ("\\overline",ESymbol Accent "\773") + , ("\\overline",ESymbol TOver "\175") , ("\\overparen",ESymbol TOver "\9180") , ("\\ovhook",ESymbol Accent "\777") , ("\\parallelogram",ESymbol Ord "\9649") @@ -3488,12 +3485,12 @@ , ("\\ulcorner",ESymbol Open "\8988") , ("\\ultriangle",ESymbol Ord "\9720") , ("\\uminus",ESymbol Bin "\10817") - , ("\\underbar",ESymbol Accent "\817") + , ("\\underbar",ESymbol TUnder "\817") , ("\\underbrace",ESymbol TUnder "\9183") , ("\\underbracket",ESymbol TUnder "\9141") , ("\\underleftarrow",ESymbol Accent "\8430") , ("\\underleftharpoondown",ESymbol Accent "\8429") - , ("\\underline",ESymbol Accent "\818") + , ("\\underline",ESymbol TUnder "\818") , ("\\underparen",ESymbol TUnder "\9181") , ("\\underrightarrow",ESymbol Accent "\8431") , ("\\underrightharpoondown",ESymbol Accent "\8428") 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 @@ -26,7 +26,6 @@ , getSpaceWidth , getSpaceChars , getDiacriticalCommand - , getDiacriticalCons , diacriticals , getOperator , readLength @@ -104,16 +103,6 @@ getScalerValue :: String -> Maybe Rational getScalerValue command = lookup command scalers --- | Returns the correct constructor given a LaTeX command -getDiacriticalCons :: String -> Maybe (Exp -> Exp) -getDiacriticalCons command = - f <$> M.lookup command diaMap - where - diaMap = M.fromList (reverseKeys diacriticals) - f s e = (if command `elem` under - then EUnder False - else EOver False) e (ESymbol Accent s) - -- | Given a diacritical mark, returns the corresponding LaTeX command getDiacriticalCommand :: Position -> String -> Maybe String getDiacriticalCommand pos symbol = do @@ -185,11 +174,6 @@ let [(n :: Double, [])] = reads (neg ++ dec ++ frac) :: [(Double, String)] return (round (n * 18) % 18, unit) - - -reverseKeys :: [(a, b)] -> [(b, a)] -reverseKeys = map (\(k,v) -> (v, k)) - textTypesMap :: M.Map TextType (String, String) textTypesMap = M.fromList textTypes @@ -306,30 +290,38 @@ diacriticals :: [(String, String)] diacriticals = [ ("\x00B4", "\\acute") - , (("\x0060", "\\grave")) - , (("\x02D8", "\\breve")) - , (("\x02C7", "\\check")) - , (("\x307", "\\dot")) - , (("\x308", "\\ddot")) - , (("\x20DB", "\\dddot")) - , (("\x20DC", "\\ddddot")) - , (("\x00B0", "\\mathring")) - , (("\x20D7", "\\vec")) - , (("\x20D7", "\\overrightarrow")) - , (("\x20D6", "\\overleftarrow")) - , (("\x005E", "\\hat")) - , (("\x0302", "\\widehat")) - , (("\x02C6", "\\widehat")) - , (("\x0303", "\\tilde")) - , (("\x02DC", "\\widetilde")) - , (("\x203E", "\\bar")) - , (("\x23DE", "\\overbrace")) - , (("\x23B4", "\\overbracket")) -- Only availible in mathtools - , (("\x00AF", "\\overline")) - , (("\x23DF", "\\underbrace")) - , (("\x23B5", "\\underbracket")) -- mathtools - , (("\x0332", "\\underline")) - , (("\x0333", "\\underbar")) + , ("\x0301", "\\acute") + , ("\x0060", "\\grave") + , ("\x0300", "\\grave") + , ("\x02D8", "\\breve") + , ("\x0306", "\\breve") + , ("\x02C7", "\\check") + , ("\x030C", "\\check") + , ("\x307", "\\dot") + , ("\x308", "\\ddot") + , ("\x20DB", "\\dddot") + , ("\x20DC", "\\ddddot") + , ("\x00B0", "\\mathring") + , ("\x030A", "\\mathring") + , ("\x20D7", "\\vec") + , ("\x20D7", "\\overrightarrow") + , ("\x20D6", "\\overleftarrow") + , ("\x005E", "\\hat") + , ("\x02C6", "\\widehat") + , ("\x0302", "\\widehat") + , ("\x02DC", "\\widetilde") + , ("\x0303", "\\tilde") + , ("\x0303", "\\widetilde") + , ("\x0304", "\\bar") + , ("\x203E", "\\bar") + , ("\x23DE", "\\overbrace") + , ("\x23B4", "\\overbracket") -- Only availible in mathtools + , ("\x00AF", "\\overline") + , ("\x0305", "\\overline") + , ("\x23DF", "\\underbrace") + , ("\x23B5", "\\underbracket") -- mathtools + , ("\x0332", "\\underline") + , ("\x0333", "\\underbar") ] 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 @@ -124,15 +124,17 @@ makeFence :: FormType -> Element -> Element makeFence (fromForm -> t) = withAttribute "stretchy" "false" . withAttribute "form" t -op :: String -> Element -op s = accentCons $ unode "mo" s - where - accentCons = - case (elem "accent") . properties <$> getMathMLOperator s FPostfix of - Nothing -> id - Just False -> id - Just True -> withAttribute "accent" "false" - +showExp' :: TextType -> Exp -> Element +showExp' tt e = + case e of + ESymbol Accent x -> accent x + ESymbol _ x -> + let isaccent = case (elem "accent") . properties <$> + getMathMLOperator x FPostfix of + Just True -> "true" + _ -> "false" + in withAttribute "accent" isaccent $ unode "mo" x + _ -> showExp tt e showExp :: TextType -> Exp -> Element showExp tt e = @@ -146,19 +148,19 @@ [ makeStretchy FPostfix (unode "mo" end) | not (null end) ] EIdentifier x -> unode "mi" $ toUnicode tt x EMathOperator x -> unode "mo" x - ESymbol Accent x -> accent x - ESymbol Open x -> makeFence FPrefix $ op x - ESymbol Close x -> makeFence FPostfix $ op x + ESymbol Open x -> makeFence FPrefix $ unode "mo" x + ESymbol Close x -> makeFence FPostfix $ unode "mo" x ESymbol Ord x -> unode "mi" x - ESymbol _ x -> op x + ESymbol _ x -> unode "mo" x ESpace x -> spaceWidth x EFraction ft x y -> showFraction tt ft x y ESub x y -> unode "msub" $ map (showExp tt) [x, y] ESuper x y -> unode "msup" $ map (showExp tt) [x, y] ESubsup x y z -> unode "msubsup" $ map (showExp tt) [x, y, z] - EUnder _ x y -> unode "munder" $ map (showExp tt) [x, y] - EOver _ x y -> unode "mover" $ map (showExp tt) [x, y] - EUnderover _ x y z -> unode "munderover" $ map (showExp tt) [x, y, z] + EUnder _ x y -> unode "munder" [showExp tt x, showExp' tt y] + EOver _ x y -> unode "mover" [showExp tt x, showExp' tt y] + EUnderover _ x y z -> unode "munderover" + [showExp tt x, showExp' tt y, showExp' tt z] EPhantom x -> unode "mphantom" $ showExp tt x EBoxed x -> withAttribute "notation" "box" . unode "menclose" $ 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 @@ -202,20 +202,26 @@ | n > 1.8 -> [str props "\x2001\x2001"] | otherwise -> [] -- this is how the xslt sheet handles all spaces - EUnder _ x (ESymbol Accent [c]) | isBarChar c -> + EUnder _ x (ESymbol _ [c]) | isBarChar c -> [mnode "bar" [ mnode "barPr" $ mnodeA "pos" "bot" () , mnode "e" $ showExp props x ]] - EOver _ x (ESymbol Accent [c]) | isBarChar c -> + EOver _ x (ESymbol _ [c]) | isBarChar c -> [mnode "bar" [ mnode "barPr" $ mnodeA "pos" "top" () , mnode "e" $ showExp props x ]] - EOver _ x (ESymbol Accent y) -> + EOver _ x (ESymbol st y) | st == Accent || st == TOver -> [mnode "groupChr" [ mnode "groupChrPr" [ mnodeA "chr" y () , mnodeA "pos" "top" () , mnodeA "vertJc" "bot" () ] , mnode "e" $ showExp props x ]] + EUnder _ x (ESymbol st y) | st == Accent || st == TUnder -> + [mnode "groupChr" [ mnode "groupChrPr" + [ mnodeA "chr" y () + , mnodeA "pos" "bot" () + , mnodeA "vertJc" "top" () ] + , mnode "e" $ showExp props x ]] ESub x y -> [mnode "sSub" [ mnode "e" $ showExp props x , mnode "sub" $ showExp props y]] ESuper x y -> [mnode "sSup" [ mnode "e" $ showExp props x @@ -244,7 +250,8 @@ EStyled a es -> concatMap (showExp (setProps a)) es isBarChar :: Char -> Bool -isBarChar c = c == '\x203E' || c == '\x00AF' +isBarChar c = c == '\x203E' || c == '\x00AF' || + c == '\x0304' || c == '\x0333' isNary :: Exp -> Bool isNary (ESymbol Op _) = True 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 @@ -295,7 +295,9 @@ writeScript :: Position -> Bool -> Exp -> Exp -> Math () writeScript pos convertible b e1 = do let diacmd = case e1 of - ESymbol Accent a -> S.getDiacriticalCommand pos a + ESymbol stype a + | stype `elem` [Accent, TOver, TUnder] + -> S.getDiacriticalCommand pos a _ -> Nothing case diacmd of Just cmd -> do diff --git a/tests/readers/omml/08.native b/tests/readers/omml/08.native --- a/tests/readers/omml/08.native +++ b/tests/readers/omml/08.native @@ -1,1 +1,1 @@ -[ESymbol Fence "|",EOver False (EIdentifier "z") (ESymbol Accent "\175"),ESymbol Fence "|",ESymbol Rel "=",ESymbol Fence "|",EIdentifier "z",ESymbol Fence "|",ESymbol Pun ",",ESymbol Fence "|",ESymbol Open "(",EOver False (EIdentifier "z") (ESymbol Accent "\175"),ESuper (ESymbol Close ")") (EIdentifier "n"),ESymbol Fence "|",ESymbol Rel "=",ESymbol Fence "|",EIdentifier "z",ESuper (ESymbol Fence "|") (EIdentifier "n"),ESymbol Pun ",",EMathOperator "arg",ESymbol Open "(",ESuper (EIdentifier "z") (EIdentifier "n"),ESymbol Close ")",ESymbol Rel "=",EIdentifier "n",EMathOperator "arg",ESymbol Open "(",EIdentifier "z",ESymbol Close ")"] +[ESymbol Fence "|",EOver False (EIdentifier "z") (ESymbol TOver "\773"),ESymbol Fence "|",ESymbol Rel "=",ESymbol Fence "|",EIdentifier "z",ESymbol Fence "|",ESymbol Pun ",",ESymbol Fence "|",ESymbol Open "(",EOver False (EIdentifier "z") (ESymbol TOver "\773"),ESuper (ESymbol Close ")") (EIdentifier "n"),ESymbol Fence "|",ESymbol Rel "=",ESymbol Fence "|",EIdentifier "z",ESuper (ESymbol Fence "|") (EIdentifier "n"),ESymbol Pun ",",EMathOperator "arg",ESymbol Open "(",ESuper (EIdentifier "z") (EIdentifier "n"),ESymbol Close ")",ESymbol Rel "=",EIdentifier "n",EMathOperator "arg",ESymbol Open "(",EIdentifier "z",ESymbol Close ")"] diff --git a/tests/readers/omml/deMorgans_law.native b/tests/readers/omml/deMorgans_law.native --- a/tests/readers/omml/deMorgans_law.native +++ b/tests/readers/omml/deMorgans_law.native @@ -1,1 +1,1 @@ -[ESymbol Ord "\172",ESymbol Open "(",EIdentifier "p",ESymbol Bin "\8743",EIdentifier "q",ESymbol Close ")",ESymbol Rel "\8660",ESymbol Open "(",ESymbol Ord "\172",EIdentifier "p",ESymbol Close ")",ESymbol Bin "\8744",ESymbol Open "(",ESymbol Ord "\172",EIdentifier "q",ESymbol Close ")",EOver False (EGrouped [EUnderover True (ESymbol Op "\8899") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),ESub (EIdentifier "A") (EIdentifier "i")]) (ESymbol Accent "\175"),ESymbol Rel "=",EUnderover True (ESymbol Op "\8898") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),EOver False (ESub (EIdentifier "A") (EIdentifier "i")) (ESymbol Accent "\175")] +[ESymbol Ord "\172",ESymbol Open "(",EIdentifier "p",ESymbol Bin "\8743",EIdentifier "q",ESymbol Close ")",ESymbol Rel "\8660",ESymbol Open "(",ESymbol Ord "\172",EIdentifier "p",ESymbol Close ")",ESymbol Bin "\8744",ESymbol Open "(",ESymbol Ord "\172",EIdentifier "q",ESymbol Close ")",EOver False (EGrouped [EUnderover True (ESymbol Op "\8899") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),ESub (EIdentifier "A") (EIdentifier "i")]) (ESymbol TOver "\773"),ESymbol Rel "=",EUnderover True (ESymbol Op "\8898") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),EOver False (ESub (EIdentifier "A") (EIdentifier "i")) (ESymbol TOver "\773")] diff --git a/tests/readers/omml/subsup.native b/tests/readers/omml/subsup.native --- a/tests/readers/omml/subsup.native +++ b/tests/readers/omml/subsup.native @@ -1,1 +1,1 @@ -[ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EUnder True (EMathOperator "min") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "max") (EIdentifier "B"),ESpace (1 % 1),EUnder True (EMathOperator "det") (EIdentifier "C"),ESpace (1 % 1),EUnder True (EMathOperator "Pr") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "gcd") (EIdentifier "A"),ESpace (1 % 1),ESuper (EOver False (EIdentifier "u") (ESymbol Accent "\775")) (ENumber "2"),ESpace (1 % 1),ESub (EOver False (EIdentifier "u") (ESymbol Accent "\175")) (EIdentifier "\949"),ESpace (1 % 1),ESubsup (EUnder True (EIdentifier "u") (ESymbol Accent "\818")) (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EOver True (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\65079")) (EText TextNormal "term"),ESpace (1 % 1),EOver True (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\9140")) (EIdentifier "c"),ESpace (1 % 1),EUnder True (EUnder True (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Ord "\65080")) (EIdentifier "c"),ESpace (1 % 1),EUnder True (EUnder True (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol TUnder "\9141")) (EIdentifier "c"),ESuper (ESpace (1 % 1)) (EIdentifier "H"),EIdentifier "e",ENumber "3",ESub (ESpace (1 % 1)) (EIdentifier "x"),EIdentifier "A",ESubsup (ESpace (1 % 1)) (EIdentifier "x") (ENumber "3")] +[ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EUnder True (EMathOperator "min") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "max") (EIdentifier "B"),ESpace (1 % 1),EUnder True (EMathOperator "det") (EIdentifier "C"),ESpace (1 % 1),EUnder True (EMathOperator "Pr") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "gcd") (EIdentifier "A"),ESpace (1 % 1),ESuper (EOver False (EIdentifier "u") (ESymbol Accent "\775")) (ENumber "2"),ESpace (1 % 1),ESub (EOver False (EIdentifier "u") (ESymbol TOver "\773")) (EIdentifier "\949"),ESpace (1 % 1),ESubsup (EUnder True (EIdentifier "u") (ESymbol Accent "\818")) (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EOver True (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\65079")) (EText TextNormal "term"),ESpace (1 % 1),EOver True (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\9140")) (EIdentifier "c"),ESpace (1 % 1),EUnder True (EUnder True (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Ord "\65080")) (EIdentifier "c"),ESpace (1 % 1),EUnder True (EUnder True (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol TUnder "\9141")) (EIdentifier "c"),ESuper (ESpace (1 % 1)) (EIdentifier "H"),EIdentifier "e",ENumber "3",ESub (ESpace (1 % 1)) (EIdentifier "x"),EIdentifier "A",ESubsup (ESpace (1 % 1)) (EIdentifier "x") (ENumber "3")] diff --git a/tests/readers/tex/complex_number.native b/tests/readers/tex/complex_number.native --- a/tests/readers/tex/complex_number.native +++ b/tests/readers/tex/complex_number.native @@ -1,1 +1,1 @@ -[EIdentifier "c",ESymbol Rel "=",EOver False (EOver False (EGrouped [EUnder False (EUnder False (EIdentifier "a") (ESymbol Accent "\9183")) (EText TextNormal "real"),ESymbol Bin "+",EUnder False (EUnder False (EGrouped [EIdentifier "b",EStyled TextNormal [EIdentifier "i"]]) (ESymbol Accent "\9183")) (EText TextNormal "imaginary")]) (ESymbol Accent "\9182")) (EText TextNormal "complex number")] +[EIdentifier "c",ESymbol Rel "=",EOver False (EOver False (EGrouped [EUnder False (EUnder False (EIdentifier "a") (ESymbol TUnder "\9183")) (EText TextNormal "real"),ESymbol Bin "+",EUnder False (EUnder False (EGrouped [EIdentifier "b",EStyled TextNormal [EIdentifier "i"]]) (ESymbol TUnder "\9183")) (EText TextNormal "imaginary")]) (ESymbol TOver "\9182")) (EText TextNormal "complex number")] diff --git a/tests/readers/tex/deMorgans_law.native b/tests/readers/tex/deMorgans_law.native --- a/tests/readers/tex/deMorgans_law.native +++ b/tests/readers/tex/deMorgans_law.native @@ -1,1 +1,1 @@ -[ESymbol Op "\172",ESymbol Open "(",EIdentifier "p",ESymbol Bin "\8743",EIdentifier "q",ESymbol Close ")",ESymbol Rel "\8660",ESymbol Open "(",ESymbol Op "\172",EIdentifier "p",ESymbol Close ")",ESymbol Bin "\8744",ESymbol Open "(",ESymbol Op "\172",EIdentifier "q",ESymbol Close ")",EOver False (EGrouped [EUnderover True (ESymbol Op "\8899") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),ESub (EIdentifier "A") (EIdentifier "i")]) (ESymbol Accent "\175"),ESymbol Rel "=",EUnderover True (ESymbol Op "\8898") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),EOver False (ESub (EIdentifier "A") (EIdentifier "i")) (ESymbol Accent "\175")] +[ESymbol Op "\172",ESymbol Open "(",EIdentifier "p",ESymbol Bin "\8743",EIdentifier "q",ESymbol Close ")",ESymbol Rel "\8660",ESymbol Open "(",ESymbol Op "\172",EIdentifier "p",ESymbol Close ")",ESymbol Bin "\8744",ESymbol Open "(",ESymbol Op "\172",EIdentifier "q",ESymbol Close ")",EOver False (EGrouped [EUnderover True (ESymbol Op "\8899") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),ESub (EIdentifier "A") (EIdentifier "i")]) (ESymbol TOver "\175"),ESymbol Rel "=",EUnderover True (ESymbol Op "\8898") (EGrouped [EIdentifier "i",ESymbol Rel "=",ENumber "1"]) (EIdentifier "n"),EOver False (ESub (EIdentifier "A") (EIdentifier "i")) (ESymbol TOver "\175")] diff --git a/tests/readers/tex/subsup.native b/tests/readers/tex/subsup.native --- a/tests/readers/tex/subsup.native +++ b/tests/readers/tex/subsup.native @@ -1,1 +1,1 @@ -[ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EUnder True (EMathOperator "min") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "max") (EIdentifier "B"),ESpace (1 % 1),EUnder True (EMathOperator "det") (EIdentifier "C"),ESpace (1 % 1),EUnder True (EMathOperator "Pr") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "gcd") (EIdentifier "A"),ESpace (1 % 1),ESuper (EOver False (EIdentifier "u") (ESymbol Accent "\775")) (ENumber "2"),ESpace (1 % 1),ESub (EOver False (EIdentifier "u") (ESymbol Accent "\175")) (EIdentifier "\949"),ESpace (1 % 1),ESubsup (EUnder False (EIdentifier "u") (ESymbol Accent "\818")) (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EOver False (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\9182")) (EText TextNormal "term"),ESpace (1 % 1),EOver False (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\9140")) (EIdentifier "c"),ESpace (1 % 1),EUnder False (EUnder False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\9183")) (EIdentifier "c"),ESpace (1 % 1),EUnder False (EUnder False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol Accent "\9141")) (EIdentifier "c"),ESuper (ESpace (1 % 1)) (EIdentifier "H"),EIdentifier "e",ENumber "3",ESub (ESpace (1 % 1)) (EIdentifier "x"),EIdentifier "A",ESubsup (ESpace (1 % 1)) (EIdentifier "x") (ENumber "3")] +[ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),ESubsup (EIdentifier "x") (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EUnder True (EMathOperator "min") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "max") (EIdentifier "B"),ESpace (1 % 1),EUnder True (EMathOperator "det") (EIdentifier "C"),ESpace (1 % 1),EUnder True (EMathOperator "Pr") (EIdentifier "A"),ESpace (1 % 1),EUnder True (EMathOperator "gcd") (EIdentifier "A"),ESpace (1 % 1),ESuper (EOver False (EIdentifier "u") (ESymbol Accent "\775")) (ENumber "2"),ESpace (1 % 1),ESub (EOver False (EIdentifier "u") (ESymbol TOver "\175")) (EIdentifier "\949"),ESpace (1 % 1),ESubsup (EUnder False (EIdentifier "u") (ESymbol TUnder "\818")) (EIdentifier "b") (EIdentifier "a"),ESpace (1 % 1),EOver False (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol TOver "\9182")) (EText TextNormal "term"),ESpace (1 % 1),EOver False (EOver False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol TOver "\9140")) (EIdentifier "c"),ESpace (1 % 1),EUnder False (EUnder False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol TUnder "\9183")) (EIdentifier "c"),ESpace (1 % 1),EUnder False (EUnder False (EGrouped [EIdentifier "a",ESymbol Bin "+",EIdentifier "b"]) (ESymbol TUnder "\9141")) (EIdentifier "c"),ESuper (ESpace (1 % 1)) (EIdentifier "H"),EIdentifier "e",ENumber "3",ESub (ESpace (1 % 1)) (EIdentifier "x"),EIdentifier "A",ESubsup (ESpace (1 % 1)) (EIdentifier "x") (ENumber "3")] diff --git a/tests/writers/00000_C0_Controls_and_Basic_Latin.mml b/tests/writers/00000_C0_Controls_and_Basic_Latin.mml --- a/tests/writers/00000_C0_Controls_and_Basic_Latin.mml +++ b/tests/writers/00000_C0_Controls_and_Basic_Latin.mml @@ -51,7 +51,7 @@ P - ` + ` p @@ -97,7 +97,7 @@ * - " + " 2 @@ -242,7 +242,7 @@ * - ' + ' 7 @@ -460,7 +460,7 @@ n - ~ + ~ diff --git a/tests/writers/00080_C1_Controls_and_Latin-1_Supplement.mml b/tests/writers/00080_C1_Controls_and_Latin-1_Supplement.mml --- a/tests/writers/00080_C1_Controls_and_Latin-1_Supplement.mml +++ b/tests/writers/00080_C1_Controls_and_Latin-1_Supplement.mml @@ -100,7 +100,7 @@ ¢ - ² + ² Â @@ -129,7 +129,7 @@ £ - ³ + ³ Ã @@ -158,7 +158,7 @@ ¤ - ´ + ´ Ä @@ -271,10 +271,10 @@ @ - ¨ + ¨ - ¸ + ¸ È @@ -303,7 +303,7 @@ © - ¹ + ¹ É @@ -329,10 +329,10 @@ @ - ª + ª - º + º Ê @@ -474,7 +474,7 @@ @ - ¯ + ¯ ¿ diff --git a/tests/writers/002B0_Spacing_Modifier_Letters.mml b/tests/writers/002B0_Spacing_Modifier_Letters.mml --- a/tests/writers/002B0_Spacing_Modifier_Letters.mml +++ b/tests/writers/002B0_Spacing_Modifier_Letters.mml @@ -147,7 +147,7 @@ ʶ - ˆ + ˆ ˖ @@ -167,7 +167,7 @@ ʷ - ˇ + ˇ ˗ @@ -176,7 +176,7 @@ ˧ - ˷ + ˷ @@ -190,7 +190,7 @@ ˈ - ˘ + ˘ ˨ @@ -207,10 +207,10 @@ ʹ - ˉ + ˉ - ˙ + ˙ ˩ @@ -227,10 +227,10 @@ ʺ - ˊ + ˊ - ˚ + ˚ ˪ @@ -247,7 +247,7 @@ ʻ - ˋ + ˋ ˛ @@ -270,7 +270,7 @@ ˌ - ˜ + ˜ ˬ @@ -287,10 +287,10 @@ ʽ - ˍ + ˍ - ˝ + ˝ ˭ diff --git a/tests/writers/00300_Combining_Diacritical_Marks.mml b/tests/writers/00300_Combining_Diacritical_Marks.mml --- a/tests/writers/00300_Combining_Diacritical_Marks.mml +++ b/tests/writers/00300_Combining_Diacritical_Marks.mml @@ -30,16 +30,16 @@ 0 - ̀ + ̀ - ̐ + ̐ ̠ - ̰ + ̰ ̀ @@ -56,16 +56,16 @@ 1 - ́ + ́ - ̑ + ̑ ̡ - ̱ + ̱ ́ @@ -82,16 +82,16 @@ 2 - ̂ + ̂ - ̒ + ̒ ̢ - ̲ + ̲ ͂ @@ -108,16 +108,16 @@ 3 - ̃ + ̃ ̓ - ̣ + ̣ - ̳ + ̳ ̓ @@ -134,7 +134,7 @@ 4 - ̄ + ̄ ̔ @@ -160,10 +160,10 @@ 5 - ̅ + ̅ - ̕ + ̕ ̥ @@ -186,7 +186,7 @@ 6 - ̆ + ̆ ̖ @@ -198,7 +198,7 @@ ̶ - ͆ + ͆ ͖ @@ -212,7 +212,7 @@ 7 - ̇ + ̇ ̗ @@ -238,7 +238,7 @@ 8 - ̈ + ̈ ̘ @@ -247,7 +247,7 @@ ̨ - ̸ + ̸ ͈ @@ -264,7 +264,7 @@ 9 - ̉ + ̉ ̙ @@ -290,16 +290,16 @@ A - ̊ + ̊ - ̚ + ̚ ̪ - ̺ + ̺ ͊ @@ -342,13 +342,13 @@ C - ̌ + ̌ ̜ - ̬ + ̬ ̼ @@ -374,7 +374,7 @@ ̝ - ̭ + ̭ ̽ @@ -400,7 +400,7 @@ ̞ - ̮ + ̮ ̾ @@ -426,10 +426,10 @@ ̟ - ̯ + ̯ - ̿ + ̿ ͏ diff --git a/tests/writers/02000_General_Punctuation.mml b/tests/writers/02000_General_Punctuation.mml --- a/tests/writers/02000_General_Punctuation.mml +++ b/tests/writers/02000_General_Punctuation.mml @@ -117,7 +117,7 @@ ‣ - ″ + ″ ⁃ @@ -143,7 +143,7 @@ ․ - ‴ + ‴ ⁄ @@ -169,7 +169,7 @@ ‥ - ‵ + ‵ ⁅ @@ -195,7 +195,7 @@ … - ‶ + ‶ ⁆ @@ -221,13 +221,13 @@ ‧ - ‷ + ‷ ⁇ - ⁗ + ⁗ @ @@ -293,7 +293,7 @@   - ‚ + ‚ ‪ @@ -319,7 +319,7 @@ ​ - ‛ + ‛ ‫ @@ -397,13 +397,13 @@ ‎ - „ + „ ‮ - ‾ + ‾ ⁎ @@ -423,7 +423,7 @@ ‏ - ‟ + ‟   diff --git a/tests/writers/020D0_Combining_Diacritical_Marks_for_Symbols.mml b/tests/writers/020D0_Combining_Diacritical_Marks_for_Symbols.mml --- a/tests/writers/020D0_Combining_Diacritical_Marks_for_Symbols.mml +++ b/tests/writers/020D0_Combining_Diacritical_Marks_for_Symbols.mml @@ -18,13 +18,13 @@ 0 - ⃐ + ⃐ ⃠ - ⃰ + ⃰ @@ -32,10 +32,10 @@ 1 - ⃑ + ⃑ - ⃡ + ⃡ @ @@ -46,7 +46,7 @@ 2 - ⃒ + ⃒ ⃢ @@ -60,7 +60,7 @@ 3 - ⃓ + ⃓ ⃣ @@ -74,10 +74,10 @@ 4 - ⃔ + ⃔ - ⃤ + ⃤ @ @@ -91,7 +91,7 @@ ⃕ - ⃥ + ⃥ @ @@ -102,10 +102,10 @@ 6 - ⃖ + ⃖ - ⃦ + ⃦ @ @@ -116,10 +116,10 @@ 7 - ⃗ + ⃗ - ⃧ + ⃧ @ @@ -130,10 +130,10 @@ 8 - ⃘ + ⃘ - ⃨ + ⃨ @ @@ -144,10 +144,10 @@ 9 - ⃙ + ⃙ - ⃩ + ⃩ @ @@ -158,10 +158,10 @@ A - ⃚ + ⃚ - ⃪ + ⃪ @ @@ -172,10 +172,10 @@ B - ⃛ + ⃛ - ⃫ + ⃫ @ @@ -186,10 +186,10 @@ C - ⃜ + ⃜ - ⃬ + ⃬ @ @@ -200,10 +200,10 @@ D - ⃝ + ⃝ - ⃭ + ⃭ @ @@ -214,10 +214,10 @@ E - ⃞ + ⃞ - ⃮ + ⃮ @ @@ -228,10 +228,10 @@ F - ⃟ + ⃟ - ⃯ + ⃯ @ diff --git a/tests/writers/02190_Arrows.mml b/tests/writers/02190_Arrows.mml --- a/tests/writers/02190_Arrows.mml +++ b/tests/writers/02190_Arrows.mml @@ -30,25 +30,25 @@ 0 - ← + ← - ↠ + ↠ ↰ - ⇀ + ⇀ - ⇐ + ⇐ - ⇠ + ⇠ - ⇰ + ⇰ @@ -65,7 +65,7 @@ ↱ - ⇁ + ⇁ ⇑ @@ -82,10 +82,10 @@ 2 - → + → - ↢ + ↢ ↲ @@ -94,10 +94,10 @@ ⇂ - ⇒ + ⇒ - ⇢ + ⇢ ⇲ @@ -111,7 +111,7 @@ ↓ - ↣ + ↣ ↳ @@ -134,25 +134,25 @@ 4 - ↔ + ↔ - ↤ + ↤ ↴ - ⇄ + ⇄ - ⇔ + ⇔ - ⇤ + ⇤ - ⇴ + ⇴ @@ -175,7 +175,7 @@ ⇕ - ⇥ + ⇥ ⇵ @@ -189,22 +189,22 @@ ↖ - ↦ + ↦ - ↶ + ↶ - ⇆ + ⇆ ⇖ - ⇦ + ⇦ - ⇶ + ⇶ @@ -218,10 +218,10 @@ ↧ - ↷ + ↷ - ⇇ + ⇇ ⇗ @@ -230,7 +230,7 @@ ⇧ - ⇷ + ⇷ @@ -253,10 +253,10 @@ ⇘ - ⇨ + ⇨ - ⇸ + ⇸ @@ -267,13 +267,13 @@ ↙ - ↩ + ↩ - ↹ + ↹ - ⇉ + ⇉ ⇙ @@ -282,7 +282,7 @@ ⇩ - ⇹ + ⇹ @@ -290,10 +290,10 @@ A - ↚ + ↚ - ↪ + ↪ ↺ @@ -302,13 +302,13 @@ ⇊ - ⇚ + ⇚ ⇪ - ⇺ + ⇺ @@ -316,25 +316,25 @@ B - ↛ + ↛ - ↫ + ↫ ↻ - ⇋ + ⇋ - ⇛ + ⇛ ⇫ - ⇻ + ⇻ @@ -342,25 +342,25 @@ C - ↜ + ↜ - ↬ + ↬ - ↼ + ↼ - ⇌ + ⇌ - ⇜ + ⇜ ⇬ - ⇼ + ⇼ @@ -368,25 +368,25 @@ D - ↝ + ↝ - ↭ + ↭ - ↽ + ↽ - ⇍ + ⇍ - ⇝ + ⇝ ⇭ - ⇽ + ⇽ @@ -394,16 +394,16 @@ E - ↞ + ↞ - ↮ + ↮ ↾ - ⇎ + ⇎ ⇞ @@ -412,7 +412,7 @@ ⇮ - ⇾ + ⇾ @@ -420,7 +420,7 @@ F - ↟ + ↟ ↯ @@ -429,7 +429,7 @@ ↿ - ⇏ + ⇏ ⇟ @@ -438,7 +438,7 @@ ⇯ - ⇿ + ⇿ diff --git a/tests/writers/02300_Miscellaneous_Technical.mml b/tests/writers/02300_Miscellaneous_Technical.mml --- a/tests/writers/02300_Miscellaneous_Technical.mml +++ b/tests/writers/02300_Miscellaneous_Technical.mml @@ -99,7 +99,7 @@ ⏐ - ⏠ + ⏠ @ @@ -152,7 +152,7 @@ ⏑ - ⏡ + ⏡ @ @@ -302,7 +302,7 @@ ⎤ - ⎴ + ⎴ ⏄ @@ -355,7 +355,7 @@ ⎥ - ⎵ + ⎵ ⏅ @@ -732,7 +732,7 @@ ⏌ - ⏜ + ⏜ @ @@ -785,7 +785,7 @@ ⏍ - ⏝ + ⏝ @ @@ -838,7 +838,7 @@ ⏎ - ⏞ + ⏞ @ @@ -891,7 +891,7 @@ ⏏ - ⏟ + ⏟ @ diff --git a/tests/writers/027F0_Supplemental_Arrows-A.mml b/tests/writers/027F0_Supplemental_Arrows-A.mml --- a/tests/writers/027F0_Supplemental_Arrows-A.mml +++ b/tests/writers/027F0_Supplemental_Arrows-A.mml @@ -52,7 +52,7 @@ 5 - ⟵ + ⟵ @@ -60,7 +60,7 @@ 6 - ⟶ + ⟶ @@ -68,7 +68,7 @@ 7 - ⟷ + ⟷ @@ -76,7 +76,7 @@ 8 - ⟸ + ⟸ @@ -84,7 +84,7 @@ 9 - ⟹ + ⟹ @@ -92,7 +92,7 @@ A - ⟺ + ⟺ @@ -100,7 +100,7 @@ B - ⟻ + ⟻ @@ -108,7 +108,7 @@ C - ⟼ + ⟼ @@ -116,7 +116,7 @@ D - ⟽ + ⟽ @@ -124,7 +124,7 @@ E - ⟾ + ⟾ @@ -132,7 +132,7 @@ F - ⟿ + ⟿ diff --git a/tests/writers/02900_Supplemental_Arrows-B.mml b/tests/writers/02900_Supplemental_Arrows-B.mml --- a/tests/writers/02900_Supplemental_Arrows-B.mml +++ b/tests/writers/02900_Supplemental_Arrows-B.mml @@ -33,13 +33,13 @@ 0 - ⤀ + ⤀ - ⤐ + ⤐ - ⤠ + ⤠ ⤰ @@ -48,13 +48,13 @@ ⥀ - ⥐ + ⥐ ⥠ - ⥰ + ⥰ @@ -62,10 +62,10 @@ 1 - ⤁ + ⤁ - ⤑ + ⤑ ⤡ @@ -83,7 +83,7 @@ ⥡ - ⥱ + ⥱ @@ -91,7 +91,7 @@ 2 - ⤂ + ⤂ ⤒ @@ -103,16 +103,16 @@ ⤲ - ⥂ + ⥂ - ⥒ + ⥒ - ⥢ + ⥢ - ⥲ + ⥲ @@ -120,7 +120,7 @@ 3 - ⤃ + ⤃ ⤓ @@ -129,19 +129,19 @@ ⤣ - ⤳ + ⤳ - ⥃ + ⥃ - ⥓ + ⥓ ⥣ - ⥳ + ⥳ @@ -149,10 +149,10 @@ 4 - ⤄ + ⤄ - ⤔ + ⤔ ⤤ @@ -161,16 +161,16 @@ ⤴ - ⥄ + ⥄ ⥔ - ⥤ + ⥤ - ⥴ + ⥴ @@ -178,10 +178,10 @@ 5 - ⤅ + ⤅ - ⤕ + ⤕ ⤥ @@ -190,7 +190,7 @@ ⤵ - ⥅ + ⥅ ⥕ @@ -199,7 +199,7 @@ ⥥ - ⥵ + ⥵ @@ -207,10 +207,10 @@ 6 - ⤆ + ⤆ - ⤖ + ⤖ ⤦ @@ -219,16 +219,16 @@ ⤶ - ⥆ + ⥆ ⥖ - ⥦ + ⥦ - ⥶ + ⥶ @@ -236,10 +236,10 @@ 7 - ⤇ + ⤇ - ⤗ + ⤗ ⤧ @@ -248,16 +248,16 @@ ⤷ - ⥇ + ⥇ ⥗ - ⥧ + ⥧ - ⥷ + ⥷ @@ -268,7 +268,7 @@ ⤈ - ⤘ + ⤘ ⤨ @@ -277,16 +277,16 @@ ⤸ - ⥈ + ⥈ ⥘ - ⥨ + ⥨ - ⥸ + ⥸ @@ -297,7 +297,7 @@ ⤉ - ⤙ + ⤙ ⤩ @@ -312,10 +312,10 @@ ⥙ - ⥩ + ⥩ - ⥹ + ⥹ @@ -326,25 +326,25 @@ ⤊ - ⤚ + ⤚ ⤪ - ⤺ + ⤺ - ⥊ + ⥊ - ⥚ + ⥚ - ⥪ + ⥪ - ⥺ + ⥺ @@ -355,25 +355,25 @@ ⤋ - ⤛ + ⤛ ⤫ - ⤻ + ⤻ - ⥋ + ⥋ - ⥛ + ⥛ - ⥫ + ⥫ - ⥻ + ⥻ @@ -381,16 +381,16 @@ C - ⤌ + ⤌ - ⤜ + ⤜ ⤬ - ⤼ + ⤼ ⥌ @@ -399,10 +399,10 @@ ⥜ - ⥬ + ⥬ - ⥼ + ⥼ @@ -410,16 +410,16 @@ D - ⤍ + ⤍ - ⤝ + ⤝ ⤭ - ⤽ + ⤽ ⥍ @@ -428,10 +428,10 @@ ⥝ - ⥭ + ⥭ - ⥽ + ⥽ @@ -439,10 +439,10 @@ E - ⤎ + ⤎ - ⤞ + ⤞ ⤮ @@ -451,10 +451,10 @@ ⤾ - ⥎ + ⥎ - ⥞ + ⥞ ⥮ @@ -468,10 +468,10 @@ F - ⤏ + ⤏ - ⤟ + ⤟ ⤯ @@ -483,7 +483,7 @@ ⥏ - ⥟ + ⥟ ⥯ diff --git a/tests/writers/06.mml b/tests/writers/06.mml --- a/tests/writers/06.mml +++ b/tests/writers/06.mml @@ -8,7 +8,7 @@ = 1 - ∞ + ∞ ∑ @@ -17,7 +17,7 @@ = 1 - ∞ + ∞ diff --git a/tests/writers/09.mml b/tests/writers/09.mml --- a/tests/writers/09.mml +++ b/tests/writers/09.mml @@ -5,7 +5,7 @@ lim z - → + → z 0 diff --git a/tests/writers/0FE00_Variation_Selectors.mml b/tests/writers/0FE00_Variation_Selectors.mml --- a/tests/writers/0FE00_Variation_Selectors.mml +++ b/tests/writers/0FE00_Variation_Selectors.mml @@ -12,7 +12,7 @@ 0 - ︀ + ︀ diff --git a/tests/writers/0FE30_CJK_Compatibility_Forms.mml b/tests/writers/0FE30_CJK_Compatibility_Forms.mml --- a/tests/writers/0FE30_CJK_Compatibility_Forms.mml +++ b/tests/writers/0FE30_CJK_Compatibility_Forms.mml @@ -92,7 +92,7 @@ 7 - ︷ + ︷ ﹇ @@ -103,7 +103,7 @@ 8 - ︸ + ︸ ﹈ diff --git a/tests/writers/13.mml b/tests/writers/13.mml --- a/tests/writers/13.mml +++ b/tests/writers/13.mml @@ -44,7 +44,7 @@ = 0 - ∞ + ∞ diff --git a/tests/writers/a.mml b/tests/writers/a.mml --- a/tests/writers/a.mml +++ b/tests/writers/a.mml @@ -78,7 +78,7 @@ acute - ´ + ´ @@ -470,7 +470,7 @@ apos - ' + ' diff --git a/tests/writers/accents1.mml b/tests/writers/accents1.mml --- a/tests/writers/accents1.mml +++ b/tests/writers/accents1.mml @@ -166,67 +166,67 @@ H - ' + ' H - ^ + ^ H - _ + _ H - ` + ` H - ~ + ~ H - ¨ + ¨ H - ¯ + ¯ H - ´ + ´ H - ¸ + ¸ H - ˆ + ˆ H - ˇ + ˇ H - ˘ + ˘ H - ˙ + ˙ H - ˚ + ˚ H - ˜ + ˜ H - ˝ + ˝ H @@ -238,7 +238,7 @@ H - ‾ + ‾ H @@ -250,63 +250,63 @@ H - ← + ← H - → + → H - ↔ + ↔ H - ↼ + ↼ H - ↽ + ↽ H - ⇀ + ⇀ H - ⇁ + ⇁ H - ⎴ + ⎴ H - ⎵ + ⎵ H - ⏜ + ⏜ H - ⏝ + ⏝ H - ⏞ + ⏞ H - ⏟ + ⏟ H - ⥎ + ⥎ H - ⥐ + ⥐ diff --git a/tests/writers/accents1.omml b/tests/writers/accents1.omml --- a/tests/writers/accents1.omml +++ b/tests/writers/accents1.omml @@ -543,18 +543,16 @@ - + + + + H - - - ¯ - - - + @@ -687,18 +685,16 @@ - + + + + H - - - ‾ - - - + @@ -807,18 +803,18 @@ - + + + + + + H - - - ⎴ - - - + @@ -831,18 +827,18 @@ - + + + + + + H - - - ⏜ - - - + @@ -855,18 +851,18 @@ - + + + + + + H - - - ⏞ - - - + diff --git a/tests/writers/accents1.tex b/tests/writers/accents1.tex --- a/tests/writers/accents1.tex +++ b/tests/writers/accents1.tex @@ -2,5 +2,5 @@ \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}} \\ \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}\overset{\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}\overset{}{H}\overset{}{H}\overset{}{H}\overset{}{H}\overbrace{H}\overset{\underbrace{}}{H}\overset{}{H}\overset{}{H}} \\ \end{array} diff --git a/tests/writers/accents2.mml b/tests/writers/accents2.mml --- a/tests/writers/accents2.mml +++ b/tests/writers/accents2.mml @@ -166,67 +166,67 @@ x - ' + ' x - ^ + ^ x - _ + _ x - ` + ` x - ~ + ~ x - ¨ + ¨ x - ¯ + ¯ x - ´ + ´ x - ¸ + ¸ x - ˆ + ˆ x - ˇ + ˇ x - ˘ + ˘ x - ˙ + ˙ x - ˚ + ˚ x - ˜ + ˜ x - ˝ + ˝ x @@ -238,7 +238,7 @@ x - ‾ + ‾ x @@ -250,63 +250,63 @@ x - ← + ← x - → + → x - ↔ + ↔ x - ↼ + ↼ x - ↽ + ↽ x - ⇀ + ⇀ x - ⇁ + ⇁ x - ⎴ + ⎴ x - ⎵ + ⎵ x - ⏜ + ⏜ x - ⏝ + ⏝ x - ⏞ + ⏞ x - ⏟ + ⏟ x - ⥎ + ⥎ x - ⥐ + ⥐ diff --git a/tests/writers/accents2.omml b/tests/writers/accents2.omml --- a/tests/writers/accents2.omml +++ b/tests/writers/accents2.omml @@ -543,18 +543,16 @@ - + + + + x - - - ¯ - - - + @@ -687,18 +685,16 @@ - + + + + x - - - ‾ - - - + @@ -807,18 +803,18 @@ - + + + + + + x - - - ⎴ - - - + @@ -831,18 +827,18 @@ - + + + + + + x - - - ⏜ - - - + @@ -855,18 +851,18 @@ - + + + + + + x - - - ⏞ - - - + diff --git a/tests/writers/accents2.tex b/tests/writers/accents2.tex --- a/tests/writers/accents2.tex +++ b/tests/writers/accents2.tex @@ -2,5 +2,5 @@ \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}} \\ \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}\overset{\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}\overset{}{x}\overset{}{x}\overset{}{x}\overset{}{x}\overbrace{x}\overset{\underbrace{}}{x}\overset{}{x}\overset{}{x}} \\ \end{array} diff --git a/tests/writers/accents3.mml b/tests/writers/accents3.mml --- a/tests/writers/accents3.mml +++ b/tests/writers/accents3.mml @@ -166,67 +166,67 @@ H - ' + ' H - ^ + ^ H - _ + _ H - ` + ` H - ~ + ~ H - ¨ + ¨ H - ¯ + ¯ H - ´ + ´ H - ¸ + ¸ H - ˆ + ˆ H - ˇ + ˇ H - ˘ + ˘ H - ˙ + ˙ H - ˚ + ˚ H - ˜ + ˜ H - ˝ + ˝ H @@ -238,7 +238,7 @@ H - ‾ + ‾ H @@ -250,63 +250,63 @@ H - ← + ← H - → + → H - ↔ + ↔ H - ↼ + ↼ H - ↽ + ↽ H - ⇀ + ⇀ H - ⇁ + ⇁ H - ⎴ + ⎴ H - ⎵ + ⎵ H - ⏜ + ⏜ H - ⏝ + ⏝ H - ⏞ + ⏞ H - ⏟ + ⏟ H - ⥎ + ⥎ H - ⥐ + ⥐ diff --git a/tests/writers/accents3.omml b/tests/writers/accents3.omml --- a/tests/writers/accents3.omml +++ b/tests/writers/accents3.omml @@ -29,78 +29,78 @@ - + + + + + + H - - - ' - - - - + + + + + + + H - - - ^ - - - - + + + + + + + H - - - _ - - - - + + + + + + + H - - - ` - - - - + + + + + + + H - - - ~ - - - - + + + + + + + H - - - ¨ - - - + @@ -111,138 +111,138 @@ - + + + + + + H - - - ´ - - - - + + + + + + + H - - - ¸ - - - - + + + + + + + H - - - ˆ - - - - + + + + + + + H - - - ˇ - - - - + + + + + + + H - - - ˘ - - - - + + + + + + + H - - - ˙ - - - - + + + + + + + H - - - ˚ - - - - + + + + + + + H - - - ˜ - - - - + + + + + + + H - - - ˝ - - - - + + + + + + + H - - - ̂ - - - - + + + + + + + H - - - ̑ - - - + @@ -253,210 +253,210 @@ - + + + + + + H - - - ⃛ - - - - + + + + + + + H - - - ⃜ - - - - + + + + + + + H - - - ← - - - - + + + + + + + H - - - → - - - - + + + + + + + H - - - ↔ - - - - + + + + + + + H - - - ↼ - - - - + + + + + + + H - - - ↽ - - - - + + + + + + + H - - - ⇀ - - - - + + + + + + + H - - - ⇁ - - - - + + + + + + + H - - - ⎴ - - - - + + + + + + + H - - - ⎵ - - - - + + + + + + + H - - - ⏜ - - - - + + + + + + + H - - - ⏝ - - - - + + + + + + + H - - - ⏞ - - - - + + + + + + + H - - - ⏟ - - - - + + + + + + + H - - - ⥎ - - - - + + + + + + + H - - - ⥐ - - - + @@ -543,18 +543,16 @@ - + + + + H - - - ¯ - - - + @@ -663,66 +661,64 @@ - + + + + + + H - - - ̂ - - - - + + + + + + + H - - - ̑ - - - - + + + + + H - - - ‾ - - - - + + + + + + + H - - - ⃛ - - - - + + + + + + + H - - - ⃜ - - - + @@ -819,18 +815,18 @@ - + + + + + + H - - - ⎵ - - - + @@ -843,18 +839,18 @@ - + + + + + + H - - - ⏝ - - - + @@ -867,18 +863,18 @@ - + + + + + + H - - - ⏟ - - - + diff --git a/tests/writers/accents3.tex b/tests/writers/accents3.tex --- a/tests/writers/accents3.tex +++ b/tests/writers/accents3.tex @@ -2,5 +2,5 @@ \text{default:\ (accent=true)} \\ {\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}} \\ \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}\underset{\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}\underset{}{H}\underset{}{H}\underset{}{H}\underset{\overbrace{}}{H}\underbrace{H}\underset{}{H}\underset{}{H}} \\ \end{array} diff --git a/tests/writers/accents4.mml b/tests/writers/accents4.mml --- a/tests/writers/accents4.mml +++ b/tests/writers/accents4.mml @@ -166,67 +166,67 @@ x - ' + ' x - ^ + ^ x - _ + _ x - ` + ` x - ~ + ~ x - ¨ + ¨ x - ¯ + ¯ x - ´ + ´ x - ¸ + ¸ x - ˆ + ˆ x - ˇ + ˇ x - ˘ + ˘ x - ˙ + ˙ x - ˚ + ˚ x - ˜ + ˜ x - ˝ + ˝ x @@ -238,7 +238,7 @@ x - ‾ + ‾ x @@ -250,63 +250,63 @@ x - ← + ← x - → + → x - ↔ + ↔ x - ↼ + ↼ x - ↽ + ↽ x - ⇀ + ⇀ x - ⇁ + ⇁ x - ⎴ + ⎴ x - ⎵ + ⎵ x - ⏜ + ⏜ x - ⏝ + ⏝ x - ⏞ + ⏞ x - ⏟ + ⏟ x - ⥎ + ⥎ x - ⥐ + ⥐ diff --git a/tests/writers/accents4.omml b/tests/writers/accents4.omml --- a/tests/writers/accents4.omml +++ b/tests/writers/accents4.omml @@ -29,78 +29,78 @@ - + + + + + + x - - - ' - - - - + + + + + + + x - - - ^ - - - - + + + + + + + x - - - _ - - - - + + + + + + + x - - - ` - - - - + + + + + + + x - - - ~ - - - - + + + + + + + x - - - ¨ - - - + @@ -111,138 +111,138 @@ - + + + + + + x - - - ´ - - - - + + + + + + + x - - - ¸ - - - - + + + + + + + x - - - ˆ - - - - + + + + + + + x - - - ˇ - - - - + + + + + + + x - - - ˘ - - - - + + + + + + + x - - - ˙ - - - - + + + + + + + x - - - ˚ - - - - + + + + + + + x - - - ˜ - - - - + + + + + + + x - - - ˝ - - - - + + + + + + + x - - - ̂ - - - - + + + + + + + x - - - ̑ - - - + @@ -253,210 +253,210 @@ - + + + + + + x - - - ⃛ - - - - + + + + + + + x - - - ⃜ - - - - + + + + + + + x - - - ← - - - - + + + + + + + x - - - → - - - - + + + + + + + x - - - ↔ - - - - + + + + + + + x - - - ↼ - - - - + + + + + + + x - - - ↽ - - - - + + + + + + + x - - - ⇀ - - - - + + + + + + + x - - - ⇁ - - - - + + + + + + + x - - - ⎴ - - - - + + + + + + + x - - - ⎵ - - - - + + + + + + + x - - - ⏜ - - - - + + + + + + + x - - - ⏝ - - - - + + + + + + + x - - - ⏞ - - - - + + + + + + + x - - - ⏟ - - - - + + + + + + + x - - - ⥎ - - - - + + + + + + + x - - - ⥐ - - - + @@ -543,18 +543,16 @@ - + + + + x - - - ¯ - - - + @@ -663,66 +661,64 @@ - + + + + + + x - - - ̂ - - - - + + + + + + + x - - - ̑ - - - - + + + + + x - - - ‾ - - - - + + + + + + + x - - - ⃛ - - - - + + + + + + + x - - - ⃜ - - - + @@ -819,18 +815,18 @@ - + + + + + + x - - - ⎵ - - - + @@ -843,18 +839,18 @@ - + + + + + + x - - - ⏝ - - - + @@ -867,18 +863,18 @@ - + + + + + + x - - - ⏟ - - - + diff --git a/tests/writers/accents4.tex b/tests/writers/accents4.tex --- a/tests/writers/accents4.tex +++ b/tests/writers/accents4.tex @@ -2,5 +2,5 @@ \text{default:\ (accent=true)} \\ {\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}} \\ \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}\underset{\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}\underset{}{x}\underset{}{x}\underset{}{x}\underset{\overbrace{}}{x}\underbrace{x}\underset{}{x}\underset{}{x}} \\ \end{array} diff --git a/tests/writers/accents5.mml b/tests/writers/accents5.mml --- a/tests/writers/accents5.mml +++ b/tests/writers/accents5.mml @@ -202,83 +202,83 @@ H - ' - ' + ' + ' H - ^ - ^ + ^ + ^ H - _ - _ + _ + _ H - ` - ` + ` + ` H - ~ - ~ + ~ + ~ H - ¨ - ¨ + ¨ + ¨ H - ¯ - ¯ + ¯ + ¯ H - ´ - ´ + ´ + ´ H - ¸ - ¸ + ¸ + ¸ H - ˆ - ˆ + ˆ + ˆ H - ˇ - ˇ + ˇ + ˇ H - ˘ - ˘ + ˘ + ˘ H - ˙ - ˙ + ˙ + ˙ H - ˚ - ˚ + ˚ + ˚ H - ˜ - ˜ + ˜ + ˜ H - ˝ - ˝ + ˝ + ˝ H @@ -292,8 +292,8 @@ H - ‾ - ‾ + ‾ + ‾ H @@ -307,78 +307,78 @@ H - ← - ← + ← + ← H - → - → + → + → H - ↔ - ↔ + ↔ + ↔ H - ↼ - ↼ + ↼ + ↼ H - ↽ - ↽ + ↽ + ↽ H - ⇀ - ⇀ + ⇀ + ⇀ H - ⇁ - ⇁ + ⇁ + ⇁ H - ⎴ - ⎴ + ⎴ + ⎴ H - ⎵ - ⎵ + ⎵ + ⎵ H - ⏜ - ⏜ + ⏜ + ⏜ H - ⏝ - ⏝ + ⏝ + ⏝ H - ⏞ - ⏞ + ⏞ + ⏞ H - ⏟ - ⏟ + ⏟ + ⏟ H - ⥎ - ⥎ + ⥎ + ⥎ H - ⥐ - ⥐ + ⥐ + ⥐ diff --git a/tests/writers/accents5.omml b/tests/writers/accents5.omml --- a/tests/writers/accents5.omml +++ b/tests/writers/accents5.omml @@ -29,7 +29,12 @@ - + + + + + + @@ -44,13 +49,13 @@ - - - ' - - - - + + + + + + + @@ -65,13 +70,13 @@ - - - ^ - - - - + + + + + + + @@ -86,13 +91,13 @@ - - - _ - - - - + + + + + + + @@ -107,13 +112,13 @@ - - - ` - - - - + + + + + + + @@ -128,13 +133,13 @@ - - - ~ - - - - + + + + + + + @@ -149,12 +154,7 @@ - - - ¨ - - - + @@ -172,7 +172,12 @@ - + + + + + + @@ -187,13 +192,13 @@ - - - ´ - - - - + + + + + + + @@ -208,13 +213,13 @@ - - - ¸ - - - - + + + + + + + @@ -229,13 +234,13 @@ - - - ˆ - - - - + + + + + + + @@ -250,13 +255,13 @@ - - - ˇ - - - - + + + + + + + @@ -271,13 +276,13 @@ - - - ˘ - - - - + + + + + + + @@ -292,13 +297,13 @@ - - - ˙ - - - - + + + + + + + @@ -313,13 +318,13 @@ - - - ˚ - - - - + + + + + + + @@ -334,13 +339,13 @@ - - - ˜ - - - - + + + + + + + @@ -355,13 +360,13 @@ - - - ˝ - - - - + + + + + + + @@ -376,13 +381,13 @@ - - - ̂ - - - - + + + + + + + @@ -397,12 +402,7 @@ - - - ̑ - - - + @@ -420,7 +420,12 @@ - + + + + + + @@ -435,13 +440,13 @@ - - - ⃛ - - - - + + + + + + + @@ -456,13 +461,13 @@ - - - ⃜ - - - - + + + + + + + @@ -477,13 +482,13 @@ - - - ← - - - - + + + + + + + @@ -498,13 +503,13 @@ - - - → - - - - + + + + + + + @@ -519,13 +524,13 @@ - - - ↔ - - - - + + + + + + + @@ -540,13 +545,13 @@ - - - ↼ - - - - + + + + + + + @@ -561,13 +566,13 @@ - - - ↽ - - - - + + + + + + + @@ -582,13 +587,13 @@ - - - ⇀ - - - - + + + + + + + @@ -603,13 +608,13 @@ - - - ⇁ - - - - + + + + + + + @@ -624,13 +629,13 @@ - - - ⎴ - - - - + + + + + + + @@ -645,13 +650,13 @@ - - - ⎵ - - - - + + + + + + + @@ -666,13 +671,13 @@ - - - ⏜ - - - - + + + + + + + @@ -687,13 +692,13 @@ - - - ⏝ - - - - + + + + + + + @@ -708,13 +713,13 @@ - - - ⏞ - - - - + + + + + + + @@ -729,13 +734,13 @@ - - - ⏟ - - - - + + + + + + + @@ -750,13 +755,13 @@ - - - ⥎ - - - - + + + + + + + @@ -771,12 +776,7 @@ - - - ⥐ - - - + @@ -917,27 +917,23 @@ - + + + + - + + + + H - - - ¯ - - - + - - - ¯ - - - + @@ -1127,7 +1123,12 @@ - + + + + + + @@ -1142,13 +1143,13 @@ - - - ̂ - - - - + + + + + + + @@ -1163,34 +1164,30 @@ - - - ̑ - - - - + + + + + - + + + + H - - - ‾ - - - + - - - ‾ - - - - + + + + + + + @@ -1205,13 +1202,13 @@ - - - ⃛ - - - - + + + + + + + @@ -1226,12 +1223,7 @@ - - - ⃜ - - - + @@ -1381,18 +1373,18 @@ - + + + + + + H - - - ⎴ - - - + @@ -1400,7 +1392,12 @@ - + + + + + + @@ -1415,26 +1412,21 @@ - - - ⎵ - - - + - + + + + + + H - - - ⏜ - - - + @@ -1442,7 +1434,12 @@ - + + + + + + @@ -1457,26 +1454,21 @@ - - - ⏝ - - - + - + + + + + + H - - - ⏞ - - - + @@ -1484,7 +1476,12 @@ - + + + + + + @@ -1499,12 +1496,7 @@ - - - ⏟ - - - + diff --git a/tests/writers/accents5.tex b/tests/writers/accents5.tex --- a/tests/writers/accents5.tex +++ b/tests/writers/accents5.tex @@ -2,5 +2,5 @@ \text{default:\ (accent=true)} \\ {\underset{'}{\overset{'}{H}}\underset{\hat{}}{\hat{H}}\underset{\_}{\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}}} \\ \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{}}{\overset{\overbrace{}}{H}}\underset{\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{}{\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}}} \\ \end{array} diff --git a/tests/writers/accents6.mml b/tests/writers/accents6.mml --- a/tests/writers/accents6.mml +++ b/tests/writers/accents6.mml @@ -202,83 +202,83 @@ x - ' - ' + ' + ' x - ^ - ^ + ^ + ^ x - _ - _ + _ + _ x - ` - ` + ` + ` x - ~ - ~ + ~ + ~ x - ¨ - ¨ + ¨ + ¨ x - ¯ - ¯ + ¯ + ¯ x - ´ - ´ + ´ + ´ x - ¸ - ¸ + ¸ + ¸ x - ˆ - ˆ + ˆ + ˆ x - ˇ - ˇ + ˇ + ˇ x - ˘ - ˘ + ˘ + ˘ x - ˙ - ˙ + ˙ + ˙ x - ˚ - ˚ + ˚ + ˚ x - ˜ - ˜ + ˜ + ˜ x - ˝ - ˝ + ˝ + ˝ x @@ -292,8 +292,8 @@ x - ‾ - ‾ + ‾ + ‾ x @@ -307,78 +307,78 @@ x - ← - ← + ← + ← x - → - → + → + → x - ↔ - ↔ + ↔ + ↔ x - ↼ - ↼ + ↼ + ↼ x - ↽ - ↽ + ↽ + ↽ x - ⇀ - ⇀ + ⇀ + ⇀ x - ⇁ - ⇁ + ⇁ + ⇁ x - ⎴ - ⎴ + ⎴ + ⎴ x - ⎵ - ⎵ + ⎵ + ⎵ x - ⏜ - ⏜ + ⏜ + ⏜ x - ⏝ - ⏝ + ⏝ + ⏝ x - ⏞ - ⏞ + ⏞ + ⏞ x - ⏟ - ⏟ + ⏟ + ⏟ x - ⥎ - ⥎ + ⥎ + ⥎ x - ⥐ - ⥐ + ⥐ + ⥐ diff --git a/tests/writers/accents6.omml b/tests/writers/accents6.omml --- a/tests/writers/accents6.omml +++ b/tests/writers/accents6.omml @@ -29,7 +29,12 @@ - + + + + + + @@ -44,13 +49,13 @@ - - - ' - - - - + + + + + + + @@ -65,13 +70,13 @@ - - - ^ - - - - + + + + + + + @@ -86,13 +91,13 @@ - - - _ - - - - + + + + + + + @@ -107,13 +112,13 @@ - - - ` - - - - + + + + + + + @@ -128,13 +133,13 @@ - - - ~ - - - - + + + + + + + @@ -149,12 +154,7 @@ - - - ¨ - - - + @@ -172,7 +172,12 @@ - + + + + + + @@ -187,13 +192,13 @@ - - - ´ - - - - + + + + + + + @@ -208,13 +213,13 @@ - - - ¸ - - - - + + + + + + + @@ -229,13 +234,13 @@ - - - ˆ - - - - + + + + + + + @@ -250,13 +255,13 @@ - - - ˇ - - - - + + + + + + + @@ -271,13 +276,13 @@ - - - ˘ - - - - + + + + + + + @@ -292,13 +297,13 @@ - - - ˙ - - - - + + + + + + + @@ -313,13 +318,13 @@ - - - ˚ - - - - + + + + + + + @@ -334,13 +339,13 @@ - - - ˜ - - - - + + + + + + + @@ -355,13 +360,13 @@ - - - ˝ - - - - + + + + + + + @@ -376,13 +381,13 @@ - - - ̂ - - - - + + + + + + + @@ -397,12 +402,7 @@ - - - ̑ - - - + @@ -420,7 +420,12 @@ - + + + + + + @@ -435,13 +440,13 @@ - - - ⃛ - - - - + + + + + + + @@ -456,13 +461,13 @@ - - - ⃜ - - - - + + + + + + + @@ -477,13 +482,13 @@ - - - ← - - - - + + + + + + + @@ -498,13 +503,13 @@ - - - → - - - - + + + + + + + @@ -519,13 +524,13 @@ - - - ↔ - - - - + + + + + + + @@ -540,13 +545,13 @@ - - - ↼ - - - - + + + + + + + @@ -561,13 +566,13 @@ - - - ↽ - - - - + + + + + + + @@ -582,13 +587,13 @@ - - - ⇀ - - - - + + + + + + + @@ -603,13 +608,13 @@ - - - ⇁ - - - - + + + + + + + @@ -624,13 +629,13 @@ - - - ⎴ - - - - + + + + + + + @@ -645,13 +650,13 @@ - - - ⎵ - - - - + + + + + + + @@ -666,13 +671,13 @@ - - - ⏜ - - - - + + + + + + + @@ -687,13 +692,13 @@ - - - ⏝ - - - - + + + + + + + @@ -708,13 +713,13 @@ - - - ⏞ - - - - + + + + + + + @@ -729,13 +734,13 @@ - - - ⏟ - - - - + + + + + + + @@ -750,13 +755,13 @@ - - - ⥎ - - - - + + + + + + + @@ -771,12 +776,7 @@ - - - ⥐ - - - + @@ -917,27 +917,23 @@ - + + + + - + + + + x - - - ¯ - - - + - - - ¯ - - - + @@ -1127,7 +1123,12 @@ - + + + + + + @@ -1142,13 +1143,13 @@ - - - ̂ - - - - + + + + + + + @@ -1163,34 +1164,30 @@ - - - ̑ - - - - + + + + + - + + + + x - - - ‾ - - - + - - - ‾ - - - - + + + + + + + @@ -1205,13 +1202,13 @@ - - - ⃛ - - - - + + + + + + + @@ -1226,12 +1223,7 @@ - - - ⃜ - - - + @@ -1381,18 +1373,18 @@ - + + + + + + x - - - ⎴ - - - + @@ -1400,7 +1392,12 @@ - + + + + + + @@ -1415,26 +1412,21 @@ - - - ⎵ - - - + - + + + + + + x - - - ⏜ - - - + @@ -1442,7 +1434,12 @@ - + + + + + + @@ -1457,26 +1454,21 @@ - - - ⏝ - - - + - + + + + + + x - - - ⏞ - - - + @@ -1484,7 +1476,12 @@ - + + + + + + @@ -1499,12 +1496,7 @@ - - - ⏟ - - - + diff --git a/tests/writers/accents6.tex b/tests/writers/accents6.tex --- a/tests/writers/accents6.tex +++ b/tests/writers/accents6.tex @@ -2,5 +2,5 @@ \text{default:\ (accent=true)} \\ {\underset{'}{\overset{'}{x}}\underset{\hat{}}{\hat{x}}\underset{\_}{\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}}} \\ \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{}}{\overset{\overbrace{}}{x}}\underset{\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{}{\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}}} \\ \end{array} diff --git a/tests/writers/axiom_of_power_set.mml b/tests/writers/axiom_of_power_set.mml --- a/tests/writers/axiom_of_power_set.mml +++ b/tests/writers/axiom_of_power_set.mml @@ -14,7 +14,7 @@ B ∈ P - ⇔ + ⇔ ∀ C @@ -22,7 +22,7 @@ C ∈ B - ⇒ + ⇒ C ∈ A diff --git a/tests/writers/b.mml b/tests/writers/b.mml --- a/tests/writers/b.mml +++ b/tests/writers/b.mml @@ -22,7 +22,7 @@ backprime - ‵ + ‵ @@ -94,7 +94,7 @@ bbrk - ⎵ + ⎵ @@ -334,7 +334,7 @@ bkarow - ⤍ + ⤍ @@ -854,7 +854,7 @@ bprime - ‵ + ‵ @@ -862,7 +862,7 @@ breve - ˘ + ˘ @@ -870,7 +870,7 @@ Breve - ˘ + ˘ diff --git a/tests/writers/c.mml b/tests/writers/c.mml --- a/tests/writers/c.mml +++ b/tests/writers/c.mml @@ -102,7 +102,7 @@ caron - ˇ + ˇ @@ -214,7 +214,7 @@ cedil - ¸ + ¸ @@ -222,7 +222,7 @@ Cedilla - ¸ + ¸ @@ -326,7 +326,7 @@ circ - ˆ + ˆ @@ -806,7 +806,7 @@ cularr - ↶ + ↶ @@ -814,7 +814,7 @@ cularrp - ⤽ + ⤽ @@ -894,7 +894,7 @@ curarr - ↷ + ↷ @@ -902,7 +902,7 @@ curarrm - ⤼ + ⤼ @@ -950,7 +950,7 @@ curvearrowleft - ↶ + ↶ @@ -958,7 +958,7 @@ curvearrowright - ↷ + ↷ diff --git a/tests/writers/complex1.mml b/tests/writers/complex1.mml --- a/tests/writers/complex1.mml +++ b/tests/writers/complex1.mml @@ -1008,7 +1008,7 @@ H - ← + ← K @@ -1030,7 +1030,7 @@ H - → + → K diff --git a/tests/writers/complex3.mml b/tests/writers/complex3.mml --- a/tests/writers/complex3.mml +++ b/tests/writers/complex3.mml @@ -216,7 +216,7 @@ lim n - → + → ∞ @@ -5580,7 +5580,7 @@ P ∥ - → + → 0 @@ -5657,7 +5657,7 @@ lim n - → + → ∞ @@ -5963,7 +5963,7 @@ lim x - → + → 0 @@ -6336,7 +6336,7 @@ lim a - → + → 1 + @@ -6399,7 +6399,7 @@ lim a - → + → 1 − @@ -7745,7 +7745,7 @@ x - → + → a @@ -11790,7 +11790,7 @@ A - ← + ← n @@ -11802,7 +11802,7 @@ B - → + → T n diff --git a/tests/writers/complex3.omml b/tests/writers/complex3.omml --- a/tests/writers/complex3.omml +++ b/tests/writers/complex3.omml @@ -3842,7 +3842,12 @@ - + + + + + + a @@ -3866,12 +3871,7 @@ a - - - ︸ - - - + @@ -17194,7 +17194,12 @@ - + + + + + + x @@ -17212,12 +17217,7 @@ x - - - ︸ - - - + @@ -22459,7 +22459,12 @@ - + + + + + + @@ -22468,12 +22473,7 @@ lim - - - ̲ - - - + x @@ -22482,7 +22482,12 @@ - + + + + + + @@ -22491,12 +22496,7 @@ lim - - - → - - - + x @@ -22505,7 +22505,12 @@ - + + + + + + @@ -22514,12 +22519,7 @@ lim - - - ← - - - + x diff --git a/tests/writers/complex_number.omml b/tests/writers/complex_number.omml --- a/tests/writers/complex_number.omml +++ b/tests/writers/complex_number.omml @@ -21,18 +21,18 @@ - + + + + + + a - - - ⏟ - - - + @@ -48,7 +48,12 @@ - + + + + + + b @@ -60,12 +65,7 @@ i - - - ⏟ - - - + diff --git a/tests/writers/d.mml b/tests/writers/d.mml --- a/tests/writers/d.mml +++ b/tests/writers/d.mml @@ -94,7 +94,7 @@ dbkarow - ⤏ + ⤏ @@ -102,7 +102,7 @@ dblac - ˝ + ˝ @@ -174,7 +174,7 @@ DDotrahd - ⤑ + ⤑ @@ -278,7 +278,7 @@ DiacriticalAcute - ´ + ´ @@ -286,7 +286,7 @@ DiacriticalDot - ˙ + ˙ @@ -294,7 +294,7 @@ DiacriticalDoubleAcute - ˝ + ˝ @@ -302,7 +302,7 @@ DiacriticalGrave - ` + ` @@ -310,7 +310,7 @@ DiacriticalTilde - ˜ + ˜ @@ -358,7 +358,7 @@ die - ¨ + ¨ @@ -478,7 +478,7 @@ dot - ˙ + ˙ @@ -486,7 +486,7 @@ Dot - ¨ + ¨ @@ -494,7 +494,7 @@ DotDot - ⃜ + ⃜ @@ -566,7 +566,7 @@ DoubleDot - ¨ + ¨ @@ -582,7 +582,7 @@ DoubleLeftArrow - ⇐ + ⇐ @@ -590,7 +590,7 @@ DoubleLeftRightArrow - ⇔ + ⇔ @@ -606,7 +606,7 @@ DoubleLongLeftArrow - ⟸ + ⟸ @@ -614,7 +614,7 @@ DoubleLongLeftRightArrow - ⟺ + ⟺ @@ -622,7 +622,7 @@ DoubleLongRightArrow - ⟹ + ⟹ @@ -630,7 +630,7 @@ DoubleRightArrow - ⇒ + ⇒ @@ -710,7 +710,7 @@ DownBreve - ̑ + ̑ @@ -742,7 +742,7 @@ DownLeftRightVector - ⥐ + ⥐ @@ -750,7 +750,7 @@ DownLeftTeeVector - ⥞ + ⥞ @@ -758,7 +758,7 @@ DownLeftVector - ↽ + ↽ @@ -774,7 +774,7 @@ DownRightTeeVector - ⥟ + ⥟ @@ -782,7 +782,7 @@ DownRightVector - ⇁ + ⇁ @@ -814,7 +814,7 @@ drbkarow - ⤐ + ⤐ @@ -958,7 +958,7 @@ dzigrarr - ⟿ + ⟿ diff --git a/tests/writers/deMorgans_law.mml b/tests/writers/deMorgans_law.mml --- a/tests/writers/deMorgans_law.mml +++ b/tests/writers/deMorgans_law.mml @@ -7,7 +7,7 @@ ∧ q ) - ⇔ + ⇔ ( ¬ p diff --git a/tests/writers/differentiable_manifold.mml b/tests/writers/differentiable_manifold.mml --- a/tests/writers/differentiable_manifold.mml +++ b/tests/writers/differentiable_manifold.mml @@ -10,7 +10,7 @@ γ 2 - ⇔ + ⇔ { diff --git a/tests/writers/e.mml b/tests/writers/e.mml --- a/tests/writers/e.mml +++ b/tests/writers/e.mml @@ -494,7 +494,7 @@ Equilibrium - ⇌ + ⇌ @@ -526,7 +526,7 @@ erarr - ⥱ + ⥱ diff --git a/tests/writers/g.mml b/tests/writers/g.mml --- a/tests/writers/g.mml +++ b/tests/writers/g.mml @@ -406,7 +406,7 @@ grave - ` + ` @@ -574,7 +574,7 @@ gtrarr - ⥸ + ⥸ diff --git a/tests/writers/genBvert1.mml b/tests/writers/genBvert1.mml --- a/tests/writers/genBvert1.mml +++ b/tests/writers/genBvert1.mml @@ -30,7 +30,7 @@ H ⋱ H - ˙ + ˙ H diff --git a/tests/writers/h.mml b/tests/writers/h.mml --- a/tests/writers/h.mml +++ b/tests/writers/h.mml @@ -6,7 +6,7 @@ Hacek - ˇ + ˇ @@ -54,7 +54,7 @@ harr - ↔ + ↔ @@ -62,7 +62,7 @@ hArr - ⇔ + ⇔ @@ -70,7 +70,7 @@ harrcir - ⥈ + ⥈ @@ -78,7 +78,7 @@ harrw - ↭ + ↭ @@ -190,7 +190,7 @@ hoarr - ⇿ + ⇿ @@ -206,7 +206,7 @@ hookleftarrow - ↩ + ↩ @@ -214,7 +214,7 @@ hookrightarrow - ↪ + ↪ diff --git a/tests/writers/i.mml b/tests/writers/i.mml --- a/tests/writers/i.mml +++ b/tests/writers/i.mml @@ -94,7 +94,7 @@ iff - ⇔ + ⇔ @@ -270,7 +270,7 @@ Implies - ⇒ + ⇒ diff --git a/tests/writers/l.mml b/tests/writers/l.mml --- a/tests/writers/l.mml +++ b/tests/writers/l.mml @@ -6,7 +6,7 @@ lAarr - ⇚ + ⇚ @@ -118,7 +118,7 @@ larr - ← + ← @@ -126,7 +126,7 @@ lArr - ⇐ + ⇐ @@ -134,7 +134,7 @@ Larr - ↞ + ↞ @@ -142,7 +142,7 @@ larrb - ⇤ + ⇤ @@ -150,7 +150,7 @@ larrbfs - ⤟ + ⤟ @@ -158,7 +158,7 @@ larrfs - ⤝ + ⤝ @@ -166,7 +166,7 @@ larrhk - ↩ + ↩ @@ -174,7 +174,7 @@ larrlp - ↫ + ↫ @@ -190,7 +190,7 @@ larrsim - ⥳ + ⥳ @@ -198,7 +198,7 @@ larrtl - ↢ + ↢ @@ -214,7 +214,7 @@ latail - ⤙ + ⤙ @@ -222,7 +222,7 @@ lAtail - ⤛ + ⤛ @@ -246,7 +246,7 @@ lbarr - ⤌ + ⤌ @@ -254,7 +254,7 @@ lBarr - ⤎ + ⤎ @@ -390,7 +390,7 @@ ldquor - „ + „ @@ -398,7 +398,7 @@ ldrdhar - ⥧ + ⥧ @@ -406,7 +406,7 @@ ldrushar - ⥋ + ⥋ @@ -446,7 +446,7 @@ leftarrow - ← + ← @@ -454,7 +454,7 @@ Leftarrow - ⇐ + ⇐ @@ -462,7 +462,7 @@ LeftArrow - ← + ← @@ -470,7 +470,7 @@ LeftArrowBar - ⇤ + ⇤ @@ -478,7 +478,7 @@ LeftArrowRightArrow - ⇆ + ⇆ @@ -486,7 +486,7 @@ leftarrowtail - ↢ + ↢ @@ -542,7 +542,7 @@ leftharpoondown - ↽ + ↽ @@ -550,7 +550,7 @@ leftharpoonup - ↼ + ↼ @@ -558,7 +558,7 @@ leftleftarrows - ⇇ + ⇇ @@ -566,7 +566,7 @@ leftrightarrow - ↔ + ↔ @@ -574,7 +574,7 @@ Leftrightarrow - ⇔ + ⇔ @@ -582,7 +582,7 @@ LeftRightArrow - ↔ + ↔ @@ -590,7 +590,7 @@ leftrightarrows - ⇆ + ⇆ @@ -598,7 +598,7 @@ leftrightharpoons - ⇋ + ⇋ @@ -606,7 +606,7 @@ leftrightsquigarrow - ↭ + ↭ @@ -614,7 +614,7 @@ LeftRightVector - ⥎ + ⥎ @@ -630,7 +630,7 @@ LeftTeeArrow - ↤ + ↤ @@ -638,7 +638,7 @@ LeftTeeVector - ⥚ + ⥚ @@ -710,7 +710,7 @@ LeftVector - ↼ + ↼ @@ -718,7 +718,7 @@ LeftVectorBar - ⥒ + ⥒ @@ -918,7 +918,7 @@ lfisht - ⥼ + ⥼ @@ -966,7 +966,7 @@ lHar - ⥢ + ⥢ @@ -974,7 +974,7 @@ lhard - ↽ + ↽ @@ -982,7 +982,7 @@ lharu - ↼ + ↼ @@ -990,7 +990,7 @@ lharul - ⥪ + ⥪ @@ -1038,7 +1038,7 @@ llarr - ⇇ + ⇇ @@ -1054,7 +1054,7 @@ Lleftarrow - ⇚ + ⇚ @@ -1062,7 +1062,7 @@ llhard - ⥫ + ⥫ @@ -1174,7 +1174,7 @@ loarr - ⇽ + ⇽ @@ -1190,7 +1190,7 @@ longleftarrow - ⟵ + ⟵ @@ -1198,7 +1198,7 @@ Longleftarrow - ⟸ + ⟸ @@ -1206,7 +1206,7 @@ LongLeftArrow - ⟵ + ⟵ @@ -1214,7 +1214,7 @@ longleftrightarrow - ⟷ + ⟷ @@ -1222,7 +1222,7 @@ Longleftrightarrow - ⟺ + ⟺ @@ -1230,7 +1230,7 @@ LongLeftRightArrow - ⟷ + ⟷ @@ -1238,7 +1238,7 @@ longmapsto - ⟼ + ⟼ @@ -1246,7 +1246,7 @@ longrightarrow - ⟶ + ⟶ @@ -1254,7 +1254,7 @@ Longrightarrow - ⟹ + ⟹ @@ -1262,7 +1262,7 @@ LongRightArrow - ⟶ + ⟶ @@ -1270,7 +1270,7 @@ looparrowleft - ↫ + ↫ @@ -1278,7 +1278,7 @@ looparrowright - ↬ + ↬ @@ -1398,7 +1398,7 @@ lrarr - ⇆ + ⇆ @@ -1414,7 +1414,7 @@ lrhar - ⇋ + ⇋ @@ -1422,7 +1422,7 @@ lrhard - ⥭ + ⥭ @@ -1510,7 +1510,7 @@ lsquor - ‚ + ‚ @@ -1590,7 +1590,7 @@ ltlarr - ⥶ + ⥶ @@ -1638,7 +1638,7 @@ lurdshar - ⥊ + ⥊ @@ -1646,7 +1646,7 @@ luruhar - ⥦ + ⥦ diff --git a/tests/writers/m.mml b/tests/writers/m.mml --- a/tests/writers/m.mml +++ b/tests/writers/m.mml @@ -6,7 +6,7 @@ macr - ¯ + ¯ @@ -38,7 +38,7 @@ map - ↦ + ↦ @@ -46,7 +46,7 @@ Map - ⤅ + ⤅ @@ -54,7 +54,7 @@ mapsto - ↦ + ↦ @@ -70,7 +70,7 @@ mapstoleft - ↤ + ↤ diff --git a/tests/writers/mi3.mml b/tests/writers/mi3.mml --- a/tests/writers/mi3.mml +++ b/tests/writers/mi3.mml @@ -3,7 +3,7 @@ x - → + → maps to y diff --git a/tests/writers/moAaccent10.mml b/tests/writers/moAaccent10.mml --- a/tests/writers/moAaccent10.mml +++ b/tests/writers/moAaccent10.mml @@ -7,25 +7,25 @@ - 1 - ‾ + ‾ + G - - + - 1 - ‾ + ‾ - + + + G - 1 - ‾ + ‾ diff --git a/tests/writers/moAaccent10.omml b/tests/writers/moAaccent10.omml --- a/tests/writers/moAaccent10.omml +++ b/tests/writers/moAaccent10.omml @@ -4,7 +4,10 @@ - + + + + G @@ -16,16 +19,14 @@ 1 - - - ‾ - - - + + - + + + + G @@ -37,16 +38,14 @@ 1 - - - ‾ - - - + + - + + + + G @@ -58,11 +57,6 @@ 1 - - - ‾ - - - + diff --git a/tests/writers/moAaccent9.mml b/tests/writers/moAaccent9.mml --- a/tests/writers/moAaccent9.mml +++ b/tests/writers/moAaccent9.mml @@ -13,7 +13,7 @@ G - - + - 1 ‾ @@ -25,7 +25,7 @@ - 1 - ‾ + ‾ diff --git a/tests/writers/moAaccent9.omml b/tests/writers/moAaccent9.omml --- a/tests/writers/moAaccent9.omml +++ b/tests/writers/moAaccent9.omml @@ -42,7 +42,10 @@ + - + + + + G @@ -54,11 +57,6 @@ 1 - - - ‾ - - - + diff --git a/tests/writers/moAprime16.mml b/tests/writers/moAprime16.mml --- a/tests/writers/moAprime16.mml +++ b/tests/writers/moAprime16.mml @@ -3,7 +3,7 @@ f - ' + ' ( diff --git a/tests/writers/mover1.mml b/tests/writers/mover1.mml --- a/tests/writers/mover1.mml +++ b/tests/writers/mover1.mml @@ -8,17 +8,17 @@ ≠ x - ´ + ´ = x - ´ + ´ = x - ´ + ´ diff --git a/tests/writers/mover2.mml b/tests/writers/mover2.mml --- a/tests/writers/mover2.mml +++ b/tests/writers/mover2.mml @@ -8,17 +8,17 @@ ≠ x - ` + ` = x - ` + ` = x - ` + ` diff --git a/tests/writers/mover3.mml b/tests/writers/mover3.mml --- a/tests/writers/mover3.mml +++ b/tests/writers/mover3.mml @@ -8,17 +8,17 @@ ≠ x - ˆ + ˆ = x - ˆ + ˆ = x - ˆ + ˆ diff --git a/tests/writers/mover4.mml b/tests/writers/mover4.mml --- a/tests/writers/mover4.mml +++ b/tests/writers/mover4.mml @@ -8,17 +8,17 @@ ≠ x - ˇ + ˇ = x - ˇ + ˇ = x - ˇ + ˇ diff --git a/tests/writers/mover5.mml b/tests/writers/mover5.mml --- a/tests/writers/mover5.mml +++ b/tests/writers/mover5.mml @@ -8,17 +8,17 @@ ≠ x - ˜ + ˜ = x - ˜ + ˜ = x - ˜ + ˜ diff --git a/tests/writers/mover6.mml b/tests/writers/mover6.mml --- a/tests/writers/mover6.mml +++ b/tests/writers/mover6.mml @@ -8,17 +8,17 @@ ≠ x - ˙ + ˙ = x - ˙ + ˙ = x - ˙ + ˙ diff --git a/tests/writers/mover7.mml b/tests/writers/mover7.mml --- a/tests/writers/mover7.mml +++ b/tests/writers/mover7.mml @@ -8,17 +8,17 @@ ≠ x - ¨ + ¨ = x - ¨ + ¨ = x - ¨ + ¨ diff --git a/tests/writers/mtableBsize1.mml b/tests/writers/mtableBsize1.mml --- a/tests/writers/mtableBsize1.mml +++ b/tests/writers/mtableBsize1.mml @@ -3,7 +3,7 @@ - ← + ← 1 diff --git a/tests/writers/mtableBsize2.mml b/tests/writers/mtableBsize2.mml --- a/tests/writers/mtableBsize2.mml +++ b/tests/writers/mtableBsize2.mml @@ -6,7 +6,7 @@ H - → + → G @@ -28,7 +28,7 @@ K - → + → L diff --git a/tests/writers/munder1.mml b/tests/writers/munder1.mml --- a/tests/writers/munder1.mml +++ b/tests/writers/munder1.mml @@ -8,17 +8,17 @@ ≠ x - ´ + ´ = x - ´ + ´ = x - ´ + ´ diff --git a/tests/writers/munder1.omml b/tests/writers/munder1.omml --- a/tests/writers/munder1.omml +++ b/tests/writers/munder1.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ´ - - - + ≠ diff --git a/tests/writers/munder2.mml b/tests/writers/munder2.mml --- a/tests/writers/munder2.mml +++ b/tests/writers/munder2.mml @@ -8,17 +8,17 @@ ≠ x - ` + ` = x - ` + ` = x - ` + ` diff --git a/tests/writers/munder2.omml b/tests/writers/munder2.omml --- a/tests/writers/munder2.omml +++ b/tests/writers/munder2.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ` - - - + ≠ diff --git a/tests/writers/munder3.mml b/tests/writers/munder3.mml --- a/tests/writers/munder3.mml +++ b/tests/writers/munder3.mml @@ -8,17 +8,17 @@ ≠ x - ˆ + ˆ = x - ˆ + ˆ = x - ˆ + ˆ diff --git a/tests/writers/munder3.omml b/tests/writers/munder3.omml --- a/tests/writers/munder3.omml +++ b/tests/writers/munder3.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ˆ - - - + ≠ diff --git a/tests/writers/munder4.mml b/tests/writers/munder4.mml --- a/tests/writers/munder4.mml +++ b/tests/writers/munder4.mml @@ -8,17 +8,17 @@ ≠ x - ˇ + ˇ = x - ˇ + ˇ = x - ˇ + ˇ diff --git a/tests/writers/munder4.omml b/tests/writers/munder4.omml --- a/tests/writers/munder4.omml +++ b/tests/writers/munder4.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ˇ - - - + ≠ diff --git a/tests/writers/munder5.mml b/tests/writers/munder5.mml --- a/tests/writers/munder5.mml +++ b/tests/writers/munder5.mml @@ -8,17 +8,17 @@ ≠ x - ˜ + ˜ = x - ˜ + ˜ = x - ˜ + ˜ diff --git a/tests/writers/munder5.omml b/tests/writers/munder5.omml --- a/tests/writers/munder5.omml +++ b/tests/writers/munder5.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ˜ - - - + ≠ diff --git a/tests/writers/munder6.mml b/tests/writers/munder6.mml --- a/tests/writers/munder6.mml +++ b/tests/writers/munder6.mml @@ -8,17 +8,17 @@ ≠ x - ˙ + ˙ = x - ˙ + ˙ = x - ˙ + ˙ diff --git a/tests/writers/munder6.omml b/tests/writers/munder6.omml --- a/tests/writers/munder6.omml +++ b/tests/writers/munder6.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ˙ - - - + ≠ diff --git a/tests/writers/munder7.mml b/tests/writers/munder7.mml --- a/tests/writers/munder7.mml +++ b/tests/writers/munder7.mml @@ -8,17 +8,17 @@ ≠ x - ¨ + ¨ = x - ¨ + ¨ = x - ¨ + ¨ diff --git a/tests/writers/munder7.omml b/tests/writers/munder7.omml --- a/tests/writers/munder7.omml +++ b/tests/writers/munder7.omml @@ -4,18 +4,18 @@ - + + + + + + x - - - ¨ - - - + ≠ diff --git a/tests/writers/munder8.omml b/tests/writers/munder8.omml --- a/tests/writers/munder8.omml +++ b/tests/writers/munder8.omml @@ -4,62 +4,62 @@ - + + + + + + x - - - ⃛ - - - + ≠ - + + + + + + x - - - ⃛ - - - + = - + + + + + + x - - - ⃛ - - - + = - + + + + + + x - - - ⃛ - - - + diff --git a/tests/writers/munder9.omml b/tests/writers/munder9.omml --- a/tests/writers/munder9.omml +++ b/tests/writers/munder9.omml @@ -4,62 +4,62 @@ - + + + + + + x - - - ⃜ - - - + ≠ - + + + + + + x - - - ⃜ - - - + = - + + + + + + x - - - ⃜ - - - + = - + + + + + + x - - - ⃜ - - - + diff --git a/tests/writers/n.mml b/tests/writers/n.mml --- a/tests/writers/n.mml +++ b/tests/writers/n.mml @@ -470,7 +470,7 @@ nharr - ↮ + ↮ @@ -478,7 +478,7 @@ nhArr - ⇎ + ⇎ @@ -542,7 +542,7 @@ nlarr - ↚ + ↚ @@ -550,7 +550,7 @@ nlArr - ⇍ + ⇍ @@ -582,7 +582,7 @@ nleftarrow - ↚ + ↚ @@ -590,7 +590,7 @@ nLeftarrow - ⇍ + ⇍ @@ -598,7 +598,7 @@ nleftrightarrow - ↮ + ↮ @@ -606,7 +606,7 @@ nLeftrightarrow - ⇎ + ⇎ @@ -1334,7 +1334,7 @@ nrarr - ↛ + ↛ @@ -1342,7 +1342,7 @@ nrArr - ⇏ + ⇏ @@ -1366,7 +1366,7 @@ nrightarrow - ↛ + ↛ @@ -1374,7 +1374,7 @@ nRightarrow - ⇏ + ⇏ @@ -1774,7 +1774,7 @@ nvHarr - ⤄ + ⤄ @@ -1790,7 +1790,7 @@ nvlArr - ⤂ + ⤂ @@ -1822,7 +1822,7 @@ nvrArr - ⤃ + ⤃ diff --git a/tests/writers/o.mml b/tests/writers/o.mml --- a/tests/writers/o.mml +++ b/tests/writers/o.mml @@ -398,7 +398,7 @@ ordf - ª + ª @@ -406,7 +406,7 @@ ordm - º + º @@ -558,7 +558,7 @@ OverBar - ‾ + ‾ @@ -566,7 +566,7 @@ OverBrace - ⏞ + ⏞ @@ -574,7 +574,7 @@ OverBracket - ⎴ + ⎴ @@ -582,7 +582,7 @@ OverParenthesis - ⏜ + ⏜ diff --git a/tests/writers/operatorname.mml b/tests/writers/operatorname.mml --- a/tests/writers/operatorname.mml +++ b/tests/writers/operatorname.mml @@ -38,7 +38,7 @@ ⋆-lim'sup x - → + → 0 @@ -52,7 +52,7 @@ ⋆-lim'sup x - → + → 0 w @@ -62,7 +62,7 @@ ⋆-lim'sup x - → + → 0 w @@ -79,7 +79,7 @@ ⋆-lim'sup x - → + → 0 @@ -93,7 +93,7 @@ ⋆-lim'sup x - → + → 0 w @@ -103,7 +103,7 @@ ⋆-lim'sup x - → + → 0 w diff --git a/tests/writers/p.mml b/tests/writers/p.mml --- a/tests/writers/p.mml +++ b/tests/writers/p.mml @@ -518,7 +518,7 @@ Prime - ″ + ″ diff --git a/tests/writers/primes1.mml b/tests/writers/primes1.mml --- a/tests/writers/primes1.mml +++ b/tests/writers/primes1.mml @@ -18,7 +18,7 @@ + x - ' + ' + @@ -32,15 +32,15 @@ x - ' + ' - ' + ' + x - ' + ' 2 @@ -48,36 +48,36 @@ x - ' + ' + - ' + ' + x - ' + ' - ' + ' + x - ' - ' + ' + ' + - ' - ' + ' + ' + - ' - ' + ' + ' diff --git a/tests/writers/primes2.mml b/tests/writers/primes2.mml --- a/tests/writers/primes2.mml +++ b/tests/writers/primes2.mml @@ -3,11 +3,11 @@ H - " + " H - ' + ' H @@ -15,11 +15,11 @@ H - ` + ` H - ª + ª H @@ -27,23 +27,23 @@ H - ² + ² H - ³ + ³ H - ´ + ´ H - ¹ + ¹ H - º + º H @@ -55,11 +55,11 @@ H - ‚ + ‚ H - ‛ + ‛ H @@ -71,11 +71,11 @@ H - „ + „ H - ‟ + ‟ H @@ -83,27 +83,27 @@ H - ″ + ″ H - ‴ + ‴ H - ‵ + ‵ H - ‶ + ‶ H - ‷ + ‷ H - ⁗ + ⁗ diff --git a/tests/writers/q.mml b/tests/writers/q.mml --- a/tests/writers/q.mml +++ b/tests/writers/q.mml @@ -46,7 +46,7 @@ qprime - ⁗ + ⁗ @@ -102,7 +102,7 @@ quot - " + " diff --git a/tests/writers/r.mml b/tests/writers/r.mml --- a/tests/writers/r.mml +++ b/tests/writers/r.mml @@ -6,7 +6,7 @@ rAarr - ⇛ + ⇛ @@ -102,7 +102,7 @@ rarr - → + → @@ -110,7 +110,7 @@ rArr - ⇒ + ⇒ @@ -118,7 +118,7 @@ Rarr - ↠ + ↠ @@ -126,7 +126,7 @@ rarrap - ⥵ + ⥵ @@ -134,7 +134,7 @@ rarrb - ⇥ + ⇥ @@ -142,7 +142,7 @@ rarrbfs - ⤠ + ⤠ @@ -150,7 +150,7 @@ rarrc - ⤳ + ⤳ @@ -158,7 +158,7 @@ rarrfs - ⤞ + ⤞ @@ -166,7 +166,7 @@ rarrhk - ↪ + ↪ @@ -174,7 +174,7 @@ rarrlp - ↬ + ↬ @@ -182,7 +182,7 @@ rarrpl - ⥅ + ⥅ @@ -190,7 +190,7 @@ rarrsim - ⥴ + ⥴ @@ -198,7 +198,7 @@ rarrtl - ↣ + ↣ @@ -206,7 +206,7 @@ Rarrtl - ⤖ + ⤖ @@ -214,7 +214,7 @@ rarrw - ↝ + ↝ @@ -222,7 +222,7 @@ ratail - ⤚ + ⤚ @@ -230,7 +230,7 @@ rAtail - ⤜ + ⤜ @@ -254,7 +254,7 @@ rbarr - ⤍ + ⤍ @@ -262,7 +262,7 @@ rBarr - ⤏ + ⤏ @@ -270,7 +270,7 @@ RBarr - ⤐ + ⤐ @@ -398,7 +398,7 @@ rdldhar - ⥩ + ⥩ @@ -494,7 +494,7 @@ ReverseEquilibrium - ⇋ + ⇋ @@ -510,7 +510,7 @@ rfisht - ⥽ + ⥽ @@ -542,7 +542,7 @@ rHar - ⥤ + ⥤ @@ -550,7 +550,7 @@ rhard - ⇁ + ⇁ @@ -558,7 +558,7 @@ rharu - ⇀ + ⇀ @@ -566,7 +566,7 @@ rharul - ⥬ + ⥬ @@ -598,7 +598,7 @@ rightarrow - → + → @@ -606,7 +606,7 @@ Rightarrow - ⇒ + ⇒ @@ -614,7 +614,7 @@ RightArrow - → + → @@ -622,7 +622,7 @@ RightArrowBar - ⇥ + ⇥ @@ -630,7 +630,7 @@ RightArrowLeftArrow - ⇄ + ⇄ @@ -638,7 +638,7 @@ rightarrowtail - ↣ + ↣ @@ -694,7 +694,7 @@ rightharpoondown - ⇁ + ⇁ @@ -702,7 +702,7 @@ rightharpoonup - ⇀ + ⇀ @@ -710,7 +710,7 @@ rightleftarrows - ⇄ + ⇄ @@ -718,7 +718,7 @@ rightleftharpoons - ⇌ + ⇌ @@ -726,7 +726,7 @@ rightrightarrows - ⇉ + ⇉ @@ -734,7 +734,7 @@ rightsquigarrow - ↝ + ↝ @@ -750,7 +750,7 @@ RightTeeArrow - ↦ + ↦ @@ -758,7 +758,7 @@ RightTeeVector - ⥛ + ⥛ @@ -830,7 +830,7 @@ RightVector - ⇀ + ⇀ @@ -838,7 +838,7 @@ RightVectorBar - ⥓ + ⥓ @@ -846,7 +846,7 @@ ring - ˚ + ˚ @@ -862,7 +862,7 @@ rlarr - ⇄ + ⇄ @@ -870,7 +870,7 @@ rlhar - ⇌ + ⇌ @@ -910,7 +910,7 @@ roarr - ⇾ + ⇾ @@ -966,7 +966,7 @@ RoundImplies - ⥰ + ⥰ @@ -998,7 +998,7 @@ rrarr - ⇉ + ⇉ @@ -1006,7 +1006,7 @@ Rrightarrow - ⇛ + ⇛ @@ -1126,7 +1126,7 @@ ruluhar - ⥨ + ⥨ diff --git a/tests/writers/s.mml b/tests/writers/s.mml --- a/tests/writers/s.mml +++ b/tests/writers/s.mml @@ -350,7 +350,7 @@ ShortLeftArrow - ← + ← @@ -374,7 +374,7 @@ ShortRightArrow - → + → @@ -502,7 +502,7 @@ simrarr - ⥲ + ⥲ @@ -510,7 +510,7 @@ slarr - ← + ← @@ -862,7 +862,7 @@ srarr - → + → @@ -950,7 +950,7 @@ strns - ¯ + ¯ @@ -1038,7 +1038,7 @@ subrarr - ⥹ + ⥹ @@ -1270,7 +1270,7 @@ sup1 - ¹ + ¹ @@ -1278,7 +1278,7 @@ sup2 - ² + ² @@ -1286,7 +1286,7 @@ sup3 - ³ + ³ @@ -1366,7 +1366,7 @@ suplarr - ⥻ + ⥻ diff --git a/tests/writers/sophomores_dream.mml b/tests/writers/sophomores_dream.mml --- a/tests/writers/sophomores_dream.mml +++ b/tests/writers/sophomores_dream.mml @@ -23,7 +23,7 @@ = 1 - ∞ + ∞ ( diff --git a/tests/writers/stackrel.mml b/tests/writers/stackrel.mml --- a/tests/writers/stackrel.mml +++ b/tests/writers/stackrel.mml @@ -6,7 +6,7 @@ n - → + → w u diff --git a/tests/writers/stretchAccents1.omml b/tests/writers/stretchAccents1.omml --- a/tests/writers/stretchAccents1.omml +++ b/tests/writers/stretchAccents1.omml @@ -77,18 +77,18 @@ + - + + + + + + xxx - - - ⏟ - - - + + diff --git a/tests/writers/stretchBrack1.omml b/tests/writers/stretchBrack1.omml --- a/tests/writers/stretchBrack1.omml +++ b/tests/writers/stretchBrack1.omml @@ -22,7 +22,12 @@ - + + + + + + H @@ -34,11 +39,6 @@ G - - - ⏟ - - - + diff --git a/tests/writers/stretchHoriz1.mml b/tests/writers/stretchHoriz1.mml --- a/tests/writers/stretchHoriz1.mml +++ b/tests/writers/stretchHoriz1.mml @@ -16,7 +16,7 @@ - → + → maps to @@ -33,7 +33,7 @@ - → + → maps to @@ -50,7 +50,7 @@ - → + → maps to @@ -67,7 +67,7 @@ - → + → maps to diff --git a/tests/writers/stretchHoriz3.mml b/tests/writers/stretchHoriz3.mml --- a/tests/writers/stretchHoriz3.mml +++ b/tests/writers/stretchHoriz3.mml @@ -3,7 +3,7 @@ H - → + → This is a long stretched arrow H diff --git a/tests/writers/stretchTable1.mml b/tests/writers/stretchTable1.mml --- a/tests/writers/stretchTable1.mml +++ b/tests/writers/stretchTable1.mml @@ -6,7 +6,7 @@ 1 - → + → 2 @@ -38,7 +38,7 @@ 3 - → + → 4 diff --git a/tests/writers/stretchTable2.mml b/tests/writers/stretchTable2.mml --- a/tests/writers/stretchTable2.mml +++ b/tests/writers/stretchTable2.mml @@ -3,7 +3,7 @@ - ← + ← 1 diff --git a/tests/writers/stretchVert1.mml b/tests/writers/stretchVert1.mml --- a/tests/writers/stretchVert1.mml +++ b/tests/writers/stretchVert1.mml @@ -24,7 +24,7 @@ + ( - - + - 2 diff --git a/tests/writers/subsup.mml b/tests/writers/subsup.mml --- a/tests/writers/subsup.mml +++ b/tests/writers/subsup.mml @@ -57,7 +57,7 @@ u - ̲ + ̲ b a diff --git a/tests/writers/subsup.omml b/tests/writers/subsup.omml --- a/tests/writers/subsup.omml +++ b/tests/writers/subsup.omml @@ -182,18 +182,18 @@ - + + + + + + u - - - ̲ - - - + @@ -274,7 +274,12 @@ - + + + + + + a @@ -286,12 +291,7 @@ b - - - ⏟ - - - + @@ -304,7 +304,12 @@ - + + + + + + a @@ -316,12 +321,7 @@ b - - - ⎵ - - - + diff --git a/tests/writers/t.mml b/tests/writers/t.mml --- a/tests/writers/t.mml +++ b/tests/writers/t.mml @@ -30,7 +30,7 @@ tbrk - ⎴ + ⎴ @@ -86,7 +86,7 @@ tdot - ⃛ + ⃛ @@ -238,7 +238,7 @@ tilde - ˜ + ˜ @@ -382,7 +382,7 @@ tprime - ‴ + ‴ @@ -478,7 +478,7 @@ TripleDot - ⃛ + ⃛ @@ -590,7 +590,7 @@ twoheadleftarrow - ↞ + ↞ @@ -598,7 +598,7 @@ twoheadrightarrow - ↠ + ↠ diff --git a/tests/writers/tokens.tex b/tests/writers/tokens.tex --- a/tests/writers/tokens.tex +++ b/tests/writers/tokens.tex @@ -1,1 +1,1 @@ -\tilde{\phi}\sqrt{\phi}\frac{\phi}{\xi}\frac{\phi}{\xi}\frac{\phi}{\xi}{(\phi)}{(\phi)}\xi +\widetilde{\phi}\sqrt{\phi}\frac{\phi}{\xi}\frac{\phi}{\xi}\frac{\phi}{\xi}{(\phi)}{(\phi)}\xi diff --git a/tests/writers/u.mml b/tests/writers/u.mml --- a/tests/writers/u.mml +++ b/tests/writers/u.mml @@ -38,7 +38,7 @@ Uarr - ↟ + ↟ @@ -270,7 +270,7 @@ uml - ¨ + ¨ @@ -286,7 +286,7 @@ UnderBrace - ⏟ + ⏟ @@ -294,7 +294,7 @@ UnderBracket - ⎵ + ⎵ @@ -302,7 +302,7 @@ UnderParenthesis - ⏝ + ⏝ diff --git a/tests/writers/unicode.mml b/tests/writers/unicode.mml --- a/tests/writers/unicode.mml +++ b/tests/writers/unicode.mml @@ -4,7 +4,7 @@ f : X - → + → Y diff --git a/tests/writers/x.mml b/tests/writers/x.mml --- a/tests/writers/x.mml +++ b/tests/writers/x.mml @@ -54,7 +54,7 @@ xharr - ⟷ + ⟷ @@ -62,7 +62,7 @@ xhArr - ⟺ + ⟺ @@ -86,7 +86,7 @@ xlarr - ⟵ + ⟵ @@ -94,7 +94,7 @@ xlArr - ⟸ + ⟸ @@ -102,7 +102,7 @@ xmap - ⟼ + ⟼ @@ -158,7 +158,7 @@ xrarr - ⟶ + ⟶ @@ -166,7 +166,7 @@ xrArr - ⟹ + ⟹ diff --git a/tests/writers/z.mml b/tests/writers/z.mml --- a/tests/writers/z.mml +++ b/tests/writers/z.mml @@ -126,7 +126,7 @@ zigrarr - ⇝ + ⇝ diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.9.4 +Version: 0.9.4.1 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics.