7f09c18 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Markdown writer: Fix rendering of tight sublists.

7f09c18John MacFarlane13 years ago

src/Text/Pandoc/Writers/Markdown.hs+8−1

@@ -555,7 +555,14 @@ bulletListItemToMarkdown opts items = do

555 contents <- blockListToMarkdown opts items

556 let sps = replicate (writerTabStop opts - 2) ' '

557 let start = text ('-' : ' ' : sps)

558+ -- remove trailing blank line if it is a tight list

559+ let contents' = case reverse items of

560+ (BulletList xs:_) | isTightList xs ->

561+ chomp contents <> cr

562+ (OrderedList _ xs:_) | isTightList xs ->

563+ chomp contents <> cr

564+ _ -> contents

558− return $ hang (writerTabStop opts) start $ contents <> cr

565+ return $ hang (writerTabStop opts) start $ contents' <> cr

559

566

560-- | Convert ordered list item (a list of blocks) to markdown.

567-- | Convert ordered list item (a list of blocks) to markdown.

561orderedListItemToMarkdown :: WriterOptions -- ^ options

568orderedListItemToMarkdown :: WriterOptions -- ^ options

tests/Tests/Writers/Markdown.hs+4

@@ -31,4 +31,8 @@ tests :: [Test]

31tests = [ "indented code after list"

32 =: (orderedList [ para "one" <> para "two" ] <> codeBlock "test")

33 =?> "1. one\n\n two\n\n\n\n test"

34+ , "list with tight sublist"

35+ =: bulletList [ plain "foo" <> bulletList [ plain "bar" ],

36+ plain "baz" ]

37+ =?> "- foo\n - bar\n- baz\n"

34 ]

38 ]