[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: Try again with Ulrike's help (3b9260f6)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : lthooks2
Link       : https://github.com/latex3/latex2e/commit/3b9260f6327a337f4a54483311023b56f7cdf148

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

commit 3b9260f6327a337f4a54483311023b56f7cdf148
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Aug 16 21:03:07 2020 +0200

    Try again with Ulrike's help


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

3b9260f6327a337f4a54483311023b56f7cdf148
 base/lthooks.dtx   |  6 +++---
 base/ltshipout.dtx | 31 +++++++++++++------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index d79229ed..233c7c1b 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -3471,12 +3471,12 @@
 %    \begin{macrocode}
 %
 %   The push and pop macros are injected in \cs{@pushfilename} and
-%   \cs{@popfilename} so that they correctly keep track of the label.s
+%   \cs{@popfilename} so that they correctly keep track of the hook
+%   labels.
+% \fmi{Properly integrate in the kernel}
 %    \begin{macrocode}
-% TODO! \pho{Properly integrate in the kernel}
 \tl_gput_left:Nn \@pushfilename { \@@_curr_name_push:n { } }
 \tl_gput_left:Nn \@popfilename { \@@_curr_name_pop: }
-% TODO! \pho{Properly integrate in the kernel}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index bb1eef43..533b20ff 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1408,37 +1408,32 @@
 \expandafter\cs_set_eq:NN\csname ver at everyshi.sty\endcsname\fmtversion
 \@namedef {ver at everyshi.sty}{2020/10/01}
 %    \end{macrocode}
-
-%    \begin{macrocode}
-\ExplSyntaxOff
-%</2ekernel>
-%    \end{macrocode}
-
-
+%
+%
 % \subsection{Package \pkg{atenddvi} emulation}
 %
 %
 %  \begin{macro}{\AtEndDvi}
-%    This package has only one public command to simulating it is easy:
-%    \begin{macrocode}
-%<*atenddvi>
-\ProvidesExplPackage{atenddvi}{2020/10/01}{v.10}
-                    {atenddvi for 2020-10-01 LaTeX or later}
-%    \end{macrocode}
-%    
+%    This package has only one public command to simulating it is easy
+%    and actually sensible to provide as part of the kernel.
 %    \begin{macrocode}
 \cs_new:Npn \AtEndDvi {\AddToHook{shipout/lastpage}}
-%</atenddvi>
 %    \end{macrocode}
 %  \end{macro}
 %
 %
 %    \begin{macrocode}
-%\declare at file@substitution{atenddvi}{atenddvi-integrated}
+%\disable at packageload{atenddvi}
+   {\PackageWarning{atenddvi}{Functionality provided by LaTeX.
+       Package is no longer necessary}}
 %    \end{macrocode}
 %
-
-
+%    \begin{macrocode}
+\ExplSyntaxOff
+%</2ekernel>
+%    \end{macrocode}
+%
+%
 %    Rather important :-)
 %    \begin{macrocode}
 %<@@=>