[latex3-commits] [git/LaTeX3-latex3-latex2e] rawoptions: fix includeinrelease guards (ce582536)
David Carlisle
d.p.carlisle at gmail.com
Wed Aug 26 01:06:57 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : rawoptions
Link : https://github.com/latex3/latex2e/commit/ce582536fa4e7bfe1fac6cac7090e06ade8b9774
>---------------------------------------------------------------
commit ce582536fa4e7bfe1fac6cac7090e06ade8b9774
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Wed Aug 26 00:06:57 2020 +0100
fix includeinrelease guards
>---------------------------------------------------------------
ce582536fa4e7bfe1fac6cac7090e06ade8b9774
base/ltclass.dtx | 24 +++++++++++++---------
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 14 +++++++++++++
.../tlb-latexrelease-rollback-003-often.tlg | 14 +++++++++++++
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 14 +++++++++++++
base/testfiles/tlb-rollback-004-often.luatex.tlg | 7 +++++++
base/testfiles/tlb-rollback-004-often.tlg | 7 +++++++
base/testfiles/tlb-rollback-004-often.xetex.tlg | 7 +++++++
7 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index fcbaa8e2..7747c0a3 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/08/25 v1.3o LaTeX Kernel (Class & Package Interface)]
+ [2020/08/25 v1.3p LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -1030,10 +1030,10 @@
% \begin{macro}{\PassOptionsToClass}
% If the package has been loaded, we check that it was first loaded with
% the options. Otherwise we add the option list to that of the package.
-% \changes{v1.3a}{2018/11/11}{save raw option lists}
+% \changes{v1.3p}{2020/08/25}{save raw option lists}
% \begin{macrocode}
%</2ekernel>
-%<latexrelease>\IncludeInRelease{2018/12/01}%
+%<latexrelease>\IncludeInRelease{2020/08/25}%
%<latexrelease> {\@pass at ptions}{Raw option lists}%
%<*2ekernel|latexrelease>
\def\@pass at ptions#1#2#3{%
@@ -1060,6 +1060,7 @@
%<latexrelease> \@ifundefined{opt@#3.#1}\@empty
%<latexrelease> {\csname opt@#3.#1\endcsname,}%
%<latexrelease> \zap at space#2 \@empty}}
+%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
%
@@ -1070,6 +1071,7 @@
% \begin{macrocode}
\def\PassOptionsToPackage{\@pass at ptions\@pkgextension}
\def\PassOptionsToClass{\@pass at ptions\@clsextension}
+\@onlypreamble\PassOptionsToPackage
\@onlypreamble\PassOptionsToClass
% \end{macrocode}
% \end{macro}
@@ -1104,14 +1106,14 @@
% \end{macro}
%
% \begin{macro}{\OptionNotUsed}
-% \changes{v1.3a}{2018/11/11}{filter out =value from unused option list}
+% \changes{v1.3p}{2020/08/25}{filter out =value from unused option list}
% \begin{macro}{\@remove at eq@value}
-% \changes{v1.3a}{2018/11/11}{macro added}
+% \changes{v1.3p}{2020/08/25}{macro added}
% If we are in a class file, add |\CurrentOption| to the list of
% unused options. Otherwise, in a package file do nothing.
% \begin{macrocode}
%</2ekernel>
-%<latexrelease>\IncludeInRelease{2018/12/01}%
+%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\OptionNotUsed}{filter unused option list}%
%<*2ekernel|latexrelease>
\def\@remove at eq@value#1=#2\@nil{#1}
@@ -1138,6 +1140,7 @@
%<latexrelease> \ifx\@unusedoptionlist\@empty\else\@unusedoptionlist,\fi
%<latexrelease> \CurrentOption}%
%<latexrelease> \fi}
+%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
%
@@ -1296,10 +1299,10 @@
% {Name changed from \cs{@executeoption}}
% \changes{v1.0e}{1994/05/17}
% {Execute option after removing from list, not before}
-% \changes{v1.3a}{2018/11/11}{filter out =value from unused option list}
+% \changes{v1.3p}{2020/08/25}{filter out =value from unused option list}
% \begin{macrocode}
%</2ekernel>
-%<latexrelease>\IncludeInRelease{2018/12/01}%
+%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\@use at ption}{filter unused option list}%
%<*2ekernel|latexrelease>
\def\@use at ption{%
@@ -1315,6 +1318,7 @@
%<latexrelease> \@expandtwoargs\@removeelement\CurrentOption
%<latexrelease> \@unusedoptionlist\@unusedoptionlist
%<latexrelease> \csname ds@\CurrentOption\endcsname}
+%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
%
@@ -1632,10 +1636,10 @@
% {Prevent loss of brackets PR/3965}
% \changes{v2.1b}{2016/11/09}
% {Improve \cs{ifx} tests PR/4497}
-% \changes{v1.3a}{2018/11/11}{save raw class option list}
+% \changes{v1.3p}{2020/08/25}{save raw class option list}
% \begin{macrocode}
%</2ekernel>
-%<latexrelease>\IncludeInRelease{2018/12/01}%
+%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\@fileswith at pti@ns}{ifx tests in \@fileswith at pti@ns}%
%<*2ekernel|latexrelease>
\def\@fileswith at pti@ns#1[#2]#3[#4]{%
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index b569a140..fb1bf61e 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -232,13 +232,20 @@ Skipping: [....-..-..] Spaces in option clash check on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Skipping: [....-..-..] Protection for package info on input line ....
Applying: [....-..-..] Protection for package info on input line ....
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Spaces in \ExecuteOptions on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
+Skipping: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
Applying: [....-..-..] Hooks and unused options issue on input line ....
@@ -716,12 +723,19 @@ Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
Skipping: [....-..-..] Protection for package info on input line ....
Applying: [....-..-..] Protection for package info on input line ....
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
Already applied: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 30e8b2e8..a1fe89be 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -230,13 +230,20 @@ Skipping: [....-..-..] Spaces in option clash check on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Skipping: [....-..-..] Protection for package info on input line ....
Applying: [....-..-..] Protection for package info on input line ....
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Spaces in \ExecuteOptions on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
+Skipping: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
Applying: [....-..-..] Hooks and unused options issue on input line ....
@@ -708,12 +715,19 @@ Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
Skipping: [....-..-..] Protection for package info on input line ....
Applying: [....-..-..] Protection for package info on input line ....
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
Already applied: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue 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 b8d59aa9..13b6b764 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -230,13 +230,20 @@ Skipping: [....-..-..] Spaces in option clash check on input line ....
Applying: [....-..-..] Spaces in option clash check on input line ....
Skipping: [....-..-..] Protection for package info on input line ....
Applying: [....-..-..] Protection for package info on input line ....
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Spaces in \ExecuteOptions on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
+Skipping: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Applying: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
Applying: [....-..-..] Hooks and unused options issue on input line ....
@@ -717,12 +724,19 @@ Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
Skipping: [....-..-..] Protection for package info on input line ....
Applying: [....-..-..] Protection for package info on input line ....
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
Already applied: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 7c1391ac..94aa2454 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -321,12 +321,19 @@ Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
Applying: [....-..-..] Protection for package info on input line ....
Already applied: [....-..-..] Protection for package info on input line ...
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
Already applied: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index c573c2d0..9f436173 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -319,12 +319,19 @@ Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
Applying: [....-..-..] Protection for package info on input line ....
Already applied: [....-..-..] Protection for package info on input line ...
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
Already applied: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 0b49e288..73dab11f 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -319,12 +319,19 @@ Applying: [....-..-..] Spaces in option clash check on input line ....
Already applied: [....-..-..] Spaces in option clash check on input line ...
Applying: [....-..-..] Protection for package info on input line ....
Already applied: [....-..-..] Protection for package info on input line ...
+Skipping: [....-..-..] Raw option lists on input line ....
+Applying: [....-..-..] Raw option lists on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Skipping: [....-..-..] Unused options issue on input line ....
Applying: [....-..-..] Unused options issue on input line ....
+Skipping: [....-..-..] filter unused option list on input line ....
+Applying: [....-..-..] filter unused option list on input line ....
Applying: [....-..-..] Spaces in \ExecuteOptions on input line ....
Already applied: [....-..-..] Spaces in \ExecuteOptions on input line ....
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 ....
Already applied: [....-..-..] ifx tests in \@fileswith at pti@ns on input line ....
Skipping: [....-..-..] Hooks and unused options issue on input line ....
More information about the latex3-commits
mailing list.