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

LaTeX reader: Another small improvement to macro handling.

Browse source
This commit is contained in:
John MacFarlane 2021-02-20 22:14:31 -08:00
parent 31b8f60ea8
commit cec541e54c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,16 +461,15 @@ doMacros' n inp = do
case inp of
Tok spos (CtrlSeq "begin") _ : Tok _ Symbol "{" :
Tok _ Word name : Tok _ Symbol "}" : ts
-> handleMacros macros n spos name ts
-> handleMacros macros n spos name ts <|> return inp
Tok spos (CtrlSeq "end") _ : Tok _ Symbol "{" :
Tok _ Word name : Tok _ Symbol "}" : ts
-> handleMacros macros n spos ("end" <> name) ts
-> handleMacros macros n spos ("end" <> name) ts <|> return inp
Tok _ (CtrlSeq "expandafter") _ : t : ts
-> combineTok t <$> doMacros' n ts
Tok spos (CtrlSeq name) _ : ts
-> handleMacros macros n spos name ts
-> handleMacros macros n spos name ts <|> return inp
_ -> return inp
<|> return inp
where
combineTok (Tok spos (CtrlSeq name) x) (Tok _ Word w : ts)