@@ -155,7 +155,6 @@ data LaTeXState = LaTeXState{ sOptions :: ReaderOptions
155155 , sLabels :: M.Map Text [Inline]
156156 , sHasChapters :: Bool
157157 , sToggles :: M.Map Text Bool
158− , sExpanded :: Bool
159158 , sFileContents :: M.Map Text Text
160159 , sEnableWithRaw :: Bool
161160 , sRawTokens :: IntMap.IntMap [Tok]
@@ -183,7 +182,6 @@ defaultLaTeXState = LaTeXState{ sOptions = def
183182 , sLabels = M.empty
184183 , sHasChapters = False
185184 , sToggles = M.empty
186− , sExpanded = False
187185 , sFileContents = M.empty
188186 , sEnableWithRaw = True
189187 , sRawTokens = IntMap.empty
@@ -256,7 +254,6 @@ rawLaTeXParser toks retokenize parser valParser = do
256254 Right toks' -> do
257255 res <- lift $ runParserT (do when retokenize $ do
258256 -- retokenize, applying macros
259− doMacros
260257 ts <- many (satisfyTok (const True))
261258 setInput ts
262259 rawparser)
@@ -432,8 +429,7 @@ satisfyTok :: PandocMonad m => (Tok -> Bool) -> LP m Tok
432429satisfyTok f = do
433430 doMacros -- apply macros on remaining input stream
434431 res <- tokenPrim (T.unpack . untoken) updatePos matcher
435− updateState $ \st -> st{ sExpanded = False
436− , sRawTokens =
432+ updateState $ \st -> st{ sRawTokens =
437433 if sEnableWithRaw st
438434 then IntMap.map (res:) $ sRawTokens st
439435 else sRawTokens st }
@@ -447,9 +443,8 @@ satisfyTok f = do
447443doMacros :: PandocMonad m => LP m ()
448444doMacros = do
449445 st <- getState
450− unless (sExpanded st || sVerbatimMode st || M.null (sMacros st)) $ do
446+ unless (sVerbatimMode st || M.null (sMacros st)) $ do
451447 getInput >>= doMacros' 1 >>= setInput
452− updateState $ \s -> s{ sExpanded = True }
453448
454449doMacros' :: PandocMonad m => Int -> [Tok] -> LP m [Tok]
455450doMacros' n inp =