From 1a7b9382db3c948ccae0b8b081a0e960a6daf14f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 27 Oct 2018 08:51:36 -0700 Subject: Man reader: allow .nf to be implicitly closed by eof. --- src/Text/Pandoc/Readers/Man.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Text/Pandoc/Readers') diff --git a/src/Text/Pandoc/Readers/Man.hs b/src/Text/Pandoc/Readers/Man.hs index 3414d8263..67639bee4 100644 --- a/src/Text/Pandoc/Readers/Man.hs +++ b/src/Text/Pandoc/Readers/Man.hs @@ -36,7 +36,7 @@ module Text.Pandoc.Readers.Man (readMan) where import Prelude import Data.Char (toLower) import Data.Default (Default) -import Control.Monad (liftM, mzero, guard) +import Control.Monad (liftM, mzero, guard, void) import Control.Monad.Trans (lift) import Control.Monad.Except (throwError) import Text.Pandoc.Class (PandocMonad(..), report) @@ -345,8 +345,10 @@ bareIP = msatisfy isBareIP where isBareIP (MMacro "IP" [] _) = True isBareIP _ = False -endmacro :: PandocMonad m => String -> ManParser m RoffToken -endmacro name = mmacro name <|> lookAhead newBlockMacro +endmacro :: PandocMonad m => String -> ManParser m () +endmacro name = void (mmacro name) + <|> lookAhead (void newBlockMacro) + <|> lookAhead eof where newBlockMacro = msatisfy isNewBlockMacro isNewBlockMacro (MMacro "SH" _ _) = True -- cgit v1.2.3