From 23553446f930e26c746658dd2607783d8b9149f3 Mon Sep 17 00:00:00 2001
From: Adam Vogt <vogt.adam@gmail.com>
Date: Fri, 31 Dec 2010 17:31:18 +0100
Subject: Update util/GenerateManpage for pandoc 1.6

Ignore-this: 6fdd88c649d37670501aa47594586ee6

darcs-hash:20101231163118-1499c-1ded61bf5473fdf93267bc993b9bf72afa18134d
---
 util/GenerateManpage.hs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/util/GenerateManpage.hs b/util/GenerateManpage.hs
index e0acb31..01bdec4 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
+import Text.Pandoc -- works with 1.6
 
 releaseDate = "25 October 09"
 
@@ -76,21 +76,22 @@ main = do
         . lines
         <$> readFile "./man/xmonad.1.markdown"
 
-    Right template <- getDefaultTemplate "man"
+    Right template <- getDefaultTemplate Nothing "man"
     writeFile "./man/xmonad.1"
         . (manHeader ++)
         . writeMan writeOpts{ writerStandalone = True, writerTemplate = template }
         $ parsed
     putStrLn "Documentation created: man/xmonad.1"
 
-    Right template <- getDefaultTemplate "html"
+    Right template <- getDefaultTemplate Nothing "html"
     writeFile "./man/xmonad.1.html"
         . writeHtmlString writeOpts
-            { writerIncludeBefore =
-                             "<h1>"++releaseName++"</h1>"++
+            { writerVariables =
+                        [("include-before"
+                            ,"<h1>"++releaseName++"</h1>"++
                              "<p>Section: xmonad manual (1)<br/>"++
                              "Updated: "++releaseDate++"</p>"++
-                             "<hr/>"
+                             "<hr/>")]
             , writerStandalone = True
             , writerTemplate = template
             , writerTableOfContents = True }
-- 
cgit v1.2.3