[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Gh621 (#622) (3273941c)
GitHub
noreply at github.com
Thu Aug 5 14:49:44 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/3273941c09030b3ff4e346845b8861c88053b17f
>---------------------------------------------------------------
commit 3273941c09030b3ff4e346845b8861c88053b17f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Aug 5 14:49:44 2021 +0200
Gh621 (#622)
* implement #621
* typo in csname
* fix typo [CI skip]
>---------------------------------------------------------------
3273941c09030b3ff4e346845b8861c88053b17f
base/changes.txt | 8 ++
base/doc/ltnews34.tex | 23 ++++
base/ltclass.dtx | 119 +++++++++++++++------
base/testfiles/github-0479-often.luatex.tlg | 2 +
base/testfiles/github-0479-often.tlg | 2 +
base/testfiles/github-0479-often.xetex.tlg | 2 +
base/testfiles/github-0621.lvt | 78 ++++++++++++++
.../{github-0022b.tlg => github-0621.tlg} | 58 ++++++++--
.../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 +
base/testfiles/tlb-rollback-005.luatex.tlg | 2 +
base/testfiles/tlb-rollback-005.tlg | 2 +
base/testfiles/tlb-rollback-005.xetex.tlg | 2 +
17 files changed, 276 insertions(+), 40 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 204a51fb..2c7c7a34 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -44,6 +44,14 @@ are not part of the distribution.
* ltcmdhooks.dtx:
Fix usage of \@if at newcommand when patching a robust command (gh/623).
+2021-07-19 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltclass.dtx: Provide public names:
+ \IfPackageLoadedTF, \IfPackageLoadedWithOptionsTF,
+ \IfClassLoadedTF, \IfClassLoadedWithOptionsTF.
+
+ Drop \@onlypremable restriction for several commands.
+
2021-07-16 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltplain.dtx (section{Plain \TeX}):
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index 723f3f15..4f94269c 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -239,6 +239,29 @@ error and should therefore be properly looked at.
+\subsection{Provide tests for package and class loading}
+
+To test if a package was loaded you can now use \cs{IfPackageLoadedTF}
+\Arg{package} \Arg{true} \Arg{false} and based on the result execute
+different code. It is also possible to check if the package was loaded
+with certain options. This is done with
+\cs{IfPackageLoadedWithOptionsTF}. It takes four arguments:
+\Arg{package}\Arg{option-list}\Arg{true}\Arg{false}. It uses the
+\meta{false} code if at least one option in the \meta{option-list}
+has not been used during loading or if the package hasn't been loaded
+at all.
+
+For classes similar commands (\texttt{Package} replaced by
+\texttt{Class} in the name) are provided.
+%
+\githubissue{621}
+
+
+
+
+
+
+
\subsection{New \cs{showfloat} command}
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index f08b4a68..0dfdd034 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -311,27 +311,49 @@
% default option handler, which is not used for |landscape| as that
% option is explicitly declared.
%
+% \DescribeMacro\IfPackageLoadedTF
+% \DescribeMacro\IfClassLoadedTF
% \DescribeMacro\@ifpackageloaded
-% To find out if a package has already been loaded, use\\
% \DescribeMacro\@ifclassloaded
-% |\@ifpackageloaded{|\meta{package}|}{|\meta{true}|}{|\meta{false}|}|.
-%
+% To find out if a package has already been loaded, use
+% \begin{quote}
+% |\IfPackageLoadedTF{|\meta{package}|}{|\meta{true}|}{|\meta{false}|}|\\
+% \end{quote}
+% or the old name \cs{@ifpackageloaded}.
+%
+% \DescribeMacro\IfPackageAtLeastTF
+% \DescribeMacro\IfClassAtLeastTF
% \DescribeMacro\@ifpackagelater
+% \DescribeMacro\@ifclasslater
% \changes{v1.1i}{2013/07/07}{Correctly describe how the date in
% \cs{@ifpackagelater} is used}
% To find out if a package has already been loaded with a version
% equal to or more
-% recent than \meta{version}, use\\
-% \DescribeMacro\@ifclasslater
-% |\@ifpackagelater{|\meta{package}|}{|\meta{version}|}{|^^A
-% \meta{true}|}{|\meta{false}|}|.
-%
+% recent than \meta{date}, use
+% \begin{quote}
+% |\IfPackageAtLeastTF{|\meta{package}|}{|\meta{date}|}{|^^A
+% \meta{true}|}{|\meta{false}|}|
+% \end{quote}
+% or the old name \cs{@ifpackagelater}.
+
+% \DescribeMacro\IfFormatAtLeastTF
+% To test the format date use
+% \begin{quote}
+% |\IfFormatAtLeastTF{|\meta{date}|}{|^^A
+% \meta{true}|}{|\meta{false}|}|
+% \end{quote}
+%
+% \DescribeMacro\IfPackageLoadedWithOptionsTF
+% \DescribeMacro\IfClassLoadedWithOptionsTF
% \DescribeMacro\@ifpackagewith
+% \DescribeMacro\@ifclasswith
% To find out if a package has already been loaded with at least the
% options \meta{options}, use
-% \DescribeMacro\@ifclasswith
-% |\@ifpackagewith{|\meta{package}|}{|\meta{options}|}{|^^A
-% \meta{true}|}{|\meta{false}|}|.
+% \begin{quote}
+% |\IfPackageLoadedWithOptionsTF{|\meta{package}|}{|\meta{options}|}{|^^A
+% \meta{true}|}{|\meta{false}|}|
+% \end{quote}
+% or the old name \cs{@ifpackagewith}.
%
% There exists one package that can't be tested with the above
% commands: the \texttt{fontenc} package pretends that it was never
@@ -499,9 +521,10 @@
% \begin{macro}{\@classoptionslist}
% List of options of the main class.
% \changes{v1.0u}{1996/07/26}{made only preamble}
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\let\@classoptionslist\relax
-\@onlypreamble\@classoptionslist
+%\@onlypreamble\@classoptionslist
% \end{macrocode}
% \end{macro}
%
@@ -517,9 +540,10 @@
% \changes{v1.0u}{1996/07/26}{made only preamble}
% List of options of the main class that haven't been declared or
% loaded as class option files.
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\let\@unusedoptionlist\@empty
-\@onlypreamble\@unusedoptionlist
+%\@onlypreamble\@unusedoptionlist
% \end{macrocode}
% \end{macro}
%
@@ -571,11 +595,10 @@
% \begin{macro}{\@clsextension}
% \begin{macro}{\@pkgextension}
% The two possible values of |\@currext|.
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\def\@clsextension{cls}
\def\@pkgextension{sty}
-\@onlypreamble\@clsextension
-\@onlypreamble\@pkgextension
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -811,10 +834,11 @@
%
% \begin{macro}{\@ptionlist}
% Returns the option list of the file.
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\def\@ptionlist#1{%
\@ifundefined{opt@#1}\@empty{\csname opt@#1\endcsname}}
-\@onlypreamble\@ptionlist
+%\@onlypreamble\@ptionlist
% \end{macrocode}
% \end{macro}
%
@@ -824,11 +848,10 @@
% Checks to see whether a file has been loaded.
% \changes{v0.2t}{1994/01/18}
% {Fix typo \cs{@pkgetension}}
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\def\@ifpackageloaded{\@ifl at aded\@pkgextension}
\def\@ifclassloaded{\@ifl at aded\@clsextension}
-\@onlypreamble\@ifpackageloaded
-\@onlypreamble\@ifclassloaded
% \end{macrocode}
%
% \begin{macrocode}
@@ -838,11 +861,12 @@
\else
\expandafter\@firstoftwo
\fi}
-\@onlypreamble\@ifl at aded
% \end{macrocode}
% \end{macro}
% \end{macro}
%
+%
+%
% \begin{macro}{\@ifpackagelater}
% \begin{macro}{\@ifclasslater}
% |\@ifpackagelater{|\meta{name}|}{YYYY/MM/DD}{|\meta{true
@@ -852,17 +876,17 @@
% A better name for it would therefore been
% |\@ifpackagelaterorequal| but it is in use for more than 30
% years, so \ldots
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\def\@ifpackagelater{\@ifl at ter\@pkgextension}
\def\@ifclasslater{\@ifl at ter\@clsextension}
-\@onlypreamble\@ifpackagelater
-\@onlypreamble\@ifclasslater
% \end{macrocode}
% \end{macro}
% \end{macro}
%
%
%
+%
% \begin{macro}{\IfPackageAtLeastTF}
% \begin{macro}{\IfClassAtLeastTF}
% \begin{macro}{\IfFormatAtLeastTF}
@@ -870,6 +894,7 @@
% code}|}{|\meta{false code}|}|
% Test if the format is later or equal to the given date.
% \changes{v1.3k}{2020/04/07}{Macro added; also in rollback (gh/168)}
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -878,9 +903,6 @@
\def\IfFormatAtLeastTF{\@ifl at t@r\fmtversion}
\let\IfPackageAtLeastTF\@ifpackagelater
\let\IfClassAtLeastTF\@ifclasslater
-\@onlypreamble\IfFormatAtLeastTF
-\@onlypreamble\IfPackageAtLeastTF
-\@onlypreamble\IfClassAtLeastTF
% \end{macrocode}
% For rollback pretend it was available since the beginning of dawn.
% \begin{macrocode}
@@ -899,11 +921,11 @@
% \end{macro}
%
% \begin{macro}{\@ifl at ter}
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\def\@ifl at ter#1#2{%
\expandafter\@ifl at t@r
\csname ver@#2.#1\endcsname}
-\@onlypreamble\@ifl at ter
%</2ekernel>
% \end{macrocode}
%
@@ -942,9 +964,6 @@
%<*2ekernel>
% \end{macrocode}
%
-% \begin{macrocode}
-\@onlypreamble\@ifl at t@r
-% \end{macrocode}
% \end{macro}
%
% \changes{v1.1j}{2016/06/20}
@@ -974,17 +993,15 @@
% |\@ifpackagewith{|\meta{name}|}{|\meta{option-list}|}|
% Checks that \meta{option-list} is a subset of the options
% \textbf{with} which \meta{name} was loaded.
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
\def\@ifpackagewith{\@if at ptions\@pkgextension}
\def\@ifclasswith{\@if at ptions\@clsextension}
-\@onlypreamble\@ifpackagewith
-\@onlypreamble\@ifclasswith
% \end{macrocode}
%
% \begin{macrocode}
\def\@if at ptions#1#2{%
\@expandtwoargs\@if at pti@ns{\@ptionlist{#2.#1}}}
-\@onlypreamble\@if at ptions
% \end{macrocode}
%
% Probably shouldn't use |\CurrentOption| here\ldots (changed to
@@ -993,6 +1010,7 @@
% {Add extra ,s so `two' is not matched with `twocolumn'}
% \changes{v1.1i}{2011/08/19}
% {Re-jig definition after more stringent \cs{in@} test.}
+% \changes{v1.4e}{2021/07/19}{Drop \cs{@onlypreamble}}
% \begin{macrocode}
%</2ekernel>
%<latexrelease>\IncludeInRelease{2017/01/01}%
@@ -1038,12 +1056,45 @@
%<*2ekernel>
% \end{macrocode}
%
-% \begin{macrocode}
-\@onlypreamble\@if at pti@ns
-% \end{macrocode}
% \end{macro}
% \end{macro}
%
+%
+%
+%
+% \begin{macro}{\IfPackageLoadedTF,\IfPackageLoadedWithOptionsTF,
+% \IfClassLoadedTF,\IfClassLoadedWithOptionsTF}
+% More public names for the commands already available for a long time.
+% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2021/11/15}%
+%<latexrelease> {\IfPackageLoadedtTF}{Test package loading}%
+\let \IfPackageLoadedTF \@ifpackageloaded
+\let \IfClassLoadedTF \@ifclassloaded
+\let \IfPackageLoadedWithOptionsTF \@ifpackagewith
+\let \IfClassLoadedWithOptionsTF \@ifclasswith
+% \end{macrocode}
+% For rollback pretend it was available since the beginning of dawn.
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\IfPackageLoadedtTF}{Test package loading}%
+%<latexrelease>
+%<latexrelease>\let \IfPackageLoadedTF \@ifpackageloaded
+%<latexrelease>\let \IfClassLoadedTF \@ifclassloaded
+%<latexrelease>\let \IfPackageLoadedWithOptionsTF \@ifpackagewith
+%<latexrelease>\let \IfClassLoadedWithOptionsTF \@ifclasswith
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+%
% \begin{macro}{\ProvidesPackage}
% Checks that the current filename is correct, and defines
% |\ver at filename|.
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index 935eb6d3..f7150c50 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -514,6 +514,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Applying: [....-..-..] Check name with \strcmp on input line ....
Already applied: [....-..-..] Undo: check name with \strcmp on input line ....
Applying: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index 8e96a2ee..277439bd 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -503,6 +503,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Applying: [....-..-..] Check name with \strcmp on input line ....
Already applied: [....-..-..] Undo: check name with \strcmp on input line ....
Applying: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index c07cc78c..bf23bef6 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -504,6 +504,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Applying: [....-..-..] Check name with \strcmp on input line ....
Already applied: [....-..-..] Undo: check name with \strcmp on input line ....
Applying: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/github-0621.lvt b/base/testfiles/github-0621.lvt
new file mode 100644
index 00000000..572f7588
--- /dev/null
+++ b/base/testfiles/github-0621.lvt
@@ -0,0 +1,78 @@
+\documentclass[german,final]{article}
+
+\usepackage[ascii]{inputenc}
+
+\input{test2e}
+\START
+
+\typeout{--- is article:}
+\IfClassLoadedTF{article}{\typeout{true}}{\typeout{false}}
+\typeout{--- is report:}
+\IfClassLoadedTF{report}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- has german,final:}
+\IfClassLoadedWithOptionsTF{article}{german,final}{\typeout{true}}{\typeout{false}}
+\typeout{--- has final,german:}
+\IfClassLoadedWithOptionsTF{article}{final,german}{\typeout{true}}{\typeout{false}}
+\typeout{--- has draft:}
+\IfClassLoadedWithOptionsTF{article}{draft}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- is report and final:}
+\IfClassLoadedWithOptionsTF{report}{final}{\typeout{true}}{\typeout{false}}
+
+
+\typeout{--- is inputenc:}
+\IfPackageLoadedTF{inputenc}{\typeout{true}}{\typeout{false}}
+\typeout{--- is trace:}
+\IfPackageLoadedTF{trace}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- has ascii:}
+\IfPackageLoadedWithOptionsTF{inputenc}{ascii}{\typeout{true}}{\typeout{false}}
+\typeout{--- has ascii,utf8:}
+\IfPackageLoadedWithOptionsTF{inputenc}{ascii,utf8}{\typeout{true}}{\typeout{false}}
+\typeout{--- has utf8:}
+\IfPackageLoadedWithOptionsTF{inputenc}{utf8}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- is trace and final:}
+\IfPackageLoadedWithOptionsTF{trace}{final}{\typeout{true}}{\typeout{false}}
+
+
+
+\begin{document}
+
+\typeout{In body...}
+
+\typeout{--- is article:}
+\IfClassLoadedTF{article}{\typeout{true}}{\typeout{false}}
+\typeout{--- is report:}
+\IfClassLoadedTF{report}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- has german,final:}
+\IfClassLoadedWithOptionsTF{article}{german,final}{\typeout{true}}{\typeout{false}}
+\typeout{--- has final,german:}
+\IfClassLoadedWithOptionsTF{article}{final,german}{\typeout{true}}{\typeout{false}}
+\typeout{--- has draft:}
+\IfClassLoadedWithOptionsTF{article}{draft}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- is report and final:}
+\IfClassLoadedWithOptionsTF{report}{final}{\typeout{true}}{\typeout{false}}
+
+
+\typeout{--- is inputenc:}
+\IfPackageLoadedTF{inputenc}{\typeout{true}}{\typeout{false}}
+\typeout{--- is trace:}
+\IfPackageLoadedTF{trace}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- has ascii:}
+\IfPackageLoadedWithOptionsTF{inputenc}{ascii}{\typeout{true}}{\typeout{false}}
+\typeout{--- has ascii,utf8:}
+\IfPackageLoadedWithOptionsTF{inputenc}{ascii,utf8}{\typeout{true}}{\typeout{false}}
+\typeout{--- has utf8:}
+\IfPackageLoadedWithOptionsTF{inputenc}{utf8}{\typeout{true}}{\typeout{false}}
+
+\typeout{--- is trace and final:}
+\IfPackageLoadedWithOptionsTF{trace}{final}{\typeout{true}}{\typeout{false}}
+
+
+
+\END
diff --git a/base/testfiles/github-0022b.tlg b/base/testfiles/github-0621.tlg
similarity index 59%
copy from base/testfiles/github-0022b.tlg
copy to base/testfiles/github-0621.tlg
index c70d7419..69e6e653 100644
--- a/base/testfiles/github-0022b.tlg
+++ b/base/testfiles/github-0621.tlg
@@ -1,10 +1,32 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-(github-0022b-1.sty
-Package github-0022b-1 with option X
-) (github-0022b-2.sty
-Do something
-) (github-0022b.aux)
+--- is article:
+true
+--- is report:
+false
+--- has german,final:
+true
+--- has final,german:
+true
+--- has draft:
+false
+--- is report and final:
+false
+--- is inputenc:
+true
+--- is trace:
+false
+--- has ascii:
+true
+--- has ascii,utf8:
+false
+--- has utf8:
+false
+--- is trace and final:
+false
+LaTeX Warning: Unused global option(s):
+ [german].
+(github-0621.aux)
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line ....
@@ -19,4 +41,28 @@ LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line ....
LaTeX Font Info: ... okay on input line ....
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line ....
LaTeX Font Info: ... okay on input line ....
-success!
+In body...
+--- is article:
+true
+--- is report:
+false
+--- has german,final:
+true
+--- has final,german:
+true
+--- has draft:
+false
+--- is report and final:
+false
+--- is inputenc:
+true
+--- is trace:
+false
+--- has ascii:
+true
+--- has ascii,utf8:
+false
+--- has utf8:
+false
+--- is trace and final:
+false
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index bd265781..d98aad6e 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -429,6 +429,8 @@ Skipping: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Guard against bad input on input line ....
Skipping: [....-..-..] Spaces in option clash check on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
@@ -1019,6 +1021,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index c05b06d4..86a57f0a 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -423,6 +423,8 @@ Skipping: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Guard against bad input on input line ....
Skipping: [....-..-..] Spaces in option clash check on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
@@ -1003,6 +1005,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution 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 afbdbc67..3be58b31 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -423,6 +423,8 @@ Skipping: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Guard against bad input on input line ....
Skipping: [....-..-..] Spaces in option clash check on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
@@ -1012,6 +1014,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 425bb7f1..4ffe9a07 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -510,6 +510,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 4877673e..67d227de 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -498,6 +498,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 17af41da..1242da96 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -499,6 +499,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Skipping: [....-..-..] Check name with \strcmp on input line ....
Applying: [....-..-..] Undo: check name with \strcmp on input line ....
Skipping: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index 8685286b..fd7e8754 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -518,6 +518,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Applying: [....-..-..] Check name with \strcmp on input line ....
Already applied: [....-..-..] Undo: check name with \strcmp on input line ....
Applying: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 5db0e306..8c059e33 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -507,6 +507,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Applying: [....-..-..] Check name with \strcmp on input line ....
Already applied: [....-..-..] Undo: check name with \strcmp on input line ....
Applying: [....-..-..] Allow for package substitution on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index bd63d4f7..ddd66a64 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -508,6 +508,8 @@ Applying: [....-..-..] Guard against bad input on input line ....
Already applied: [....-..-..] Guard against bad input on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
+Skipping: [....-..-..] Test package loading on input line ....
+Applying: [....-..-..] Test package loading on input line ....
Applying: [....-..-..] Check name with \strcmp on input line ....
Already applied: [....-..-..] Undo: check name with \strcmp on input line ....
Applying: [....-..-..] Allow for package substitution on input line ....
More information about the latex3-commits
mailing list.