git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: make listItem generic
eaebc5fAlexander Krotov
src/Text/Pandoc/Readers/Muse.hs+3−3
@@ -432,7 +432,7 @@ listItemContents = do
432 let col = sourceColumn pos - 1
432 let col = sourceColumn pos - 1
433 listItemContents' col
433 listItemContents' col
434
434
435−listItem :: PandocMonad m => Int -> MuseParser m () -> MuseParser m (F Blocks)
435+listItem :: PandocMonad m => Int -> MuseParser m a -> MuseParser m (F Blocks)
436listItem n p = try $ do
436listItem n p = try $ do
437 optionMaybe blankline
437 optionMaybe blankline
438 count n spaceChar
438 count n spaceChar
@@ -449,7 +449,7 @@ bulletList = try $ do
449 char '-'
449 char '-'
450 void spaceChar <|> lookAhead eol
450 void spaceChar <|> lookAhead eol
451 first <- listItemContents
451 first <- listItemContents
452− rest <- many $ listItem (col - 1) (void (char '-'))
452+ rest <- many $ listItem (col - 1) (char '-')
453 return $ B.bulletList <$> sequence (first : rest)
453 return $ B.bulletList <$> sequence (first : rest)
454
454
455orderedList :: PandocMonad m => MuseParser m (F Blocks)
455orderedList :: PandocMonad m => MuseParser m (F Blocks)
@@ -463,7 +463,7 @@ orderedList = try $ do
463 guard $ delim == Period
463 guard $ delim == Period
464 void spaceChar <|> lookAhead eol
464 void spaceChar <|> lookAhead eol
465 first <- listItemContents
465 first <- listItemContents
466− rest <- many $ listItem (col - 1) (void (orderedListMarker style delim))
466+ rest <- many $ listItem (col - 1) (orderedListMarker style delim)
467 return $ B.orderedListWith p <$> sequence (first : rest)
467 return $ B.orderedListWith p <$> sequence (first : rest)
468
468
469definitionListItem :: PandocMonad m => Int -> MuseParser m (F (Inlines, [Blocks]))
469definitionListItem :: PandocMonad m => Int -> MuseParser m (F (Inlines, [Blocks]))