[latex3-commits] [git/LaTeX3-latex3-latex2e] gh440: everyshi emulation taken out #440 (ab8187d3)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh440
Link       : https://github.com/latex3/latex2e/commit/ab8187d340d5db4783d3fe6d4e6c7323e53ea8fe

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

commit ab8187d340d5db4783d3fe6d4e6c7323e53ea8fe
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Jan 8 16:53:14 2021 +0100

    everyshi emulation taken out #440


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

ab8187d340d5db4783d3fe6d4e6c7323e53ea8fe
 base/changes.txt                                |  5 ++
 base/format.ins                                 |  1 -
 base/ltshipout.dtx                              | 61 ++-----------------------
 base/testfiles-lthooks2/shipout2-emulations.tlg |  5 +-
 support/texlive.sh                              |  1 +
 5 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index a061624d..3062b63e 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2021-01-08  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltshipout.dtx (subsection{Package \pkg{everyshi} emulation}):
+	The emulation is no longer needed so taken out (gh440)
+
 2020-12-22  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltfssaxes.dtx (subsection{Changing to a new series}):
diff --git a/base/format.ins b/base/format.ins
index f872c31a..a475acfc 100644
--- a/base/format.ins
+++ b/base/format.ins
@@ -233,7 +233,6 @@ the system are in the document `cfgguide.tex'.
 
 % hook management support
 
-\generate{\file{everyshi-ltx.sty}{\from{ltshipout.dtx}{everyshi-ltx}}} % emulating everyshi
 \generate{\file{atbegshi-ltx.sty}{\from{ltshipout.dtx}{atbegshi-ltx}}} % emulating atbegshi
 \generate{\file{atveryend-ltx.sty}{\from{ltfilehook.dtx}{atveryend-ltx}}} % emulating atveryend
 
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index cd561949..0ea285a9 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %%
-%% File: ltshipout.dtx (C) Copyright 2020 Frank Mittelbach, LaTeX Team
+%% File: ltshipout.dtx (C) Copyright 2020-2021 Frank Mittelbach, LaTeX Team
 %%
 %
 % This file is part of the LaTeX base system.
@@ -31,8 +31,8 @@
 %%% From File: ltshipout.dtx
 %
 %    \begin{macrocode}
-\providecommand\ltshipoutversion{v1.0d}
-\providecommand\ltshipoutdate{2020/12/06}
+\providecommand\ltshipoutversion{v1.0e}
+\providecommand\ltshipoutdate{2021/01/08}
 %    \end{macrocode}
 %
 %<*driver>
@@ -1561,9 +1561,6 @@
 %    commands) and properly removing it would mean we need to make the
 %    \cs{unclare at ...} and its support macros available in all earlier
 %    kernel releases which is pointless (and actually worse).
-%    \begin{macrocode}
-%\undeclare at file@substitution{everyshi.sty}
-%    \end{macrocode}
 %    
 %    \begin{macrocode}
 %<latexrelease>
@@ -1747,56 +1744,8 @@
 %
 % \subsection{Package \pkg{everyshi} emulation}
 %
-%    \begin{macrocode}
-%<*everyshi-ltx>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\ProvidesPackage{everyshi-ltx}
-   [2020/10/15 v1.0b
-    Emulation of the original everyshi^^Jpackage with kernel methods]
-%    \end{macrocode}
-%    
-%  \begin{macro}{\EveryShipout,\AtNextShipout}
-%    This package has only two public commands so simulating it is easy:
-%    \begin{macrocode}
-\protected \def \EveryShipout  {\AddToHook{shipout/before}}
-\protected \def \AtNextShipout {\AddToHookNext{shipout/before}}
-%    \end{macrocode}
-%  \end{macro}
-%
-%    \begin{macrocode}
-%    This is one difference between \pkg{everyshi} and the kernel
-%    implementation, the latter does not directly use box 255.
-%
-%    For usage by ordinary users this makes no difference but of a
-%    package use complicated code together with \pkg{everyshi} and
-%    directly manipulates box 255 then this package needs updating.
-%    In most cases the updates are simple because the kernel offers
-%    hooks that makes such complicated code unnecessary.
-%
-%    We therefore add a little file into the adjusted package
-%    \begin{macrocode}
-%%
-%%   In normal circumstances the above emulation is sufficient and in
-%%   all known packages (we know of) that use everyshi it either works or
-%%   the packages have been adjusted. 
-%%
-%%   Code that directly manipulates box 255, however, might fail. 
-%%   If that is the case look at the shipout hooks offered now as
-%%   they are normally sufficient to avoid such manipulations (or
-%%   replace box 255 with \ShipoutBox in the code.
-%%
-%</everyshi-ltx>
-%    \end{macrocode}
-%
-%
-%    If the package is requested we substitute the one above:
-%    \begin{macrocode}
-%<*2ekernel>
-\declare at file@substitution{everyshi.sty}{everyshi-ltx.sty}
-%</2ekernel>
-%    \end{macrocode}
+%    This is now directly handled in that package so emulation is not
+%    necessary any more.
 %
 %
 %    Rather important :-)
diff --git a/base/testfiles-lthooks2/shipout2-emulations.tlg b/base/testfiles-lthooks2/shipout2-emulations.tlg
index ba3e47c4..89771cea 100644
--- a/base/testfiles-lthooks2/shipout2-emulations.tlg
+++ b/base/testfiles-lthooks2/shipout2-emulations.tlg
@@ -1,8 +1,7 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-(everyshi-ltx.sty
-Package: everyshi-ltx ....-..-.. v... Emulation of the original everyshi
-package with kernel methods
+(../everyshi.sty
+Package: everyshi ....-..-.. v... EveryShipout Package
 )
 Package atenddvi Warning: Functionality of this package is already
 (atenddvi)                provided by LaTeX.
diff --git a/support/texlive.sh b/support/texlive.sh
index a6cef68d..3ff5be13 100644
--- a/support/texlive.sh
+++ b/support/texlive.sh
@@ -61,6 +61,7 @@ tlmgr install   \
 tlmgr install   \
   bidi          \
   dinbrief      \
+  everyshi      \
   pgfmorepages  \
   pgf           \
   filehook