Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

LaTeX reader: use applyMacros in rawLaTeXBlock, rawLaTeXInline.

Browse source
This commit is contained in:
John MacFarlane 2017-12-22 16:57:52 -08:00
parent 9daf22fa61
commit 3679d8d0bd
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Text/Pandoc/Readers/LaTeX.hs
View file

@ -270,13 +270,16 @@ rawLaTeXBlock :: (PandocMonad m, HasMacros s, HasReaderOptions s)
=> ParserT String s m String
rawLaTeXBlock = do
lookAhead (try (char '\\' >> letter))
snd <$> rawLaTeXParser (environment <|> macroDef <|> blockCommand)
-- we don't want to apply newly defined latex macros to their own
-- definitions:
(snd <$> rawLaTeXParser macroDef) <|>
((snd <$> rawLaTeXParser (environment <|> blockCommand)) >>= applyMacros)
rawLaTeXInline :: (PandocMonad m, HasMacros s, HasReaderOptions s)
=> ParserT String s m String
rawLaTeXInline = do
lookAhead (try (char '\\' >> letter) <|> char '$')
snd <$> rawLaTeXParser (inlineEnvironment <|> inlineCommand')
rawLaTeXParser (inlineEnvironment <|> inlineCommand') >>= applyMacros . snd
inlineCommand :: PandocMonad m => ParserT String ParserState m Inlines
inlineCommand = do