6b553c2 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Man reader: Moved handling of P, PP, LP to parser phase.

6b553c2John MacFarlane8 years ago

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

compare with master

unifiedsplit

@@ -155,13 +155,18 @@ parseBlock = choice [ parseList

155 , parseDefinitionList

156 , parseBlockQuote

157 , parseTitle

158+ , parseNewParagraph

158 , parsePara

159 , parsePara

159− , parseSkippedContent

160 , parseCodeBlock

161 , parseHeader

162 , skipUnkownMacro

163 ]

164

165+parseNewParagraph :: PandocMonad m => ManParser m Blocks

166+parseNewParagraph = do

167+ mmacro "P" <|> mmacro "PP" <|> mmacro "LP" <|> memptyLine

168+ return mempty

169+

165eofline :: Stream s m Char => ParsecT s u m ()

170eofline :: Stream s m Char => ParsecT s u m ()

166eofline = void newline <|> eof

171eofline = void newline <|> eof

167

172

@@ -299,7 +304,7 @@ lexMacro = do

299 "\\\"" -> return mempty

304 "\\\"" -> return mempty

300 "\\#" -> return mempty

305 "\\#" -> return mempty

301 "de" -> lexMacroDef args

306 "de" -> lexMacroDef args

302− x | x `elem` [ "P", "PP", "LP", "sp"] -> return $ singleTok MEmptyLine

307+ "sp" -> return $ singleTok MEmptyLine

303 _ -> resolveMacro macroName args

308 _ -> resolveMacro macroName args

304

309

305 where

310 where

@@ -479,9 +484,6 @@ parseTitle = do

479 modifyState $ \st -> st{ metadata = adjustMeta $ metadata st }

484 modifyState $ \st -> st{ metadata = adjustMeta $ metadata st }

480 return mempty

485 return mempty

481

486

482−parseSkippedContent :: PandocMonad m => ManParser m Blocks

483−parseSkippedContent = mempty <$ memptyLine

484−

485linePartsToInlines :: [LinePart] -> Inlines

487linePartsToInlines :: [LinePart] -> Inlines

486linePartsToInlines = go

488linePartsToInlines = go

487

489