diff options
author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-08-13 03:02:42 +0000 |
---|---|---|
committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2008-08-13 03:02:42 +0000 |
commit | f53fb554fe0acf88d7c697236bbd1373e78f3d83 (patch) | |
tree | 31f3a3e7b5274458a0738482a32c4b881da2e180 /Text/Pandoc/Writers/Texinfo.hs | |
parent | aeaf5e5108de4e7ab20782cf753e4617df45d8a2 (diff) | |
download | pandoc-f53fb554fe0acf88d7c697236bbd1373e78f3d83.tar.gz |
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
Diffstat (limited to 'Text/Pandoc/Writers/Texinfo.hs')
-rw-r--r-- | Text/Pandoc/Writers/Texinfo.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Text/Pandoc/Writers/Texinfo.hs b/Text/Pandoc/Writers/Texinfo.hs index d0e134346..305a1a8d0 100644 --- a/Text/Pandoc/Writers/Texinfo.hs +++ b/Text/Pandoc/Writers/Texinfo.hs @@ -30,6 +30,7 @@ Conversion of 'Pandoc' format into Texinfo. module Text.Pandoc.Writers.Texinfo ( writeTexinfo ) where import Text.Pandoc.Definition import Text.Pandoc.Shared +import Text.Pandoc.Readers.TeXMath import Text.Printf ( printf ) import Data.List ( isSuffixOf ) import Data.Char ( chr, ord ) @@ -364,7 +365,7 @@ inlineForNode EnDash = return $ text "--" inlineForNode Apostrophe = return $ char '\'' inlineForNode Ellipses = return $ text "..." inlineForNode LineBreak = return empty -inlineForNode (Math _) = return empty +inlineForNode (Math _ str) = inlineListForNode $ readTeXMath str inlineForNode (TeX _) = return empty inlineForNode (HtmlInline _) = return empty inlineForNode (Link lst _) = inlineListForNode lst @@ -437,7 +438,7 @@ inlineToTexinfo EmDash = return $ text "---" inlineToTexinfo EnDash = return $ text "--" inlineToTexinfo Ellipses = return $ text "@dots{}" inlineToTexinfo (Str str) = return $ text (stringToTexinfo str) -inlineToTexinfo (Math str) = return $ inCmd "math" $ text str +inlineToTexinfo (Math _ str) = return $ inCmd "math" $ text str inlineToTexinfo (TeX str) = return $ text "@tex" $$ text str $$ text "@end tex" inlineToTexinfo (HtmlInline _) = return empty inlineToTexinfo (LineBreak) = return $ text "@*" |