9defc25 · typeable/pandoc

git.iko.soy/typeable/pandoc

Roff tokenizer: allow eof in some places we allowed only newline.

commit9defc2545dfc8246f7bc24292f1274ef51dbdd87 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 26 Oct 2018, 21:50 (8 years ago) parentcbeef9f

1 file changed+3−3

unifiedsplit

src/Text/Pandoc/Readers/Roff.hs+3−3

@@ -308,7 +308,7 @@ lexComment = do

308308 try $ string ".\\\""

309309 many Parsec.space

310310 skipMany $ noneOf "\n"

311− char '\n'

311+ eofline

312312 return mempty

313313

314314lexMacro :: PandocMonad m => RoffLexer m RoffTokens

@@ -451,7 +451,7 @@ lexConditional = do

451451-- n means nroff mode

452452lexNCond :: PandocMonad m => RoffLexer m RoffTokens

453453lexNCond = do

454− char '\n'

454+ newline

455455 many1 spacetab

456456 lexGroup <|> manToken

457457

@@ -631,7 +631,7 @@ spaceTabChar = do

631631 return [RoffStr [c]]

632632

633633lexEmptyLine :: PandocMonad m => RoffLexer m RoffTokens

634−lexEmptyLine = char '\n' >> return (singleTok MEmptyLine)

634+lexEmptyLine = newline >> return (singleTok MEmptyLine)

635635

636636manToken :: PandocMonad m => RoffLexer m RoffTokens

637637manToken = lexComment <|> lexMacro <|> lexLine <|> lexEmptyLine