Renamed headers -> templates.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1677 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2009-12-31 01:09:20 +00:00
parent ca712fe7f8
commit ca97f1482d
10 changed files with 39 additions and 40 deletions

View file

@ -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,

View file

@ -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)

View file

@ -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

View file

@ -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