git.iko.soy/typeable/pandoc
on master help sign in
Fixes to make haddock work with template haskell:
e371db9fiddlosopher
Text/Pandoc/ASCIIMathML.hs+3−1
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−{-# LANGUAGE TemplateHaskell #-}
1+{-# LANGUAGE CPP, TemplateHaskell #-}
2-- | Definitions for use of ASCIIMathML in HTML.
2-- | Definitions for use of ASCIIMathML in HTML.
3-- (See <http://www1.chapman.edu/~jipsen/mathml/asciimath.html>.)
3-- (See <http://www1.chapman.edu/~jipsen/mathml/asciimath.html>.)
4module Text.Pandoc.ASCIIMathML ( asciiMathMLScript ) where
4module Text.Pandoc.ASCIIMathML ( asciiMathMLScript ) where
@@ -7,6 +7,8 @@ import System.FilePath ( (</>) )
7
7
8-- | String containing ASCIIMathML javascript.
8-- | String containing ASCIIMathML javascript.
9asciiMathMLScript :: String
9asciiMathMLScript :: String
10+#ifndef __HADDOCK__
10asciiMathMLScript = "<script type=\"text/javascript\">\n" ++
11asciiMathMLScript = "<script type=\"text/javascript\">\n" ++
11 $(contentsOf $ "data" </> "ASCIIMathML.js.comment") ++
12 $(contentsOf $ "data" </> "ASCIIMathML.js.comment") ++
12 $(contentsOf $ "data" </> "ASCIIMathML.js.packed") ++ "</script>\n"
13 $(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 #-}
2{-
2{-
3Copyright (C) 2006-7 John MacFarlane <jgm@berkeley.edu>
3Copyright (C) 2006-7 John MacFarlane <jgm@berkeley.edu>
4
4
@@ -41,19 +41,29 @@ import System.FilePath ( (</>) )
41import Text.Pandoc.Shared ( contentsOf )
41import Text.Pandoc.Shared ( contentsOf )
42
42
43defaultLaTeXHeader :: String
43defaultLaTeXHeader :: String
44+#ifndef __HADDOCK__
44defaultLaTeXHeader = $(contentsOf $ "data" </> "headers" </> "LaTeX.header")
45defaultLaTeXHeader = $(contentsOf $ "data" </> "headers" </> "LaTeX.header")
46+#endif
45
47
46defaultConTeXtHeader :: String
48defaultConTeXtHeader :: String
49+#ifndef __HADDOCK__
47defaultConTeXtHeader = $(contentsOf $ "data" </> "headers" </> "ConTeXt.header")
50defaultConTeXtHeader = $(contentsOf $ "data" </> "headers" </> "ConTeXt.header")
51+#endif
48
52
49defaultDocbookHeader :: String
53defaultDocbookHeader :: String
54+#ifndef __HADDOCK__
50defaultDocbookHeader = $(contentsOf $ "data" </> "headers" </> "Docbook.header")
55defaultDocbookHeader = $(contentsOf $ "data" </> "headers" </> "Docbook.header")
56+#endif
51
57
52defaultOpenDocumentHeader :: String
58defaultOpenDocumentHeader :: String
59+#ifndef __HADDOCK__
53defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocument.header")
60defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocument.header")
61+#endif
54
62
55defaultS5Header :: String
63defaultS5Header :: String
56defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript
64defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript
57
65
58defaultRTFHeader :: String
66defaultRTFHeader :: String
67+#ifndef __HADDOCK__
59defaultRTFHeader = $(contentsOf $ "data" </> "headers" </> "RTF.header")
68defaultRTFHeader = $(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 #-}
2{-
2{-
3Copyright (C) 2006-7 John MacFarlane <jgm@berkeley.edu>
3Copyright (C) 2006-7 John MacFarlane <jgm@berkeley.edu>
4
4
@@ -50,27 +50,41 @@ s5Meta :: String
50s5Meta = "<!-- configuration parameters -->\n<meta name=\"defaultView\" content=\"slideshow\" />\n<meta name=\"controlVis\" content=\"hidden\" />\n"
50s5Meta = "<!-- configuration parameters -->\n<meta name=\"defaultView\" content=\"slideshow\" />\n<meta name=\"controlVis\" content=\"hidden\" />\n"
51
51
52s5Javascript :: String
52s5Javascript :: String
53+#ifndef __HADDOCK__
53s5Javascript = "<script type=\"text/javascript\">\n" ++
54s5Javascript = "<script type=\"text/javascript\">\n" ++
54 $(contentsOf $ "data" </> "ui" </> "default" </> "slides.js.comment") ++
55 $(contentsOf $ "data" </> "ui" </> "default" </> "slides.js.comment") ++
55 $(contentsOf $ "data" </> "ui" </> "default" </> "slides.js.packed") ++ "</script>\n"
56 $(contentsOf $ "data" </> "ui" </> "default" </> "slides.js.packed") ++ "</script>\n"
57+#endif
56
58
57s5CoreCSS :: String
59s5CoreCSS :: String
60+#ifndef __HADDOCK__
58s5CoreCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "s5-core.css")
61s5CoreCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "s5-core.css")
62+#endif
59
63
60s5FramingCSS :: String
64s5FramingCSS :: String
65+#ifndef __HADDOCK__
61s5FramingCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "framing.css")
66s5FramingCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "framing.css")
67+#endif
62
68
63s5PrettyCSS :: String
69s5PrettyCSS :: String
70+#ifndef __HADDOCK__
64s5PrettyCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "pretty.css")
71s5PrettyCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "pretty.css")
72+#endif
65
73
66s5OperaCSS :: String
74s5OperaCSS :: String
75+#ifndef __HADDOCK__
67s5OperaCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "opera.css")
76s5OperaCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "opera.css")
77+#endif
68
78
69s5OutlineCSS :: String
79s5OutlineCSS :: String
80+#ifndef __HADDOCK__
70s5OutlineCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "outline.css")
81s5OutlineCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "outline.css")
82+#endif
71
83
72s5PrintCSS :: String
84s5PrintCSS :: String
85+#ifndef __HADDOCK__
73s5PrintCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "print.css")
86s5PrintCSS = $(contentsOf $ "data" </> "ui" </> "default" </> "print.css")
87+#endif
74
88
75s5CSS :: String
89s5CSS :: String
76s5CSS = "<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"
90s5CSS = "<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
109 Text.XML.Light.Input,
109 Text.XML.Light.Input,
110 Text.XML.Light.Proc,
110 Text.XML.Light.Proc,
111 Text.XML.Light.Cursor
111 Text.XML.Light.Cursor
112+ Extensions: CPP, TemplateHaskell, FlexibleInstances
112 Ghc-Options: -O2 -Wall -threaded
113 Ghc-Options: -O2 -Wall -threaded
113 Ghc-Prof-Options: -auto-all
114 Ghc-Prof-Options: -auto-all
114
115