From ca97f1482d391220e8a711b4b6552d2f885dbd53 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Thu, 31 Dec 2009 01:09:20 +0000
Subject: [PATCH] Renamed headers -> templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1677 788f1e2b-df1e-0410-8736-df70ead52e1b
---
.../ConTeXt.template} | 0
.../Docbook.template} | 0
.../LaTeX.header => templates/LaTeX.template} | 0
.../OpenDocument.template} | 0
.../RTF.header => templates/RTF.template} | 0
.../S5.header => templates/S5.template} | 0
pandoc.cabal | 16 +++----
src/Text/Pandoc.hs | 4 +-
...{DefaultHeaders.hs => DefaultTemplates.hs} | 43 +++++++++----------
src/pandoc.hs | 16 +++----
10 files changed, 39 insertions(+), 40 deletions(-)
rename data/{headers/ConTeXt.header => templates/ConTeXt.template} (100%)
rename data/{headers/Docbook.header => templates/Docbook.template} (100%)
rename data/{headers/LaTeX.header => templates/LaTeX.template} (100%)
rename data/{headers/OpenDocument.header => templates/OpenDocument.template} (100%)
rename data/{headers/RTF.header => templates/RTF.template} (100%)
rename data/{headers/S5.header => templates/S5.template} (100%)
rename src/Text/Pandoc/{DefaultHeaders.hs => DefaultTemplates.hs} (51%)
diff --git a/data/headers/ConTeXt.header b/data/templates/ConTeXt.template
similarity index 100%
rename from data/headers/ConTeXt.header
rename to data/templates/ConTeXt.template
diff --git a/data/headers/Docbook.header b/data/templates/Docbook.template
similarity index 100%
rename from data/headers/Docbook.header
rename to data/templates/Docbook.template
diff --git a/data/headers/LaTeX.header b/data/templates/LaTeX.template
similarity index 100%
rename from data/headers/LaTeX.header
rename to data/templates/LaTeX.template
diff --git a/data/headers/OpenDocument.header b/data/templates/OpenDocument.template
similarity index 100%
rename from data/headers/OpenDocument.header
rename to data/templates/OpenDocument.template
diff --git a/data/headers/RTF.header b/data/templates/RTF.template
similarity index 100%
rename from data/headers/RTF.header
rename to data/templates/RTF.template
diff --git a/data/headers/S5.header b/data/templates/S5.template
similarity index 100%
rename from data/headers/S5.header
rename to data/templates/S5.template
diff --git a/pandoc.cabal b/pandoc.cabal
index 95875b19a..3a1f62c95 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -45,13 +45,13 @@ Extra-Source-Files:
man/man1/html2markdown.1.md, man/man1/hsmarkdown.1.md,
-- Makefile
Makefile,
- -- data for DefaultHeaders.hs
- data/headers/ConTeXt.header,
- data/headers/Docbook.header,
- data/headers/LaTeX.header,
- data/headers/OpenDocument.header,
- data/headers/RTF.header,
- data/headers/S5.header,
+ -- data for DefaultTemplates.hs
+ data/templates/ConTeXt.template,
+ data/templates/Docbook.template,
+ data/templates/LaTeX.template,
+ data/templates/OpenDocument.template,
+ data/templates/RTF.template,
+ data/templates/S5.template,
-- data for LaTeXMathML writer
data/LaTeXMathML.js.comment,
data/LaTeXMathML.js.packed,
@@ -172,7 +172,7 @@ Library
Text.Pandoc.Shared,
Text.Pandoc.ODT,
Text.Pandoc.LaTeXMathML,
- Text.Pandoc.DefaultHeaders,
+ Text.Pandoc.DefaultTemplates,
Text.Pandoc.Highlighting,
Text.Pandoc.Readers.HTML,
Text.Pandoc.Readers.LaTeX,
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index 390c27765..fedb4102a 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -89,7 +89,7 @@ module Text.Pandoc
, HTMLMathMethod (..)
, defaultWriterOptions
-- * Default headers for various output formats
- , module Text.Pandoc.DefaultHeaders
+ , module Text.Pandoc.DefaultTemplates
-- * Version
, pandocVersion
) where
@@ -111,7 +111,7 @@ import Text.Pandoc.Writers.OpenDocument
import Text.Pandoc.Writers.Man
import Text.Pandoc.Writers.RTF
import Text.Pandoc.Writers.MediaWiki
-import Text.Pandoc.DefaultHeaders
+import Text.Pandoc.DefaultTemplates
import Text.Pandoc.Shared
import Data.Version (showVersion)
import Paths_pandoc (version)
diff --git a/src/Text/Pandoc/DefaultHeaders.hs b/src/Text/Pandoc/DefaultTemplates.hs
similarity index 51%
rename from src/Text/Pandoc/DefaultHeaders.hs
rename to src/Text/Pandoc/DefaultTemplates.hs
index 27fb237c5..533fb10a6 100644
--- a/src/Text/Pandoc/DefaultHeaders.hs
+++ b/src/Text/Pandoc/DefaultTemplates.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : Text.Pandoc.DefaultHeaders
+ Module : Text.Pandoc.DefaultTemplates
Copyright : Copyright (C) 2006-7 John MacFarlane
License : GNU GPL, version 2 or above
@@ -26,45 +26,44 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Stability : alpha
Portability : portable
-Default headers for Pandoc writers.
+Default templates for Pandoc writers.
-}
-module Text.Pandoc.DefaultHeaders (
- defaultLaTeXHeader,
- defaultConTeXtHeader,
- defaultDocbookHeader,
- defaultOpenDocumentHeader,
- defaultS5Header,
- defaultRTFHeader
- ) where
+module Text.Pandoc.DefaultTemplates ( defaultLaTeXTemplate,
+ defaultConTeXtTemplate,
+ defaultDocbookTemplate,
+ defaultOpenDocumentTemplate,
+ defaultS5Template,
+ defaultRTFTemplate
+ ) where
import Text.Pandoc.Writers.S5
import Text.Pandoc.Shared
import System.FilePath ( (</>) )
import Text.Pandoc.TH ( contentsOf )
-defaultLaTeXHeader :: String
+defaultLaTeXTemplate :: String
#ifndef __HADDOCK__
-defaultLaTeXHeader = $(contentsOf $ "data" </> "headers" </> "LaTeX.header")
+defaultLaTeXTemplate = $(contentsOf $ "data" </> "templates" </> "LaTeX.template")
#endif
-defaultConTeXtHeader :: String
+defaultConTeXtTemplate :: String
#ifndef __HADDOCK__
-defaultConTeXtHeader = $(contentsOf $ "data" </> "headers" </> "ConTeXt.header")
+defaultConTeXtTemplate = $(contentsOf $ "data" </> "templates" </> "ConTeXt.template")
#endif
-defaultDocbookHeader :: String
+defaultDocbookTemplate :: String
#ifndef __HADDOCK__
-defaultDocbookHeader = $(contentsOf $ "data" </> "headers" </> "Docbook.header")
+defaultDocbookTemplate = $(contentsOf $ "data" </> "templates" </> "Docbook.template")
#endif
-defaultOpenDocumentHeader :: String
+defaultOpenDocumentTemplate :: String
#ifndef __HADDOCK__
-defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocument.header")
+defaultOpenDocumentTemplate = $(contentsOf $ "data" </> "templates" </> "OpenDocument.template")
#endif
-defaultS5Header :: String
-defaultS5Header = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript
+defaultS5Template :: String
+defaultS5Template = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript
-defaultRTFHeader :: String
+defaultRTFTemplate :: String
#ifndef __HADDOCK__
-defaultRTFHeader = $(contentsOf $ "data" </> "headers" </> "RTF.header")
+defaultRTFTemplate = $(contentsOf $ "data" </> "templates" </> "RTF.template")
#endif
diff --git a/src/pandoc.hs b/src/pandoc.hs
index c2cc9b75e..4e3cad5b2 100644
--- a/src/pandoc.hs
+++ b/src/pandoc.hs
@@ -101,13 +101,13 @@ writers :: [ ( String, ( WriterOptions -> Pandoc -> String, String ) ) ]
writers = [("native" , (writeDoc, ""))
,("html" , (writeHtmlString, ""))
,("html+lhs" , (writeHtmlString, ""))
- ,("s5" , (writeS5String, defaultS5Header))
- ,("docbook" , (writeDocbook, defaultDocbookHeader))
- ,("opendocument" , (writeOpenDocument, defaultOpenDocumentHeader))
- ,("odt" , (writeOpenDocument, defaultOpenDocumentHeader))
- ,("latex" , (writeLaTeX, defaultLaTeXHeader))
- ,("latex+lhs" , (writeLaTeX, defaultLaTeXHeader))
- ,("context" , (writeConTeXt, defaultConTeXtHeader))
+ ,("s5" , (writeS5String, defaultS5Template))
+ ,("docbook" , (writeDocbook, defaultDocbookTemplate))
+ ,("opendocument" , (writeOpenDocument, defaultOpenDocumentTemplate))
+ ,("odt" , (writeOpenDocument, defaultOpenDocumentTemplate))
+ ,("latex" , (writeLaTeX, defaultLaTeXTemplate))
+ ,("latex+lhs" , (writeLaTeX, defaultLaTeXTemplate))
+ ,("context" , (writeConTeXt, defaultConTeXtTemplate))
,("texinfo" , (writeTexinfo, ""))
,("man" , (writeMan, ""))
,("markdown" , (writeMarkdown, ""))
@@ -115,7 +115,7 @@ writers = [("native" , (writeDoc, ""))
,("rst" , (writeRST, ""))
,("rst+lhs" , (writeRST, ""))
,("mediawiki" , (writeMediaWiki, ""))
- ,("rtf" , (writeRTF, defaultRTFHeader))
+ ,("rtf" , (writeRTF, defaultRTFTemplate))
]
isNonTextOutput :: String -> Bool