diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +texmath (0.12.0.1) + + * OMML writer: Fix overline and accent rendering (#152). + * OMML reader: Fix dropped arrows (#153). Add tests. + texmath (0.12) * Use Text instead of String in data types and functions diff --git a/src/Text/TeXMath/Readers/OMML.hs b/src/Text/TeXMath/Readers/OMML.hs --- a/src/Text/TeXMath/Readers/OMML.hs +++ b/src/Text/TeXMath/Readers/OMML.hs @@ -319,6 +319,9 @@ pos = gPr >>= filterChildName (hasElemName "m" "pos") >>= findAttrBy (hasElemName "m" "val") + justif = gPr >>= + filterChildName (hasElemName "m" "vertJC") >>= + findAttrBy (hasElemName "m" "val") baseExp <- filterChildName (hasElemName "m" "e") element >>= elemToBase case pos of @@ -327,14 +330,19 @@ Just (c:_) -> T.singleton c _ -> "\65079" -- default to overbrace in - return [EOver False baseExp (ESymbol TOver chr')] - Just "bot" -> + return $ + case justif of + Just "top" -> [EUnder False (ESymbol TOver chr') baseExp] + _ -> [EOver False baseExp (ESymbol TOver chr')] + _ -> -- bot is default let chr' = case chr of Just (c:_) -> T.singleton c _ -> "\65080" -- default to underbrace in - return [EUnder False baseExp (ESymbol TUnder chr')] - _ -> Nothing + return $ + case justif of + Just "top" -> [EUnder False baseExp (ESymbol TUnder chr')] + _ -> [EOver False (ESymbol TUnder chr') baseExp] elemToExps' element | isElem "m" "limLow" element = do baseExp <- filterChildName (hasElemName "m" "e") element >>= elemToBase diff --git a/src/Text/TeXMath/Writers/OMML.hs b/src/Text/TeXMath/Writers/OMML.hs --- a/src/Text/TeXMath/Writers/OMML.hs +++ b/src/Text/TeXMath/Writers/OMML.hs @@ -221,11 +221,11 @@ | n > 1.8 -> [str props "\x2001\x2001"] | otherwise -> [str props "\x200B"] -- this is how the xslt sheet handles all spaces - EUnder _ x (ESymbol _ (T.unpack -> [c])) | isBarChar c -> + EUnder _ x (ESymbol TUnder t) | T.all isBarChar t -> [mnode "bar" [ mnode "barPr" $ mnodeA "pos" "bot" () , mnode "e" $ showExp props x ]] - EOver _ x (ESymbol _ (T.unpack -> [c])) | isBarChar c -> + EOver _ x (ESymbol TOver t) | T.all isBarChar t -> [mnode "bar" [ mnode "barPr" $ mnodeA "pos" "top" () , mnode "e" $ showExp props x ]] diff --git a/tests/readers/omml/153a.native b/tests/readers/omml/153a.native new file mode 100644 --- /dev/null +++ b/tests/readers/omml/153a.native @@ -0,0 +1,1 @@ +[EIdentifier "A",EOver False (ESymbol TUnder "\8594") (EText TextNormal "yields"),EIdentifier "B"] diff --git a/tests/readers/omml/153b.native b/tests/readers/omml/153b.native new file mode 100644 --- /dev/null +++ b/tests/readers/omml/153b.native @@ -0,0 +1,1 @@ +[EIdentifier "A",EOver False (ESymbol TUnder "\8594") (ESymbol Ord "\8710"),EIdentifier "B"] diff --git a/tests/readers/omml/153c.native b/tests/readers/omml/153c.native new file mode 100644 --- /dev/null +++ b/tests/readers/omml/153c.native @@ -0,0 +1,1 @@ +[EIdentifier "A",EOver False (ESymbol TUnder "\8658") (EIdentifier "f"),EIdentifier "B"] diff --git a/tests/src/153a.omml b/tests/src/153a.omml new file mode 100644 --- /dev/null +++ b/tests/src/153a.omml @@ -0,0 +1,55 @@ + + + + + + + A + + + + + + + + + + + + + + + + + + + + + + + + + + + + + yields + + + + + + + + + + B + + + + diff --git a/tests/src/153b.omml b/tests/src/153b.omml new file mode 100644 --- /dev/null +++ b/tests/src/153b.omml @@ -0,0 +1,55 @@ + + + + + + + A + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ∆ + + + + + + + + + + B + + + + diff --git a/tests/src/153c.omml b/tests/src/153c.omml new file mode 100644 --- /dev/null +++ b/tests/src/153c.omml @@ -0,0 +1,52 @@ + + + + + + + A + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f + + + + + + + + + + B + + + diff --git a/tests/writers/08.omml b/tests/writers/08.omml --- a/tests/writers/08.omml +++ b/tests/writers/08.omml @@ -7,16 +7,16 @@ | - - - - + + + + z - + | @@ -41,16 +41,16 @@ ( - - - - + + + + z - + diff --git a/tests/writers/accents1.omml b/tests/writers/accents1.omml --- a/tests/writers/accents1.omml +++ b/tests/writers/accents1.omml @@ -90,16 +90,16 @@ - - - - + + + + H - + @@ -210,16 +210,16 @@ - - - - + + + + H - + @@ -477,16 +477,18 @@ - - - - + H - + + + ¯ + + + @@ -615,16 +617,18 @@ - - - - + H - + + + ‾ + + + diff --git a/tests/writers/accents2.omml b/tests/writers/accents2.omml --- a/tests/writers/accents2.omml +++ b/tests/writers/accents2.omml @@ -90,16 +90,16 @@ - - - - + + + + x - + @@ -210,16 +210,16 @@ - - - - + + + + x - + @@ -477,16 +477,18 @@ - - - - + x - + + + ¯ + + + @@ -615,16 +617,18 @@ - - - - + x - + + + ‾ + + + diff --git a/tests/writers/accents3.omml b/tests/writers/accents3.omml --- a/tests/writers/accents3.omml +++ b/tests/writers/accents3.omml @@ -102,16 +102,18 @@ - - - - + H - + + + ¯ + + + @@ -244,16 +246,18 @@ - - - - + H - + + + ‾ + + + @@ -545,16 +549,18 @@ - - - - + H - + + + ¯ + + + @@ -687,16 +693,18 @@ - - - - + H - + + + ‾ + + + diff --git a/tests/writers/accents4.omml b/tests/writers/accents4.omml --- a/tests/writers/accents4.omml +++ b/tests/writers/accents4.omml @@ -102,16 +102,18 @@ - - - - + x - + + + ¯ + + + @@ -244,16 +246,18 @@ - - - - + x - + + + ‾ + + + @@ -545,16 +549,18 @@ - - - - + x - + + + ¯ + + + @@ -687,16 +693,18 @@ - - - - + x - + + + ‾ + + + diff --git a/tests/writers/accents5.omml b/tests/writers/accents5.omml --- a/tests/writers/accents5.omml +++ b/tests/writers/accents5.omml @@ -144,23 +144,25 @@ - - - - + - - - - + + + + H - + - + + + ¯ + + + @@ -370,23 +372,25 @@ - - - - + - - - - + + + + H - + - + + + ‾ + + + @@ -851,23 +855,27 @@ - - - - + - - - - + H - + + + ¯ + + + - + + + ¯ + + + @@ -1095,23 +1103,27 @@ - - - - + - - - - + H - + + + ‾ + + + - + + + ‾ + + + diff --git a/tests/writers/accents6.omml b/tests/writers/accents6.omml --- a/tests/writers/accents6.omml +++ b/tests/writers/accents6.omml @@ -144,23 +144,25 @@ - - - - + - - - - + + + + x - + - + + + ¯ + + + @@ -370,23 +372,25 @@ - - - - + - - - - + + + + x - + - + + + ‾ + + + @@ -851,23 +855,27 @@ - - - - + - - - - + x - + + + ¯ + + + - + + + ¯ + + + @@ -1095,23 +1103,27 @@ - - - - + - - - - + x - + + + ‾ + + + - + + + ‾ + + + diff --git a/tests/writers/complex3.omml b/tests/writers/complex3.omml --- a/tests/writers/complex3.omml +++ b/tests/writers/complex3.omml @@ -11634,16 +11634,16 @@ - - - - + + + + x - + @@ -20014,16 +20014,16 @@ + - - - - + + + + g - + + @@ -22784,10 +22784,10 @@ - - - - + + + + @@ -22797,7 +22797,7 @@ lim - + x diff --git a/tests/writers/moAaccent10.omml b/tests/writers/moAaccent10.omml --- a/tests/writers/moAaccent10.omml +++ b/tests/writers/moAaccent10.omml @@ -4,10 +4,7 @@ - - - - + G @@ -19,14 +16,16 @@ 1 - + + + ‾ + + + + - - - - + G @@ -38,14 +37,16 @@ 1 - + + + ‾ + + + + - - - - + G @@ -57,6 +58,11 @@ 1 - + + + ‾ + + + diff --git a/tests/writers/moAaccent9.omml b/tests/writers/moAaccent9.omml --- a/tests/writers/moAaccent9.omml +++ b/tests/writers/moAaccent9.omml @@ -4,10 +4,10 @@ - - - - + + + + G @@ -19,14 +19,14 @@ 1 - + + - - - - + + + + G @@ -38,14 +38,11 @@ 1 - + + - - - - + G @@ -57,6 +54,11 @@ 1 - + + + ‾ + + + diff --git a/tests/writers/stretchAccents1.omml b/tests/writers/stretchAccents1.omml --- a/tests/writers/stretchAccents1.omml +++ b/tests/writers/stretchAccents1.omml @@ -17,16 +17,16 @@ + - - - - + + + + xxx - + + diff --git a/tests/writers/stretchAccents2.omml b/tests/writers/stretchAccents2.omml --- a/tests/writers/stretchAccents2.omml +++ b/tests/writers/stretchAccents2.omml @@ -4,23 +4,23 @@ - - - - + + + + xxx - + = - - - - + + + + @@ -29,6 +29,6 @@ xxx - + diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.12 +Version: 0.12.0.1 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics.