diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,13 @@ +texmath (0.12.3) + + * TeX reader: implement logic to convert a Bin symbol to + an Op to Op when it occurs at the beginning of a group, + or after an Open, Pun, or Op symbol. This will give much + better results for unary `-` (#176). + + * OMML writer: fixed rendering of EDelimited (#173). + We now properly render "middles" (separators). + texmath (0.12.2) * MathML input: support mmultiscripts element (#158, #100). 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 @@ -46,6 +46,7 @@ import Data.Maybe (fromJust) import Text.TeXMath.Unicode.ToUnicode (toUnicode) import Text.TeXMath.Shared (getSpaceChars) +import Data.Generics (everywhere, mkT) type TP = Parser @@ -67,8 +68,40 @@ readTeX :: Text -> Either Text [Exp] readTeX inp = let (ms, rest) = parseMacroDefinitions inp in - either (Left . showParseError inp) (Right . id) + either (Left . showParseError inp) (Right . everywhere (mkT fixBins)) $ parse formula "formula" $ applyMacros ms rest + +-- | Convert Bin after nothing, Open, Pun, or Op to Op (#176). +fixBins :: Exp -> Exp +fixBins e = + case e of + EGrouped es -> EGrouped (fixBinList True es) + EDelimited op cl des -> EDelimited op cl (fixBinListDel True des) + _ -> e + where + fixBinList atBeginning xs = + case xs of + ESymbol Bin t : rest + | atBeginning + -> ESymbol Op t : fixBinList False rest + ESymbol Bin t : rest@(ESymbol ty _ : _) + | ty == Open || ty == Pun || ty == Op + -> ESymbol Op t : fixBinList False rest + x:rest -> x : fixBinList False rest + [] -> [] + + fixBinListDel atBeginning xs = + case xs of + Left x : rest + -> Left x : fixBinListDel True rest + Right (ESymbol Bin t) : rest + | atBeginning + -> Right (ESymbol Op t) : fixBinListDel False rest + Right (ESymbol Bin t) : rest@(Right (ESymbol ty _):_) + | ty == Open || ty == Pun || ty == Op + -> Right (ESymbol Op t) : fixBinListDel False rest + x:rest -> x : fixBinListDel False rest + [] -> [] showParseError :: Text -> ParseError -> Text showParseError inp pe = 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 @@ -28,7 +28,9 @@ import Text.TeXMath.Types import Data.Generics (everywhere, mkT) import Data.Char (isSymbol, isPunctuation) +import Data.Either (lefts, isLeft, rights) import qualified Data.Text as T +import Data.List.Split (splitWhen) -- | Transforms an expression tree to an OMML XML Tree writeOMML :: DisplayType -> [Exp] -> Element @@ -192,13 +194,20 @@ EGrouped [] -> [str props "\x200B"] -- avoid dashed box, see #118 EGrouped xs -> concatMap (showExp props) xs EDelimited start end xs -> - [mnode "d" [ mnode "dPr" - [ mnodeA "begChr" (T.unpack start) () - , mnodeA "endChr" (T.unpack end) () - , mnode "grow" () ] - , mnode "e" $ concatMap - (either ((:[]) . str props) (showExp props)) xs - ] ] + [ mnode "d" $ mnode "dPr" + [ mnodeA "begChr" (T.unpack start) () + , mnodeA "endChr" (T.unpack end) () + , mnodeA "sepChr" (T.unpack sepchr) () + , mnode "grow" () ] + : map (mnode "e" . concatMap (showExp props)) es + ] + where + seps = lefts xs + sepchr = case seps of + [] -> "" + (s:_) -> s + es = map rights $ splitWhen isLeft xs + EIdentifier "" -> [str props "\x200B"] -- 0-width space -- to avoid the dashed box we get otherwise; see #118 EIdentifier x -> [str props x] diff --git a/tests/readers/tex/01.native b/tests/readers/tex/01.native --- a/tests/readers/tex/01.native +++ b/tests/readers/tex/01.native @@ -1,1 +1,1 @@ -[EIdentifier "x",ESymbol Rel "=",EFraction NormalFrac (EGrouped [ESymbol Bin "\8722",EIdentifier "b",ESymbol Bin "\177",ESqrt (EGrouped [ESuper (EIdentifier "b") (ENumber "2"),ESymbol Bin "\8722",ENumber "4",EIdentifier "a",EIdentifier "c"])]) (EGrouped [ENumber "2",EIdentifier "a"])] +[EIdentifier "x",ESymbol Rel "=",EFraction NormalFrac (EGrouped [ESymbol Op "\8722",EIdentifier "b",ESymbol Bin "\177",ESqrt (EGrouped [ESuper (EIdentifier "b") (ENumber "2"),ESymbol Bin "\8722",ENumber "4",EIdentifier "a",EIdentifier "c"])]) (EGrouped [ENumber "2",EIdentifier "a"])] diff --git a/tests/readers/tex/11.native b/tests/readers/tex/11.native --- a/tests/readers/tex/11.native +++ b/tests/readers/tex/11.native @@ -1,1 +1,1 @@ -[ESub (EIdentifier "\981") (EIdentifier "n"),EDelimited "(" ")" [Right (EIdentifier "\954")],ESymbol Rel "=",ENumber "0.033",ESubsup (EIdentifier "C") (EIdentifier "n") (ENumber "2"),ESuper (EIdentifier "\954") (EGrouped [ESymbol Bin "\8722",ENumber "11",ESymbol Ord "/",ENumber "3"]),ESymbol Pun ",",ESpace (1 % 1),EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "L") (ENumber "0")),ESymbol Rel "\8810",EIdentifier "\954",ESymbol Rel "\8810",EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "l") (ENumber "0"))] +[ESub (EIdentifier "\981") (EIdentifier "n"),EDelimited "(" ")" [Right (EIdentifier "\954")],ESymbol Rel "=",ENumber "0.033",ESubsup (EIdentifier "C") (EIdentifier "n") (ENumber "2"),ESuper (EIdentifier "\954") (EGrouped [ESymbol Op "\8722",ENumber "11",ESymbol Ord "/",ENumber "3"]),ESymbol Pun ",",ESpace (1 % 1),EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "L") (ENumber "0")),ESymbol Rel "\8810",EIdentifier "\954",ESymbol Rel "\8810",EFraction NormalFrac (ENumber "1") (ESub (EIdentifier "l") (ENumber "0"))] diff --git a/tests/readers/tex/quadratic_formula.native b/tests/readers/tex/quadratic_formula.native --- a/tests/readers/tex/quadratic_formula.native +++ b/tests/readers/tex/quadratic_formula.native @@ -1,1 +1,1 @@ -[EIdentifier "x",ESymbol Rel "=",EFraction NormalFrac (EGrouped [ESymbol Bin "\8722",EIdentifier "b",ESymbol Bin "\177",ESqrt (EGrouped [ESuper (EIdentifier "b") (ENumber "2"),ESymbol Bin "\8722",ENumber "4",EIdentifier "a",EIdentifier "c"])]) (EGrouped [ENumber "2",EIdentifier "a"])] +[EIdentifier "x",ESymbol Rel "=",EFraction NormalFrac (EGrouped [ESymbol Op "\8722",EIdentifier "b",ESymbol Bin "\177",ESqrt (EGrouped [ESuper (EIdentifier "b") (ENumber "2"),ESymbol Bin "\8722",ENumber "4",EIdentifier "a",EIdentifier "c"])]) (EGrouped [ENumber "2",EIdentifier "a"])] diff --git a/tests/readers/tex/sophomores_dream.native b/tests/readers/tex/sophomores_dream.native --- a/tests/readers/tex/sophomores_dream.native +++ b/tests/readers/tex/sophomores_dream.native @@ -1,1 +1,1 @@ -[ESubsup (ESymbol Op "\8747") (ENumber "0") (ENumber "1"),ESuper (EIdentifier "x") (EIdentifier "x"),ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "x",ESymbol Rel "=",EUnderover True (ESymbol Op "\8721") (EGrouped [EIdentifier "n",ESymbol Rel "=",ENumber "1"]) (ESymbol Ord "\8734"),EGrouped [ESuper (EDelimited "(" ")" [Right (ESymbol Bin "\8722"),Right (ENumber "1")]) (EGrouped [EIdentifier "n",ESymbol Bin "+",ENumber "1"]),ESpace (1 % 6),ESuper (EIdentifier "n") (EGrouped [ESymbol Bin "\8722",EIdentifier "n"])]] +[ESubsup (ESymbol Op "\8747") (ENumber "0") (ENumber "1"),ESuper (EIdentifier "x") (EIdentifier "x"),ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "x",ESymbol Rel "=",EUnderover True (ESymbol Op "\8721") (EGrouped [EIdentifier "n",ESymbol Rel "=",ENumber "1"]) (ESymbol Ord "\8734"),EGrouped [ESuper (EDelimited "(" ")" [Right (ESymbol Op "\8722"),Right (ENumber "1")]) (EGrouped [EIdentifier "n",ESymbol Bin "+",ENumber "1"]),ESpace (1 % 6),ESuper (EIdentifier "n") (EGrouped [ESymbol Op "\8722",EIdentifier "n"])]] diff --git a/tests/readers/tex/sphere_volume.native b/tests/readers/tex/sphere_volume.native --- a/tests/readers/tex/sphere_volume.native +++ b/tests/readers/tex/sphere_volume.native @@ -1,1 +1,1 @@ -[EIdentifier "S",ESymbol Rel "=",ESymbol Open "{",ENumber "0",ESymbol Rel "\8804",EIdentifier "\981",ESymbol Rel "\8804",ENumber "2",EIdentifier "\960",ESymbol Pun ",",ESpace (2 % 9),ENumber "0",ESymbol Rel "\8804",EIdentifier "\952",ESymbol Rel "\8804",EIdentifier "\960",ESymbol Pun ",",ESpace (2 % 9),ENumber "0",ESymbol Rel "\8804",EIdentifier "\961",ESymbol Rel "\8804",EIdentifier "R",ESymbol Close "}",EArray [AlignRight,AlignLeft] [[[EStyled TextNormal [EIdentifier "V",EIdentifier "o",EIdentifier "l",EIdentifier "u",EIdentifier "m",EIdentifier "e"]],[ESymbol Rel "=",EUnder False (ESymbol Op "\8749") (EIdentifier "S"),ESpace ((-1) % 6),ESuper (EIdentifier "\961") (ENumber "2"),EMathOperator "sin",EIdentifier "\952",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\961",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\952",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\981"]],[[],[ESymbol Rel "=",ESubsup (ESymbol Op "\8747") (ENumber "0") (EGrouped [ENumber "2",EIdentifier "\960"]),ESpace ((-1) % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\981",ESpace (1 % 6),ESubsup (ESymbol Op "\8747") (ENumber "0") (EIdentifier "\960"),ESpace ((-1) % 6),EMathOperator "sin",EIdentifier "\952",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\952",ESpace (1 % 6),ESubsup (ESymbol Op "\8747") (ENumber "0") (EIdentifier "R"),ESpace ((-1) % 6),ESuper (EIdentifier "\961") (ENumber "2"),EStyled TextNormal [EIdentifier "d"],EIdentifier "\961"]],[[],[ESymbol Rel "=",EIdentifier "\981",ESubsup (EScaled (9 % 5) (ESymbol Open "|")) (ENumber "0") (EGrouped [ENumber "2",EIdentifier "\960"]),ESpace (2 % 9),EDelimited "(" ")" [Right (ESymbol Bin "\8722"),Right (EMathOperator "cos"),Right (EIdentifier "\952")],ESubsup (EScaled (9 % 5) (ESymbol Open "|")) (ENumber "0") (EIdentifier "\960"),ESpace (2 % 9),EFraction InlineFrac (ENumber "1") (ENumber "3"),ESuper (EIdentifier "\961") (ENumber "3"),ESubsup (EScaled (9 % 5) (ESymbol Open "|")) (ENumber "0") (EIdentifier "R")]],[[],[ESymbol Rel "=",ENumber "2",EIdentifier "\960",ESymbol Bin "\215",ENumber "2",ESymbol Bin "\215",EFraction InlineFrac (ENumber "1") (ENumber "3"),ESuper (EIdentifier "R") (ENumber "3")]],[[],[ESymbol Rel "=",EFraction InlineFrac (ENumber "4") (ENumber "3"),EIdentifier "\960",ESuper (EIdentifier "R") (ENumber "3")]]]] +[EIdentifier "S",ESymbol Rel "=",ESymbol Open "{",ENumber "0",ESymbol Rel "\8804",EIdentifier "\981",ESymbol Rel "\8804",ENumber "2",EIdentifier "\960",ESymbol Pun ",",ESpace (2 % 9),ENumber "0",ESymbol Rel "\8804",EIdentifier "\952",ESymbol Rel "\8804",EIdentifier "\960",ESymbol Pun ",",ESpace (2 % 9),ENumber "0",ESymbol Rel "\8804",EIdentifier "\961",ESymbol Rel "\8804",EIdentifier "R",ESymbol Close "}",EArray [AlignRight,AlignLeft] [[[EStyled TextNormal [EIdentifier "V",EIdentifier "o",EIdentifier "l",EIdentifier "u",EIdentifier "m",EIdentifier "e"]],[ESymbol Rel "=",EUnder False (ESymbol Op "\8749") (EIdentifier "S"),ESpace ((-1) % 6),ESuper (EIdentifier "\961") (ENumber "2"),EMathOperator "sin",EIdentifier "\952",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\961",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\952",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\981"]],[[],[ESymbol Rel "=",ESubsup (ESymbol Op "\8747") (ENumber "0") (EGrouped [ENumber "2",EIdentifier "\960"]),ESpace ((-1) % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\981",ESpace (1 % 6),ESubsup (ESymbol Op "\8747") (ENumber "0") (EIdentifier "\960"),ESpace ((-1) % 6),EMathOperator "sin",EIdentifier "\952",ESpace (1 % 6),EStyled TextNormal [EIdentifier "d"],EIdentifier "\952",ESpace (1 % 6),ESubsup (ESymbol Op "\8747") (ENumber "0") (EIdentifier "R"),ESpace ((-1) % 6),ESuper (EIdentifier "\961") (ENumber "2"),EStyled TextNormal [EIdentifier "d"],EIdentifier "\961"]],[[],[ESymbol Rel "=",EIdentifier "\981",ESubsup (EScaled (9 % 5) (ESymbol Open "|")) (ENumber "0") (EGrouped [ENumber "2",EIdentifier "\960"]),ESpace (2 % 9),EDelimited "(" ")" [Right (ESymbol Op "\8722"),Right (EMathOperator "cos"),Right (EIdentifier "\952")],ESubsup (EScaled (9 % 5) (ESymbol Open "|")) (ENumber "0") (EIdentifier "\960"),ESpace (2 % 9),EFraction InlineFrac (ENumber "1") (ENumber "3"),ESuper (EIdentifier "\961") (ENumber "3"),ESubsup (EScaled (9 % 5) (ESymbol Open "|")) (ENumber "0") (EIdentifier "R")]],[[],[ESymbol Rel "=",ENumber "2",EIdentifier "\960",ESymbol Bin "\215",ENumber "2",ESymbol Bin "\215",EFraction InlineFrac (ENumber "1") (ENumber "3"),ESuper (EIdentifier "R") (ENumber "3")]],[[],[ESymbol Rel "=",EFraction InlineFrac (ENumber "4") (ENumber "3"),EIdentifier "\960",ESuper (EIdentifier "R") (ENumber "3")]]]] diff --git a/tests/writers/01.tex b/tests/writers/01.tex --- a/tests/writers/01.tex +++ b/tests/writers/01.tex @@ -1,1 +1,1 @@ -x = \frac{- b \pm \sqrt{b^{2} - 4ac}}{2a} +x = \frac{-b \pm \sqrt{b^{2} - 4ac}}{2a} diff --git a/tests/writers/02.omml b/tests/writers/02.omml --- a/tests/writers/02.omml +++ b/tests/writers/02.omml @@ -17,6 +17,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/tests/writers/04.omml b/tests/writers/04.omml --- a/tests/writers/04.omml +++ b/tests/writers/04.omml @@ -59,6 +59,7 @@ + diff --git a/tests/writers/05.omml b/tests/writers/05.omml --- a/tests/writers/05.omml +++ b/tests/writers/05.omml @@ -60,6 +60,7 @@ + @@ -119,6 +120,7 @@ + @@ -131,6 +133,7 @@ + diff --git a/tests/writers/06.omml b/tests/writers/06.omml --- a/tests/writers/06.omml +++ b/tests/writers/06.omml @@ -105,6 +105,7 @@ + diff --git a/tests/writers/07.omml b/tests/writers/07.omml --- a/tests/writers/07.omml +++ b/tests/writers/07.omml @@ -26,6 +26,7 @@ + @@ -56,6 +57,7 @@ + @@ -80,6 +82,7 @@ + diff --git a/tests/writers/08.omml b/tests/writers/08.omml --- a/tests/writers/08.omml +++ b/tests/writers/08.omml @@ -8,6 +8,7 @@ + @@ -33,6 +34,7 @@ + @@ -51,6 +53,7 @@ + @@ -60,6 +63,7 @@ + @@ -96,6 +100,7 @@ + @@ -128,6 +133,7 @@ + @@ -165,6 +171,7 @@ + diff --git a/tests/writers/09.omml b/tests/writers/09.omml --- a/tests/writers/09.omml +++ b/tests/writers/09.omml @@ -45,6 +45,7 @@ + @@ -66,6 +67,7 @@ + diff --git a/tests/writers/10.omml b/tests/writers/10.omml --- a/tests/writers/10.omml +++ b/tests/writers/10.omml @@ -20,6 +20,7 @@ + @@ -110,6 +111,7 @@ + @@ -161,6 +163,7 @@ + @@ -203,6 +206,7 @@ + diff --git a/tests/writers/11.omml b/tests/writers/11.omml --- a/tests/writers/11.omml +++ b/tests/writers/11.omml @@ -20,6 +20,7 @@ + diff --git a/tests/writers/11.tex b/tests/writers/11.tex --- a/tests/writers/11.tex +++ b/tests/writers/11.tex @@ -1,1 +1,1 @@ -\phi_{n}(\kappa) = 0.033C_{n}^{2}\kappa^{- 11/3},\quad\frac{1}{L_{0}} \ll \kappa \ll \frac{1}{l_{0}} +\phi_{n}(\kappa) = 0.033C_{n}^{2}\kappa^{-11/3},\quad\frac{1}{L_{0}} \ll \kappa \ll \frac{1}{l_{0}} diff --git a/tests/writers/12.omml b/tests/writers/12.omml --- a/tests/writers/12.omml +++ b/tests/writers/12.omml @@ -11,6 +11,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/tests/writers/13.omml b/tests/writers/13.omml --- a/tests/writers/13.omml +++ b/tests/writers/13.omml @@ -32,6 +32,7 @@ + @@ -183,6 +184,7 @@ + @@ -219,6 +221,7 @@ + @@ -251,6 +254,7 @@ + @@ -287,6 +291,7 @@ + diff --git a/tests/writers/19.omml b/tests/writers/19.omml --- a/tests/writers/19.omml +++ b/tests/writers/19.omml @@ -8,6 +8,7 @@ + @@ -236,6 +237,7 @@ + @@ -289,6 +291,7 @@ + @@ -342,6 +345,7 @@ + @@ -395,6 +399,7 @@ + diff --git a/tests/writers/abs1.omml b/tests/writers/abs1.omml --- a/tests/writers/abs1.omml +++ b/tests/writers/abs1.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/abs2.omml b/tests/writers/abs2.omml --- a/tests/writers/abs2.omml +++ b/tests/writers/abs2.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/axiom_of_power_set.omml b/tests/writers/axiom_of_power_set.omml --- a/tests/writers/axiom_of_power_set.omml +++ b/tests/writers/axiom_of_power_set.omml @@ -44,6 +44,7 @@ + @@ -81,6 +82,7 @@ + diff --git a/tests/writers/binomial_coefficient.omml b/tests/writers/binomial_coefficient.omml --- a/tests/writers/binomial_coefficient.omml +++ b/tests/writers/binomial_coefficient.omml @@ -14,6 +14,7 @@ + @@ -100,6 +101,7 @@ + @@ -158,6 +160,7 @@ + diff --git a/tests/writers/chain1.omml b/tests/writers/chain1.omml --- a/tests/writers/chain1.omml +++ b/tests/writers/chain1.omml @@ -31,6 +31,7 @@ + @@ -225,6 +226,7 @@ + @@ -278,6 +280,7 @@ + @@ -331,6 +334,7 @@ + diff --git a/tests/writers/chain2.omml b/tests/writers/chain2.omml --- a/tests/writers/chain2.omml +++ b/tests/writers/chain2.omml @@ -31,6 +31,7 @@ + @@ -225,6 +226,7 @@ + @@ -278,6 +280,7 @@ + @@ -331,6 +334,7 @@ + diff --git a/tests/writers/choose.omml b/tests/writers/choose.omml --- a/tests/writers/choose.omml +++ b/tests/writers/choose.omml @@ -8,6 +8,7 @@ + @@ -25,6 +26,7 @@ + diff --git a/tests/writers/complex1.omml b/tests/writers/complex1.omml --- a/tests/writers/complex1.omml +++ b/tests/writers/complex1.omml @@ -62,6 +62,7 @@ + @@ -165,6 +166,7 @@ + @@ -255,6 +257,7 @@ + @@ -310,6 +313,7 @@ + @@ -591,6 +595,7 @@ + @@ -786,6 +791,7 @@ + @@ -1448,6 +1454,7 @@ + diff --git a/tests/writers/complex2.omml b/tests/writers/complex2.omml --- a/tests/writers/complex2.omml +++ b/tests/writers/complex2.omml @@ -1641,6 +1641,7 @@ + @@ -1739,6 +1740,7 @@ + diff --git a/tests/writers/complex3.omml b/tests/writers/complex3.omml --- a/tests/writers/complex3.omml +++ b/tests/writers/complex3.omml @@ -265,6 +265,7 @@ + @@ -321,6 +322,7 @@ + @@ -340,6 +342,7 @@ + @@ -476,6 +479,7 @@ + @@ -556,6 +560,7 @@ + @@ -563,6 +568,7 @@ + @@ -582,6 +588,7 @@ + @@ -713,6 +720,7 @@ + @@ -749,13 +757,13 @@ ) - - ⇒ - + + + @@ -3639,6 +3647,7 @@ + @@ -3659,6 +3668,7 @@ + @@ -3890,6 +3900,7 @@ + @@ -3920,6 +3931,7 @@ + @@ -3950,6 +3962,7 @@ + @@ -3979,6 +3992,7 @@ + @@ -4009,6 +4023,7 @@ + @@ -4039,6 +4054,7 @@ + @@ -4068,6 +4084,7 @@ + @@ -4098,6 +4115,7 @@ + @@ -4128,6 +4146,7 @@ + @@ -4157,12 +4176,11 @@ + + - - ↑ - @@ -4178,10 +4196,8 @@ - - ↑ - + @@ -4193,12 +4209,11 @@ + + - - ↓ - @@ -4214,10 +4229,8 @@ - - ↓ - + @@ -4229,12 +4242,11 @@ + + - - ↕ - @@ -4250,10 +4262,8 @@ - - ↕ - + @@ -4613,6 +4623,7 @@ + @@ -4631,6 +4642,7 @@ + @@ -4820,6 +4832,7 @@ + @@ -4865,6 +4878,7 @@ + @@ -5051,6 +5065,7 @@ + @@ -5283,6 +5298,7 @@ + @@ -5310,6 +5326,7 @@ + @@ -5419,6 +5436,7 @@ + @@ -5426,6 +5444,7 @@ + @@ -5751,6 +5770,7 @@ + @@ -5814,6 +5834,7 @@ + @@ -6398,6 +6419,7 @@ + @@ -6660,6 +6682,7 @@ + @@ -6698,6 +6721,7 @@ + @@ -6951,6 +6975,7 @@ + @@ -6994,6 +7019,7 @@ + @@ -7034,6 +7060,7 @@ + @@ -7099,6 +7126,7 @@ + @@ -7191,6 +7219,7 @@ + @@ -7250,6 +7279,7 @@ + @@ -7299,6 +7329,7 @@ + @@ -7860,6 +7891,7 @@ + @@ -7988,6 +8020,7 @@ + @@ -8229,6 +8262,7 @@ + @@ -8274,6 +8308,7 @@ + @@ -8334,6 +8369,7 @@ + @@ -9143,6 +9179,7 @@ + @@ -9594,6 +9631,7 @@ + @@ -9707,6 +9745,7 @@ + @@ -10355,6 +10394,7 @@ + @@ -10404,6 +10444,7 @@ + @@ -10518,6 +10559,7 @@ + @@ -10650,6 +10692,7 @@ + @@ -10729,6 +10772,7 @@ + @@ -10792,6 +10836,7 @@ + @@ -10941,6 +10986,7 @@ + @@ -10992,6 +11038,7 @@ + @@ -11077,6 +11124,7 @@ + @@ -11164,6 +11212,7 @@ + @@ -11251,6 +11300,7 @@ + @@ -11316,6 +11366,7 @@ + @@ -11368,6 +11419,7 @@ + @@ -11418,9 +11470,8 @@ - - | - + + @@ -11463,6 +11514,7 @@ + @@ -11515,6 +11567,7 @@ + @@ -11565,9 +11618,8 @@ - - | - + + @@ -11620,6 +11672,7 @@ + @@ -11693,6 +11746,7 @@ + @@ -11874,6 +11928,7 @@ + @@ -11901,6 +11956,7 @@ + @@ -11925,6 +11981,7 @@ + @@ -12042,6 +12099,7 @@ + @@ -12188,6 +12246,7 @@ + @@ -12255,6 +12314,7 @@ + @@ -12327,6 +12387,7 @@ + @@ -12442,6 +12503,7 @@ + @@ -12480,6 +12542,7 @@ + @@ -12625,6 +12688,7 @@ + @@ -12658,6 +12722,7 @@ + @@ -12665,6 +12730,7 @@ + @@ -12672,6 +12738,7 @@ + @@ -12763,9 +12830,8 @@ - - ↔ - + + @@ -12830,19 +12896,16 @@ + + - ∥ - - A - - ∥ - + @@ -12884,13 +12947,12 @@ + + - ∥ - - A @@ -12902,10 +12964,8 @@ x - - ∥ - + @@ -12913,19 +12973,16 @@ + + - ∥ - - x - - ∥ - + @@ -12938,6 +12995,7 @@ + @@ -13069,6 +13127,7 @@ + @@ -13200,6 +13259,7 @@ + @@ -13447,6 +13507,7 @@ + @@ -13454,6 +13515,7 @@ + @@ -13517,6 +13579,7 @@ + @@ -13592,6 +13655,7 @@ + @@ -13660,6 +13724,7 @@ + @@ -13930,6 +13995,7 @@ + @@ -14145,6 +14211,7 @@ + @@ -14350,6 +14417,7 @@ + @@ -14377,6 +14445,7 @@ + @@ -14434,6 +14503,7 @@ + @@ -14461,6 +14531,7 @@ + @@ -14518,6 +14589,7 @@ + @@ -14591,6 +14663,7 @@ + @@ -14708,6 +14781,7 @@ + @@ -14884,6 +14958,7 @@ + @@ -15125,6 +15200,7 @@ + @@ -15132,6 +15208,7 @@ + @@ -15149,13 +15226,13 @@ - - → - + + + @@ -15252,6 +15329,7 @@ + @@ -15268,6 +15346,7 @@ + @@ -15295,6 +15374,7 @@ + @@ -15356,6 +15436,7 @@ + @@ -15370,6 +15451,7 @@ + @@ -15386,6 +15468,7 @@ + @@ -15413,6 +15496,7 @@ + @@ -15479,6 +15563,7 @@ + @@ -15495,6 +15580,7 @@ + @@ -15522,6 +15608,7 @@ + @@ -15574,6 +15661,7 @@ + @@ -15760,6 +15848,7 @@ + @@ -15781,6 +15870,7 @@ + @@ -15817,6 +15907,7 @@ + @@ -15930,6 +16021,7 @@ + @@ -15951,6 +16043,7 @@ + @@ -15987,6 +16080,7 @@ + @@ -16101,6 +16195,7 @@ + @@ -16130,6 +16225,7 @@ + @@ -16160,6 +16256,7 @@ + @@ -16198,6 +16295,7 @@ + @@ -16266,6 +16364,7 @@ + @@ -16282,6 +16381,7 @@ + @@ -16289,6 +16389,7 @@ + @@ -16306,13 +16407,13 @@ - - → - + + + @@ -16339,6 +16440,7 @@ + @@ -16403,6 +16505,7 @@ + @@ -16430,6 +16533,7 @@ + @@ -16608,6 +16712,7 @@ + @@ -16804,6 +16909,7 @@ + @@ -16849,6 +16955,7 @@ + @@ -18125,6 +18232,7 @@ + @@ -18215,6 +18323,7 @@ + @@ -18269,6 +18378,7 @@ + @@ -18487,6 +18597,7 @@ + @@ -18597,6 +18708,7 @@ + @@ -18782,6 +18894,7 @@ + @@ -18789,6 +18902,7 @@ + @@ -19031,6 +19145,7 @@ + @@ -19049,6 +19164,7 @@ + @@ -20015,6 +20131,7 @@ + @@ -20051,12 +20168,11 @@ + + - - ∥ - @@ -20090,12 +20206,11 @@ + + - - / - @@ -20123,10 +20238,8 @@ - - / - + @@ -20138,6 +20251,7 @@ + @@ -20174,12 +20288,11 @@ + + - - ↕ - @@ -20207,10 +20320,8 @@ - - ↕ - + @@ -20243,12 +20354,11 @@ + + - - ⇕ - @@ -20288,21 +20398,18 @@ - - ⇕ - + + + - - ↑ - @@ -20330,10 +20437,8 @@ - - ↑ - + @@ -20345,12 +20450,11 @@ + + - - ⇑ - @@ -20378,21 +20482,18 @@ - - ⇑ - + + + - - ↓ - @@ -20420,21 +20521,18 @@ - - ↓ - + + + - - ⇓ - @@ -20462,10 +20560,8 @@ - - ⇓ - + @@ -20543,6 +20639,7 @@ + @@ -20615,6 +20712,7 @@ + @@ -20827,6 +20925,7 @@ + @@ -20857,6 +20956,7 @@ + @@ -20896,6 +20996,7 @@ + @@ -20935,6 +21036,7 @@ + @@ -21426,6 +21528,7 @@ + @@ -21532,6 +21635,7 @@ + @@ -21583,6 +21687,7 @@ + @@ -21974,6 +22079,7 @@ + @@ -22091,6 +22197,7 @@ + @@ -22348,6 +22455,7 @@ + @@ -22501,6 +22609,7 @@ + @@ -22607,6 +22716,7 @@ + @@ -22658,6 +22768,7 @@ + @@ -22689,6 +22800,7 @@ + @@ -22703,6 +22815,7 @@ + @@ -22739,6 +22852,7 @@ + @@ -22793,6 +22907,7 @@ + @@ -22861,6 +22976,7 @@ + @@ -23017,6 +23133,7 @@ + @@ -23069,6 +23186,7 @@ + @@ -23121,6 +23239,7 @@ + @@ -23173,6 +23292,7 @@ + @@ -23261,6 +23381,7 @@ + @@ -23517,6 +23638,7 @@ + @@ -23581,6 +23703,7 @@ + @@ -23645,6 +23768,7 @@ + @@ -23703,12 +23827,11 @@ + + - - ∥ - @@ -23769,10 +23892,8 @@ - - ∥ - + @@ -24245,6 +24366,7 @@ + @@ -24284,6 +24406,7 @@ + @@ -26318,6 +26441,7 @@ + @@ -26443,6 +26567,7 @@ + @@ -26637,6 +26762,7 @@ + @@ -27692,6 +27818,7 @@ + @@ -27734,9 +27861,8 @@ - - ↑ - + + @@ -27771,6 +27897,7 @@ + @@ -27813,9 +27940,8 @@ - - | - + + @@ -27850,6 +27976,7 @@ + @@ -27892,9 +28019,8 @@ - - | - + + @@ -27929,16 +28055,16 @@ + + - - ⇓ - + @@ -27981,9 +28107,8 @@ - - ↕ - + + @@ -28009,10 +28134,8 @@ - - ⇓ - + @@ -28023,6 +28146,7 @@ + @@ -28076,6 +28200,7 @@ + @@ -28129,6 +28254,7 @@ + @@ -28182,6 +28308,7 @@ + @@ -28235,6 +28362,7 @@ + @@ -28288,6 +28416,7 @@ + @@ -28341,12 +28470,11 @@ + + - - ↑ - @@ -28386,10 +28514,8 @@ - - ↑ - + @@ -28400,12 +28526,11 @@ + + - - ↓ - @@ -28445,10 +28570,8 @@ - - ↓ - + @@ -28459,12 +28582,11 @@ + + - - ↕ - @@ -28504,10 +28626,8 @@ - - ↕ - + @@ -28518,12 +28638,11 @@ + + - - ⇑ - @@ -28563,10 +28682,8 @@ - - ⇑ - + @@ -28577,12 +28694,11 @@ + + - - ⇓ - @@ -28622,10 +28738,8 @@ - - ⇓ - + @@ -28636,12 +28750,11 @@ + + - - ⇕ - @@ -28681,10 +28794,8 @@ - - ⇕ - + @@ -28739,6 +28850,7 @@ + @@ -28792,6 +28904,7 @@ + @@ -28845,6 +28958,7 @@ + @@ -28898,6 +29012,7 @@ + @@ -28951,6 +29066,7 @@ + @@ -29004,6 +29120,7 @@ + @@ -29057,12 +29174,11 @@ + + - - ∥ - @@ -29102,10 +29218,8 @@ - - ∥ - + @@ -29116,12 +29230,11 @@ + + - - ∥ - @@ -29161,10 +29274,8 @@ - - ∥ - + @@ -29175,12 +29286,11 @@ + + - - / - @@ -29220,10 +29330,8 @@ - - / - + @@ -29234,12 +29342,11 @@ + + - - \ - @@ -29279,10 +29386,8 @@ - - \ - + @@ -29293,6 +29398,7 @@ + @@ -29346,6 +29452,7 @@ + @@ -29399,6 +29506,7 @@ + @@ -29452,6 +29560,7 @@ + @@ -29909,6 +30018,7 @@ + @@ -29951,6 +30061,7 @@ + @@ -29993,6 +30104,7 @@ + @@ -30035,6 +30147,7 @@ + @@ -30077,6 +30190,7 @@ + @@ -30119,6 +30233,7 @@ + @@ -30161,6 +30276,7 @@ + @@ -30203,6 +30319,7 @@ + @@ -30245,6 +30362,7 @@ + diff --git a/tests/writers/deMorgans_law.omml b/tests/writers/deMorgans_law.omml --- a/tests/writers/deMorgans_law.omml +++ b/tests/writers/deMorgans_law.omml @@ -14,6 +14,7 @@ + @@ -41,6 +42,7 @@ + @@ -65,6 +67,7 @@ + diff --git a/tests/writers/differentiable_manifold.omml b/tests/writers/differentiable_manifold.omml --- a/tests/writers/differentiable_manifold.omml +++ b/tests/writers/differentiable_manifold.omml @@ -44,6 +44,7 @@ + @@ -78,6 +79,7 @@ + @@ -108,6 +110,7 @@ + @@ -148,6 +151,7 @@ + @@ -200,6 +204,7 @@ + @@ -238,6 +243,7 @@ + @@ -290,6 +296,7 @@ + diff --git a/tests/writers/doubleint1.omml b/tests/writers/doubleint1.omml --- a/tests/writers/doubleint1.omml +++ b/tests/writers/doubleint1.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/doubleint2.omml b/tests/writers/doubleint2.omml --- a/tests/writers/doubleint2.omml +++ b/tests/writers/doubleint2.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/embStretch1.omml b/tests/writers/embStretch1.omml --- a/tests/writers/embStretch1.omml +++ b/tests/writers/embStretch1.omml @@ -10,6 +10,7 @@ + diff --git a/tests/writers/genfrac.omml b/tests/writers/genfrac.omml --- a/tests/writers/genfrac.omml +++ b/tests/writers/genfrac.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/int1.omml b/tests/writers/int1.omml --- a/tests/writers/int1.omml +++ b/tests/writers/int1.omml @@ -17,6 +17,7 @@ + diff --git a/tests/writers/int10.omml b/tests/writers/int10.omml --- a/tests/writers/int10.omml +++ b/tests/writers/int10.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/int2.omml b/tests/writers/int2.omml --- a/tests/writers/int2.omml +++ b/tests/writers/int2.omml @@ -17,6 +17,7 @@ + diff --git a/tests/writers/int3.omml b/tests/writers/int3.omml --- a/tests/writers/int3.omml +++ b/tests/writers/int3.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/int4.omml b/tests/writers/int4.omml --- a/tests/writers/int4.omml +++ b/tests/writers/int4.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/int5.omml b/tests/writers/int5.omml --- a/tests/writers/int5.omml +++ b/tests/writers/int5.omml @@ -17,6 +17,7 @@ + diff --git a/tests/writers/int6.omml b/tests/writers/int6.omml --- a/tests/writers/int6.omml +++ b/tests/writers/int6.omml @@ -17,6 +17,7 @@ + diff --git a/tests/writers/int7.omml b/tests/writers/int7.omml --- a/tests/writers/int7.omml +++ b/tests/writers/int7.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/int8.omml b/tests/writers/int8.omml --- a/tests/writers/int8.omml +++ b/tests/writers/int8.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/int9.omml b/tests/writers/int9.omml --- a/tests/writers/int9.omml +++ b/tests/writers/int9.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/intDispStyle.omml b/tests/writers/intDispStyle.omml --- a/tests/writers/intDispStyle.omml +++ b/tests/writers/intDispStyle.omml @@ -65,6 +65,7 @@ + @@ -95,6 +96,7 @@ + @@ -109,6 +111,7 @@ + @@ -139,6 +142,7 @@ + @@ -251,6 +255,7 @@ + @@ -281,6 +286,7 @@ + @@ -311,6 +317,7 @@ + @@ -325,6 +332,7 @@ + @@ -355,6 +363,7 @@ + @@ -385,6 +394,7 @@ + diff --git a/tests/writers/intNested3.omml b/tests/writers/intNested3.omml --- a/tests/writers/intNested3.omml +++ b/tests/writers/intNested3.omml @@ -56,6 +56,7 @@ + @@ -80,6 +81,7 @@ + @@ -104,6 +106,7 @@ + @@ -128,6 +131,7 @@ + @@ -152,6 +156,7 @@ + @@ -189,6 +194,7 @@ + @@ -196,6 +202,7 @@ + @@ -210,6 +217,7 @@ + @@ -217,6 +225,7 @@ + @@ -231,6 +240,7 @@ + @@ -238,6 +248,7 @@ + @@ -264,6 +275,7 @@ + @@ -271,6 +283,7 @@ + @@ -297,6 +310,7 @@ + @@ -304,6 +318,7 @@ + @@ -330,6 +345,7 @@ + @@ -337,6 +353,7 @@ + @@ -363,6 +380,7 @@ + @@ -370,6 +388,7 @@ + @@ -409,6 +428,7 @@ + @@ -416,6 +436,7 @@ + @@ -430,6 +451,7 @@ + @@ -437,6 +459,7 @@ + @@ -451,6 +474,7 @@ + @@ -458,6 +482,7 @@ + @@ -484,6 +509,7 @@ + @@ -491,6 +517,7 @@ + @@ -517,6 +544,7 @@ + @@ -524,6 +552,7 @@ + @@ -550,6 +579,7 @@ + @@ -557,6 +587,7 @@ + @@ -583,6 +614,7 @@ + @@ -590,6 +622,7 @@ + diff --git a/tests/writers/intSize1.omml b/tests/writers/intSize1.omml --- a/tests/writers/intSize1.omml +++ b/tests/writers/intSize1.omml @@ -26,6 +26,7 @@ + @@ -50,6 +51,7 @@ + @@ -74,6 +76,7 @@ + @@ -98,6 +101,7 @@ + @@ -122,6 +126,7 @@ + diff --git a/tests/writers/intSize2.omml b/tests/writers/intSize2.omml --- a/tests/writers/intSize2.omml +++ b/tests/writers/intSize2.omml @@ -109,6 +109,7 @@ + @@ -123,6 +124,7 @@ + @@ -170,6 +172,7 @@ + @@ -184,6 +187,7 @@ + @@ -255,6 +259,7 @@ + @@ -281,6 +286,7 @@ + @@ -364,6 +370,7 @@ + @@ -390,6 +397,7 @@ + diff --git a/tests/writers/maction-02.omml b/tests/writers/maction-02.omml --- a/tests/writers/maction-02.omml +++ b/tests/writers/maction-02.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/maction-03.omml b/tests/writers/maction-03.omml --- a/tests/writers/maction-03.omml +++ b/tests/writers/maction-03.omml @@ -10,6 +10,7 @@ + diff --git a/tests/writers/maction-08.omml b/tests/writers/maction-08.omml --- a/tests/writers/maction-08.omml +++ b/tests/writers/maction-08.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced-01.omml b/tests/writers/mfenced-01.omml --- a/tests/writers/mfenced-01.omml +++ b/tests/writers/mfenced-01.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced-02.omml b/tests/writers/mfenced-02.omml --- a/tests/writers/mfenced-02.omml +++ b/tests/writers/mfenced-02.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced-03.omml b/tests/writers/mfenced-03.omml --- a/tests/writers/mfenced-03.omml +++ b/tests/writers/mfenced-03.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced-04.omml b/tests/writers/mfenced-04.omml --- a/tests/writers/mfenced-04.omml +++ b/tests/writers/mfenced-04.omml @@ -8,6 +8,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/tests/writers/mfenced-05.omml b/tests/writers/mfenced-05.omml --- a/tests/writers/mfenced-05.omml +++ b/tests/writers/mfenced-05.omml @@ -8,6 +8,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/tests/writers/mfenced-06.omml b/tests/writers/mfenced-06.omml --- a/tests/writers/mfenced-06.omml +++ b/tests/writers/mfenced-06.omml @@ -8,6 +8,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/tests/writers/mfenced-07.omml b/tests/writers/mfenced-07.omml --- a/tests/writers/mfenced-07.omml +++ b/tests/writers/mfenced-07.omml @@ -8,6 +8,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/tests/writers/mfenced-08.omml b/tests/writers/mfenced-08.omml --- a/tests/writers/mfenced-08.omml +++ b/tests/writers/mfenced-08.omml @@ -8,6 +8,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/tests/writers/mfenced1.omml b/tests/writers/mfenced1.omml --- a/tests/writers/mfenced1.omml +++ b/tests/writers/mfenced1.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced2.omml b/tests/writers/mfenced2.omml --- a/tests/writers/mfenced2.omml +++ b/tests/writers/mfenced2.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced3.omml b/tests/writers/mfenced3.omml --- a/tests/writers/mfenced3.omml +++ b/tests/writers/mfenced3.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced4.omml b/tests/writers/mfenced4.omml --- a/tests/writers/mfenced4.omml +++ b/tests/writers/mfenced4.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfenced5.omml b/tests/writers/mfenced5.omml --- a/tests/writers/mfenced5.omml +++ b/tests/writers/mfenced5.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfencedAdelims6.omml b/tests/writers/mfencedAdelims6.omml --- a/tests/writers/mfencedAdelims6.omml +++ b/tests/writers/mfencedAdelims6.omml @@ -8,6 +8,7 @@ + @@ -29,6 +30,7 @@ + @@ -47,9 +49,8 @@ - - | - + + diff --git a/tests/writers/mfencedBfences7.omml b/tests/writers/mfencedBfences7.omml --- a/tests/writers/mfencedBfences7.omml +++ b/tests/writers/mfencedBfences7.omml @@ -8,6 +8,7 @@ + @@ -35,6 +36,7 @@ + diff --git a/tests/writers/mfencedBseparators8.omml b/tests/writers/mfencedBseparators8.omml --- a/tests/writers/mfencedBseparators8.omml +++ b/tests/writers/mfencedBseparators8.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mfencedSfonts9.omml b/tests/writers/mfencedSfonts9.omml --- a/tests/writers/mfencedSfonts9.omml +++ b/tests/writers/mfencedSfonts9.omml @@ -8,6 +8,7 @@ + @@ -35,6 +36,7 @@ + @@ -65,6 +67,7 @@ + diff --git a/tests/writers/mfracBheight17.omml b/tests/writers/mfracBheight17.omml --- a/tests/writers/mfracBheight17.omml +++ b/tests/writers/mfracBheight17.omml @@ -88,6 +88,7 @@ + @@ -182,6 +183,7 @@ + diff --git a/tests/writers/mfracZcomp-10.omml b/tests/writers/mfracZcomp-10.omml --- a/tests/writers/mfracZcomp-10.omml +++ b/tests/writers/mfracZcomp-10.omml @@ -15,6 +15,7 @@ + diff --git a/tests/writers/mfracZcomp-11.omml b/tests/writers/mfracZcomp-11.omml --- a/tests/writers/mfracZcomp-11.omml +++ b/tests/writers/mfracZcomp-11.omml @@ -15,6 +15,7 @@ + diff --git a/tests/writers/mfracZcomp-12.omml b/tests/writers/mfracZcomp-12.omml --- a/tests/writers/mfracZcomp-12.omml +++ b/tests/writers/mfracZcomp-12.omml @@ -15,6 +15,7 @@ + diff --git a/tests/writers/mfracZcomp-13.omml b/tests/writers/mfracZcomp-13.omml --- a/tests/writers/mfracZcomp-13.omml +++ b/tests/writers/mfracZcomp-13.omml @@ -15,6 +15,7 @@ + diff --git a/tests/writers/mfracZcomp-14.omml b/tests/writers/mfracZcomp-14.omml --- a/tests/writers/mfracZcomp-14.omml +++ b/tests/writers/mfracZcomp-14.omml @@ -15,12 +15,11 @@ + + - - ↑ - @@ -49,10 +48,8 @@ - - ↑ - + diff --git a/tests/writers/mfracZcomp-15.omml b/tests/writers/mfracZcomp-15.omml --- a/tests/writers/mfracZcomp-15.omml +++ b/tests/writers/mfracZcomp-15.omml @@ -15,12 +15,11 @@ + + - - ↓ - @@ -49,10 +48,8 @@ - - ↓ - + diff --git a/tests/writers/mfracZcomp-16.omml b/tests/writers/mfracZcomp-16.omml --- a/tests/writers/mfracZcomp-16.omml +++ b/tests/writers/mfracZcomp-16.omml @@ -15,6 +15,7 @@ + diff --git a/tests/writers/mfracZcomp-17.omml b/tests/writers/mfracZcomp-17.omml --- a/tests/writers/mfracZcomp-17.omml +++ b/tests/writers/mfracZcomp-17.omml @@ -15,6 +15,7 @@ + diff --git a/tests/writers/mfracZcomp-18.omml b/tests/writers/mfracZcomp-18.omml --- a/tests/writers/mfracZcomp-18.omml +++ b/tests/writers/mfracZcomp-18.omml @@ -15,12 +15,11 @@ + + - - ↕ - @@ -49,10 +48,8 @@ - - ↕ - + diff --git a/tests/writers/mfracZcomp-19.omml b/tests/writers/mfracZcomp-19.omml --- a/tests/writers/mfracZcomp-19.omml +++ b/tests/writers/mfracZcomp-19.omml @@ -15,12 +15,11 @@ + + - - ⇑ - @@ -49,10 +48,8 @@ - - ⇑ - + diff --git a/tests/writers/mfracZcomp-20.omml b/tests/writers/mfracZcomp-20.omml --- a/tests/writers/mfracZcomp-20.omml +++ b/tests/writers/mfracZcomp-20.omml @@ -15,12 +15,11 @@ + + - - ⇓ - @@ -49,10 +48,8 @@ - - ⇓ - + diff --git a/tests/writers/mfracZcomp-21.omml b/tests/writers/mfracZcomp-21.omml --- a/tests/writers/mfracZcomp-21.omml +++ b/tests/writers/mfracZcomp-21.omml @@ -15,12 +15,11 @@ + + - - ⇕ - @@ -49,10 +48,8 @@ - - ⇕ - + diff --git a/tests/writers/mfracZcomp-24.omml b/tests/writers/mfracZcomp-24.omml --- a/tests/writers/mfracZcomp-24.omml +++ b/tests/writers/mfracZcomp-24.omml @@ -15,6 +15,7 @@ + @@ -27,12 +28,11 @@ + + - - ∥ - @@ -70,10 +70,8 @@ - - ∥ - + diff --git a/tests/writers/mfracZcomp-25.omml b/tests/writers/mfracZcomp-25.omml --- a/tests/writers/mfracZcomp-25.omml +++ b/tests/writers/mfracZcomp-25.omml @@ -15,6 +15,7 @@ + @@ -27,12 +28,11 @@ + + - - ∥ - @@ -70,10 +70,8 @@ - - ∥ - + diff --git a/tests/writers/mfracZcomp-30.omml b/tests/writers/mfracZcomp-30.omml --- a/tests/writers/mfracZcomp-30.omml +++ b/tests/writers/mfracZcomp-30.omml @@ -17,6 +17,7 @@ + @@ -94,6 +95,7 @@ + @@ -124,6 +126,7 @@ + @@ -168,6 +171,7 @@ + diff --git a/tests/writers/mfracZcomp-31.omml b/tests/writers/mfracZcomp-31.omml --- a/tests/writers/mfracZcomp-31.omml +++ b/tests/writers/mfracZcomp-31.omml @@ -24,6 +24,7 @@ + @@ -56,6 +57,7 @@ + @@ -103,16 +105,16 @@ + + - - ∥ - + @@ -154,10 +156,8 @@ - - ∥ - + diff --git a/tests/writers/mfracZcomp-32.omml b/tests/writers/mfracZcomp-32.omml --- a/tests/writers/mfracZcomp-32.omml +++ b/tests/writers/mfracZcomp-32.omml @@ -68,6 +68,7 @@ + @@ -86,6 +87,7 @@ + diff --git a/tests/writers/mfracZcomp-33.omml b/tests/writers/mfracZcomp-33.omml --- a/tests/writers/mfracZcomp-33.omml +++ b/tests/writers/mfracZcomp-33.omml @@ -27,6 +27,7 @@ + @@ -74,6 +75,7 @@ + @@ -149,6 +151,7 @@ + diff --git a/tests/writers/mi4.omml b/tests/writers/mi4.omml --- a/tests/writers/mi4.omml +++ b/tests/writers/mi4.omml @@ -17,6 +17,7 @@ + diff --git a/tests/writers/mo2.omml b/tests/writers/mo2.omml --- a/tests/writers/mo2.omml +++ b/tests/writers/mo2.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mo3.omml b/tests/writers/mo3.omml --- a/tests/writers/mo3.omml +++ b/tests/writers/mo3.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mo4.omml b/tests/writers/mo4.omml --- a/tests/writers/mo4.omml +++ b/tests/writers/mo4.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mo5.omml b/tests/writers/mo5.omml --- a/tests/writers/mo5.omml +++ b/tests/writers/mo5.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mo6.omml b/tests/writers/mo6.omml --- a/tests/writers/mo6.omml +++ b/tests/writers/mo6.omml @@ -43,6 +43,7 @@ + diff --git a/tests/writers/mo7.omml b/tests/writers/mo7.omml --- a/tests/writers/mo7.omml +++ b/tests/writers/mo7.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mo8.omml b/tests/writers/mo8.omml --- a/tests/writers/mo8.omml +++ b/tests/writers/mo8.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/moAminmax14.omml b/tests/writers/moAminmax14.omml --- a/tests/writers/moAminmax14.omml +++ b/tests/writers/moAminmax14.omml @@ -8,6 +8,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/tests/writers/moAprime16.omml b/tests/writers/moAprime16.omml --- a/tests/writers/moAprime16.omml +++ b/tests/writers/moAprime16.omml @@ -23,6 +23,7 @@ + @@ -56,6 +57,7 @@ + diff --git a/tests/writers/moAsep17.omml b/tests/writers/moAsep17.omml --- a/tests/writers/moAsep17.omml +++ b/tests/writers/moAsep17.omml @@ -8,6 +8,7 @@ + @@ -47,6 +48,7 @@ + @@ -86,6 +88,7 @@ + diff --git a/tests/writers/moAstretchy18.omml b/tests/writers/moAstretchy18.omml --- a/tests/writers/moAstretchy18.omml +++ b/tests/writers/moAstretchy18.omml @@ -8,6 +8,7 @@ + @@ -127,6 +128,7 @@ + diff --git a/tests/writers/moAsymmetric19.omml b/tests/writers/moAsymmetric19.omml --- a/tests/writers/moAsymmetric19.omml +++ b/tests/writers/moAsymmetric19.omml @@ -17,6 +17,7 @@ + @@ -54,6 +55,7 @@ + @@ -91,6 +93,7 @@ + diff --git a/tests/writers/moSminmax20.omml b/tests/writers/moSminmax20.omml --- a/tests/writers/moSminmax20.omml +++ b/tests/writers/moSminmax20.omml @@ -8,6 +8,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/tests/writers/moore_determinant.omml b/tests/writers/moore_determinant.omml --- a/tests/writers/moore_determinant.omml +++ b/tests/writers/moore_determinant.omml @@ -17,6 +17,7 @@ + diff --git a/tests/writers/mrowAbg4.omml b/tests/writers/mrowAbg4.omml --- a/tests/writers/mrowAbg4.omml +++ b/tests/writers/mrowAbg4.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/mstyle1.omml b/tests/writers/mstyle1.omml --- a/tests/writers/mstyle1.omml +++ b/tests/writers/mstyle1.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/msup2.omml b/tests/writers/msup2.omml --- a/tests/writers/msup2.omml +++ b/tests/writers/msup2.omml @@ -10,6 +10,7 @@ + diff --git a/tests/writers/oint1.omml b/tests/writers/oint1.omml --- a/tests/writers/oint1.omml +++ b/tests/writers/oint1.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/oint2.omml b/tests/writers/oint2.omml --- a/tests/writers/oint2.omml +++ b/tests/writers/oint2.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/operatorname.omml b/tests/writers/operatorname.omml --- a/tests/writers/operatorname.omml +++ b/tests/writers/operatorname.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/phantom.omml b/tests/writers/phantom.omml --- a/tests/writers/phantom.omml +++ b/tests/writers/phantom.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/quadratic_formula.tex b/tests/writers/quadratic_formula.tex --- a/tests/writers/quadratic_formula.tex +++ b/tests/writers/quadratic_formula.tex @@ -1,1 +1,1 @@ -x = \frac{- b \pm \sqrt{b^{2} - 4ac}}{2a} +x = \frac{-b \pm \sqrt{b^{2} - 4ac}}{2a} diff --git a/tests/writers/rec-mtable1.omml b/tests/writers/rec-mtable1.omml --- a/tests/writers/rec-mtable1.omml +++ b/tests/writers/rec-mtable1.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/schwinger_dyson.omml b/tests/writers/schwinger_dyson.omml --- a/tests/writers/schwinger_dyson.omml +++ b/tests/writers/schwinger_dyson.omml @@ -8,6 +8,7 @@ + @@ -18,6 +19,7 @@ + @@ -32,6 +34,7 @@ + @@ -60,6 +63,7 @@ + @@ -99,6 +103,7 @@ + @@ -109,6 +114,7 @@ + @@ -123,6 +129,7 @@ + @@ -133,6 +140,7 @@ + @@ -166,6 +174,7 @@ + diff --git a/tests/writers/simplePres.omml b/tests/writers/simplePres.omml --- a/tests/writers/simplePres.omml +++ b/tests/writers/simplePres.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/sophomores_dream.omml b/tests/writers/sophomores_dream.omml --- a/tests/writers/sophomores_dream.omml +++ b/tests/writers/sophomores_dream.omml @@ -90,6 +90,7 @@ + diff --git a/tests/writers/sophomores_dream.tex b/tests/writers/sophomores_dream.tex --- a/tests/writers/sophomores_dream.tex +++ b/tests/writers/sophomores_dream.tex @@ -1,1 +1,1 @@ -\int_{0}^{1}x^{x}\,\mathrm{d}x = \sum_{n = 1}^{\infty}{( - 1)^{n + 1}\, n^{- n}} +\int_{0}^{1}x^{x}\,\mathrm{d}x = \sum_{n = 1}^{\infty}{(-1)^{n + 1}\, n^{-n}} diff --git a/tests/writers/sphere_volume.omml b/tests/writers/sphere_volume.omml --- a/tests/writers/sphere_volume.omml +++ b/tests/writers/sphere_volume.omml @@ -440,6 +440,7 @@ + diff --git a/tests/writers/sphere_volume.tex b/tests/writers/sphere_volume.tex --- a/tests/writers/sphere_volume.tex +++ b/tests/writers/sphere_volume.tex @@ -1,7 +1,7 @@ S = \{ 0 \leq \phi \leq 2\pi,\ 0 \leq \theta \leq \pi,\ 0 \leq \rho \leq R\}\begin{aligned} \mathrm{Volume} & = \iiint\limits_{S}\!\rho^{2}\sin\theta\,\mathrm{d}\rho\,\mathrm{d}\theta\,\mathrm{d}\phi \\ & = \int_{0}^{2\pi}\!\mathrm{d}\phi\,\int_{0}^{\pi}\!\sin\theta\,\mathrm{d}\theta\,\int_{0}^{R}\!\rho^{2}\mathrm{d}\rho \\ - & = \phi\Big|_{0}^{2\pi}\ \left( - \cos\theta \right)\Big|_{0}^{\pi}\ \tfrac{1}{3}\rho^{3}\Big|_{0}^{R} \\ + & = \phi\Big|_{0}^{2\pi}\ \left( -\cos\theta \right)\Big|_{0}^{\pi}\ \tfrac{1}{3}\rho^{3}\Big|_{0}^{R} \\ & = 2\pi \times 2 \times \tfrac{1}{3}R^{3} \\ & = \tfrac{4}{3}\pi R^{3} \\ \end{aligned} diff --git a/tests/writers/stretchHoriz2.omml b/tests/writers/stretchHoriz2.omml --- a/tests/writers/stretchHoriz2.omml +++ b/tests/writers/stretchHoriz2.omml @@ -8,6 +8,7 @@ + @@ -23,21 +24,18 @@ A - - ← - + + x - - → - + + H - - ↔ - + + H diff --git a/tests/writers/stretchVert1.omml b/tests/writers/stretchVert1.omml --- a/tests/writers/stretchVert1.omml +++ b/tests/writers/stretchVert1.omml @@ -32,6 +32,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/tests/writers/stretchVert2.omml b/tests/writers/stretchVert2.omml --- a/tests/writers/stretchVert2.omml +++ b/tests/writers/stretchVert2.omml @@ -8,15 +8,15 @@ + H - - | - + + @@ -27,6 +27,7 @@ + diff --git a/tests/writers/stretchVertNest2.omml b/tests/writers/stretchVertNest2.omml --- a/tests/writers/stretchVertNest2.omml +++ b/tests/writers/stretchVertNest2.omml @@ -8,6 +8,7 @@ + @@ -15,6 +16,7 @@ + diff --git a/tests/writers/substack.omml b/tests/writers/substack.omml --- a/tests/writers/substack.omml +++ b/tests/writers/substack.omml @@ -92,6 +92,7 @@ + diff --git a/tests/writers/tokens.omml b/tests/writers/tokens.omml --- a/tests/writers/tokens.omml +++ b/tests/writers/tokens.omml @@ -74,6 +74,7 @@ + @@ -86,6 +87,7 @@ + diff --git a/tests/writers/tripleint1.omml b/tests/writers/tripleint1.omml --- a/tests/writers/tripleint1.omml +++ b/tests/writers/tripleint1.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/tripleint2.omml b/tests/writers/tripleint2.omml --- a/tests/writers/tripleint2.omml +++ b/tests/writers/tripleint2.omml @@ -31,6 +31,7 @@ + diff --git a/tests/writers/verbar1.omml b/tests/writers/verbar1.omml --- a/tests/writers/verbar1.omml +++ b/tests/writers/verbar1.omml @@ -8,6 +8,7 @@ + diff --git a/tests/writers/verbar2.omml b/tests/writers/verbar2.omml --- a/tests/writers/verbar2.omml +++ b/tests/writers/verbar2.omml @@ -8,6 +8,7 @@ + diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.12.2 +Version: 0.12.3 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics. @@ -87,7 +87,7 @@ Library Build-depends: base >= 4.8 && < 5, syb >= 0.4.2 && < 0.8, xml, parsec >= 3, containers, - pandoc-types >= 1.20 && < 1.23, mtl, text + pandoc-types >= 1.20 && < 1.23, mtl, text, split Exposed-modules: Text.TeXMath, Text.TeXMath.Types,