git.iko.soy/typeable/pandoc
on master help sign in
Renamed headers -> templates.
ca97f14fiddlosopher
data/headers/ConTeXt.header → data/templates/ConTeXt.templaterenamed
compare with master
unifiedsplit

The content is the same.

data/headers/Docbook.header → data/templates/Docbook.templaterenamed

The content is the same.

data/headers/LaTeX.header → data/templates/LaTeX.templaterenamed

The content is the same.

data/headers/OpenDocument.header → data/templates/OpenDocument.templaterenamed

The content is the same.

data/headers/RTF.header → data/templates/RTF.templaterenamed

The content is the same.

data/headers/S5.header → data/templates/S5.templaterenamed

The content is the same.

pandoc.cabal+8−8
@@ -45,13 +45,13 @@ Extra-Source-Files:
45 man/man1/html2markdown.1.md, man/man1/hsmarkdown.1.md,
45 man/man1/html2markdown.1.md, man/man1/hsmarkdown.1.md,
46 -- Makefile
46 -- Makefile
47 Makefile,
47 Makefile,
48− -- data for DefaultHeaders.hs
48+ -- data for DefaultTemplates.hs
49− data/headers/ConTeXt.header,
49+ data/templates/ConTeXt.template,
50− data/headers/Docbook.header,
50+ data/templates/Docbook.template,
51− data/headers/LaTeX.header,
51+ data/templates/LaTeX.template,
52− data/headers/OpenDocument.header,
52+ data/templates/OpenDocument.template,
53− data/headers/RTF.header,
53+ data/templates/RTF.template,
54− data/headers/S5.header,
54+ data/templates/S5.template,
55 -- data for LaTeXMathML writer
55 -- data for LaTeXMathML writer
56 data/LaTeXMathML.js.comment,
56 data/LaTeXMathML.js.comment,
57 data/LaTeXMathML.js.packed,
57 data/LaTeXMathML.js.packed,
@@ -172,7 +172,7 @@ Library
172 Text.Pandoc.Shared,
172 Text.Pandoc.Shared,
173 Text.Pandoc.ODT,
173 Text.Pandoc.ODT,
174 Text.Pandoc.LaTeXMathML,
174 Text.Pandoc.LaTeXMathML,
175− Text.Pandoc.DefaultHeaders,
175+ Text.Pandoc.DefaultTemplates,
176 Text.Pandoc.Highlighting,
176 Text.Pandoc.Highlighting,
177 Text.Pandoc.Readers.HTML,
177 Text.Pandoc.Readers.HTML,
178 Text.Pandoc.Readers.LaTeX,
178 Text.Pandoc.Readers.LaTeX,
src/Text/Pandoc.hs+2−2
@@ -89,7 +89,7 @@ module Text.Pandoc
89 , HTMLMathMethod (..)
89 , HTMLMathMethod (..)
90 , defaultWriterOptions
90 , defaultWriterOptions
91 -- * Default headers for various output formats
91 -- * Default headers for various output formats
92− , module Text.Pandoc.DefaultHeaders
92+ , module Text.Pandoc.DefaultTemplates
93 -- * Version
93 -- * Version
94 , pandocVersion
94 , pandocVersion
95 ) where
95 ) where
@@ -111,7 +111,7 @@ import Text.Pandoc.Writers.OpenDocument
111import Text.Pandoc.Writers.Man
111import Text.Pandoc.Writers.Man
112import Text.Pandoc.Writers.RTF
112import Text.Pandoc.Writers.RTF
113import Text.Pandoc.Writers.MediaWiki
113import Text.Pandoc.Writers.MediaWiki
114−import Text.Pandoc.DefaultHeaders
114+import Text.Pandoc.DefaultTemplates
115import Text.Pandoc.Shared
115import Text.Pandoc.Shared
116import Data.Version (showVersion)
116import Data.Version (showVersion)
117import Paths_pandoc (version)
117import Paths_pandoc (version)
src/Text/Pandoc/DefaultHeaders.hs → src/Text/Pandoc/DefaultTemplates.hsrenamed+21−22
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18-}
18-}
19
19
20{- |
20{- |
21− Module : Text.Pandoc.DefaultHeaders
21+ Module : Text.Pandoc.DefaultTemplates
22 Copyright : Copyright (C) 2006-7 John MacFarlane
22 Copyright : Copyright (C) 2006-7 John MacFarlane
23 License : GNU GPL, version 2 or above
23 License : GNU GPL, version 2 or above
24
24
@@ -26,45 +26,44 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
26 Stability : alpha
26 Stability : alpha
27 Portability : portable
27 Portability : portable
28
28
29−Default headers for Pandoc writers.
29+Default templates for Pandoc writers.
30-}
30-}
31−module Text.Pandoc.DefaultHeaders (
31+module Text.Pandoc.DefaultTemplates ( defaultLaTeXTemplate,
32− defaultLaTeXHeader,
32+ defaultConTeXtTemplate,
33− defaultConTeXtHeader,
33+ defaultDocbookTemplate,
34− defaultDocbookHeader,
34+ defaultOpenDocumentTemplate,
35− defaultOpenDocumentHeader,
35+ defaultS5Template,
36− defaultS5Header,
36+ defaultRTFTemplate
37− defaultRTFHeader
38− ) where
37+ ) where
39import Text.Pandoc.Writers.S5
38import Text.Pandoc.Writers.S5
40import Text.Pandoc.Shared
39import Text.Pandoc.Shared
41import System.FilePath ( (</>) )
40import System.FilePath ( (</>) )
42import Text.Pandoc.TH ( contentsOf )
41import Text.Pandoc.TH ( contentsOf )
43
42
44−defaultLaTeXHeader :: String
43+defaultLaTeXTemplate :: String
45#ifndef __HADDOCK__
44#ifndef __HADDOCK__
46−defaultLaTeXHeader = $(contentsOf $ "data" </> "headers" </> "LaTeX.header")
45+defaultLaTeXTemplate = $(contentsOf $ "data" </> "templates" </> "LaTeX.template")
47#endif
46#endif
48
47
49−defaultConTeXtHeader :: String
48+defaultConTeXtTemplate :: String
50#ifndef __HADDOCK__
49#ifndef __HADDOCK__
51−defaultConTeXtHeader = $(contentsOf $ "data" </> "headers" </> "ConTeXt.header")
50+defaultConTeXtTemplate = $(contentsOf $ "data" </> "templates" </> "ConTeXt.template")
52#endif
51#endif
53
52
54−defaultDocbookHeader :: String
53+defaultDocbookTemplate :: String
55#ifndef __HADDOCK__
54#ifndef __HADDOCK__
56−defaultDocbookHeader = $(contentsOf $ "data" </> "headers" </> "Docbook.header")
55+defaultDocbookTemplate = $(contentsOf $ "data" </> "templates" </> "Docbook.template")
57#endif
56#endif
58
57
59−defaultOpenDocumentHeader :: String
58+defaultOpenDocumentTemplate :: String
60#ifndef __HADDOCK__
59#ifndef __HADDOCK__
61−defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocument.header")
60+defaultOpenDocumentTemplate = $(contentsOf $ "data" </> "templates" </> "OpenDocument.template")
62#endif
61#endif
63
62
64−defaultS5Header :: String
63+defaultS5Template :: String
65−defaultS5Header = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript
64+defaultS5Template = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript
66
65
67−defaultRTFHeader :: String
66+defaultRTFTemplate :: String
68#ifndef __HADDOCK__
67#ifndef __HADDOCK__
69−defaultRTFHeader = $(contentsOf $ "data" </> "headers" </> "RTF.header")
68+defaultRTFTemplate = $(contentsOf $ "data" </> "templates" </> "RTF.template")
70#endif
69#endif
src/pandoc.hs+8−8
@@ -101,13 +101,13 @@ writers :: [ ( String, ( WriterOptions -> Pandoc -> String, String ) ) ]
101writers = [("native" , (writeDoc, ""))
101writers = [("native" , (writeDoc, ""))
102 ,("html" , (writeHtmlString, ""))
102 ,("html" , (writeHtmlString, ""))
103 ,("html+lhs" , (writeHtmlString, ""))
103 ,("html+lhs" , (writeHtmlString, ""))
104− ,("s5" , (writeS5String, defaultS5Header))
104+ ,("s5" , (writeS5String, defaultS5Template))
105− ,("docbook" , (writeDocbook, defaultDocbookHeader))
105+ ,("docbook" , (writeDocbook, defaultDocbookTemplate))
106− ,("opendocument" , (writeOpenDocument, defaultOpenDocumentHeader))
106+ ,("opendocument" , (writeOpenDocument, defaultOpenDocumentTemplate))
107− ,("odt" , (writeOpenDocument, defaultOpenDocumentHeader))
107+ ,("odt" , (writeOpenDocument, defaultOpenDocumentTemplate))
108− ,("latex" , (writeLaTeX, defaultLaTeXHeader))
108+ ,("latex" , (writeLaTeX, defaultLaTeXTemplate))
109− ,("latex+lhs" , (writeLaTeX, defaultLaTeXHeader))
109+ ,("latex+lhs" , (writeLaTeX, defaultLaTeXTemplate))
110− ,("context" , (writeConTeXt, defaultConTeXtHeader))
110+ ,("context" , (writeConTeXt, defaultConTeXtTemplate))
111 ,("texinfo" , (writeTexinfo, ""))
111 ,("texinfo" , (writeTexinfo, ""))
112 ,("man" , (writeMan, ""))
112 ,("man" , (writeMan, ""))
113 ,("markdown" , (writeMarkdown, ""))
113 ,("markdown" , (writeMarkdown, ""))
@@ -115,7 +115,7 @@ writers = [("native" , (writeDoc, ""))
115 ,("rst" , (writeRST, ""))
115 ,("rst" , (writeRST, ""))
116 ,("rst+lhs" , (writeRST, ""))
116 ,("rst+lhs" , (writeRST, ""))
117 ,("mediawiki" , (writeMediaWiki, ""))
117 ,("mediawiki" , (writeMediaWiki, ""))
118− ,("rtf" , (writeRTF, defaultRTFHeader))
118+ ,("rtf" , (writeRTF, defaultRTFTemplate))
119 ]
119 ]
120
120
121isNonTextOutput :: String -> Bool
121isNonTextOutput :: String -> Bool