aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-02-09 03:18:03 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-02-09 03:18:03 +0000
commit9f7a14c210aed7cabcbd23721ffbcf491d54b085 (patch)
tree455fe57ed9041d6461f92b2e2144f1405fd7a9da
parent6a921f09664d45ce603151f9cd0d14d8c8f550a1 (diff)
downloadpandoc-9f7a14c210aed7cabcbd23721ffbcf491d54b085.tar.gz
Modified readers for new parameter in CodeBlock.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1199 788f1e2b-df1e-0410-8736-df70ead52e1b
-rw-r--r--Text/Pandoc/Readers/HTML.hs2
-rw-r--r--Text/Pandoc/Readers/LaTeX.hs6
-rw-r--r--Text/Pandoc/Readers/Markdown.hs2
-rw-r--r--Text/Pandoc/Readers/RST.hs2
4 files changed, 6 insertions, 6 deletions
diff --git a/Text/Pandoc/Readers/HTML.hs b/Text/Pandoc/Readers/HTML.hs
index a317d6fa1..2528de7b7 100644
--- a/Text/Pandoc/Readers/HTML.hs
+++ b/Text/Pandoc/Readers/HTML.hs
@@ -407,7 +407,7 @@ codeBlock = try $ do
let result''' = if "\n" `isSuffixOf` result''
then init result''
else result''
- return $ CodeBlock $ decodeCharacterReferences result'''
+ return $ CodeBlock "" $ decodeCharacterReferences result'''
--
-- block quotes
diff --git a/Text/Pandoc/Readers/LaTeX.hs b/Text/Pandoc/Readers/LaTeX.hs
index 20b814d4a..aa1e73704 100644
--- a/Text/Pandoc/Readers/LaTeX.hs
+++ b/Text/Pandoc/Readers/LaTeX.hs
@@ -182,14 +182,14 @@ codeBlock1 = try $ do
-- leading space
contents <- manyTill anyChar (try (string "\\end{verbatim}"))
spaces
- return $ CodeBlock (stripTrailingNewlines contents)
+ return $ CodeBlock "" (stripTrailingNewlines contents)
codeBlock2 = try $ do
string "\\begin{Verbatim}" -- used by fancyvrb package
- option "" blanklines
+ optional blanklines
contents <- manyTill anyChar (try (string "\\end{Verbatim}"))
spaces
- return $ CodeBlock (stripTrailingNewlines contents)
+ return $ CodeBlock "" (stripTrailingNewlines contents)
--
-- block quotes
diff --git a/Text/Pandoc/Readers/Markdown.hs b/Text/Pandoc/Readers/Markdown.hs
index ecf05b18d..8d7a274bf 100644
--- a/Text/Pandoc/Readers/Markdown.hs
+++ b/Text/Pandoc/Readers/Markdown.hs
@@ -301,7 +301,7 @@ codeBlock = do
l <- indentedLine
return $ b ++ l))
optional blanklines
- return $ CodeBlock $ stripTrailingNewlines $ concat contents
+ return $ CodeBlock "" $ stripTrailingNewlines $ concat contents
--
-- block quotes
diff --git a/Text/Pandoc/Readers/RST.hs b/Text/Pandoc/Readers/RST.hs
index 30d867e38..85bc95fa3 100644
--- a/Text/Pandoc/Readers/RST.hs
+++ b/Text/Pandoc/Readers/RST.hs
@@ -304,7 +304,7 @@ indentedBlock = do
codeBlock = try $ do
codeBlockStart
result <- indentedBlock
- return $ CodeBlock $ stripTrailingNewlines result
+ return $ CodeBlock "" $ stripTrailingNewlines result
--
-- raw html