[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: start integrating ltshipout (ac19f3cb)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sun Aug 16 01:05:42 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : lthooks2
Link : https://github.com/latex3/latex2e/commit/ac19f3cbc3d9adfcc7e00f632d140ab919fa5bdf
>---------------------------------------------------------------
commit ac19f3cbc3d9adfcc7e00f632d140ab919fa5bdf
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sun Aug 16 01:05:42 2020 +0200
start integrating ltshipout
>---------------------------------------------------------------
ac19f3cbc3d9adfcc7e00f632d140ab919fa5bdf
base/format.ins | 2 ++
base/latexrelease.ins | 2 ++
base/ltclass.dtx | 21 +--------------------
base/ltdefns.dtx | 24 +++++++++++++++++++++++-
base/ltfinal.dtx | 20 +++++++++++++++++++-
base/lthooks.ins | 3 ++-
base/ltoutput.dtx | 8 ++++----
base/ltshipout.dtx | 23 ++++++-----------------
8 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/base/format.ins b/base/format.ins
index 5d96b5e1..f40eb276 100644
--- a/base/format.ins
+++ b/base/format.ins
@@ -162,6 +162,7 @@ the system are in the document `cfgguide.tex'.
\from{ltplain.dtx}{2ekernel}
\from{ltvers.dtx}{2ekernel}
\from{ltluatex.dtx}{2ekernel}
+% \from{lthooks.dtx}{2ekernel} % L3 layer module
\from{ltdefns.dtx}{2ekernel}
\from{ltalloc.dtx}{2ekernel}
\from{ltcntrl.dtx}{2ekernel}
@@ -195,6 +196,7 @@ the system are in the document `cfgguide.tex'.
\from{ltidxglo.dtx}{2ekernel}
\from{ltbibl.dtx}{2ekernel}
\from{ltpage.dtx}{2ekernel}
+ \from{ltshipout.dtx}{2ekernel} % L3 layer module
\from{ltoutput.dtx}{2ekernel}
\from{ltclass.dtx}{2ekernel,tracerollback}
\from{ltfinal.dtx}{2ekernel}}
diff --git a/base/latexrelease.ins b/base/latexrelease.ins
index ff55e7d8..6e7abae6 100644
--- a/base/latexrelease.ins
+++ b/base/latexrelease.ins
@@ -86,6 +86,7 @@ extension .ins) which are part of the distribution.
\from{ltvers.dtx} {latexrelease}%
\from{latexrelease.dtx}{latexrelease}%
\from{ltdirchk.dtx} {latexrelease}%
+ \from{lthooks.dtx} {latexrelease}% empty % L3 layer module
\from{ltdefns.dtx} {latexrelease}%
\from{ltalloc.dtx} {latexrelease}% empty
\from{ltcntrl.dtx} {latexrelease}% empty
@@ -106,6 +107,7 @@ extension .ins) which are part of the distribution.
\from{ltidxglo.dtx} {latexrelease}% empty
\from{ltbibl.dtx} {latexrelease}% empty
\from{ltpage.dtx} {latexrelease}% empty
+ \from{ltshipout.dtx} {latexrelease}% % L3 layer module
\from{ltoutput.dtx} {latexrelease}%
\from{ltclass.dtx} {latexrelease,tracerollback}%
\from{ltspace.dtx} {latexrelease}%
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index cc597906..008d0960 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/08/08 v1.3n LaTeX Kernel (Class & Package Interface)]
+ [2020/08/15 v1.3o LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -1866,25 +1866,6 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\g at addto@macro}
-% Globally add to the end of a macro.
-% \changes{v0.2a}{1993/11/14}{Made global}
-% \changes{v0.2w}{1994/01/31}
-% {Use toks register to avoid `hash' problems}
-% \changes{v1.0o}{1995/05/17}
-% {Make long for latex/1522}
-% \changes{v1.0w}{1996/12/17}
-% {Use \cs{begingroup} to save making a mathord}
-% \changes{v1.0x}{1997/02/05}
-% {missing percent /2402}
-% \begin{macrocode}
-\long\def\g at addto@macro#1#2{%
- \begingroup
- \toks@\expandafter{#1#2}%
- \xdef#1{\the\toks@}%
- \endgroup}
-% \end{macrocode}
-% \end{macro}
%
% \begin{macro}{\AtEndOfPackage}
% \begin{macro}{\AtEndOfClass}
diff --git a/base/ltdefns.dtx b/base/ltdefns.dtx
index 3abd251e..ad9a2af7 100644
--- a/base/ltdefns.dtx
+++ b/base/ltdefns.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltdefns.dtx}
- [2020/06/04 v1.5i LaTeX Kernel (definition commands)]
+ [2020/08/15 v1.5j LaTeX Kernel (definition commands)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltdefns.dtx}
@@ -1726,6 +1726,28 @@
%<*2ekernel>
% \end{macrocode}
%
+%
+% \begin{macro}{\g at addto@macro}
+% Globally add to the end of a macro.
+% \changes{v0.2a}{1993/11/14}{Made global}
+% \changes{v0.2w}{1994/01/31}
+% {Use toks register to avoid `hash' problems}
+% \changes{v1.0o}{1995/05/17}
+% {Make long for latex/1522}
+% \changes{v1.0w}{1996/12/17}
+% {Use \cs{begingroup} to save making a mathord}
+% \changes{v1.0x}{1997/02/05}
+% {missing percent /2402}
+% \begin{macrocode}
+\long\def\g at addto@macro#1#2{%
+ \begingroup
+ \toks@\expandafter{#1#2}%
+ \xdef#1{\the\toks@}%
+ \endgroup}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macrocode}
%</2ekernel>
% \end{macrocode}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index a704362f..c1e3ea93 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -1139,8 +1139,26 @@
%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\ShowHook}{The hook management}%
\input lthooks.ltx
-\input ltshipout.ltx
+%\input ltshipout.ltx
+
+\ExplSyntaxOn
+% \begin{macro}{shipout/before,
+% shipout/foreground,shipout/background,
+% shipout/firstpage,
+% shipout/lastpage}
+% Declaring all hooks for the shipout code.
+% \begin{macrocode}
+\hook_new:n{shipout/before}
+\hook_new:n{shipout/foreground}
+\hook_new:n{shipout/background}
+\hook_new:n{shipout/firstpage}
+\hook_new:n{shipout/lastpage}
+% \end{macrocode}
+% \end{macro}
+\ExplSyntaxOff
+
\input ltfilehook.ltx
+
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
diff --git a/base/lthooks.ins b/base/lthooks.ins
index 4218fb8b..bb3e9372 100644
--- a/base/lthooks.ins
+++ b/base/lthooks.ins
@@ -60,7 +60,8 @@ where one can also log issues in case there are any.
\endpreamble
-\generate{\file{lthooks.ltx}{\from{lthooks.dtx}{2ekernel}}}
+\generate{\file{lthooks.ltx}{\from{lthooks.dtx}{2ekernel}}} % only for lthooks.sty
+
\generate{\file{ltshipout.ltx}{\from{ltshipout.dtx}{2ekernel}}}
\generate{\file{ltfilehook.ltx}{\from{ltfilehook.dtx}{2ekernel}}}
diff --git a/base/ltoutput.dtx b/base/ltoutput.dtx
index c3b27baf..709c3917 100644
--- a/base/ltoutput.dtx
+++ b/base/ltoutput.dtx
@@ -793,10 +793,10 @@
% page when it is unboxed.
% \begin{macrocode}
\newbox\@begindvibox
-\DeclareRobustCommand \AtBeginDvi [1]{%
- \global \setbox \@begindvibox
- \vbox{\unvbox \@begindvibox #1}%
-}
+%\DeclareRobustCommand \AtBeginDvi [1]{%
+% \global \setbox \@begindvibox
+% \vbox{\unvbox \@begindvibox #1}%
+%}
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 67493438..db796d0f 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -490,20 +490,6 @@
% \end{macro}
%
-% \begin{macro}{shipout/before,
-% shipout/foreground,shipout/background,
-% shipout/firstpage,
-% shipout/lastpage}
-% Declaring all hooks for the shipout code.
-% \begin{macrocode}
-\hook_new:n{shipout/before}
-\hook_new:n{shipout/foreground}
-\hook_new:n{shipout/background}
-\hook_new:n{shipout/firstpage}
-\hook_new:n{shipout/lastpage}
-% \end{macrocode}
-% \end{macro}
-
@@ -1301,7 +1287,7 @@
% \begin{macro}{\AtBeginDvi}
%
% \begin{macrocode}
-\renewcommand \AtBeginDvi {\@@_add_firstpage_material:Nn \AtBeginDvi}
+\newcommand \AtBeginDvi {\@@_add_firstpage_material:Nn \AtBeginDvi}
% \end{macrocode}
% \end{macro}
@@ -1441,8 +1427,11 @@
% \end{macrocode}
-
-
+% Rather important :-)
+% \begin{macrocode}
+%<@@=>
+% \end{macrocode}
+%
% \begin{macrocode}
\ExplSyntaxOff
%</2ekernel>
More information about the latex3-commits
mailing list.