Changed how ASCIIMathML is handled:

+ -m|--asciimathml option now takes an *optional* argument,
  the URL to an asciiMathML.js script.  This is much better
  in situations where multiple files with math must be served,
  as the script can be cached.
+ If the argument is provided, a link is inserted; otherwise,
  the whole script is inserted as before.
+ Nothing is inserted unless there is inline LaTeX.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@799 788f1e2b-df1e-0410-8736-df70ead52e1b

2 files changed, 14 insertions, 1 deletions

diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index f1df22c4f..b79af235d 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -421,6 +421,8 @@ data WriterOptions = WriterOptions
     , writerIncludeAfter    :: String -- ^ String to include after the body
     , writerTableOfContents :: Bool   -- ^ Include table of contents
     , writerS5              :: Bool   -- ^ We're writing S5 
+    , writerUseASCIIMathML  :: Bool   -- ^ Use ASCIIMathML
+    , writerASCIIMathMLURL  :: Maybe String -- ^ URL to asciiMathML.js 
     , writerIgnoreNotes     :: Bool   -- ^ Ignore footnotes (used in making toc)
     , writerIncremental     :: Bool   -- ^ Incremental S5 lists
     , writerNumberSections  :: Bool   -- ^ Number sections in LaTeX
@@ -438,6 +440,8 @@ defaultWriterOptions =
                     writerTabStop         = 4,
                     writerTableOfContents = False,
                     writerS5              = False,
+                    writerUseASCIIMathML  = False,
+                    writerASCIIMathMLURL  = Nothing,
                     writerIgnoreNotes     = False,
                     writerIncremental     = False,
                     writerNumberSections  = False,
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 4637ffde4..c860d73e6 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -29,6 +29,7 @@ Conversion of 'Pandoc' documents to HTML.
 -}
 module Text.Pandoc.Writers.HTML ( writeHtml, writeHtmlString ) where
 import Text.Pandoc.Definition
+import Text.Pandoc.ASCIIMathML
 import Text.Pandoc.Shared
 import Text.Pandoc.Entities (decodeEntities)
 import Text.Regex ( mkRegex, matchRegex )
@@ -358,7 +359,15 @@ inlineToHtml opts inline =
                                               primHtmlChar "rdquo") in 
                         do contents <- inlineListToHtml opts lst
                            return $ leftQuote +++ contents +++ rightQuote
-    (TeX str)        -> return $ stringToHtml str
+    (TeX str)        -> do if writerUseASCIIMathML opts
+                              then addToHeader $
+                                   case writerASCIIMathMLURL opts of
+                                        Just path -> script !  [src path, 
+                                                     thetype "text/javascript"] $
+                                                     noHtml
+                                        Nothing   -> primHtml asciiMathMLScript
+                              else return ()
+                           return $ stringToHtml str
     (HtmlInline str) -> return $ primHtml str 
     (Link txt (src,tit)) ->
                         do linkText <- inlineListToHtml opts txt