diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/DefaultTemplates.hs (renamed from src/Text/Pandoc/DefaultHeaders.hs) | 43 | ||||
| -rw-r--r-- | src/pandoc.hs | 16 |
3 files changed, 31 insertions, 32 deletions
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 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 |