4275d58 · typeable/pandoc

git.iko.soy/typeable/pandoc

Muse writer: do not insert newline before lists

commit4275d58a9f8386ee978c1b20697feb6e0c0c77cc authorAlexander Krotov <ilabdsf@gmail.com> dateTue 23 Oct 2018, 03:38 (8 years ago) parent1d3460c

2 files changed+4−3

unifiedsplit

src/Text/Pandoc/Writers/Muse.hs+3−3

@@ -201,7 +201,7 @@ blockToMuse (OrderedList (start, style, _) items) = do

201201 contents <- zipWithM orderedListItemToMuse markers items

202202 -- ensure that sublists have preceding blank line

203203 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

205205 where orderedListItemToMuse :: PandocMonad m

206206 => String -- ^ marker for list item

207207 -> [Block] -- ^ list item (list of blocks)

@@ -212,7 +212,7 @@ blockToMuse (BulletList items) = do

212212 contents <- mapM bulletListItemToMuse items

213213 -- ensure that sublists have preceding blank line

214214 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

216216 where bulletListItemToMuse :: PandocMonad m

217217 => [Block]

218218 -> Muse m Doc

@@ -223,7 +223,7 @@ blockToMuse (DefinitionList items) = do

223223 contents <- mapM definitionListItemToMuse items

224224 -- ensure that sublists have preceding blank line

225225 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

227227 where definitionListItemToMuse :: PandocMonad m

228228 => ([Inline], [[Block]])

229229 -> Muse m Doc

test/Tests/Writers/Muse.hs+1

@@ -247,6 +247,7 @@ tests = [ testGroup "block elements"

247247 , " first inner definition :: first inner description"

248248 , " second inner definition :: second inner description"

249249 ]

250+ , "list item starting with list" =: bulletList [ bulletList [ plain $ text "foo"] ] =?> " - - foo"

250251 ]

251252 -- Check that list is intended with one space even inside a quote

252253 , "List inside block quote" =: blockQuote (orderedList [ plain $ text "first"