git.iko.soy/typeable/pandoc
on master help sign in
Man reader: got rid of MUnknownMacro and simplified code.
574f925John MacFarlane
src/Text/Pandoc/Readers/Man.hs+4−21
compare with master
unifiedsplit
@@ -74,7 +74,6 @@ data ManToken = MStr RoffStr
74 | MEmptyLine
74 | MEmptyLine
75 | MHeader Int [RoffStr]
75 | MHeader Int [RoffStr]
76 | MMacro MacroKind [RoffStr]
76 | MMacro MacroKind [RoffStr]
77− | MUnknownMacro String [RoffStr]
78 | MComment String
77 | MComment String
79 deriving Show
78 deriving Show
80
79
@@ -387,8 +386,8 @@ mmaybeLink = msatisfy isMMaybeLink where
387 isMMaybeLink (MMaybeLink _) = True
386 isMMaybeLink (MMaybeLink _) = True
388 isMMaybeLink _ = False
387 isMMaybeLink _ = False
389
388
390−memplyLine :: PandocMonad m => ManParser m ManToken
389+memptyLine :: PandocMonad m => ManParser m ManToken
391−memplyLine = msatisfy isMEmptyLine where
390+memptyLine = msatisfy isMEmptyLine where
392 isMEmptyLine MEmptyLine = True
391 isMEmptyLine MEmptyLine = True
393 isMEmptyLine _ = False
392 isMEmptyLine _ = False
394
393
@@ -408,11 +407,6 @@ mmacroAny = msatisfy isMMacro where
408 isMMacro (MMacro _ _) = True
407 isMMacro (MMacro _ _) = True
409 isMMacro _ = False
408 isMMacro _ = False
410
409
411−munknownMacro :: PandocMonad m => ManParser m ManToken
412−munknownMacro = msatisfy isMUnknownMacro where
413− isMUnknownMacro (MUnknownMacro _ _) = True
414− isMUnknownMacro _ = False
415−
416mcomment :: PandocMonad m => ManParser m ManToken
410mcomment :: PandocMonad m => ManParser m ManToken
417mcomment = msatisfy isMComment where
411mcomment = msatisfy isMComment where
418 isMComment (MComment _) = True
412 isMComment (MComment _) = True
@@ -439,18 +433,7 @@ parseTitle = do
439 pst {stateMeta = metaUp}
433 pst {stateMeta = metaUp}
440
434
441parseSkippedContent :: PandocMonad m => ManParser m Blocks
435parseSkippedContent :: PandocMonad m => ManParser m Blocks
442−parseSkippedContent = do
436+parseSkippedContent = mempty <$ (mcomment <|> memptyLine)
443− tok <- munknownMacro <|> mcomment <|> memplyLine
444− onToken tok
445− return mempty
446−
447− where
448−
449− onToken :: PandocMonad m => ManToken -> ManParser m ()
450− onToken (MUnknownMacro mname _) = do
451− pos <- getPosition
452− report $ SkippedContent ("Unknown macro: " ++ mname) pos
453− onToken _ = return ()
454
437
455strToInlines :: RoffStr -> Inlines
438strToInlines :: RoffStr -> Inlines
456strToInlines (s, fonts) = inner $ S.toList fonts where
439strToInlines (s, fonts) = inner $ S.toList fonts where
@@ -514,7 +497,7 @@ parseInlines = do
514parseCodeBlock :: PandocMonad m => ManParser m Blocks
497parseCodeBlock :: PandocMonad m => ManParser m Blocks
515parseCodeBlock = do
498parseCodeBlock = do
516 mmacro "nf"
499 mmacro "nf"
517− toks <- many (mstr <|> mline <|> mmaybeLink <|> memplyLine <|> munknownMacro <|> mcomment)
500+ toks <- many (mstr <|> mline <|> mmaybeLink <|> memptyLine <|> mcomment)
518 mmacro "fi"
501 mmacro "fi"
519 return $ codeBlock (removeFinalNewline $
502 return $ codeBlock (removeFinalNewline $
520 intercalate "\n" . catMaybes $
503 intercalate "\n" . catMaybes $