From f53fb554fe0acf88d7c697236bbd1373e78f3d83 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Wed, 13 Aug 2008 03:02:42 +0000 Subject: Support for display math; changed ASCIIMathML -> LaTeXMathML: Resolves Issue #47. + Added a DisplayMath/InlineMath selector to Math inlines. + Markdown parser yields DisplayMath for $$...$$. + LaTeX parser yields DisplayMath when appropriate. Removed mathBlock parsers, since the same effect is achieved by the math inline parsers, now that they handle display math. + Writers handle DisplayMath as appropriate for the format. + Changed -m option to use LaTeXMathML rather than ASCIIMathML. LaTeXMathML is closer to LaTeX in its display of math, and supports many non-math LaTeX environments. + Modified HTML writer to print raw TeX when LaTeXMathML is being used instead of suppressing it. + Removed ASCIIMathML files from data/ and added LaTeXMathML. + Replaced ASCIIMathML with LaTeXMathML in source files. + Modified README and pandoc man page source. + Modified web page. + Added --latexmathml option (kept --asciimathml as a synonym for backwards compatibility) + Modified tests accordingly; added new tests for display math. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1409 788f1e2b-df1e-0410-8736-df70ead52e1b --- Text/Pandoc/Shared.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Text/Pandoc/Shared.hs') diff --git a/Text/Pandoc/Shared.hs b/Text/Pandoc/Shared.hs index d14a49d82..38c1cf6b4 100644 --- a/Text/Pandoc/Shared.hs +++ b/Text/Pandoc/Shared.hs @@ -715,8 +715,8 @@ refsMatch ((Quoted t x):restx) ((Quoted u y):resty) = t == u && refsMatch x y && refsMatch restx resty refsMatch ((Code x):restx) ((Code y):resty) = ((map toLower x) == (map toLower y)) && refsMatch restx resty -refsMatch ((Math x):restx) ((Math y):resty) = - ((map toLower x) == (map toLower y)) && refsMatch restx resty +refsMatch ((Math t x):restx) ((Math u y):resty) = + ((map toLower x) == (map toLower y)) && t == u && refsMatch restx resty refsMatch ((TeX x):restx) ((TeX y):resty) = ((map toLower x) == (map toLower y)) && refsMatch restx resty refsMatch ((HtmlInline x):restx) ((HtmlInline y):resty) = @@ -876,7 +876,7 @@ isHeaderBlock _ = False -- data HTMLMathMethod = PlainMath - | ASCIIMathML (Maybe String) -- url of ASCIIMathML.js + | LaTeXMathML (Maybe String) -- url of LaTeXMathML.js | GladTeX | MimeTeX String -- url of mimetex.cgi deriving (Show, Read, Eq) -- cgit v1.2.3