diff --git a/Text/TeXMath/MathML.hs b/Text/TeXMath/MathML.hs
--- a/Text/TeXMath/MathML.hs
+++ b/Text/TeXMath/MathML.hs
@@ -25,6 +25,7 @@
import qualified Data.Map as M
import Text.XML.Light
import Text.TeXMath.Types
+import Text.TeXMath.ToUnicode
import Data.Generics (everywhere, mkT)
toMathML :: DisplayType -> [Exp] -> Element
@@ -107,12 +108,13 @@
makeScaled :: String -> Element -> Element
makeScaled s = withAttribute "minsize" s . withAttribute "maxsize" s
+-- Note: Converts strings to unicode directly, as few renderers support those mathvariants.
makeText :: TextType -> String -> Element
makeText a s = if trailingSp
then mrow [s', sp]
else s'
where sp = spaceWidth "0.333em"
- s' = withAttribute "mathvariant" attr $ unode "mtext" s
+ s' = withAttribute "mathvariant" attr $ unode "mtext" $ toUnicode a s
trailingSp = not (null s) && last s `elem` " \t"
attr = case a of
TextNormal -> "normal"
@@ -123,6 +125,12 @@
TextDoubleStruck -> "double-struck"
TextScript -> "script"
TextFraktur -> "fraktur"
+ TextBoldItalic -> "bold-italic"
+ TextBoldSansSerif -> "bold-sans-serif"
+ TextBoldSansSerifItalic -> "sans-serif-bold-italic"
+ TextBoldScript -> "bold-script"
+ TextBoldFraktur -> "bold-fraktur"
+ TextSansSerifItalic -> "sans-serif-italic"
makeArray :: [Alignment] -> [ArrayLine] -> Element
makeArray as ls = unode "mtable" $
diff --git a/Text/TeXMath/OMML.hs b/Text/TeXMath/OMML.hs
--- a/Text/TeXMath/OMML.hs
+++ b/Text/TeXMath/OMML.hs
@@ -106,6 +106,12 @@
TextDoubleStruck -> [sty "p", scr "double-struck"]
TextScript -> [sty "p", scr "script"]
TextFraktur -> [sty "p", scr "fraktur"]
+ TextBoldItalic -> [sty "i"]
+ TextBoldSansSerif -> [sty "b", scr "sans-serif"]
+ TextBoldScript -> [sty "b", scr "script"]
+ TextBoldFraktur -> [sty "b", scr "fraktur"]
+ TextSansSerifItalic -> [sty "i", scr "sans-serif"]
+ TextBoldSansSerifItalic -> [sty "bi", scr "sans-serif"]
sty x = mnodeA "sty" x ()
scr x = mnodeA "scr" x ()
diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs
--- a/Text/TeXMath/Parser.hs
+++ b/Text/TeXMath/Parser.hs
@@ -35,8 +35,8 @@
texMathDef :: LanguageDef st
texMathDef = LanguageDef
- { commentStart = ""
- , commentEnd = ""
+ { commentStart = "\\label{"
+ , commentEnd = "}"
, commentLine = "%"
, nestedComments = False
, identStart = letter
@@ -97,7 +97,7 @@
inbraces = liftM EGrouped (braces $ many $ notFollowedBy (char '}') >> expr)
texToken :: TP Exp
-texToken = inbraces <|> inbrackets <|>
+texToken = texSymbol <|> inbraces <|> inbrackets <|>
do c <- anyChar
spaces
return $ if isDigit c
@@ -322,22 +322,34 @@
unaryOps :: [String]
unaryOps = ["\\sqrt", "\\surd"]
+-- Note: cal and scr are treated the same way, as unicode is lacking such two different sets for those.
textOps :: M.Map String (String -> Exp)
textOps = M.fromList
- [ ("\\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)
+ [ ("\\textrm", EText TextNormal . parseText)
+ , ("\\mathrm", EText TextNormal)
+ , ("\\mathup", EText TextNormal)
+ , ("\\text", EText TextNormal . parseText)
+ , ("\\mbox", EText TextNormal)
+ , ("\\mathbf", EText TextBold)
+ , ("\\mathbfup", EText TextBold)
+ , ("\\textbf", EText TextBold . parseText)
+ , ("\\mathit", EText TextItalic)
+ , ("\\textit", EText TextItalic . parseText)
+ , ("\\mathtt", EText TextMonospace)
+ , ("\\texttt", EText TextMonospace)
+ , ("\\mathsf", EText TextSansSerif)
+ , ("\\mathsfup", EText TextSansSerif)
+ , ("\\mathbb", EText TextDoubleStruck)
+ , ("\\mathcal", EText TextScript)
+ , ("\\mathscr", EText TextScript)
+ , ("\\mathfrak", EText TextFraktur)
+ , ("\\mathbfit", EText TextBoldItalic)
+ , ("\\mathbfsfup", EText TextBoldSansSerif)
+ , ("\\mathbfsfit", EText TextBoldSansSerifItalic)
+ , ("\\mathbfscr", EText TextBoldScript)
+ , ("\\mathbffrak", EText TextBoldFraktur)
+ , ("\\mathbfcal", EText TextBoldScript)
+ , ("\\mathsfit", EText TextSansSerifItalic)
]
parseText :: String -> String
@@ -559,21 +571,6 @@
, ("\\xi", EIdentifier "\x03BE")
, ("\\Xi", ESymbol Op "\x039E")
, ("\\zeta", EIdentifier "\x03B6")
- , ("\\frac12", ESymbol Ord "\x00BD")
- , ("\\frac14", ESymbol Ord "\x00BC")
- , ("\\frac34", ESymbol Ord "\x00BE")
- , ("\\frac13", ESymbol Ord "\x2153")
- , ("\\frac23", ESymbol Ord "\x2154")
- , ("\\frac15", ESymbol Ord "\x2155")
- , ("\\frac25", ESymbol Ord "\x2156")
- , ("\\frac35", ESymbol Ord "\x2157")
- , ("\\frac45", ESymbol Ord "\x2158")
- , ("\\frac16", ESymbol Ord "\x2159")
- , ("\\frac56", ESymbol Ord "\x215A")
- , ("\\frac18", ESymbol Ord "\x215B")
- , ("\\frac38", ESymbol Ord "\x215C")
- , ("\\frac58", ESymbol Ord "\x215D")
- , ("\\frac78", ESymbol Ord "\x215E")
, ("\\pm", ESymbol Bin "\x00B1")
, ("\\mp", ESymbol Bin "\x2213")
, ("\\triangleleft", ESymbol Bin "\x22B2")
@@ -768,130 +765,3 @@
, ("\\tanh", EMathOperator "tanh")
]
--- MathML has a mathvariant attribute which is unimplemented in Firefox
--- (see https://bugzilla.mozilla.org/show_bug.cgi?id=114365)
--- Therefore, we translate mathcal to unicode symbols directly.
--- This list is from http://www.w3.org/TR/MathML2/script.html
-mathcal :: M.Map String String
-mathcal = M.fromList [
- ("A", "\x1D49C")
- , ("B", "\x0212C")
- , ("C", "\x1D49E")
- , ("D", "\x1D49F")
- , ("E", "\x02130")
- , ("F", "\x02131")
- , ("G", "\x1D4A2")
- , ("H", "\x0210B")
- , ("I", "\x02110")
- , ("J", "\x1D4A5")
- , ("K", "\x1D4A6")
- , ("L", "\x02112")
- , ("M", "\x02133")
- , ("N", "\x1D4A9")
- , ("O", "\x1D4AA")
- , ("P", "\x1D4AB")
- , ("Q", "\x1D4AC")
- , ("R", "\x0211B")
- , ("S", "\x1D4AE")
- , ("T", "\x1D4AF")
- , ("U", "\x1D4B0")
- , ("V", "\x1D4B1")
- , ("W", "\x1D4B2")
- , ("X", "\x1D4B3")
- , ("Y", "\x1D4B4")
- , ("Z", "\x1D4B5")
- , ("a", "\x1D4B6")
- , ("b", "\x1D4B7")
- , ("c", "\x1D4B8")
- , ("d", "\x1D4B9")
- , ("e", "\x0212F")
- , ("f", "\x1D4BB")
- , ("g", "\x0210A")
- , ("h", "\x1D4BD")
- , ("i", "\x1D4BE")
- , ("j", "\x1D4BF")
- , ("k", "\x1D4C0")
- , ("l", "\x1D4C1")
- , ("m", "\x1D4C2")
- , ("n", "\x1D4C3")
- , ("o", "\x02134")
- , ("p", "\x1D4C5")
- , ("q", "\x1D4C6")
- , ("r", "\x1D4C7")
- , ("s", "\x1D4C8")
- , ("t", "\x1D4C9")
- , ("u", "\x1D4CA")
- , ("v", "\x1D4CB")
- , ("w", "\x1D4CC")
- , ("x", "\x1D4CD")
- , ("y", "\x1D4CE")
- , ("z", "\x1D4CF")
- ]
-
--- Similar to mathcal above, we translate manually.
--- This list is from http://www.w3.org/TR/MathML2/double-struck.html
-mathbb :: M.Map String String
-mathbb = M.fromList [
- ("A", "\x1D538")
- , ("B", "\x1D539")
- , ("C", "\x02102")
- , ("D", "\x1D53B")
- , ("E", "\x1D53C")
- , ("F", "\x1D53D")
- , ("G", "\x1D53E")
- , ("H", "\x0210D")
- , ("I", "\x1D540")
- , ("J", "\x1D541")
- , ("K", "\x1D542")
- , ("L", "\x1D543")
- , ("M", "\x1D544")
- , ("N", "\x02115")
- , ("O", "\x1D546")
- , ("P", "\x02119")
- , ("Q", "\x0211A")
- , ("R", "\x0211D")
- , ("S", "\x1D54A")
- , ("T", "\x1D54B")
- , ("U", "\x1D54C")
- , ("V", "\x1D54D")
- , ("W", "\x1D54E")
- , ("X", "\x1D54F")
- , ("Y", "\x1D550")
- , ("Z", "\x02124")
- , ("a", "\x1D552")
- , ("b", "\x1D553")
- , ("c", "\x1D554")
- , ("d", "\x1D555")
- , ("e", "\x1D556")
- , ("f", "\x1D557")
- , ("g", "\x1D558")
- , ("h", "\x1D559")
- , ("i", "\x1D55A")
- , ("j", "\x1D55B")
- , ("k", "\x1D55C")
- , ("l", "\x1D55D")
- , ("m", "\x1D55E")
- , ("n", "\x1D55F")
- , ("o", "\x1D560")
- , ("p", "\x1D561")
- , ("q", "\x1D562")
- , ("r", "\x1D563")
- , ("s", "\x1D564")
- , ("t", "\x1D565")
- , ("u", "\x1D566")
- , ("v", "\x1D567")
- , ("w", "\x1D568")
- , ("x", "\x1D569")
- , ("y", "\x1D56A")
- , ("z", "\x1D56B")
- , ("0", "\x1D7D8")
- , ("1", "\x1D7D9")
- , ("2", "\x1D7DA")
- , ("3", "\x1D7DB")
- , ("4", "\x1D7DC")
- , ("5", "\x1D7DD")
- , ("6", "\x1D7DE")
- , ("7", "\x1D7DF")
- , ("8", "\x1D7E0")
- , ("9", "\x1D7E1")
- ]
diff --git a/Text/TeXMath/Types.hs b/Text/TeXMath/Types.hs
--- a/Text/TeXMath/Types.hs
+++ b/Text/TeXMath/Types.hs
@@ -71,4 +71,10 @@
| TextDoubleStruck
| TextScript
| TextFraktur
+ | TextBoldItalic
+ | TextBoldSansSerif
+ | TextBoldSansSerifItalic
+ | TextBoldScript
+ | TextBoldFraktur
+ | TextSansSerifItalic
deriving (Show, Read, Eq, Data, Typeable)
diff --git a/tests/20.omml b/tests/20.omml
--- a/tests/20.omml
+++ b/tests/20.omml
@@ -5,464 +5,809 @@
-
- ๐
+
+
+
+
+ A
-
- โฌ
+
+
+
+
+ B
-
- ๐
+
+
+
+
+ C
-
- ๐
+
+
+
+
+ D
-
- โฐ
+
+
+
+
+ E
-
- โฑ
+
+
+
+
+ F
-
- ๐ข
+
+
+
+
+ G
-
- โ
+
+
+
+
+ H
-
- โ
+
+
+
+
+ I
-
- ๐ฅ
+
+
+
+
+ J
-
- ๐ฆ
+
+
+
+
+ K
-
- โ
+
+
+
+
+ L
-
- โณ
+
+
+
+
+ M
-
- ๐ฉ
+
+
+
+
+ N
-
- ๐ช
+
+
+
+
+ O
-
- ๐ซ
+
+
+
+
+ P
-
- ๐ฌ
+
+
+
+
+ Q
-
- โ
+
+
+
+
+ R
-
- ๐ฎ
+
+
+
+
+ S
-
- ๐ฏ
+
+
+
+
+ T
-
- ๐ฐ
+
+
+
+
+ U
-
- ๐ฑ
+
+
+
+
+ V
-
- ๐ฒ
+
+
+
+
+ W
-
- ๐ณ
+
+
+
+
+ X
-
- ๐ด
+
+
+
+
+ Y
-
- ๐ต
+
+
+
+
+ Z
-
- ๐ถ
+
+
+
+
+ a
-
- ๐ท
+
+
+
+
+ b
-
- ๐ธ
+
+
+
+
+ c
-
- ๐น
+
+
+
+
+ d
-
- โฏ
+
+
+
+
+ e
-
- ๐ป
+
+
+
+
+ f
-
- โ
+
+
+
+
+ g
-
- ๐ฝ
+
+
+
+
+ h
-
- ๐พ
+
+
+
+
+ i
-
- ๐ฟ
+
+
+
+
+ j
-
- ๐
+
+
+
+
+ k
-
- ๐
+
+
+
+
+ l
-
- ๐
+
+
+
+
+ m
-
- ๐
+
+
+
+
+ n
-
- โด
+
+
+
+
+ o
-
- ๐
+
+
+
+
+ p
-
- ๐
+
+
+
+
+ q
-
- ๐
+
+
+
+
+ r
-
- ๐
+
+
+
+
+ s
-
- ๐
+
+
+
+
+ t
-
- ๐
+
+
+
+
+ u
-
- ๐
+
+
+
+
+ v
-
- ๐
+
+
+
+
+ w
-
- ๐
+
+
+
+
+ x
-
- ๐
+
+
+
+
+ y
-
- ๐
+
+
+
+
+ z
-
- ๐ธ
+
+
+
+
+ A
-
- ๐น
+
+
+
+
+ B
-
- โ
+
+
+
+
+ C
-
- ๐ป
+
+
+
+
+ D
-
- ๐ผ
+
+
+
+
+ E
-
- ๐ฝ
+
+
+
+
+ F
-
- ๐พ
+
+
+
+
+ G
-
- โ
+
+
+
+
+ H
-
- ๐
+
+
+
+
+ I
-
- ๐
+
+
+
+
+ J
-
- ๐
+
+
+
+
+ K
-
- ๐
+
+
+
+
+ L
-
- ๐
+
+
+
+
+ M
-
- โ
+
+
+
+
+ N
-
- ๐
+
+
+
+
+ O
-
- โ
+
+
+
+
+ P
-
- โ
+
+
+
+
+ Q
-
- โ
+
+
+
+
+ R
-
- ๐
+
+
+
+
+ S
-
- ๐
+
+
+
+
+ T
-
- ๐
+
+
+
+
+ U
-
- ๐
+
+
+
+
+ V
-
- ๐
+
+
+
+
+ W
-
- ๐
+
+
+
+
+ X
-
- ๐
+
+
+
+
+ Y
-
- โค
+
+
+
+
+ Z
-
- ๐
+
+
+
+
+ a
-
- ๐
+
+
+
+
+ b
-
- ๐
+
+
+
+
+ c
-
- ๐
+
+
+
+
+ d
-
- ๐
+
+
+
+
+ e
-
- ๐
+
+
+
+
+ f
-
- ๐
+
+
+
+
+ g
-
- ๐
+
+
+
+
+ h
-
- ๐
+
+
+
+
+ i
-
- ๐
+
+
+
+
+ j
-
- ๐
+
+
+
+
+ k
-
- ๐
+
+
+
+
+ l
-
- ๐
+
+
+
+
+ m
-
- ๐
+
+
+
+
+ n
-
- ๐
+
+
+
+
+ o
-
- ๐ก
+
+
+
+
+ p
-
- ๐ข
+
+
+
+
+ q
-
- ๐ฃ
+
+
+
+
+ r
-
- ๐ค
+
+
+
+
+ s
-
- ๐ฅ
+
+
+
+
+ t
-
- ๐ฆ
+
+
+
+
+ u
-
- ๐ง
+
+
+
+
+ v
-
- ๐จ
+
+
+
+
+ w
-
- ๐ฉ
+
+
+
+
+ x
-
- ๐ช
+
+
+
+
+ y
-
- ๐ซ
+
+
+
+
+ z
-
- ๐
+
+
+
+
+ 0
-
- ๐
+
+
+
+
+ 1
-
- ๐
+
+
+
+
+ 2
-
- ๐
+
+
+
+
+ 3
-
- ๐
+
+
+
+
+ 4
-
- ๐
+
+
+
+
+ 5
-
- ๐
+
+
+
+
+ 6
-
- ๐
+
+
+
+
+ 7
-
- ๐
+
+
+
+
+ 8
-
- ๐ก
+
+
+
+
+ 9
-
- ๐
+
+
+
+
+ 0
diff --git a/tests/20.xhtml b/tests/20.xhtml
--- a/tests/20.xhtml
+++ b/tests/20.xhtml
@@ -6,121 +6,121 @@
diff --git a/tests/22.omml b/tests/22.omml
new file mode 100644
--- /dev/null
+++ b/tests/22.omml
@@ -0,0 +1,630 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ textrm
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathrm
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathup
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ text
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mbox
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbf
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbfup
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ textbf
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathit
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ textit
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathtt
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ texttt
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathsf
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathsfup
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbb
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathcal
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathscr
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathfrak
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbfit
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbfsfup
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbfsfit
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbfscr
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbffrak
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathbfcal
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
+
+
+
+
+ mathsfit
+
+
+
+
+
+
+
+
+ ABCabc
+
+
+
+
+
+
diff --git a/tests/22.tex b/tests/22.tex
new file mode 100644
--- /dev/null
+++ b/tests/22.tex
@@ -0,0 +1,28 @@
+\begin{array}{ll}
+\texttt{textrm} & \textrm {ABCabc} \\
+\texttt{mathrm} & \mathrm {ABCabc} \\
+\texttt{mathup} & \mathup {ABCabc} \\
+\texttt{text} & \text {ABCabc} \\
+\texttt{mbox} & \mbox {ABCabc} \\
+\texttt{mathbf} & \mathbf {ABCabc} \\
+\texttt{mathbfup} & \mathbfup {ABCabc} \\
+\texttt{textbf} & \textbf {ABCabc} \\
+\texttt{mathit} & \mathit {ABCabc} \\
+\texttt{textit} & \textit {ABCabc} \\
+\texttt{mathtt} & \mathtt {ABCabc} \\
+\texttt{texttt} & \texttt {ABCabc} \\
+\texttt{mathsf} & \mathsf {ABCabc} \\
+\texttt{mathsfup} & \mathsfup {ABCabc} \\
+\texttt{mathbb} & \mathbb {ABCabc} \\
+\texttt{mathcal} & \mathcal {ABCabc} \\
+\texttt{mathscr} & \mathscr {ABCabc} \\
+\texttt{mathfrak} & \mathfrak {ABCabc} \\
+\texttt{mathbfit} & \mathbfit {ABCabc} \\
+\texttt{mathbfsfup} & \mathbfsfup{ABCabc} \\
+\texttt{mathbfsfit} & \mathbfsfit{ABCabc} \\
+\texttt{mathbfscr} & \mathbfscr {ABCabc} \\
+\texttt{mathbffrak} & \mathbffrak{ABCabc} \\
+\texttt{mathbfcal} & \mathbfcal {ABCabc} \\
+\texttt{mathsfit} & \mathsfit {ABCabc}
+\end{array}
+
diff --git a/tests/22.xhtml b/tests/22.xhtml
new file mode 100644
--- /dev/null
+++ b/tests/22.xhtml
@@ -0,0 +1,214 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/labels.omml b/tests/labels.omml
new file mode 100644
--- /dev/null
+++ b/tests/labels.omml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+ 2
+
+
+
+ +
+
+
+
+ 2
+
+
+
diff --git a/tests/labels.tex b/tests/labels.tex
new file mode 100644
--- /dev/null
+++ b/tests/labels.tex
@@ -0,0 +1,2 @@
+2 + 2
+\label{myeq}
diff --git a/tests/labels.xhtml b/tests/labels.xhtml
new file mode 100644
--- /dev/null
+++ b/tests/labels.xhtml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/tests/schwinger_dyson.omml b/tests/schwinger_dyson.omml
--- a/tests/schwinger_dyson.omml
+++ b/tests/schwinger_dyson.omml
@@ -23,8 +23,11 @@
-
- ๐ฏ
+
+
+
+
+ T
@@ -113,8 +116,11 @@
-
- ๐ฏ
+
+
+
+
+ T
diff --git a/tests/schwinger_dyson.xhtml b/tests/schwinger_dyson.xhtml
--- a/tests/schwinger_dyson.xhtml
+++ b/tests/schwinger_dyson.xhtml
@@ -11,7 +11,7 @@
ฯ
โฃ
- ๐ฏ
+ ๐ฏ
{
@@ -40,7 +40,7 @@
ฯ
โฃ
- ๐ฏ
+ ๐ฏ
{
F
diff --git a/texmath.cabal b/texmath.cabal
--- a/texmath.cabal
+++ b/texmath.cabal
@@ -1,5 +1,5 @@
Name: texmath
-Version: 0.6.0.6
+Version: 0.6.1
Cabal-Version: >= 1.6
Build-type: Custom
Synopsis: Conversion of LaTeX math formulas to MathML or OMML.
@@ -46,6 +46,7 @@
tests/19.tex, tests/19.xhtml, tests/19.omml,
tests/20.tex, tests/20.xhtml, tests/20.omml,
tests/21.tex, tests/21.xhtml, tests/21.omml,
+ tests/22.tex, tests/22.xhtml, tests/22.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,
@@ -61,7 +62,8 @@
tests/ensuremath.tex, tests/ensuremath.xhtml, tests/ensuremath.omml,
tests/macros.tex, tests/macros.xhtml, tests/macros.omml,
tests/subsup.tex, tests/subsup.xhtml, tests/subsup.omml,
- tests/stackrel.tex, tests/stackrel.xhtml, tests/stackrel.omml
+ tests/stackrel.tex, tests/stackrel.xhtml, tests/stackrel.omml,
+ tests/labels.tex, tests/labels.xhtml, tests/labels.omml
Source-repository head
type: git