update GenerateManpage to pandoc 1.12

Ignore-this: 7a8168999fbb181558dc97a194de65f9

darcs-hash:20140511171441-1499c-9af9810d37f92f4910e6c1d4816885c1f632d1a0.gz

1 files changed, 4 insertions, 5 deletions

diff --git a/util/GenerateManpage.hs b/util/GenerateManpage.hs
index 34b63f8..b9ac27a 100644
--- a/util/GenerateManpage.hs
+++ b/util/GenerateManpage.hs
@@ -34,7 +34,7 @@ import Distribution.PackageDescription
 import Text.PrettyPrint.HughesPJ
 import Distribution.Text
 
-import Text.Pandoc -- works with 1.6
+import Text.Pandoc -- works with 1.12.4
 
 releaseDate = "31 December 2012"
 
@@ -68,9 +68,8 @@ main = do
                     `liftM` readFile "./src/XMonad/Config.hs"
 
     let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
-        writeOpts = defaultWriterOptions -- { writerLiterateHaskell = True }
 
-    parsed <- readMarkdown defaultParserState { stateLiterateHaskell = True }
+    parsed <- readMarkdown def
         . unlines
         . replace "___KEYBINDINGS___" keybindings
         . lines
@@ -79,13 +78,13 @@ main = do
     Right template <- getDefaultTemplate Nothing "man"
     writeFile "./man/xmonad.1"
         . (manHeader ++)
-        . writeMan writeOpts{ writerStandalone = True, writerTemplate = template }
+        . writeMan def{ writerStandalone = True, writerTemplate = template }
         $ parsed
     putStrLn "Documentation created: man/xmonad.1"
 
     Right template <- getDefaultTemplate Nothing "html"
     writeFile "./man/xmonad.1.html"
-        . writeHtmlString writeOpts
+        . writeHtmlString def
             { writerVariables =
                         [("include-before"
                             ,"<h1>"++releaseName++"</h1>"++