From f36ce015c4ba1d638f3b4009419f11c3d5ffa768 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Thu, 31 Dec 2009 01:13:16 +0000
Subject: Fixed up LaTeXMathML module not to use TH.

Instead, we read the script in pandoc.hs, and pass it via variables.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1702 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 src/Text/Pandoc/LaTeXMathML.hs |  3 ---
 src/pandoc.hs                  | 13 ++++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/LaTeXMathML.hs b/src/Text/Pandoc/LaTeXMathML.hs
index 8cdd3cd21..020d626c0 100644
--- a/src/Text/Pandoc/LaTeXMathML.hs
+++ b/src/Text/Pandoc/LaTeXMathML.hs
@@ -6,11 +6,8 @@ import Text.Pandoc.Shared (readDataFile)
 
 -- | String containing LaTeXMathML javascript.
 latexMathMLScript :: IO String
-latexMathMLScript = undefined
-{-
 latexMathMLScript = do
  jsCom <- readDataFile $ "data" </> "LaTeXMathML.js.comment"
  jsPacked <- readDataFile $ "data" </> "LaTeXMathML.js.packed"
  return $ "<script type=\"text/javascript\">\n" ++ jsCom ++ jsPacked ++
           "</script>\n"
--}
diff --git a/src/pandoc.hs b/src/pandoc.hs
index 431a41836..69c7ad895 100644
--- a/src/pandoc.hs
+++ b/src/pandoc.hs
@@ -34,6 +34,7 @@ import Text.Pandoc
 import Text.Pandoc.ODT
 import Text.Pandoc.Writers.S5 (s5HeaderIncludes)
 import Text.Pandoc.Templates (getDefaultTemplate)
+import Text.Pandoc.LaTeXMathML (latexMathMLScript)
 import Text.Pandoc.Shared ( HTMLMathMethod (..), tabFilter, ObfuscationMethod (..) )
 #ifdef _HIGHLIGHTING
 import Text.Pandoc.Highlighting ( languages )
@@ -261,8 +262,8 @@ options =
 
     , Option "m" ["latexmathml", "asciimathml"]
                  (OptArg
-                  (\arg opt -> return opt { optHTMLMathMethod =
-                                               LaTeXMathML arg })
+                  (\arg opt ->
+                      return opt { optHTMLMathMethod = LaTeXMathML arg })
                   "URL")
                  "" -- "Use LaTeXMathML script in html output"
 
@@ -641,6 +642,12 @@ main = do
                                           variables
                    else return variables
 
+  variables'' <- case mathMethod of
+                      LaTeXMathML (Just _) -> do
+                         s <- latexMathMLScript
+                         return $ ("latexmathml-script", s) : variables'
+                      _ -> return variables'
+
   let startParserState =
          defaultParserState { stateParseRaw        = parseRaw,
                               stateTabStop         = tabStop,
@@ -660,7 +667,7 @@ main = do
                                       writerTemplate         = if null template
                                                                   then defaultTemplate
                                                                   else template,
-                                      writerVariables        = variables',
+                                      writerVariables        = variables'',
                                       writerIncludeBefore    = concat befores,
                                       writerIncludeAfter     = concat afters,
                                       writerTabStop          = tabStop,
-- 
cgit v1.2.3