Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
John MacFarlane 2018-10-26 21:50:19 -07:00
parent cbeef9f5ca
commit 9defc2545d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Text/Pandoc/Readers/Roff.hs
View file

@ -308,7 +308,7 @@ lexComment = do
try $ string ".\\\"" try $ string ".\\\""
many Parsec.space many Parsec.space
skipMany $ noneOf "\n" skipMany $ noneOf "\n"
char '\n' eofline
return mempty return mempty
lexMacro :: PandocMonad m => RoffLexer m RoffTokens lexMacro :: PandocMonad m => RoffLexer m RoffTokens
@ -451,7 +451,7 @@ lexConditional = do
-- n means nroff mode -- n means nroff mode
lexNCond :: PandocMonad m => RoffLexer m RoffTokens lexNCond :: PandocMonad m => RoffLexer m RoffTokens
lexNCond = do lexNCond = do
char '\n' newline
many1 spacetab many1 spacetab
lexGroup <|> manToken lexGroup <|> manToken
@ -631,7 +631,7 @@ spaceTabChar = do
return [RoffStr [c]] return [RoffStr [c]]
lexEmptyLine :: PandocMonad m => RoffLexer m RoffTokens lexEmptyLine :: PandocMonad m => RoffLexer m RoffTokens
lexEmptyLine = char '\n' >> return (singleTok MEmptyLine) lexEmptyLine = newline >> return (singleTok MEmptyLine)
manToken :: PandocMonad m => RoffLexer m RoffTokens manToken :: PandocMonad m => RoffLexer m RoffTokens
manToken = lexComment <|> lexMacro <|> lexLine <|> lexEmptyLine manToken = lexComment <|> lexMacro <|> lexLine <|> lexEmptyLine