ca97f14 · typeable/pandoc

git.iko.soy/typeable/pandoc

Renamed headers -> templates.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1677 788f1e2b-df1e-0410-8736-df70ead52e1b

commitca97f1482d391220e8a711b4b6552d2f885dbd53 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 31 Dec 2009, 01:09 (17 years ago) parentca712fe

10 files changed+39−40

compare with master

unifiedsplit

data/headers/ConTeXt.header → data/templates/ConTeXt.template data/headers/Docbook.header → data/templates/Docbook.template data/headers/LaTeX.header → data/templates/LaTeX.template data/headers/OpenDocument.header → data/templates/OpenDocument.template data/headers/RTF.header → data/templates/RTF.template data/headers/S5.header → data/templates/S5.template pandoc.cabal+8−8 src/Text/Pandoc.hs+2−2 src/Text/Pandoc/DefaultHeaders.hs → src/Text/Pandoc/DefaultTemplates.hs+21−22 src/pandoc.hs+8−8

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

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:

4545 man/man1/html2markdown.1.md, man/man1/hsmarkdown.1.md,

4646 -- Makefile

4747 Makefile,

48− -- data for DefaultHeaders.hs

49− data/headers/ConTeXt.header,

50− data/headers/Docbook.header,

51− data/headers/LaTeX.header,

52− data/headers/OpenDocument.header,

53− data/headers/RTF.header,

54− data/headers/S5.header,

48+ -- data for DefaultTemplates.hs

49+ data/templates/ConTeXt.template,

50+ data/templates/Docbook.template,

51+ data/templates/LaTeX.template,

52+ data/templates/OpenDocument.template,

53+ data/templates/RTF.template,

54+ data/templates/S5.template,

5555 -- data for LaTeXMathML writer

5656 data/LaTeXMathML.js.comment,

5757 data/LaTeXMathML.js.packed,

@@ -172,7 +172,7 @@ Library

172172 Text.Pandoc.Shared,

173173 Text.Pandoc.ODT,

174174 Text.Pandoc.LaTeXMathML,

175− Text.Pandoc.DefaultHeaders,

175+ Text.Pandoc.DefaultTemplates,

176176 Text.Pandoc.Highlighting,

177177 Text.Pandoc.Readers.HTML,

178178 Text.Pandoc.Readers.LaTeX,

src/Text/Pandoc.hs+2−2

@@ -89,7 +89,7 @@ module Text.Pandoc

8989 , HTMLMathMethod (..)

9090 , defaultWriterOptions

9191 -- * Default headers for various output formats

92− , module Text.Pandoc.DefaultHeaders

92+ , module Text.Pandoc.DefaultTemplates

9393 -- * Version

9494 , pandocVersion

9595 ) where

@@ -111,7 +111,7 @@ import Text.Pandoc.Writers.OpenDocument

111111import Text.Pandoc.Writers.Man

112112import Text.Pandoc.Writers.RTF

113113import Text.Pandoc.Writers.MediaWiki

114−import Text.Pandoc.DefaultHeaders

114+import Text.Pandoc.DefaultTemplates

115115import Text.Pandoc.Shared

116116import Data.Version (showVersion)

117117import 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

1818-}

1919

2020{- |

21− Module : Text.Pandoc.DefaultHeaders

21+ Module : Text.Pandoc.DefaultTemplates

2323 License : GNU GPL, version 2 or above

2424

@@ -26,45 +26,44 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

2626 Stability : alpha

2727 Portability : portable

2828

29−Default headers for Pandoc writers.

29+Default templates for Pandoc writers.

3030-}

31−module Text.Pandoc.DefaultHeaders (

32− defaultLaTeXHeader,

33− defaultConTeXtHeader,

34− defaultDocbookHeader,

35− defaultOpenDocumentHeader,

36− defaultS5Header,

37− defaultRTFHeader

38− ) where

31+module Text.Pandoc.DefaultTemplates ( defaultLaTeXTemplate,

32+ defaultConTeXtTemplate,

33+ defaultDocbookTemplate,

34+ defaultOpenDocumentTemplate,

35+ defaultS5Template,

36+ defaultRTFTemplate

37+ ) where

3938import Text.Pandoc.Writers.S5

