From 7018003811f2b606808ddecb5c1ce12e27ad7d51 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 30 Jan 2017 11:31:50 +0100
Subject: `--mathml` and MathML in HTMLMathMethod longer take an argument.

The argument was for a bridge javascript that used to be necessary
in 2004.  We have removed the script already.
---
 src/Text/Pandoc/Writers/Docbook.hs | 8 ++++----
 src/Text/Pandoc/Writers/EPUB.hs    | 2 +-
 src/Text/Pandoc/Writers/HTML.hs    | 8 ++------
 src/Text/Pandoc/Writers/TEI.hs     | 4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'src/Text/Pandoc/Writers')

diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index 53618d173..4c5b255d8 100644
--- a/src/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
@@ -117,8 +117,8 @@ writeDocbook opts (Pandoc meta blocks) = do
   main <- (render' . vcat) <$> (mapM (elementToDocbook opts' startLvl) elements)
   let context = defField "body" main
               $ defField "mathml" (case writerHTMLMathMethod opts of
-                                        MathML _ -> True
-                                        _        -> False)
+                                        MathML -> True
+                                        _      -> False)
               $ metadata
   return $ case writerTemplate opts of
            Nothing   -> main
@@ -421,8 +421,8 @@ inlineToDocbook opts (Note contents) =
   inTagsIndented "footnote" <$> blocksToDocbook opts contents
 
 isMathML :: HTMLMathMethod -> Bool
-isMathML (MathML _) = True
-isMathML _          = False
+isMathML MathML = True
+isMathML _      = False
 
 idAndRole :: Attr -> [(String, String)]
 idAndRole (id',cls,_) = ident ++ role
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
index ae77c10a2..d21f7bea1 100644
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -382,7 +382,7 @@ pandocToEPUB version opts doc@(Pandoc meta _) = do
                   , writerVariables = vars
                   , writerHTMLMathMethod =
                        if epub3
-                          then MathML Nothing
+                          then MathML
                           else writerHTMLMathMethod opts
                   , writerWrapText = WrapAuto }
   metadata <- getEPUBMetadata opts' meta
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 9037bfbec..d1fb3dda7 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -230,10 +230,6 @@ pandocToHtml opts (Pandoc meta blocks) = do
                          H.script ! A.src (toValue url)
                                   ! A.type_ "text/javascript"
                                   $ mempty
-                      MathML (Just url) ->
-                         H.script ! A.src (toValue url)
-                                  ! A.type_ "text/javascript"
-                                  $ mempty
                       MathJax url ->
                          H.script ! A.src (toValue url)
                                   ! A.type_ "text/javascript"
@@ -903,7 +899,7 @@ inlineToHtml opts inline = do
               return $ case t of
                          InlineMath -> preEscapedString $ "<EQ ENV=\"math\">" ++ str ++ "</EQ>"
                          DisplayMath -> preEscapedString $ "<EQ ENV=\"displaymath\">" ++ str ++ "</EQ>"
-           MathML _ -> do
+           MathML -> do
               let conf = useShortEmptyTags (const False)
                            defaultConfigPP
               res <- lift $ convertMath writeMathML t str
@@ -1061,6 +1057,6 @@ isMathEnvironment s = "\\begin{" `isPrefixOf` s &&
 
 allowsMathEnvironments :: HTMLMathMethod -> Bool
 allowsMathEnvironments (MathJax _) = True
-allowsMathEnvironments (MathML _)  = True
+allowsMathEnvironments (MathML)    = True
 allowsMathEnvironments (WebTeX _)  = True
 allowsMathEnvironments _           = False
diff --git a/src/Text/Pandoc/Writers/TEI.hs b/src/Text/Pandoc/Writers/TEI.hs
index c589c0c36..a54d42c53 100644
--- a/src/Text/Pandoc/Writers/TEI.hs
+++ b/src/Text/Pandoc/Writers/TEI.hs
@@ -76,8 +76,8 @@ writeTEI opts (Pandoc meta blocks) = return $
       main    = render' $ vcat (map (elementToTEI opts startLvl) elements)
       context = defField "body" main
               $ defField "mathml" (case writerHTMLMathMethod opts of
-                                        MathML _ -> True
-                                        _        -> False)
+                                        MathML -> True
+                                        _      -> False)
               $ metadata
   in  case writerTemplate opts of
            Nothing  -> main
-- 
cgit v1.2.3