Properly handle commented-out list items in markdown.

Example:
- a
<!--
- b
-->
- c

Resolves Issue #142.

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

src/Text/Pandoc/Readers/HTML.hs

@@ -38,6 +38,7 @@ module Text.Pandoc.Readers.HTML (
                                  htmlEndTag,
                                  extractTagType,
                                  htmlBlockElement,
+                                 htmlComment,
                                  unsanitaryURI
                                 ) where
 

src/Text/Pandoc/Readers/Markdown.hs

@@ -42,7 +42,7 @@ import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment' )
 import Text.Pandoc.Readers.HTML ( rawHtmlBlock, anyHtmlBlockTag, 
                                   anyHtmlInlineTag, anyHtmlTag,
                                   anyHtmlEndTag, htmlEndTag, extractTagType,
-                                  htmlBlockElement, unsanitaryURI )
+                                  htmlBlockElement, htmlComment, unsanitaryURI )
 import Text.Pandoc.CharacterReferences ( decodeCharacterReferences )
 import Text.ParserCombinators.Parsec
 import Control.Monad (when, liftM)
@@ -504,8 +504,8 @@ listLine = try $ do
   notFollowedBy' (do indentSpaces
                      many (spaceChar)
                      listStart)
-  line <- manyTill anyChar newline
-  return $ line ++ "\n"
+  chunks <- manyTill (htmlComment <|> count 1 anyChar) newline
+  return $ concat chunks ++ "\n"
 
 -- parse raw text for one list item, excluding start marker and continuations
 rawListItem :: GenParser Char ParserState [Char]

tests/markdown-reader-more.native

@@ -15,5 +15,9 @@ Pandoc (Meta [] [] "")
 , Plain [HtmlInline "<a>",HtmlInline "</a>"]
 , Header 3 [Str "my",Space,Str "header"]
 , Header 2 [Str "$",Space,Str "in",Space,Str "math"]
-, Para [Math InlineMath "\\$2 + \\$3"] ]
+, Para [Math InlineMath "\\$2 + \\$3"]
+, Header 2 [Str "Commented",Str "-",Str "out",Space,Str "list",Space,Str "item"]
+, BulletList
+  [ [ Plain [Str "one"]
+    , RawHtml "<!--\n- two\n-->" ], [ Plain [Str "three"] ] ] ]
 

tests/markdown-reader-more.txt

@@ -51,3 +51,11 @@
 
 $\$2 + \$3$
 
+## Commented-out list item
+
+- one
+<!--
+- two
+-->
+- three
+