4039import Text.Pandoc.Shared

4140import System.FilePath ( (</>) )

4241import Text.Pandoc.TH ( contentsOf )

4342

44−defaultLaTeXHeader :: String

43+defaultLaTeXTemplate :: String

4544#ifndef __HADDOCK__

46−defaultLaTeXHeader = $(contentsOf $ "data" </> "headers" </> "LaTeX.header")

45+defaultLaTeXTemplate = $(contentsOf $ "data" </> "templates" </> "LaTeX.template")

4746#endif

4847

49−defaultConTeXtHeader :: String

48+defaultConTeXtTemplate :: String

5049#ifndef __HADDOCK__

51−defaultConTeXtHeader = $(contentsOf $ "data" </> "headers" </> "ConTeXt.header")

50+defaultConTeXtTemplate = $(contentsOf $ "data" </> "templates" </> "ConTeXt.template")

5251#endif

5352

54−defaultDocbookHeader :: String

53+defaultDocbookTemplate :: String

5554#ifndef __HADDOCK__

56−defaultDocbookHeader = $(contentsOf $ "data" </> "headers" </> "Docbook.header")

55+defaultDocbookTemplate = $(contentsOf $ "data" </> "templates" </> "Docbook.template")

5756#endif

5857

59−defaultOpenDocumentHeader :: String

58+defaultOpenDocumentTemplate :: String

6059#ifndef __HADDOCK__

61−defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocument.header")

60+defaultOpenDocumentTemplate = $(contentsOf $ "data" </> "templates" </> "OpenDocument.template")

6261#endif

6362

64−defaultS5Header :: String

65−defaultS5Header = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript

63+defaultS5Template :: String

64+defaultS5Template = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript

6665

67−defaultRTFHeader :: String

66+defaultRTFTemplate :: String

6867#ifndef __HADDOCK__

69−defaultRTFHeader = $(contentsOf $ "data" </> "headers" </> "RTF.header")

68+defaultRTFTemplate = $(contentsOf $ "data" </> "templates" </> "RTF.template")

7069#endif

src/pandoc.hs+8−8

@@ -101,13 +101,13 @@ writers :: [ ( String, ( WriterOptions -> Pandoc -> String, String ) ) ]

101101writers = [("native" , (writeDoc, ""))

102102 ,("html" , (writeHtmlString, ""))

103103 ,("html+lhs" , (writeHtmlString, ""))

104− ,("s5" , (writeS5String, defaultS5Header))

105− ,("docbook" , (writeDocbook, defaultDocbookHeader))

106− ,("opendocument" , (writeOpenDocument, defaultOpenDocumentHeader))

107− ,("odt" , (writeOpenDocument, defaultOpenDocumentHeader))

108− ,("latex" , (writeLaTeX, defaultLaTeXHeader))

109− ,("latex+lhs" , (writeLaTeX, defaultLaTeXHeader))

110− ,("context" , (writeConTeXt, defaultConTeXtHeader))

104+ ,("s5" , (writeS5String, defaultS5Template))

105+ ,("docbook" , (writeDocbook, defaultDocbookTemplate))

106+ ,("opendocument" , (writeOpenDocument, defaultOpenDocumentTemplate))

107+ ,("odt" , (writeOpenDocument, defaultOpenDocumentTemplate))

108+ ,("latex" , (writeLaTeX, defaultLaTeXTemplate))

109+ ,("latex+lhs" , (writeLaTeX, defaultLaTeXTemplate))

110+ ,("context" , (writeConTeXt, defaultConTeXtTemplate))

111111 ,("texinfo" , (writeTexinfo, ""))

112112 ,("man" , (writeMan, ""))

113113 ,("markdown" , (writeMarkdown, ""))

@@ -115,7 +115,7 @@ writers = [("native" , (writeDoc, ""))

115115 ,("rst" , (writeRST, ""))

116116 ,("rst+lhs" , (writeRST, ""))

117117 ,("mediawiki" , (writeMediaWiki, ""))

118− ,("rtf" , (writeRTF, defaultRTFHeader))

118+ ,("rtf" , (writeRTF, defaultRTFTemplate))

119119 ]

120120

121121isNonTextOutput :: String -> Bool