diff options
Diffstat (limited to 'src/pandoc.hs')
| -rw-r--r-- | src/pandoc.hs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/pandoc.hs b/src/pandoc.hs index cd2768bfc..e959baba1 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -32,8 +32,7 @@ module Main where import Text.Pandoc import Text.Pandoc.ODT import Text.Pandoc.Writers.S5 (s5HeaderIncludes) -import Text.Pandoc.LaTeXMathML (latexMathMLScript) -import Text.Pandoc.Shared ( tabFilter, ObfuscationMethod (..) ) +import Text.Pandoc.Shared ( tabFilter, ObfuscationMethod (..), readDataFile ) #ifdef _HIGHLIGHTING import Text.Pandoc.Highlighting ( languages ) #endif @@ -287,6 +286,13 @@ options = "URL") "" -- "Use LaTeXMathML script in html output" + , Option "" ["mathml"] + (OptArg + (\arg opt -> + return opt { optHTMLMathMethod = MathML arg }) + "URL") + "" -- "Use mathml for HTML math" + , Option "" ["mimetex"] (OptArg (\arg opt -> return opt { optHTMLMathMethod = MimeTeX @@ -709,8 +715,11 @@ main = do variables'' <- case mathMethod of LaTeXMathML Nothing -> do - s <- latexMathMLScript datadir - return $ ("latexmathml-script", s) : variables' + s <- readDataFile datadir $ "data" </> "LaTeXMathML.js" + return $ ("mathml-script", s) : variables' + MathML Nothing -> do + s <- readDataFile datadir $ "data"</>"MathMLinHTML.js" + return $ ("mathml-script", s) : variables' _ -> return variables' let startParserState = |