@@ -108,8 +108,8 @@ testParser p t = do
108108 Left e -> error (show e)
109109 Right r -> return r
110110
111−data Macro = Macro -- TODO
112− deriving Show
111+data Macro = CommandMacro Text ([Tok] -> [Tok])
112+ | EnvironmentMacro Text ([Tok] -> [Tok])
113113
114114data LaTeXState = LaTeXState{ sOptions :: ReaderOptions
115115 , sMeta :: Meta
@@ -119,7 +119,6 @@ data LaTeXState = LaTeXState{ sOptions :: ReaderOptions
119119 , sHeaders :: M.Map Inlines String
120120 , sLogMessages :: [LogMessage]
121121 , sIdentifiers :: Set.Set String }
122− deriving Show
123122
124123defaultLaTeXState :: LaTeXState
125124defaultLaTeXState = LaTeXState{ sOptions = def