summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2012-10-05 10:23:15 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2012-10-05 10:23:15 -0700
commitf232034ab0a97c71643901a116ed1c55c5fb7f29 (patch)
tree2980070a1eb522fa081b2da6416057d66f58251d
parentb1dafe8750debfb375fd9b40294bc9c0fa8e11e0 (diff)
Textile reader: Implemented comment blocks.
-rw-r--r--src/Text/Pandoc/Readers/Textile.hs7
-rw-r--r--tests/textile-reader.native5
-rw-r--r--tests/textile-reader.textile7
3 files changed, 18 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs
index 0d516f545..922ebc44e 100644
--- a/src/Text/Pandoc/Readers/Textile.hs
+++ b/src/Text/Pandoc/Readers/Textile.hs
@@ -125,6 +125,7 @@ blockParsers = [ codeBlock
, header
, blockQuote
, hrule
+ , commentBlock
, anyList
, rawHtmlBlock
, rawLaTeXBlock'
@@ -136,6 +137,12 @@ blockParsers = [ codeBlock
block :: Parser [Char] ParserState Block
block = choice blockParsers <?> "block"
+commentBlock :: Parser [Char] ParserState Block
+commentBlock = try $ do
+ string "###."
+ manyTill anyLine blanklines
+ return Null
+
codeBlock :: Parser [Char] ParserState Block
codeBlock = codeBlockBc <|> codeBlockPre
diff --git a/tests/textile-reader.native b/tests/textile-reader.native
index 84dc50516..3ca39dfc1 100644
--- a/tests/textile-reader.native
+++ b/tests/textile-reader.native
@@ -155,4 +155,7 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
,Para [Str "\174",Space,Str "Hi",Str "\174"]
,Para [Str "Hi",Str "\169",Str "2008",Space,Str "\169",Space,Str "2008"]
,Header 1 [Str "Footnotes"]
-,Para [Str "A",Space,Str "note",Str ".",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here",Str "!"]],Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note",Str "."]],Str "."]]
+,Para [Str "A",Space,Str "note",Str ".",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here",Str "!"]],Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note",Str "."]],Str "."]
+,Header 1 [Str "Comment",Space,Str "blocks"]
+,Null
+,Para [Str "not",Space,Str "a",Space,Str "comment",Str "."]]
diff --git a/tests/textile-reader.textile b/tests/textile-reader.textile
index aba1cf3ad..8c4d98b51 100644
--- a/tests/textile-reader.textile
+++ b/tests/textile-reader.textile
@@ -243,3 +243,10 @@ fn1. The note
is here!
fn2. Other note.
+
+h1. Comment blocks
+
+###. my comment
+is here.
+
+not a comment.