aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-10-27 08:51:36 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2018-10-27 08:52:01 -0700
commit1a7b9382db3c948ccae0b8b081a0e960a6daf14f (patch)
tree97737d178df17c5c9a66ea6100dc88b1dbf21563 /src/Text/Pandoc/Readers
parentdae03de44c748a89140ed1baf915d042bcc30dda (diff)
downloadpandoc-1a7b9382db3c948ccae0b8b081a0e960a6daf14f.tar.gz
Man reader: allow .nf to be implicitly closed by eof.
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r--src/Text/Pandoc/Readers/Man.hs8
1 files changed, 5 insertions, 3 deletions
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