git.iko.soy/typeable/pandoc
on master help sign in
Roff reader: removed MacroKind alias.
e9130b8John MacFarlane
src/Text/Pandoc/Readers/Man.hs+1−1
compare with master
unifiedsplit
@@ -217,7 +217,7 @@ memptyLine = msatisfy isMEmptyLine where
217 isMEmptyLine MEmptyLine = True
217 isMEmptyLine MEmptyLine = True
218 isMEmptyLine _ = False
218 isMEmptyLine _ = False
219
219
220−mmacro :: PandocMonad m => MacroKind -> ManParser m RoffToken
220+mmacro :: PandocMonad m => String -> ManParser m RoffToken
221mmacro mk = msatisfy isMMacro where
221mmacro mk = msatisfy isMMacro where
222 isMMacro (MMacro mk' _ _) | mk == mk' = True
222 isMMacro (MMacro mk' _ _) | mk == mk' = True
223 | otherwise = False
223 | otherwise = False
src/Text/Pandoc/Readers/Roff.hs+2−5
@@ -32,8 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
32Tokenizer for groff formats (man, ms).
32Tokenizer for groff formats (man, ms).
33-}
33-}
34module Text.Pandoc.Readers.Roff
34module Text.Pandoc.Readers.Roff
35− ( MacroKind
36− , FontSpec(..)
35+ ( FontSpec(..)
37 , defaultFontSpec
36 , defaultFontSpec
38 , LinePart(..)
37 , LinePart(..)
39 , Arg
38 , Arg
@@ -83,8 +82,6 @@ data FontSpec = FontSpec{ fontBold :: Bool
83defaultFontSpec :: FontSpec
82defaultFontSpec :: FontSpec
84defaultFontSpec = FontSpec False False False
83defaultFontSpec = FontSpec False False False
85
84
86−type MacroKind = String
87−
88data LinePart = RoffStr String
85data LinePart = RoffStr String
89 | Font FontSpec
86 | Font FontSpec
90 | MacroArg Int
87 | MacroArg Int
@@ -106,7 +103,7 @@ type TableRow = ([CellFormat], [RoffTokens])
106
103
107data RoffToken = MLine [LinePart]
104data RoffToken = MLine [LinePart]
108 | MEmptyLine
105 | MEmptyLine
109− | MMacro MacroKind [Arg] SourcePos
106+ | MMacro String [Arg] SourcePos
110 | MTable [TableOption] [TableRow] SourcePos
107 | MTable [TableOption] [TableRow] SourcePos
111 deriving Show
108 deriving Show
112
109