From d9d88e58e1d710c86ef4037c352244ea6b439fa3 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 26 Apr 2015 11:20:53 -0700 Subject: Fixed regression with lists inside defintiion lists. This fixes a regression (not in any released version) on things like hi : - there Closes #2098. --- src/Text/Pandoc/Readers/Markdown.hs | 2 +- tests/Tests/Readers/Markdown.hs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 8f63663bc..3722fc0c8 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -883,7 +883,7 @@ definitionListItem compact = try $ do rawLine' <- anyLine raw <- many1 $ defRawBlock compact term <- parseFromString (trimInlinesF . mconcat <$> many inline) rawLine' - contents <- mapM (parseFromString parseBlocks) raw + contents <- mapM (parseFromString parseBlocks . (++"\n")) raw optional blanklines return $ liftM2 (,) term (sequence contents) diff --git a/tests/Tests/Readers/Markdown.hs b/tests/Tests/Readers/Markdown.hs index 02d49a70e..9904cb9f1 100644 --- a/tests/Tests/Readers/Markdown.hs +++ b/tests/Tests/Readers/Markdown.hs @@ -276,6 +276,9 @@ tests = [ testGroup "inline code" , "first line not indented" =: "foo\n: bar\n" =?> definitionList [ (text "foo", [plain (text "bar")]) ] + , "list in definition" =: + "foo\n: - bar\n" =?> + definitionList [ (text "foo", [bulletList [plain (text "bar")]]) ] ] , testGroup "+compact_definition_lists" [ test markdownCDL "basic compact list" $ -- cgit v1.2.3