diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-04-26 11:20:53 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-04-26 11:27:47 -0700 |
| commit | d9d88e58e1d710c86ef4037c352244ea6b439fa3 (patch) | |
| tree | 0a5eab891ece723fab46f85b65aeb4b2c0c195c8 | |
| parent | 2793d986dc5f745e3272832e034581217a00a077 (diff) | |
| download | pandoc-d9d88e58e1d710c86ef4037c352244ea6b439fa3.tar.gz | |
Fixed regression with lists inside defintiion lists.
This fixes a regression (not in any released version) on
things like
hi
: - there
Closes #2098.
| -rw-r--r-- | src/Text/Pandoc/Readers/Markdown.hs | 2 | ||||
| -rw-r--r-- | tests/Tests/Readers/Markdown.hs | 3 |
2 files changed, 4 insertions, 1 deletions
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" $ |