git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: simplify ordered list parsing
commitca0bb5123e52b89b39033a54120626062e824ca5 authorAlexander Krotov <ilabdsf@gmail.com> dateFri 21 Sep 2018, 12:46 (8 years ago) parent23725f3
1 file changed+4−11
src/Text/Pandoc/Readers/Muse.hs+4−11
src/Text/Pandoc/Readers/Muse.hs+4−11
@@ -595,13 +595,6 @@ bulletListUntil end = try $ do
595595 (items, e) <- bulletListItemsUntil indent end
596596 return (B.bulletList <$> sequence items, e)
597597
598−-- | Parses an ordered list marker and returns list attributes.
599−anyMuseOrderedListMarker :: PandocMonad m => MuseParser m ListAttributes
600−anyMuseOrderedListMarker = do
601− (style, start) <- decimal <|> lowerRoman <|> upperRoman <|> lowerAlpha <|> upperAlpha
602− char '.'
603− return (start, style, Period)
604−
605598museOrderedListMarker :: PandocMonad m
606599 => ListNumberStyle
607600 -> MuseParser m Int
@@ -639,10 +632,10 @@ orderedListUntil end = try $ do
639632 pos <- getPosition
640633 let indent = sourceColumn pos - 1
641634 guard $ indent /= 0
642− p@(_, style, _) <- anyMuseOrderedListMarker
643− guard $ style `elem` [Decimal, LowerAlpha, UpperAlpha, LowerRoman, UpperRoman]
644− (items, e) <- orderedListItemsUntil indent style end
645− return (B.orderedListWith p <$> sequence items, e)
635+ (style, start) <- decimal <|> lowerRoman <|> upperRoman <|> lowerAlpha <|> upperAlpha
636+ char '.'
637+ first (fmap (B.orderedListWith (start, style, Period)) . sequence)
638+ <$> orderedListItemsUntil indent style end
646639
647640descriptionsUntil :: PandocMonad m
648641 => Int