[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh434: remaining fixes for #434 it should not roll forward even from fairly old kernels (d1ac8f18)

Frank Mittelbach frank.mittelbach at latex-project.org
Wed Nov 25 10:33:42 CET 2020 

Repository : https://github.com/latex3/latex2e
On branch  : hotfix/gh434
Link       : https://github.com/latex3/latex2e/commit/d1ac8f1848a63415de3c2c1048ab3456b9dbe7ff

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

commit d1ac8f1848a63415de3c2c1048ab3456b9dbe7ff
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Nov 25 10:33:42 2020 +0100

    remaining fixes for #434 it should not roll forward even from fairly old kernels


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

d1ac8f1848a63415de3c2c1048ab3456b9dbe7ff
 base/ltexpl.dtx                                    | 31 ++++++++++++----------
 base/ltshipout.dtx                                 |  3 +++
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |  8 +++---
 .../tlb-latexrelease-rollback-003-often.tlg        |  8 +++---
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |  8 +++---
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |  4 +--
 base/testfiles/tlb-rollback-004-often.tlg          |  4 +--
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |  4 +--
 8 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 0cf78935..0185a73e 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -275,9 +275,6 @@
 %    if that \pkg{expl3} command is needed in places that are others
 %    coded in \LaTeXe{} conventions.
 %
-%    \begin{macrocode}
-\ExplSyntaxOn
-%    \end{macrocode}
 %
 %    In this file, each release of LaTeX adds an \cs{IncludeInRelease}
 %    block, in which the macros copied for that release were defined.
@@ -292,10 +289,14 @@
 %    redefinitions.
 %
 %    \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}{expl3~2020-10-01}%
+%<latexrelease>\IncludeInRelease{2020/10/01}{\@expl at cs@to at str@@N}%
 %<latexrelease>        {expl3~macros~added~for~the~2020-10-01~release}%
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+\ExplSyntaxOn
+%    \end{macrocode}
+%
 % \changes{v1.2e}{2020/08/19}
 %         {Add \cs{@expl at cs@to at str@@N} and \cs{@expl at str@if at eq@@nnTF}
 %          for \cs{NewCommandCopy} (gh/239)}
@@ -323,21 +324,23 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
+\ExplSyntaxOff
+%    \end{macrocode}
+%
+%
+%    \begin{macrocode}
 %<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}{expl3~2020-10-01}%
+%<latexrelease>\IncludeInRelease{0000/00/00}{\@expl at cs@to at str@@N}%
 %<latexrelease>        {expl3~macros~added~for~the~2020-10-01~release}%
-%<latexrelease>\cs_undefine:N \@expl at cs@to at str@@N
-%<latexrelease>\cs_undefine:N \@expl at str@if at eq@@nnTF
-%<latexrelease>\cs_undefine:N \@expl at cs@prefix at spec@@N
-%<latexrelease>\cs_undefine:N \@expl at cs@argument at spec@@N
-%<latexrelease>\cs_undefine:N \@expl at cs@replacement at spec@@N
-%<latexrelease>\cs_undefine:N \@expl at str@map at function@@NN
+%<latexrelease>\let \@expl at cs@to at str@@N \@undefined
+%<latexrelease>\let \@expl at str@if at eq@@nnTF \@undefined
+%<latexrelease>\let \@expl at cs@prefix at spec@@N \@undefined
+%<latexrelease>\let \@expl at cs@argument at spec@@N \@undefined
+%<latexrelease>\let \@expl at cs@replacement at spec@@N \@undefined
+%<latexrelease>\let \@expl at str@map at function@@NN \@undefined
 %<latexrelease>\EndIncludeInRelease
 %</2ekernel|latexrelease>
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-\ExplSyntaxOff
-%    \end{macrocode}
 %
 % \Finale
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 16dec839..1c5df781 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1448,7 +1448,10 @@
 %    \begin{macrocode}
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\shipout}{The hook management (shipout)}%
+%<latexrelease>
+%<latexrelease>\ifcsname tex_shipout:D\endcsname
 %<latexrelease>\expandafter\let\expandafter\shipout\csname tex_shipout:D\endcsname
+%<latexrelease>\fi
 %<latexrelease>
 %<latexrelease>\let \ShipoutBox\@undefined
 %<latexrelease>\let \ReadonlyShipoutCounter \@undefined
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index a4c513ef..09ccbac2 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -39,8 +39,8 @@ Skipping: [....-..-..] Roll forward support on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
@@ -469,8 +469,8 @@ Skipping: [....-..-..] Roll forward support on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index d2a9850d..c5d40622 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -33,8 +33,8 @@ Skipping: [....-..-..] Roll forward support on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
@@ -453,8 +453,8 @@ Skipping: [....-..-..] Roll forward support on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 38b1c16a..d894cfb4 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -33,8 +33,8 @@ Skipping: [....-..-..] Roll forward support on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
@@ -462,8 +462,8 @@ Skipping: [....-..-..] Roll forward support on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Pre-load expl3 on input line ....
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index b7e05337..6906a73b 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -42,8 +42,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
 Applying: [....-..-..] Pre-load expl3 on input line ....
 (../expl3.ltx)
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 9ad986aa..344bf70f 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -31,8 +31,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
 Applying: [....-..-..] Pre-load expl3 on input line ....
 (../expl3.ltx)
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 47445397..2722015b 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -31,8 +31,8 @@ Skipping: [....-..-..] Pre-load expl3 on input line ....
 Applying: [....-..-..] Pre-load expl3 on input line ....
 (../expl3.ltx)
 Skipping: [....-..-..] Emergency loading xparse on input line ....
-Skipping: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
-Applying: [....-..-..] expl3 macros added for the ....-..-.. release on input line ....
+Skipping: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
+Applying: [....-..-..] expl3~macros~added~for~the~....-..-..~release on input line ....
 Skipping: [....-..-..] Allow "par" in \typeout  on input line ....
 Applying: [....-..-..] Allow "par" in \typeout  on input line ....
 Skipping: [....-..-..] \MakeRobust  on input line ....

More information about the latex3-commits mailing list.