[latex3-commits] [git/LaTeX3-latex3-latex2e] develop+master: cherry picked code from gh/463 (no v change update yet) (fb7f60f9)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Jan 3 13:12:06 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : develop+master
Link : https://github.com/latex3/latex2e/commit/fb7f60f9a25c7100c36629ebcc94868a28690614
>---------------------------------------------------------------
commit fb7f60f9a25c7100c36629ebcc94868a28690614
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Jan 3 13:12:06 2021 +0100
cherry picked code from gh/463 (no v change update yet)
>---------------------------------------------------------------
fb7f60f9a25c7100c36629ebcc94868a28690614
base/ltfilehook.dtx | 8 +++
base/lthooks.dtx | 74 ++++++++++++++++------
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 2 +
.../tlb-latexrelease-rollback-003-often.tlg | 2 +
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 2 +
base/testfiles/tlb-rollback-004-often.luatex.tlg | 1 +
base/testfiles/tlb-rollback-004-often.tlg | 1 +
base/testfiles/tlb-rollback-004-often.xetex.tlg | 1 +
8 files changed, 73 insertions(+), 18 deletions(-)
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index fc466b32..70fd2ecc 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -1492,9 +1492,17 @@
\ExplSyntaxOff
% \end{macrocode}
%
+% This one specifically has to be undefined because it is left over in
+% the input stream from \cs{InputIfFileExists} and executed when
+% \pkg{latexrelease} is loaded.
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\@expl@@@filehook at if@no at extension@@nTF}{2e tmp interfaces}%
+%<latexrelease>\let\@expl@@@filehook at file@pop@@\@empty
+%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
%
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 3465e8e7..03e291c1 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -1873,35 +1873,73 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_tl_set:Nn,\@@_tl_set:cn,\@@_tl_set:cx}
-% \begin{macro}{\@@_tl_gset:Nn,\@@_tl_gset:cn,\@@_tl_gset:co,\@@_tl_gset:cx}
-% \begin{macro}{\@@_tl_gput_right:Nn,\@@_tl_gput_right:No,\@@_tl_gput_right:cn}
-% \begin{macro}{\@@_tl_gput_left:Nn,\@@_tl_gput_left:No}
-% \begin{macro}{\@@_tl_gclear:N,\@@_tl_gclear:c}
-% \begin{macro}{\@@_tl_gset_eq:NN}
+% \begin{macro}{\@@_tl_set:Nn,\@@_tl_set:Nx,
+% \@@_tl_set:cn,\@@_tl_set:cx}
% Private copies of a few \pkg{expl3} functions. \pkg{l3debug} will
% only add debugging to the public names, not to these copies, so we
% don't have to use \cs{debug_suspend:} and \cs{debug_resume:}
% everywhere.
% \begin{macrocode}
-\cs_new_eq:NN \@@_tl_set:Nn \tl_set:Nn
-\cs_generate_variant:Nn \@@_tl_set:Nn { cn, cx }
-\cs_new_eq:NN \@@_tl_gset:Nn \tl_gset:Nn
-\cs_generate_variant:Nn \@@_tl_gset:Nn { cn, co, cx }
-\cs_new_eq:NN \@@_tl_gput_right:Nn \tl_gput_right:Nn
-\cs_generate_variant:Nn \@@_tl_gput_right:Nn { No, cn }
-\cs_new_eq:NN \@@_tl_gput_left:Nn \tl_gput_left:Nn
-\cs_generate_variant:Nn \@@_tl_gput_left:Nn { No }
-\cs_new_protected:Npn \@@_tl_gclear:N #1
- { \@@_tl_gset_eq:NN #1 \c_empty_tl }
-\cs_generate_variant:Nn \@@_tl_gclear:N { c }
-\cs_new_eq:NN \@@_tl_gset_eq:NN \tl_gset_eq:NN
+\cs_new_protected:Npn \@@_tl_set:Nn #1#2
+ { \cs_set_nopar:Npx #1 { \__kernel_exp_not:w {#2} } }
+\cs_new_protected:Npn \@@_tl_set:Nx #1#2
+ { \cs_set_nopar:Npx #1 {#2} }
+\cs_generate_variant:Nn \@@_tl_set:Nn { c }
+\cs_generate_variant:Nn \@@_tl_set:Nx { c }
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\@@_tl_gset:Nn,\@@_tl_gset:No,\@@_tl_gset:Nx,
+% \@@_tl_gset:cn,\@@_tl_gset:co,\@@_tl_gset:cx}
+% Same as above.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_tl_gset:Nn #1#2
+ { \cs_gset_nopar:Npx #1 { \__kernel_exp_not:w {#2} } }
+\cs_new_protected:Npn \@@_tl_gset:No #1#2
+ { \cs_gset_nopar:Npx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } }
+\cs_new_protected:Npn \@@_tl_gset:Nx #1#2
+ { \cs_gset_nopar:Npx #1 {#2} }
+\cs_generate_variant:Nn \@@_tl_gset:Nn { c }
+\cs_generate_variant:Nn \@@_tl_gset:No { c }
+\cs_generate_variant:Nn \@@_tl_gset:Nx { c }
+% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\@@_tl_gput_right:Nn,\@@_tl_gput_right:No,\@@_tl_gput_right:cn}
+% Same as above.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_tl_gput_right:Nn #1#2
+ { \@@_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN { #1 #2 } } }
+\cs_generate_variant:Nn \@@_tl_gput_right:Nn { No, cn }
+% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\@@_tl_gput_left:Nn,\@@_tl_gput_left:No}
+% Same as above.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_tl_gput_left:Nn #1#2
+ {
+ \@@_tl_gset:Nx #1
+ { \__kernel_exp_not:w {#2} \__kernel_exp_not:w \exp_after:wN {#1} }
+ }
+\cs_generate_variant:Nn \@@_tl_gput_left:Nn { No }
+% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\@@_tl_gset_eq:NN}
+% Same as above.
+% \begin{macrocode}
+\cs_new_eq:NN \@@_tl_gset_eq:NN \tl_gset_eq:NN
+% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\@@_tl_gclear:N,\@@_tl_gclear:c}
+% Same as above.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_tl_gclear:N #1
+ { \@@_tl_gset_eq:NN #1 \c_empty_tl }
+\cs_generate_variant:Nn \@@_tl_gclear:N { c }
+% \end{macrocode}
% \end{macro}
%
%
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index ab526c70..2590c127 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -395,6 +395,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
@@ -889,6 +890,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 0f650a28..41653a86 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -389,6 +389,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
@@ -873,6 +874,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi 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 f543b01e..22ff16a8 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -389,6 +389,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
@@ -882,6 +883,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 86b424be..c2e39ff9 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -767,6 +767,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index ba5937b4..625105f8 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -755,6 +755,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 999fd815..ed811da4 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -756,6 +756,7 @@ Skipping: [....-..-..] Tortoise and Hare on input line ...
Skipping: [....-..-..] Disable packages on input line ....
Applying: [....-..-..] Disable packages on input line ....
Skipping: [....-..-..] 2e tmp interfaces on input line ....
+Applying: [....-..-..] 2e tmp interfaces on input line ....
Skipping: [....-..-..] Hook management (shipout) on input line ....
Applying: [....-..-..] Hook management (shipout) on input line ....
LaTeX Info: Redefining \AtBeginDvi on input line ....
More information about the latex3-commits
mailing list.