From 4806628c8d8ef9e696a981e6f47ede2b3a6f4d48 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Thu, 31 Dec 2009 01:12:14 +0000 Subject: Added 'standalone' variable, use in templates. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1697 788f1e2b-df1e-0410-8736-df70ead52e1b --- src/Text/Pandoc/Writers/LaTeX.hs | 7 +------ src/Text/Pandoc/Writers/Markdown.hs | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src/Text/Pandoc/Writers') diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index fadde0760..92bf65b0a 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -62,12 +62,7 @@ pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do , ("title", titletext) , ("authors", intercalate "\\\\" $ map stringToLaTeX authors) , ("date", stringToLaTeX date) ] - let templ = if writerStandalone options - then writerTemplate options - else "$if(toc)$\\tableofcontents\n$endif$" ++ - "$if(before)$$before$\n$endif$" ++ - "$body$$if(after)$$after$\n$endif$" - return $ renderTemplate context templ + return $ renderTemplate context $ writerTemplate options -- escape things as needed for LaTeX diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 305b71310..a72116376 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -70,12 +70,7 @@ pandocToMarkdown opts (Pandoc meta blocks) = do text "" $+$ refs') , ("titleblock", render head') ] - let templ = if writerStandalone opts - then writerTemplate opts - else "$if(toc)$$toc$\n$endif$" ++ - "$if(before)$$before$\n$endif$" ++ - "$body$$if(after)$$after$\n$endif$" - return $ renderTemplate context templ + return $ renderTemplate context $ writerTemplate opts -- | Return markdown representation of reference key table. keyTableToMarkdown :: WriterOptions -> KeyTable -> State WriterState Doc -- cgit v1.2.3