git.iko.soy/typeable/pandoc
on master help sign in
Fixes to make haddock work with template haskell:

+ Added CPP, TemplateHaskell, FlexibleInstances to cabal file "Extensions" field + Added #ifndef __HADDOCK__ cpp declarations in the files using template haskell. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1366 788f1e2b-df1e-0410-8736-df70ead52e1b

commite371db97d7de5188b89b9f77749b47c20ef958de authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 1 Aug 2008, 23:29 (18 years ago) parent5c1c786
4 files changed+30−3
compare with master
unifiedsplit
Text/Pandoc/ASCIIMathML.hs+3−1 Text/Pandoc/DefaultHeaders.hs+11−1 Text/Pandoc/Writers/S5.hs+15−1 pandoc.cabal+1
Text/Pandoc/ASCIIMathML.hs+3−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE TemplateHaskell #-}
1+{-# LANGUAGE CPP, TemplateHaskell #-}
22-- | Definitions for use of ASCIIMathML in HTML.
33-- (See <http://www1.chapman.edu/~jipsen/mathml/asciimath.html>.)
44module Text.Pandoc.ASCIIMathML ( asciiMathMLScript ) where
@@ -7,6 +7,8 @@ import System.FilePath ( (</>) )
77
88-- | String containing ASCIIMathML javascript.
99asciiMathMLScript :: String
10+#ifndef __HADDOCK__
1011asciiMathMLScript = "<script type=\"text/javascript\">\n" ++
1112 $(contentsOf $ "data" </> "ASCIIMathML.js.comment") ++
1213 $(contentsOf $ "data" </> "ASCIIMathML.js.packed") ++ "</script>\n"
14+#endif
Text/Pandoc/DefaultHeaders.hs+11−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE TemplateHaskell #-}
1+{-# LANGUAGE CPP, TemplateHaskell #-}
22{-
33Copyright (C) 2006-7 John MacFarlane <jgm@berkeley.edu>
44
@@ -41,19 +41,29 @@ import System.FilePath ( (</>) )
4141import Text.Pandoc.Shared ( contentsOf )
4242
4343defaultLaTeXHeader :: String
44+#ifndef __HADDOCK__
4445defaultLaTeXHeader = $(contentsOf $ "data" </> "headers" </> "LaTeX.header")
46+#endif
4547
4648defaultConTeXtHeader :: String
49+#ifndef __HADDOCK__
4750defaultConTeXtHeader = $(contentsOf $ "data" </> "headers" </> "ConTeXt.header")
51+#endif
4852
4953defaultDocbookHeader :: String
54+#ifndef __HADDOCK__
5055defaultDocbookHeader = $(contentsOf $ "data" </> "headers" </> "Docbook.header")
56+#endif
5157
5258defaultOpenDocumentHeader :: String
59+#ifndef __HADDOCK__
5360defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocument.header")
61+#endif
5462
5563defaultS5Header :: String
5664defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript
5765
5866defaultRTFHeader :: String
67+#ifndef __HADDOCK__
5968defaultRTFHeader = $(contentsOf $ "data" </> "headers" </> "RTF.header")
69+#endif
Text/Pandoc/Writers/S5.hs+15−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE TemplateHaskell #-}
1+{-# LANGUAGE CPP, TemplateHaskell #-}
22{-
33Copyright (C) 2006-7 John MacFarlane <jgm@berkeley.edu>
44
@@ -50,27 +50,41 @@ s5Meta :: String
5050s5Meta = "<!-- configuration parameters -->\n<meta name=\"defaultView\" content=\"slideshow\" />\n<meta name=\"controlVis\" content=\"hidden\" />\n"
5151
5252s5Javascript :: String
53+#ifndef __HADDOCK__
5354s5Javascript = "<script type=\"text/javascript\">\n" ++
5455 $(contentsOf $ "data" </> "ui" </> "default" </> "slides.js.comment") ++
5556 $(contentsOf $ "data" </> "ui" </> "default" </> "slides.js.packed") ++ "</script>\n"
57+#endif
5658
5759s5CoreCSS :: String
60+#ifndef __HADDOCK__
5861s5CoreCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "s5-core.css")
62+#endif
5963
6064s5FramingCSS :: String
65+#ifndef __HADDOCK__
6166s5FramingCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "framing.css")
67+#endif
6268
6369s5PrettyCSS :: String
70+#ifndef __HADDOCK__
6471s5PrettyCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "pretty.css")
72+#endif
6573
6674s5OperaCSS :: String
75+#ifndef __HADDOCK__
6776s5OperaCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "opera.css")
77+#endif
6878
6979s5OutlineCSS :: String
80+#ifndef __HADDOCK__
7081s5OutlineCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "outline.css")
82+#endif
7183
7284s5PrintCSS :: String
85+#ifndef __HADDOCK__
7386s5PrintCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "print.css")
87+#endif
7488
7589s5CSS :: String
7690s5CSS = "<style type=\"text/css\" media=\"projection\" id=\"slideProj\">\n" ++ s5CoreCSS ++ "\n" ++ s5FramingCSS ++ "\n" ++ s5PrettyCSS ++ "\n</style>\n<style type=\"text/css\" media=\"projection\" id=\"operaFix\">\n" ++ s5OperaCSS ++ "\n</style>\n<style type=\"text/css\" media=\"screen\" id=\"outlineStyle\">\n" ++ s5OutlineCSS ++ "\n</style>\n<style type=\"text/css\" media=\"print\" id=\"slidePrint\">\n" ++ s5PrintCSS ++ "\n</style>\n"
pandoc.cabal+1
@@ -109,6 +109,7 @@ Library
109109 Text.XML.Light.Input,
110110 Text.XML.Light.Proc,
111111 Text.XML.Light.Cursor
112+ Extensions: CPP, TemplateHaskell, FlexibleInstances
112113 Ghc-Options: -O2 -Wall -threaded
113114 Ghc-Prof-Options: -auto-all
114115