summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-05-03 15:06:40 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-05-03 15:06:40 -0700
commit64b1394fe2a089828bd58303b23ca461b837cb22 (patch)
treef8b2957bf78d10e0e49278f5515574f9a772c905
parent8a77eb4c9c4a280debc067f632f9210bc8cbb5eb (diff)
Make sure a closing `</div>` doesn't get included in a defn list item.
Closes #2127.
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs1
-rw-r--r--tests/Tests/Readers/Markdown.hs4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 3722fc0c8..cc5521a62 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -894,6 +894,7 @@ defRawBlock compact = try $ do
firstline <- anyLine
let dline = try
( do notFollowedBy blankline
+ notFollowedByHtmlCloser
if compact -- laziness not compatible with compact
then () <$ indentSpaces
else (() <$ indentSpaces)
diff --git a/tests/Tests/Readers/Markdown.hs b/tests/Tests/Readers/Markdown.hs
index 9904cb9f1..ed79f9e3d 100644
--- a/tests/Tests/Readers/Markdown.hs
+++ b/tests/Tests/Readers/Markdown.hs
@@ -279,6 +279,10 @@ tests = [ testGroup "inline code"
, "list in definition" =:
"foo\n: - bar\n" =?>
definitionList [ (text "foo", [bulletList [plain (text "bar")]]) ]
+ , "in div" =:
+ "<div>foo\n: - bar\n</div>" =?>
+ divWith nullAttr (definitionList
+ [ (text "foo", [bulletList [plain (text "bar")]]) ])
]
, testGroup "+compact_definition_lists"
[ test markdownCDL "basic compact list" $