From 868aeace2d1a8c7d69083e6e298bc93d2a4517b5 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 9 Feb 2008 03:30:59 +0000 Subject: 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 --- Setup.hs | 4 +-- templates/DefaultHeaders.hs | 8 ++--- templates/headers/ConTeXt.header | 70 ++++++++++++++++++++++++++++++++++++++++ templates/headers/ConTeXtHeader | 70 ---------------------------------------- templates/headers/Docbook.header | 3 ++ templates/headers/DocbookHeader | 3 -- templates/headers/LaTeX.header | 5 +++ templates/headers/LaTeXHeader | 5 --- templates/headers/RTF.header | 4 +++ templates/headers/RTFHeader | 4 --- templates/headers/S5.header | 3 ++ templates/headers/S5Header | 3 -- 12 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 templates/headers/ConTeXt.header delete mode 100644 templates/headers/ConTeXtHeader create mode 100644 templates/headers/Docbook.header delete mode 100644 templates/headers/DocbookHeader create mode 100644 templates/headers/LaTeX.header delete mode 100644 templates/headers/LaTeXHeader create mode 100644 templates/headers/RTF.header delete mode 100644 templates/headers/RTFHeader create mode 100644 templates/headers/S5.header delete mode 100644 templates/headers/S5Header diff --git a/Setup.hs b/Setup.hs index d402b4954..25960bcc4 100644 --- a/Setup.hs +++ b/Setup.hs @@ -2,7 +2,7 @@ import Distribution.Simple import Distribution.Simple.Setup import Distribution.PackageDescription import Distribution.Simple.LocalBuildInfo -import System.FilePath (combine, joinPath, takeFileName) +import System.FilePath (combine, joinPath, takeFileName, takeExtension) import System.Directory (getDirectoryContents, removeFile, copyFile) import System.IO (readFile, writeFile) import Control.Monad (foldM) @@ -52,7 +52,7 @@ fillS5WriterTemplate = fillDefaultHeadersTemplate :: IO () fillDefaultHeadersTemplate = do files <- getDirectoryContents (combine "templates" "headers") >>= - return . map (combine "headers") . filter (\x -> not (x `elem` [".",".."])) + return . map (combine "headers") . filter (\x -> takeExtension x == ".header") fillTemplate files "DefaultHeaders.hs" "DefaultHeaders.hs" -- Post-clean: remove the files generated from templates. diff --git a/templates/DefaultHeaders.hs b/templates/DefaultHeaders.hs index df14c2d0c..e37609f82 100644 --- a/templates/DefaultHeaders.hs +++ b/templates/DefaultHeaders.hs @@ -37,16 +37,16 @@ module Text.Pandoc.DefaultHeaders ( import Text.Pandoc.Writers.S5 defaultLaTeXHeader :: String -defaultLaTeXHeader = @LaTeXHeader@ +defaultLaTeXHeader = @LaTeX.header@ defaultConTeXtHeader :: String -defaultConTeXtHeader = @ConTeXtHeader@ +defaultConTeXtHeader = @ConTeXt.header@ defaultDocbookHeader :: String -defaultDocbookHeader = @DocbookHeader@ +defaultDocbookHeader = @Docbook.header@ defaultS5Header :: String defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript defaultRTFHeader :: String -defaultRTFHeader = @RTFHeader@ +defaultRTFHeader = @RTF.header@ diff --git a/templates/headers/ConTeXt.header b/templates/headers/ConTeXt.header new file mode 100644 index 000000000..d19b41c45 --- /dev/null +++ b/templates/headers/ConTeXt.header @@ -0,0 +1,70 @@ +\enableregime[utf] % use UTF-8 + +\setupcolors[state=start] +\setupinteraction[state=start, color=middleblue] % needed for hyperlinks + +\setuppapersize[letter][letter] % use letter paper +\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, + height=middle, header=0.75in, footer=0.75in] % page layout +\setuppagenumbering[location={footer,center}] % number pages +\setupbodyfont[11pt] % 11pt font +\setupwhitespace[medium] % inter-paragraph spacing + +\setuphead[section][style=\tfc] +\setuphead[subsection][style=\tfb] +\setuphead[subsubsection][style=\bf] + +% define title block commands +\unprotect +\def\doctitle#1{\gdef\@title{#1}} +\def\author#1{\gdef\@author{#1}} +\def\date#1{\gdef\@date{#1}} +\date{\currentdate} % Default to today unless specified otherwise. +\def\maketitle{% + \startalignment[center] + \blank[2*big] + {\tfd \@title} + \blank[3*medium] + {\tfa \@author} + \blank[2*medium] + {\tfa \@date} + \blank[3*medium] + \stopalignment} +\protect + +% define descr (for definition lists) +\definedescription[descr][ + headstyle=bold,style=normal,align=left,location=hanging, + width=broad,margin=1cm] + +% prevent orphaned list intros +\setupitemize[autointro] + +% define defaults for bulleted lists +\setupitemize[1][symbol=1][indentnext=no] +\setupitemize[2][symbol=2][indentnext=no] +\setupitemize[3][symbol=3][indentnext=no] +\setupitemize[4][symbol=4][indentnext=no] + +\setupthinrules[width=15em] % width of horizontal rules + +% for block quotations +\unprotect + +\startvariables all +blockquote: blockquote +\stopvariables + +\definedelimitedtext +[\v!blockquote][\v!quotation] + +\setupdelimitedtext +[\v!blockquote] +[\c!left=, +\c!right=, +before={\blank[medium]}, +after={\blank[medium]}, +] + +\protect + diff --git a/templates/headers/ConTeXtHeader b/templates/headers/ConTeXtHeader deleted file mode 100644 index d19b41c45..000000000 --- a/templates/headers/ConTeXtHeader +++ /dev/null @@ -1,70 +0,0 @@ -\enableregime[utf] % use UTF-8 - -\setupcolors[state=start] -\setupinteraction[state=start, color=middleblue] % needed for hyperlinks - -\setuppapersize[letter][letter] % use letter paper -\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in, - height=middle, header=0.75in, footer=0.75in] % page layout -\setuppagenumbering[location={footer,center}] % number pages -\setupbodyfont[11pt] % 11pt font -\setupwhitespace[medium] % inter-paragraph spacing - -\setuphead[section][style=\tfc] -\setuphead[subsection][style=\tfb] -\setuphead[subsubsection][style=\bf] - -% define title block commands -\unprotect -\def\doctitle#1{\gdef\@title{#1}} -\def\author#1{\gdef\@author{#1}} -\def\date#1{\gdef\@date{#1}} -\date{\currentdate} % Default to today unless specified otherwise. -\def\maketitle{% - \startalignment[center] - \blank[2*big] - {\tfd \@title} - \blank[3*medium] - {\tfa \@author} - \blank[2*medium] - {\tfa \@date} - \blank[3*medium] - \stopalignment} -\protect - -% define descr (for definition lists) -\definedescription[descr][ - headstyle=bold,style=normal,align=left,location=hanging, - width=broad,margin=1cm] - -% prevent orphaned list intros -\setupitemize[autointro] - -% define defaults for bulleted lists -\setupitemize[1][symbol=1][indentnext=no] -\setupitemize[2][symbol=2][indentnext=no] -\setupitemize[3][symbol=3][indentnext=no] -\setupitemize[4][symbol=4][indentnext=no] - -\setupthinrules[width=15em] % width of horizontal rules - -% for block quotations -\unprotect - -\startvariables all -blockquote: blockquote -\stopvariables - -\definedelimitedtext -[\v!blockquote][\v!quotation] - -\setupdelimitedtext -[\v!blockquote] -[\c!left=, -\c!right=, -before={\blank[medium]}, -after={\blank[medium]}, -] - -\protect - diff --git a/templates/headers/Docbook.header b/templates/headers/Docbook.header new file mode 100644 index 000000000..7b26b2c73 --- /dev/null +++ b/templates/headers/Docbook.header @@ -0,0 +1,3 @@ + + diff --git a/templates/headers/DocbookHeader b/templates/headers/DocbookHeader deleted file mode 100644 index 7b26b2c73..000000000 --- a/templates/headers/DocbookHeader +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/templates/headers/LaTeX.header b/templates/headers/LaTeX.header new file mode 100644 index 000000000..d891b5f63 --- /dev/null +++ b/templates/headers/LaTeX.header @@ -0,0 +1,5 @@ +\documentclass{article} +\usepackage[mathletters]{ucs} +\usepackage[utf8x]{inputenc} +\setlength{\parindent}{0pt} +\setlength{\parskip}{6pt plus 2pt minus 1pt} diff --git a/templates/headers/LaTeXHeader b/templates/headers/LaTeXHeader deleted file mode 100644 index d891b5f63..000000000 --- a/templates/headers/LaTeXHeader +++ /dev/null @@ -1,5 +0,0 @@ -\documentclass{article} -\usepackage[mathletters]{ucs} -\usepackage[utf8x]{inputenc} -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} diff --git a/templates/headers/RTF.header b/templates/headers/RTF.header new file mode 100644 index 000000000..b4368694b --- /dev/null +++ b/templates/headers/RTF.header @@ -0,0 +1,4 @@ +{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}} +{\colortbl;\red255\green0\blue0;\red0\green0\blue255;} +\widowctrl\hyphauto + diff --git a/templates/headers/RTFHeader b/templates/headers/RTFHeader deleted file mode 100644 index b4368694b..000000000 --- a/templates/headers/RTFHeader +++ /dev/null @@ -1,4 +0,0 @@ -{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}} -{\colortbl;\red255\green0\blue0;\red0\green0\blue255;} -\widowctrl\hyphauto - diff --git a/templates/headers/S5.header b/templates/headers/S5.header new file mode 100644 index 000000000..ebb24ebe2 --- /dev/null +++ b/templates/headers/S5.header @@ -0,0 +1,3 @@ + + + diff --git a/templates/headers/S5Header b/templates/headers/S5Header deleted file mode 100644 index ebb24ebe2..000000000 --- a/templates/headers/S5Header +++ /dev/null @@ -1,3 +0,0 @@ - - - -- cgit v1.2.3