aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Text/Pandoc/Readers/Man.hs2
-rw-r--r--src/Text/Pandoc/Readers/Roff.hs7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Readers/Man.hs b/src/Text/Pandoc/Readers/Man.hs
index bec26bd02..8c2fc6b77 100644
--- a/src/Text/Pandoc/Readers/Man.hs
+++ b/src/Text/Pandoc/Readers/Man.hs
@@ -217,7 +217,7 @@ memptyLine = msatisfy isMEmptyLine where
isMEmptyLine MEmptyLine = True
isMEmptyLine _ = False
-mmacro :: PandocMonad m => MacroKind -> ManParser m RoffToken
+mmacro :: PandocMonad m => String -> ManParser m RoffToken
mmacro mk = msatisfy isMMacro where
isMMacro (MMacro mk' _ _) | mk == mk' = True
| otherwise = False
diff --git a/src/Text/Pandoc/Readers/Roff.hs b/src/Text/Pandoc/Readers/Roff.hs
index 9e3315cb3..b1011c2d3 100644
--- a/src/Text/Pandoc/Readers/Roff.hs
+++ b/src/Text/Pandoc/Readers/Roff.hs
@@ -32,8 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Tokenizer for groff formats (man, ms).
-}
module Text.Pandoc.Readers.Roff
- ( MacroKind
- , FontSpec(..)
+ ( FontSpec(..)
, defaultFontSpec
, LinePart(..)
, Arg
@@ -83,8 +82,6 @@ data FontSpec = FontSpec{ fontBold :: Bool
defaultFontSpec :: FontSpec
defaultFontSpec = FontSpec False False False
-type MacroKind = String
-
data LinePart = RoffStr String
| Font FontSpec
| MacroArg Int
@@ -106,7 +103,7 @@ type TableRow = ([CellFormat], [RoffTokens])
data RoffToken = MLine [LinePart]
| MEmptyLine
- | MMacro MacroKind [Arg] SourcePos
+ | MMacro String [Arg] SourcePos
| MTable [TableOption] [TableRow] SourcePos
deriving Show