aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-11-09 22:52:36 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-11-09 22:52:36 -0800
commit83e6c01e4d393f642231ed76e7a44804ec781f66 (patch)
tree2e614b0cd1c3ac93b28d499d61e9381d80d3efb4 /src/Text/Pandoc/Readers
parent07775b5f4fbe108dde4bd3729552c613b8f8d122 (diff)
parent21556e37f4596cd7020337f1a8f039364c47c04b (diff)
downloadpandoc-83e6c01e4d393f642231ed76e7a44804ec781f66.tar.gz
Merge branch 'master' into citeproc
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index a2ee93f42..b7c5220d1 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -1300,7 +1300,7 @@ rawHtmlInline' = do
st <- getState
result <- if stateStrict st
then choice [htmlBlockElement, anyHtmlTag, anyHtmlEndTag]
- else anyHtmlInlineTag
+ else choice [htmlComment, anyHtmlInlineTag]
return $ HtmlInline result
inlineCitation :: GenParser Char ParserState Inline