diff options
author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2009-12-31 01:10:17 +0000 |
---|---|---|
committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2009-12-31 01:10:17 +0000 |
commit | 9f126c15cf4d0f6c2ab14167e11336d4f5f8783e (patch) | |
tree | 416833a563f3be1b9e0bd72e1ec9006150e16943 /src/Text/Pandoc/Writers/Markdown.hs | |
parent | c602ed345959dbeb08533cd9c9c11f0604641c10 (diff) | |
download | pandoc-9f126c15cf4d0f6c2ab14167e11336d4f5f8783e.tar.gz |
Removed unneeded writer options; use template variables instead.
Removed writerIncludeAfter, writerIncludeBefore, writerTitlePrefix,
writerHeader. Removed corresponding fields of Options structure
in pandoc.hs. The options now set template variables (writerVariables)
instead.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1684 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/Text/Pandoc/Writers/Markdown.hs')
-rw-r--r-- | src/Text/Pandoc/Writers/Markdown.hs | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 0e1231b62..e95b139a6 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -50,27 +50,28 @@ writeMarkdown opts document = -- | Return markdown representation of document. pandocToMarkdown :: WriterOptions -> Pandoc -> State WriterState Doc pandocToMarkdown opts (Pandoc meta blocks) = do - let before = writerIncludeBefore opts - let after = writerIncludeAfter opts - let header = writerHeader opts - let before' = if null before then empty else text before - let after' = if null after then empty else text after - let header' = if null header then empty else text header - metaBlock <- metaToMarkdown opts meta - let head' = if writerStandalone opts - then metaBlock $+$ header' - else empty - let headerBlocks = filter isHeaderBlock blocks - let toc = if writerTableOfContents opts - then tableOfContents opts headerBlocks - else empty - body <- blockListToMarkdown opts blocks - (notes, _) <- get - notes' <- notesToMarkdown opts (reverse notes) - (_, refs) <- get -- note that the notes may contain refs - refs' <- keyTableToMarkdown opts (reverse refs) - return $ head' $+$ before' $+$ toc $+$ body $+$ text "" $+$ - notes' $+$ text "" $+$ refs' $+$ after' + return empty -- TODO +-- let before = writerIncludeBefore opts +-- let after = writerIncludeAfter opts +-- let header = writerHeader opts +-- let before' = if null before then empty else text before +-- let after' = if null after then empty else text after +-- let header' = if null header then empty else text header +-- metaBlock <- metaToMarkdown opts meta +-- let head' = if writerStandalone opts +-- then metaBlock $+$ header' +-- else empty +-- let headerBlocks = filter isHeaderBlock blocks +-- let toc = if writerTableOfContents opts +-- then tableOfContents opts headerBlocks +-- else empty +-- body <- blockListToMarkdown opts blocks +-- (notes, _) <- get +-- notes' <- notesToMarkdown opts (reverse notes) +-- (_, refs) <- get -- note that the notes may contain refs +-- refs' <- keyTableToMarkdown opts (reverse refs) +-- return $ head' $+$ before' $+$ toc $+$ body $+$ text "" $+$ +-- notes' $+$ text "" $+$ refs' $+$ after' -- | Return markdown representation of reference key table. keyTableToMarkdown :: WriterOptions -> KeyTable -> State WriterState Doc |