From ca97f1482d391220e8a711b4b6552d2f885dbd53 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Thu, 31 Dec 2009 01:09:20 +0000 Subject: Renamed headers -> templates. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1677 788f1e2b-df1e-0410-8736-df70ead52e1b --- data/headers/ConTeXt.header | 70 ------------------------------------ data/headers/Docbook.header | 3 -- data/headers/LaTeX.header | 56 ----------------------------- data/headers/OpenDocument.header | 1 - data/headers/RTF.header | 4 --- data/headers/S5.header | 3 -- data/templates/ConTeXt.template | 70 ++++++++++++++++++++++++++++++++++++ data/templates/Docbook.template | 3 ++ data/templates/LaTeX.template | 56 +++++++++++++++++++++++++++++ data/templates/OpenDocument.template | 1 + data/templates/RTF.template | 4 +++ data/templates/S5.template | 3 ++ pandoc.cabal | 16 ++++----- src/Text/Pandoc.hs | 4 +-- src/Text/Pandoc/DefaultHeaders.hs | 70 ------------------------------------ src/Text/Pandoc/DefaultTemplates.hs | 69 +++++++++++++++++++++++++++++++++++ src/pandoc.hs | 16 ++++----- 17 files changed, 224 insertions(+), 225 deletions(-) delete mode 100644 data/headers/ConTeXt.header delete mode 100644 data/headers/Docbook.header delete mode 100644 data/headers/LaTeX.header delete mode 100644 data/headers/OpenDocument.header delete mode 100644 data/headers/RTF.header delete mode 100644 data/headers/S5.header create mode 100644 data/templates/ConTeXt.template create mode 100644 data/templates/Docbook.template create mode 100644 data/templates/LaTeX.template create mode 100644 data/templates/OpenDocument.template create mode 100644 data/templates/RTF.template create mode 100644 data/templates/S5.template delete mode 100644 src/Text/Pandoc/DefaultHeaders.hs create mode 100644 src/Text/Pandoc/DefaultTemplates.hs diff --git a/data/headers/ConTeXt.header b/data/headers/ConTeXt.header deleted file mode 100644 index d19b41c45..000000000 --- a/data/headers/ConTeXt.header +++ /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/data/headers/Docbook.header b/data/headers/Docbook.header deleted file mode 100644 index 7b26b2c73..000000000 --- a/data/headers/Docbook.header +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/data/headers/LaTeX.header b/data/headers/LaTeX.header deleted file mode 100644 index 4a4c8436c..000000000 --- a/data/headers/LaTeX.header +++ /dev/null @@ -1,56 +0,0 @@ -\documentclass{article} -\usepackage{ifpdf,ifxetex} -\ifxetex - \usepackage{fontspec,xltxtra,xunicode} -\else - \usepackage[utf8x]{inputenc} - \usepackage[mathletters]{ucs} -\fi -\usepackage{amsmath} -\usepackage{listings} -\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} -\usepackage{fancyvrb} -\usepackage{enumerate} -\usepackage{array} -% This is needed because raggedright in table elements redefines \\: -\newcommand{\PreserveBackslash}[1]{\let\temp=\\#1\let\\=\temp} -\let\PBS=\PreserveBackslash -\usepackage[normalem]{ulem} -\newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} -\usepackage[breaklinks=true]{hyperref} -\usepackage{url} -\usepackage{graphicx} - -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -\VerbatimFootnotes % allows verbatim text in footnotes -$if(numbersections)$ -$else$ -\setcounter{secnumdepth}{0} -$endif$ -$header-includes$ - -$if(title)$ -\title{$title$} -$endif$ -$if(authors)$ -\author{$authors$} -$endif$ -$if(date)$ -\date{$date$} -$endif$ - -\begin{document} -\maketitle - -$if(toc)$ -\tableofcontents -$endif$ -$if(before)$ -$before$ -$endif$ -$body$ -$if(after)$ -$after$ -$endif$ -\end{document} diff --git a/data/headers/OpenDocument.header b/data/headers/OpenDocument.header deleted file mode 100644 index 17ed4fd9f..000000000 --- a/data/headers/OpenDocument.header +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/headers/RTF.header b/data/headers/RTF.header deleted file mode 100644 index b4368694b..000000000 --- a/data/headers/RTF.header +++ /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/data/headers/S5.header b/data/headers/S5.header deleted file mode 100644 index ebb24ebe2..000000000 --- a/data/headers/S5.header +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/templates/ConTeXt.template b/data/templates/ConTeXt.template new file mode 100644 index 000000000..d19b41c45 --- /dev/null +++ b/data/templates/ConTeXt.template @@ -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/data/templates/Docbook.template b/data/templates/Docbook.template new file mode 100644 index 000000000..7b26b2c73 --- /dev/null +++ b/data/templates/Docbook.template @@ -0,0 +1,3 @@ + + diff --git a/data/templates/LaTeX.template b/data/templates/LaTeX.template new file mode 100644 index 000000000..4a4c8436c --- /dev/null +++ b/data/templates/LaTeX.template @@ -0,0 +1,56 @@ +\documentclass{article} +\usepackage{ifpdf,ifxetex} +\ifxetex + \usepackage{fontspec,xltxtra,xunicode} +\else + \usepackage[utf8x]{inputenc} + \usepackage[mathletters]{ucs} +\fi +\usepackage{amsmath} +\usepackage{listings} +\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} +\usepackage{fancyvrb} +\usepackage{enumerate} +\usepackage{array} +% This is needed because raggedright in table elements redefines \\: +\newcommand{\PreserveBackslash}[1]{\let\temp=\\#1\let\\=\temp} +\let\PBS=\PreserveBackslash +\usepackage[normalem]{ulem} +\newcommand{\textsubscr}[1]{\ensuremath{_{\scriptsize\textrm{#1}}}} +\usepackage[breaklinks=true]{hyperref} +\usepackage{url} +\usepackage{graphicx} + +\setlength{\parindent}{0pt} +\setlength{\parskip}{6pt plus 2pt minus 1pt} +\VerbatimFootnotes % allows verbatim text in footnotes +$if(numbersections)$ +$else$ +\setcounter{secnumdepth}{0} +$endif$ +$header-includes$ + +$if(title)$ +\title{$title$} +$endif$ +$if(authors)$ +\author{$authors$} +$endif$ +$if(date)$ +\date{$date$} +$endif$ + +\begin{document} +\maketitle + +$if(toc)$ +\tableofcontents +$endif$ +$if(before)$ +$before$ +$endif$ +$body$ +$if(after)$ +$after$ +$endif$ +\end{document} diff --git a/data/templates/OpenDocument.template b/data/templates/OpenDocument.template new file mode 100644 index 000000000..17ed4fd9f --- /dev/null +++ b/data/templates/OpenDocument.template @@ -0,0 +1 @@ + diff --git a/data/templates/RTF.template b/data/templates/RTF.template new file mode 100644 index 000000000..b4368694b --- /dev/null +++ b/data/templates/RTF.template @@ -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/data/templates/S5.template b/data/templates/S5.template new file mode 100644 index 000000000..ebb24ebe2 --- /dev/null +++ b/data/templates/S5.template @@ -0,0 +1,3 @@ + + + diff --git a/pandoc.cabal b/pandoc.cabal index 95875b19a..3a1f62c95 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -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, 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/DefaultHeaders.hs deleted file mode 100644 index 27fb237c5..000000000 --- a/src/Text/Pandoc/DefaultHeaders.hs +++ /dev/null @@ -1,70 +0,0 @@ -{-# LANGUAGE CPP, TemplateHaskell #-} -{- -Copyright (C) 2006-7 John MacFarlane - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --} - -{- | - Module : Text.Pandoc.DefaultHeaders - Copyright : Copyright (C) 2006-7 John MacFarlane - License : GNU GPL, version 2 or above - - Maintainer : John MacFarlane - Stability : alpha - Portability : portable - -Default headers for Pandoc writers. --} -module Text.Pandoc.DefaultHeaders ( - defaultLaTeXHeader, - defaultConTeXtHeader, - defaultDocbookHeader, - defaultOpenDocumentHeader, - defaultS5Header, - defaultRTFHeader - ) where -import Text.Pandoc.Writers.S5 -import Text.Pandoc.Shared -import System.FilePath ( () ) -import Text.Pandoc.TH ( contentsOf ) - -defaultLaTeXHeader :: String -#ifndef __HADDOCK__ -defaultLaTeXHeader = $(contentsOf $ "data" "headers" "LaTeX.header") -#endif - -defaultConTeXtHeader :: String -#ifndef __HADDOCK__ -defaultConTeXtHeader = $(contentsOf $ "data" "headers" "ConTeXt.header") -#endif - -defaultDocbookHeader :: String -#ifndef __HADDOCK__ -defaultDocbookHeader = $(contentsOf $ "data" "headers" "Docbook.header") -#endif - -defaultOpenDocumentHeader :: String -#ifndef __HADDOCK__ -defaultOpenDocumentHeader = $(contentsOf $ "data" "headers" "OpenDocument.header") -#endif - -defaultS5Header :: String -defaultS5Header = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript - -defaultRTFHeader :: String -#ifndef __HADDOCK__ -defaultRTFHeader = $(contentsOf $ "data" "headers" "RTF.header") -#endif diff --git a/src/Text/Pandoc/DefaultTemplates.hs b/src/Text/Pandoc/DefaultTemplates.hs new file mode 100644 index 000000000..533fb10a6 --- /dev/null +++ b/src/Text/Pandoc/DefaultTemplates.hs @@ -0,0 +1,69 @@ +{-# LANGUAGE CPP, TemplateHaskell #-} +{- +Copyright (C) 2006-7 John MacFarlane + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-} + +{- | + Module : Text.Pandoc.DefaultTemplates + Copyright : Copyright (C) 2006-7 John MacFarlane + License : GNU GPL, version 2 or above + + Maintainer : John MacFarlane + Stability : alpha + Portability : portable + +Default templates for Pandoc writers. +-} +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 ) + +defaultLaTeXTemplate :: String +#ifndef __HADDOCK__ +defaultLaTeXTemplate = $(contentsOf $ "data" "templates" "LaTeX.template") +#endif + +defaultConTeXtTemplate :: String +#ifndef __HADDOCK__ +defaultConTeXtTemplate = $(contentsOf $ "data" "templates" "ConTeXt.template") +#endif + +defaultDocbookTemplate :: String +#ifndef __HADDOCK__ +defaultDocbookTemplate = $(contentsOf $ "data" "templates" "Docbook.template") +#endif + +defaultOpenDocumentTemplate :: String +#ifndef __HADDOCK__ +defaultOpenDocumentTemplate = $(contentsOf $ "data" "templates" "OpenDocument.template") +#endif + +defaultS5Template :: String +defaultS5Template = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript + +defaultRTFTemplate :: String +#ifndef __HADDOCK__ +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 -- cgit v1.2.3