[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: fix reenable at package@load integrate \include and \includeonly changes move leftover from ealier implementation to ltdoc.cls and source2edoc.cls (needs update) (6bd547a7)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Aug 17 19:51:19 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : lthooks2
Link : https://github.com/latex3/latex2e/commit/6bd547a75a87b7f2bceca0bd94958cbd35143370
>---------------------------------------------------------------
commit 6bd547a75a87b7f2bceca0bd94958cbd35143370
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Aug 17 19:51:19 2020 +0200
fix reenable at package@load
integrate \include and \includeonly changes
move leftover from ealier implementation to ltdoc.cls and source2edoc.cls (needs update)
>---------------------------------------------------------------
6bd547a75a87b7f2bceca0bd94958cbd35143370
base/ltfilehook.dtx | 192 +--------------------
base/ltfiles.dtx | 150 ++++++++++------
base/ltxdoc.dtx | 20 +++
base/source2edoc.cls | 17 ++
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 4 +-
.../tlb-latexrelease-rollback-003-often.tlg | 4 +-
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.luatex.tlg | 2 +-
base/testfiles/tlb-rollback-004-often.tlg | 2 +-
base/testfiles/tlb-rollback-004-often.xetex.tlg | 2 +-
10 files changed, 150 insertions(+), 247 deletions(-)
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index 1e490eb5..76c65c6a 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -1001,7 +1001,8 @@
% \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}
+ \global\expandafter\let
+ \csname @pkg-disable@#1.\@pkgextension \endcsname \@undefined}
% \end{macrocode}
% \end{macro}
%
@@ -1216,195 +1217,6 @@
% \end{macro}
-
-% \begin{macro}{\include,\includeonly}
-% With space stripping in place in \cs{set at curr@file} we need to
-% add the space after it has acted to keep the legacy interface of
-% \cs{@include}.
-% \begin{macrocode}
-\def\include#1{\relax
- \ifnum\@auxout=\@partaux
- \@latex at error{\string\include\space cannot be nested}\@eha
- \else
-% \end{macrocode}
-% Here the normalisation will add |.tex| for all files, (it uses the
-% the same normalisation as the hooks), so we need to remove that
-% manually. \cs{@strip at tex@ext} does that.
-% \begin{macrocode}
- \set at curr@file{#1}%
- \edef\@curr at file{\@strip at tex@ext\@curr at file}%
- \expandafter\@include\expandafter{\@curr at file} % deliberate space
- \fi}
-% \end{macrocode}
-% Here in \cs{includeonly} we also need to strip |.tex| after
-% normalisation:
-% \begin{macrocode}
-\def\includeonly#1{%
- \@partswtrue
- \let\@partlist\@empty
- \@for\reserved at a:=#1 \do
- {%
- \expandafter\set at curr@file\expandafter{\reserved at a}%
- \ifx\@partlist\@empty
- \edef\@partlist{\@strip at tex@ext\@curr at file}%
- \else
- \edef\@partlist{\@partlist,\@strip at tex@ext\@curr at file}%
- \fi
- }%
- }
-% \end{macrocode}
-%
-% \begin{macro}{\@strip at tex@ext,\@strip at tex@ext at aux}
-% These macros take a (\cs{detokenize}d file name and remove any
-% |.tex| extension). Extra care is taken to not remove the string
-% |.tex| from the middle of a file name: it is only removed if it's
-% the very last thing in the file name.
-% \begin{macrocode}
-\def\reserved at a#1{%
-\def\@strip at tex@ext##1{%
- \expandafter\@strip at tex@ext at aux
- ##1\@nil\@nil
- #1\@nil\relax\@nnil}
-\def\@strip at tex@ext at aux##1#1\@nil##2\@nnil{%
- \ifx\relax##2\@empty
- \expandafter\@cdr\expandafter\@empty\@cdr{}##1%
- \else##1\fi}}%
-\expandafter\reserved at a
-\expandafter{\detokenize{.tex}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-
-% \begin{macro}{\@include}
-% \begin{macrocode}
-\def\@include#1 {%
- \clearpage
- \if at filesw
- \immediate\write\@mainaux{\string\@input{#1.aux}}%
- \fi
- \@tempswatrue
- \if at partsw
- \@tempswafalse
- \edef\reserved at b{#1}%
- \@for\reserved at a:=\@partlist\do
- {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
- \fi
- \if at tempswa
- \let\@auxout\@partaux
- \if at filesw
- \immediate\openout\@partaux #1.aux
- \immediate\write\@partaux{\relax}%
- \fi
-%-----------------------------------------
-% \end{macrocode}
-% Now before going to the hooks we need to set \cs{CurrentFile}:
-% \begin{macrocode}
- \@filehook at set@CurrentFile
-% \end{macrocode}
-% Execute the \texttt{before} hooks just after we switched the
-% \texttt{.aux} file \ldots
-% \begin{macrocode}
- \UseHook{include/before}%
- \UseHook{include/before/#1}%
-%-----------------------------------------
- \@input@{#1.tex}%
-% \end{macrocode}
-% \ldots{} then \texttt{end} hooks \ldots
-% \begin{macrocode}
-%-----------------------------------------
- \UseHook{include/end/#1}%
- \UseHook{include/end}%
-%-----------------------------------------
- \clearpage
-% \end{macrocode}
-% \ldots{} and after the \cs{clearpage} the \texttt{after} hooks
-% followed by another \cs{clearpage} just in case new material got
-% added (after all we need to be in well defined state after the
-% \cs{include}).
-% \begin{macrocode}
-%-----------------------------------------
- \UseHook{include/after/#1}%
- \UseHook{include/after}%
-% \end{macrocode}
-% The additional \cs{clearpage} is needed to ensure that switching
-% the \texttt{.aux} files happen at a defined point even if the
-% above hooks add further material.
-% \begin{macrocode}
- \clearpage
-%-----------------------------------------
- \@writeckpt{#1}%
- \if at filesw
- \immediate\closeout\@partaux
- \fi
- \else
- \deadcycles\z@
- \@nameuse{cp@#1}%
- \fi
- \let\@auxout\@mainaux
-}
-% \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\@include#1 {%
- \clearpage
- \if at filesw
- \immediate\write\@mainaux{\string\@input{"#1.aux"}}%
- \fi
- \@tempswatrue
- \if at partsw
- \@tempswafalse
- \edef\reserved at b{#1}%
- \@for\reserved at a:=\@partlist\do
- {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
- \fi
- \if at tempswa
- \let\@auxout\@partaux
- \if at filesw
- \immediate\openout\@partaux "#1.aux"
- \immediate\write\@partaux{\relax}%
- \fi
-%-----------------------------------------
-% \end{macrocode}
-% Now before going to the hooks we need to set \cs{CurrentFile}:
-% \begin{macrocode}
- \@filehook at set@CurrentFile
- \UseHook{include/before}%
- \UseHook{include/before/#1}%
-%-----------------------------------------
- \@input@{#1.tex}%
-%-----------------------------------------
- \UseHook{include/end/#1}%
- \UseHook{include/end}%
-%-----------------------------------------
- \clearpage
-%-----------------------------------------
- \UseHook{include/after/#1}%
- \UseHook{include/after}%
- \clearpage
-%-----------------------------------------
- \@writeckpt{#1}%
- \if at filesw
- \immediate\closeout\@partaux
- \fi
- \else
-% \end{macrocode}
-% If the file is not included, reset |\deadcycles|, so that a long
-% list of non-included files does not generate an `Output loop'
-% error.
-% \changes{v1.1j}{1997/01/08}{reset \cs{deadcycles} latex/2365}
-% \begin{macrocode}
- \deadcycles\z@
- \@nameuse{cp@#1}%
- \fi
- \let\@auxout\@mainaux}
-}{}
-% \end{macrocode}
-% \end{macro}
-%
%
%
% \subsection{High-level interfaces for \LaTeX{}}
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index cb7c452e..d2624b91 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -610,44 +610,19 @@
\let\@auxout=\@mainaux
% \end{macrocode}
%
-%
-% \begin{macro}{\includeonly}
-% \changes{v1.0p}{1995/04/22}{Allow blanks in argument}
-% \changes{v1.2a}{2019/07/01}{Support UTF-8}
-% \changes{v1.2g}{2020/05/02}{Improved support for spaces in filenames
-% (gh/217)}
-% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\includeonly}{Spaces in file names}%
-\def\includeonly#1{%
- \@partswtrue
-% \end{macrocode}
-% Because the argument to |\includeonly| is a comma-separated list
-% of filenames where there may be comma's precedeing some of the
-% filenames or trailing them. Therefore we need to take the list
-% apart, remove the unwanted spaces while leaving the spaces
-% \emph{in} the filenames intact.
-% \begin{macrocode}
- \let\@partlist\@empty
- \@for\reserved at a:=#1 \do
- {
- \expandafter\set at curr@file at trim@spaces\expandafter{\reserved at a}%
- \ifx\@partlist\@empty
- \edef\@partlist{\@curr at file}%
- \else
- \edef\@partlist{\@partlist,\@curr at file}%
- \fi
- }%
- }
-\@onlypreamble\includeonly
-% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\include}
+% \begin{macro}{\include,\includeonly}
% \changes{v0.9p}{1994/01/18}
% {Use \cs{@input@} so include files are listed.}
+% \changes{v1.0p}{1995/04/22}{Allow blanks in argument}
+% \changes{v1.2a}{2019/07/01}{Support UTF-8}
+% \changes{v1.2g}{2020/05/02}{Improved support for spaces in filenames
+% (gh/217)}
+%
% In the definition of |\include|, |\def\reserved at b| changed to
% |\edef\reserved at b| to be consistent with the |\edef| in
% |\includeonly|.
@@ -665,12 +640,22 @@
% from the filename (gh/217)}
% \changes{v1.2g}{2020-05-02}{Pass the filename to \cs{@include} by
% value instead of by reference (gh/217)}
+%
+% With space stripping in place in \cs{set at curr@file} we need to
+% add the space after it has acted to keep the legacy interface of
+% \cs{@include}.
% \begin{macrocode}
\def\include#1{\relax
\ifnum\@auxout=\@partaux
\@latex at error{\string\include\space cannot be nested}\@eha
\else
- \set at curr@file at trim@spaces{#1}%
+% \end{macrocode}
+% Here the normalisation will add |.tex| for all files, (it uses the
+% the same normalisation as the hooks), so we need to remove that
+% manually. \cs{@strip at tex@ext} does that.
+% \begin{macrocode}
+ \set at curr@file{#1}%
+ \edef\@curr at file{\@strip at tex@ext\@curr at file}%
% \end{macrocode}
% For historical reasons \cs{@include} expects an argument
% delimited by a space. This is kept (though uncessary now) to avoid
@@ -679,24 +664,53 @@
\expandafter\@include\expandafter{\@curr at file} % deliberate space
\fi}
% \end{macrocode}
-% \end{macro}
%
-%
-%
-% \begin{macro}{\set at curr@file at trim@spaces}
-%
-% For |\include| and |\includeonly| we need a variant that removes
-% any leading and trailing spaces from the filename, while leaving
-% any spaces \emph{inside} the filename intact. In order simplify
-% the implementaion we borrow some code from the \texttt{expl3}
-% language, \textbf{\emph{beware}: this may change unannounced}.
+% Here in \cs{includeonly} we also need to strip |.tex| after
+% normalisation:
+% \begin{macrocode}
+\def\includeonly#1{%
+ \@partswtrue
+% \end{macrocode}
+% Because the argument to |\includeonly| is a comma-separated list
+% of filenames where there may be comma's precedeing some of the
+% filenames or trailing them. Therefore we need to take the list
+% apart, remove the unwanted spaces while leaving the spaces
+% \emph{in} the filenames intact.
% \begin{macrocode}
-\def\set at curr@file at trim@spaces#1{%
- \@expl at tl@trim at spaces@apply@@nN {#1} \set at curr@file }
+ \let\@partlist\@empty
+ \@for\reserved at a:=#1 \do
+ {%
+ \expandafter\set at curr@file\expandafter{\reserved at a}%
+ \ifx\@partlist\@empty
+ \edef\@partlist{\@strip at tex@ext\@curr at file}%
+ \else
+ \edef\@partlist{\@partlist,\@strip at tex@ext\@curr at file}%
+ \fi
+ }%
+ }
+\@onlypreamble\includeonly
% \end{macrocode}
-% \end{macro}
-%
+% \end{macro}
%
+% \begin{macro}{\@strip at tex@ext,\@strip at tex@ext at aux}
+% These macros take a (\cs{detokenize}d file name and remove any
+% |.tex| extension). Extra care is taken to not remove the string
+% |.tex| from the middle of a file name: it is only removed if it's
+% the very last thing in the file name.
+% \begin{macrocode}
+\def\reserved at a#1{%
+\def\@strip at tex@ext##1{%
+ \expandafter\@strip at tex@ext at aux
+ ##1\@nil\@nil
+ #1\@nil\relax\@nnil}
+\def\@strip at tex@ext at aux##1#1\@nil##2\@nnil{%
+ \ifx\relax##2\@empty
+ \expandafter\@cdr\expandafter\@empty\@cdr{}##1%
+ \else##1\fi}}%
+\expandafter\reserved at a
+\expandafter{\detokenize{.tex}}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macrocode}
%</2ekernel|latexrelease>
@@ -718,7 +732,9 @@
%<latexrelease> \expandafter\@include\@curr at file
%<latexrelease> \fi}
%<latexrelease>
-%<latexrelease>\let\set at curr@file at trim@spaces\@undefined
+%<latexrelease>\let\@strip at tex@ext\@undefined
+%<latexrelease>\let\@strip at tex@ext at aux\@undefined
+%<latexrelease>
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
%
@@ -768,19 +784,57 @@
\immediate\openout\@partaux "#1.aux"
\immediate\write\@partaux{\relax}%
\fi
+% \end{macrocode}
+% Now before going to the hooks we need to set \cs{CurrentFile}:
+% \begin{macrocode}
+%-----------------------------------------
+ \@filehook at set@CurrentFile
+% \end{macrocode}
+% Execute the \texttt{before} hooks just after we switched the
+% \texttt{.aux} file \ldots
+% \begin{macrocode}
+ \UseHook{include/before}%
+ \UseHook{include/before/#1}%
+%-----------------------------------------
\@input@{#1.tex}%
+%-----------------------------------------
+% \end{macrocode}
+% \ldots{} then \texttt{end} hooks \ldots
+% \begin{macrocode}
+ \UseHook{include/end/#1}%
+ \UseHook{include/end}%
+%-----------------------------------------
\clearpage
+%-----------------------------------------
+% \end{macrocode}
+% \ldots{} and after the \cs{clearpage} the \texttt{after} hooks
+% followed by another \cs{clearpage} just in case new material got
+% added (after all we need to be in well defined state after the
+% \cs{include}).
+% \begin{macrocode}
+ \UseHook{include/after/#1}%
+ \UseHook{include/after}%
+ \clearpage
+%-----------------------------------------
\@writeckpt{#1}%
\if at filesw
\immediate\closeout\@partaux
\fi
\else
+% \end{macrocode}
+% If the file is not included, reset |\deadcycles|, so that a long
+% list of non-included files does not generate an `Output loop'
+% error.
+% \changes{v1.1j}{1997/01/08}{reset \cs{deadcycles} latex/2365}
+% \begin{macrocode}
\deadcycles\z@
\@nameuse{cp@#1}%
\fi
\let\@auxout\@mainaux}
%<latexrelease>\EndIncludeInRelease
-%<latexrelease>
+% \end{macrocode}
+%
+% \begin{macrocode}
%<latexrelease>\IncludeInRelease{0000/00/00}%
%<latexrelease> {\@include}{Spaces in file names}%
%<latexrelease>\def\@include#1 {%
diff --git a/base/ltxdoc.dtx b/base/ltxdoc.dtx
index 3b82ccd7..d46113c5 100644
--- a/base/ltxdoc.dtx
+++ b/base/ltxdoc.dtx
@@ -422,6 +422,26 @@
\def\partname{File}
% \end{macrocode}
%
+
+%
+% \begin{macro}{\set at curr@file at trim@spaces}
+%
+% Leftover moved from ltfiles.
+% Earlier implementation approach --- this need a cleanup!
+%
+% For |\include| and |\includeonly| we need a variant that removes
+% any leading and trailing spaces from the filename, while leaving
+% any spaces \emph{inside} the filename intact. In order simplify
+% the implementaion we borrow some code from the \texttt{expl3}
+% language, \textbf{\emph{beware}: this may change unannounced}.
+% \begin{macrocode}
+\def\set at curr@file at trim@spaces#1{%
+ \@expl at tl@trim at spaces@apply@@nN {#1} \set at curr@file }
+% \end{macrocode}
+% \end{macro}
+%
+
+
% \changes{v2.0z}{2020/05/17}{Support spaces \emph{within} filenames
% (gh/218)}
% \begin{macrocode}
diff --git a/base/source2edoc.cls b/base/source2edoc.cls
index f9b1dd6a..1cabcfba 100644
--- a/base/source2edoc.cls
+++ b/base/source2edoc.cls
@@ -14,6 +14,23 @@
\def\partname{File}
+
+%
+% \begin{macro}{\set at curr@file at trim@spaces}
+%
+% For |\include| and |\includeonly| we need a variant that removes
+% any leading and trailing spaces from the filename, while leaving
+% any spaces \emph{inside} the filename intact. In order simplify
+% the implementaion we borrow some code from the \texttt{expl3}
+% language, \textbf{\emph{beware}: this may change unannounced}.
+% \begin{macrocode}
+\def\set at curr@file at trim@spaces#1{%
+ \@expl at tl@trim at spaces@apply@@nN {#1} \set at curr@file }
+% \end{macrocode}
+% \end{macro}
+%
+
+
\renewcommand*{\DocInclude}[1]{%
\relax
\clearpage
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 976328c5..6afc0a42 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -81,7 +81,7 @@ Applying: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Skipping: [....-..-..] Quote file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
@@ -448,7 +448,7 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
LaTeX Info: Redefining \IfFileExists on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 506bf6c8..10e2f79c 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -79,7 +79,7 @@ Applying: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Skipping: [....-..-..] Quote file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
@@ -440,7 +440,7 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
LaTeX Info: Redefining \IfFileExists 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 e545be22..331f86e8 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -79,7 +79,7 @@ Applying: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Skipping: [....-..-..] Quote file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
@@ -449,7 +449,7 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
LaTeX Info: Redefining \IfFileExists on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 3d3e1e8c..b7582349 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -133,7 +133,7 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
LaTeX Info: Redefining \IfFileExists on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index d4baf5c3..c3bca872 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -131,7 +131,7 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
LaTeX Info: Redefining \IfFileExists on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index e4ef78c6..50cd9045 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -131,7 +131,7 @@ Already applied: [....-..-..] Save language for hyphenation on input line ....
Skipping: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Already applied: [....-..-..] Spaces in file names on input line ....
-Skipping: [....-..-..] Spaces in file names on input line ....
+Skipping: [....-..-..] Spaces in file names and hooks on input line ....
Applying: [....-..-..] Spaces in file names on input line ....
Applying: [....-..-..] Quote file names on input line ....
LaTeX Info: Redefining \IfFileExists on input line ....
More information about the latex3-commits
mailing list.