texmath 0.6.1.5 → 0.6.3
raw patch · 14 files changed
+166/−23 lines, 14 files
Files
- Text/TeXMath/OMML.hs +0/−1
- Text/TeXMath/Parser.hs +5/−0
- cgi/texmath-cgi.hs +2/−2
- tests/05.omml +0/−3
- tests/06.omml +0/−2
- tests/10.omml +0/−1
- tests/13.omml +0/−1
- tests/deMorgans_law.omml +0/−2
- tests/sophomores_dream.omml +0/−2
- tests/sphere_volume.omml +0/−4
- tests/subsup.omml +112/−0
- tests/subsup.tex +17/−4
- tests/subsup.xhtml +29/−0
- texmath.cabal +1/−1
Text/TeXMath/OMML.hs view
@@ -228,7 +228,6 @@ mnode "nary" [ mnode "naryPr" [ mnodeA "chr" s () , mnodeA "limLoc" t ()- , mnode "grow" () , mnodeA "supHide" (if y == EGrouped [] then "on" else "off") () , mnodeA "supHide"
Text/TeXMath/Parser.hs view
@@ -61,6 +61,7 @@ , unary , binary , enclosure+ , bareSubSup , environment , diacritical , escaped@@ -87,6 +88,10 @@ a <- expr1 limits <- limitsIndicator subSup limits a <|> superOrSubscripted limits a <|> return a++bareSubSup :: TP Exp+bareSubSup = subSup Nothing (EIdentifier "")+ <|> superOrSubscripted Nothing (EIdentifier "") limitsIndicator :: TP (Maybe Bool) limitsIndicator =
cgi/texmath-cgi.hs view
@@ -6,7 +6,7 @@ import Data.Maybe (fromMaybe) import Control.Monad import Text.JSON-import Codec.Binary.UTF8.String (decodeString)+import Codec.Binary.UTF8.String (decodeString, encodeString) cgiMain :: CGI CGIResult cgiMain = do@@ -19,7 +19,7 @@ Left e -> toJSObject [("success", JSBool False) , ("error", JSString $ toJSString e)] Right v -> toJSObject [("success", JSBool True)- , ("mathml", JSString $ toJSString $+ , ("mathml", JSString $ toJSString $ encodeString $ ppElement v)] main :: IO ()
tests/05.omml view
@@ -8,7 +8,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -30,7 +29,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -97,7 +95,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/06.omml view
@@ -8,7 +8,6 @@ <m:naryPr> <m:chr m:val="∑" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -17,7 +16,6 @@ <m:naryPr> <m:chr m:val="∑" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/10.omml view
@@ -83,7 +83,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/13.omml view
@@ -135,7 +135,6 @@ <m:naryPr> <m:chr m:val="∑" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/deMorgans_law.omml view
@@ -77,7 +77,6 @@ <m:naryPr> <m:chr m:val="⋃" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -128,7 +127,6 @@ <m:naryPr> <m:chr m:val="⋂" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/sophomores_dream.omml view
@@ -8,7 +8,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -63,7 +62,6 @@ <m:naryPr> <m:chr m:val="∑" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/sphere_volume.omml view
@@ -150,7 +150,6 @@ <m:naryPr> <m:chr m:val="∭" /> <m:limLoc m:val="undOvr" />- <m:grow /> <m:supHide m:val="on" /> <m:supHide m:val="on" /> </m:naryPr>@@ -242,7 +241,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -282,7 +280,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>@@ -332,7 +329,6 @@ <m:naryPr> <m:chr m:val="∫" /> <m:limLoc m:val="subSup" />- <m:grow /> <m:supHide m:val="off" /> <m:supHide m:val="off" /> </m:naryPr>
tests/subsup.omml view
@@ -24,6 +24,10 @@ </m:r> </m:sup> </m:sSubSup>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:sSubSup> <m:e> <m:r>@@ -44,6 +48,10 @@ </m:r> </m:sup> </m:sSubSup>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:r>@@ -60,6 +68,10 @@ </m:r> </m:lim> </m:limLow>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:r>@@ -76,6 +88,10 @@ </m:r> </m:lim> </m:limLow>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:r>@@ -92,6 +108,10 @@ </m:r> </m:lim> </m:limLow>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:r>@@ -108,6 +128,10 @@ </m:r> </m:lim> </m:limLow>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:r>@@ -124,6 +148,10 @@ </m:r> </m:lim> </m:limLow>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:sSup> <m:e> <m:acc>@@ -145,6 +173,10 @@ </m:r> </m:sup> </m:sSup>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:sSub> <m:e> <m:bar>@@ -166,6 +198,10 @@ </m:r> </m:sub> </m:sSub>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:sSubSup> <m:e> <m:bar>@@ -193,6 +229,10 @@ </m:r> </m:sup> </m:sSubSup>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limUpp> <m:e> <m:acc>@@ -224,6 +264,10 @@ </m:r> </m:lim> </m:limUpp>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limUpp> <m:e> <m:acc>@@ -253,6 +297,10 @@ </m:r> </m:lim> </m:limUpp>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:limLow>@@ -285,6 +333,10 @@ </m:r> </m:lim> </m:limLow>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r> <m:limLow> <m:e> <m:limLow>@@ -317,5 +369,65 @@ </m:r> </m:lim> </m:limLow>+ <m:sSup>+ <m:e>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r>+ </m:e>+ <m:sup>+ <m:r>+ <m:rPr />+ <m:t>H</m:t>+ </m:r>+ </m:sup>+ </m:sSup>+ <m:r>+ <m:rPr />+ <m:t>e</m:t>+ </m:r>+ <m:r>+ <m:rPr />+ <m:t>3</m:t>+ </m:r>+ <m:sSub>+ <m:e>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r>+ </m:e>+ <m:sub>+ <m:r>+ <m:rPr />+ <m:t>x</m:t>+ </m:r>+ </m:sub>+ </m:sSub>+ <m:r>+ <m:rPr />+ <m:t>A</m:t>+ </m:r>+ <m:sSubSup>+ <m:e>+ <m:r>+ <m:rPr />+ <m:t> </m:t>+ </m:r>+ </m:e>+ <m:sub>+ <m:r>+ <m:rPr />+ <m:t>x</m:t>+ </m:r>+ </m:sub>+ <m:sup>+ <m:r>+ <m:rPr />+ <m:t>3</m:t>+ </m:r>+ </m:sup>+ </m:sSubSup> </m:oMath> </m:oMathPara>
tests/subsup.tex view
@@ -1,4 +1,17 @@- x^a_b x_b^a \min_A \max_B \det_C \Pr_A \gcd_A- \dot{u}^2 \overline{u}_\varepsilon \underline{u}^a_b- \overbrace{a+b}^{\text{term}} \overbracket{a+b}^{c}- \underbrace{a+b}_{c} \underbracket{a+b}_{c}+ x^a_b\quad+ x_b^a\quad+ \min_A\quad+ \max_B\quad+ \det_C\quad+ \Pr_A\quad+ \gcd_A\quad+ \dot{u}^2\quad+ \overline{u}_\varepsilon\quad+ \underline{u}^a_b\quad+ \overbrace{a+b}^{\text{term}}\quad+ \overbracket{a+b}^{c}\quad+ \underbrace{a+b}_{c}\quad+ \underbracket{a+b}_{c}\quad+ ^He3\quad+ _xA\quad+ _x^3
tests/subsup.xhtml view
@@ -11,31 +11,38 @@ <mi>b</mi> <mi>a</mi> </msubsup>+ <mspace width="1em" /> <msubsup> <mi>x</mi> <mi>b</mi> <mi>a</mi> </msubsup>+ <mspace width="1em" /> <munder> <mi>min</mi> <mi>A</mi> </munder>+ <mspace width="1em" /> <munder> <mi>max</mi> <mi>B</mi> </munder>+ <mspace width="1em" /> <munder> <mi>det</mi> <mi>C</mi> </munder>+ <mspace width="1em" /> <munder> <mi>Pr</mi> <mi>A</mi> </munder>+ <mspace width="1em" /> <munder> <mi>gcd</mi> <mi>A</mi> </munder>+ <mspace width="1em" /> <msup> <mover> <mi>u</mi>@@ -43,6 +50,7 @@ </mover> <mn>2</mn> </msup>+ <mspace width="1em" /> <msub> <mover> <mi>u</mi>@@ -50,6 +58,7 @@ </mover> <mi>ɛ</mi> </msub>+ <mspace width="1em" /> <msubsup> <munder> <mi>u</mi>@@ -58,6 +67,7 @@ <mi>b</mi> <mi>a</mi> </msubsup>+ <mspace width="1em" /> <mover> <mover> <mrow>@@ -69,6 +79,7 @@ </mover> <mtext mathvariant="normal">term</mtext> </mover>+ <mspace width="1em" /> <mover> <mover> <mrow>@@ -80,6 +91,7 @@ </mover> <mi>c</mi> </mover>+ <mspace width="1em" /> <munder> <munder> <mrow>@@ -91,6 +103,7 @@ </munder> <mi>c</mi> </munder>+ <mspace width="1em" /> <munder> <munder> <mrow>@@ -102,6 +115,22 @@ </munder> <mi>c</mi> </munder>+ <msup>+ <mspace width="1em" />+ <mi>H</mi>+ </msup>+ <mi>e</mi>+ <mn>3</mn>+ <msub>+ <mspace width="1em" />+ <mi>x</mi>+ </msub>+ <mi>A</mi>+ <msubsup>+ <mspace width="1em" />+ <mi>x</mi>+ <mn>3</mn>+ </msubsup> </mrow> </math> </body>
texmath.cabal view
@@ -1,5 +1,5 @@ Name: texmath-Version: 0.6.1.5+Version: 0.6.3 Cabal-Version: >= 1.6 Build-type: Custom Synopsis: Conversion of LaTeX math formulas to MathML or OMML.