2c13782 · typeable/pandoc

git.iko.soy/typeable/pandoc

Modified writers for new argument place in CodeBlock.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1200 788f1e2b-df1e-0410-8736-df70ead52e1b

commit2c13782fdf4f122fce6fb910a1e13a832455c0b0 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 9 Feb 2008, 03:18 (19 years ago) parent9f7a14c

8 files changed+8−8

compare with master

unifiedsplit

Text/Pandoc/Writers/ConTeXt.hs+1−1 Text/Pandoc/Writers/Docbook.hs+1−1 Text/Pandoc/Writers/HTML.hs+1−1 Text/Pandoc/Writers/LaTeX.hs+1−1 Text/Pandoc/Writers/Man.hs+1−1 Text/Pandoc/Writers/Markdown.hs+1−1 Text/Pandoc/Writers/RST.hs+1−1 Text/Pandoc/Writers/RTF.hs+1−1

Text/Pandoc/Writers/ConTeXt.hs+1−1

@@ -140,7 +140,7 @@ blockToConTeXt (Para lst) = do

140140blockToConTeXt (BlockQuote lst) = do

141141 contents <- blockListToConTeXt lst

142142 return $ Pad $ text "\\startblockquote" $$ contents $$ text "\\stopblockquote"

143−blockToConTeXt (CodeBlock str) =

143+blockToConTeXt (CodeBlock _ str) =

144144 return $ Reg $ text $ "\\starttyping\n" ++ str ++ "\n\\stoptyping\n"

145145 -- \n because \stoptyping can't have anything after it, inc. }

146146blockToConTeXt (RawHtml str) = return $ Reg empty

Text/Pandoc/Writers/Docbook.hs+1−1

@@ -186,7 +186,7 @@ blockToDocbook opts (Plain lst) = wrap opts lst

186186blockToDocbook opts (Para lst) = inTagsIndented "para" $ wrap opts lst

187187blockToDocbook opts (BlockQuote blocks) =

188188 inTagsIndented "blockquote" $ blocksToDocbook opts blocks

189−blockToDocbook opts (CodeBlock str) =

189+blockToDocbook opts (CodeBlock _ str) =

190190 text "<screen>\n" <> text (escapeStringForXML str) <> text "\n</screen>"

191191blockToDocbook opts (BulletList lst) =

192192 inTagsIndented "itemizedlist" $ listItemsToDocbook opts lst

Text/Pandoc/Writers/HTML.hs+1−1

@@ -263,7 +263,7 @@ blockToHtml opts (Plain lst) = inlineListToHtml opts lst

263263blockToHtml opts (Para lst) = inlineListToHtml opts lst >>= (return . paragraph)

264264blockToHtml opts (RawHtml str) = return $ primHtml str

265265blockToHtml opts (HorizontalRule) = return $ hr

266−blockToHtml opts (CodeBlock str) = return $ pre $ thecode << (str ++ "\n")

266+blockToHtml opts (CodeBlock _ str) = return $ pre $ thecode << (str ++ "\n")

267267 -- the final \n for consistency with Markdown.pl

268268blockToHtml opts (BlockQuote blocks) =

269269 -- in S5, treat list in blockquote specially

Text/Pandoc/Writers/LaTeX.hs+1−1

@@ -146,7 +146,7 @@ blockToLaTeX (Para lst) = do

146146blockToLaTeX (BlockQuote lst) = do

147147 contents <- blockListToLaTeX lst

148148 return $ text "\\begin{quote}" $$ contents $$ text "\\end{quote}"

149−blockToLaTeX (CodeBlock str) = do

149+blockToLaTeX (CodeBlock _ str) = do

150150 st <- get

151151 env <- if stInNote st

152152 then do addToHeader "\\usepackage{fancyvrb}"

Text/Pandoc/Writers/Man.hs+1−1

@@ -128,7 +128,7 @@ blockToMan opts (Header level inlines) = do

128128 1 -> ".SH "

129129 _ -> ".SS "

130130 return $ text heading <> contents

131−blockToMan opts (CodeBlock str) = return $

131+blockToMan opts (CodeBlock _ str) = return $

132132 text ".PP" $$ text "\\f[CR]" $$

133133 text ((unlines . map (" " ++) . lines) (escapeCode str)) <> text "\\f[]"

134134blockToMan opts (BlockQuote blocks) = do

Text/Pandoc/Writers/Markdown.hs+1−1

@@ -185,7 +185,7 @@ blockToMarkdown opts HorizontalRule = return $ text "\n* * * * *\n"

185185blockToMarkdown opts (Header level inlines) = do

186186 contents <- inlineListToMarkdown opts inlines

187187 return $ text ((replicate level '#') ++ " ") <> contents <> text "\n"

188−blockToMarkdown opts (CodeBlock str) = return $

188+blockToMarkdown opts (CodeBlock _ str) = return $

189189 (nest (writerTabStop opts) $ vcat $ map text (lines str)) <> text "\n"

190190blockToMarkdown opts (BlockQuote blocks) = do

191191 contents <- blockListToMarkdown opts blocks

Text/Pandoc/Writers/RST.hs+1−1

@@ -178,7 +178,7 @@ blockToRST (Header level inlines) = do

178178 let headerChar = if level > 5 then ' ' else "=-~^'" !! (level - 1)

179179 let border = text $ replicate headerLength headerChar

180180 return $ contents $+$ border <> text "\n"

181−blockToRST (CodeBlock str) = do

181+blockToRST (CodeBlock _ str) = do

182182 tabstop <- get >>= (return . writerTabStop . stOptions)

183183 return $ (text "::\n") $+$

184184 (nest tabstop $ vcat $ map text (lines str)) <> text "\n"

Text/Pandoc/Writers/RTF.hs+1−1

@@ -174,7 +174,7 @@ blockToRTF indent alignment (Para lst) =

174174 rtfPar indent 0 alignment $ inlineListToRTF lst

175175blockToRTF indent alignment (BlockQuote lst) =

176176 concatMap (blockToRTF (indent + indentIncrement) alignment) lst

177−blockToRTF indent _ (CodeBlock str) =

177+blockToRTF indent _ (CodeBlock _ str) =

178178 rtfPar indent 0 AlignLeft ("\\f1 " ++ (codeStringToRTF str))

179179blockToRTF _ _ (RawHtml str) = ""

180180blockToRTF indent alignment (BulletList lst) = spaceAtEnd $