diff options
author | John MacFarlane <jgm@berkeley.edu> | 2010-07-04 16:55:48 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2010-07-05 00:06:27 -0700 |
commit | 15cc99c61714f3018cbf734656657282d61c860f (patch) | |
tree | 2782a8560eb025c5a7ca72f69a5af307c27233a7 | |
parent | 3548bf6d9cdc09c59b36e8d77a1834e1d0619b4a (diff) | |
download | pandoc-15cc99c61714f3018cbf734656657282d61c860f.tar.gz |
Removed writerInclude{Before,After} from WriterOptions.
This is no longer used with the new templating system.
-rw-r--r-- | src/Text/Pandoc/Shared.hs | 4 | ||||
-rw-r--r-- | src/pandoc.hs | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index f750b52b2..a5e99f827 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -462,8 +462,6 @@ data WriterOptions = WriterOptions { writerStandalone :: Bool -- ^ Include header and footer , writerTemplate :: String -- ^ Template to use in standalone mode , writerVariables :: [(String, String)] -- ^ Variables to set in template - , writerIncludeBefore :: String -- ^ Text to include before the body - , writerIncludeAfter :: String -- ^ Text to include after the body , writerTabStop :: Int -- ^ Tabstop for conversion btw spaces and tabs , writerTableOfContents :: Bool -- ^ Include table of contents , writerS5 :: Bool -- ^ We're writing S5 @@ -486,8 +484,6 @@ defaultWriterOptions = WriterOptions { writerStandalone = False , writerTemplate = "" , writerVariables = [] - , writerIncludeBefore = "" - , writerIncludeAfter = "" , writerTabStop = 4 , writerTableOfContents = False , writerS5 = False diff --git a/src/pandoc.hs b/src/pandoc.hs index 8d02f4c55..892409871 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -145,8 +145,6 @@ data Opt = Opt , optTransforms :: [Pandoc -> Pandoc] -- ^ Doc transforms to apply , optTemplate :: String -- ^ Custom template , optVariables :: [(String,String)] -- ^ Template variables to set - , optBefore :: [String] -- ^ Texts to include before body - , optAfter :: [String] -- ^ Texts to include after body , optOutputFile :: String -- ^ Name of output file , optNumberSections :: Bool -- ^ Number sections in LaTeX , optIncremental :: Bool -- ^ Use incremental lists in S5 @@ -186,8 +184,6 @@ defaultOpts = Opt , optTransforms = [] , optTemplate = "" , optVariables = [] - , optBefore = [] - , optAfter = [] , optOutputFile = "-" -- "-" means stdout , optNumberSections = False , optIncremental = False @@ -624,8 +620,6 @@ main = do , optWriter = writerName , optParseRaw = parseRaw , optVariables = variables - , optBefore = befores - , optAfter = afters , optTableOfContents = toc , optTransforms = transforms , optTemplate = template @@ -757,8 +751,6 @@ main = do then defaultTemplate else template, writerVariables = variables'', - writerIncludeBefore = concat befores, - writerIncludeAfter = concat afters, writerTabStop = tabStop, writerTableOfContents = toc && writerName' /= "s5", |