LaTeX reader: pass through macro defs in rawLaTeXBlock...

even if the `latex_macros` extension is set.
This reverts to earlier behavior and is probably safer
on the whole, since some macros only modify things in
included packages, which pandoc's macro expansion can't
modify.

Closes #4246.

src/Text/Pandoc/Readers/LaTeX.hs

@@ -272,10 +272,8 @@ rawLaTeXBlock = do
   lookAhead (try (char '\\' >> letter))
   -- we don't want to apply newly defined latex macros to their own
   -- definitions:
-  (do (_, raw) <- rawLaTeXParser macroDef
+  (snd <$> rawLaTeXParser macroDef)
-      (guardDisabled Ext_latex_macros >> return raw) <|> return "")
+  <|> ((snd <$> rawLaTeXParser (environment <|> blockCommand)) >>= applyMacros)
-  <|> (do (_, raw) <- rawLaTeXParser (environment <|> blockCommand)
-          applyMacros raw)
 
 rawLaTeXInline :: (PandocMonad m, HasMacros s, HasReaderOptions s)
                => ParserT String s m String

test/command/4159.md

@@ -3,5 +3,6 @@
 \newcommand{\gen}{a\ Gen\ b}
 abc
 ^D
-[Para [Str "abc"]]
+[RawBlock (Format "latex") "\\newcommand{\\gen}{a\\ Gen\\ b}"
+,Para [Str "abc"]]
 ```

test/command/macros.md

@@ -3,6 +3,7 @@
 \newcommand{\my}{\phi}
 $\my+\my$
 ^D
+\newcommand{\my}{\phi}
 $\phi+\phi$
 ```
 
@@ -73,6 +74,7 @@ x &= y\\\end{aligned}\]
 \my+\my
 \end{equation}
 ^D
+\newcommand{\my}{\phi}
 \begin{equation}
 \phi+\phi
 \end{equation}
@@ -96,5 +98,6 @@ x &= y\\\end{aligned}\]
 \newcommand{\my}{\emph{a}}
 \my
 ^D
+\newcommand{\my}{\emph{a}}
 \emph{a}
 ```

test/markdown-reader-more.native

@@ -54,6 +54,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",S
 ,OrderedList (3,Example,TwoParens)
  [[Plain [Str "Third",Space,Str "example."]]]
 ,Header 2 ("macros",[],[]) [Str "Macros"]
+,RawBlock (Format "latex") "\\newcommand{\\tuple}[1]{\\langle #1 \\rangle}"
 ,Para [Math InlineMath "\\langle x,y \\rangle"]
 ,Header 2 ("case-insensitive-references",[],[]) [Str "Case-insensitive",Space,Str "references"]
 ,Para [Link ("",[],[]) [Str "Fum"] ("/fum","")]