diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,23 @@
+texmath (0.12.2)
+
+ * MathML input: support mmultiscripts element (#158, #100).
+
+ * Make MathML tag/attr recognition case-insensitive (#158).
+
+ * Pandoc writer: better handling of styling such as `\mathrm` (#145).
+ Previously identifiers were always italic, no matter what
+ styling was applied.
+
+ * Ignore `\tag` in TeX input (#162).
+
+ * TeX writer: avoid unneeded `\left` and `\right` for delimited.
+ We don't need `\left` and `\right` when the contents are
+ "standard height."
+
+ * TeX reader: parse implicit EDelimited sections (#172).
+ We now parse `(x)` as EDelimited, even though `\right` and `\left`
+ are not used.
+
texmath (0.12.1.1)
* Fix compilation with GHC-9.0.1 (#169, Simon Jakobi).
diff --git a/src/Text/TeXMath/Readers/MathML.hs b/src/Text/TeXMath/Readers/MathML.hs
--- a/src/Text/TeXMath/Readers/MathML.hs
+++ b/src/Text/TeXMath/Readers/MathML.hs
@@ -23,9 +23,7 @@
Unimplemented features:
- - menclose
- mpadded
- - mmultiscripts (etc)
- malignmark
- maligngroup
- Elementary Math
@@ -49,6 +47,7 @@
import Text.TeXMath.Compat (throwError, Except, runExcept, MonadError)
import Control.Applicative ((<$>), (<|>), (<*>))
import Control.Arrow ((&&&))
+import Data.Char (toLower)
import Data.Maybe (fromMaybe, listToMaybe, isJust)
import Data.Monoid (mconcat, First(..), getFirst)
import Data.Semigroup ((<>))
@@ -125,6 +124,7 @@
"semantics" -> mkE <$> semantics e
"maligngroup" -> return $ mkE empty
"malignmark" -> return $ mkE empty
+ "mmultiscripts" -> mkE <$> multiscripts e
_ -> throwError $ "Unexpected element " <> err e
where
mkE :: Exp -> [IR Exp]
@@ -469,6 +469,27 @@
First . Just <$> row e
_ -> return (First Nothing)
+multiscripts :: Element -> MML Exp
+multiscripts e = do
+ let (xs, pres) = break ((== "mprescripts") . name) (elChildren e)
+ let row' e' = if name e' == "none"
+ then return $ EGrouped []
+ else row e'
+ xs' <- mapM row' xs
+ let base =
+ case xs' of
+ [x] -> x
+ [x,y] -> ESub x y
+ (x:y:z:_) -> ESubsup x y z
+ [] -> EGrouped []
+ pres' <- mapM row' $ drop 1 pres
+ return $
+ case pres' of
+ (x:y:_) -> EGrouped [ESubsup (EGrouped []) x y, base]
+ [x] -> EGrouped [ESub x (EGrouped []), base]
+ [] -> base
+
+
-- Table
table :: Element -> MML Exp
@@ -584,10 +605,10 @@
-- Kept as String for Text.XML.Light
lookupAttrQ :: String -> [Attr] -> Maybe String
-lookupAttrQ s = lookupAttr (QName s Nothing Nothing)
+lookupAttrQ s = lookupAttr (QName (map toLower s) Nothing Nothing)
name :: Element -> T.Text
-name (elName -> (QName n _ _)) = T.pack n
+name (elName -> (QName n _ _)) = T.toLower $ T.pack n
-- Kept as String for Text.XML.Light
tunode :: String -> T.Text -> 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
@@ -107,6 +107,7 @@
ignorable = skipMany $
comment
<|> label
+ <|> tag
<|> () <$ ctrlseq "nonumber"
<|> (skipMany1 space "whitespace")
@@ -116,6 +117,9 @@
label :: TP ()
label = ctrlseq "label" *> braces (skipMany (noneOf "}"))
+tag :: TP ()
+tag = ctrlseq "tag" *> braces (skipMany (noneOf "}"))
+
unGrouped :: Exp -> [Exp]
unGrouped (EGrouped xs) = xs
unGrouped x = [x]
@@ -307,7 +311,7 @@
zs -> return $ T.pack zs
enclosure :: TP Exp
-enclosure = basicEnclosure <|> delimited
+enclosure = delimited <|> delimitedImplicit <|> basicEnclosure
basicEnclosure :: TP Exp
basicEnclosure = try $ do
@@ -340,6 +344,22 @@
many1Exp (notFollowedBy right *> expr)))
closec <- right <|> return ""
return $ EDelimited openc closec contents
+
+delimitedImplicit :: TP Exp
+delimitedImplicit = try $ do
+ openc <- lexeme $ oneOf "()[]|"
+ closec <- case openc of
+ '(' -> return ')'
+ '[' -> return ']'
+ '|' -> return '|'
+ _ -> mzero
+ let closer = lexeme $ char closec
+ contents <- concat <$>
+ many (try $ ((:[]) . Left <$> middle)
+ <|> (map Right . unGrouped <$>
+ many1Exp (notFollowedBy closer *> expr)))
+ _ <- closer
+ return $ EDelimited (T.singleton openc) (T.singleton closec) contents
scaled :: Text -> TP Exp
scaled cmd = do
diff --git a/src/Text/TeXMath/Writers/Pandoc.hs b/src/Text/TeXMath/Writers/Pandoc.hs
--- a/src/Text/TeXMath/Writers/Pandoc.hs
+++ b/src/Text/TeXMath/Writers/Pandoc.hs
@@ -34,9 +34,9 @@
writePandoc :: DisplayType
-> [Exp]
-> Maybe [Inline]
-writePandoc _ exps = expsToInlines TextNormal exps
+writePandoc _ exps = expsToInlines Nothing exps
-expsToInlines :: TextType -> [Exp] -> Maybe [Inline]
+expsToInlines :: Maybe TextType -> [Exp] -> Maybe [Inline]
expsToInlines tt xs = do
res <- mapM (expToInlines tt) (addSpaces xs)
return (concat res)
@@ -72,9 +72,10 @@
medspace = EText TextNormal "\x2005"
widespace = EText TextNormal "\x2004"
-renderStr :: TextType -> T.Text -> [Inline]
+renderStr :: Maybe TextType -> T.Text -> [Inline]
renderStr _ "" = []
-renderStr tt s =
+renderStr Nothing s = [Str s]
+renderStr (Just tt) s =
case tt of
TextNormal -> [Str s]
TextBold -> [Strong [Str s]]
@@ -91,9 +92,9 @@
TextSansSerifItalic -> [Emph [Str s]]
TextSansSerifBoldItalic -> [Strong [Emph [Str s]]]
-expToInlines :: TextType -> Exp -> Maybe [Inline]
+expToInlines :: Maybe TextType -> Exp -> Maybe [Inline]
expToInlines tt (ENumber s) = Just $ renderStr tt s
-expToInlines TextNormal (EIdentifier s) = Just $ renderStr TextItalic s
+expToInlines Nothing (EIdentifier s) = Just $ renderStr (Just TextItalic) s
expToInlines tt (EIdentifier s) = Just $ renderStr tt s
expToInlines tt (EMathOperator s) = Just $ renderStr tt s
expToInlines tt (ESymbol _ s) = Just $ renderStr tt s
@@ -101,7 +102,7 @@
xs' <- mapM (either (return . renderStr tt) (expToInlines tt)) xs
return $ renderStr tt start ++ concat xs' ++ renderStr tt end
expToInlines tt (EGrouped xs) = expsToInlines tt xs
-expToInlines _ (EStyled tt' xs) = expsToInlines tt' xs
+expToInlines _ (EStyled tt' xs) = expsToInlines (Just tt') xs
expToInlines _ (ESpace n) = Just [Str $ getSpaceChars n]
expToInlines _ (ESqrt _) = Nothing
expToInlines _ (ERoot _ _) = Nothing
@@ -119,7 +120,7 @@
y' <- expToInlines tt y
z' <- expToInlines tt z
return $ x' ++ [Subscript y'] ++ [Superscript z']
-expToInlines _ (EText tt' x) = Just $ renderStr tt' x
+expToInlines _ (EText tt' x) = Just $ renderStr (Just tt') x
expToInlines tt (EOver b (EGrouped [EIdentifier (T.unpack -> [c])]) (ESymbol Accent (T.unpack -> [accent]))) = expToInlines tt (EOver b (EIdentifier $ T.singleton c) (ESymbol Accent $ T.singleton accent))
expToInlines tt (EOver _ (EIdentifier (T.unpack -> [c])) (ESymbol Accent (T.unpack -> [accent]))) =
case accent of
@@ -144,7 +145,7 @@
'~' -> Just $ renderStr tt' $ T.pack [c,'\x0303'] -- tilde
'\x0303' -> Just $ renderStr tt' $ T.pack [c,'\x0303'] -- tilde combining
_ -> Nothing
- where tt' = if tt == TextNormal then TextItalic else tt
+ where tt' = maybe (Just TextItalic) Just tt
expToInlines tt (EScaled _ e) = expToInlines tt e
expToInlines tt (EUnder convertible b e)
| convertible = expToInlines tt (ESub b e)
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
@@ -33,6 +33,7 @@
import Control.Monad.Writer( MonadWriter, WriterT,
execWriterT, tell, censor)
import Text.TeXMath.TeX
+import Data.Either (isRight)
-- import Debug.Trace
-- tr' x = trace (show x) x
@@ -135,6 +136,22 @@
writeDelim DLeft open
writeExp (EArray aligns rows)
writeDelim DRight close
+-- this clause is meant to pair with delimitedImplicit in the tex reader:
+writeExp (EDelimited open close es)
+ | all isStandardHeight es
+ , open == "(" || open == "[" || open == "|"
+ , close == ")" || close == "]" || close == "|"
+ , all isRight es
+ = do
+ getTeXMathM open >>= tell
+ mapM_ (either (writeDelim DMiddle) writeExp) es
+ getTeXMathM close >>= tell
+ where
+ isStandardHeight (Right (EIdentifier{})) = True
+ isStandardHeight (Right (ENumber{})) = True
+ isStandardHeight (Right (ESpace{})) = True
+ isStandardHeight (Right (ESymbol ty _)) = ty `elem` [Ord, Op, Bin, Rel, Pun]
+ isStandardHeight _ = False
writeExp (EDelimited open close es) = do
writeDelim DLeft open
mapM_ (either (writeDelim DMiddle) writeExp) es
diff --git a/tests/readers/tex/05.native b/tests/readers/tex/05.native
--- a/tests/readers/tex/05.native
+++ b/tests/readers/tex/05.native
@@ -1,1 +1,1 @@
-[ESubsup (ESymbol Op "\8747") (EIdentifier "a") (EIdentifier "x"),ESpace ((-1) % 6),ESpace ((-1) % 6),ESpace ((-1) % 6),ESubsup (ESymbol Op "\8747") (EIdentifier "a") (EIdentifier "s"),EIdentifier "f",ESymbol Open "(",EIdentifier "y",ESymbol Close ")",ESpace (1 % 6),EIdentifier "d",EIdentifier "y",ESpace (1 % 6),EIdentifier "d",EIdentifier "s",ESymbol Rel "=",ESubsup (ESymbol Op "\8747") (EIdentifier "a") (EIdentifier "x"),EIdentifier "f",ESymbol Open "(",EIdentifier "y",ESymbol Close ")",ESymbol Open "(",EIdentifier "x",ESymbol Bin "\8722",EIdentifier "y",ESymbol Close ")",ESpace (1 % 6),EIdentifier "d",EIdentifier "y"]
+[ESubsup (ESymbol Op "\8747") (EIdentifier "a") (EIdentifier "x"),ESpace ((-1) % 6),ESpace ((-1) % 6),ESpace ((-1) % 6),ESubsup (ESymbol Op "\8747") (EIdentifier "a") (EIdentifier "s"),EIdentifier "f",EDelimited "(" ")" [Right (EIdentifier "y")],ESpace (1 % 6),EIdentifier "d",EIdentifier "y",ESpace (1 % 6),EIdentifier "d",EIdentifier "s",ESymbol Rel "=",ESubsup (ESymbol Op "\8747") (EIdentifier "a") (EIdentifier "x"),EIdentifier "f",EDelimited "(" ")" [Right (EIdentifier "y")],EDelimited "(" ")" [Right (EIdentifier "x"),Right (ESymbol Bin "\8722"),Right (EIdentifier "y")],ESpace (1 % 6),EIdentifier "d",EIdentifier "y"]
diff --git a/tests/readers/tex/07.native b/tests/readers/tex/07.native
--- a/tests/readers/tex/07.native
+++ b/tests/readers/tex/07.native
@@ -1,1 +1,1 @@
-[EIdentifier "u",ESymbol Ord "\8243",ESymbol Bin "+",EIdentifier "p",ESymbol Open "(",EIdentifier "x",ESymbol Close ")",EIdentifier "u",ESymbol Ord "\8242",ESymbol Bin "+",EIdentifier "q",ESymbol Open "(",EIdentifier "x",ESymbol Close ")",EIdentifier "u",ESymbol Rel "=",EIdentifier "f",ESymbol Open "(",EIdentifier "x",ESymbol Close ")",ESymbol Pun ",",ESpace (1 % 1),EIdentifier "x",ESymbol Rel ">",EIdentifier "a"]
+[EIdentifier "u",ESymbol Ord "\8243",ESymbol Bin "+",EIdentifier "p",EDelimited "(" ")" [Right (EIdentifier "x")],EIdentifier "u",ESymbol Ord "\8242",ESymbol Bin "+",EIdentifier "q",EDelimited "(" ")" [Right (EIdentifier "x")],EIdentifier "u",ESymbol Rel "=",EIdentifier "f",EDelimited "(" ")" [Right (EIdentifier "x")],ESymbol Pun ",",ESpace (1 % 1),EIdentifier "x",ESymbol Rel ">",EIdentifier "a"]
diff --git a/tests/readers/tex/08.native b/tests/readers/tex/08.native
--- a/tests/readers/tex/08.native
+++ b/tests/readers/tex/08.native
@@ -1,1 +1,1 @@
-[ESymbol Open "|",EOver False (EIdentifier "z") (ESymbol Accent "\8254"),ESymbol Open "|",ESymbol Rel "=",ESymbol Open "|",EIdentifier "z",ESymbol Open "|",ESymbol Pun ",",ESymbol Open "|",ESymbol Open "(",EOver False (EIdentifier "z") (ESymbol Accent "\8254"),ESuper (ESymbol Close ")") (EIdentifier "n"),ESymbol Open "|",ESymbol Rel "=",ESymbol Open "|",EIdentifier "z",ESuper (ESymbol Open "|") (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 ")"]
+[EDelimited "|" "|" [Right (EOver False (EIdentifier "z") (ESymbol Accent "\8254"))],ESymbol Rel "=",EDelimited "|" "|" [Right (EIdentifier "z")],ESymbol Pun ",",EDelimited "|" "|" [Right (ESuper (EDelimited "(" ")" [Right (EOver False (EIdentifier "z") (ESymbol Accent "\8254"))]) (EIdentifier "n"))],ESymbol Rel "=",ESuper (EDelimited "|" "|" [Right (EIdentifier "z")]) (EIdentifier "n"),ESymbol Pun ",",EMathOperator "arg",EDelimited "(" ")" [Right (ESuper (EIdentifier "z") (EIdentifier "n"))],ESymbol Rel "=",EIdentifier "n",EMathOperator "arg",EDelimited "(" ")" [Right (EIdentifier "z")]]
diff --git a/tests/readers/tex/09.native b/tests/readers/tex/09.native
--- a/tests/readers/tex/09.native
+++ b/tests/readers/tex/09.native
@@ -1,1 +1,1 @@
-[EUnder True (EMathOperator "lim") (EGrouped [EIdentifier "z",ESymbol Rel "\8594",ESub (EIdentifier "z") (ENumber "0")]),EIdentifier "f",ESymbol Open "(",EIdentifier "z",ESymbol Close ")",ESymbol Rel "=",EIdentifier "f",ESymbol Open "(",ESub (EIdentifier "z") (ENumber "0"),ESymbol Close ")"]
+[EUnder True (EMathOperator "lim") (EGrouped [EIdentifier "z",ESymbol Rel "\8594",ESub (EIdentifier "z") (ENumber "0")]),EIdentifier "f",EDelimited "(" ")" [Right (EIdentifier "z")],ESymbol Rel "=",EIdentifier "f",EDelimited "(" ")" [Right (ESub (EIdentifier "z") (ENumber "0"))]]
diff --git a/tests/readers/tex/10.native b/tests/readers/tex/10.native
--- a/tests/readers/tex/10.native
+++ b/tests/readers/tex/10.native
@@ -1,1 +1,1 @@
-[ESub (EIdentifier "\981") (EIdentifier "n"),ESymbol Open "(",EIdentifier "\954",ESymbol Close ")",ESymbol Rel "=",EFraction NormalFrac (ENumber "1") (EGrouped [ENumber "4",ESuper (EIdentifier "\960") (ENumber "2"),ESuper (EIdentifier "\954") (ENumber "2")]),ESubsup (ESymbol Op "\8747") (ENumber "0") (ESymbol Ord "\8734"),EFraction NormalFrac (EGrouped [EMathOperator "sin",ESymbol Open "(",EIdentifier "\954",EIdentifier "R",ESymbol Close ")"]) (EGrouped [EIdentifier "\954",EIdentifier "R"]),EFraction NormalFrac (ESymbol Ord "\8706") (EGrouped [ESymbol Ord "\8706",EIdentifier "R"]),EDelimited "[" "]" [Right (ESuper (EIdentifier "R") (ENumber "2")),Right (EFraction NormalFrac (EGrouped [ESymbol Ord "\8706",ESub (EIdentifier "D") (EIdentifier "n"),ESymbol Open "(",EIdentifier "R",ESymbol Close ")"]) (EGrouped [ESymbol Ord "\8706",EIdentifier "R"]))],ESpace (1 % 6),EIdentifier "d",EIdentifier "R"]
+[ESub (EIdentifier "\981") (EIdentifier "n"),EDelimited "(" ")" [Right (EIdentifier "\954")],ESymbol Rel "=",EFraction NormalFrac (ENumber "1") (EGrouped [ENumber "4",ESuper (EIdentifier "\960") (ENumber "2"),ESuper (EIdentifier "\954") (ENumber "2")]),ESubsup (ESymbol Op "\8747") (ENumber "0") (ESymbol Ord "\8734"),EFraction NormalFrac (EGrouped [EMathOperator "sin",EDelimited "(" ")" [Right (EIdentifier "\954"),Right (EIdentifier "R")]]) (EGrouped [EIdentifier "\954",EIdentifier "R"]),EFraction NormalFrac (ESymbol Ord "\8706") (EGrouped [ESymbol Ord "\8706",EIdentifier "R"]),EDelimited "[" "]" [Right (ESuper (EIdentifier "R") (ENumber "2")),Right (EFraction NormalFrac (EGrouped [ESymbol Ord "\8706",ESub (EIdentifier "D") (EIdentifier "n"),EDelimited "(" ")" [Right (EIdentifier "R")]]) (EGrouped [ESymbol Ord "\8706",EIdentifier "R"]))],ESpace (1 % 6),EIdentifier "d",EIdentifier "R"]
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"),ESymbol Open "(",EIdentifier "\954",ESymbol Close ")",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 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"))]
diff --git a/tests/readers/tex/12.native b/tests/readers/tex/12.native
--- a/tests/readers/tex/12.native
+++ b/tests/readers/tex/12.native
@@ -1,1 +1,1 @@
-[EIdentifier "f",ESymbol Open "(",EIdentifier "x",ESymbol Close ")",ESymbol Rel "=",EDelimited "{" "" [Right (EArray [AlignLeft,AlignLeft] [[[ENumber "1"],[ESymbol Bin "\8722",ENumber "1",ESymbol Rel "\8804",EIdentifier "x",ESymbol Rel "<",ENumber "0"]],[[EFraction NormalFrac (ENumber "1") (ENumber "2")],[EIdentifier "x",ESymbol Rel "=",ENumber "0"]],[[ENumber "1",ESymbol Bin "\8722",ESuper (EIdentifier "x") (ENumber "2")],[EText TextNormal "otherwise"]]])]]
+[EIdentifier "f",EDelimited "(" ")" [Right (EIdentifier "x")],ESymbol Rel "=",EDelimited "{" "" [Right (EArray [AlignLeft,AlignLeft] [[[ENumber "1"],[ESymbol Bin "\8722",ENumber "1",ESymbol Rel "\8804",EIdentifier "x",ESymbol Rel "<",ENumber "0"]],[[EFraction NormalFrac (ENumber "1") (ENumber "2")],[EIdentifier "x",ESymbol Rel "=",ENumber "0"]],[[ENumber "1",ESymbol Bin "\8722",ESuper (EIdentifier "x") (ENumber "2")],[EText TextNormal "otherwise"]]])]]
diff --git a/tests/readers/tex/13.native b/tests/readers/tex/13.native
--- a/tests/readers/tex/13.native
+++ b/tests/readers/tex/13.native
@@ -1,1 +1,1 @@
-[ESub (EGrouped []) (EIdentifier "p"),ESub (EIdentifier "F") (EIdentifier "q"),ESymbol Open "(",ESub (EIdentifier "a") (ENumber "1"),ESymbol Pun ",",ESymbol Ord "\8230",ESymbol Pun ",",ESub (EIdentifier "a") (EIdentifier "p"),ESymbol Pun ";",ESub (EIdentifier "c") (ENumber "1"),ESymbol Pun ",",ESymbol Ord "\8230",ESymbol Pun ",",ESub (EIdentifier "c") (EIdentifier "q"),ESymbol Pun ";",EIdentifier "z",ESymbol Close ")",ESymbol Rel "=",EUnderover True (ESymbol Op "\8721") (EGrouped [EIdentifier "n",ESymbol Rel "=",ENumber "0"]) (ESymbol Ord "\8734"),EFraction NormalFrac (EGrouped [ESymbol Open "(",ESub (EIdentifier "a") (ENumber "1"),ESub (ESymbol Close ")") (EIdentifier "n"),ESymbol Ord "\8943",ESymbol Open "(",ESub (EIdentifier "a") (EIdentifier "p"),ESub (ESymbol Close ")") (EIdentifier "n")]) (EGrouped [ESymbol Open "(",ESub (EIdentifier "c") (ENumber "1"),ESub (ESymbol Close ")") (EIdentifier "n"),ESymbol Ord "\8943",ESymbol Open "(",ESub (EIdentifier "c") (EIdentifier "q"),ESub (ESymbol Close ")") (EIdentifier "n")]),EFraction NormalFrac (ESuper (EIdentifier "z") (EIdentifier "n")) (EGrouped [EIdentifier "n",ESymbol Ord "!"])]
+[ESub (EGrouped []) (EIdentifier "p"),ESub (EIdentifier "F") (EIdentifier "q"),EDelimited "(" ")" [Right (ESub (EIdentifier "a") (ENumber "1")),Right (ESymbol Pun ","),Right (ESymbol Ord "\8230"),Right (ESymbol Pun ","),Right (ESub (EIdentifier "a") (EIdentifier "p")),Right (ESymbol Pun ";"),Right (ESub (EIdentifier "c") (ENumber "1")),Right (ESymbol Pun ","),Right (ESymbol Ord "\8230"),Right (ESymbol Pun ","),Right (ESub (EIdentifier "c") (EIdentifier "q")),Right (ESymbol Pun ";"),Right (EIdentifier "z")],ESymbol Rel "=",EUnderover True (ESymbol Op "\8721") (EGrouped [EIdentifier "n",ESymbol Rel "=",ENumber "0"]) (ESymbol Ord "\8734"),EFraction NormalFrac (EGrouped [ESub (EDelimited "(" ")" [Right (ESub (EIdentifier "a") (ENumber "1"))]) (EIdentifier "n"),ESymbol Ord "\8943",ESub (EDelimited "(" ")" [Right (ESub (EIdentifier "a") (EIdentifier "p"))]) (EIdentifier "n")]) (EGrouped [ESub (EDelimited "(" ")" [Right (ESub (EIdentifier "c") (ENumber "1"))]) (EIdentifier "n"),ESymbol Ord "\8943",ESub (EDelimited "(" ")" [Right (ESub (EIdentifier "c") (EIdentifier "q"))]) (EIdentifier "n")]),EFraction NormalFrac (ESuper (EIdentifier "z") (EIdentifier "n")) (EGrouped [EIdentifier "n",ESymbol Ord "!"])]
diff --git a/tests/readers/tex/axiom_of_power_set.native b/tests/readers/tex/axiom_of_power_set.native
--- a/tests/readers/tex/axiom_of_power_set.native
+++ b/tests/readers/tex/axiom_of_power_set.native
@@ -1,1 +1,1 @@
-[ESymbol Op "\8704",EIdentifier "A",ESpace (1 % 6),ESymbol Op "\8707",EIdentifier "P",ESpace (1 % 6),ESymbol Op "\8704",EIdentifier "B",ESpace (1 % 6),ESymbol Open "[",EIdentifier "B",ESymbol Rel "\8712",EIdentifier "P",ESymbol Rel "\8660",ESymbol Op "\8704",EIdentifier "C",ESpace (1 % 6),ESymbol Open "(",EIdentifier "C",ESymbol Rel "\8712",EIdentifier "B",ESymbol Rel "\8658",EIdentifier "C",ESymbol Rel "\8712",EIdentifier "A",ESymbol Close ")",ESymbol Close "]"]
+[ESymbol Op "\8704",EIdentifier "A",ESpace (1 % 6),ESymbol Op "\8707",EIdentifier "P",ESpace (1 % 6),ESymbol Op "\8704",EIdentifier "B",ESpace (1 % 6),EDelimited "[" "]" [Right (EIdentifier "B"),Right (ESymbol Rel "\8712"),Right (EIdentifier "P"),Right (ESymbol Rel "\8660"),Right (ESymbol Op "\8704"),Right (EIdentifier "C"),Right (ESpace (1 % 6)),Right (EDelimited "(" ")" [Right (EIdentifier "C"),Right (ESymbol Rel "\8712"),Right (EIdentifier "B"),Right (ESymbol Rel "\8658"),Right (EIdentifier "C"),Right (ESymbol Rel "\8712"),Right (EIdentifier "A")])]]
diff --git a/tests/readers/tex/binomial_coefficient.native b/tests/readers/tex/binomial_coefficient.native
--- a/tests/readers/tex/binomial_coefficient.native
+++ b/tests/readers/tex/binomial_coefficient.native
@@ -1,1 +1,1 @@
-[EStyled TextBold [EIdentifier "C"],ESymbol Open "(",EIdentifier "n",ESymbol Pun ",",EIdentifier "k",ESymbol Close ")",ESymbol Rel "=",ESubsup (EStyled TextBold [EIdentifier "C"]) (EIdentifier "k") (EIdentifier "n"),ESymbol Rel "=",ESub (EGrouped []) (EIdentifier "n"),ESub (EStyled TextBold [EIdentifier "C"]) (EIdentifier "k"),ESymbol Rel "=",EDelimited "(" ")" [Right (EFraction NoLineFrac (EIdentifier "n") (EIdentifier "k"))],ESymbol Rel "=",EFraction NormalFrac (EGrouped [EIdentifier "n",ESymbol Ord "!"]) (EGrouped [EIdentifier "k",ESymbol Ord "!",ESpace (1 % 6),ESymbol Open "(",EIdentifier "n",ESymbol Bin "\8722",EIdentifier "k",ESymbol Close ")",ESymbol Ord "!"])]
+[EStyled TextBold [EIdentifier "C"],EDelimited "(" ")" [Right (EIdentifier "n"),Right (ESymbol Pun ","),Right (EIdentifier "k")],ESymbol Rel "=",ESubsup (EStyled TextBold [EIdentifier "C"]) (EIdentifier "k") (EIdentifier "n"),ESymbol Rel "=",ESub (EGrouped []) (EIdentifier "n"),ESub (EStyled TextBold [EIdentifier "C"]) (EIdentifier "k"),ESymbol Rel "=",EDelimited "(" ")" [Right (EFraction NoLineFrac (EIdentifier "n") (EIdentifier "k"))],ESymbol Rel "=",EFraction NormalFrac (EGrouped [EIdentifier "n",ESymbol Ord "!"]) (EGrouped [EIdentifier "k",ESymbol Ord "!",ESpace (1 % 6),EDelimited "(" ")" [Right (EIdentifier "n"),Right (ESymbol Bin "\8722"),Right (EIdentifier "k")],ESymbol Ord "!"])]
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 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")]
+[ESymbol Op "\172",EDelimited "(" ")" [Right (EIdentifier "p"),Right (ESymbol Bin "\8743"),Right (EIdentifier "q")],ESymbol Rel "\8660",EDelimited "(" ")" [Right (ESymbol Op "\172"),Right (EIdentifier "p")],ESymbol Bin "\8744",EDelimited "(" ")" [Right (ESymbol Op "\172"),Right (EIdentifier "q")],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/differentiable_manifold.native b/tests/readers/tex/differentiable_manifold.native
--- a/tests/readers/tex/differentiable_manifold.native
+++ b/tests/readers/tex/differentiable_manifold.native
@@ -1,1 +1,1 @@
-[ESub (EIdentifier "\947") (ENumber "1"),ESymbol Rel "\8801",ESub (EIdentifier "\947") (ENumber "2"),ESymbol Rel "\8660",EDelimited "{" "" [Right (EArray [AlignLeft] [[[ESub (EIdentifier "\947") (ENumber "1"),ESymbol Open "(",ENumber "0",ESymbol Close ")",ESymbol Rel "=",ESub (EIdentifier "\947") (ENumber "2"),ESymbol Open "(",ENumber "0",ESymbol Close ")",ESymbol Rel "=",EIdentifier "p",ESymbol Pun ",",EText TextNormal " and "]],[[ESub (EDelimited "" "|" [Right (EFraction NormalFrac (EStyled TextNormal [EIdentifier "d"]) (EGrouped [EStyled TextNormal [EIdentifier "d"],EIdentifier "t"])),Right (EIdentifier "\981"),Right (ESymbol Bin "\8728"),Right (ESub (EIdentifier "\947") (ENumber "1")),Right (ESymbol Open "("),Right (EIdentifier "t"),Right (ESymbol Close ")")]) (EGrouped [EIdentifier "t",ESymbol Rel "=",ENumber "0"]),ESymbol Rel "=",ESub (EDelimited "" "|" [Right (EFraction NormalFrac (EStyled TextNormal [EIdentifier "d"]) (EGrouped [EStyled TextNormal [EIdentifier "d"],EIdentifier "t"])),Right (EIdentifier "\981"),Right (ESymbol Bin "\8728"),Right (ESub (EIdentifier "\947") (ENumber "2")),Right (ESymbol Open "("),Right (EIdentifier "t"),Right (ESymbol Close ")")]) (EGrouped [EIdentifier "t",ESymbol Rel "=",ENumber "0"])]]])]]
+[ESub (EIdentifier "\947") (ENumber "1"),ESymbol Rel "\8801",ESub (EIdentifier "\947") (ENumber "2"),ESymbol Rel "\8660",EDelimited "{" "" [Right (EArray [AlignLeft] [[[ESub (EIdentifier "\947") (ENumber "1"),EDelimited "(" ")" [Right (ENumber "0")],ESymbol Rel "=",ESub (EIdentifier "\947") (ENumber "2"),EDelimited "(" ")" [Right (ENumber "0")],ESymbol Rel "=",EIdentifier "p",ESymbol Pun ",",EText TextNormal " and "]],[[ESub (EDelimited "" "|" [Right (EFraction NormalFrac (EStyled TextNormal [EIdentifier "d"]) (EGrouped [EStyled TextNormal [EIdentifier "d"],EIdentifier "t"])),Right (EIdentifier "\981"),Right (ESymbol Bin "\8728"),Right (ESub (EIdentifier "\947") (ENumber "1")),Right (EDelimited "(" ")" [Right (EIdentifier "t")])]) (EGrouped [EIdentifier "t",ESymbol Rel "=",ENumber "0"]),ESymbol Rel "=",ESub (EDelimited "" "|" [Right (EFraction NormalFrac (EStyled TextNormal [EIdentifier "d"]) (EGrouped [EStyled TextNormal [EIdentifier "d"],EIdentifier "t"])),Right (EIdentifier "\981"),Right (ESymbol Bin "\8728"),Right (ESub (EIdentifier "\947") (ENumber "2")),Right (EDelimited "(" ")" [Right (EIdentifier "t")])]) (EGrouped [EIdentifier "t",ESymbol Rel "=",ENumber "0"])]]])]]
diff --git a/tests/readers/tex/schwinger_dyson.native b/tests/readers/tex/schwinger_dyson.native
--- a/tests/readers/tex/schwinger_dyson.native
+++ b/tests/readers/tex/schwinger_dyson.native
@@ -1,1 +1,1 @@
-[EDelimited "\10216" "\10217" [Right (EIdentifier "\968"),Right (EDelimited "|" "|" [Right (EStyled TextScript [EIdentifier "T"]),Right (EDelimited "{" "}" [Right (EFraction NormalFrac (EIdentifier "\948") (EGrouped [EIdentifier "\948",EIdentifier "\981"])),Right (EIdentifier "F"),Right (ESymbol Open "["),Right (EIdentifier "\981"),Right (ESymbol Close "]")])]),Right (EIdentifier "\968")],ESymbol Rel "=",ESymbol Bin "\8722",EStyled TextNormal [EIdentifier "i"],EDelimited "\10216" "\10217" [Right (EIdentifier "\968"),Right (EDelimited "|" "|" [Right (EStyled TextScript [EIdentifier "T"]),Right (EDelimited "{" "}" [Right (EIdentifier "F"),Right (ESymbol Open "["),Right (EIdentifier "\981"),Right (ESymbol Close "]"),Right (EFraction NormalFrac (EIdentifier "\948") (EGrouped [EIdentifier "\948",EIdentifier "\981"])),Right (EIdentifier "S"),Right (ESymbol Open "["),Right (EIdentifier "\981"),Right (ESymbol Close "]")])]),Right (EIdentifier "\968")]]
+[EDelimited "\10216" "\10217" [Right (EIdentifier "\968"),Right (EDelimited "|" "|" [Right (EStyled TextScript [EIdentifier "T"]),Right (EDelimited "{" "}" [Right (EFraction NormalFrac (EIdentifier "\948") (EGrouped [EIdentifier "\948",EIdentifier "\981"])),Right (EIdentifier "F"),Right (EDelimited "[" "]" [Right (EIdentifier "\981")])])]),Right (EIdentifier "\968")],ESymbol Rel "=",ESymbol Bin "\8722",EStyled TextNormal [EIdentifier "i"],EDelimited "\10216" "\10217" [Right (EIdentifier "\968"),Right (EDelimited "|" "|" [Right (EStyled TextScript [EIdentifier "T"]),Right (EDelimited "{" "}" [Right (EIdentifier "F"),Right (EDelimited "[" "]" [Right (EIdentifier "\981")]),Right (EFraction NormalFrac (EIdentifier "\948") (EGrouped [EIdentifier "\948",EIdentifier "\981"])),Right (EIdentifier "S"),Right (EDelimited "[" "]" [Right (EIdentifier "\981")])])]),Right (EIdentifier "\968")]]
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 [ESymbol Open "(",ESymbol Bin "\8722",ENumber "1",ESuper (ESymbol Close ")") (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 Bin "\8722"),Right (ENumber "1")]) (EGrouped [EIdentifier "n",ESymbol Bin "+",ENumber "1"]),ESpace (1 % 6),ESuper (EIdentifier "n") (EGrouped [ESymbol Bin "\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),ESymbol Open "(",ESymbol Bin "\8722",EMathOperator "cos",EIdentifier "\952",ESymbol Close ")",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 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")]]]]
diff --git a/tests/readers/tex/substack.native b/tests/readers/tex/substack.native
--- a/tests/readers/tex/substack.native
+++ b/tests/readers/tex/substack.native
@@ -1,1 +1,1 @@
-[EUnder True (ESymbol Op "\8721") (EArray [AlignCenter] [[[EGrouped [ENumber "0",ESymbol Rel "<",EIdentifier "i",ESymbol Rel "<",EIdentifier "m"]]],[[EGrouped [ENumber "0",ESymbol Rel "<",EIdentifier "j",ESymbol Rel "<",EIdentifier "n"]]]]),EIdentifier "P",ESymbol Open "(",EIdentifier "i",ESymbol Pun ",",EIdentifier "j",ESymbol Close ")"]
+[EUnder True (ESymbol Op "\8721") (EArray [AlignCenter] [[[EGrouped [ENumber "0",ESymbol Rel "<",EIdentifier "i",ESymbol Rel "<",EIdentifier "m"]]],[[EGrouped [ENumber "0",ESymbol Rel "<",EIdentifier "j",ESymbol Rel "<",EIdentifier "n"]]]]),EIdentifier "P",EDelimited "(" ")" [Right (EIdentifier "i"),Right (ESymbol Pun ","),Right (EIdentifier "j")]]
diff --git a/tests/readers/tex/tokens.native b/tests/readers/tex/tokens.native
--- a/tests/readers/tex/tokens.native
+++ b/tests/readers/tex/tokens.native
@@ -1,1 +1,1 @@
-[EOver False (EIdentifier "\981") (ESymbol Accent "\771"),ESqrt (EIdentifier "\981"),EFraction NormalFrac (EIdentifier "\981") (EIdentifier "\958"),EFraction NormalFrac (EIdentifier "\981") (EIdentifier "\958"),EFraction NormalFrac (EIdentifier "\981") (EIdentifier "\958"),EGrouped [ESymbol Open "(",EIdentifier "\981",ESymbol Close ")"],EGrouped [ESymbol Open "(",EIdentifier "\981",ESymbol Close ")"],EIdentifier "\958"]
+[EOver False (EIdentifier "\981") (ESymbol Accent "\771"),ESqrt (EIdentifier "\981"),EFraction NormalFrac (EIdentifier "\981") (EIdentifier "\958"),EFraction NormalFrac (EIdentifier "\981") (EIdentifier "\958"),EFraction NormalFrac (EIdentifier "\981") (EIdentifier "\958"),EDelimited "(" ")" [Right (EIdentifier "\981")],EDelimited "(" ")" [Right (EIdentifier "\981")],EIdentifier "\958"]
diff --git a/tests/writers/02.tex b/tests/writers/02.tex
--- a/tests/writers/02.tex
+++ b/tests/writers/02.tex
@@ -1,1 +1,1 @@
-2 = \left( \frac{\left( 3 - x \right) \times 2}{3 - x} \right)
+2 = \left( \frac{(3 - x) \times 2}{3 - x} \right)
diff --git a/tests/writers/04.tex b/tests/writers/04.tex
--- a/tests/writers/04.tex
+++ b/tests/writers/04.tex
@@ -1,1 +1,1 @@
-S_{\text{new}} = S_{\text{old}} - \frac{\left( 5 - T \right)^{2}}{2}
+S_{\text{new}} = S_{\text{old}} - \frac{(5 - T)^{2}}{2}
diff --git a/tests/writers/05.eqn b/tests/writers/05.eqn
--- a/tests/writers/05.eqn
+++ b/tests/writers/05.eqn
@@ -1,1 +1,1 @@
-int sub a sup x back 16 back 16 back 16 int sub a sup s f ( y ) ^ d y ^ d s = int sub a sup x f ( y ) ( x \[u2212] y ) ^ d y
+int sub a sup x back 16 back 16 back 16 int sub a sup s f left ( y right ) ^ d y ^ d s = int sub a sup x f left ( y right ) left ( x \[u2212] y right ) ^ d y
diff --git a/tests/writers/05.mml b/tests/writers/05.mml
--- a/tests/writers/05.mml
+++ b/tests/writers/05.mml
@@ -15,9 +15,11 @@
s
f
- (
- y
- )
+
+ (
+ y
+ )
+
d
y
@@ -31,14 +33,18 @@
x
f
- (
- y
- )
- (
- x
- −
- y
- )
+
+ (
+ y
+ )
+
+
+ (
+ x
+ −
+ y
+ )
+
d
y
diff --git a/tests/writers/05.omml b/tests/writers/05.omml
--- a/tests/writers/05.omml
+++ b/tests/writers/05.omml
@@ -56,21 +56,18 @@
-
-
-
-
- (
-
-
- y
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ y
+
+
+
@@ -118,45 +115,39 @@
-
-
-
-
- (
-
-
- y
-
-
-
-
-
- )
-
-
-
-
-
- (
-
-
- x
-
-
-
-
-
- −
-
-
- y
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ y
+
+
+
+
+
+
+
+
+
+
+
+ x
+
+
+
+
+
+ −
+
+
+ y
+
+
+
diff --git a/tests/writers/07.eqn b/tests/writers/07.eqn
--- a/tests/writers/07.eqn
+++ b/tests/writers/07.eqn
@@ -1,1 +1,1 @@
-u \[u2033] + p ( x ) u prime + q ( x ) u = f ( x ) , fwd 100 x > a
+u \[u2033] + p left ( x right ) u prime + q left ( x right ) u = f left ( x right ) , fwd 100 x > a
diff --git a/tests/writers/07.mml b/tests/writers/07.mml
--- a/tests/writers/07.mml
+++ b/tests/writers/07.mml
@@ -5,22 +5,28 @@
″
+
p
- (
- x
- )
+
+ (
+ x
+ )
+
u
′
+
q
- (
- x
- )
+
+ (
+ x
+ )
+
u
=
f
- (
- x
- )
+
+ (
+ x
+ )
+
,
x
diff --git a/tests/writers/07.omml b/tests/writers/07.omml
--- a/tests/writers/07.omml
+++ b/tests/writers/07.omml
@@ -22,21 +22,18 @@
p
-
-
-
-
- (
-
-
- x
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ x
+
+
+
u
@@ -55,21 +52,18 @@
q
-
-
-
-
- (
-
-
- x
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ x
+
+
+
u
@@ -82,21 +76,18 @@
f
-
-
-
-
- (
-
-
- x
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ x
+
+
+
diff --git a/tests/writers/08.eqn b/tests/writers/08.eqn
--- a/tests/writers/08.eqn
+++ b/tests/writers/08.eqn
@@ -1,1 +1,1 @@
-| z to \[u203E] | = | z | , | ( z to \[u203E] ) sup n | = | z | sup n , "arg" ( z sup n ) = n "arg" ( z )
+left | z to \[u203E] right | = left | z right | , left | {left ( z to \[u203E] right )} sup n right | = {left | z right |} sup n , "arg" left ( z sup n right ) = n "arg" left ( z right )
diff --git a/tests/writers/08.mml b/tests/writers/08.mml
--- a/tests/writers/08.mml
+++ b/tests/writers/08.mml
@@ -1,48 +1,62 @@
diff --git a/tests/writers/08.omml b/tests/writers/08.omml
--- a/tests/writers/08.omml
+++ b/tests/writers/08.omml
@@ -4,121 +4,106 @@
-
-
-
-
- |
-
-
-
-
-
+
+
+
+
+
+
-
- z
-
+
+
+
+
+
+
+ z
+
+
+
-
-
-
-
-
- |
-
+
=
-
-
-
-
- |
-
-
- z
-
-
-
-
-
- |
-
-
-
-
-
- ,
-
-
-
-
-
- |
-
-
-
-
-
- (
-
-
-
-
-
+
+
+
+
+
+
z
-
-
-
-
-
-
-
- )
-
-
-
-
- n
-
-
-
+
- |
+ ,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ z
+
+
+
+
+
+
+
+
+ n
+
+
+
+
+
=
-
-
-
-
- |
-
-
- z
-
-
-
-
-
- |
-
+
+
+
+
+
+
+
+
+ z
+
+
+
@@ -139,30 +124,27 @@
arg
-
-
-
-
- (
-
-
+
+
+
+
+
+
-
- z
-
+
+
+
+ z
+
+
+
+
+ n
+
+
+
-
-
- n
-
-
-
-
-
-
-
- )
-
+
@@ -179,20 +161,17 @@
arg
-
-
-
-
- (
-
-
- z
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ z
+
+
+
diff --git a/tests/writers/08.tex b/tests/writers/08.tex
--- a/tests/writers/08.tex
+++ b/tests/writers/08.tex
@@ -1,1 +1,1 @@
-|\bar{z}| = |z|,|(\bar{z})^{n}| = |z|^{n},\arg(z^{n}) = n\arg(z)
+\left| \bar{z} \right| = |z|,\left| \left( \bar{z} \right)^{n} \right| = |z|^{n},\arg\left( z^{n} \right) = n\arg(z)
diff --git a/tests/writers/09.eqn b/tests/writers/09.eqn
--- a/tests/writers/09.eqn
+++ b/tests/writers/09.eqn
@@ -1,1 +1,1 @@
-lim from {z -> z sub 0} f ( z ) = f ( z sub 0 )
+lim from {z -> z sub 0} f left ( z right ) = f left ( z sub 0 right )
diff --git a/tests/writers/09.mml b/tests/writers/09.mml
--- a/tests/writers/09.mml
+++ b/tests/writers/09.mml
@@ -13,16 +13,20 @@
f
- (
- z
- )
+
+ (
+ z
+ )
+
=
f
- (
-
- z
- 0
-
- )
+
+ (
+
+ z
+ 0
+
+ )
+
diff --git a/tests/writers/09.omml b/tests/writers/09.omml
--- a/tests/writers/09.omml
+++ b/tests/writers/09.omml
@@ -41,21 +41,18 @@
f
-
-
-
-
- (
-
-
- z
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ z
+
+
+
@@ -65,29 +62,26 @@
f
-
-
-
-
- (
-
-
+
+
+
+
+
+
-
- z
-
+
+
+
+ z
+
+
+
+
+ 0
+
+
+
-
-
- 0
-
-
-
-
-
-
-
- )
-
+
diff --git a/tests/writers/09.tex b/tests/writers/09.tex
--- a/tests/writers/09.tex
+++ b/tests/writers/09.tex
@@ -1,1 +1,1 @@
-\lim_{z \rightarrow z_{0}}f(z) = f(z_{0})
+\lim_{z \rightarrow z_{0}}f(z) = f\left( z_{0} \right)
diff --git a/tests/writers/10.eqn b/tests/writers/10.eqn
--- a/tests/writers/10.eqn
+++ b/tests/writers/10.eqn
@@ -1,1 +1,1 @@
-phi sub n ( kappa ) = 1 over {4 pi sup 2 kappa sup 2} int sub 0 sup inf {sin ( kappa R )} over {kappa R} partial over {partial R} left [ R sup 2 {partial D sub n ( R )} over {partial R} right ] ^ d R
+phi sub n left ( kappa right ) = 1 over {4 pi sup 2 kappa sup 2} int sub 0 sup inf {sin left ( kappa R right )} over {kappa R} partial over {partial R} left [ R sup 2 {partial D sub n left ( R right )} over {partial R} right ] ^ d R
diff --git a/tests/writers/10.mml b/tests/writers/10.mml
--- a/tests/writers/10.mml
+++ b/tests/writers/10.mml
@@ -5,9 +5,11 @@
ϕ
n
- (
- κ
- )
+
+ (
+ κ
+ )
+
=
1
@@ -31,10 +33,12 @@
sin
- (
- κ
- R
- )
+
+ (
+ κ
+ R
+ )
+
κ
@@ -61,9 +65,11 @@
D
n
- (
- R
- )
+
+ (
+ R
+ )
+
∂
diff --git a/tests/writers/10.omml b/tests/writers/10.omml
--- a/tests/writers/10.omml
+++ b/tests/writers/10.omml
@@ -16,21 +16,18 @@
-
-
-
-
- (
-
-
- κ
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ κ
+
+
+
@@ -109,24 +106,21 @@
sin
-
-
-
-
- (
-
-
- κ
-
-
- R
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ κ
+
+
+ R
+
+
+
@@ -205,21 +199,18 @@
-
-
-
-
- (
-
-
- R
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ R
+
+
+
diff --git a/tests/writers/11.eqn b/tests/writers/11.eqn
--- a/tests/writers/11.eqn
+++ b/tests/writers/11.eqn
@@ -1,1 +1,1 @@
-phi sub n ( kappa ) = 0.033 C sub n sup 2 kappa sup {\[u2212] 11 / 3} , fwd 100 1 over {L sub 0} << kappa << 1 over {l sub 0}
+phi sub n left ( kappa right ) = 0.033 C sub n sup 2 kappa sup {\[u2212] 11 / 3} , fwd 100 1 over {L sub 0} << kappa << 1 over {l sub 0}
diff --git a/tests/writers/11.mml b/tests/writers/11.mml
--- a/tests/writers/11.mml
+++ b/tests/writers/11.mml
@@ -5,9 +5,11 @@
ϕ
n
- (
- κ
- )
+
+ (
+ κ
+ )
+
=
0.033
diff --git a/tests/writers/11.omml b/tests/writers/11.omml
--- a/tests/writers/11.omml
+++ b/tests/writers/11.omml
@@ -16,21 +16,18 @@
-
-
-
-
- (
-
-
- κ
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ κ
+
+
+
diff --git a/tests/writers/12.eqn b/tests/writers/12.eqn
--- a/tests/writers/12.eqn
+++ b/tests/writers/12.eqn
@@ -1,4 +1,4 @@
-f ( x ) = left { matrix{
+f left ( x right ) = left { matrix{
lcol{ 1 above {1 over 2} above {1 \[u2212] x sup 2} }
lcol{ {\[u2212] 1 <= x < 0} above {x = 0} above {roman "otherwise"} }
} right ""
diff --git a/tests/writers/12.mml b/tests/writers/12.mml
--- a/tests/writers/12.mml
+++ b/tests/writers/12.mml
@@ -2,9 +2,11 @@
⋯
-
-
-
-
- (
-
-
- c
-
-
-
-
- q
-
-
-
-
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+
+
+ c
+
+
+
+
+ q
+
+
+
+
+
diff --git a/tests/writers/13.tex b/tests/writers/13.tex
--- a/tests/writers/13.tex
+++ b/tests/writers/13.tex
@@ -1,1 +1,1 @@
-{}_{p}F_{q}(a_{1},\ldots,a_{p};c_{1},\ldots,c_{q};z) = \sum_{n = 0}^{\infty}\frac{(a_{1})_{n}\cdots(a_{p})_{n}}{(c_{1})_{n}\cdots(c_{q})_{n}}\frac{z^{n}}{n!}
+{}_{p}F_{q}\left( a_{1},\ldots,a_{p};c_{1},\ldots,c_{q};z \right) = \sum_{n = 0}^{\infty}\frac{\left( a_{1} \right)_{n}\cdots\left( a_{p} \right)_{n}}{\left( c_{1} \right)_{n}\cdots\left( c_{q} \right)_{n}}\frac{z^{n}}{n!}
diff --git a/tests/writers/abs1.tex b/tests/writers/abs1.tex
--- a/tests/writers/abs1.tex
+++ b/tests/writers/abs1.tex
@@ -1,1 +1,1 @@
-\left| x \right|
+|x|
diff --git a/tests/writers/axiom_of_power_set.eqn b/tests/writers/axiom_of_power_set.eqn
--- a/tests/writers/axiom_of_power_set.eqn
+++ b/tests/writers/axiom_of_power_set.eqn
@@ -1,1 +1,1 @@
-\[u2200] A ^ \[u2203] P ^ \[u2200] B ^ [ B \[u2208] P \[u21D4] \[u2200] C ^ ( C \[u2208] B \[u21D2] C \[u2208] A ) ]
+\[u2200] A ^ \[u2203] P ^ \[u2200] B ^ left [ B \[u2208] P \[u21D4] \[u2200] C ^ left ( C \[u2208] B \[u21D2] C \[u2208] A right ) right ]
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
@@ -10,23 +10,27 @@
∀
B
- [
- B
- ∈
- P
- ⇔
- ∀
- C
-
- (
- C
- ∈
- B
- ⇒
- C
- ∈
- A
- )
- ]
+
+ [
+ B
+ ∈
+ P
+ ⇔
+ ∀
+ C
+
+
+ (
+ C
+ ∈
+ B
+ ⇒
+ C
+ ∈
+ A
+ )
+
+ ]
+
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
@@ -40,89 +40,83 @@
-
-
-
-
- [
-
-
- B
-
-
-
-
-
- ∈
-
-
- P
-
-
-
-
-
- ⇔
-
-
-
-
-
- ∀
-
-
- C
-
-
-
-
-
-
-
-
- (
-
-
- C
-
-
-
-
-
- ∈
-
-
- B
-
-
-
-
-
- ⇒
-
-
- C
-
-
-
-
-
- ∈
-
-
- A
-
-
-
-
-
- )
-
-
-
-
-
- ]
-
+
+
+
+
+
+
+
+
+ B
+
+
+
+
+
+ ∈
+
+
+ P
+
+
+
+
+
+ ⇔
+
+
+
+
+
+ ∀
+
+
+ C
+
+
+
+
+
+
+
+
+
+
+
+
+ C
+
+
+
+
+
+ ∈
+
+
+ B
+
+
+
+
+
+ ⇒
+
+
+ C
+
+
+
+
+
+ ∈
+
+
+ A
+
+
+
+
+
diff --git a/tests/writers/axiom_of_power_set.tex b/tests/writers/axiom_of_power_set.tex
--- a/tests/writers/axiom_of_power_set.tex
+++ b/tests/writers/axiom_of_power_set.tex
@@ -1,1 +1,1 @@
-\forall A\,\exists P\,\forall B\,\lbrack B \in P \Leftrightarrow \forall C\,(C \in B \Rightarrow C \in A)\rbrack
+\forall A\,\exists P\,\forall B\,\left\lbrack B \in P \Leftrightarrow \forall C\,(C \in B \Rightarrow C \in A) \right\rbrack
diff --git a/tests/writers/binomial_coefficient.eqn b/tests/writers/binomial_coefficient.eqn
--- a/tests/writers/binomial_coefficient.eqn
+++ b/tests/writers/binomial_coefficient.eqn
@@ -1,1 +1,1 @@
-bold {C} ( n , k ) = {bold {C}} sub k sup n = {} sub n {bold {C}} sub k = left ( n / k right ) = {n !} over {k ! ^ ( n \[u2212] k ) !}
+bold {C} left ( n , k right ) = {bold {C}} sub k sup n = {} sub n {bold {C}} sub k = left ( n / k right ) = {n !} over {k ! ^ left ( n \[u2212] k right ) !}
diff --git a/tests/writers/binomial_coefficient.mml b/tests/writers/binomial_coefficient.mml
--- a/tests/writers/binomial_coefficient.mml
+++ b/tests/writers/binomial_coefficient.mml
@@ -4,11 +4,13 @@
𝐂
- (
- n
- ,
- k
- )
+
+ (
+ n
+ ,
+ k
+ )
+
=
@@ -47,11 +49,13 @@
k
!
- (
- n
- −
- k
- )
+
+ (
+ n
+ −
+ k
+ )
+
!
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
@@ -10,30 +10,27 @@
C
-
-
-
-
- (
-
-
- n
-
-
-
-
-
- ,
-
-
- k
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ n
+
+
+
+
+
+ ,
+
+
+ k
+
+
+
@@ -157,30 +154,27 @@
-
-
-
-
- (
-
-
- n
-
-
-
-
-
- −
-
-
- k
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ n
+
+
+
+
+
+ −
+
+
+ k
+
+
+
diff --git a/tests/writers/chain1.tex b/tests/writers/chain1.tex
--- a/tests/writers/chain1.tex
+++ b/tests/writers/chain1.tex
@@ -1,1 +1,1 @@
-\int_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x = \sum\limits_{i = 0}^{\infty}x_{i} = \prod\limits_{i = 0}^{\infty}x_{i} = \coprod\limits_{i = 0}^{\infty}x_{i} = \oint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x = \iint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x = \iiint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x = \sum\limits_{i = 0}^{\infty}x_{i} = \prod\limits_{i = 0}^{\infty}x_{i} = \coprod\limits_{i = 0}^{\infty}x_{i} = \oint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x = \iint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x = \iiint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/chain2.tex b/tests/writers/chain2.tex
--- a/tests/writers/chain2.tex
+++ b/tests/writers/chain2.tex
@@ -1,1 +1,1 @@
-\int_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x = \sum\limits_{i = 0}^{\infty}x_{i} = \prod\limits_{i = 0}^{\infty}x_{i} = \coprod\limits_{i = 0}^{\infty}x_{i} = \oint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x = \iint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x = \iiint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x = \sum\limits_{i = 0}^{\infty}x_{i} = \prod\limits_{i = 0}^{\infty}x_{i} = \coprod\limits_{i = 0}^{\infty}x_{i} = \oint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x = \iint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x = \iiint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/complex3.tex b/tests/writers/complex3.tex
--- a/tests/writers/complex3.tex
+++ b/tests/writers/complex3.tex
@@ -2,7 +2,7 @@
{2{\sum{ab}}} & \\
x^{\prime 3} & \\
{{{f^{\prime}{(x)}} + {\sin\cos\theta}} = 1} & \\
-{{{f{(z)}} = {\sum\limits_{n = 0}^{\infty}{a_{n}z^{n}}}}\text{, }{{\left| z \right| < R}\hspace{0pt}{({R \neq 0})}}} & \\
+{{{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} & \\
\left. {n \geq {N{(\varepsilon)}}}\Rightarrow{\left| {{f{(z)}} - {\sum\limits_{k = 0}^{n}{a_{k}z^{k}}}} \right| < \varepsilon} \right. & \\
@@ -38,7 +38,7 @@
{{10\text{ as}} + {10\text{ d}} - {10\text{ fs}} + {10\text{ h}} - {10\text{ μs}} + {10\text{ ms}} - {10\text{ min}} + {10\text{ ns}} - {10\text{ ps}} + {10\text{ s}} - {10\text{ y}}} & \\
{{10\text{ ft}^{3}} + {10\text{ in}^{3}} - {10\text{ m}^{3}} + {10\text{ gal}} - {10\text{ l}}} & \\
{{10\text{ ml}} + {10\text{ pint}} - {10\text{ qt}}} & \\
-{\frac{1}{x\left( y \right)} = {\left( {{- {\int{e^{{- \frac{1}{2}}y^{2}}{\sin y}{\mathbb{d}y}}}} + C_{1}} \right)e^{\frac{1}{2}y^{2}}}} & \\
+{\frac{1}{x(y)} = {\left( {{- {\int{e^{{- \frac{1}{2}}y^{2}}{\sin y}{\mathbb{d}y}}}} + C_{1}} \right)e^{\frac{1}{2}y^{2}}}} & \\
{{{\mathbb{D}_{x}y} - y} = {\sin x}} & \\
{\left( \frac{1}{2} \right)\left( \frac{1}{2} \right)\left( \frac{1}{2} \right)} & \\
{\left\lbrack \frac{1}{2} \right\rbrack\left( \frac{1}{2} \right)\left\{ \frac{1}{2} \right\}} & \\
@@ -49,7 +49,7 @@
{\frac{1}{2}\frac{1}{2}\frac{1}{2}} & \\
{{- {({a - b})}} = {b - a}} & \\
{{\frac{2}{5} + \frac{3}{7}} = \frac{{2 \cdot 7} + {3 \cdot 5}}{35} = \frac{29}{35}} & \\
-{\left| a \right| = \left\{ \begin{matrix}
+{|a| = \left\{ \begin{matrix}
a & \text{if} & {a \geq 0} \\
{- a} & \text{if} & {a < 0} \\
\end{matrix} \right.} & \\
@@ -93,14 +93,14 @@
3 \\
\end{matrix}} \\
\end{matrix}}} & \\
-{{y\left( x \right)} = \frac{{xe^{x}} - e^{x} + 2}{e^{x}} = {x - 1 + \frac{2}{e^{x}}}} & \\
+{{y(x)} = \frac{{xe^{x}} - e^{x} + 2}{e^{x}} = {x - 1 + \frac{2}{e^{x}}}} & \\
\begin{array}{r}
{{{\mathbb{D}_{x\hspace{0pt}x}y} - y} = 0} \\
{{y{(0)}} = 1} \\
-{{y^{\prime}\left( 0 \right)} = 0} \\
+{{y^{\prime}(0)} = 0} \\
\end{array} & \\
-{{y\left( x \right)} = {{\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\left( t \right)} = {2{\tan\left( {{2t} - {\frac{1}{4}\pi}} \right)}}} & \\
+{{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)}}} & \\
{{\mathcal{F}\left( {\begin{matrix}
e^{2\pi ix} \\
{2\pi{{Dirac}\left( {x - {2\pi}} \right)}} \\
@@ -126,7 +126,7 @@
.9 & 3.7077 & .0777 & {- 1.7077} \\
1.0 & 4.2842 & {- .5424} & {- 2.2842} \\
\end{matrix} & \\
-{{K_{v}{(z)}} = {{BesselK}_{v}\left( z \right)}} & \\
+{{K_{v}{(z)}} = {{BesselK}_{v}(z)}} & \\
{{{z^{2}\frac{\mathbb{d}^{2}w}{\mathbb{d}z^{2}}} + {z\frac{\mathbb{d}w}{\mathbb{d}z}} - {\left( {z^{2} + v^{2}} \right)w}} = 0} & \\
{{\frac{\partial^{2}{u{({x,y})}}}{\partial x^{2}} - \frac{\partial^{2}{u{({x,y})}}}{\partial y^{2}}} = 0} & \\
{{y\left( {t,x} \right)} = {{F_{1}\left( {{- x} - {at}} \right)} + {F_{2}\left( {x - {at}} \right)}}} & \\
@@ -201,7 +201,7 @@
a & b & 1 \\
a & d & 1 \\
\end{pmatrix}} = {{xb} - {xd} + {ad} - {ab}} = 0} & \\
-{{{A\left( \theta \right)}{A\left( {- \theta} \right)}} = {\begin{bmatrix}
+{{{A(\theta)}{A\left( {- \theta} \right)}} = {\begin{bmatrix}
{\cos\theta} & {- {\sin\theta}} \\
{\sin\theta} & {\cos\theta} \\
\end{bmatrix}\begin{bmatrix}
@@ -257,9 +257,9 @@
{{h{({i,j})}} = {{{({2 - j})}{g{(i)}}} + {{({j - 1})}{f{({g{(i)}})}}}}} & \\
{\bigtriangleup:\left. \left\lbrack {0,1} \right\rbrack\rightarrow\left\lbrack {0,1} \right\rbrack \right.} & \\
{{0 \bigtriangledown x} = x} & \\
-{{x \bigtriangleup y} = {h^{- 1}\left( {{h\left( x \right)}{h\left( y \right)}} \right)}} & \\
-{{x \bigtriangleup y} = {f^{- 1}\left( {\max\left\{ {{{f\left( x \right)} + {f\left( y \right)} - 1},0} \right\}} \right)}} & \\
-{{x \bigtriangledown y} = {\eta\left( {{\eta\left( x \right)} \bigtriangleup {\eta\left( y \right)}} \right)}} & \\
+{{x \bigtriangleup y} = {h^{- 1}\left( {{h(x)}{h(y)}} \right)}} & \\
+{{x \bigtriangleup y} = {f^{- 1}\left( {\max\left\{ {{{f(x)} + {f(y)} - 1},0} \right\}} \right)}} & \\
+{{x \bigtriangledown y} = {\eta\left( {{\eta(x)} \bigtriangleup {\eta(y)}} \right)}} & \\
{{x{\bigtriangleup_{0}y}} = \left\{ \begin{matrix}
{x \land y} & \text{if} & {x \vee {y = 1}} \\
0 & \text{if} & {x \vee {y < 1}} \\
@@ -268,7 +268,7 @@
{{g{(x)}} = {\exp\left( {- \frac{1 - \left( {1 - x} \right)^{a}}{\left( {2^{a} - 1} \right)\left( {1 - x} \right)^{a}}} \right)}} & \\
{{\operatorname{Aut}{(\mathbf{I})}} = \left\{ {f:\left. \left\lbrack {0,1} \right\rbrack\rightarrow\left\lbrack {0,1} \right\rbrack \right.}\;\left| \begin{array}{l}
{f\text{ is\ one-to-one\ and\ onto,\ and}} \\
-{{x \leq y}\text{ implies }{{f\left( x \right)} \leq {f\left( y \right)}}} \\
+{{x \leq y}\text{ implies }{{f(x)} \leq {f(y)}}} \\
\end{array} \right. \right\}} & \\
{{{x^{2} + y^{2}} = r^{2}},\text{\quad\quad}{{\tan\theta} = \frac{y}{x}}} & \\
{\sqrt{2}\sqrt{1 - t^{2}}} & \\
@@ -323,7 +323,7 @@
{{\Pr{({X \leq 54})}} = {{BinomialDist}{({54;{100,.55}})}} = .45846} & \\
{{k = {\max\left\{ {\left| {\frac{\partial f}{\partial y}{({x,y})}} \right|:{{({x,y})} \in D}} \right\}}}\text{.}} & \\
{m = {\lim\limits_{x\overset{}{\rightarrow}a}\frac{{f{(x)}} - {f{(a)}}}{x - a}}} & \\
-{\left| A \right| = \left| \begin{matrix}
+{|A| = \left| \begin{matrix}
a_{1\hspace{0pt}1} & a_{1\hspace{0pt}2} & \cdot & \cdot & \cdot & a_{1\hspace{0pt}n} \\
a_{2\hspace{0pt}1} & a_{2\hspace{0pt}2} & \cdot & \cdot & \cdot & a_{2\hspace{0pt}n} \\
\cdot & \cdot & \cdot & \mspace{1mu} & \mspace{1mu} & \cdot \\
@@ -446,7 +446,7 @@
\text{Focus} & {F{({0,p})}} \\
\text{Directrix} & {y = {- p}} \\
\end{matrix} & \\
-{{\frac{\mathbb{d}}{\mathbb{d}x}\text{ }{({\csc^{- 1}x})}} = {- \frac{1}{\left| x \right|\sqrt{x^{2} - 1}}}} & \\
+{{\frac{\mathbb{d}}{\mathbb{d}x}\text{ }{({\csc^{- 1}x})}} = {- \frac{1}{|x|\sqrt{x^{2} - 1}}}} & \\
{{{\tanh^{- 1}x} = {\frac{1}{2}{\ln\left( \frac{1 + x}{1 - x} \right)}}}\text{\quad\quad}{{- 1} < x < 1}} & \\
{{{\angle\alpha} + {\angle ABC} + {\angle 1}} = {\vartriangle abc}} & \\
{y = {e^{- {\int{P{\mathbb{d}x}}}}\left\lbrack {{\int{e^{\int{P{\mathbb{d}x}}}Q{\mathbb{d}x}}} + c} \right\rbrack}} & \\
diff --git a/tests/writers/deMorgans_law.eqn b/tests/writers/deMorgans_law.eqn
--- a/tests/writers/deMorgans_law.eqn
+++ b/tests/writers/deMorgans_law.eqn
@@ -1,1 +1,1 @@
-\[u00AC] ( p \[u2227] q ) \[u21D4] ( \[u00AC] p ) \[u2228] ( \[u00AC] q ) {inter from {i = 1} to n A sub i} to \[u00AF] = union from {i = 1} to n {A sub i} to \[u00AF]
+\[u00AC] left ( p \[u2227] q right ) \[u21D4] left ( \[u00AC] p right ) \[u2228] left ( \[u00AC] q right ) {inter from {i = 1} to n A sub i} to \[u00AF] = union from {i = 1} to n {A sub i} to \[u00AF]
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
@@ -2,21 +2,27 @@
¬
-
-
-
-
- (
-
-
- p
-
-
-
-
-
- ∧
-
-
- q
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ p
+
+
+
+
+
+ ∧
+
+
+ q
+
+
+
⇔
-
-
-
-
- (
-
-
-
-
-
- ¬
-
-
- p
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+
+
+
+ ¬
+
+
+ p
+
+
+
∨
-
-
-
-
- (
-
-
-
-
-
- ¬
-
-
- q
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+
+
+
+ ¬
+
+
+ q
+
+
+
diff --git a/tests/writers/differentiable_manifold.eqn b/tests/writers/differentiable_manifold.eqn
--- a/tests/writers/differentiable_manifold.eqn
+++ b/tests/writers/differentiable_manifold.eqn
@@ -1,3 +1,3 @@
gamma sub 1 == gamma sub 2 \[u21D4] left { matrix{
-lcol{ {gamma sub 1 ( 0 ) = gamma sub 2 ( 0 ) = p , roman " and "} above {{left "" {roman {d}} over {roman {d} t} phi \[u2218] gamma sub 1 ( t ) right |} sub {t = 0} = {left "" {roman {d}} over {roman {d} t} phi \[u2218] gamma sub 2 ( t ) right |} sub {t = 0}} }
+lcol{ {gamma sub 1 left ( 0 right ) = gamma sub 2 left ( 0 right ) = p , roman " and "} above {{left "" {roman {d}} over {roman {d} t} phi \[u2218] gamma sub 1 left ( t right ) right |} sub {t = 0} = {left "" {roman {d}} over {roman {d} t} phi \[u2218] gamma sub 2 left ( t right ) right |} sub {t = 0}} }
} right ""
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
@@ -20,17 +20,21 @@
γ
1
- (
- 0
- )
+
+ (
+ 0
+ )
+
=
γ
2
- (
- 0
- )
+
+ (
+ 0
+ )
+
=
p
,
@@ -62,9 +66,11 @@
γ
1
- (
- t
- )
+
+ (
+ t
+ )
+
|
@@ -93,9 +99,11 @@
γ
2
- (
- t
- )
+
+ (
+ t
+ )
+
|
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
@@ -74,21 +74,18 @@
-
-
-
-
- (
-
-
- 0
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ 0
+
+
+
@@ -107,21 +104,18 @@
-
-
-
-
- (
-
-
- 0
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ 0
+
+
+
@@ -202,21 +196,18 @@
-
-
-
-
- (
-
-
- t
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ t
+
+
+
@@ -295,21 +286,18 @@
-
-
-
-
- (
-
-
- t
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ t
+
+
+
diff --git a/tests/writers/doubleint1.tex b/tests/writers/doubleint1.tex
--- a/tests/writers/doubleint1.tex
+++ b/tests/writers/doubleint1.tex
@@ -1,1 +1,1 @@
-\iint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\iint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/doubleint2.tex b/tests/writers/doubleint2.tex
--- a/tests/writers/doubleint2.tex
+++ b/tests/writers/doubleint2.tex
@@ -1,1 +1,1 @@
-\iint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\iint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/int1.tex b/tests/writers/int1.tex
--- a/tests/writers/int1.tex
+++ b/tests/writers/int1.tex
@@ -1,1 +1,1 @@
-\int f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/int10.tex b/tests/writers/int10.tex
--- a/tests/writers/int10.tex
+++ b/tests/writers/int10.tex
@@ -1,1 +1,1 @@
-\int\limits_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int\limits_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/int3.tex b/tests/writers/int3.tex
--- a/tests/writers/int3.tex
+++ b/tests/writers/int3.tex
@@ -1,1 +1,1 @@
-\int_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/int5.tex b/tests/writers/int5.tex
--- a/tests/writers/int5.tex
+++ b/tests/writers/int5.tex
@@ -1,1 +1,1 @@
-\int f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/int7.tex b/tests/writers/int7.tex
--- a/tests/writers/int7.tex
+++ b/tests/writers/int7.tex
@@ -1,1 +1,1 @@
-\int_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/int9.tex b/tests/writers/int9.tex
--- a/tests/writers/int9.tex
+++ b/tests/writers/int9.tex
@@ -1,1 +1,1 @@
-\int\limits_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\int\limits_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/mfenced2.tex b/tests/writers/mfenced2.tex
--- a/tests/writers/mfenced2.tex
+++ b/tests/writers/mfenced2.tex
@@ -1,1 +1,1 @@
-\left( x \right)
+(x)
diff --git a/tests/writers/mfracZcomp-33.tex b/tests/writers/mfracZcomp-33.tex
--- a/tests/writers/mfracZcomp-33.tex
+++ b/tests/writers/mfracZcomp-33.tex
@@ -1,1 +1,1 @@
-\text{And\ this\ shows\ a\ combination\ with\ a\ background\ image\ at\ a\ desired\ opacity~}{Z_{\alpha}\left( f \right) = \frac{1}{2i\,\cos\left( \frac{\alpha\pi}{2} \right)}{\int_{C}\frac{f(iz)\left( - z \right)^{\alpha}}{e^{2\pi z} - 1}}\mathbb{d}z}
+\text{And\ this\ shows\ a\ combination\ with\ a\ background\ image\ at\ a\ desired\ opacity~}{Z_{\alpha}(f) = \frac{1}{2i\,\cos\left( \frac{\alpha\pi}{2} \right)}{\int_{C}\frac{f(iz)( - z)^{\alpha}}{e^{2\pi z} - 1}}\mathbb{d}z}
diff --git a/tests/writers/mi4.tex b/tests/writers/mi4.tex
--- a/tests/writers/mi4.tex
+++ b/tests/writers/mi4.tex
@@ -1,1 +1,1 @@
-f\left( x \right)
+f(x)
diff --git a/tests/writers/mo2.tex b/tests/writers/mo2.tex
--- a/tests/writers/mo2.tex
+++ b/tests/writers/mo2.tex
@@ -1,1 +1,1 @@
-\left( x \right)
+(x)
diff --git a/tests/writers/mo6.tex b/tests/writers/mo6.tex
--- a/tests/writers/mo6.tex
+++ b/tests/writers/mo6.tex
@@ -1,1 +1,1 @@
-\operatorname{there\ exists}{{\delta > 0}\operatorname{such\ that}{{f\left( x \right)} < 1}}
+\operatorname{there\ exists}{{\delta > 0}\operatorname{such\ that}{{f(x)} < 1}}
diff --git a/tests/writers/moAprime16.tex b/tests/writers/moAprime16.tex
--- a/tests/writers/moAprime16.tex
+++ b/tests/writers/moAprime16.tex
@@ -1,1 +1,1 @@
-f^{'}\left( x \right) = f^{\prime}\left( x \right)
+f^{'}(x) = f^{\prime}(x)
diff --git a/tests/writers/mrowAbg4.tex b/tests/writers/mrowAbg4.tex
--- a/tests/writers/mrowAbg4.tex
+++ b/tests/writers/mrowAbg4.tex
@@ -1,1 +1,1 @@
-\left( x + x + x + x + x + x + x + x + x + x + x + x + x \right)
+(x + x + x + x + x + x + x + x + x + x + x + x + x)
diff --git a/tests/writers/oint1.tex b/tests/writers/oint1.tex
--- a/tests/writers/oint1.tex
+++ b/tests/writers/oint1.tex
@@ -1,1 +1,1 @@
-\oint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\oint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/oint2.tex b/tests/writers/oint2.tex
--- a/tests/writers/oint2.tex
+++ b/tests/writers/oint2.tex
@@ -1,1 +1,1 @@
-\oint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\oint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/schwinger_dyson.eqn b/tests/writers/schwinger_dyson.eqn
--- a/tests/writers/schwinger_dyson.eqn
+++ b/tests/writers/schwinger_dyson.eqn
@@ -1,1 +1,1 @@
-left ⟨ psi left | {T} left { delta over {delta phi} F [ phi ] right } right | psi right ⟩ = \[u2212] roman {i} left ⟨ psi left | {T} left { F [ phi ] delta over {delta phi} S [ phi ] right } right | psi right ⟩
+left ⟨ psi left | {T} left { delta over {delta phi} F left [ phi right ] right } right | psi right ⟩ = \[u2212] roman {i} left ⟨ psi left | {T} left { F left [ phi right ] delta over {delta phi} S left [ phi right ] right } right | psi right ⟩
diff --git a/tests/writers/schwinger_dyson.mml b/tests/writers/schwinger_dyson.mml
--- a/tests/writers/schwinger_dyson.mml
+++ b/tests/writers/schwinger_dyson.mml
@@ -19,9 +19,11 @@
F
- [
- ϕ
- ]
+
+ [
+ ϕ
+ ]
+
}
|
@@ -45,9 +47,11 @@
{
F
- [
- ϕ
- ]
+
+ [
+ ϕ
+ ]
+
δ
@@ -56,9 +60,11 @@
S
- [
- ϕ
- ]
+
+ [
+ ϕ
+ ]
+
}
|
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
@@ -56,21 +56,18 @@
F
-
-
-
-
- [
-
-
- ϕ
-
-
-
-
-
- ]
-
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
@@ -132,21 +129,18 @@
F
-
-
-
-
- [
-
-
- ϕ
-
-
-
-
-
- ]
-
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
@@ -168,21 +162,18 @@
S
-
-
-
-
- [
-
-
- ϕ
-
-
-
-
-
- ]
-
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
diff --git a/tests/writers/sophomores_dream.eqn b/tests/writers/sophomores_dream.eqn
--- a/tests/writers/sophomores_dream.eqn
+++ b/tests/writers/sophomores_dream.eqn
@@ -1,1 +1,1 @@
-int sub 0 sup 1 x sup x ^ roman {d} x = sum from {n = 1} to inf {( \[u2212] 1 ) sup {n + 1} ^ n sup {\[u2212] n}}
+int sub 0 sup 1 x sup x ^ roman {d} x = sum from {n = 1} to inf {{left ( \[u2212] 1 right )} sup {n + 1} ^ n sup {\[u2212] n}}
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
@@ -26,11 +26,13 @@
∞
- (
- −
- 1
- )
+
+ (
+ −
+ 1
+ )
+
n
+
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
@@ -84,29 +84,26 @@
-
-
-
-
- (
-
-
-
-
-
- −
-
-
- 1
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+
+
+
+ −
+
+
+ 1
+
+
+
diff --git a/tests/writers/sphere_volume.eqn b/tests/writers/sphere_volume.eqn
--- a/tests/writers/sphere_volume.eqn
+++ b/tests/writers/sphere_volume.eqn
@@ -1,4 +1,4 @@
S = \[lC] 0 <= phi <= 2 pi , ~ 0 <= theta <= pi , ~ 0 <= rho <= R \[rC] matrix{
rcol{ {roman {V o l u m e}} above {} above {} above {} above {} }
-lcol{ {= \[u222D] from S back 16 rho sup 2 sin theta ^ roman {d} rho ^ roman {d} theta ^ roman {d} phi} above {= int sub 0 sup {2 pi} back 16 roman {d} phi ^ int sub 0 sup pi back 16 sin theta ^ roman {d} theta ^ int sub 0 sup R back 16 rho sup 2 roman {d} rho} above {= phi | sub 0 sup {2 pi} ~ ( \[u2212] cos theta ) | sub 0 sup pi ~ 1 over 3 rho sup 3 | sub 0 sup R} above {= 2 pi times 2 times 1 over 3 R sup 3} above {= 4 over 3 pi R sup 3} }
+lcol{ {= \[u222D] from S back 16 rho sup 2 sin theta ^ roman {d} rho ^ roman {d} theta ^ roman {d} phi} above {= int sub 0 sup {2 pi} back 16 roman {d} phi ^ int sub 0 sup pi back 16 sin theta ^ roman {d} theta ^ int sub 0 sup R back 16 rho sup 2 roman {d} rho} above {= phi | sub 0 sup {2 pi} ~ left ( \[u2212] cos theta right ) | sub 0 sup pi ~ 1 over 3 rho sup 3 | sub 0 sup R} above {= 2 pi times 2 times 1 over 3 R sup 3} above {= 4 over 3 pi R sup 3} }
}
diff --git a/tests/writers/sphere_volume.mml b/tests/writers/sphere_volume.mml
--- a/tests/writers/sphere_volume.mml
+++ b/tests/writers/sphere_volume.mml
@@ -129,11 +129,13 @@
- (
- −
- cos
- θ
- )
+
+ (
+ −
+ cos
+ θ
+ )
+
|
0
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
@@ -436,34 +436,31 @@
-
-
-
-
- (
-
-
-
-
-
- −
-
-
-
-
-
-
- cos
-
-
- θ
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+
+
+
+ −
+
+
+
+
+
+
+ cos
+
+
+ θ
+
+
+
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}\ ( - \cos\theta)\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/substack.eqn b/tests/writers/substack.eqn
--- a/tests/writers/substack.eqn
+++ b/tests/writers/substack.eqn
@@ -1,3 +1,3 @@
sum from {matrix{
ccol{ {0 < i < m} above {0 < j < n} }
-}} P ( i , j )
+}} P left ( i , j right )
diff --git a/tests/writers/substack.mml b/tests/writers/substack.mml
--- a/tests/writers/substack.mml
+++ b/tests/writers/substack.mml
@@ -29,10 +29,12 @@
P
- (
- i
- ,
- j
- )
+
+ (
+ i
+ ,
+ j
+ )
+
diff --git a/tests/writers/substack.omml b/tests/writers/substack.omml
--- a/tests/writers/substack.omml
+++ b/tests/writers/substack.omml
@@ -88,29 +88,26 @@
-
-
-
-
- (
-
-
- i
-
-
-
-
-
- ,
-
-
- j
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ i
+
+
+
+
+
+ ,
+
+
+ j
+
+
+
diff --git a/tests/writers/tokens.eqn b/tests/writers/tokens.eqn
--- a/tests/writers/tokens.eqn
+++ b/tests/writers/tokens.eqn
@@ -1,1 +1,1 @@
-phi to \[u0303] sqrt phi phi over xi phi over xi phi over xi {( phi )} {( phi )} xi
+phi to \[u0303] sqrt phi phi over xi phi over xi phi over xi left ( phi right ) left ( phi right ) xi
diff --git a/tests/writers/tokens.mml b/tests/writers/tokens.mml
--- a/tests/writers/tokens.mml
+++ b/tests/writers/tokens.mml
@@ -21,14 +21,14 @@
ξ
- (
+ (
ϕ
- )
+ )
- (
+ (
ϕ
- )
+ )
ξ
diff --git a/tests/writers/tokens.omml b/tests/writers/tokens.omml
--- a/tests/writers/tokens.omml
+++ b/tests/writers/tokens.omml
@@ -70,36 +70,30 @@
-
-
-
-
- (
-
-
- ϕ
-
-
-
-
-
- )
-
-
-
-
-
- (
-
-
- ϕ
-
-
-
-
-
- )
-
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
+
+
+
+
+
+
+
+
+ ϕ
+
+
+
ξ
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 @@
-\widetilde{\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/tripleint1.tex b/tests/writers/tripleint1.tex
--- a/tests/writers/tripleint1.tex
+++ b/tests/writers/tripleint1.tex
@@ -1,1 +1,1 @@
-\iiint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\iiint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/tripleint2.tex b/tests/writers/tripleint2.tex
--- a/tests/writers/tripleint2.tex
+++ b/tests/writers/tripleint2.tex
@@ -1,1 +1,1 @@
-\iiint_{0}^{1}f\left( x \right)\mspace{2mu}\mathbb{d}x
+\iiint_{0}^{1}f(x)\mspace{2mu}\mathbb{d}x
diff --git a/tests/writers/verbar1.tex b/tests/writers/verbar1.tex
--- a/tests/writers/verbar1.tex
+++ b/tests/writers/verbar1.tex
@@ -1,1 +1,1 @@
-\left| x \right|
+|x|
diff --git a/texmath.cabal b/texmath.cabal
--- a/texmath.cabal
+++ b/texmath.cabal
@@ -1,5 +1,5 @@
Name: texmath
-Version: 0.12.1.1
+Version: 0.12.2
Cabal-Version: >= 1.10
Build-type: Simple
Synopsis: Conversion between formats used to represent mathematics.