From faa35bb014626fd4143b54904827d5bbc82bd15c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 20 Oct 2018 07:48:20 -0700 Subject: [PATCH] Man reader: minor refactoring. --- src/Text/Pandoc/Readers/Man.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Text/Pandoc/Readers/Man.hs b/src/Text/Pandoc/Readers/Man.hs index e420ee0ab..458a9bfce 100644 --- a/src/Text/Pandoc/Readers/Man.hs +++ b/src/Text/Pandoc/Readers/Man.hs @@ -510,7 +510,7 @@ type ListBuilder = [Blocks] -> Blocks parseList :: PandocMonad m => ManParser m Blocks parseList = try $ do - xx <- many1 paras + xx <- many1 items let bls = map snd xx let bldr = fst $ head xx return $ bldr bls @@ -528,20 +528,20 @@ parseList = try $ do Left _ -> bulletList listKind _ = bulletList - paras :: PandocMonad m => ManParser m (ListBuilder, Blocks) - paras = do + items :: PandocMonad m => ManParser m (ListBuilder, Blocks) + items = do (MMacro _ args) <- mmacro "IP" let lbuilder = listKind args inls <- parseInlines continuations <- mconcat <$> many continuation return $ (lbuilder, para inls <> continuations) - continuation :: PandocMonad m => ManParser m Blocks - continuation = do - mmacro "RS" - bs <- mconcat <$> many (notFollowedBy (mmacro "RE") >> parseBlock) - mmacro "RE" - return bs +continuation :: PandocMonad m => ManParser m Blocks +continuation = do + mmacro "RS" + bs <- mconcat <$> many (notFollowedBy (mmacro "RE") >> parseBlock) + mmacro "RE" + return bs -- In case of weird man file it will be parsed succesfully parseSkipMacro :: PandocMonad m => ManParser m Blocks