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

Man reader: handle implicitly closed RS, nf, EX.

Browse source 
These are implicitly closed by a new section command.
(See e.g. tiffcp.1)
This commit is contained in:
John MacFarlane 2018-10-23 12:47:49 -07:00
parent b0fa2b954f
commit 8f428c4e10
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Text/Pandoc/Readers/Man.hs
View file

@ -719,11 +719,19 @@ bareIP = msatisfy isBareIP where
isBareIP (MMacro "IP" [] _) = True
isBareIP _ = False
endmacro :: PandocMonad m => String -> ManParser m ManToken
endmacro name = mmacro name <|> lookAhead newBlockMacro
where
newBlockMacro = msatisfy isNewBlockMacro
isNewBlockMacro (MMacro "SH" _ _) = True
isNewBlockMacro (MMacro "SS" _ _) = True
isNewBlockMacro _ = False
parseCodeBlock :: PandocMonad m => ManParser m Blocks
parseCodeBlock = try $ do
optional bareIP -- some people indent their code
toks <- (mmacro "nf" *> many (mline <|> memptyLine) <* mmacro "fi")
<|> (mmacro "EX" *> many (mline <|> memptyLine) <* mmacro "EE")
toks <- (mmacro "nf" *> many (mline <|> memptyLine) <* endmacro "fi")
<|> (mmacro "EX" *> many (mline <|> memptyLine) <* endmacro "EE")
return $ codeBlock (intercalate "\n" . catMaybes $
extractText <$> toks)
@ -786,12 +794,9 @@ parseList = try $ do
Ordered lattr -> orderedListWith lattr (x:xs)
continuation :: PandocMonad m => ManParser m Blocks
continuation = (do
mmacro "RS"
bs <- mconcat <$> many (notFollowedBy (mmacro "RE") >> parseBlock)
mmacro "RE"
return bs)
<|> mconcat <$> many1 (try (bareIP *> parsePara))
continuation =
mconcat <$> (mmacro "RS" *> manyTill parseBlock (endmacro "RE"))
<|> mconcat <$> many1 (try (bareIP *> parsePara))
definitionListItem :: PandocMonad m
=> ManParser m (Inlines, [Blocks])