git.iko.soy/typeable/pandoc
on master help sign in
Roff reader: removed MacroKind alias.
commite9130b8e52d01ebbc157f26ecdc4f3d81b0f2e9b authorJohn MacFarlane <jgm@berkeley.edu> dateTue 30 Oct 2018, 15:59 (8 years ago) parent3305a01
2 files changed+3−6
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Man.hs+1−1 src/Text/Pandoc/Readers/Roff.hs+2−5
src/Text/Pandoc/Readers/Man.hs+1−1
@@ -217,7 +217,7 @@ memptyLine = msatisfy isMEmptyLine where
217217 isMEmptyLine MEmptyLine = True
218218 isMEmptyLine _ = False
219219
220−mmacro :: PandocMonad m => MacroKind -> ManParser m RoffToken
220+mmacro :: PandocMonad m => String -> ManParser m RoffToken
221221mmacro mk = msatisfy isMMacro where
222222 isMMacro (MMacro mk' _ _) | mk == mk' = True
223223 | 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
3232Tokenizer for groff formats (man, ms).
3333-}
3434module Text.Pandoc.Readers.Roff
35− ( MacroKind
36− , FontSpec(..)
35+ ( FontSpec(..)
3736 , defaultFontSpec
3837 , LinePart(..)
3938 , Arg
@@ -83,8 +82,6 @@ data FontSpec = FontSpec{ fontBold :: Bool
8382defaultFontSpec :: FontSpec
8483defaultFontSpec = FontSpec False False False
8584
86−type MacroKind = String
87−
8885data LinePart = RoffStr String
8986 | Font FontSpec
9087 | MacroArg Int
@@ -106,7 +103,7 @@ type TableRow = ([CellFormat], [RoffTokens])
106103
107104data RoffToken = MLine [LinePart]
108105 | MEmptyLine
109− | MMacro MacroKind [Arg] SourcePos
106+ | MMacro String [Arg] SourcePos
110107 | MTable [TableOption] [TableRow] SourcePos
111108 deriving Show
112109