From 6f507336918baa016eefce854f00fad1e1a78068 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 21 Mar 2018 17:32:12 +0300 Subject: Muse writer: don't align ordered list items It leads to problems with round-trip test, because aligned line blocks can't be read back. --- src/Text/Pandoc/Writers/Muse.hs | 5 +---- test/Tests/Writers/Muse.hs | 12 ++++++------ test/writer.muse | 6 +++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs index 8feb277c6..ad3afd751 100644 --- a/src/Text/Pandoc/Writers/Muse.hs +++ b/src/Text/Pandoc/Writers/Muse.hs @@ -175,10 +175,7 @@ blockToMuse (BlockQuote blocks) = do blockToMuse (OrderedList (start, style, _) items) = do let markers = take (length items) $ orderedListMarkers (start, style, Period) - let maxMarkerLength = maximum $ map length markers - let markers' = map (\m -> let s = maxMarkerLength - length m - in m ++ replicate s ' ') markers - contents <- zipWithM orderedListItemToMuse markers' items + contents <- zipWithM orderedListItemToMuse markers items -- ensure that sublists have preceding blank line topLevel <- gets stTopLevel return $ cr $$ (if topLevel then nest 1 else id) (vcat contents) $$ blankline diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs index ad7e4f1c4..56fa22955 100644 --- a/test/Tests/Writers/Muse.hs +++ b/test/Tests/Writers/Muse.hs @@ -74,8 +74,8 @@ tests = [ testGroup "block elements" , plain $ text "second" , plain $ text "third" ] - =?> unlines [ " I. first" - , " II. second" + =?> unlines [ " I. first" + , " II. second" , " III. third" ] , "bullet list" =: bulletList [ plain $ text "first" @@ -138,11 +138,11 @@ tests = [ testGroup "block elements" orderedListWith (1, UpperRoman, DefaultDelim) [ para $ text "Third" , para $ text "Fourth" ] =?> - unlines [ " I. First" + unlines [ " I. First" , " II. Second" , "" , "" - , " I. Third" + , " I. Third" , " II. Fourth" ] , "ordered lists with equal styles" =: @@ -169,7 +169,7 @@ tests = [ testGroup "block elements" unlines [ " - First" , " - Second" , "" - , " I. Third" + , " I. Third" , " II. Fourth" ] , "different style ordered lists" =: @@ -179,7 +179,7 @@ tests = [ testGroup "block elements" orderedListWith (1, Decimal, DefaultDelim) [ para $ text "Third" , para $ text "Fourth" ] =?> - unlines [ " I. First" + unlines [ " I. First" , " II. Second" , "" , " 1. Third" diff --git a/test/writer.muse b/test/writer.muse index 5db3871a1..530fb3ba5 100644 --- a/test/writer.muse +++ b/test/writer.muse @@ -224,9 +224,9 @@ Same thing but with paragraphs: with a continuation iv. sublist with roman numerals, starting with 4 - v. more items - A. a subsublist - B. a subsublist + v. more items + A. a subsublist + B. a subsublist Nesting: -- cgit v1.2.3