diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,8 @@ +texmath (0.11.1) + + * OMML writer: Use m:acc for accents in OMML (#119). This fixes + some spacing issues for e.g. the translation of `\dot{m}`. + texmath (0.11.0.1) * OMML writer: use zero-width space to avoid dashed box (#118). 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 @@ -224,17 +224,18 @@ [mnode "bar" [ mnode "barPr" $ mnodeA "pos" "top" () , mnode "e" $ showExp props x ]] - EOver _ x (ESymbol st y) | st == Accent || st == TOver -> - [mnode "groupChr" [ mnode "groupChrPr" - [ mnodeA "chr" y () - , mnodeA "pos" "top" () - , mnodeA "vertJc" "bot" () ] + EOver _ x (ESymbol st y) + | st == Accent -> [mnode "acc" [ mnode "accPr" [ mnodeA "chr" y () ] , mnode "e" $ showExp props x ]] - EUnder _ x (ESymbol st y) | st == Accent || st == TUnder -> - [mnode "groupChr" [ mnode "groupChrPr" + | st == TUnder -> [mnode "groupChr" [ mnode "groupChrPr" [ mnodeA "chr" y () , mnodeA "pos" "bot" () , mnodeA "vertJc" "top" () ] + , mnode "e" $ showExp props x ]] + | st == TOver -> [mnode "groupChr" [ mnode "groupChrPr" + [ mnodeA "chr" y () + , mnodeA "pos" "top" () + , mnodeA "vertJc" "bot" () ] , mnode "e" $ showExp props x ]] ESub x y -> [mnode "sSub" [ mnode "e" $ showExp props x , mnode "sub" $ showExp props y]] diff --git a/tests/writers/accents1.omml b/tests/writers/accents1.omml --- a/tests/writers/accents1.omml +++ b/tests/writers/accents1.omml @@ -29,78 +29,66 @@ - - + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - + @@ -111,138 +99,116 @@ - - + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - + @@ -253,210 +219,176 @@ - - + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - - - + + + - - - + H - + @@ -661,30 +593,26 @@ - - + + - - - + H - - - + + + - - - + H - + @@ -695,30 +623,26 @@ - - + + - - - + H - - - + + + - - - + H - + @@ -815,18 +739,18 @@ - + + + + + + H - - - ⎵ - - - + @@ -839,18 +763,18 @@ - + + + + + + H - - - ⏝ - - - + @@ -863,18 +787,18 @@ - + + + + + + H - - - ⏟ - - - + diff --git a/tests/writers/accents2.omml b/tests/writers/accents2.omml --- a/tests/writers/accents2.omml +++ b/tests/writers/accents2.omml @@ -29,78 +29,66 @@ - - + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - + @@ -111,138 +99,116 @@ - - + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - + @@ -253,210 +219,176 @@ - - + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - - - + + + - - - + x - + @@ -661,30 +593,26 @@ - - + + - - - + x - - - + + + - - - + x - + @@ -695,30 +623,26 @@ - - + + - - - + x - - - + + + - - - + x - + @@ -815,18 +739,18 @@ - + + + + + + x - - - ⎵ - - - + @@ -839,18 +763,18 @@ - + + + + + + x - - - ⏝ - - - + @@ -863,18 +787,18 @@ - + + + + + + x - - - ⏟ - - - + diff --git a/tests/writers/accents3.omml b/tests/writers/accents3.omml --- a/tests/writers/accents3.omml +++ b/tests/writers/accents3.omml @@ -29,78 +29,78 @@ - - - - - - + H - - - - - - - + + + ' + + + + H - - - - - - - + + + ^ + + + + H - - - - - - - + + + _ + + + + H - - - - - - - + + + ` + + + + H - - - - - - - + + + ~ + + + + H - + + + ¨ + + + @@ -111,138 +111,138 @@ - - - - - - + H - - - - - - - + + + ´ + + + + H - - - - - - - + + + ¸ + + + + H - - - - - - - + + + ˆ + + + + H - - - - - - - + + + ˇ + + + + H - - - - - - - + + + ˘ + + + + H - - - - - - - + + + ˙ + + + + H - - - - - - - + + + ˚ + + + + H - - - - - - - + + + ˜ + + + + H - - - - - - - + + + ˝ + + + + H - - - - - - - + + + ̂ + + + + H - + + + ̑ + + + @@ -253,210 +253,210 @@ - - - - - - + H - - - - - - - + + + ⃛ + + + + H - - - - - - - + + + ⃜ + + + + H - - - - - - - + + + ← + + + + H - - - - - - - + + + → + + + + H - - - - - - - + + + ↔ + + + + H - - - - - - - + + + ↼ + + + + H - - - - - - - + + + ↽ + + + + H - - - - - - - + + + ⇀ + + + + H - - - - - - - + + + ⇁ + + + + H - - - - - - - + + + ⎴ + + + + H - - - - - - - + + + ⎵ + + + + H - - - - - - - + + + ⏜ + + + + H - - - - - - - + + + ⏝ + + + + H - - - - - - - + + + ⏞ + + + + H - - - - - - - + + + ⏟ + + + + H - - - - - - - + + + ⥎ + + + + H - + + + ⥐ + + + @@ -661,30 +661,30 @@ - - - - - - + H - - - - - - - + + + ̂ + + + + H - + + + ̑ + + + @@ -695,30 +695,30 @@ - - - - - - + H - - - - - - - + + + ⃛ + + + + H - + + + ⃜ + + + @@ -815,18 +815,18 @@ - - - - - - + H - + + + ⎵ + + + @@ -839,18 +839,18 @@ - - - - - - + H - + + + ⏝ + + + @@ -863,18 +863,18 @@ - - - - - - + H - + + + ⏟ + + + diff --git a/tests/writers/accents4.omml b/tests/writers/accents4.omml --- a/tests/writers/accents4.omml +++ b/tests/writers/accents4.omml @@ -29,78 +29,78 @@ - - - - - - + x - - - - - - - + + + ' + + + + x - - - - - - - + + + ^ + + + + x - - - - - - - + + + _ + + + + x - - - - - - - + + + ` + + + + x - - - - - - - + + + ~ + + + + x - + + + ¨ + + + @@ -111,138 +111,138 @@ - - - - - - + x - - - - - - - + + + ´ + + + + x - - - - - - - + + + ¸ + + + + x - - - - - - - + + + ˆ + + + + x - - - - - - - + + + ˇ + + + + x - - - - - - - + + + ˘ + + + + x - - - - - - - + + + ˙ + + + + x - - - - - - - + + + ˚ + + + + x - - - - - - - + + + ˜ + + + + x - - - - - - - + + + ˝ + + + + x - - - - - - - + + + ̂ + + + + x - + + + ̑ + + + @@ -253,210 +253,210 @@ - - - - - - + x - - - - - - - + + + ⃛ + + + + x - - - - - - - + + + ⃜ + + + + x - - - - - - - + + + ← + + + + x - - - - - - - + + + → + + + + x - - - - - - - + + + ↔ + + + + x - - - - - - - + + + ↼ + + + + x - - - - - - - + + + ↽ + + + + x - - - - - - - + + + ⇀ + + + + x - - - - - - - + + + ⇁ + + + + x - - - - - - - + + + ⎴ + + + + x - - - - - - - + + + ⎵ + + + + x - - - - - - - + + + ⏜ + + + + x - - - - - - - + + + ⏝ + + + + x - - - - - - - + + + ⏞ + + + + x - - - - - - - + + + ⏟ + + + + x - - - - - - - + + + ⥎ + + + + x - + + + ⥐ + + + @@ -661,30 +661,30 @@ - - - - - - + x - - - - - - - + + + ̂ + + + + x - + + + ̑ + + + @@ -695,30 +695,30 @@ - - - - - - + x - - - - - - - + + + ⃛ + + + + x - + + + ⃜ + + + @@ -815,18 +815,18 @@ - - - - - - + x - + + + ⎵ + + + @@ -839,18 +839,18 @@ - - - - - - + x - + + + ⏝ + + + @@ -863,18 +863,18 @@ - - - - - - + x - + + + ⏟ + + + diff --git a/tests/writers/accents5.omml b/tests/writers/accents5.omml --- a/tests/writers/accents5.omml +++ b/tests/writers/accents5.omml @@ -29,132 +29,120 @@ - - - - - - + - - + + - - - + H - + - - - - - - - + + + ' + + + + - - + + - - - + H - + - - - - - - - + + + ^ + + + + - - + + - - - + H - + - - - - - - - + + + _ + + + + - - + + - - - + H - + - - - - - - - + + + ` + + + + - - + + - - - + H - + - - - - - - - + + + ~ + + + + - - + + - - - + H - + - + + + ¨ + + + @@ -172,237 +160,215 @@ - - - - - - + - - + + - - - + H - + - - - - - - - + + + ´ + + + + - - + + - - - + H - + - - - - - - - + + + ¸ + + + + - - + + - - - + H - + - - - - - - - + + + ˆ + + + + - - + + - - - + H - + - - - - - - - + + + ˇ + + + + - - + + - - - + H - + - - - - - - - + + + ˘ + + + + - - + + - - - + H - + - - - - - - - + + + ˙ + + + + - - + + - - - + H - + - - - - - - - + + + ˚ + + + + - - + + - - - + H - + - - - - - - - + + + ˜ + + + + - - + + - - - + H - + - - - - - - - + + + ˝ + + + + - - + + - - - + H - + - - - - - - - + + + ̂ + + + + - - + + - - - + H - + - + + + ̑ + + + @@ -420,363 +386,329 @@ - - - - - - + - - + + - - - + H - + - - - - - - - + + + ⃛ + + + + - - + + - - - + H - + - - - - - - - + + + ⃜ + + + + - - + + - - - + H - + - - - - - - - + + + ← + + + + - - + + - - - + H - + - - - - - - - + + + → + + + + - - + + - - - + H - + - - - - - - - + + + ↔ + + + + - - + + - - - + H - + - - - - - - - + + + ↼ + + + + - - + + - - - + H - + - - - - - - - + + + ↽ + + + + - - + + - - - + H - + - - - - - - - + + + ⇀ + + + + - - + + - - - + H - + - - - - - - - + + + ⇁ + + + + - - + + - - - + H - + - - - - - - - + + + ⎴ + + + + - - + + - - - + H - + - - - - - - - + + + ⎵ + + + + - - + + - - - + H - + - - - - - - - + + + ⏜ + + + + - - + + - - - + H - + - - - - - - - + + + ⏝ + + + + - - + + - - - + H - + - - - - - - - + + + ⏞ + + + + - - + + - - - + H - + - - - - - - - + + + ⏟ + + + + - - + + - - - + H - + - - - - - - - + + + ⥎ + + + + - - + + - - - + H - + - + + + ⥐ + + + @@ -1123,48 +1055,44 @@ - - - - - - + - - + + - - - + H - + - - - - - - - + + + ̂ + + + + - - + + - - - + H - + - + + + ̑ + + + @@ -1182,48 +1110,44 @@ - - - - - - + - - + + - - - + H - + - - - - - - - + + + ⃛ + + + + - - + + - - - + H - + - + + + ⃜ + + + @@ -1392,27 +1316,27 @@ - - - - - - + - + + + + + + H - - - ⎵ - - - + - + + + ⎵ + + + @@ -1434,27 +1358,27 @@ - - - - - - + - + + + + + + H - - - ⏝ - - - + - + + + ⏝ + + + @@ -1476,27 +1400,27 @@ - - - - - - + - + + + + + + H - - - ⏟ - - - + - + + + ⏟ + + + diff --git a/tests/writers/accents6.omml b/tests/writers/accents6.omml --- a/tests/writers/accents6.omml +++ b/tests/writers/accents6.omml @@ -29,132 +29,120 @@ - - - - - - + - - + + - - - + x - + - - - - - - - + + + ' + + + + - - + + - - - + x - + - - - - - - - + + + ^ + + + + - - + + - - - + x - + - - - - - - - + + + _ + + + + - - + + - - - + x - + - - - - - - - + + + ` + + + + - - + + - - - + x - + - - - - - - - + + + ~ + + + + - - + + - - - + x - + - + + + ¨ + + + @@ -172,237 +160,215 @@ - - - - - - + - - + + - - - + x - + - - - - - - - + + + ´ + + + + - - + + - - - + x - + - - - - - - - + + + ¸ + + + + - - + + - - - + x - + - - - - - - - + + + ˆ + + + + - - + + - - - + x - + - - - - - - - + + + ˇ + + + + - - + + - - - + x - + - - - - - - - + + + ˘ + + + + - - + + - - - + x - + - - - - - - - + + + ˙ + + + + - - + + - - - + x - + - - - - - - - + + + ˚ + + + + - - + + - - - + x - + - - - - - - - + + + ˜ + + + + - - + + - - - + x - + - - - - - - - + + + ˝ + + + + - - + + - - - + x - + - - - - - - - + + + ̂ + + + + - - + + - - - + x - + - + + + ̑ + + + @@ -420,363 +386,329 @@ - - - - - - + - - + + - - - + x - + - - - - - - - + + + ⃛ + + + + - - + + - - - + x - + - - - - - - - + + + ⃜ + + + + - - + + - - - + x - + - - - - - - - + + + ← + + + + - - + + - - - + x - + - - - - - - - + + + → + + + + - - + + - - - + x - + - - - - - - - + + + ↔ + + + + - - + + - - - + x - + - - - - - - - + + + ↼ + + + + - - + + - - - + x - + - - - - - - - + + + ↽ + + + + - - + + - - - + x - + - - - - - - - + + + ⇀ + + + + - - + + - - - + x - + - - - - - - - + + + ⇁ + + + + - - + + - - - + x - + - - - - - - - + + + ⎴ + + + + - - + + - - - + x - + - - - - - - - + + + ⎵ + + + + - - + + - - - + x - + - - - - - - - + + + ⏜ + + + + - - + + - - - + x - + - - - - - - - + + + ⏝ + + + + - - + + - - - + x - + - - - - - - - + + + ⏞ + + + + - - + + - - - + x - + - - - - - - - + + + ⏟ + + + + - - + + - - - + x - + - - - - - - - + + + ⥎ + + + + - - + + - - - + x - + - + + + ⥐ + + + @@ -1123,48 +1055,44 @@ - - - - - - + - - + + - - - + x - + - - - - - - - + + + ̂ + + + + - - + + - - - + x - + - + + + ̑ + + + @@ -1182,48 +1110,44 @@ - - - - - - + - - + + - - - + x - + - - - - - - - + + + ⃛ + + + + - - + + - - - + x - + - + + + ⃜ + + + @@ -1392,27 +1316,27 @@ - - - - - - + - + + + + + + x - - - ⎵ - - - + - + + + ⎵ + + + @@ -1434,27 +1358,27 @@ - - - - - - + - + + + + + + x - - - ⏝ - - - + - + + + ⏝ + + + @@ -1476,27 +1400,27 @@ - - - - - - + - + + + + + + x - - - ⏟ - - - + - + + + ⏟ + + + diff --git a/tests/writers/complex1.omml b/tests/writers/complex1.omml --- a/tests/writers/complex1.omml +++ b/tests/writers/complex1.omml @@ -1107,18 +1107,16 @@ - - + + - - - + x - + @@ -1157,18 +1155,16 @@ - - + + - - - + y - + @@ -1210,18 +1206,16 @@ - - + + - - - + z - + @@ -1314,18 +1308,16 @@ - - + + - - - + B - + @@ -1370,18 +1362,16 @@ - - + + - - - + E - + @@ -1432,18 +1422,16 @@ - - + + - - - + j - + @@ -1466,18 +1454,16 @@ - - + + - - - + E - + @@ -1516,18 +1502,16 @@ - - + + - - - + E - + @@ -1575,18 +1559,16 @@ - - + + - - - + B - + @@ -1616,18 +1598,16 @@ - - + + - - - + 0 - + @@ -1650,18 +1630,16 @@ - - + + - - - + B - + diff --git a/tests/writers/complex3.omml b/tests/writers/complex3.omml --- a/tests/writers/complex3.omml +++ b/tests/writers/complex3.omml @@ -3862,12 +3862,7 @@ - - - - - - + a @@ -3891,7 +3886,12 @@ a - + + + ︸ + + + @@ -17242,12 +17242,7 @@ - - - - - - + x @@ -17265,7 +17260,12 @@ x - + + + ︸ + + + @@ -19651,93 +19651,81 @@ - - + + - - - + a - + + - - + + - - - + b - + + - - + + - - - + c - + + - - + + - - - + d - + + - - + + - - - + e - + + - - + + - - - + f - + + @@ -19760,93 +19748,81 @@ + - - + + - - - + i - + + - - + + - - - + j - + + - - + + - - - + k - + + - - + + - - - + l - + + - - + + - - - + m - + + - - + + - - - + n - + @@ -22511,12 +22487,7 @@ - - - - - - + @@ -22525,7 +22496,12 @@ lim - + + + ̲ + + + x @@ -22534,12 +22510,7 @@ - - - - - - + @@ -22548,7 +22519,12 @@ lim - + + + → + + + x @@ -22557,12 +22533,7 @@ - - - - - - + @@ -22571,7 +22542,12 @@ lim - + + + ← + + + x diff --git a/tests/writers/complex_number.omml b/tests/writers/complex_number.omml --- a/tests/writers/complex_number.omml +++ b/tests/writers/complex_number.omml @@ -21,18 +21,18 @@ - - - - - - + a - + + + ⏟ + + + @@ -48,12 +48,7 @@ - - - - - - + b @@ -65,7 +60,12 @@ i - + + + ⏟ + + + diff --git a/tests/writers/divergence.omml b/tests/writers/divergence.omml --- a/tests/writers/divergence.omml +++ b/tests/writers/divergence.omml @@ -10,18 +10,16 @@ ⋅ - - + + - - - + v - + = diff --git a/tests/writers/mover1.omml b/tests/writers/mover1.omml --- a/tests/writers/mover1.omml +++ b/tests/writers/mover1.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover2.omml b/tests/writers/mover2.omml --- a/tests/writers/mover2.omml +++ b/tests/writers/mover2.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover3.omml b/tests/writers/mover3.omml --- a/tests/writers/mover3.omml +++ b/tests/writers/mover3.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover4.omml b/tests/writers/mover4.omml --- a/tests/writers/mover4.omml +++ b/tests/writers/mover4.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover5.omml b/tests/writers/mover5.omml --- a/tests/writers/mover5.omml +++ b/tests/writers/mover5.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover6.omml b/tests/writers/mover6.omml --- a/tests/writers/mover6.omml +++ b/tests/writers/mover6.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover7.omml b/tests/writers/mover7.omml --- a/tests/writers/mover7.omml +++ b/tests/writers/mover7.omml @@ -4,18 +4,16 @@ - - + + - - - + x - + ≠ diff --git a/tests/writers/mover8.omml b/tests/writers/mover8.omml --- a/tests/writers/mover8.omml +++ b/tests/writers/mover8.omml @@ -4,62 +4,54 @@ - - + + - - - + x - + ≠ - - + + - - - + x - + = - - + + - - - + x - + = - - + + - - - + x - + diff --git a/tests/writers/mover9.omml b/tests/writers/mover9.omml --- a/tests/writers/mover9.omml +++ b/tests/writers/mover9.omml @@ -4,62 +4,54 @@ - - + + - - - + x - + ≠ - - + + - - - + x - + = - - + + - - - + x - + = - - + + - - - + x - + diff --git a/tests/writers/munder1.omml b/tests/writers/munder1.omml --- a/tests/writers/munder1.omml +++ b/tests/writers/munder1.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ´ + + + ≠ diff --git a/tests/writers/munder2.omml b/tests/writers/munder2.omml --- a/tests/writers/munder2.omml +++ b/tests/writers/munder2.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ` + + + ≠ diff --git a/tests/writers/munder3.omml b/tests/writers/munder3.omml --- a/tests/writers/munder3.omml +++ b/tests/writers/munder3.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ˆ + + + ≠ diff --git a/tests/writers/munder4.omml b/tests/writers/munder4.omml --- a/tests/writers/munder4.omml +++ b/tests/writers/munder4.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ˇ + + + ≠ diff --git a/tests/writers/munder5.omml b/tests/writers/munder5.omml --- a/tests/writers/munder5.omml +++ b/tests/writers/munder5.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ˜ + + + ≠ diff --git a/tests/writers/munder6.omml b/tests/writers/munder6.omml --- a/tests/writers/munder6.omml +++ b/tests/writers/munder6.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ˙ + + + ≠ diff --git a/tests/writers/munder7.omml b/tests/writers/munder7.omml --- a/tests/writers/munder7.omml +++ b/tests/writers/munder7.omml @@ -4,18 +4,18 @@ - - - - - - + x - + + + ¨ + + + ≠ diff --git a/tests/writers/munder8.omml b/tests/writers/munder8.omml --- a/tests/writers/munder8.omml +++ b/tests/writers/munder8.omml @@ -4,62 +4,62 @@ - - - - - - + x - + + + ⃛ + + + ≠ - - - - - - + x - + + + ⃛ + + + = - - - - - - + x - + + + ⃛ + + + = - - - - - - + x - + + + ⃛ + + + diff --git a/tests/writers/munder9.omml b/tests/writers/munder9.omml --- a/tests/writers/munder9.omml +++ b/tests/writers/munder9.omml @@ -4,62 +4,62 @@ - - - - - - + x - + + + ⃜ + + + ≠ - - - - - - + x - + + + ⃜ + + + = - - - - - - + x - + + + ⃜ + + + = - - - - - - + x - + + + ⃜ + + + diff --git a/tests/writers/stretchAccents1.omml b/tests/writers/stretchAccents1.omml --- a/tests/writers/stretchAccents1.omml +++ b/tests/writers/stretchAccents1.omml @@ -4,18 +4,16 @@ - - + + - - - + xxx - + + @@ -32,63 +30,57 @@ + - - + + - - - + xxx - + + - - + + - - - + xxx - + + - - + + - - - + xxx - + + - - - - - - + xxx - + + + ⏟ + + + + diff --git a/tests/writers/stretchBrack1.omml b/tests/writers/stretchBrack1.omml --- a/tests/writers/stretchBrack1.omml +++ b/tests/writers/stretchBrack1.omml @@ -4,12 +4,10 @@ - - + + - - - + H @@ -21,13 +19,8 @@ G - - - - - - - + + H @@ -39,6 +32,11 @@ G - + + + ⏟ + + + diff --git a/tests/writers/stretchHoriz1.omml b/tests/writers/stretchHoriz1.omml --- a/tests/writers/stretchHoriz1.omml +++ b/tests/writers/stretchHoriz1.omml @@ -75,12 +75,10 @@ - - + + - - - + @@ -89,7 +87,7 @@ maps to - + @@ -119,12 +117,10 @@ - - + + - - - + @@ -133,7 +129,7 @@ maps to - + @@ -163,12 +159,10 @@ - - + + - - - + @@ -177,7 +171,7 @@ maps to - + @@ -207,12 +201,10 @@ - - + + - - - + @@ -221,7 +213,7 @@ maps to - + diff --git a/tests/writers/stretchTilde1.omml b/tests/writers/stretchTilde1.omml --- a/tests/writers/stretchTilde1.omml +++ b/tests/writers/stretchTilde1.omml @@ -4,17 +4,15 @@ - - + + - - - + caledonia - + diff --git a/tests/writers/subsup.omml b/tests/writers/subsup.omml --- a/tests/writers/subsup.omml +++ b/tests/writers/subsup.omml @@ -136,18 +136,16 @@ - - + + - - - + u - + @@ -182,18 +180,18 @@ - - - - - - + u - + + + ̲ + + + @@ -274,12 +272,7 @@ - - - - - - + a @@ -291,7 +284,12 @@ b - + + + ⏟ + + + @@ -304,12 +302,7 @@ - - - - - - + a @@ -321,7 +314,12 @@ b - + + + ⎵ + + + diff --git a/tests/writers/tokens.omml b/tests/writers/tokens.omml --- a/tests/writers/tokens.omml +++ b/tests/writers/tokens.omml @@ -4,18 +4,16 @@ - - + + - - - + ϕ - + diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,5 +1,5 @@ Name: texmath -Version: 0.11.0.1 +Version: 0.11.1 Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Conversion between formats used to represent mathematics.