From 2c13782fdf4f122fce6fb910a1e13a832455c0b0 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Sat, 9 Feb 2008 03:18:22 +0000 Subject: Modified writers for new argument place in CodeBlock. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1200 788f1e2b-df1e-0410-8736-df70ead52e1b --- Text/Pandoc/Writers/ConTeXt.hs | 2 +- Text/Pandoc/Writers/Docbook.hs | 2 +- Text/Pandoc/Writers/HTML.hs | 2 +- Text/Pandoc/Writers/LaTeX.hs | 2 +- Text/Pandoc/Writers/Man.hs | 2 +- Text/Pandoc/Writers/Markdown.hs | 2 +- Text/Pandoc/Writers/RST.hs | 2 +- Text/Pandoc/Writers/RTF.hs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Text') diff --git a/Text/Pandoc/Writers/ConTeXt.hs b/Text/Pandoc/Writers/ConTeXt.hs index c2a7dbf41..cd1d09e0c 100644 --- a/Text/Pandoc/Writers/ConTeXt.hs +++ b/Text/Pandoc/Writers/ConTeXt.hs @@ -140,7 +140,7 @@ blockToConTeXt (Para lst) = do blockToConTeXt (BlockQuote lst) = do contents <- blockListToConTeXt lst return $ Pad $ text "\\startblockquote" $$ contents $$ text "\\stopblockquote" -blockToConTeXt (CodeBlock str) = +blockToConTeXt (CodeBlock _ str) = return $ Reg $ text $ "\\starttyping\n" ++ str ++ "\n\\stoptyping\n" -- \n because \stoptyping can't have anything after it, inc. } blockToConTeXt (RawHtml str) = return $ Reg empty diff --git a/Text/Pandoc/Writers/Docbook.hs b/Text/Pandoc/Writers/Docbook.hs index f0fde18a4..51a4497fa 100644 --- a/Text/Pandoc/Writers/Docbook.hs +++ b/Text/Pandoc/Writers/Docbook.hs @@ -186,7 +186,7 @@ blockToDocbook opts (Plain lst) = wrap opts lst blockToDocbook opts (Para lst) = inTagsIndented "para" $ wrap opts lst blockToDocbook opts (BlockQuote blocks) = inTagsIndented "blockquote" $ blocksToDocbook opts blocks -blockToDocbook opts (CodeBlock str) = +blockToDocbook opts (CodeBlock _ str) = text "\n" <> text (escapeStringForXML str) <> text "\n" blockToDocbook opts (BulletList lst) = inTagsIndented "itemizedlist" $ listItemsToDocbook opts lst diff --git a/Text/Pandoc/Writers/HTML.hs b/Text/Pandoc/Writers/HTML.hs index 960d5a5c0..ec01951f7 100644 --- a/Text/Pandoc/Writers/HTML.hs +++ b/Text/Pandoc/Writers/HTML.hs @@ -263,7 +263,7 @@ blockToHtml opts (Plain lst) = inlineListToHtml opts lst blockToHtml opts (Para lst) = inlineListToHtml opts lst >>= (return . paragraph) blockToHtml opts (RawHtml str) = return $ primHtml str blockToHtml opts (HorizontalRule) = return $ hr -blockToHtml opts (CodeBlock str) = return $ pre $ thecode << (str ++ "\n") +blockToHtml opts (CodeBlock _ str) = return $ pre $ thecode << (str ++ "\n") -- the final \n for consistency with Markdown.pl blockToHtml opts (BlockQuote blocks) = -- in S5, treat list in blockquote specially diff --git a/Text/Pandoc/Writers/LaTeX.hs b/Text/Pandoc/Writers/LaTeX.hs index b49a4488f..7e7ecb222 100644 --- a/Text/Pandoc/Writers/LaTeX.hs +++ b/Text/Pandoc/Writers/LaTeX.hs @@ -146,7 +146,7 @@ blockToLaTeX (Para lst) = do blockToLaTeX (BlockQuote lst) = do contents <- blockListToLaTeX lst return $ text "\\begin{quote}" $$ contents $$ text "\\end{quote}" -blockToLaTeX (CodeBlock str) = do +blockToLaTeX (CodeBlock _ str) = do st <- get env <- if stInNote st then do addToHeader "\\usepackage{fancyvrb}" diff --git a/Text/Pandoc/Writers/Man.hs b/Text/Pandoc/Writers/Man.hs index 71bda8e88..d96825927 100644 --- a/Text/Pandoc/Writers/Man.hs +++ b/Text/Pandoc/Writers/Man.hs @@ -128,7 +128,7 @@ blockToMan opts (Header level inlines) = do 1 -> ".SH " _ -> ".SS " return $ text heading <> contents -blockToMan opts (CodeBlock str) = return $ +blockToMan opts (CodeBlock _ str) = return $ text ".PP" $$ text "\\f[CR]" $$ text ((unlines . map (" " ++) . lines) (escapeCode str)) <> text "\\f[]" blockToMan opts (BlockQuote blocks) = do diff --git a/Text/Pandoc/Writers/Markdown.hs b/Text/Pandoc/Writers/Markdown.hs index dca607f19..556be70cf 100644 --- a/Text/Pandoc/Writers/Markdown.hs +++ b/Text/Pandoc/Writers/Markdown.hs @@ -185,7 +185,7 @@ blockToMarkdown opts HorizontalRule = return $ text "\n* * * * *\n" blockToMarkdown opts (Header level inlines) = do contents <- inlineListToMarkdown opts inlines return $ text ((replicate level '#') ++ " ") <> contents <> text "\n" -blockToMarkdown opts (CodeBlock str) = return $ +blockToMarkdown opts (CodeBlock _ str) = return $ (nest (writerTabStop opts) $ vcat $ map text (lines str)) <> text "\n" blockToMarkdown opts (BlockQuote blocks) = do contents <- blockListToMarkdown opts blocks diff --git a/Text/Pandoc/Writers/RST.hs b/Text/Pandoc/Writers/RST.hs index bfb460cf5..d63b04bf4 100644 --- a/Text/Pandoc/Writers/RST.hs +++ b/Text/Pandoc/Writers/RST.hs @@ -178,7 +178,7 @@ blockToRST (Header level inlines) = do let headerChar = if level > 5 then ' ' else "=-~^'" !! (level - 1) let border = text $ replicate headerLength headerChar return $ contents $+$ border <> text "\n" -blockToRST (CodeBlock str) = do +blockToRST (CodeBlock _ str) = do tabstop <- get >>= (return . writerTabStop . stOptions) return $ (text "::\n") $+$ (nest tabstop $ vcat $ map text (lines str)) <> text "\n" diff --git a/Text/Pandoc/Writers/RTF.hs b/Text/Pandoc/Writers/RTF.hs index 64d73a30f..00cc8c6cd 100644 --- a/Text/Pandoc/Writers/RTF.hs +++ b/Text/Pandoc/Writers/RTF.hs @@ -174,7 +174,7 @@ blockToRTF indent alignment (Para lst) = rtfPar indent 0 alignment $ inlineListToRTF lst blockToRTF indent alignment (BlockQuote lst) = concatMap (blockToRTF (indent + indentIncrement) alignment) lst -blockToRTF indent _ (CodeBlock str) = +blockToRTF indent _ (CodeBlock _ str) = rtfPar indent 0 AlignLeft ("\\f1 " ++ (codeStringToRTF str)) blockToRTF _ _ (RawHtml str) = "" blockToRTF indent alignment (BulletList lst) = spaceAtEnd $ -- cgit v1.2.3