[latex3-commits] [git/LaTeX3-latex3-latex2e] gh479: Avoid expl3 syntax when rolling from/to before 2020-02-02 (de84c71c)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh479
Link       : https://github.com/latex3/latex2e/commit/de84c71c70588eaccc967e82ce9ca7a618126a2c

>---------------------------------------------------------------

commit de84c71c70588eaccc967e82ce9ca7a618126a2c
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Mon Mar 22 00:11:04 2021 -0300

    Avoid expl3 syntax when rolling from/to before 2020-02-02


>---------------------------------------------------------------

de84c71c70588eaccc967e82ce9ca7a618126a2c
 base/latexrelease.dtx | 8 ++++++--
 base/ltcmd.dtx        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/base/latexrelease.dtx b/base/latexrelease.dtx
index 6a33d6dc..5209e848 100644
--- a/base/latexrelease.dtx
+++ b/base/latexrelease.dtx
@@ -696,7 +696,11 @@ of this package available from CTAN}
 %
 %    \begin{macrocode}
 %<*latexrelease-finish>
-\ExplSyntaxOn
+\@ifundefined{ExplSyntaxOn}%
+  {\@gobble}%
+  {\ExplSyntaxOn
+   \@firstofone}%
+  {%
 %    \end{macrocode}
 %
 % Now just loop through the list of redefined commands and restore their
@@ -717,7 +721,7 @@ of this package available from CTAN}
 %
 %    \begin{macrocode}
 %<@@=>
-\ExplSyntaxOff
+  \ExplSyntaxOff}%
 %</latexrelease-finish>
 %    \end{macrocode}
 %
diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
index f2239c16..36071a99 100644
--- a/base/ltcmd.dtx
+++ b/base/ltcmd.dtx
@@ -4012,9 +4012,9 @@
 %<latexrelease>                 {ltcmd}{Document~commands}%
 %<latexrelease>
 %<latexrelease>\EndModuleRelease
-%<latexrelease>\cs_if_exist_use:N \latexrelease at postexpl
 %<latexrelease>\@ifundefined{ExplSyntaxOff}{}
 \ExplSyntaxOff
+%<latexrelease>\@ifundefined{ExplSyntaxOff}{}{\latexrelease at postexpl}
 %<latexrelease>\catcode`\^^@=\@latexrelease at catcode@null\relax
 %</2ekernel|latexrelease>
 %    \end{macrocode}