[latex3-commits] [git/LaTeX3-latex3-latex2e] rawoptions: move rawoptions to 2021-05-01 (61c37f37)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : rawoptions
Link       : https://github.com/latex3/latex2e/commit/61c37f37d1116dd0353e4c8c05df2ae891d31a07

>---------------------------------------------------------------

commit 61c37f37d1116dd0353e4c8c05df2ae891d31a07
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sun Aug 30 21:08:01 2020 +0100

    move rawoptions to 2021-05-01


>---------------------------------------------------------------

61c37f37d1116dd0353e4c8c05df2ae891d31a07
 base/ltclass.dtx => ltclass.dtx | 122 ++--------------------------------------
 1 file changed, 4 insertions(+), 118 deletions(-)

diff --git a/base/ltclass.dtx b/ltclass.dtx
similarity index 96%
copy from base/ltclass.dtx
copy to ltclass.dtx
index 2313bd01..7b1dbc81 100644
--- a/base/ltclass.dtx
+++ b/ltclass.dtx
@@ -1020,41 +1020,12 @@
 % \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.3p}{2020/08/25}{save raw option lists}
 %    \begin{macrocode}
-%</2ekernel>
-%<latexrelease>\IncludeInRelease{2020/08/25}%
-%<latexrelease>                 {\@pass at ptions}{Raw option lists}%
-%<*2ekernel|latexrelease>
 \def\@pass at ptions#1#2#3{%
   \expandafter\xdef\csname opt@#3.#1\endcsname{%
     \@ifundefined{opt@#3.#1}\@empty
       {\csname opt@#3.#1\endcsname,}%
-    \zap at space#2 \@empty}%
-%    \end{macrocode}
-% Extend raw option list
-%    \begin{macrocode}
-    \@ifundefined{@raw at opt@#3.#1}%
-      {\expandafter\gdef\csname @raw at opt@#3.#1\endcsname{#2}}%
-      {\expandafter\g at addto@macro\csname @raw at opt@#3.#1\endcsname{,#2}}%
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-}
-%</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {\@pass at ptions}{Raw option lists}%
-%<latexrelease>\def\@pass at ptions#1#2#3{%
-%<latexrelease>  \expandafter\xdef\csname opt@#3.#1\endcsname{%
-%<latexrelease>    \@ifundefined{opt@#3.#1}\@empty
-%<latexrelease>      {\csname opt@#3.#1\endcsname,}%
-%<latexrelease>    \zap at space#2 \@empty}}
-%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
+    \zap at space#2 \@empty}}
 \@onlypreamble\@pass at ptions
 %    \end{macrocode}
 %
@@ -1096,49 +1067,18 @@
 % \end{macro}
 %
 % \begin{macro}{\OptionNotUsed}
-% \changes{v1.3p}{2020/08/25}{filter out =value from unused option list}
-% \begin{macro}{\@remove at eq@value}
-% \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{2020/10/01}%
-%<latexrelease>                 {\OptionNotUsed}{filter unused option list}%
-%<*2ekernel|latexrelease>
-\def\@remove at eq@value#1=#2\@nil{#1}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
 \def\OptionNotUsed{%
   \ifx\@currext\@clsextension
     \xdef\@unusedoptionlist{%
       \ifx\@unusedoptionlist\@empty\else\@unusedoptionlist,\fi
-      \expandafter\@remove at eq@value\CurrentOption=\@nil}%
+      \CurrentOption}%
   \fi}
-%</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {\OptionNotUsed}{filter unused option list}%
-%<latexrelease>\let\@remove at eq@value\@undefined
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%<latexrelease>\def\OptionNotUsed{%
-%<latexrelease>  \ifx\@currext\@clsextension
-%<latexrelease>    \xdef\@unusedoptionlist{%
-%<latexrelease>      \ifx\@unusedoptionlist\@empty\else\@unusedoptionlist,\fi
-%<latexrelease>      \CurrentOption}%
-%<latexrelease>  \fi}
-%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
 \@onlypreamble\OptionNotUsed
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\default at ds}
 % The default option code.
@@ -1289,30 +1229,11 @@
 %         {Name changed from \cs{@executeoption}}
 % \changes{v1.0e}{1994/05/17}
 %         {Execute option after removing from list, not before}
-% \changes{v1.3p}{2020/08/25}{filter out =value from unused option list}
 %    \begin{macrocode}
-%</2ekernel>
-%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease>                 {\@use at ption}{filter unused option list}%
-%<*2ekernel|latexrelease>
 \def\@use at ption{%
-  \@expandtwoargs\@removeelement
-     {\expandafter\@remove at eq@value\CurrentOption=\@nil}%
+  \@expandtwoargs\@removeelement\CurrentOption
   \@unusedoptionlist\@unusedoptionlist
   \csname ds@\CurrentOption\endcsname}
-%</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>                 {\@use at ption}{filter unused option list}%
-%<latexrelease>\def\@use at ption{%
-%<latexrelease>  \@expandtwoargs\@removeelement\CurrentOption
-%<latexrelease>  \@unusedoptionlist\@unusedoptionlist
-%<latexrelease>  \csname ds@\CurrentOption\endcsname}
-%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
 \@onlypreamble\@use at ption
 %    \end{macrocode}
 % \end{macro}
@@ -1626,23 +1547,15 @@
 %         {Prevent loss of brackets PR/3965}
 % \changes{v2.1b}{2016/11/09}
 %         {Improve \cs{ifx} tests PR/4497}
-% \changes{v1.3p}{2020/08/25}{save raw class option list}
 %    \begin{macrocode}
 %</2ekernel>
-%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease>\IncludeInRelease{2017/01/01}%
 %<latexrelease>        {\@fileswith at pti@ns}{ifx tests in \@fileswith at pti@ns}%
 %<*2ekernel|latexrelease>
 \def\@fileswith at pti@ns#1[#2]#3[#4]{%
   \ifx#1\@clsextension
     \ifx\@classoptionslist\relax
       \xdef\@classoptionslist{\zap at space#2 \@empty}%
-%    \end{macrocode}
-% Save raw class list.
-%    \begin{macrocode}
-      \gdef\@raw at classoptionslist{#2}%
-%    \end{macrocode}
-%
-%    \begin{macrocode}
       \def\reserved at a{%
         \@onefilewithoptions#3[{#2}][{#4}]#1%
         \@documentclasshook}%
@@ -1681,33 +1594,6 @@
   \fi
   \reserved at a}
 %</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{2017/01/01}%
-%<latexrelease>        {\@fileswith at pti@ns}{ifx tests in \@fileswith at pti@ns}%
-%<latexrelease>\def\@fileswith at pti@ns#1[#2]#3[#4]{%
-%<latexrelease>  \ifx#1\@clsextension
-%<latexrelease>    \ifx\@classoptionslist\relax
-%<latexrelease>      \xdef\@classoptionslist{\zap at space#2 \@empty}%
-%<latexrelease>      \def\reserved at a{%
-%<latexrelease>        \@onefilewithoptions#3[{#2}][{#4}]#1%
-%<latexrelease>        \@documentclasshook}%
-%<latexrelease>    \else
-%<latexrelease>      \def\reserved at a{%
-%<latexrelease>        \@onefilewithoptions#3[{#2}][{#4}]#1}%
-%<latexrelease>    \fi
-%<latexrelease>  \else
-%<latexrelease>    \def\reserved at b##1,{%
-%<latexrelease>      \ifx\@nnil##1\relax\else
-%<latexrelease>        \ifx\@nnil##1\@nnil\else
-%<latexrelease>         \noexpand\@onefilewithoptions##1[{#2}][{#4}]%
-%<latexrelease>         \noexpand\@pkgextension
-%<latexrelease>        \fi
-%<latexrelease>        \expandafter\reserved at b
-%<latexrelease>      \fi}%
-%<latexrelease>      \edef\reserved at a{\zap at space#3 \@empty}%
-%<latexrelease>      \edef\reserved at a{\expandafter\reserved at b\reserved at a,\@nnil,}%
-%<latexrelease>  \fi
-%<latexrelease>  \reserved at a}
 %    \end{macrocode}
 %
 %    \begin{macrocode}