868aeac · typeable/pandoc

git.iko.soy/typeable/pandoc

Renamed default headers with .header extension; have Setup.hs look for these.

(This fixes a bug where Setup.hs would find .svn directories.) git-svn-id: https://pandoc.googlecode.com/svn/trunk@1230 788f1e2b-df1e-0410-8736-df70ead52e1b

commit868aeace2d1a8c7d69083e6e298bc93d2a4517b5 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 9 Feb 2008, 03:30 (19 years ago) parent968b34a

7 files changed+6−6

compare with master

unifiedsplit

Setup.hs+2−2 templates/DefaultHeaders.hs+4−4 templates/headers/ConTeXtHeader → templates/headers/ConTeXt.header templates/headers/DocbookHeader → templates/headers/Docbook.header templates/headers/LaTeXHeader → templates/headers/LaTeX.header templates/headers/RTFHeader → templates/headers/RTF.header templates/headers/S5Header → templates/headers/S5.header

Setup.hs+2−2

@@ -2,7 +2,7 @@ import Distribution.Simple

22import Distribution.Simple.Setup

33import Distribution.PackageDescription

44import Distribution.Simple.LocalBuildInfo

5−import System.FilePath (combine, joinPath, takeFileName)

5+import System.FilePath (combine, joinPath, takeFileName, takeExtension)

66import System.Directory (getDirectoryContents, removeFile, copyFile)

77import System.IO (readFile, writeFile)

88import Control.Monad (foldM)

@@ -52,7 +52,7 @@ fillS5WriterTemplate =

5252fillDefaultHeadersTemplate :: IO ()

5353fillDefaultHeadersTemplate = do

5454 files <- getDirectoryContents (combine "templates" "headers") >>=

55− return . map (combine "headers") . filter (\x -> not (x `elem` [".",".."]))

55+ return . map (combine "headers") . filter (\x -> takeExtension x == ".header")

5656 fillTemplate files "DefaultHeaders.hs" "DefaultHeaders.hs"

5757

5858-- Post-clean: remove the files generated from templates.

templates/DefaultHeaders.hs+4−4

@@ -37,16 +37,16 @@ module Text.Pandoc.DefaultHeaders (

3737import Text.Pandoc.Writers.S5

3838

3939defaultLaTeXHeader :: String

40−defaultLaTeXHeader = @LaTeXHeader@

40+defaultLaTeXHeader = @LaTeX.header@

4141

4242defaultConTeXtHeader :: String

43−defaultConTeXtHeader = @ConTeXtHeader@

43+defaultConTeXtHeader = @ConTeXt.header@

4444

4545defaultDocbookHeader :: String

46−defaultDocbookHeader = @DocbookHeader@

46+defaultDocbookHeader = @Docbook.header@

4747

4848defaultS5Header :: String

4949defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript

5050

5151defaultRTFHeader :: String

52−defaultRTFHeader = @RTFHeader@

52+defaultRTFHeader = @RTF.header@

templates/headers/ConTeXtHeader → templates/headers/ConTeXt.headerrenamed

The content is the same.

templates/headers/DocbookHeader → templates/headers/Docbook.headerrenamed

The content is the same.

templates/headers/LaTeXHeader → templates/headers/LaTeX.headerrenamed

The content is the same.

templates/headers/RTFHeader → templates/headers/RTF.headerrenamed

The content is the same.

templates/headers/S5Header → templates/headers/S5.headerrenamed

The content is the same.