[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: start integrating filehook (c721e011)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Aug 17 23:58:12 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : lthooks2
Link : https://github.com/latex3/latex2e/commit/c721e011e219ad44e00b0b0febfcb43a34b823b0
>---------------------------------------------------------------
commit c721e011e219ad44e00b0b0febfcb43a34b823b0
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Aug 17 23:58:12 2020 +0200
start integrating filehook
>---------------------------------------------------------------
c721e011e219ad44e00b0b0febfcb43a34b823b0
base/ltclass.dtx | 227 +++++++++++++++------
base/ltfilehook.dtx | 214 +------------------
base/ltfinal.dtx | 2 -
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 8 +-
.../tlb-latexrelease-rollback-003-often.tlg | 8 +-
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 8 +-
base/testfiles/tlb-rollback-004-often.luatex.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.xetex.tlg | 4 +-
9 files changed, 191 insertions(+), 288 deletions(-)
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index bcae81bc..c6ac6958 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -1626,6 +1626,11 @@
\@onlypreamble\@fileswith at pti@ns
% \end{macrocode}
%
+
+
+% \begin{macro}{\load at onefilewithoptions}
+% This macro is used when loading packages or classes.
+%
% Have the main argument as |#1|, so we only need one |\expandafter|
% above.
% \changes{v0.2a}{1993/11/14}
@@ -1642,55 +1647,164 @@
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease> {\@onefilewithoptions}{Unused options issue}%
+%<latexrelease> {\@onefilewithoptions}{Hooks and unused options issue}%
\def\@onefilewithoptions#1[#2][#3]#4{%
\@pushfilename
\xdef\@currname{#1}%
\global\let\@currext#4%
+% \end{macrocode}
+% The command \cs{ver@\meta{file}.\meta{ext}} is used to signal that
+% a package is already loaded, either because it is in fact loaded, or
+% because it's loading was suppressed. In minimal installations, said
+% package may not exist but still have its loading suppressed with
+% \cs{ver@\meta{file}.\meta{ext}}, so before checking if the file
+% exists we have to check that we do need to load it with
+% \cs{@ifl at aded}. If we don't, then there's no point in checking for
+% a typo or load-disabling.
+% \begin{macrocode}
+ \@ifl at aded\@currext\@currname
+% \end{macrocode}
+% If the package is already loaded, check that there were no option
+% clashes:
+% \changes{v1.1b}{1998/05/07}
+% {Modify help message for latex/2805}
+% \begin{macrocode}
+ {\@if at ptions\@currext{\@currname}{#2}{}%
+ {\@latex at error
+ {Option clash for \@cls at pkg\space \@currname}%
+ {The package \@currname\space has already been loaded
+ with options:\MessageBreak
+ \space\space[\@ptionlist{\@currname.\@currext}]\MessageBreak
+ There has now been an attempt to load it
+ with options\MessageBreak
+ \space\space[#2]\MessageBreak
+ Adding the global options:\MessageBreak
+ \space\space
+ \@ptionlist{\@currname.\@currext},#2\MessageBreak
+ to your \noexpand\documentclass declaration may fix this.%
+ \MessageBreak
+ Try typing \space <return> \space to proceed.}}%
+ \@firstofone}%
+ {\@reset at ptions
+ \makeatletter
+% \end{macrocode}
+% First we take the \meta{name} and \meta{ext} given in the argument
+% and check if the file exists, and issue an error otherwise asking
+% for a correction with \cs{@missingfileerror}.
+% \begin{macrocode}
+ \IfFileExists{\@currname.\@currext}{}%
+ {\@missing at onefilewithoptions{#2}}%
+% \end{macrocode}
+% If \cs{@currname} is empty (the user replied to the ``Enter file
+% name'' prompt with \meta{RETURN}), so stop here
+% (do \cs{@popfilename} to pop the item just added above).
+%
+% This \cs{@gobble} omits the date check at the end.
+% \begin{macrocode}
+ \ifx\@currname\@empty
+ \expandafter\@gobble
+ \else
+% \end{macrocode}
+% If the file exists, check if it was load-prevented, and otherwise
+% do the bookkeeping with \cs{@filehook at file@push}
+% then call \cs{set at curr@file} to set \cs{@curr at file} (and do any
+% required substitution), then actually load the class/package with
+% \cs{load at onefile@withoptions}.
+% \begin{macrocode}
+ \@disable at packageload@do{\@currname.\@currext}%
+ {\@filehook at file@push
+ \set at curr@file{\@currname.\@currext}%
+ \@filehook at set@CurrentFile
+ \load at onefile@withoptions{#2}%
+% \end{macrocode}
+% Now just clean up and exit.
+% \begin{macrocode}
+ \@filehook at file@pop}%
+ \@reset at ptions
+ \expandafter\@firstofone
+ \fi}%
+% \end{macrocode}
+% Except in the case where \cs{@currname} is empty, the date is
+% checked against the date marked in the package file:
+% \begin{macrocode}
+ {\@ifl at ter\@currext{\@currname}{#3}{}%
+ {\@latex at warning@no at line
+ {You have requested,\on at line,
+ version\MessageBreak
+ `#3' of \@cls at pkg\space \@currname,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver@\@currname.\@currext\endcsname'\MessageBreak
+ is available}}%
+% \end{macrocode}
+% \changes{v0.2c}{1993/11/17}
+% {Added trap for two \cs{LoadClass} commands.}
+% \begin{macrocode}
+ \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}%
+ \@popfilename}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\@onlypreamble\@onefilewithoptions
+% \end{macrocode}
+%
+% The kernel no longer uses \cs{@unprocessedoptions}
+% \begin{macrocode}
+\let\@unprocessedoptions\@undefined
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\@missing at onefilewithoptions}
+% Now the action taken when a file is not found.
+% \begin{macrocode}
+\def\@missing at onefilewithoptions#1{%
+ \@missingfileerror\@currname\@currext
+ \xdef\@currname{\@missingfile at area\@missingfile at base}%
+ \global\let\@currext\@missingfile at ext}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\load at onefile@withoptions}
+% Now the code that actually does the file loading:
+% \begin{macrocode}
+\def\load at onefile@withoptions#1{%
\let\CurrentOption\@empty
\@reset at ptions
- \makeatletter
-% \end{macrocode}
% Grab everything in a macro, so the parameter stack is popped before
% any processing begins.
% \changes{v0.2s}{1994/01/17}
% {Modify to reduce parameter stack usage}
-% \changes{v1.1b}{1998/05/07}
-% {Modify help message for latex/2805}
-% \begin{macrocode}
\def\reserved at a{%
- \@ifl at aded\@currext{#1}%
- {\@if at ptions\@currext{#1}{#2}{}%
- {\@latex at error
- {Option clash for \@cls at pkg\space #1}%
- {The package #1 has already been loaded
- with options:\MessageBreak
- \space\space[\@ptionlist{#1.\@currext}]\MessageBreak
- There has now been an attempt to load it
- with options\MessageBreak
- \space\space[#2]\MessageBreak
- Adding the global options:\MessageBreak
- \space\space
- \@ptionlist{#1.\@currext},#2\MessageBreak
- to your \noexpand\documentclass declaration may fix this.%
- \MessageBreak
- Try typing \space <return> \space to proceed.}}}%
- {\@pass at ptions\@currext{#2}{#1}%
-% \end{macrocode}
-% \changes{v0.3c}{1994/03/12}
-% {Do not use \cs{@pr at videpackage} to avoid typeout}
-% \begin{macrocode}
- \global\expandafter
- \let\csname ver@\@currname.\@currext\endcsname\@empty
+ \@pass at ptions\@currext{#1}{\@currname}%
+ \global\expandafter
+ \let\csname ver@\@currname.\@currext\endcsname\@empty
% \end{macrocode}
% We initialize \cs{...-h@@k} here and only if we load the file so that it
% remains undefined otherwise.
% \begin{macrocode}
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
- \InputIfFileExists
- {\@currname.\@currext}%
- {}%
- {\@missingfileerror\@currname\@currext}%
+ \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
+% \end{macrocode}
+% When the current extension is \cs{@pkgextension} we are loading a
+% package otherwise, if it is \cs{@clsextension}, a class, so
+% depending on that we execute different hooks. If the extension is
+% neither, then it is another type of file without special hooks.
+% \begin{macrocode}
+%-----------------------------------------
+ \ifx\@currext\@pkgextension
+ \UseHook{package/before}%
+ \UseHook{package/before/\@currname}%
+ \else
+ \ifx\@currext\@clsextension
+ \UseHook{class/before}%
+ \UseHook{class/before/\@currname}%
+ \fi
+ \fi
+% \end{macrocode}
+% Now actually load the file (at this point we are certain it exists,
+% but use \cs{InputIfFileExists} so that file hooks are executed):
+% \begin{macrocode}
+ \InputIfFileExists{\@currname.\@currext}{}{}%
+%-----------------------------------------
% \end{macrocode}
% In older versions of the code |\@unprocessedoptions| would
% generate an error for each specified
@@ -1734,44 +1848,39 @@
% \begin{macrocode}
\expandafter\let
\csname unprocessedoptions-\@currname.\@currext\endcsname
- \@undefined}%
+ \@undefined
% \end{macrocode}
-%
+% And same procedure, James, when we are finished loading, except
+% that the hook order is now reversed.
% \begin{macrocode}
- \@ifl at ter\@currext{#1}{#3}{}%
- {\@latex at warning@no at line
- {You have requested,\on at line,
- version\MessageBreak
- `#3' of \@cls at pkg\space #1,\MessageBreak
- but only version\MessageBreak
- `\csname ver@#1.\@currext\endcsname'\MessageBreak
- is available}}%
-% \end{macrocode}
-% \changes{v0.2c}{1993/11/17}
-% {Added trap for two \cs{LoadClass} commands.}
-% \begin{macrocode}
- \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi
- \@popfilename
- \@reset at ptions}%
+%-----------------------------------------
+ \ifx\@currext\@pkgextension
+ \UseHook{package/after/\@currname}%
+ \UseHook{package/after}%
+ \else
+ \ifx\@currext\@clsextension
+ \UseHook{class/after/\@currname}%
+ \UseHook{class/after}%
+ \fi
+ \fi}%
+%-----------------------------------------
\reserved at a}
-\@onlypreamble\@onefilewithoptions
% \end{macrocode}
+% \end{macro}
%
-% The kernel no longer uses \cs{@unprocessedoptions}
% \begin{macrocode}
-\let\@unprocessedoptions\@undefined
+%</2ekernel|latexrelease>
% \end{macrocode}
%
% \begin{macrocode}
-%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\@onefilewithoptions}{Unused options issue}%
+%<latexrelease> {\@onefilewithoptions}{Hooks and unused options issue}%
%<latexrelease>
% \end{macrocode}
% Because of the way \cs{@onfilewithoptions} is changed for
% rollback handling below we have to define
-% \cs{load at onefilewithoptions} when rollowing back!
+% \cs{load at onefilewithoptions} when rolling back!
% \begin{macrocode}
%<latexrelease>\def\load at onefilewithoptions#1[#2][#3]#4{%
%<latexrelease> \@pushfilename
@@ -1822,6 +1931,10 @@
%<latexrelease> \@popfilename
%<latexrelease> \@reset at ptions}%
%<latexrelease> \reserved at a}
+%<latexrelease>
+%<latexrelease>\let \load at onefile@withoptions \@undefined
+%<latexrelease>\let \@missing at onefilewithoptions \@undefined
+%<latexrelease>
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index 76c65c6a..075b4f09 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -1006,217 +1006,9 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\load at onefilewithoptions,\load at onefile@withoptions}
-% \begin{macro}{\@missing at onefilewithoptions}
-% This macro is used when loading packages or classes.
-% \begin{macrocode}
-\def\load at onefilewithoptions#1[#2][#3]#4{%
- \@pushfilename
- \xdef\@currname{#1}%
- \global\let\@currext#4%
-% \end{macrocode}
-% The command \cs{ver@\meta{file}.\meta{ext}} is used to signal that
-% a package is already loaded, either because it is in fact loaded, or
-% because it's loading was suppressed. In minimal installations, said
-% package may not exist but still have its loading suppressed with
-% \cs{ver@\meta{file}.\meta{ext}}, so before checking if the file
-% exists we have to check that we do need to load it with
-% \cs{@ifl at aded}. If we don't, then there's no point in checking for
-% a typo or load-disabling.
-% \begin{macrocode}
- \@ifl at aded\@currext\@currname
-% \end{macrocode}
-% If the package is already loaded, check that there were no option
-% clashes:
-% \begin{macrocode}
- {\@if at ptions\@currext{\@currname}{#2}{}%
- {\@latex at error
- {Option clash for \@cls at pkg\space \@currname}%
- {The package \@currname\space has already been loaded
- with options:\MessageBreak
- \space\space[\@ptionlist{\@currname.\@currext}]\MessageBreak
- There has now been an attempt to load it
- with options\MessageBreak
- \space\space[#2]\MessageBreak
- Adding the global options:\MessageBreak
- \space\space
- \@ptionlist{\@currname.\@currext},#2\MessageBreak
- to your \noexpand\documentclass declaration may fix this.%
- \MessageBreak
- Try typing \space <return> \space to proceed.}}%
- \@firstofone}%
- {\@reset at ptions
- \makeatletter
-% \end{macrocode}
-% First we take the \meta{name} and \meta{ext} given in the argument
-% and check if the file exists, and issue an error otherwise asking
-% for a correction with \cs{@missingfileerror}.
-% \begin{macrocode}
- \IfFileExists{\@currname.\@currext}{}%
- {\@missing at onefilewithoptions{#2}}%
-% \end{macrocode}
-% If \cs{@currname} is empty (the user replied to the ``Enter file
-% name'' prompt with \meta{RETURN}), so stop here
-% (do \cs{@popfilename} to pop the item just added above).
-%
-% This \cs{@gobble} omits the date check at the end.
-% \begin{macrocode}
- \ifx\@currname\@empty
- \expandafter\@gobble
- \else
-% \end{macrocode}
-% If the file exists, check if it was load-prevented, and otherwise
-% do the bookkeeping with \cs{@filehook at file@push}
-% then call \cs{set at curr@file} to set \cs{@curr at file} (and do any
-% required substitution), then actually load the class/package with
-% \cs{load at onefile@withoptions}.
-% \begin{macrocode}
- \@disable at packageload@do{\@currname.\@currext}%
- {\@filehook at file@push
- \set at curr@file{\@currname.\@currext}%
- \@filehook at set@CurrentFile
- \load at onefile@withoptions{#2}%
-% \end{macrocode}
-% Now just clean up and exit.
-% \begin{macrocode}
- \@filehook at file@pop}%
- \@reset at ptions
- \expandafter\@firstofone
- \fi}%
-% \end{macrocode}
-% Except in the case where \cs{@currname} is empty, the date is
-% checked against the date marked in the package file:
-% \begin{macrocode}
- {\@ifl at ter\@currext{\@currname}{#3}{}%
- {\@latex at warning@no at line
- {You have requested,\on at line,
- version\MessageBreak
- `#3' of \@cls at pkg\space \@currname,\MessageBreak
- but only version\MessageBreak
- `\csname ver@\@currname.\@currext\endcsname'\MessageBreak
- is available}}%
- \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}%
- \@popfilename}
-% \end{macrocode}
-%
-% Now the action taken when a file is not found.
-% \begin{macrocode}
-\def\@missing at onefilewithoptions#1{%
- \@missingfileerror\@currname\@currext
- \xdef\@currname{\@missingfile at area\@missingfile at base}%
- \global\let\@currext\@missingfile at ext}
-% \end{macrocode}
-%
-% Now the code that actually does the file loading:
-% \begin{macrocode}
-\def\load at onefile@withoptions#1{%
- \let\CurrentOption\@empty
- \@reset at ptions
- \def\reserved at a{%
- \@pass at ptions\@currext{#1}{\@currname}%
- \global\expandafter
- \let\csname ver@\@currname.\@currext\endcsname\@empty
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
-%-----------------------------------------
-% \end{macrocode}
-% When the current extension is \cs{@pkgextension} we are loading a
-% package otherwise, if it is \cs{@clsextension}, a class, so
-% depending on that we execute different hooks. If the extension is
-% neither, then it is another type of file without special hooks.
-% \begin{macrocode}
- \ifx\@currext\@pkgextension
- \UseHook{package/before}%
- \UseHook{package/before/\@currname}%
- \else
- \ifx\@currext\@clsextension
- \UseHook{class/before}%
- \UseHook{class/before/\@currname}%
- \fi
- \fi
-% \end{macrocode}
-% Now actually load the file (at this point we are certain it exists,
-% but use \cs{InputIfFileExists} so tha file hooks are executed):
-% \begin{macrocode}
- \InputIfFileExists{\@currname.\@currext}{}{}%
- \let\@unprocessedoptions\@@unprocessedoptions
- \csname\@currname.\@currext-h@@k\endcsname
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
- \@undefined
-%-----------------------------------------
-% \end{macrocode}
-% And same procedure, James, when we are finished loading, except
-% that the hook order is now reversed.
-% \begin{macrocode}
- \ifx\@currext\@pkgextension
- \UseHook{package/after/\@currname}%
- \UseHook{package/after}%
- \else
- \ifx\@currext\@clsextension
- \UseHook{class/after/\@currname}%
- \UseHook{class/after}%
- \fi
- \fi
-%-----------------------------------------
- \@unprocessedoptions}%
- \reserved at a}
-% \end{macrocode}
-%
-% The code for this macro has changed between 2020/02/02 and
-% 2020/10/01 so the never version is this:
-% \begin{macrocode}
-\@ifl at t@r\fmtversion{2020/10/01}
-{%
-\def\load at onefile@withoptions#1{%
- \let\CurrentOption\@empty
- \@reset at ptions
- \def\reserved at a{%
- \@pass at ptions\@currext{#1}{\@currname}%
- \global\expandafter
- \let\csname ver@\@currname.\@currext\endcsname\@empty
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty
-%-----------------------------------------
- \ifx\@currext\@pkgextension
- \UseHook{package/before}%
- \UseHook{package/before/\@currname}%
- \else
- \ifx\@currext\@clsextension
- \UseHook{class/before}%
- \UseHook{class/before/\@currname}%
- \fi
- \fi
- \InputIfFileExists{\@currname.\@currext}{}{}%
-%-----------------------------------------
- \expandafter\let\csname unprocessedoptions-\@currname.\@currext\endcsname
- \@@unprocessedoptions
- \csname\@currname.\@currext-h@@k\endcsname
- \expandafter\let\csname\@currname.\@currext-h@@k\endcsname
- \@undefined
- \ifx\@unprocessedoptions\relax
- \let\@unprocessedoptions\@undefined
- \else
- \csname unprocessedoptions-\@currname.\@currext\endcsname
- \fi
- \expandafter\let
- \csname unprocessedoptions-\@currname.\@currext\endcsname
- \@undefined
-%-----------------------------------------
- \ifx\@currext\@pkgextension
- \UseHook{package/after/\@currname}%
- \UseHook{package/after}%
- \else
- \ifx\@currext\@clsextension
- \UseHook{class/after/\@currname}%
- \UseHook{class/after}%
- \fi
- \fi}%
-%-----------------------------------------
- \reserved at a}
-}{}%
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-
-
+%
+%
+%
%
%
% \subsection{High-level interfaces for \LaTeX{}}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index e4b6d994..c090bc80 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -1255,8 +1255,6 @@
%<latexrelease>\let \AtBeginShipoutUpperLeft \@undefined
%<latexrelease>\let \AtBeginShipoutUpperLeftForeground \@undefined
%<latexrelease>
-%<latexrelease>\expandafter\let\csname ver at atbegshi.sty\endcsname \@undefined
-%<latexrelease>
%<latexrelease>
% \end{macrocode}
% We do not undo a substitution when rolling back. As the file
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 6afc0a42..e1d7b127 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -168,8 +168,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Skipping: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
@@ -575,8 +575,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 10e2f79c..8262c921 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -166,8 +166,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Skipping: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
@@ -567,8 +567,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument 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 331f86e8..cc2a4725 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -166,8 +166,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Skipping: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
@@ -576,8 +576,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index b7582349..d2da3fe0 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -261,8 +261,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index c3bca872..9894b2cb 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -259,8 +259,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 50cd9045..a561fd9f 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -259,8 +259,8 @@ Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
-Skipping: [....-..-..] Unused options issue on input line ....
-Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] Hooks and unused options issue on input line ....
+Applying: [....-..-..] Hooks and unused options issue on input line ....
Skipping: [....-..-..] Use hook system on input line ....
Applying: [....-..-..] Use hook system on input line ....
LaTeX Info: Redefining \AtBeginDocument on input line ....
More information about the latex3-commits
mailing list.