git.iko.soy/typeable/pandoc
on master help sign in
Muse writer: do not insert newline before lists
4275d58Alexander Krotov
src/Text/Pandoc/Writers/Muse.hs+3−3
compare with master
unifiedsplit
@@ -201,7 +201,7 @@ blockToMuse (OrderedList (start, style, _) items) = do
201 contents <- zipWithM orderedListItemToMuse markers items
201 contents <- zipWithM orderedListItemToMuse markers items
202 -- ensure that sublists have preceding blank line
202 -- ensure that sublists have preceding blank line
203 topLevel <- asks envTopLevel
203 topLevel <- asks envTopLevel
204− return $ cr $$ (if topLevel then nest 1 else id) (vcat contents) $$ blankline
204+ return $ (if topLevel then nest 1 else id) (vcat contents) $$ blankline
205 where orderedListItemToMuse :: PandocMonad m
205 where orderedListItemToMuse :: PandocMonad m
206 => String -- ^ marker for list item
206 => String -- ^ marker for list item
207 -> [Block] -- ^ list item (list of blocks)
207 -> [Block] -- ^ list item (list of blocks)
@@ -212,7 +212,7 @@ blockToMuse (BulletList items) = do
212 contents <- mapM bulletListItemToMuse items
212 contents <- mapM bulletListItemToMuse items
213 -- ensure that sublists have preceding blank line
213 -- ensure that sublists have preceding blank line
214 topLevel <- asks envTopLevel
214 topLevel <- asks envTopLevel
215− return $ cr $$ (if topLevel then nest 1 else id) (vcat contents) $$ blankline
215+ return $ (if topLevel then nest 1 else id) (vcat contents) $$ blankline
216 where bulletListItemToMuse :: PandocMonad m
216 where bulletListItemToMuse :: PandocMonad m
217 => [Block]
217 => [Block]
218 -> Muse m Doc
218 -> Muse m Doc
@@ -223,7 +223,7 @@ blockToMuse (DefinitionList items) = do
223 contents <- mapM definitionListItemToMuse items
223 contents <- mapM definitionListItemToMuse items
224 -- ensure that sublists have preceding blank line
224 -- ensure that sublists have preceding blank line
225 topLevel <- asks envTopLevel
225 topLevel <- asks envTopLevel
226− return $ cr $$ (if topLevel then nest 1 else id) (vcat contents) $$ blankline
226+ return $ (if topLevel then nest 1 else id) (vcat contents) $$ blankline
227 where definitionListItemToMuse :: PandocMonad m
227 where definitionListItemToMuse :: PandocMonad m
228 => ([Inline], [[Block]])
228 => ([Inline], [[Block]])
229 -> Muse m Doc
229 -> Muse m Doc
test/Tests/Writers/Muse.hs+1
@@ -247,6 +247,7 @@ tests = [ testGroup "block elements"
247 , " first inner definition :: first inner description"
247 , " first inner definition :: first inner description"
248 , " second inner definition :: second inner description"
248 , " second inner definition :: second inner description"
249 ]
249 ]
250+ , "list item starting with list" =: bulletList [ bulletList [ plain $ text "foo"] ] =?> " - - foo"
250 ]
251 ]
251 -- Check that list is intended with one space even inside a quote
252 -- Check that list is intended with one space even inside a quote
252 , "List inside block quote" =: blockQuote (orderedList [ plain $ text "first"
253 , "List inside block quote" =: blockQuote (orderedList [ plain $ text "first"