From 8889ae8b5b091eb9d35bdf4698d39c562cb2e374 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 20 Dec 2010 19:34:47 -0800 Subject: Markdown writer: Use delimited code block if there are attributes. (Unless in strict mode.) --- src/Text/Pandoc/Writers/Markdown.hs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/Text/Pandoc/Writers/Markdown.hs') diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 135f7a7f6..50bf05a54 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -229,8 +229,27 @@ blockToMarkdown opts (CodeBlock (_,classes,_) str) | "haskell" `elem` classes && "literate" `elem` classes && writerLiterateHaskell opts = return $ prefixed "> " (text str) <> blankline -blockToMarkdown opts (CodeBlock _ str) = return $ - nest (writerTabStop opts) (text str) <> blankline +blockToMarkdown opts (CodeBlock attribs str) = return $ + if writerStrictMarkdown opts || attribs == ([],[],[]) + then nest (writerTabStop opts) (text str) <> blankline + else -- use delimited code block + flush $ tildes <> space <> attrs <> cr <> text str <> + cr <> tildes <> blankline + where tildes = text "~~~~" + attrs = braces $ hsep [attribId, attribClasses, attribKeys] + attribId = case attribs of + ([],_,_) -> empty + (i,_,_) -> "#" <> text i + attribClasses = case attribs of + (_,[],_) -> empty + (_,cs,_) -> hsep $ + map (text . ('.':)) + cs + attribKeys = case attribs of + (_,_,[]) -> empty + (_,_,ks) -> hsep $ + map (\(k,v) -> text k + <> "=\"" <> text v <> "\"") ks blockToMarkdown opts (BlockQuote blocks) = do st <- get -- if we're writing literate haskell, put a space before the bird tracks -- cgit v1.2.3