Refresh remaining patches

1 files changed, 44 insertions, 56 deletions

diff --git a/debian/patches/1001_online_latexmathml_default.patch b/debian/patches/1001_online_latexmathml_default.patch
index d19d8199e..3d104504a 100644
--- a/debian/patches/1001_online_latexmathml_default.patch
+++ b/debian/patches/1001_online_latexmathml_default.patch
@@ -1,51 +1,11 @@
 Description: use online LaTeXMathML.js by default
 Author: Jonas Smedegaard <dr@jones.dk>
-Last-Update: 2017-07-21
+Last-Update: 2018-04-24
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pandoc.hs
-+++ b/pandoc.hs
-@@ -819,8 +819,11 @@
- 
-     , Option "m" ["latexmathml", "asciimathml"]
-                  (OptArg
--                  (\arg opt ->
--                      return opt { optHTMLMathMethod = LaTeXMathML arg })
-+                  (\arg opt -> do
-+                      let url' = case arg of
-+                                      Just u   -> u
-+                                      Nothing  -> "http://math.etsu.edu/LaTeXMathML/LaTeXMathML.js"
-+                      return opt { optHTMLMathMethod = LaTeXMathML url'})
-                   "URL")
-                  "" -- "Use LaTeXMathML script in html output"
- 
-@@ -1319,12 +1322,6 @@
-                                                      in throwIO e')
-                                        else throwIO e)
- 
--  variables' <- case mathMethod of
--                      LaTeXMathML Nothing -> do
--                         s <- readDataFileUTF8 datadir "LaTeXMathML.js"
--                         return $ ("mathml-script", s) : variables
--                      _ -> return variables
--
-   variables'' <- if format == "dzslides"
-                     then do
-                         dztempl <- readDataFileUTF8 datadir
-@@ -1333,8 +1330,8 @@
-                         let dzcore = unlines
-                                    $ dropWhile (not . (dzline `isPrefixOf`))
-                                    $ lines dztempl
--                        return $ ("dzslides-core", dzcore) : variables'
--                    else return variables'
-+                        return $ ("dzslides-core", dzcore) : variables
-+                    else return variables
- 
-   let sourceURL = case sources of
-                     []    -> Nothing
 --- a/src/Text/Pandoc/Options.hs
 +++ b/src/Text/Pandoc/Options.hs
-@@ -299,7 +299,7 @@
+@@ -104,7 +104,7 @@ defaultAbbrevs = Set.fromList
  data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable, Generic)
  
  data HTMLMathMethod = PlainMath
@@ -56,9 +16,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                      | WebTeX String               -- url of TeX->image script.
 --- a/src/Text/Pandoc/Writers/HTML.hs
 +++ b/src/Text/Pandoc/Writers/HTML.hs
-@@ -142,7 +142,7 @@
-   let notes = reverse (stNotes st)
-   let thebody = blocks' >> footnoteSection opts notes
+@@ -259,7 +259,7 @@ pandocToHtml opts (Pandoc meta blocks) =
+   notes <- footnoteSection opts (reverse (stNotes st))
+   let thebody = blocks' >> notes
    let  math = case writerHTMLMathMethod opts of
 -                      LaTeXMathML (Just url) ->
 +                      LaTeXMathML url ->
@@ -67,22 +27,50 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                                    $ mempty
 --- a/man/pandoc.1
 +++ b/man/pandoc.1
-@@ -1104,14 +1104,10 @@
- .SS Math rendering in HTML
+@@ -1302,15 +1302,16 @@ Note that this option does not imply \f[
+ .RE
  .TP
  .B \f[C]\-m\f[] [\f[I]URL\f[]], \f[C]\-\-latexmathml\f[][\f[C]=\f[]\f[I]URL\f[]]
--Use the LaTeXMathML script to display embedded TeX math in HTML output.
--To insert a link to a local copy of the \f[C]LaTeXMathML.js\f[] script,
--provide a \f[I]URL\f[].
--If no \f[I]URL\f[] is provided, the contents of the script will be
--inserted directly into the HTML header, preserving portability at the
--price of efficiency.
--If you plan to use math on several pages, it is much better to link to a
--copy of the script, so it can be cached.
-+Use LaTeXMathML to display embedded TeX math in HTML output.
+-\f[I]Deprecated.\f[] Use the LaTeXMathML script to display embedded TeX
++\f[I]Deprecated.\f[] Use LaTeXMathML to display embedded TeX
+ math in HTML output.
+ TeX math will be displayed between \f[C]$\f[] or \f[C]$$\f[] characters
+ and put in \f[C]<span>\f[] tags with class \f[C]LaTeX\f[].
+ The LaTeXMathML JavaScript will then change it to MathML.
+ Note that currently only Firefox and Safari (and select e\-book readers)
+ natively support MathML.
+-To insert a link the \f[C]LaTeXMathML.js\f[] script, provide a
+-\f[I]URL\f[].
 +The \f[I]URL\f[] should point to the \f[C]LaTeXMathML.js\f[] load script.
 +If a \f[I]URL\f[] is not provided, a link to LaTeXMathML.js at the
 +Homepage of LaTeXMathML will be inserted.
  .RS
  .RE
  .TP
+--- a/src/Text/Pandoc/App.hs
++++ b/src/Text/Pandoc/App.hs
+@@ -351,12 +351,6 @@ convertWithOpts opts = do
+         maybe return (addStringAsVariable "epub-cover-image")
+                      (optEpubCoverImage opts)
+         >>=
+-        (\vars -> case optHTMLMathMethod opts of
+-                       LaTeXMathML Nothing -> do
+-                          s <- UTF8.toString <$> readDataFile "LaTeXMathML.js"
+-                          return $ ("mathml-script", s) : vars
+-                       _ -> return vars)
+-        >>=
+         (\vars ->  if format == "dzslides"
+                       then do
+                           dztempl <- UTF8.toString <$> readDataFile
+@@ -1396,7 +1390,10 @@ options =
+                  (OptArg
+                   (\arg opt -> do
+                       deprecatedOption "--latexmathml, --asciimathml, -m" ""
+-                      return opt { optHTMLMathMethod = LaTeXMathML arg })
++                      let url' = case arg of
++                                      Just u   -> u
++                                      Nothing -> "http://math.etsu.edu/LaTeXMathML/LaTeXMathML.js"
++                      return opt { optHTMLMathMethod = LaTeXMathML url' })
+                   "URL")
+                  "" -- "Use LaTeXMathML script in html output"
+