1a7b938 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Man reader: allow .nf to be implicitly closed by eof.

1a7b938John MacFarlane8 years ago

src/Text/Pandoc/Readers/Man.hs+5−3

@@ -36,7 +36,7 @@ module Text.Pandoc.Readers.Man (readMan) where

36import Prelude

37import Data.Char (toLower)

38import Data.Default (Default)

39−import Control.Monad (liftM, mzero, guard)

39+import Control.Monad (liftM, mzero, guard, void)

40import Control.Monad.Trans (lift)

41import Control.Monad.Except (throwError)

42import Text.Pandoc.Class (PandocMonad(..), report)

@@ -345,8 +345,10 @@ bareIP = msatisfy isBareIP where

345 isBareIP (MMacro "IP" [] _) = True

346 isBareIP _ = False

347

348−endmacro :: PandocMonad m => String -> ManParser m RoffToken

348+endmacro :: PandocMonad m => String -> ManParser m ()

349−endmacro name = mmacro name <|> lookAhead newBlockMacro

349+endmacro name = void (mmacro name)

350+ <|> lookAhead (void newBlockMacro)

351+ <|> lookAhead eof

350 where

352 where

351 newBlockMacro = msatisfy isNewBlockMacro

353 newBlockMacro = msatisfy isNewBlockMacro

352 isNewBlockMacro (MMacro "SH" _ _) = True

354 isNewBlockMacro (MMacro "SH" _ _) = True