diff --git a/Text/TeXMath.hs b/Text/TeXMath.hs --- a/Text/TeXMath.hs +++ b/Text/TeXMath.hs @@ -1,5 +1,5 @@ {- -Copyright (C) 2009 John MacFarlane +Copyright (C) 2009-2012 John MacFarlane This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,12 +19,18 @@ {- | Functions for converting LaTeX math formulas to MathML. -} -module Text.TeXMath ( texMathToMathML, DisplayType(..) ) +module Text.TeXMath ( texMathToMathML, texMathToOMML, DisplayType(..) ) where import Text.TeXMath.Parser import Text.TeXMath.MathML +import Text.TeXMath.OMML +import Text.TeXMath.Types import Text.XML.Light texMathToMathML :: DisplayType -> String -> Either String Element texMathToMathML dt inp = inp `seq` either Left (Right . toMathML dt) $ parseFormula inp + +texMathToOMML :: DisplayType -> String -> Either String Element +texMathToOMML dt inp = inp `seq` + either Left (Right . toOMML dt) $ parseFormula inp diff --git a/Text/TeXMath/MathML.hs b/Text/TeXMath/MathML.hs --- a/Text/TeXMath/MathML.hs +++ b/Text/TeXMath/MathML.hs @@ -19,7 +19,7 @@ {- | Functions for writing a parsed formula as MathML. -} -module Text.TeXMath.MathML (toMathML, DisplayType(..), showExp) +module Text.TeXMath.MathML (toMathML, showExp) where import qualified Data.Map as M @@ -27,10 +27,6 @@ import Text.TeXMath.Types import Data.Generics (everywhere, mkT) -data DisplayType = DisplayBlock - | DisplayInline - deriving Show - toMathML :: DisplayType -> [Exp] -> Element toMathML dt exprs = add_attr dtattr $ math $ map showExp $ everywhere (mkT $ handleDownup dt) exprs @@ -111,13 +107,22 @@ makeScaled :: String -> Element -> Element makeScaled s = withAttribute "minsize" s . withAttribute "maxsize" s -makeText :: String -> String -> Element +makeText :: TextType -> String -> Element makeText a s = if trailingSp then mrow [s', sp] else s' where sp = spaceWidth "0.333em" - s' = withAttribute "mathvariant" a $ unode "mtext" s + s' = withAttribute "mathvariant" attr $ unode "mtext" s trailingSp = not (null s) && last s `elem` " \t" + attr = case a of + TextNormal -> "normal" + TextBold -> "bold" + TextItalic -> "italic" + TextMonospace -> "monospace" + TextSansSerif -> "sans-serif" + TextDoubleStruck -> "double-struck" + TextScript -> "script" + TextFraktur -> "fraktur" makeArray :: [Alignment] -> [ArrayLine] -> Element makeArray as ls = unode "mtable" $ @@ -151,6 +156,10 @@ ENumber x -> unode "mn" x EGrouped [x] -> showExp x EGrouped xs -> mrow $ map showExp xs + EDelimited start end xs -> mrow $ + [ makeStretchy (unode "mo" start) | not (null start) ] ++ + map showExp xs ++ + [ makeStretchy (unode "mo" end) | not (null end) ] EIdentifier x -> unode "mi" x EMathOperator x -> unode "mi" x ESymbol Accent x -> accent x diff --git a/Text/TeXMath/OMML.hs b/Text/TeXMath/OMML.hs new file mode 100644 --- /dev/null +++ b/Text/TeXMath/OMML.hs @@ -0,0 +1,231 @@ +{- +Copyright (C) 2012 John MacFarlane + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-} + +{- | Functions for writing a parsed formula as OMML. +-} + +module Text.TeXMath.OMML (toOMML, showExp) +where + +import Text.XML.Light +import Text.TeXMath.Types +import Data.Generics (everywhere, mkT) + +toOMML :: DisplayType -> [Exp] -> Element +toOMML dt = container . concatMap showExp + . everywhere (mkT $ handleDownup dt) + where container = case dt of + DisplayBlock -> mnode "oMathPara" . mnode "oMath" + DisplayInline -> mnode "oMath" + +mnode :: Node t => String -> t -> Element +mnode s = node (QName s Nothing (Just "m")) + +mnodeA :: Node t => String -> String -> t -> Element +mnodeA s v = add_attr (Attr (QName "val" Nothing (Just "m")) v) . mnode s + +str :: [Element] -> String -> Element +str props s = mnode "r" [ mnode "rPr" props + , mnode "t" s ] + +showBinary :: String -> Exp -> Exp -> Element +showBinary c x y = + case c of + "\\frac" -> mnode "f" [ mnode "fPr" $ + mnodeA "type" "bar" () + , mnode "num" x' + , mnode "den" y'] + "\\dfrac" -> showBinary "\\frac" x y + "\\tfrac" -> mnode "f" [ mnode "fPr" $ + mnodeA "type" "lin" () + , mnode "num" x' + , mnode "den" y'] + "\\sqrt" -> mnode "rad" [ mnode "radPr" $ + mnodeA "degHide" "on" () + , mnode "deg" y' + , mnode "e" x'] + "\\stackrel" -> mnode "limUpp" [ mnode "e" x' + , mnode "lim" y'] + "\\overset" -> mnode "limUpp" [ mnode "e" x' + , mnode "lim" y' ] + "\\underset" -> mnode "limLow" [ mnode "e" x' + , mnode "lim" y' ] + "\\binom" -> mnode "d" [ mnode "dPr" $ + mnodeA "sepChr" "," () + , mnode "e" $ + mnode "f" [ mnode "fPr" $ + mnodeA "type" + "noBar" () + , mnode "num" x' + , mnode "den" y' ]] + _ -> error $ "Unknown binary operator " ++ c + where x' = showExp x + y' = showExp y + +makeArray :: [Alignment] -> [ArrayLine] -> Element +makeArray as rs = mnode "m" $ mProps : map toMr rs + where mProps = mnode "mPr" + [ mnodeA "baseJc" "center" () + , mnodeA "plcHide" "on" () + , mnode "mcs" $ map toMc as' ] + as' = take (length rs) $ as ++ cycle [AlignDefault] + toMr r = mnode "mr" $ map (mnode "e" . concatMap showExp) r + toMc a = mnode "mc" $ mnode "mcPr" + $ mnodeA "mcJc" (toAlign a) () + toAlign AlignLeft = "left" + toAlign AlignRight = "right" + toAlign AlignCenter = "center" + toAlign AlignDefault = "left" + +makeText :: TextType -> String -> Element +makeText a s = str attrs s + where attrs = case a of + TextNormal -> [sty "p"] + TextBold -> [sty "b"] + TextItalic -> [sty "i"] + TextMonospace -> [sty "p", scr "monospace"] + TextSansSerif -> [sty "p", scr "sans-serif"] + TextDoubleStruck -> [sty "p", scr "double-struck"] + TextScript -> [sty "p", scr "script"] + TextFraktur -> [sty "p", scr "fraktur"] + sty x = mnodeA "sty" x () + scr x = mnodeA "scr" x () + +handleDownup :: DisplayType -> [Exp] -> [Exp] +handleDownup dt (exp' : xs) = + case exp' of + EDown x y + | isNary x -> EGrouped [constructor x y emptyGroup, next] : rest + | otherwise -> case dt of + DisplayBlock -> EUnder x y : xs + DisplayInline -> ESub x y : xs + EUp x y + | isNary x -> EGrouped [constructor x emptyGroup y, next] : rest + | otherwise -> case dt of + DisplayBlock -> EOver x y : xs + DisplayInline -> ESuper x y : xs + EDownup x y z + | isNary x -> EGrouped [constructor x y z, next] : rest + | otherwise -> case dt of + DisplayBlock -> EUnderover x y z : xs + DisplayInline -> ESubsup x y z : xs + ESub x y + | isNary x -> EGrouped [ESubsup x y emptyGroup, next] : rest + ESuper x y + | isNary x -> EGrouped [ESubsup x emptyGroup y, next] : rest + ESubsup x y z + | isNary x -> EGrouped [ESubsup x y z, next] : rest + EOver x y + | isNary x -> EGrouped [EUnderover x y emptyGroup, next] : rest + EUnder x y + | isNary x -> EGrouped [EUnderover x emptyGroup y, next] : rest + EUnderover x y z + | isNary x -> EGrouped [EUnderover x y z, next] : rest + _ -> exp' : next : rest + where (next, rest) = case xs of + (t:ts) -> (t,ts) + [] -> (emptyGroup, []) + emptyGroup = EGrouped [] + constructor = case dt of + DisplayBlock -> EUnderover + DisplayInline -> ESubsup +handleDownup _ [] = [] + +showExp :: Exp -> [Element] +showExp e = + case e of + ENumber x -> [str [] x] + EGrouped [EUnderover (ESymbol Op s) y z, w] -> [makeNary "undOvr" s y z w] + EGrouped [ESubsup (ESymbol Op s) y z, w] -> [makeNary "subSup" s y z w] + EGrouped xs -> concatMap showExp xs + EDelimited start end xs -> + [mnode "d" [ mnode "dPr" + [ mnodeA "begChr" start () + , mnodeA "endChr" end () + , mnode "grow" () ] + , mnode "e" $ concatMap showExp xs + ] ] + + EIdentifier x -> [str [] x] + EMathOperator x -> [str [] x] + EStretchy x -> showExp x -- no support for stretchy in OMML + ESymbol _ x -> [str [] x] + ESpace "0.167em" -> [str [] "\x2009"] + ESpace "0.222em" -> [str [] "\x2005"] + ESpace "0.278em" -> [str [] "\x2004"] + ESpace "0.333em" -> [str [] "\x2004"] + ESpace "1em" -> [str [] "\x2001"] + ESpace "2em" -> [str [] "\x2001\x2001"] + ESpace _ -> [] -- this is how the xslt sheet handles all spaces + EBinary c x y -> [showBinary c x y] + EUnder x (ESymbol Accent [c]) | isBarChar c -> + [mnode "bar" [ mnode "barPr" $ + mnodeA "pos" "bot" () + , mnode "e" $ showExp x ]] + EOver x (ESymbol Accent [c]) | isBarChar c -> + [mnode "bar" [ mnode "barPr" $ + mnodeA "pos" "top" () + , mnode "e" $ showExp x ]] + EOver x (ESymbol Accent y) -> + [mnode "acc" [ mnode "accPr" $ + mnodeA "chr" y () + , mnode "e" $ showExp x ]] + ESub x y -> [mnode "sSub" [ mnode "e" $ showExp x + , mnode "sub" $ showExp y]] + ESuper x y -> [mnode "sSup" [ mnode "e" $ showExp x + , mnode "sup" $ showExp y]] + ESubsup x y z -> [mnode "sSubSup" [ mnode "e" $ showExp x + , mnode "sub" $ showExp y + , mnode "sup" $ showExp z]] + EUnder x y -> [mnode "limLow" [ mnode "e" $ showExp x + , mnode "lim" $ showExp y]] + EOver x y -> [mnode "limUpp" [ mnode "e" $ showExp x + , mnode "lim" $ showExp y]] + EUnderover x y z -> showExp (EUnder x (EOver y z)) + EUnary "\\sqrt" x -> [mnode "rad" [ mnode "radPr" $ mnodeA "degHide" "on" () + , mnode "deg" () + , mnode "e" $ showExp x]] + EUnary "\\surd" x -> showExp $ EUnary "\\sqrt" x + EScaled _ x -> showExp x -- no support for scaler? + EArray as ls -> [makeArray as ls] + EText a s -> [makeText a s] + x -> error $ "showExp encountered " ++ show x + -- note: EUp, EDown, EDownup should be removed by handleDownup + +isBarChar :: Char -> Bool +isBarChar c = c == '\x203E' || c == '\x00AF' + +isNary :: Exp -> Bool +isNary (ESymbol Op _) = True +isNary _ = False + +makeNary :: String -> String -> Exp -> Exp -> Exp -> Element +makeNary t s y z w = + mnode "nary" [ mnode "naryPr" + [ mnodeA "chr" s () + , mnodeA "limLoc" t () + , mnode "grow" () + , mnodeA "supHide" + (if y == EGrouped [] then "on" else "off") () + , mnodeA "supHide" + (if y == EGrouped [] then "on" else "off") () + ] + , mnode "e" $ showExp w + , mnode "sub" $ showExp y + , mnode "sup" $ showExp z ] + diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs --- a/Text/TeXMath/Parser.hs +++ b/Text/TeXMath/Parser.hs @@ -136,7 +136,13 @@ contents <- manyTill expr (try $ symbol "\\right" >> lookAhead basicEnclosure) end <- basicEnclosure - return $ EGrouped $ EStretchy start : (contents ++ [EStretchy end]) + let startChar = case start of + ESymbol _ c -> c + _ -> "" + let endChar = case end of + ESymbol _ c -> c + _ -> "" + return $ EDelimited startChar endChar contents scaledEnclosure :: GenParser Char st Exp scaledEnclosure = try $ do @@ -170,9 +176,7 @@ inEnvironment keywd $ do aligns <- option [] arrayAlignments lines' <- sepEndBy1 arrayLine endLine - return $ EGrouped [ EStretchy (ESymbol Open opendelim) - , EArray aligns lines' - , EStretchy (ESymbol Close closedelim)] + return $ EDelimited opendelim closedelim [EArray aligns lines'] stdarray :: GenParser Char st Exp stdarray = inEnvironment "array" $ do @@ -192,7 +196,7 @@ cases :: GenParser Char st Exp cases = inEnvironment "cases" $ do rs <- sepEndBy1 arrayLine endLine - return $ EGrouped [EStretchy (ESymbol Open "{"), EArray [] rs] + return $ EDelimited "{" "" [EArray [] rs] split :: GenParser Char st Exp split = inEnvironment "split" $ do @@ -287,20 +291,20 @@ textOps :: M.Map String (String -> Exp) textOps = M.fromList - [ ("\\textrm", EText "normal" . parseText) - , ("\\mathrm", EText "normal") - , ("\\text", EText "normal" . parseText) - , ("\\mbox", EText "normal") - , ("\\mathbf", EText "bold") - , ("\\textbf", EText "bold" . parseText) - , ("\\mathit", EText "italic") - , ("\\textit", EText "italic" . parseText) - , ("\\mathtt", EText "monospace") - , ("\\texttt", EText "monospace") - , ("\\mathsf", EText "sans-serif") - , ("\\mathbb", \e -> maybe (EText "double-struck" e) (ESymbol Pun) (M.lookup e mathbb)) - , ("\\mathcal", \e -> maybe (EText "script" e) (ESymbol Pun) (M.lookup e mathcal)) - , ("\\mathfrak", EText "fraktur") + [ ("\\textrm", EText TextNormal . parseText) + , ("\\mathrm", EText TextNormal) + , ("\\text", EText TextNormal . parseText) + , ("\\mbox", EText TextNormal) + , ("\\mathbf", EText TextBold) + , ("\\textbf", EText TextBold . parseText) + , ("\\mathit", EText TextItalic) + , ("\\textit", EText TextItalic . parseText) + , ("\\mathtt", EText TextMonospace) + , ("\\texttt", EText TextMonospace) + , ("\\mathsf", EText TextSansSerif) + , ("\\mathbb", \e -> maybe (EText TextDoubleStruck e) (ESymbol Pun) (M.lookup e mathbb)) + , ("\\mathcal", \e -> maybe (EText TextScript e) (ESymbol Pun) (M.lookup e mathcal)) + , ("\\mathfrak", EText TextFraktur) ] parseText :: String -> String diff --git a/Text/TeXMath/Types.hs b/Text/TeXMath/Types.hs --- a/Text/TeXMath/Types.hs +++ b/Text/TeXMath/Types.hs @@ -20,7 +20,8 @@ {- | Types for representing a structured formula. -} -module Text.TeXMath.Types (Exp(..), TeXSymbolType(..), ArrayLine, Alignment(..)) +module Text.TeXMath.Types (Exp(..), TeXSymbolType(..), ArrayLine, + TextType(..), Alignment(..), DisplayType(..)) where import Data.Generics @@ -36,6 +37,7 @@ data Exp = ENumber String | EGrouped [Exp] + | EDelimited String String [Exp] | EIdentifier String | EMathOperator String | ESymbol TeXSymbolType String @@ -54,5 +56,19 @@ | EScaled String Exp | EStretchy Exp | EArray [Alignment] [ArrayLine] - | EText String String + | EText TextType String deriving (Show, Read, Eq, Data, Typeable) + +data DisplayType = DisplayBlock + | DisplayInline + deriving Show + +data TextType = TextNormal + | TextBold + | TextItalic + | TextMonospace + | TextSansSerif + | TextDoubleStruck + | TextScript + | TextFraktur + deriving (Show, Read, Eq, Data, Typeable) diff --git a/tests/01.omml b/tests/01.omml new file mode 100644 --- /dev/null +++ b/tests/01.omml @@ -0,0 +1,80 @@ + + + + + + x + + + + = + + + + + + + + + − + + + + b + + + + ± + + + + + + + + + + + + b + + + + + + 2 + + + + + + − + + + + 4 + + + + a + + + + c + + + + + + + + 2 + + + + a + + + + + diff --git a/tests/01.xhtml b/tests/01.xhtml --- a/tests/01.xhtml +++ b/tests/01.xhtml @@ -10,16 +10,16 @@ = - − + − b - ± + ± b 2 - − + − 4 a c diff --git a/tests/02.omml b/tests/02.omml new file mode 100644 --- /dev/null +++ b/tests/02.omml @@ -0,0 +1,72 @@ + + + + + + 2 + + + + = + + + + + + + + + + + + + + + + + + + + + + + 3 + + + + − + + + + x + + + + + + × + + + + 2 + + + + + + 3 + + + + − + + + + x + + + + + + + diff --git a/tests/02.xhtml b/tests/02.xhtml --- a/tests/02.xhtml +++ b/tests/02.xhtml @@ -15,16 +15,16 @@ ( 3 - − + − x ) - × + × 2 3 - − + − x diff --git a/tests/03.omml b/tests/03.omml new file mode 100644 --- /dev/null +++ b/tests/03.omml @@ -0,0 +1,51 @@ + + + + + + a + + + + + + x + + + + + + 2 + + + + + + + + + + + b + + + + x + + + + + + + + + c + + + + = + + + + 0 + + + diff --git a/tests/04.omml b/tests/04.omml new file mode 100644 --- /dev/null +++ b/tests/04.omml @@ -0,0 +1,89 @@ + + + + + + + + S + + + + + + + + new + + + + + + = + + + + + + S + + + + + + + + old + + + + + + − + + + + + + + + + + + + + + + + + + 5 + + + + − + + + + T + + + + + + + + 2 + + + + + + + + 2 + + + + + diff --git a/tests/04.xhtml b/tests/04.xhtml --- a/tests/04.xhtml +++ b/tests/04.xhtml @@ -15,13 +15,13 @@ S old - − + − ( 5 - − + − T ) diff --git a/tests/05.omml b/tests/05.omml new file mode 100644 --- /dev/null +++ b/tests/05.omml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + a + + + + + + x + + + + + + + + + + + + + + + f + + + + + + a + + + + + + s + + + + + + ( + + + + y + + + + ) + + + +   + + + + d + + + + y + + + +   + + + + d + + + + s + + + + = + + + + + + + + + + + + + f + + + + + + a + + + + + + x + + + + + + ( + + + + y + + + + ) + + + + ( + + + + x + + + + − + + + + y + + + + ) + + + +   + + + + d + + + + y + + + diff --git a/tests/05.xhtml b/tests/05.xhtml --- a/tests/05.xhtml +++ b/tests/05.xhtml @@ -7,7 +7,7 @@ - ∫ + ∫ a x @@ -15,7 +15,7 @@ - ∫ + ∫ a s @@ -31,7 +31,7 @@ s = - ∫ + ∫ a x @@ -41,7 +41,7 @@ ) ( x - − + − y ) diff --git a/tests/06.omml b/tests/06.omml new file mode 100644 --- /dev/null +++ b/tests/06.omml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + m + + + + + + 2 + + + + + +   + + + + n + + + + + + + + 3 + + + + + + m + + + + + + + + + + + + + m + + + +   + + + + + + 3 + + + + + + n + + + + + + + + + + + n + + + +   + + + + + + 3 + + + + + + m + + + + + + + + + + + + n + + + + = + + + + 1 + + + + + + ∞ + + + + + + + + m + + + + = + + + + 1 + + + + + + ∞ + + + + + diff --git a/tests/06.xhtml b/tests/06.xhtml --- a/tests/06.xhtml +++ b/tests/06.xhtml @@ -7,22 +7,22 @@ - ∑ + ∑ m = 1 - ∞ + ∞ - ∑ + ∑ n = 1 - ∞ + ∞ diff --git a/tests/07.omml b/tests/07.omml new file mode 100644 --- /dev/null +++ b/tests/07.omml @@ -0,0 +1,105 @@ + + + + + + u + + + + ʺ + + + + + + + + + p + + + + ( + + + + x + + + + ) + + + + u + + + + ʹ + + + + + + + + + q + + + + ( + + + + x + + + + ) + + + + u + + + + = + + + + f + + + + ( + + + + x + + + + ) + + + + , + + + +   + + + + x + + + + > + + + + a + + + diff --git a/tests/07.xhtml b/tests/07.xhtml --- a/tests/07.xhtml +++ b/tests/07.xhtml @@ -7,14 +7,14 @@ u - ʺ + ʺ + p ( x ) u - ʹ + ʹ + q ( diff --git a/tests/08.omml b/tests/08.omml new file mode 100644 --- /dev/null +++ b/tests/08.omml @@ -0,0 +1,161 @@ + + + + + + ∣ + + + + + + + + + z + + + + + + ∣ + + + + = + + + + ∣ + + + + z + + + + ∣ + + + + , + + + + ∣ + + + + ( + + + + + + + + + z + + + + + + + + ) + + + + + + n + + + + + + ∣ + + + + = + + + + ∣ + + + + z + + + + + + ∣ + + + + + + n + + + + + + , + + + + arg + + + + ( + + + + + + z + + + + + + n + + + + + + ) + + + + = + + + + n + + + + arg + + + + ( + + + + z + + + + ) + + + diff --git a/tests/08.xhtml b/tests/08.xhtml --- a/tests/08.xhtml +++ b/tests/08.xhtml @@ -6,33 +6,33 @@ - ∣ + ∣ z - ‾ + ‾ - ∣ + ∣ = - ∣ + ∣ z - ∣ + ∣ , - ∣ + ∣ ( z - ‾ + ‾ ) n - ∣ + ∣ = - ∣ + ∣ z - ∣ + ∣ n , diff --git a/tests/09.omml b/tests/09.omml new file mode 100644 --- /dev/null +++ b/tests/09.omml @@ -0,0 +1,83 @@ + + + + + + + + lim + + + + + + z + + + + → + + + + + + z + + + + + + 0 + + + + + + + + f + + + + ( + + + + z + + + + ) + + + + = + + + + f + + + + ( + + + + + + z + + + + + + 0 + + + + + + ) + + + diff --git a/tests/09.xhtml b/tests/09.xhtml --- a/tests/09.xhtml +++ b/tests/09.xhtml @@ -10,7 +10,7 @@ lim z - → + → z 0 diff --git a/tests/10.omml b/tests/10.omml new file mode 100644 --- /dev/null +++ b/tests/10.omml @@ -0,0 +1,243 @@ + + + + + + + + φ + + + + + + n + + + + + + ( + + + + κ + + + + ) + + + + = + + + + + + + + + 1 + + + + + + 4 + + + + + + π + + + + + + 2 + + + + + + + + κ + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + sin + + + + ( + + + + κ + + + + R + + + + ) + + + + + + κ + + + + R + + + + + + + + 0 + + + + + + ∞ + + + + + + + + + + + ∂ + + + + + + ∂ + + + + R + + + + + + + + + + + + + + + R + + + + + + 2 + + + + + + + + + + + ∂ + + + + + + D + + + + + + n + + + + + + ( + + + + R + + + + ) + + + + + + ∂ + + + + R + + + + + + + +   + + + + d + + + + R + + + diff --git a/tests/10.xhtml b/tests/10.xhtml --- a/tests/10.xhtml +++ b/tests/10.xhtml @@ -7,11 +7,11 @@ - φ + φ n ( - κ + κ ) = @@ -19,37 +19,37 @@ 4 - π + π 2 - κ + κ 2 - ∫ + ∫ 0 - ∞ + ∞ sin ( - κ + κ R ) - κ + κ R - ∂ + ∂ - ∂ + ∂ R @@ -61,7 +61,7 @@ - ∂ + ∂ D n @@ -71,7 +71,7 @@ ) - ∂ + ∂ R diff --git a/tests/11.omml b/tests/11.omml new file mode 100644 --- /dev/null +++ b/tests/11.omml @@ -0,0 +1,167 @@ + + + + + + + + φ + + + + + + n + + + + + + ( + + + + κ + + + + ) + + + + = + + + + 0 + + + + . + + + + 033 + + + + + + C + + + + + + n + + + + + + 2 + + + + + + + + κ + + + + + + − + + + + 11 + + + + / + + + + 3 + + + + + + , + + + +   + + + + + + + + + 1 + + + + + + + + L + + + + + + 0 + + + + + + + + ≪ + + + + κ + + + + ≪ + + + + + + + + + 1 + + + + + + + + l + + + + + + 0 + + + + + + + diff --git a/tests/11.xhtml b/tests/11.xhtml --- a/tests/11.xhtml +++ b/tests/11.xhtml @@ -7,11 +7,11 @@ - φ + φ n ( - κ + κ ) = 0 @@ -23,9 +23,9 @@ 2 - κ + κ - − + − 11 / 3 @@ -40,9 +40,9 @@ 0 - ≪ - κ - ≪ + ≪ + κ + ≪ 1 diff --git a/tests/12.omml b/tests/12.omml new file mode 100644 --- /dev/null +++ b/tests/12.omml @@ -0,0 +1,160 @@ + + + + + + f + + + + ( + + + + x + + + + ) + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + − + + + + 1 + + + + ≤ + + + + x + + + + < + + + + 0 + + + + + + + + + + + + + 1 + + + + + + 2 + + + + + + + + x + + + + = + + + + 0 + + + + + + + + 1 + + + + − + + + + + + x + + + + + + 2 + + + + + + + + + + otherwise + + + + + + + + diff --git a/tests/12.xhtml b/tests/12.xhtml --- a/tests/12.xhtml +++ b/tests/12.xhtml @@ -19,9 +19,9 @@ 1 - − + − 1 - ≤ + ≤ x < 0 @@ -43,7 +43,7 @@ 1 - − + − x 2 diff --git a/tests/13.omml b/tests/13.omml new file mode 100644 --- /dev/null +++ b/tests/13.omml @@ -0,0 +1,339 @@ + + + + + + + + + p + + + + + + + + F + + + + + + q + + + + + + ( + + + + + + a + + + + + + 1 + + + + + + , + + + + … + + + + , + + + + + + a + + + + + + p + + + + + + ; + + + + + + c + + + + + + 1 + + + + + + , + + + + … + + + + , + + + + + + c + + + + + + q + + + + + + ; + + + + z + + + + ) + + + + = + + + + + + + + + + + + + + + + + + ( + + + + + + a + + + + + + 1 + + + + + + + + ) + + + + + + n + + + + + + ⋯ + + + + ( + + + + + + a + + + + + + p + + + + + + + + ) + + + + + + n + + + + + + + + ( + + + + + + c + + + + + + 1 + + + + + + + + ) + + + + + + n + + + + + + ⋯ + + + + ( + + + + + + c + + + + + + q + + + + + + + + ) + + + + + + n + + + + + + + + + + n + + + + = + + + + 0 + + + + + + ∞ + + + + + + + + + + + + + z + + + + + + n + + + + + + + + n + + + + ! + + + + + diff --git a/tests/13.xhtml b/tests/13.xhtml --- a/tests/13.xhtml +++ b/tests/13.xhtml @@ -20,7 +20,7 @@ 1 , - … + … , a @@ -32,7 +32,7 @@ 1 , - … + … , c @@ -43,13 +43,13 @@ ) = - ∑ + ∑ n = 0 - ∞ + ∞ @@ -62,7 +62,7 @@ ) n - ⋯ + ⋯ ( a @@ -83,7 +83,7 @@ ) n - ⋯ + ⋯ ( c diff --git a/tests/14.omml b/tests/14.omml new file mode 100644 --- /dev/null +++ b/tests/14.omml @@ -0,0 +1,43 @@ + + + + + + + + + + + a + + + + + + b + + + + + + + + + + + + + + + a + + + + + + b + + + + + diff --git a/tests/15.omml b/tests/15.omml new file mode 100644 --- /dev/null +++ b/tests/15.omml @@ -0,0 +1,22 @@ + + + + + + + + + + + a + + + + + + 2 + + + + + diff --git a/tests/16.omml b/tests/16.omml new file mode 100644 --- /dev/null +++ b/tests/16.omml @@ -0,0 +1,17 @@ + + + + + + 3 + + + + × + + + + 4 + + + diff --git a/tests/16.xhtml b/tests/16.xhtml --- a/tests/16.xhtml +++ b/tests/16.xhtml @@ -7,7 +7,7 @@ 3 - × + × 4 diff --git a/tests/17.omml b/tests/17.omml new file mode 100644 --- /dev/null +++ b/tests/17.omml @@ -0,0 +1,33 @@ + + + + + + x + + + + * + + + + 4 + + + + = + + + + 4 + + + + * + + + + x + + + diff --git a/tests/18.omml b/tests/18.omml new file mode 100644 --- /dev/null +++ b/tests/18.omml @@ -0,0 +1,29 @@ + + + + + + 1 + + + + . + + + + 3 + + + + × + + + + . + + + + 2 + + + diff --git a/tests/18.xhtml b/tests/18.xhtml --- a/tests/18.xhtml +++ b/tests/18.xhtml @@ -9,7 +9,7 @@ 1 . 3 - × + × . 2 diff --git a/tests/19.omml b/tests/19.omml new file mode 100644 --- /dev/null +++ b/tests/19.omml @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ∂ + + + + + + x + + + + + + 1 + + + + + + + + ∂ + + + + + + y + + + + + + 1 + + + + + + + + + + + + + + + ∂ + + + + + + x + + + + + + 2 + + + + + + + + ∂ + + + + + + y + + + + + + 1 + + + + + + + + + + + +   + + + + + + + + + + + + + ∂ + + + + + + x + + + + + + 1 + + + + + + + + ∂ + + + + + + y + + + + + + 2 + + + + + + + + + + + + + + + ∂ + + + + + + x + + + + + + 2 + + + + + + + + ∂ + + + + + + y + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + 2 + + + + + + + + 3 + + + + + + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + 2 + + + + + + + + 3 + + + + + + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + 2 + + + + + + + + 3 + + + + + + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + 2 + + + + + + + + 3 + + + + + + 4 + + + + + + + + diff --git a/tests/19.xhtml b/tests/19.xhtml --- a/tests/19.xhtml +++ b/tests/19.xhtml @@ -14,14 +14,14 @@ - ∂ + ∂ x 1 - ∂ + ∂ y 1 @@ -34,14 +34,14 @@ - ∂ + ∂ x 2 - ∂ + ∂ y 1 @@ -61,14 +61,14 @@ - ∂ + ∂ x 1 - ∂ + ∂ y 2 @@ -81,14 +81,14 @@ - ∂ + ∂ x 2 - ∂ + ∂ y 2 @@ -146,7 +146,7 @@ } - ∣ + ∣ @@ -165,10 +165,10 @@ - ∣ + ∣ - ∥ + ∥ @@ -187,7 +187,7 @@ - ∥ + ∥ diff --git a/tests/axiom_of_power_set.omml b/tests/axiom_of_power_set.omml new file mode 100644 --- /dev/null +++ b/tests/axiom_of_power_set.omml @@ -0,0 +1,113 @@ + + + + + + ∀ + + + + A + + + +   + + + + ∃ + + + + P + + + +   + + + + ∀ + + + + B + + + +   + + + + [ + + + + B + + + + ∈ + + + + P + + + + ⇔ + + + + ∀ + + + + C + + + +   + + + + ( + + + + C + + + + ∈ + + + + B + + + + ⇒ + + + + C + + + + ∈ + + + + A + + + + ) + + + + ] + + + diff --git a/tests/axiom_of_power_set.xhtml b/tests/axiom_of_power_set.xhtml --- a/tests/axiom_of_power_set.xhtml +++ b/tests/axiom_of_power_set.xhtml @@ -6,30 +6,30 @@ - ∀ + ∀ A - ∃ + ∃ P - ∀ + ∀ B [ B - ∈ + ∈ P - ⇔ - ∀ + ⇔ + ∀ C ( C - ∈ + ∈ B - ⇒ + ⇒ C - ∈ + ∈ A ) ] diff --git a/tests/binomial_coefficient.omml b/tests/binomial_coefficient.omml new file mode 100644 --- /dev/null +++ b/tests/binomial_coefficient.omml @@ -0,0 +1,171 @@ + + + + + + + + C + + + + ( + + + + n + + + + , + + + + k + + + + ) + + + + = + + + + + + + + C + + + + + + k + + + + + + n + + + + + + = + + + + + + + n + + + + + + + + + + C + + + + + + k + + + + + + = + + + + + + + + + + + + + + n + + + + + + k + + + + + + + + = + + + + + + + + + n + + + + ! + + + + + + k + + + + ! + + + +   + + + + ( + + + + n + + + + − + + + + k + + + + ) + + + + ! + + + + + diff --git a/tests/binomial_coefficient.xhtml b/tests/binomial_coefficient.xhtml --- a/tests/binomial_coefficient.xhtml +++ b/tests/binomial_coefficient.xhtml @@ -46,7 +46,7 @@ ( n - − + − k ) ! diff --git a/tests/complex_number.omml b/tests/complex_number.omml new file mode 100644 --- /dev/null +++ b/tests/complex_number.omml @@ -0,0 +1,94 @@ + + + + + + c + + + + = + + + + + + + + + + + + + + + a + + + + + + ︸ + + + + + + + + + + real + + + + + + + + + + + + + + + b + + + + + + i + + + + + + ︸ + + + + + + + + + + imaginary + + + + + + + + + + + + complex number + + + + + diff --git a/tests/complex_number.xhtml b/tests/complex_number.xhtml --- a/tests/complex_number.xhtml +++ b/tests/complex_number.xhtml @@ -14,7 +14,7 @@ a - ︸ + ︸ real @@ -25,12 +25,12 @@ b i - ︸ + ︸ imaginary - ︷ + ︷ complex number diff --git a/tests/deMorgans_law.omml b/tests/deMorgans_law.omml new file mode 100644 --- /dev/null +++ b/tests/deMorgans_law.omml @@ -0,0 +1,177 @@ + + + + + + ¬ + + + + ( + + + + p + + + + ∧ + + + + q + + + + ) + + + + ⇔ + + + + ( + + + + ¬ + + + + p + + + + ) + + + + ∨ + + + + ( + + + + ¬ + + + + q + + + + ) + + + + + + + + + + + + + + + + + + + + A + + + + + + i + + + + + + + + i + + + + = + + + + 1 + + + + + + n + + + + + + + + = + + + + + + + + + + + + + + + + + + + + A + + + + + + i + + + + + + + + + + i + + + + = + + + + 1 + + + + + + n + + + + + diff --git a/tests/deMorgans_law.xhtml b/tests/deMorgans_law.xhtml --- a/tests/deMorgans_law.xhtml +++ b/tests/deMorgans_law.xhtml @@ -6,26 +6,26 @@ - ¬ + ¬ ( p - ∧ + ∧ q ) - ⇔ + ⇔ ( - ¬ + ¬ p ) - ∨ + ∨ ( - ¬ + ¬ q ) - ⋃ + ⋃ i = @@ -38,11 +38,11 @@ i - ¯ + ¯ = - ⋂ + ⋂ i = @@ -55,7 +55,7 @@ A i - ¯ + ¯ diff --git a/tests/differentiable_manifold.omml b/tests/differentiable_manifold.omml new file mode 100644 --- /dev/null +++ b/tests/differentiable_manifold.omml @@ -0,0 +1,325 @@ + + + + + + + + γ + + + + + + 1 + + + + + + ≡ + + + + + + γ + + + + + + 2 + + + + + + ⇔ + + + + { + + + + + + + + + + + + + + + + + + + + + + + + + γ + + + + + + 1 + + + + + + ( + + + + 0 + + + + ) + + + + = + + + + + + γ + + + + + + 2 + + + + + + ( + + + + 0 + + + + ) + + + + = + + + + p + + + + , + + + + + + and + + + + + + + + + + + + + + + + + + + + + + + + d + + + + + + + + d + + + + t + + + + + + φ + + + + ∘ + + + + + + γ + + + + + + 1 + + + + + + ( + + + + t + + + + ) + + + + + + + + t + + + + = + + + + 0 + + + + + + = + + + + + + + + + + + + + + + + + + + + d + + + + + + + + d + + + + t + + + + + + φ + + + + ∘ + + + + + + γ + + + + + + 2 + + + + + + ( + + + + t + + + + ) + + + + + + + + t + + + + = + + + + 0 + + + + + + + + +  + + + diff --git a/tests/differentiable_manifold.xhtml b/tests/differentiable_manifold.xhtml --- a/tests/differentiable_manifold.xhtml +++ b/tests/differentiable_manifold.xhtml @@ -7,21 +7,21 @@ - γ + γ 1 - ≡ + ≡ - γ + γ 2 - ⇔ + ⇔ { - γ + γ 1 ( @@ -29,7 +29,7 @@ ) = - γ + γ 2 ( @@ -56,16 +56,16 @@ t - φ - ∘ + φ + ∘ - γ + γ 1 ( t ) - ∣ + ∣ t @@ -84,16 +84,16 @@ t - φ - ∘ + φ + ∘ - γ + γ 2 ( t ) - ∣ + ∣ t diff --git a/tests/divergence.omml b/tests/divergence.omml new file mode 100644 --- /dev/null +++ b/tests/divergence.omml @@ -0,0 +1,141 @@ + + + + + + ∇ + + + + ⋅ + + + + + + + + + v + + + + + + = + + + + + + + + + ∂ + + + + + + v + + + + + + x + + + + + + + + ∂ + + + + x + + + + + + + + + + + + + + + + ∂ + + + + + + v + + + + + + y + + + + + + + + ∂ + + + + y + + + + + + + + + + + + + + + + ∂ + + + + + + v + + + + + + z + + + + + + + + ∂ + + + + z + + + + + diff --git a/tests/divergence.xhtml b/tests/divergence.xhtml --- a/tests/divergence.xhtml +++ b/tests/divergence.xhtml @@ -6,51 +6,51 @@ - ∇ - ⋅ + ∇ + ⋅ v - ⃗ + ⃗ = - ∂ + ∂ v x - ∂ + ∂ x + - ∂ + ∂ v y - ∂ + ∂ y + - ∂ + ∂ v z - ∂ + ∂ z diff --git a/tests/ensuremath.omml b/tests/ensuremath.omml new file mode 100644 --- /dev/null +++ b/tests/ensuremath.omml @@ -0,0 +1,19 @@ + + + + + + + + π + + + + + + 2 + + + + + diff --git a/tests/ensuremath.xhtml b/tests/ensuremath.xhtml --- a/tests/ensuremath.xhtml +++ b/tests/ensuremath.xhtml @@ -7,7 +7,7 @@ - π + π 2 diff --git a/tests/macros.omml b/tests/macros.omml new file mode 100644 --- /dev/null +++ b/tests/macros.omml @@ -0,0 +1,37 @@ + + + + + + 2 + + + + 5 + + + + y + + + + + + + + + 3 + + + + x + + + + + + + + + 3 + + + diff --git a/tests/moore_determinant.omml b/tests/moore_determinant.omml new file mode 100644 --- /dev/null +++ b/tests/moore_determinant.omml @@ -0,0 +1,334 @@ + + + + + + M + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + α + + + + + + 1 + + + + + + + + + + α + + + + + + 1 + + + + + + q + + + + + + + + ⋯ + + + + + + + + α + + + + + + 1 + + + + + + + + q + + + + + + n + + + + − + + + + 1 + + + + + + + + + + + + + + α + + + + + + 2 + + + + + + + + + + α + + + + + + 2 + + + + + + q + + + + + + + + ⋯ + + + + + + + + α + + + + + + 2 + + + + + + + + q + + + + + + n + + + + − + + + + 1 + + + + + + + + + + + + ⋮ + + + + + + ⋮ + + + + + + ⋱ + + + + + + ⋮ + + + + + + + + + + α + + + + + + m + + + + + + + + + + α + + + + + + m + + + + + + q + + + + + + + + ⋯ + + + + + + + + α + + + + + + m + + + + + + + + q + + + + + + n + + + + − + + + + 1 + + + + + + + + + + + + diff --git a/tests/moore_determinant.xhtml b/tests/moore_determinant.xhtml --- a/tests/moore_determinant.xhtml +++ b/tests/moore_determinant.xhtml @@ -14,29 +14,29 @@ - α + α 1 - α + α 1 q - ⋯ + ⋯ - α + α 1 q n - − + − 1 @@ -46,29 +46,29 @@ - α + α 2 - α + α 2 q - ⋯ + ⋯ - α + α 2 q n - − + − 1 @@ -77,44 +77,44 @@ - ⋮ + ⋮ - ⋮ + ⋮ - ⋱ + ⋱ - ⋮ + ⋮ - α + α m - α + α m q - ⋯ + ⋯ - α + α m q n - − + − 1 diff --git a/tests/quadratic_formula.omml b/tests/quadratic_formula.omml new file mode 100644 --- /dev/null +++ b/tests/quadratic_formula.omml @@ -0,0 +1,80 @@ + + + + + + x + + + + = + + + + + + + + + − + + + + b + + + + ± + + + + + + + + + + + + b + + + + + + 2 + + + + + + − + + + + 4 + + + + a + + + + c + + + + + + + + 2 + + + + a + + + + + diff --git a/tests/quadratic_formula.xhtml b/tests/quadratic_formula.xhtml --- a/tests/quadratic_formula.xhtml +++ b/tests/quadratic_formula.xhtml @@ -10,16 +10,16 @@ = - − + − b - ± + ± b 2 - − + − 4 a c diff --git a/tests/runtests.sh b/tests/runtests.sh --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -5,23 +5,37 @@ # Otherwise the test program 'texmath' won't be built. # Exit status is number of failed tests. TESTPROG=../dist/build/texmath/texmath -failures=0 -passes=0 -if [ -f $TESTPROG ]; then - for t in *.tex; do - $TESTPROG <$t >tmp - diff ${t%.tex}.xhtml tmp >tmpdiff - if [ "$?" -ne "0" ]; then - echo "Test ${t%.tex} FAILED (< expected, > actual):" - cat tmpdiff +totalfailures=0 + +for format in xhtml omml; do + failures=0 + passes=0 + if [ -f $TESTPROG ]; then + for t in *.tex; do + $TESTPROG --${format} <$t >tmp + testname="Test ${t%.tex} ${format}" + if [ "$?" -ne "0" ]; then + echo "${testname} FAILED" failures=`expr $failures + 1` - else - echo "Test ${t%.tex} PASSED" - passes=`expr $passes + 1` - fi - done -else - echo "Test executable not built. NOT running tests." -fi -echo "$passes tests passed, $failures tests failed." + else + diff -u ${t%.tex}.${format} tmp >tmpdiff + if [ "$?" -ne "0" ]; then + echo "${testname} (- expected, + actual):" + cat tmpdiff + failures=`expr $failures + 1` + else + echo "${testname} PASSED" + passes=`expr $passes + 1` + fi + fi + done + else + echo "Test executable not built. NOT running tests." + fi + echo "$format: $passes tests passed, $failures tests failed." + totalfailures=`expr $totalfailures + $failures` +done +echo "$totalfailures tests failed total." exit $failures + + diff --git a/tests/schwinger_dyson.omml b/tests/schwinger_dyson.omml new file mode 100644 --- /dev/null +++ b/tests/schwinger_dyson.omml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + ψ + + + + + + + + + + + 𝒯 + + + + + + + + + + + + + + + + δ + + + + + + δ + + + + φ + + + + + + F + + + + [ + + + + φ + + + + ] + + + + + + + + ψ + + + + + + = + + + + − + + + + + + i + + + + + + + + + + + ψ + + + + + + + + + + + 𝒯 + + + + + + + + + + + F + + + + [ + + + + φ + + + + ] + + + + + + + + + δ + + + + + + δ + + + + φ + + + + + + S + + + + [ + + + + φ + + + + ] + + + + + + + + ψ + + + + + diff --git a/tests/schwinger_dyson.xhtml b/tests/schwinger_dyson.xhtml --- a/tests/schwinger_dyson.xhtml +++ b/tests/schwinger_dyson.xhtml @@ -7,63 +7,63 @@ - ⟨ - ψ + ⟨ + ψ - ∣ - 𝒯 + ∣ + 𝒯 { - δ + δ - δ - φ + δ + φ F [ - φ + φ ] } - ∣ + ∣ - ψ - ⟩ + ψ + ⟩ = - − + − i - ⟨ - ψ + ⟨ + ψ - ∣ - 𝒯 + ∣ + 𝒯 { F [ - φ + φ ] - δ + δ - δ - φ + δ + φ S [ - φ + φ ] } - ∣ + ∣ - ψ - ⟩ + ψ + ⟩ diff --git a/tests/sophomores_dream.omml b/tests/sophomores_dream.omml new file mode 100644 --- /dev/null +++ b/tests/sophomores_dream.omml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + x + + + + + + x + + + + + + + + 0 + + + + + + 1 + + + + + +   + + + + + + d + + + + x + + + + = + + + + + + + + + + + + + ( + + + + − + + + + 1 + + + + + + ) + + + + + + n + + + + + + + + + 1 + + + + + +   + + + + + + n + + + + + + − + + + + n + + + + + + + + n + + + + = + + + + 1 + + + + + + ∞ + + + + + diff --git a/tests/sophomores_dream.xhtml b/tests/sophomores_dream.xhtml --- a/tests/sophomores_dream.xhtml +++ b/tests/sophomores_dream.xhtml @@ -7,7 +7,7 @@ - ∫ + ∫ 0 1 @@ -20,17 +20,17 @@ x = - ∑ + ∑ n = 1 - ∞ + ∞ ( - − + − 1 ) @@ -44,7 +44,7 @@ n - − + − n diff --git a/tests/sphere_volume.omml b/tests/sphere_volume.omml new file mode 100644 --- /dev/null +++ b/tests/sphere_volume.omml @@ -0,0 +1,614 @@ + + + + + + S + + + + = + + + + { + + + + 0 + + + + ≤ + + + + φ + + + + ≤ + + + + 2 + + + + π + + + + , + + + + + + + + 0 + + + + ≤ + + + + θ + + + + ≤ + + + + π + + + + , + + + + + + + + 0 + + + + ≤ + + + + ρ + + + + ≤ + + + + R + + + + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Volume + + + + + + = + + + + + + + + + + + + + + + S + + + + + + + + ρ + + + + + + 2 + + + + + + sin + + + + θ + + + +   + + + + + + d + + + + ρ + + + +   + + + + + + d + + + + θ + + + +   + + + + + + d + + + + φ + + + + + + + + + = + + + + + + + + + + + + + + 0 + + + + + + 2 + + + + π + + + + + + + + d + + + + φ + + + +   + + + + + + + + + + + + + + 0 + + + + + + π + + + + + + sin + + + + θ + + + +   + + + + + + d + + + + θ + + + +   + + + + + + + + + + + + + + 0 + + + + + + R + + + + + + + + ρ + + + + + + 2 + + + + + + + + d + + + + ρ + + + + + + + + + = + + + + φ + + + + + + ∣ + + + + + + 0 + + + + + + 2 + + + + π + + + + + + + + + + ( + + + + − + + + + cos + + + + θ + + + + ) + + + + + + ∣ + + + + + + 0 + + + + + + π + + + + + + + + + + + + + + + 1 + + + + + + 3 + + + + + + + + ρ + + + + + + 3 + + + + + + + + ∣ + + + + + + 0 + + + + + + R + + + + + + + + + + + = + + + + 2 + + + + π + + + + × + + + + 2 + + + + × + + + + + + + + + 1 + + + + + + 3 + + + + + + + + R + + + + + + 3 + + + + + + + + + + + = + + + + + + + + + 4 + + + + + + 3 + + + + + + π + + + + + + R + + + + + + 3 + + + + + + + + diff --git a/tests/sphere_volume.xhtml b/tests/sphere_volume.xhtml --- a/tests/sphere_volume.xhtml +++ b/tests/sphere_volume.xhtml @@ -10,24 +10,24 @@ = { 0 - ≤ - φ - ≤ + ≤ + φ + ≤ 2 - π + π , 0 - ≤ - θ - ≤ - π + ≤ + θ + ≤ + π , 0 - ≤ - ρ - ≤ + ≤ + ρ + ≤ R } @@ -38,25 +38,25 @@ = - ∭ + ∭ S - ρ + ρ 2 sin - θ + θ d - ρ + ρ d - θ + θ d - φ + φ @@ -64,66 +64,66 @@ = - ∫ + ∫ 0 2 - π + π d - φ + φ - ∫ + ∫ 0 - π + π sin - θ + θ d - θ + θ - ∫ + ∫ 0 R - ρ + ρ 2 d - ρ + ρ = - φ + φ - ∣ + ∣ 0 2 - π + π ( - − + − cos - θ + θ ) - ∣ + ∣ 0 - π + π @@ -133,11 +133,11 @@ - ρ + ρ 3 - ∣ + ∣ 0 R @@ -148,10 +148,10 @@ = 2 - π - × + π + × 2 - × + × 1 @@ -174,7 +174,7 @@ 3 - π + π R 3 diff --git a/tests/unicode.omml b/tests/unicode.omml new file mode 100644 --- /dev/null +++ b/tests/unicode.omml @@ -0,0 +1,25 @@ + + + + + + f + + + + : + + + + X + + + + → + + + + Y + + + diff --git a/tests/unicode.xhtml b/tests/unicode.xhtml --- a/tests/unicode.xhtml +++ b/tests/unicode.xhtml @@ -9,7 +9,7 @@ f : X - → + → Y diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,12 +1,13 @@ Name: texmath -Version: 0.5.0.4 +Version: 0.6 Cabal-Version: >= 1.6 Build-type: Custom -Synopsis: Conversion of LaTeX math formulas to MathML. +Synopsis: Conversion of LaTeX math formulas to MathML or OMML. Description: The texmathml library provides functions to convert LaTeX - math formulas to presentation MathML. It supports - basic LaTeX and AMS extensions, and it can parse and - apply LaTeX macros. + math formulas to presentation MathML (which can be used + in HTML) or OMML (Office Math Markup Language, used in + Microsoft Office). It supports basic LaTeX and AMS + extensions, and it can parse and apply LaTeX macros. . Use the @test@ flag to install a standalone executable, @texmath@, that reads a LaTeX formula from @stdin@ and @@ -24,39 +25,39 @@ Homepage: http://github.com/jgm/texmath Data-Files: cgi/texmath.xhtml, tests/runtests.sh, - tests/01.tex, tests/01.xhtml, - tests/02.tex, tests/02.xhtml, - tests/03.tex, tests/03.xhtml, - tests/04.tex, tests/04.xhtml, - tests/05.tex, tests/05.xhtml, - tests/06.tex, tests/06.xhtml, - tests/07.tex, tests/07.xhtml, - tests/08.tex, tests/08.xhtml, - tests/09.tex, tests/09.xhtml, - tests/10.tex, tests/10.xhtml, - tests/11.tex, tests/11.xhtml, - tests/12.tex, tests/12.xhtml, - tests/13.tex, tests/13.xhtml, - tests/14.tex, tests/14.xhtml, - tests/15.tex, tests/15.xhtml, - tests/16.tex, tests/16.xhtml, - tests/17.tex, tests/17.xhtml, - tests/18.tex, tests/18.xhtml, - tests/19.tex, tests/19.xhtml, - tests/axiom_of_power_set.tex, tests/axiom_of_power_set.xhtml, - tests/binomial_coefficient.tex, tests/binomial_coefficient.xhtml, - tests/complex_number.tex, tests/complex_number.xhtml, - tests/deMorgans_law.tex, tests/deMorgans_law.xhtml, - tests/differentiable_manifold.tex, tests/differentiable_manifold.xhtml, - tests/divergence.tex, tests/divergence.xhtml, - tests/moore_determinant.tex, tests/moore_determinant.xhtml, - tests/quadratic_formula.tex, tests/quadratic_formula.xhtml, - tests/schwinger_dyson.tex, tests/schwinger_dyson.xhtml, - tests/sophomores_dream.tex, tests/sophomores_dream.xhtml, - tests/sphere_volume.tex, tests/sphere_volume.xhtml, - tests/unicode.tex, tests/unicode.xhtml - tests/ensuremath.tex, tests/ensuremath.xhtml - tests/macros.tex, tests/macros.xhtml + tests/01.tex, tests/01.xhtml, tests/01.omml, + tests/02.tex, tests/02.xhtml, tests/02.omml, + tests/03.tex, tests/03.xhtml, tests/03.omml, + tests/04.tex, tests/04.xhtml, tests/04.omml, + tests/05.tex, tests/05.xhtml, tests/05.omml, + tests/06.tex, tests/06.xhtml, tests/06.omml, + tests/07.tex, tests/07.xhtml, tests/07.omml, + tests/08.tex, tests/08.xhtml, tests/08.omml, + tests/09.tex, tests/09.xhtml, tests/09.omml, + tests/10.tex, tests/10.xhtml, tests/10.omml, + tests/11.tex, tests/11.xhtml, tests/11.omml, + tests/12.tex, tests/12.xhtml, tests/12.omml, + tests/13.tex, tests/13.xhtml, tests/13.omml, + tests/14.tex, tests/14.xhtml, tests/14.omml, + tests/15.tex, tests/15.xhtml, tests/15.omml, + tests/16.tex, tests/16.xhtml, tests/16.omml, + tests/17.tex, tests/17.xhtml, tests/17.omml, + tests/18.tex, tests/18.xhtml, tests/18.omml, + tests/19.tex, tests/19.xhtml, tests/19.omml, + tests/axiom_of_power_set.tex, tests/axiom_of_power_set.xhtml, tests/axiom_of_power_set.omml, + tests/binomial_coefficient.tex, tests/binomial_coefficient.xhtml, tests/binomial_coefficient.omml, + tests/complex_number.tex, tests/complex_number.xhtml, tests/complex_number.omml, + tests/deMorgans_law.tex, tests/deMorgans_law.xhtml, tests/deMorgans_law.omml, + tests/differentiable_manifold.tex, tests/differentiable_manifold.xhtml, tests/differentiable_manifold.omml, + tests/divergence.tex, tests/divergence.xhtml, tests/divergence.omml, + tests/moore_determinant.tex, tests/moore_determinant.xhtml, tests/moore_determinant.omml, + tests/quadratic_formula.tex, tests/quadratic_formula.xhtml, tests/quadratic_formula.omml, + tests/schwinger_dyson.tex, tests/schwinger_dyson.xhtml, tests/schwinger_dyson.omml, + tests/sophomores_dream.tex, tests/sophomores_dream.xhtml, tests/sophomores_dream.omml, + tests/sphere_volume.tex, tests/sphere_volume.xhtml, tests/sphere_volume.omml, + tests/unicode.tex, tests/unicode.xhtml, tests/unicode.omml, + tests/ensuremath.tex, tests/ensuremath.xhtml, tests/ensuremath.omml, + tests/macros.tex, tests/macros.xhtml, tests/macros.omml Source-repository head type: git @@ -80,6 +81,7 @@ Text.TeXMath.Types Text.TeXMath.Parser Text.TeXMath.MathML + Text.TeXMath.OMML Text.TeXMath.Macros if impl(ghc >= 6.12) diff --git a/texmath.hs b/texmath.hs --- a/texmath.hs +++ b/texmath.hs @@ -2,12 +2,15 @@ module Main where import Text.TeXMath +import Text.TeXMath.Parser (parseFormula) import Text.XML.Light import Text.TeXMath.Macros import System.IO +import System.Environment -inHtml :: Element -> Element -inHtml x = +inHtml :: Either String Element -> Either String Element +inHtml (Left x) = Left x +inHtml (Right x) = Right $ add_attr (Attr (unqual "xmlns") "http://www.w3.org/1999/xhtml") $ unode "html" [ unode "head" $ @@ -26,8 +29,17 @@ main :: IO () main = do + args <- getArgs + let dt = if "--inline" `elem` args + then DisplayInline + else DisplayBlock + let converter = if "--omml" `elem` args + then fmap ppTopElement . texMathToOMML dt + else if "--native" `elem` args + then fmap show . parseFormula + else fmap ppTopElement . inHtml . texMathToMathML dt inp <- getUTF8Contents let (ms, rest) = parseMacroDefinitions inp - case (texMathToMathML DisplayBlock $! applyMacros ms rest) of + case (converter $! applyMacros ms rest) of Left err -> hPutStrLn stderr err - Right v -> putStr . ppTopElement . inHtml $ v + Right v -> putStr v