diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,23 @@ +texmath (0.12.8.12) + + * TeX writer: render prime and superscripted prime as `'` (#246). + + * TeX reader: + + + Don't crash on array with `\hline` before blank cell (#244). + + Skip whitespace in array column specifier (#244). + + * OMML writer: + + + Fix order of dPr attributes (#243). + + * Typst writer: + + + Escape commas (#242). Otherwise we can get bad results e.g. in fractions, + when the commas separate arguments. + + * Require typst-symbols 0.1.7, update tests. + texmath (0.12.8.11) * TeX reader: Ignore `@{..}` and `!{..}` in array alignment specifiers (#241). 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 @@ -443,12 +443,12 @@ arrayLine :: TP ArrayLine arrayLine = - sepBy1 (unGrouped <$> - manyExp (try (ignorable' *> notFollowedBy (('\n' <$ ctrlseq "end") <|> endLine)) *> - expr <* - ignorable')) (symbol "&") - where ignorable' = ignorable >> - optional (try (ctrlseq "hline" >> ignorable')) + sepBy1 + (ignorable' *> + (unGrouped <$> + manyExp (try (notFollowedBy (('\n' <$ ctrlseq "end") <|> endLine)) *> + expr <* ignorable'))) (symbol "&") + where ignorable' = ignorable >> optional (try (ctrlseq "hline" >> ignorable')) -- we don't represent the line, but it shouldn't crash parsing arrayAlignments :: TP [Alignment] @@ -456,6 +456,7 @@ braces (many ( ((:[]) . letterToAlignment <$> letter) <|> ([] <$ char '|') + <|> ([] <$ oneOf " \t") <|> ([] <$ ((char '@' <|> char '!') <* inbraces)) <|> (do char '*' num <- T.pack <$> braces (many1 digit) 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 @@ -209,8 +209,8 @@ EDelimited start end xs -> [ mnode "d" $ mnode "dPr" [ mnodeA "begChr" (T.unpack start) () - , mnodeA "endChr" (T.unpack end) () , mnodeA "sepChr" (T.unpack sepchr) () + , mnodeA "endChr" (T.unpack end) () , mnode "grow" () ] : map (mnode "e" . concatMap (showExp props)) es ] 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 @@ -171,6 +171,7 @@ tell [Grouped math] writeExp (ESymbol Ord (T.unpack -> [c])) -- do not render "invisible operators" | c `elem` ['\x2061'..'\x2064'] = return () -- see 3.2.5.5 of mathml spec +writeExp (ESymbol Ord "\8242") = tell [Token '\''] -- render prime as ', #246 writeExp (ESymbol t s) = do s' <- getTeXMathM s when (t == Bin || t == Rel) $ tell [Space] @@ -198,8 +199,10 @@ tellGroup (writeExp e1) writeExp (ESuper b e1) = do (if isFancy b then tellGroup else id) $ writeExp b - tell [Token '^'] - tellGroup (writeExp e1) + case e1 of + ESymbol Ord "\8242" -> tell [Token '\''] + _ -> do tell [Token '^'] + tellGroup (writeExp e1) writeExp (ESubsup b e1 e2) = do (if isFancy b then tellGroup else id) $ writeExp b tell [Token '_'] 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 @@ -79,6 +79,7 @@ needsEscape '"' = True needsEscape '/' = True needsEscape '\\' = True + needsEscape ',' = True -- #242 needsEscape _ = False escInQuotes :: Text -> Text diff --git a/test/regression/244.test b/test/regression/244.test new file mode 100644 --- /dev/null +++ b/test/regression/244.test @@ -0,0 +1,13 @@ +<<< tex +\begin{array}{l cr} +1 & 2 & 3 \\\hline + & 5 & 6 \\ +\end{array} +>>> native +[ EArray + [ AlignLeft , AlignCenter , AlignRight ] + [ [ [ ENumber "1" ] , [ ENumber "2" ] , [ ENumber "3" ] ] + , [ [] , [ ENumber "5" ] , [ ENumber "6" ] ] + , [ [] ] + ] +] diff --git a/test/writer/omml/02.test b/test/writer/omml/02.test --- a/test/writer/omml/02.test +++ b/test/writer/omml/02.test @@ -40,8 +40,8 @@ - + @@ -53,8 +53,8 @@ - + diff --git a/test/writer/omml/04.test b/test/writer/omml/04.test --- a/test/writer/omml/04.test +++ b/test/writer/omml/04.test @@ -77,8 +77,8 @@ - + diff --git a/test/writer/omml/05.test b/test/writer/omml/05.test --- a/test/writer/omml/05.test +++ b/test/writer/omml/05.test @@ -89,8 +89,8 @@ - + @@ -149,8 +149,8 @@ - + @@ -162,8 +162,8 @@ - + diff --git a/test/writer/omml/06.test b/test/writer/omml/06.test --- a/test/writer/omml/06.test +++ b/test/writer/omml/06.test @@ -138,8 +138,8 @@ - + diff --git a/test/writer/omml/07.test b/test/writer/omml/07.test --- a/test/writer/omml/07.test +++ b/test/writer/omml/07.test @@ -47,8 +47,8 @@ - + @@ -78,8 +78,8 @@ - + @@ -103,8 +103,8 @@ - + diff --git a/test/writer/omml/08.test b/test/writer/omml/08.test --- a/test/writer/omml/08.test +++ b/test/writer/omml/08.test @@ -39,8 +39,8 @@ - + @@ -65,8 +65,8 @@ - + @@ -84,8 +84,8 @@ - + @@ -94,8 +94,8 @@ - + @@ -131,8 +131,8 @@ - + @@ -163,8 +163,8 @@ - + @@ -200,8 +200,8 @@ - + diff --git a/test/writer/omml/09.test b/test/writer/omml/09.test --- a/test/writer/omml/09.test +++ b/test/writer/omml/09.test @@ -60,8 +60,8 @@ - + @@ -82,8 +82,8 @@ - + diff --git a/test/writer/omml/10.test b/test/writer/omml/10.test --- a/test/writer/omml/10.test +++ b/test/writer/omml/10.test @@ -63,8 +63,8 @@ - + @@ -153,8 +153,8 @@ - + @@ -205,8 +205,8 @@ - + @@ -248,8 +248,8 @@ - + diff --git a/test/writer/omml/11.test b/test/writer/omml/11.test --- a/test/writer/omml/11.test +++ b/test/writer/omml/11.test @@ -44,8 +44,8 @@ - + diff --git a/test/writer/omml/12.test b/test/writer/omml/12.test --- a/test/writer/omml/12.test +++ b/test/writer/omml/12.test @@ -42,8 +42,8 @@ - + @@ -61,8 +61,8 @@ - + diff --git a/test/writer/omml/13.test b/test/writer/omml/13.test --- a/test/writer/omml/13.test +++ b/test/writer/omml/13.test @@ -87,8 +87,8 @@ - + @@ -239,8 +239,8 @@ - + @@ -276,8 +276,8 @@ - + @@ -309,8 +309,8 @@ - + @@ -346,8 +346,8 @@ - + diff --git a/test/writer/omml/19.test b/test/writer/omml/19.test --- a/test/writer/omml/19.test +++ b/test/writer/omml/19.test @@ -89,8 +89,8 @@ - + @@ -318,8 +318,8 @@ - + @@ -372,8 +372,8 @@ - + @@ -426,8 +426,8 @@ - + @@ -480,8 +480,8 @@ - + diff --git a/test/writer/omml/abs1.test b/test/writer/omml/abs1.test --- a/test/writer/omml/abs1.test +++ b/test/writer/omml/abs1.test @@ -10,8 +10,8 @@ - + diff --git a/test/writer/omml/axiom_of_power_set.test b/test/writer/omml/axiom_of_power_set.test --- a/test/writer/omml/axiom_of_power_set.test +++ b/test/writer/omml/axiom_of_power_set.test @@ -78,8 +78,8 @@ - + @@ -116,8 +116,8 @@ - + 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 @@ -55,8 +55,8 @@ - + @@ -142,8 +142,8 @@ - + @@ -201,8 +201,8 @@ - + diff --git a/test/writer/omml/chain2.test b/test/writer/omml/chain2.test --- a/test/writer/omml/chain2.test +++ b/test/writer/omml/chain2.test @@ -81,8 +81,8 @@ - + @@ -276,8 +276,8 @@ - + @@ -330,8 +330,8 @@ - + @@ -384,8 +384,8 @@ - + diff --git a/test/writer/omml/choose.test b/test/writer/omml/choose.test --- a/test/writer/omml/choose.test +++ b/test/writer/omml/choose.test @@ -27,8 +27,8 @@ - + @@ -45,8 +45,8 @@ - + diff --git a/test/writer/omml/complex1.test b/test/writer/omml/complex1.test --- a/test/writer/omml/complex1.test +++ b/test/writer/omml/complex1.test @@ -664,8 +664,8 @@ - + @@ -768,8 +768,8 @@ - + @@ -859,8 +859,8 @@ - + @@ -915,8 +915,8 @@ - + @@ -1197,8 +1197,8 @@ - + @@ -1393,8 +1393,8 @@ - + @@ -2056,8 +2056,8 @@ - + diff --git a/test/writer/omml/complex2.test b/test/writer/omml/complex2.test --- a/test/writer/omml/complex2.test +++ b/test/writer/omml/complex2.test @@ -2033,8 +2033,8 @@ - + @@ -2132,8 +2132,8 @@ - + 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 @@ -7947,8 +7947,8 @@ - + @@ -8004,8 +8004,8 @@ - + @@ -8024,8 +8024,8 @@ - + @@ -8161,8 +8161,8 @@ - + @@ -8241,16 +8241,16 @@ - + - + @@ -8269,8 +8269,8 @@ - + @@ -8401,8 +8401,8 @@ - + @@ -8444,8 +8444,8 @@ - + @@ -11328,8 +11328,8 @@ - + @@ -11349,8 +11349,8 @@ - + @@ -11579,8 +11579,8 @@ - + @@ -11610,8 +11610,8 @@ - + @@ -11641,8 +11641,8 @@ - + @@ -11671,8 +11671,8 @@ - + @@ -11702,8 +11702,8 @@ - + @@ -11733,8 +11733,8 @@ - + @@ -11763,8 +11763,8 @@ - + @@ -11794,8 +11794,8 @@ - + @@ -11825,8 +11825,8 @@ - + @@ -11855,8 +11855,8 @@ - + @@ -11888,8 +11888,8 @@ - + @@ -11921,8 +11921,8 @@ - + @@ -12302,8 +12302,8 @@ - + @@ -12321,8 +12321,8 @@ - + @@ -12511,8 +12511,8 @@ - + @@ -12557,8 +12557,8 @@ - + @@ -12744,8 +12744,8 @@ - + @@ -12977,8 +12977,8 @@ - + @@ -13005,8 +13005,8 @@ - + @@ -13115,16 +13115,16 @@ - + - + @@ -13449,8 +13449,8 @@ - + @@ -13513,8 +13513,8 @@ - + @@ -14098,8 +14098,8 @@ - + @@ -14361,8 +14361,8 @@ - + @@ -14400,8 +14400,8 @@ - + @@ -14653,8 +14653,8 @@ - + @@ -14697,8 +14697,8 @@ - + @@ -14737,8 +14737,8 @@ - + @@ -14803,8 +14803,8 @@ - + @@ -14896,8 +14896,8 @@ - + @@ -14956,8 +14956,8 @@ - + @@ -15006,8 +15006,8 @@ - + @@ -15568,8 +15568,8 @@ - + @@ -15697,8 +15697,8 @@ - + @@ -15939,8 +15939,8 @@ - + @@ -15985,8 +15985,8 @@ - + @@ -16046,8 +16046,8 @@ - + @@ -16854,8 +16854,8 @@ - + @@ -17302,8 +17302,8 @@ - + @@ -17415,8 +17415,8 @@ - + @@ -18064,8 +18064,8 @@ - + @@ -18114,8 +18114,8 @@ - + @@ -18229,8 +18229,8 @@ - + @@ -18362,8 +18362,8 @@ - + @@ -18442,8 +18442,8 @@ - + @@ -18506,8 +18506,8 @@ - + @@ -18656,8 +18656,8 @@ - + @@ -18708,8 +18708,8 @@ - + @@ -18794,8 +18794,8 @@ - + @@ -18882,8 +18882,8 @@ - + @@ -18970,8 +18970,8 @@ - + @@ -19036,8 +19036,8 @@ - + @@ -19089,8 +19089,8 @@ - + @@ -19183,8 +19183,8 @@ - + @@ -19236,8 +19236,8 @@ - + @@ -19340,8 +19340,8 @@ - + @@ -19413,8 +19413,8 @@ - + @@ -19595,8 +19595,8 @@ - + @@ -19623,8 +19623,8 @@ - + @@ -19648,8 +19648,8 @@ - + @@ -19762,8 +19762,8 @@ - + @@ -19905,8 +19905,8 @@ - + @@ -19973,8 +19973,8 @@ - + @@ -20046,8 +20046,8 @@ - + @@ -20162,8 +20162,8 @@ - + @@ -20200,8 +20200,8 @@ - + @@ -20346,8 +20346,8 @@ - + @@ -20380,24 +20380,24 @@ - + - + - + @@ -20554,8 +20554,8 @@ - + @@ -20604,8 +20604,8 @@ - + @@ -20630,8 +20630,8 @@ - + @@ -20652,8 +20652,8 @@ - + @@ -20784,8 +20784,8 @@ - + @@ -20916,8 +20916,8 @@ - + @@ -21164,16 +21164,16 @@ - + - + @@ -21236,8 +21236,8 @@ - + @@ -21312,8 +21312,8 @@ - + @@ -21381,8 +21381,8 @@ - + @@ -21650,8 +21650,8 @@ - + @@ -21865,8 +21865,8 @@ - + @@ -22071,8 +22071,8 @@ - + @@ -22099,8 +22099,8 @@ - + @@ -22157,8 +22157,8 @@ - + @@ -22185,8 +22185,8 @@ - + @@ -22243,8 +22243,8 @@ - + @@ -22317,8 +22317,8 @@ - + @@ -22435,8 +22435,8 @@ - + @@ -22610,8 +22610,8 @@ - + @@ -22852,16 +22852,16 @@ - + - + @@ -22884,8 +22884,8 @@ - + @@ -22981,8 +22981,8 @@ - + @@ -22998,8 +22998,8 @@ - + @@ -23026,8 +23026,8 @@ - + @@ -23088,8 +23088,8 @@ - + @@ -23102,8 +23102,8 @@ - + @@ -23119,8 +23119,8 @@ - + @@ -23147,8 +23147,8 @@ - + @@ -23214,8 +23214,8 @@ - + @@ -23231,8 +23231,8 @@ - + @@ -23259,8 +23259,8 @@ - + @@ -23312,8 +23312,8 @@ - + @@ -23497,8 +23497,8 @@ - + @@ -23519,8 +23519,8 @@ - + @@ -23556,8 +23556,8 @@ - + @@ -23668,8 +23668,8 @@ - + @@ -23690,8 +23690,8 @@ - + @@ -23727,8 +23727,8 @@ - + @@ -23841,8 +23841,8 @@ - + @@ -23871,8 +23871,8 @@ - + @@ -23902,8 +23902,8 @@ - + @@ -23941,8 +23941,8 @@ - + @@ -24009,8 +24009,8 @@ - + @@ -24026,16 +24026,16 @@ - + - + @@ -24058,8 +24058,8 @@ - + @@ -24085,8 +24085,8 @@ - + @@ -24150,8 +24150,8 @@ - + @@ -24178,8 +24178,8 @@ - + @@ -24356,8 +24356,8 @@ - + @@ -24548,8 +24548,8 @@ - + @@ -24594,8 +24594,8 @@ - + @@ -25868,8 +25868,8 @@ - + @@ -25957,8 +25957,8 @@ - + @@ -26012,8 +26012,8 @@ - + @@ -26230,8 +26230,8 @@ - + @@ -26341,8 +26341,8 @@ - + @@ -26525,16 +26525,16 @@ - + - + @@ -26775,8 +26775,8 @@ - + @@ -26794,8 +26794,8 @@ - + @@ -27761,8 +27761,8 @@ - + @@ -27798,8 +27798,8 @@ - + @@ -27836,8 +27836,8 @@ - + @@ -27881,8 +27881,8 @@ - + @@ -27918,8 +27918,8 @@ - + @@ -27984,8 +27984,8 @@ - + @@ -28035,8 +28035,8 @@ - + @@ -28080,8 +28080,8 @@ - + @@ -28119,8 +28119,8 @@ - + @@ -28158,8 +28158,8 @@ - + @@ -28269,8 +28269,8 @@ - + @@ -28342,8 +28342,8 @@ - + @@ -28555,8 +28555,8 @@ - + @@ -28586,8 +28586,8 @@ - + @@ -28626,8 +28626,8 @@ - + @@ -28666,8 +28666,8 @@ - + @@ -29157,8 +29157,8 @@ - + @@ -29261,8 +29261,8 @@ - + @@ -29313,8 +29313,8 @@ - + @@ -29700,8 +29700,8 @@ - + @@ -29818,8 +29818,8 @@ - + @@ -30075,8 +30075,8 @@ - + @@ -30228,8 +30228,8 @@ - + @@ -30332,8 +30332,8 @@ - + @@ -30384,8 +30384,8 @@ - + @@ -30416,8 +30416,8 @@ - + @@ -30431,8 +30431,8 @@ - + @@ -30468,8 +30468,8 @@ - + @@ -30523,8 +30523,8 @@ - + @@ -30592,8 +30592,8 @@ - + @@ -30748,8 +30748,8 @@ - + @@ -30801,8 +30801,8 @@ - + @@ -30854,8 +30854,8 @@ - + @@ -30907,8 +30907,8 @@ - + @@ -30996,8 +30996,8 @@ - + @@ -31252,8 +31252,8 @@ - + @@ -31317,8 +31317,8 @@ - + @@ -31382,8 +31382,8 @@ - + @@ -31441,8 +31441,8 @@ - + @@ -31976,8 +31976,8 @@ - + @@ -32015,8 +32015,8 @@ - + @@ -34049,8 +34049,8 @@ - + @@ -34173,8 +34173,8 @@ - + @@ -34368,8 +34368,8 @@ - + @@ -35418,8 +35418,8 @@ - + @@ -35497,8 +35497,8 @@ - + @@ -35576,8 +35576,8 @@ - + @@ -35655,8 +35655,8 @@ - + @@ -35664,8 +35664,8 @@ - + @@ -35746,8 +35746,8 @@ - + @@ -35800,8 +35800,8 @@ - + @@ -35854,8 +35854,8 @@ - + @@ -35908,8 +35908,8 @@ - + @@ -35962,8 +35962,8 @@ - + @@ -36016,8 +36016,8 @@ - + @@ -36070,8 +36070,8 @@ - + @@ -36126,8 +36126,8 @@ - + @@ -36182,8 +36182,8 @@ - + @@ -36238,8 +36238,8 @@ - + @@ -36294,8 +36294,8 @@ - + @@ -36350,8 +36350,8 @@ - + @@ -36450,8 +36450,8 @@ - + @@ -36504,8 +36504,8 @@ - + @@ -36558,8 +36558,8 @@ - + @@ -36612,8 +36612,8 @@ - + @@ -36666,8 +36666,8 @@ - + @@ -36720,8 +36720,8 @@ - + @@ -36774,8 +36774,8 @@ - + @@ -36830,8 +36830,8 @@ - + @@ -36886,8 +36886,8 @@ - + @@ -36942,8 +36942,8 @@ - + @@ -36998,8 +36998,8 @@ - + @@ -37052,8 +37052,8 @@ - + @@ -37106,8 +37106,8 @@ - + @@ -37160,8 +37160,8 @@ - + @@ -37618,8 +37618,8 @@ - + @@ -37660,8 +37660,8 @@ - + @@ -37702,8 +37702,8 @@ - + @@ -37744,8 +37744,8 @@ - + @@ -37786,8 +37786,8 @@ - + @@ -37828,8 +37828,8 @@ - + @@ -37870,8 +37870,8 @@ - + @@ -37912,8 +37912,8 @@ - + @@ -37954,8 +37954,8 @@ - + diff --git a/test/writer/omml/deMorgans_law.test b/test/writer/omml/deMorgans_law.test --- a/test/writer/omml/deMorgans_law.test +++ b/test/writer/omml/deMorgans_law.test @@ -51,8 +51,8 @@ - + @@ -79,8 +79,8 @@ - + @@ -104,8 +104,8 @@ - + diff --git a/test/writer/omml/differentiable_manifold.test b/test/writer/omml/differentiable_manifold.test --- a/test/writer/omml/differentiable_manifold.test +++ b/test/writer/omml/differentiable_manifold.test @@ -104,8 +104,8 @@ - + @@ -139,8 +139,8 @@ - + @@ -170,8 +170,8 @@ - + @@ -211,8 +211,8 @@ - + @@ -264,8 +264,8 @@ - + @@ -303,8 +303,8 @@ - + @@ -356,8 +356,8 @@ - + diff --git a/test/writer/omml/doubleint1.test b/test/writer/omml/doubleint1.test --- a/test/writer/omml/doubleint1.test +++ b/test/writer/omml/doubleint1.test @@ -39,8 +39,8 @@ - + diff --git a/test/writer/omml/embStretch1.test b/test/writer/omml/embStretch1.test --- a/test/writer/omml/embStretch1.test +++ b/test/writer/omml/embStretch1.test @@ -18,8 +18,8 @@ - + diff --git a/test/writer/omml/genfrac.test b/test/writer/omml/genfrac.test --- a/test/writer/omml/genfrac.test +++ b/test/writer/omml/genfrac.test @@ -15,8 +15,8 @@ - + diff --git a/test/writer/omml/int1.test b/test/writer/omml/int1.test --- a/test/writer/omml/int1.test +++ b/test/writer/omml/int1.test @@ -25,8 +25,8 @@ - + diff --git a/test/writer/omml/int4.test b/test/writer/omml/int4.test --- a/test/writer/omml/int4.test +++ b/test/writer/omml/int4.test @@ -42,8 +42,8 @@ - + diff --git a/test/writer/omml/int6.test b/test/writer/omml/int6.test --- a/test/writer/omml/int6.test +++ b/test/writer/omml/int6.test @@ -28,8 +28,8 @@ - + diff --git a/test/writer/omml/int7.test b/test/writer/omml/int7.test --- a/test/writer/omml/int7.test +++ b/test/writer/omml/int7.test @@ -39,8 +39,8 @@ - + diff --git a/test/writer/omml/int9.test b/test/writer/omml/int9.test --- a/test/writer/omml/int9.test +++ b/test/writer/omml/int9.test @@ -39,8 +39,8 @@ - + diff --git a/test/writer/omml/intDispStyle.test b/test/writer/omml/intDispStyle.test --- a/test/writer/omml/intDispStyle.test +++ b/test/writer/omml/intDispStyle.test @@ -164,8 +164,8 @@ - + @@ -195,8 +195,8 @@ - + @@ -210,8 +210,8 @@ - + @@ -241,8 +241,8 @@ - + @@ -354,8 +354,8 @@ - + @@ -385,8 +385,8 @@ - + @@ -416,8 +416,8 @@ - + @@ -431,8 +431,8 @@ - + @@ -462,8 +462,8 @@ - + @@ -493,8 +493,8 @@ - + diff --git a/test/writer/omml/intNested3.test b/test/writer/omml/intNested3.test --- a/test/writer/omml/intNested3.test +++ b/test/writer/omml/intNested3.test @@ -219,8 +219,8 @@ - + @@ -244,8 +244,8 @@ - + @@ -269,8 +269,8 @@ - + @@ -294,8 +294,8 @@ - + @@ -319,8 +319,8 @@ - + @@ -357,16 +357,16 @@ - + - + @@ -380,16 +380,16 @@ - + - + @@ -403,16 +403,16 @@ - + - + @@ -438,16 +438,16 @@ - + - + @@ -473,16 +473,16 @@ - + - + @@ -508,16 +508,16 @@ - + - + @@ -543,16 +543,16 @@ - + - + @@ -591,16 +591,16 @@ - + - + @@ -614,16 +614,16 @@ - + - + @@ -637,16 +637,16 @@ - + - + @@ -672,16 +672,16 @@ - + - + @@ -707,16 +707,16 @@ - + - + @@ -742,16 +742,16 @@ - + - + @@ -777,16 +777,16 @@ - + - + diff --git a/test/writer/omml/intSize1.test b/test/writer/omml/intSize1.test --- a/test/writer/omml/intSize1.test +++ b/test/writer/omml/intSize1.test @@ -55,8 +55,8 @@ - + @@ -80,8 +80,8 @@ - + @@ -105,8 +105,8 @@ - + @@ -130,8 +130,8 @@ - + @@ -155,8 +155,8 @@ - + diff --git a/test/writer/omml/intSize2.test b/test/writer/omml/intSize2.test --- a/test/writer/omml/intSize2.test +++ b/test/writer/omml/intSize2.test @@ -185,8 +185,8 @@ - + @@ -200,8 +200,8 @@ - + @@ -248,8 +248,8 @@ - + @@ -263,8 +263,8 @@ - + @@ -335,8 +335,8 @@ - + @@ -362,8 +362,8 @@ - + @@ -446,8 +446,8 @@ - + @@ -473,8 +473,8 @@ - + diff --git a/test/writer/omml/maction-02.test b/test/writer/omml/maction-02.test --- a/test/writer/omml/maction-02.test +++ b/test/writer/omml/maction-02.test @@ -18,8 +18,8 @@ - + diff --git a/test/writer/omml/maction-03.test b/test/writer/omml/maction-03.test --- a/test/writer/omml/maction-03.test +++ b/test/writer/omml/maction-03.test @@ -24,8 +24,8 @@ - + diff --git a/test/writer/omml/maction-08.test b/test/writer/omml/maction-08.test --- a/test/writer/omml/maction-08.test +++ b/test/writer/omml/maction-08.test @@ -22,8 +22,8 @@ - + diff --git a/test/writer/omml/mfenced-01.test b/test/writer/omml/mfenced-01.test --- a/test/writer/omml/mfenced-01.test +++ b/test/writer/omml/mfenced-01.test @@ -30,8 +30,8 @@ - + diff --git a/test/writer/omml/mfenced-02.test b/test/writer/omml/mfenced-02.test --- a/test/writer/omml/mfenced-02.test +++ b/test/writer/omml/mfenced-02.test @@ -30,8 +30,8 @@ - + diff --git a/test/writer/omml/mfenced-03.test b/test/writer/omml/mfenced-03.test --- a/test/writer/omml/mfenced-03.test +++ b/test/writer/omml/mfenced-03.test @@ -30,8 +30,8 @@ - + diff --git a/test/writer/omml/mfenced-04.test b/test/writer/omml/mfenced-04.test --- a/test/writer/omml/mfenced-04.test +++ b/test/writer/omml/mfenced-04.test @@ -27,8 +27,8 @@ - + @@ -71,8 +71,8 @@ - + diff --git a/test/writer/omml/mfenced-05.test b/test/writer/omml/mfenced-05.test --- a/test/writer/omml/mfenced-05.test +++ b/test/writer/omml/mfenced-05.test @@ -27,8 +27,8 @@ - + @@ -71,8 +71,8 @@ - + diff --git a/test/writer/omml/mfenced-06.test b/test/writer/omml/mfenced-06.test --- a/test/writer/omml/mfenced-06.test +++ b/test/writer/omml/mfenced-06.test @@ -27,8 +27,8 @@ - + @@ -71,8 +71,8 @@ - + diff --git a/test/writer/omml/mfenced-07.test b/test/writer/omml/mfenced-07.test --- a/test/writer/omml/mfenced-07.test +++ b/test/writer/omml/mfenced-07.test @@ -27,8 +27,8 @@ - + @@ -71,8 +71,8 @@ - + diff --git a/test/writer/omml/mfenced-08.test b/test/writer/omml/mfenced-08.test --- a/test/writer/omml/mfenced-08.test +++ b/test/writer/omml/mfenced-08.test @@ -27,8 +27,8 @@ - + @@ -71,8 +71,8 @@ - + diff --git a/test/writer/omml/mfenced1.test b/test/writer/omml/mfenced1.test --- a/test/writer/omml/mfenced1.test +++ b/test/writer/omml/mfenced1.test @@ -10,8 +10,8 @@ - + diff --git a/test/writer/omml/mfenced5.test b/test/writer/omml/mfenced5.test --- a/test/writer/omml/mfenced5.test +++ b/test/writer/omml/mfenced5.test @@ -15,8 +15,8 @@ - + diff --git a/test/writer/omml/mfencedAdelims6.test b/test/writer/omml/mfencedAdelims6.test --- a/test/writer/omml/mfencedAdelims6.test +++ b/test/writer/omml/mfencedAdelims6.test @@ -31,8 +31,8 @@ - + @@ -53,8 +53,8 @@ - + diff --git a/test/writer/omml/mfencedBfences7.test b/test/writer/omml/mfencedBfences7.test --- a/test/writer/omml/mfencedBfences7.test +++ b/test/writer/omml/mfencedBfences7.test @@ -21,8 +21,8 @@ - + @@ -49,8 +49,8 @@ - + diff --git a/test/writer/omml/mfencedBseparators8.test b/test/writer/omml/mfencedBseparators8.test --- a/test/writer/omml/mfencedBseparators8.test +++ b/test/writer/omml/mfencedBseparators8.test @@ -22,8 +22,8 @@ - + diff --git a/test/writer/omml/mfencedSfonts9.test b/test/writer/omml/mfencedSfonts9.test --- a/test/writer/omml/mfencedSfonts9.test +++ b/test/writer/omml/mfencedSfonts9.test @@ -30,8 +30,8 @@ - + @@ -58,8 +58,8 @@ - + @@ -89,8 +89,8 @@ - + diff --git a/test/writer/omml/mfracBheight17.test b/test/writer/omml/mfracBheight17.test --- a/test/writer/omml/mfracBheight17.test +++ b/test/writer/omml/mfracBheight17.test @@ -129,8 +129,8 @@ - + @@ -224,8 +224,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-10.test b/test/writer/omml/mfracZcomp-10.test --- a/test/writer/omml/mfracZcomp-10.test +++ b/test/writer/omml/mfracZcomp-10.test @@ -23,8 +23,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-11.test b/test/writer/omml/mfracZcomp-11.test --- a/test/writer/omml/mfracZcomp-11.test +++ b/test/writer/omml/mfracZcomp-11.test @@ -28,8 +28,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-12.test b/test/writer/omml/mfracZcomp-12.test --- a/test/writer/omml/mfracZcomp-12.test +++ b/test/writer/omml/mfracZcomp-12.test @@ -29,8 +29,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-13.test b/test/writer/omml/mfracZcomp-13.test --- a/test/writer/omml/mfracZcomp-13.test +++ b/test/writer/omml/mfracZcomp-13.test @@ -29,8 +29,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-14.test b/test/writer/omml/mfracZcomp-14.test --- a/test/writer/omml/mfracZcomp-14.test +++ b/test/writer/omml/mfracZcomp-14.test @@ -31,8 +31,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-15.test b/test/writer/omml/mfracZcomp-15.test --- a/test/writer/omml/mfracZcomp-15.test +++ b/test/writer/omml/mfracZcomp-15.test @@ -31,8 +31,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-16.test b/test/writer/omml/mfracZcomp-16.test --- a/test/writer/omml/mfracZcomp-16.test +++ b/test/writer/omml/mfracZcomp-16.test @@ -29,8 +29,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-17.test b/test/writer/omml/mfracZcomp-17.test --- a/test/writer/omml/mfracZcomp-17.test +++ b/test/writer/omml/mfracZcomp-17.test @@ -29,8 +29,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-18.test b/test/writer/omml/mfracZcomp-18.test --- a/test/writer/omml/mfracZcomp-18.test +++ b/test/writer/omml/mfracZcomp-18.test @@ -32,8 +32,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-19.test b/test/writer/omml/mfracZcomp-19.test --- a/test/writer/omml/mfracZcomp-19.test +++ b/test/writer/omml/mfracZcomp-19.test @@ -31,8 +31,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-20.test b/test/writer/omml/mfracZcomp-20.test --- a/test/writer/omml/mfracZcomp-20.test +++ b/test/writer/omml/mfracZcomp-20.test @@ -33,8 +33,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-21.test b/test/writer/omml/mfracZcomp-21.test --- a/test/writer/omml/mfracZcomp-21.test +++ b/test/writer/omml/mfracZcomp-21.test @@ -33,8 +33,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-24.test b/test/writer/omml/mfracZcomp-24.test --- a/test/writer/omml/mfracZcomp-24.test +++ b/test/writer/omml/mfracZcomp-24.test @@ -57,8 +57,8 @@ - + @@ -70,8 +70,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-25.test b/test/writer/omml/mfracZcomp-25.test --- a/test/writer/omml/mfracZcomp-25.test +++ b/test/writer/omml/mfracZcomp-25.test @@ -57,8 +57,8 @@ - + @@ -70,8 +70,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-30.test b/test/writer/omml/mfracZcomp-30.test --- a/test/writer/omml/mfracZcomp-30.test +++ b/test/writer/omml/mfracZcomp-30.test @@ -71,8 +71,8 @@ - + @@ -149,8 +149,8 @@ - + @@ -180,8 +180,8 @@ - + @@ -225,8 +225,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-31.test b/test/writer/omml/mfracZcomp-31.test --- a/test/writer/omml/mfracZcomp-31.test +++ b/test/writer/omml/mfracZcomp-31.test @@ -76,8 +76,8 @@ - + @@ -109,8 +109,8 @@ - + @@ -157,8 +157,8 @@ - + @@ -166,8 +166,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-32.test b/test/writer/omml/mfracZcomp-32.test --- a/test/writer/omml/mfracZcomp-32.test +++ b/test/writer/omml/mfracZcomp-32.test @@ -103,8 +103,8 @@ - + @@ -122,8 +122,8 @@ - + diff --git a/test/writer/omml/mfracZcomp-33.test b/test/writer/omml/mfracZcomp-33.test --- a/test/writer/omml/mfracZcomp-33.test +++ b/test/writer/omml/mfracZcomp-33.test @@ -80,8 +80,8 @@ - + @@ -127,8 +127,8 @@ - + @@ -203,8 +203,8 @@ - + diff --git a/test/writer/omml/mi4.test b/test/writer/omml/mi4.test --- a/test/writer/omml/mi4.test +++ b/test/writer/omml/mi4.test @@ -22,8 +22,8 @@ - + diff --git a/test/writer/omml/mo2.test b/test/writer/omml/mo2.test --- a/test/writer/omml/mo2.test +++ b/test/writer/omml/mo2.test @@ -10,8 +10,8 @@ - + diff --git a/test/writer/omml/mo3.test b/test/writer/omml/mo3.test --- a/test/writer/omml/mo3.test +++ b/test/writer/omml/mo3.test @@ -16,8 +16,8 @@ - + diff --git a/test/writer/omml/mo6.test b/test/writer/omml/mo6.test --- a/test/writer/omml/mo6.test +++ b/test/writer/omml/mo6.test @@ -57,8 +57,8 @@ - + diff --git a/test/writer/omml/mo7.test b/test/writer/omml/mo7.test --- a/test/writer/omml/mo7.test +++ b/test/writer/omml/mo7.test @@ -16,8 +16,8 @@ - + diff --git a/test/writer/omml/moAprime16.test b/test/writer/omml/moAprime16.test --- a/test/writer/omml/moAprime16.test +++ b/test/writer/omml/moAprime16.test @@ -30,8 +30,8 @@ - + @@ -64,8 +64,8 @@ - + diff --git a/test/writer/omml/moAsep17.test b/test/writer/omml/moAsep17.test --- a/test/writer/omml/moAsep17.test +++ b/test/writer/omml/moAsep17.test @@ -42,8 +42,8 @@ - + @@ -82,8 +82,8 @@ - + @@ -122,8 +122,8 @@ - + diff --git a/test/writer/omml/moAstretchy18.test b/test/writer/omml/moAstretchy18.test --- a/test/writer/omml/moAstretchy18.test +++ b/test/writer/omml/moAstretchy18.test @@ -46,8 +46,8 @@ - + @@ -166,8 +166,8 @@ - + diff --git a/test/writer/omml/moAsymmetric19.test b/test/writer/omml/moAsymmetric19.test --- a/test/writer/omml/moAsymmetric19.test +++ b/test/writer/omml/moAsymmetric19.test @@ -44,8 +44,8 @@ - + @@ -82,8 +82,8 @@ - + @@ -120,8 +120,8 @@ - + diff --git a/test/writer/omml/moSminmax20.test b/test/writer/omml/moSminmax20.test --- a/test/writer/omml/moSminmax20.test +++ b/test/writer/omml/moSminmax20.test @@ -21,8 +21,8 @@ - + @@ -52,8 +52,8 @@ - + diff --git a/test/writer/omml/moore_determinant.test b/test/writer/omml/moore_determinant.test --- a/test/writer/omml/moore_determinant.test +++ b/test/writer/omml/moore_determinant.test @@ -69,8 +69,8 @@ - + diff --git a/test/writer/omml/mrowAbg4.test b/test/writer/omml/mrowAbg4.test --- a/test/writer/omml/mrowAbg4.test +++ b/test/writer/omml/mrowAbg4.test @@ -39,8 +39,8 @@ - + diff --git a/test/writer/omml/mstyle1.test b/test/writer/omml/mstyle1.test --- a/test/writer/omml/mstyle1.test +++ b/test/writer/omml/mstyle1.test @@ -15,8 +15,8 @@ - + diff --git a/test/writer/omml/msup2.test b/test/writer/omml/msup2.test --- a/test/writer/omml/msup2.test +++ b/test/writer/omml/msup2.test @@ -20,8 +20,8 @@ - + diff --git a/test/writer/omml/oint1.test b/test/writer/omml/oint1.test --- a/test/writer/omml/oint1.test +++ b/test/writer/omml/oint1.test @@ -39,8 +39,8 @@ - + diff --git a/test/writer/omml/operatorname.test b/test/writer/omml/operatorname.test --- a/test/writer/omml/operatorname.test +++ b/test/writer/omml/operatorname.test @@ -77,8 +77,8 @@ - + diff --git a/test/writer/omml/phantom.test b/test/writer/omml/phantom.test --- a/test/writer/omml/phantom.test +++ b/test/writer/omml/phantom.test @@ -16,8 +16,8 @@ - + diff --git a/test/writer/omml/rec-mtable1.test b/test/writer/omml/rec-mtable1.test --- a/test/writer/omml/rec-mtable1.test +++ b/test/writer/omml/rec-mtable1.test @@ -21,8 +21,8 @@ - + diff --git a/test/writer/omml/schwinger_dyson.test b/test/writer/omml/schwinger_dyson.test --- a/test/writer/omml/schwinger_dyson.test +++ b/test/writer/omml/schwinger_dyson.test @@ -63,8 +63,8 @@ - + @@ -74,8 +74,8 @@ - + @@ -89,8 +89,8 @@ - + @@ -118,8 +118,8 @@ - + @@ -158,8 +158,8 @@ - + @@ -169,8 +169,8 @@ - + @@ -184,8 +184,8 @@ - + @@ -195,8 +195,8 @@ - + @@ -229,8 +229,8 @@ - + diff --git a/test/writer/omml/simplePres.test b/test/writer/omml/simplePres.test --- a/test/writer/omml/simplePres.test +++ b/test/writer/omml/simplePres.test @@ -44,8 +44,8 @@ - + diff --git a/test/writer/omml/sophomores_dream.test b/test/writer/omml/sophomores_dream.test --- a/test/writer/omml/sophomores_dream.test +++ b/test/writer/omml/sophomores_dream.test @@ -113,8 +113,8 @@ - + diff --git a/test/writer/omml/sphere_volume.test b/test/writer/omml/sphere_volume.test --- a/test/writer/omml/sphere_volume.test +++ b/test/writer/omml/sphere_volume.test @@ -565,8 +565,8 @@ - + diff --git a/test/writer/omml/stretchHoriz2.test b/test/writer/omml/stretchHoriz2.test --- a/test/writer/omml/stretchHoriz2.test +++ b/test/writer/omml/stretchHoriz2.test @@ -23,8 +23,8 @@ - + diff --git a/test/writer/omml/stretchVert1.test b/test/writer/omml/stretchVert1.test --- a/test/writer/omml/stretchVert1.test +++ b/test/writer/omml/stretchVert1.test @@ -57,8 +57,8 @@ - + @@ -86,8 +86,8 @@ - + diff --git a/test/writer/omml/stretchVert2.test b/test/writer/omml/stretchVert2.test --- a/test/writer/omml/stretchVert2.test +++ b/test/writer/omml/stretchVert2.test @@ -25,8 +25,8 @@ - + @@ -44,8 +44,8 @@ - + diff --git a/test/writer/omml/stretchVertNest2.test b/test/writer/omml/stretchVertNest2.test --- a/test/writer/omml/stretchVertNest2.test +++ b/test/writer/omml/stretchVertNest2.test @@ -20,16 +20,16 @@ - + - + diff --git a/test/writer/omml/substack.test b/test/writer/omml/substack.test --- a/test/writer/omml/substack.test +++ b/test/writer/omml/substack.test @@ -126,8 +126,8 @@ - + diff --git a/test/writer/omml/tokens.test b/test/writer/omml/tokens.test --- a/test/writer/omml/tokens.test +++ b/test/writer/omml/tokens.test @@ -84,8 +84,8 @@ - + @@ -97,8 +97,8 @@ - + diff --git a/test/writer/omml/tripleint2.test b/test/writer/omml/tripleint2.test --- a/test/writer/omml/tripleint2.test +++ b/test/writer/omml/tripleint2.test @@ -39,8 +39,8 @@ - + diff --git a/test/writer/omml/verbar2.test b/test/writer/omml/verbar2.test --- a/test/writer/omml/verbar2.test +++ b/test/writer/omml/verbar2.test @@ -15,8 +15,8 @@ - + diff --git a/test/writer/tex/02000_General_Punctuation.test b/test/writer/tex/02000_General_Punctuation.test --- a/test/writer/tex/02000_General_Punctuation.test +++ b/test/writer/tex/02000_General_Punctuation.test @@ -169,7 +169,7 @@ & \text{200} & \text{201} & \text{202} & \text{203} & \text{204} & \text{205} & \text{206} \\ \text{0} &   & ‐ & \dagger & ‰ & ⁀ & ⁐ & ⁠ \\ \text{1} & \quad & ‑ & \ddagger & ‱ & ⁁ & ⁑ & \\ -\text{2} &   & ‒ & \bullet & \prime & ⁂ & ./. & \\ +\text{2} &   & ‒ & \bullet & ' & ⁂ & ./. & \\ \text{3} & \quad & – & ‣ & '' & ⁃ & ⁓ & \\ \text{4} & \; & — & ․ & ''' & / & ⁔ & \\ \text{5} & \: & ― & ‥ & \backprime & ⁅ & ⁕ & @ \\ diff --git a/test/writer/tex/07.test b/test/writer/tex/07.test --- a/test/writer/tex/07.test +++ b/test/writer/tex/07.test @@ -20,4 +20,4 @@ , EIdentifier "a" ] >>> tex -u'' + p(x)u\prime + 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/tex/complex3.test b/test/writer/tex/complex3.test --- a/test/writer/tex/complex3.test +++ b/test/writer/tex/complex3.test @@ -7685,8 +7685,8 @@ >>> tex \begin{matrix} {2{\sum{ab}}} & \\ -x^{\prime 3} & \\ -{{{f^{\prime}{(x)}} + {\sin\cos\theta}} = 1} & \\ +x^{'3} & \\ +{{{f'{(x)}} + {\sin\cos\theta}} = 1} & \\ {{{f{(z)}} = {\sum\limits_{n = 0}^{\infty}{a_{n}z^{n}}}}\text{, }{{|z| < R}\hspace{0pt}{({R \neq 0})}}} & \\ {\left. \int{}_{C}{\left( {\sum\limits_{n = 0}^{\infty}{a_{n}z^{n}}} \right){\mathbb{d}z}} \right. = {\sum\limits_{n = 0}^{\infty}{a_{n}\left. \int{}_{C}{z^{n}{\mathbb{d}z}} \right.}}} & \\ {{\lim\limits_{n\rightarrow\infty}\left| \left. \int{}_{C}{\left\lbrack {{f{(z)}} - {\sum\limits_{k = 0}^{n}{a_{k}z^{k}}}} \right\rbrack{\mathbb{d}z}} \right. \right|} = 0} & \\ @@ -7782,7 +7782,7 @@ \begin{array}{r} {{{\mathbb{D}_{x\hspace{0pt}x}y} - y} = 0} \\ {{y{(0)}} = 1} \\ -{{y^{\prime}(0)} = 0} +{{y'(0)} = 0} \end{array} & \\ {{y(x)} = {{\frac{1}{3}e^{{- \sqrt[3]{({- 1})}}x}} + {\frac{2}{3}e^{\frac{1}{2}\sqrt[3]{({- 1})}x}{\cos{\frac{1}{2}\sqrt{3}\sqrt[3]{\left( {- 1} \right)}x}}}}} & \\ {{y(t)} = {2{\tan\left( {{2t} - {\frac{1}{4}\pi}} \right)}}} & \\ @@ -7838,8 +7838,8 @@ {1 = 3} \end{matrix} & \\ \begin{matrix} -{{A_{1} = {{N_{0}{({\lambda;\Omega^{\prime}})}} - {\varphi{({\lambda;\Omega^{\prime}})}}}}\text{,}} \\ -{{A_{2} = {{\varphi{({\lambda;\Omega^{\prime}})}} - {\varphi{({\lambda;\Omega})}}}}\text{,}} \\ +{{A_{1} = {{N_{0}{({\lambda;\Omega'})}} - {\varphi{({\lambda;\Omega'})}}}}\text{,}} \\ +{{A_{2} = {{\varphi{({\lambda;\Omega'})}} - {\varphi{({\lambda;\Omega})}}}}\text{,}} \\ {{A_{3} = {\mathcal{N}{({\lambda;\omega})}}}\text{.}} \end{matrix} & \\ \begin{matrix} @@ -7936,7 +7936,7 @@ {{\int_{a}^{b}{{f{(x)}}{\mathbb{d}x}}} = {\lim\limits_{{\parallel P\parallel}\rightarrow 0}{\sum\limits_{i = 1}^{n}{{f\left( {\overline{x}}_{i} \right)}{\Delta x_{i}}}}}} & \\ {{\int_{a}^{b}{{f{(x)}}{\mathbb{d}x}}} = {\lim\limits_{n\rightarrow\infty}{\frac{b - a}{n}{\sum\limits_{i = 1}^{n}{f\left( {a + {i\frac{b - a}{n}}} \right)}}}}} & \\ {{\int_{0}^{2}{x^{5}\sqrt{x^{3} + 1}{\mathbb{d}x}}} = {\int_{1}^{3}{\frac{2}{3}u\frac{\sqrt{\left( u^{2} \right)}}{\left( {u^{2} - 1} \right)^{\frac{2}{3}}}\left( {{u^{2}\left( {u^{2} - 1} \right)^{\frac{2}{3}}} - \left( {u^{2} - 1} \right)^{\frac{2}{3}}} \right){\mathbb{d}u}}}} & \\ -{\left. \int{{f{({g{(x)}})}}{g^{\prime}{(x)}}{\mathbb{d}x}} \right. = \left. \int{{f{(u)}}{\mathbb{d}u}} \right.} & \\ +{\left. \int{{f{({g{(x)}})}}{g'{(x)}}{\mathbb{d}x}} \right. = \left. \int{{f{(u)}}{\mathbb{d}u}} \right.} & \\ {x = {2{\sum\limits_{n = 1}^{100}{n{({n - 1})}}}}} & \\ {{\lim\limits_{x\rightarrow 0}{\sin\left( \frac{1}{x} \right)}} = {{- 1}..1}} & \\ {{h{({i,j})}} = {{{({2 - j})}{g{(i)}}} + {{({j - 1})}{f{({g{(i)}})}}}}} & \\ diff --git a/test/writer/tex/moAprime16.test b/test/writer/tex/moAprime16.test --- a/test/writer/tex/moAprime16.test +++ b/test/writer/tex/moAprime16.test @@ -6,4 +6,4 @@ , EDelimited "(" ")" [ Right (EIdentifier "x") ] ] >>> tex -f^{'}(x) = f^{\prime}(x) +f^{'}(x) = f'(x) diff --git a/test/writer/tex/p.test b/test/writer/tex/p.test --- a/test/writer/tex/p.test +++ b/test/writer/tex/p.test @@ -161,7 +161,7 @@ \text{precneqq} & ⪵ \\ \text{precnsim} & \precnsim \\ \text{precsim} & \precsim \\ -\text{prime} & \prime \\ +\text{prime} & ' \\ \text{Prime} & '' \\ \text{primes} & \mathbb{P} \\ \text{prnap} & \precnapprox \\ diff --git a/test/writer/tex/primes1.test b/test/writer/tex/primes1.test --- a/test/writer/tex/primes1.test +++ b/test/writer/tex/primes1.test @@ -37,4 +37,4 @@ , ESuper (ESymbol Accent "'") (ESymbol Accent "'") ] >>> tex -x^{2} + 2^{2} + x^{\prime} + x^{'} + x^{\operatorname{''}} + x\prime + {x^{'}}^{'} + {x^{'}}^{2} + x^{' + '} + {x^{'}}^{'} + x^{'^{'}} + '^{'} + '^{'} +x^{2} + 2^{2} + x' + x^{'} + x^{\operatorname{''}} + x\prime + {x^{'}}^{'} + {x^{'}}^{2} + x^{' + '} + {x^{'}}^{'} + x^{'^{'}} + '^{'} + '^{'} diff --git a/test/writer/tex/primes2.test b/test/writer/tex/primes2.test --- a/test/writer/tex/primes2.test +++ b/test/writer/tex/primes2.test @@ -27,4 +27,4 @@ , ESuper (EIdentifier "H") (ESymbol Accent "\8279") ] >>> tex -H^{"}H^{'}H^{*}H^{`}H^{ª}H^{{^\circ}}H^{²}H^{³}H^{´}H^{¹}H^{º}H^{‘}H^{’}H^{‚}H^{‛}H^{``}H^{"}H^{„}H^{‟}H^{\prime}H^{''}H^{'''}H^{\backprime}H^{‶}H^{‷}H^{⁗} +H^{"}H^{'}H^{*}H^{`}H^{ª}H^{{^\circ}}H^{²}H^{³}H^{´}H^{¹}H^{º}H^{‘}H^{’}H^{‚}H^{‛}H^{``}H^{"}H^{„}H^{‟}H'H^{''}H^{'''}H^{\backprime}H^{‶}H^{‷}H^{⁗} 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(|z^(‾)|) = lr(|z|) , lr(|(z^(‾))^n|) = lr(|z|)^n , arg (z^n) = n arg (z) +lr(|z^(‾)|) = lr(|z|) \, lr(|(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/binomial_coefficient.test b/test/writer/typst/binomial_coefficient.test --- a/test/writer/typst/binomial_coefficient.test +++ b/test/writer/typst/binomial_coefficient.test @@ -40,4 +40,4 @@ ]) ] >>> typst -bold(C) (n , k) = bold(C)_k^n = zws_n bold(C)_k = binom(n, k) = frac(n !, k ! thin (n - k) !) +bold(C) (n \, k) = bold(C)_k^n = zws_n bold(C)_k = binom(n, k) = frac(n !, k ! thin (n - k) !) 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 @@ -615,8 +615,8 @@ nabla zws dot.c B^harpoon.lt_() & = & 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("Another Ramanujan identity") & sum_(k = 1)^oo 1 / 2_()^(⌊ k dot.c zws phi ⌋) = 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("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("Commutative Diagram") & H & arrow.l & K\ arrow.b & zws & arrow.t\ H & arrow.r & K 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 circle.stroked.tiny gamma_1 (t)\|_(t = 0) = frac(upright(d), upright(d) t) phi.alt circle.stroked.tiny gamma_2 (t)\|_(t = 0) 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/test/writer/typst/substack.test b/test/writer/typst/substack.test --- a/test/writer/typst/substack.test +++ b/test/writer/typst/substack.test @@ -34,4 +34,4 @@ ] >>> typst sum_(0 < i < m\ -0 < j < n) P (i , j) +0 < j < n) P (i \, j) diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.12.8.11 +Version: 0.12.8.12 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.6 && < 0.1.7, + typst-symbols >= 0.1.7 && < 0.1.8, split Exposed-modules: Text.TeXMath,