@@ -206,9 +206,8 @@ blockToMuse (OrderedList (start, style, _) items) = do
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)
208 -> Muse m Doc
208 -> Muse m Doc
209− orderedListItemToMuse marker item = do
209+ orderedListItemToMuse marker item = hang (length marker + 1) (text marker <> space)
210− contents <- blockListToMuse item
210+ <$> blockListToMuse item
211− return $ hang (length marker + 1) (text marker <> space) contents
212blockToMuse (BulletList items) = do
211blockToMuse (BulletList items) = do
213 contents <- mapM bulletListItemToMuse items
212 contents <- mapM bulletListItemToMuse items
214 -- ensure that sublists have preceding blank line
213 -- ensure that sublists have preceding blank line
@@ -271,8 +270,7 @@ blockToMuse (Table caption _ _ headers rows) = do
271 let makeRow sep = (" " <>) . hpipeBlocks sep . zipWith lblock widthsInChars
270 let makeRow sep = (" " <>) . hpipeBlocks sep . zipWith lblock widthsInChars
272 let head' = makeRow " || " headers'
271 let head' = makeRow " || " headers'
273 let rowSeparator = if noHeaders then " | " else " | "
272 let rowSeparator = if noHeaders then " | " else " | "
274− rows'' <- mapM (\row -> do cols <- mapM blockListToMuse row
275− return $ makeRow rowSeparator cols) rows
273+ rows'' <- mapM (\row -> makeRow rowSeparator <$> mapM blockListToMuse row) rows
276 let body = vcat rows''
274 let body = vcat rows''
277 return $ (if noHeaders then empty else head')
275 return $ (if noHeaders then empty else head')