texmath 0.12 → 0.12.0.1
raw patch · 22 files changed
+471/−237 lines, 22 files
Files
- changelog +5/−0
- src/Text/TeXMath/Readers/OMML.hs +12/−4
- src/Text/TeXMath/Writers/OMML.hs +2/−2
- tests/readers/omml/153a.native +1/−0
- tests/readers/omml/153b.native +1/−0
- tests/readers/omml/153c.native +1/−0
- tests/src/153a.omml +55/−0
- tests/src/153b.omml +55/−0
- tests/src/153c.omml +52/−0
- tests/writers/08.omml +10/−10
- tests/writers/accents1.omml +24/−20
- tests/writers/accents2.omml +24/−20
- tests/writers/accents3.omml +28/−20
- tests/writers/accents4.omml +28/−20
- tests/writers/accents5.omml +52/−40
- tests/writers/accents6.omml +52/−40
- tests/writers/complex3.omml +15/−15
- tests/writers/moAaccent10.omml +21/−15
- tests/writers/moAaccent9.omml +17/−15
- tests/writers/stretchAccents1.omml +5/−5
- tests/writers/stretchAccents2.omml +10/−10
- texmath.cabal +1/−1
changelog view
@@ -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
src/Text/TeXMath/Readers/OMML.hs view
@@ -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
src/Text/TeXMath/Writers/OMML.hs view
@@ -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 ]]
+ tests/readers/omml/153a.native view
@@ -0,0 +1,1 @@+[EIdentifier "A",EOver False (ESymbol TUnder "\8594") (EText TextNormal "yields"),EIdentifier "B"]
+ tests/readers/omml/153b.native view
@@ -0,0 +1,1 @@+[EIdentifier "A",EOver False (ESymbol TUnder "\8594") (ESymbol Ord "\8710"),EIdentifier "B"]
+ tests/readers/omml/153c.native view
@@ -0,0 +1,1 @@+[EIdentifier "A",EOver False (ESymbol TUnder "\8658") (EIdentifier "f"),EIdentifier "B"]
+ tests/src/153a.omml view
@@ -0,0 +1,55 @@+<m:oMathPara>+ <m:oMath>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>A</m:t>+ </m:r>+ <m:box>+ <m:boxPr>+ <m:opEmu m:val="1" />+ <m:ctrlPr>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ <w:i />+ </w:rPr>+ </m:ctrlPr>+ </m:boxPr>+ <m:e>+ <m:groupChr>+ <m:groupChrPr>+ <m:chr m:val="→" />+ <m:vertJc m:val="bot" />+ <m:ctrlPr>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ <w:i />+ </w:rPr>+ </m:ctrlPr>+ </m:groupChrPr>+ <m:e>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>yields</m:t>+ </m:r>+ </m:e>+ </m:groupChr>+ </m:e>+ </m:box>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>B</m:t>+ </m:r>+ </m:oMath>+</m:oMathPara>+
+ tests/src/153b.omml view
@@ -0,0 +1,55 @@+<m:oMathPara>+ <m:oMath>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>A</m:t>+ </m:r>+ <m:box>+ <m:boxPr>+ <m:opEmu m:val="1" />+ <m:ctrlPr>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ <w:i />+ </w:rPr>+ </m:ctrlPr>+ </m:boxPr>+ <m:e>+ <m:groupChr>+ <m:groupChrPr>+ <m:chr m:val="→" />+ <m:vertJc m:val="bot" />+ <m:ctrlPr>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ <w:i />+ </w:rPr>+ </m:ctrlPr>+ </m:groupChrPr>+ <m:e>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>∆</m:t>+ </m:r>+ </m:e>+ </m:groupChr>+ </m:e>+ </m:box>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>B</m:t>+ </m:r>+ </m:oMath>+</m:oMathPara>+
+ tests/src/153c.omml view
@@ -0,0 +1,52 @@+<m:oMathPara>+ <m:oMath>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>A</m:t>+ </m:r>+ <m:box>+ <m:boxPr>+ <m:opEmu m:val="1" />+ <m:ctrlPr>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ <w:i />+ </w:rPr>+ </m:ctrlPr>+ </m:boxPr>+ <m:e>+ <m:groupChr>+ <m:groupChrPr>+ <m:chr m:val="⇒" />+ <m:vertJc m:val="bot" />+ <m:ctrlPr>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ <w:i />+ </w:rPr>+ </m:ctrlPr>+ </m:groupChrPr>+ <m:e>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math"+ w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>f</m:t>+ </m:r>+ </m:e>+ </m:groupChr>+ </m:e>+ </m:box>+ <m:r>+ <w:rPr>+ <w:rFonts w:ascii="Cambria Math" w:hAnsi="Cambria Math" />+ </w:rPr>+ <m:t>B</m:t>+ </m:r>+ </m:oMath>+</m:oMathPara>
tests/writers/08.omml view
@@ -7,16 +7,16 @@ <m:r> <m:t>|</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>z</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>|</m:t> </m:r>@@ -41,16 +41,16 @@ <m:r> <m:t>(</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>z</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:sSup> <m:e> <m:r>
tests/writers/accents1.omml view
@@ -90,16 +90,16 @@ </m:r> </m:e> </m:acc>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:acc> <m:accPr> <m:chr m:val="´" />@@ -210,16 +210,16 @@ </m:r> </m:e> </m:acc>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:acc> <m:accPr> <m:chr m:val="⃛" />@@ -477,16 +477,18 @@ </m:r> </m:lim> </m:limUpp>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> <m:limUpp> <m:e> <m:r>@@ -615,16 +617,18 @@ </m:r> </m:e> </m:acc>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> <m:acc> <m:accPr> <m:chr m:val="⃛" />
tests/writers/accents2.omml view
@@ -90,16 +90,16 @@ </m:r> </m:e> </m:acc>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:acc> <m:accPr> <m:chr m:val="´" />@@ -210,16 +210,16 @@ </m:r> </m:e> </m:acc>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:acc> <m:accPr> <m:chr m:val="⃛" />@@ -477,16 +477,18 @@ </m:r> </m:lim> </m:limUpp>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> <m:limUpp> <m:e> <m:r>@@ -615,16 +617,18 @@ </m:r> </m:e> </m:acc>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> <m:acc> <m:accPr> <m:chr m:val="⃛" />
tests/writers/accents3.omml view
@@ -102,16 +102,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>@@ -244,16 +246,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>@@ -545,16 +549,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>@@ -687,16 +693,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>
tests/writers/accents4.omml view
@@ -102,16 +102,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>@@ -244,16 +246,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>@@ -545,16 +549,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>@@ -687,16 +693,18 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:r>
tests/writers/accents5.omml view
@@ -144,23 +144,25 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:acc>@@ -370,23 +372,25 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:acc>@@ -851,23 +855,27 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:limUpp>@@ -1095,23 +1103,27 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>H</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:acc>
tests/writers/accents6.omml view
@@ -144,23 +144,25 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:acc>@@ -370,23 +372,25 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:acc>@@ -851,23 +855,27 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>¯</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:limUpp>@@ -1095,23 +1103,27 @@ </m:r> </m:lim> </m:limLow>- <m:bar>- <m:barPr>- <m:pos m:val="bot" />- </m:barPr>+ <m:limLow> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limLow> <m:limLow> <m:e> <m:acc>
tests/writers/complex3.omml view
@@ -11634,16 +11634,16 @@ <m:e> <m:sSub> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>x</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> </m:e> <m:sub> <m:r>@@ -20014,16 +20014,16 @@ <m:r> <m:t>+</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>g</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>+</m:t> </m:r>@@ -22784,10 +22784,10 @@ </m:mr> <m:mr> <m:e>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:rPr>@@ -22797,7 +22797,7 @@ <m:t>lim</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>x</m:t> </m:r>
tests/writers/moAaccent10.omml view
@@ -4,10 +4,7 @@ <m:jc m:val="center" /> </m:oMathParaPr> <m:oMath>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>G</m:t>@@ -19,14 +16,16 @@ <m:t>1</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> <m:r> <m:t>+</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>G</m:t>@@ -38,14 +37,16 @@ <m:t>1</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> <m:r> <m:t>+</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>G</m:t>@@ -57,6 +58,11 @@ <m:t>1</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> </m:oMath> </m:oMathPara>
tests/writers/moAaccent9.omml view
@@ -4,10 +4,10 @@ <m:jc m:val="center" /> </m:oMathParaPr> <m:oMath>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>G</m:t>@@ -19,14 +19,14 @@ <m:t>1</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>+</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="‾" />+ </m:accPr> <m:e> <m:r> <m:t>G</m:t>@@ -38,14 +38,11 @@ <m:t>1</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>+</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:limUpp> <m:e> <m:r> <m:t>G</m:t>@@ -57,6 +54,11 @@ <m:t>1</m:t> </m:r> </m:e>- </m:bar>+ <m:lim>+ <m:r>+ <m:t>‾</m:t>+ </m:r>+ </m:lim>+ </m:limUpp> </m:oMath> </m:oMathPara>
tests/writers/stretchAccents1.omml view
@@ -17,16 +17,16 @@ <m:r> <m:t>+</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>xxx</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>+</m:t> </m:r>
tests/writers/stretchAccents2.omml view
@@ -4,23 +4,23 @@ <m:jc m:val="center" /> </m:oMathParaPr> <m:oMath>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:t>xxx</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> <m:r> <m:t>=</m:t> </m:r>- <m:bar>- <m:barPr>- <m:pos m:val="top" />- </m:barPr>+ <m:acc>+ <m:accPr>+ <m:chr m:val="¯" />+ </m:accPr> <m:e> <m:r> <m:rPr>@@ -29,6 +29,6 @@ <m:t>xxx</m:t> </m:r> </m:e>- </m:bar>+ </m:acc> </m:oMath> </m:oMathPara>
texmath.cabal view
@@ -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.