[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: previus update didn't include all relevant changes (2e9f0b60)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Aug 17 14:19:32 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : lthooks2
Link : https://github.com/latex3/latex2e/commit/2e9f0b60c609ac5b49a2797f8c3b4d3998225c65
>---------------------------------------------------------------
commit 2e9f0b60c609ac5b49a2797f8c3b4d3998225c65
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Aug 17 14:19:32 2020 +0200
previus update didn't include all relevant changes
>---------------------------------------------------------------
2e9f0b60c609ac5b49a2797f8c3b4d3998225c65
base/format.ins | 2 ++
base/ltdefns.dtx | 9 ---------
base/ltfilehook.dtx | 2 +-
base/ltfinal.dtx | 2 +-
base/ltfssini.dtx | 8 +++++---
base/lthooks.dtx | 21 ++++++++++++---------
base/ltshipout.dtx | 6 +-----
base/testfiles-lthooks2/lthooks2-002.tlg | 6 ------
base/testfiles-lthooks2/lthooks2-005.tlg | 12 ------------
9 files changed, 22 insertions(+), 46 deletions(-)
diff --git a/base/format.ins b/base/format.ins
index 30feb949..a215c5d2 100644
--- a/base/format.ins
+++ b/base/format.ins
@@ -162,6 +162,8 @@ the system are in the document `cfgguide.tex'.
\from{ltplain.dtx}{2ekernel}
\from{ltvers.dtx}{2ekernel}
\from{ltluatex.dtx}{2ekernel}
+% This is done as soon as possible here before \texttt{ltdefns.dtx} so that
+% we have the extensions as soon as possible.
\from{ltexpl.dtx}{2ekernel} % expl3-based extensions
\from{ltdefns.dtx}{2ekernel}
\from{lthooks.dtx}{2ekernel} % L3 layer module
diff --git a/base/ltdefns.dtx b/base/ltdefns.dtx
index ad9a2af7..0185e088 100644
--- a/base/ltdefns.dtx
+++ b/base/ltdefns.dtx
@@ -101,15 +101,6 @@
%<*2ekernel>
% \end{macrocode}
%
-% \subsection{Loading further extensions}
-%
-% \changes{v1.5i}{2020-06-04}{Load \textsf{ltexpl} in \texttt{ltdefns}}
-% Simply load further code: it's deliberately separate.
-% This is done as soon as possible here in \texttt{ltdefns.dtx} so that
-% we have the extensions as soon as possible.
-% \begin{macrocode}
-\input ltexpl.ltx
-% \end{macrocode}
%
% \subsection{Initex initialisations}
%
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index d6dca91f..aa66e705 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -998,7 +998,7 @@
%
% \begin{macro}{\reenable at package@load}
% \cs{reenable at package@load} undefines
-% \cs[no-index]{@pkg-reenable@\meta{package}} to reallow loading a package.
+% \cs[no-index]{@pkg-disable@\meta{package}} to reallow loading a package.
% \begin{macrocode}
\def\reenable at package@load#1{%
\global\let{@pkg-disable@#1.\@pkgextension}\@undefined}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index a0311947..8a5876e1 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -1138,7 +1138,7 @@
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\ShowHook}{The hook management}%
-\input lthooks.ltx
+%\input lthooks.ltx
%\input ltshipout.ltx
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index 95202537..1445fc28 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -696,10 +696,12 @@
\let\@setmdseriesdefaultshook\@empty
% \end{macrocode}
%
+% FMi: proper integration needed: these are now already declared
+% hooks (move from lthooks here).
% \begin{macrocode}
-\let\@rmfamilyhook\@empty
-\let\@sffamilyhook\@empty
-\let\@ttfamilyhook\@empty
+%\let\@rmfamilyhook\@empty
+%\let\@sffamilyhook\@empty
+%\let\@ttfamilyhook\@empty
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index bf7c8149..1c3d7b98 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -1335,6 +1335,18 @@
%
%
% \section{The Implementation}
+
+
+% \subsection{Loading further extensions}
+%
+% \changes{v1.5i}{2020-06-04}{Load \textsf{ltexpl} in \texttt{ltdefns}}
+% Simply load further code: it's deliberately separate.
+% This is done as soon as possible here in \texttt{ltdefns.dtx} so that
+% we have the extensions as soon as possible.
+% \begin{macrocode}
+%\input ltexpl.ltx
+% \end{macrocode}
+%
% \begin{macrocode}
%<@@=hook>
% \end{macrocode}
@@ -3468,15 +3480,6 @@
\seq_gpop:NN \g_@@_name_stack_seq \l_@@_return_tl
\@@_curr_name_push:n {#1}
}
-% \begin{macrocode}
-%
-% The push and pop macros are injected in \cs{@pushfilename} and
-% \cs{@popfilename} so that they correctly keep track of the hook
-% labels.
-% \fmi{Properly integrate in the kernel}
-% \begin{macrocode}
-\tl_gput_left:Nn \@pushfilename { \@@_curr_name_push:n { } }
-\tl_gput_left:Nn \@popfilename { \@@_curr_name_pop: }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 629d9d26..e7dc228d 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1433,7 +1433,6 @@
% \begin{macrocode}
\let\EveryShipout\AtBeginShipout
\let\AtNextShipout\AtBeginShipoutNext
-% \end{macrocode}
% This is one difference between \pkg{everyshi} and the kernel
% implementation, the latter does not directly use box 255.
%
@@ -1462,10 +1461,6 @@
%
% \begin{macrocode}
%<*2ekernel>
-\PackageWarning{everyshi}{Functionality~ provided~ by~ LaTeX.~
- Package~ is~ no~ longer~ necessary~ and~
- you~ can~ safely~ remove~ it}
-%</2ekernel>
% \end{macrocode}
% \begin{macrocode}
@@ -1476,6 +1471,7 @@
%
% Rather important :-)
% \begin{macrocode}
+%</2ekernel>
%<@@=>
% \end{macrocode}
%
diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg
index 016806a9..7a51c5b5 100644
--- a/base/testfiles-lthooks2/lthooks2-002.tlg
+++ b/base/testfiles-lthooks2/lthooks2-002.tlg
@@ -20,11 +20,6 @@ Update code for hook 'sffamily' on input line ...:
Update code for hook 'ttfamily' on input line ...:
Update code for hook 'defaultfamily' on input line ...:
Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 ->
-Handled code for legacy
Update code for hook 'begindocument/before' on input line ...:
Update code for hook 'begindocument/end' on input line ...:
Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -55,7 +50,6 @@ Data structure for label rules:
Handled code for l3backend-dvips
Update code for hook 'shipout/lastpage' on input line ...:
All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl
enddocument/end -> \typeout {in preamble}\g__hook_enddocument/end_next_code_tl
shipout/firstpage -> \bool_lazy_and:nnT {\cs_if_exist_p:N \g__kernel_backend_header_bool }{\g__kernel_backend_header_bool }{\__kernel_backend_literal:n {header=l3backend-dvips.pro}}\g__hook_shipout/firstpage_next_code_tl
diff --git a/base/testfiles-lthooks2/lthooks2-005.tlg b/base/testfiles-lthooks2/lthooks2-005.tlg
index 7bdcf6a0..3a58c671 100644
--- a/base/testfiles-lthooks2/lthooks2-005.tlg
+++ b/base/testfiles-lthooks2/lthooks2-005.tlg
@@ -8,11 +8,6 @@ Update code for hook 'sffamily' on input line ...:
Update code for hook 'ttfamily' on input line ...:
Update code for hook 'defaultfamily' on input line ...:
Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 ->
-Handled code for legacy
Update code for hook 'begindocument/before' on input line ...:
Update code for hook 'begindocument/end' on input line ...:
Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -33,7 +28,6 @@ Update code for hook 'shipout/background' on input line ..:
Update code for hook 'shipout/firstpage' on input line ...:
Update code for hook 'shipout/lastpage' on input line ...:
All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl
**** Add to hook some-hook (other-package) on input line ... <- code from other-package,
Update code for hook 'begindocument' on input line ...:
@@ -43,11 +37,6 @@ Update code for hook 'sffamily' on input line ...:
Update code for hook 'ttfamily' on input line ...:
Update code for hook 'defaultfamily' on input line ...:
Update code for hook 'documentclass' on input line ...:
-Code labels for sorting:
- legacy
-Data structure for label rules:
- legacy = 0 ->
-Handled code for legacy
Update code for hook 'begindocument/before' on input line ...:
Update code for hook 'begindocument/end' on input line ...:
Update code for hook 'enddocument/afterlastpage' on input line ...:
@@ -76,6 +65,5 @@ Data structure for label rules:
Handled code for my-package
Handled code for other-package
All initialized (non-empty) hooks:
- documentclass -> \ifx \@normalsize \@undefined \let \@normalsize \normalsize \fi \g__hook_documentclass_next_code_tl
enddocument/info -> \@dofilelist \@enddocument at kernel@warnings \g__hook_enddocument/info_next_code_tl
some-hook -> code to run when other-package is loaded,code from other-package,\g__hook_some-hook_next_code_tl
More information about the latex3-commits
mailing list.