git.iko.soy/typeable/pandoc
on master help sign in
Removed writerInclude{Before,After} from WriterOptions.

This is no longer used with the new templating system.

commit15cc99c61714f3018cbf734656657282d61c860f authorJohn MacFarlane <jgm@berkeley.edu> dateSun 4 Jul 2010, 16:55 (16 years ago) parent3548bf6
2 files changed−12
compare with master
unifiedsplit
src/Text/Pandoc/Shared.hs−4 src/pandoc.hs−8
src/Text/Pandoc/Shared.hs−4
@@ -462,8 +462,6 @@ data WriterOptions = WriterOptions
462462 { writerStandalone :: Bool -- ^ Include header and footer
463463 , writerTemplate :: String -- ^ Template to use in standalone mode
464464 , writerVariables :: [(String, String)] -- ^ Variables to set in template
465− , writerIncludeBefore :: String -- ^ Text to include before the body
466− , writerIncludeAfter :: String -- ^ Text to include after the body
467465 , writerTabStop :: Int -- ^ Tabstop for conversion btw spaces and tabs
468466 , writerTableOfContents :: Bool -- ^ Include table of contents
469467 , writerS5 :: Bool -- ^ We're writing S5
@@ -486,8 +484,6 @@ defaultWriterOptions =
486484 WriterOptions { writerStandalone = False
487485 , writerTemplate = ""
488486 , writerVariables = []
489− , writerIncludeBefore = ""
490− , writerIncludeAfter = ""
491487 , writerTabStop = 4
492488 , writerTableOfContents = False
493489 , writerS5 = False
src/pandoc.hs−8
@@ -145,8 +145,6 @@ data Opt = Opt
145145 , optTransforms :: [Pandoc -> Pandoc] -- ^ Doc transforms to apply
146146 , optTemplate :: String -- ^ Custom template
147147 , optVariables :: [(String,String)] -- ^ Template variables to set
148− , optBefore :: [String] -- ^ Texts to include before body
149− , optAfter :: [String] -- ^ Texts to include after body
150148 , optOutputFile :: String -- ^ Name of output file
151149 , optNumberSections :: Bool -- ^ Number sections in LaTeX
152150 , optIncremental :: Bool -- ^ Use incremental lists in S5
@@ -186,8 +184,6 @@ defaultOpts = Opt
186184 , optTransforms = []
187185 , optTemplate = ""
188186 , optVariables = []
189− , optBefore = []
190− , optAfter = []
191187 , optOutputFile = "-" -- "-" means stdout
192188 , optNumberSections = False
193189 , optIncremental = False
@@ -624,8 +620,6 @@ main = do
624620 , optWriter = writerName
625621 , optParseRaw = parseRaw
626622 , optVariables = variables
627− , optBefore = befores
628− , optAfter = afters
629623 , optTableOfContents = toc
630624 , optTransforms = transforms
631625 , optTemplate = template
@@ -757,8 +751,6 @@ main = do
757751 then defaultTemplate
758752 else template,
759753 writerVariables = variables'',
760− writerIncludeBefore = concat befores,
761− writerIncludeAfter = concat afters,
762754 writerTabStop = tabStop,
763755 writerTableOfContents = toc &&
764756 writerName' /= "s5",