diff --git a/Text/TeXMath/Parser.hs b/Text/TeXMath/Parser.hs --- a/Text/TeXMath/Parser.hs +++ b/Text/TeXMath/Parser.hs @@ -481,42 +481,42 @@ , ("/", ESymbol Bin "/") , ("\\setminus", ESymbol Bin "\\") , ("\\times", ESymbol Bin "\x00D7") - , ("\\alpha", ESymbol Ord "\x03B1") - , ("\\beta", ESymbol Ord "\x03B2") - , ("\\chi", ESymbol Ord "\x03C7") - , ("\\delta", ESymbol Ord "\x03B4") + , ("\\alpha", EIdentifier "\x03B1") + , ("\\beta", EIdentifier "\x03B2") + , ("\\chi", EIdentifier "\x03C7") + , ("\\delta", EIdentifier "\x03B4") , ("\\Delta", ESymbol Op "\x0394") - , ("\\epsilon", ESymbol Ord "\x03B5") - , ("\\varepsilon", ESymbol Ord "\x025B") - , ("\\eta", ESymbol Ord "\x03B7") - , ("\\gamma", ESymbol Ord "\x03B3") + , ("\\epsilon", EIdentifier "\x03B5") + , ("\\varepsilon", EIdentifier "\x025B") + , ("\\eta", EIdentifier "\x03B7") + , ("\\gamma", EIdentifier "\x03B3") , ("\\Gamma", ESymbol Op "\x0393") - , ("\\iota", ESymbol Ord "\x03B9") - , ("\\kappa", ESymbol Ord "\x03BA") - , ("\\lambda", ESymbol Ord "\x03BB") + , ("\\iota", EIdentifier "\x03B9") + , ("\\kappa", EIdentifier "\x03BA") + , ("\\lambda", EIdentifier "\x03BB") , ("\\Lambda", ESymbol Op "\x039B") - , ("\\mu", ESymbol Ord "\x03BC") - , ("\\nu", ESymbol Ord "\x03BD") - , ("\\omega", ESymbol Ord "\x03C9") + , ("\\mu", EIdentifier "\x03BC") + , ("\\nu", EIdentifier "\x03BD") + , ("\\omega", EIdentifier "\x03C9") , ("\\Omega", ESymbol Op "\x03A9") - , ("\\phi", ESymbol Ord "\x03C6") - , ("\\varphi", ESymbol Ord "\x03D5") + , ("\\phi", EIdentifier "\x03C6") + , ("\\varphi", EIdentifier "\x03D5") , ("\\Phi", ESymbol Op "\x03A6") - , ("\\pi", ESymbol Ord "\x03C0") + , ("\\pi", EIdentifier "\x03C0") , ("\\Pi", ESymbol Op "\x03A0") - , ("\\psi", ESymbol Ord "\x03C8") + , ("\\psi", EIdentifier "\x03C8") , ("\\Psi", ESymbol Ord "\x03A8") - , ("\\rho", ESymbol Ord "\x03C1") - , ("\\sigma", ESymbol Ord "\x03C3") + , ("\\rho", EIdentifier "\x03C1") + , ("\\sigma", EIdentifier "\x03C3") , ("\\Sigma", ESymbol Op "\x03A3") - , ("\\tau", ESymbol Ord "\x03C4") - , ("\\theta", ESymbol Ord "\x03B8") - , ("\\vartheta", ESymbol Ord "\x03D1") + , ("\\tau", EIdentifier "\x03C4") + , ("\\theta", EIdentifier "\x03B8") + , ("\\vartheta", EIdentifier "\x03D1") , ("\\Theta", ESymbol Op "\x0398") - , ("\\upsilon", ESymbol Ord "\x03C5") - , ("\\xi", ESymbol Ord "\x03BE") + , ("\\upsilon", EIdentifier "\x03C5") + , ("\\xi", EIdentifier "\x03BE") , ("\\Xi", ESymbol Op "\x039E") - , ("\\zeta", ESymbol Ord "\x03B6") + , ("\\zeta", EIdentifier "\x03B6") , ("\\frac12", ESymbol Ord "\x00BD") , ("\\frac14", ESymbol Ord "\x00BC") , ("\\frac34", ESymbol Ord "\x00BE") diff --git a/tests/10.xhtml b/tests/10.xhtml --- a/tests/10.xhtml +++ b/tests/10.xhtml @@ -7,11 +7,11 @@ - φ + φ n ( - κ + κ ) = @@ -19,11 +19,11 @@ 4 - π + π 2 - κ + κ 2 @@ -37,12 +37,12 @@ sin ( - κ + κ R ) - κ + κ R diff --git a/tests/11.xhtml b/tests/11.xhtml --- a/tests/11.xhtml +++ b/tests/11.xhtml @@ -7,11 +7,11 @@ - φ + φ n ( - κ + κ ) = 0 @@ -23,7 +23,7 @@ 2 - κ + κ − 11 @@ -41,7 +41,7 @@ ≪ - κ + κ ≪ 1 diff --git a/tests/differentiable_manifold.xhtml b/tests/differentiable_manifold.xhtml --- a/tests/differentiable_manifold.xhtml +++ b/tests/differentiable_manifold.xhtml @@ -7,12 +7,12 @@ - γ + γ 1 ≡ - γ + γ 2 ⇔ @@ -21,7 +21,7 @@ - γ + γ 1 ( @@ -29,7 +29,7 @@ ) = - γ + γ 2 ( @@ -56,10 +56,10 @@ t - φ + φ ∘ - γ + γ 1 ( @@ -84,10 +84,10 @@ t - φ + φ ∘ - γ + γ 2 ( diff --git a/tests/ensuremath.xhtml b/tests/ensuremath.xhtml --- a/tests/ensuremath.xhtml +++ b/tests/ensuremath.xhtml @@ -7,7 +7,7 @@ - π + π 2 diff --git a/tests/moore_determinant.xhtml b/tests/moore_determinant.xhtml --- a/tests/moore_determinant.xhtml +++ b/tests/moore_determinant.xhtml @@ -14,13 +14,13 @@ - α + α 1 - α + α 1 q @@ -30,7 +30,7 @@ - α + α 1 q @@ -46,13 +46,13 @@ - α + α 2 - α + α 2 q @@ -62,7 +62,7 @@ - α + α 2 q @@ -92,13 +92,13 @@ - α + α m - α + α m q @@ -108,7 +108,7 @@ - α + α m q diff --git a/tests/runtests.sh b/tests/runtests.sh --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -6,6 +6,7 @@ # Exit status is number of failed tests. TESTPROG=../dist/build/texmath/texmath failures=0 +passes=0 if [ -f $TESTPROG ]; then for t in *.tex; do $TESTPROG <$t >tmp @@ -13,12 +14,14 @@ if [ "$?" -ne "0" ]; then echo "Test ${t%.tex} FAILED (< expected, > actual):" cat tmpdiff - let "failures=$failures+1" + failures=`expr $failures + 1` else echo "Test ${t%.tex} PASSED" + passes=`expr $passes + 1` fi done else echo "Test executable not built. NOT running tests." fi +echo "$passes tests passed, $failures tests failed." exit $failures diff --git a/tests/schwinger_dyson.xhtml b/tests/schwinger_dyson.xhtml --- a/tests/schwinger_dyson.xhtml +++ b/tests/schwinger_dyson.xhtml @@ -8,28 +8,28 @@ ⟨ - ψ + ψ ∣ 𝒯 { - δ + δ - δ - φ + δ + φ F [ - φ + φ ] } ∣ - ψ + ψ ⟩ = @@ -37,7 +37,7 @@ i ⟨ - ψ + ψ ∣ 𝒯 @@ -45,24 +45,24 @@ { F [ - φ + φ ] - δ + δ - δ - φ + δ + φ S [ - φ + φ ] } ∣ - ψ + ψ ⟩ diff --git a/tests/sphere_volume.xhtml b/tests/sphere_volume.xhtml --- a/tests/sphere_volume.xhtml +++ b/tests/sphere_volume.xhtml @@ -11,22 +11,22 @@ { 0 ≤ - φ + φ ≤ 2 - π + π , 0 ≤ - θ + θ ≤ - π + π , 0 ≤ - ρ + ρ ≤ R } @@ -43,20 +43,20 @@ - ρ + ρ 2 sin - θ + θ d - ρ + ρ d - θ + θ d - φ + φ @@ -68,24 +68,24 @@ 0 2 - π + π d - φ + φ ∫ 0 - π + π sin - θ + θ d - θ + θ ∫ @@ -94,36 +94,36 @@ - ρ + ρ 2 d - ρ + ρ = - φ + φ ∣ 0 2 - π + π ( − cos - θ + θ ) ∣ 0 - π + π @@ -133,7 +133,7 @@ - ρ + ρ 3 @@ -148,7 +148,7 @@ = 2 - π + π × 2 × @@ -174,7 +174,7 @@ 3 - π + π R 3 diff --git a/texmath.cabal b/texmath.cabal --- a/texmath.cabal +++ b/texmath.cabal @@ -1,6 +1,6 @@ Name: texmath -Version: 0.5.0.2 -Cabal-version: >= 1.2 +Version: 0.5.0.3 +Cabal-Version: >= 1.6 Build-type: Custom Synopsis: Conversion of LaTeX math formulas to MathML. Description: The texmathml library provides functions to convert LaTeX @@ -57,6 +57,10 @@ tests/unicode.tex, tests/unicode.xhtml tests/ensuremath.tex, tests/ensuremath.xhtml tests/macros.tex, tests/macros.xhtml + +Source-repository head + type: git + location: git://github.com/jgm/texmath.git Flag cgi description: Compile cgi executable.