[latex3-commits] [git/LaTeX3-latex3-latex3] main: Revert changes to l3keys2e (8e07ca1e3)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/8e07ca1e38521677364cf78688e02fd0c138e8a6

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

commit 8e07ca1e38521677364cf78688e02fd0c138e8a6
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Jun 21 10:06:18 2022 +0100

    Revert changes to l3keys2e


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

8e07ca1e38521677364cf78688e02fd0c138e8a6
 l3packages/CHANGELOG.md          |  3 +++
 l3packages/l3keys2e/l3keys2e.dtx | 23 ++++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/l3packages/CHANGELOG.md b/l3packages/CHANGELOG.md
index add1cb901..0b939e9a6 100644
--- a/l3packages/CHANGELOG.md
+++ b/l3packages/CHANGELOG.md
@@ -7,6 +7,9 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+- Revert alterations to `l3keys2e`
+
 ## [2022-06-16]
 
 ### Changed
diff --git a/l3packages/l3keys2e/l3keys2e.dtx b/l3packages/l3keys2e/l3keys2e.dtx
index 052c07175..7ca25a725 100644
--- a/l3packages/l3keys2e/l3keys2e.dtx
+++ b/l3packages/l3keys2e/l3keys2e.dtx
@@ -230,7 +230,6 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_latexe_options_class:n}
-% \begin{macro}{\@@_latexe_options_remove:nnn, \@@_latexe_options_remove:enn}
 %   For classes, each option (stripped of any content after |=|)
 %   is checked for existence as a key. If found, the option is added to
 %   the combined list for processing. On the other hand, unused options
@@ -250,23 +249,15 @@
           {
             \clist_map_inline:cn { opt@ \@currname . \@currext }
               {
-                \@@_latexe_options_remove:enn 
-                  { \@@_latexe_remove_equals:n {##1} }
-                  {##1} {#1}
+                \keys_if_exist:nxTF {#1} { \@@_latexe_remove_equals:n {##1} }
+                  { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} }
+                  { \clist_put_right:Nn \@unusedoptionlist {##1} }
               }
           }
       }
   }
-\cs_new_protected:Npn \@@_latexe_options_remove:nnn #1#2#3
-  {
-      \keys_if_exist:nnTF {#3} {#1}
-        { \clist_put_right:Nn \l_@@_latexe_options_clist {#2} }
-        { \clist_put_right:Nn \@unusedoptionlist {#1} }
-  }
-\cs_generate_variant:Nn \@@_latexe_options_remove:nnn { e }
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\@@_latexe_options_package:n}
 %   For global options when processing a package, the tasks are slightly
@@ -278,9 +269,11 @@
   {
     \clist_map_inline:Nn \@classoptionslist
       {
-        \@@_latexe_options_remove:enn
-         { \@@_latexe_remove_equals:n {##1} }
-         {##1} {#1}
+        \keys_if_exist:nxT {#1} { \@@_latexe_remove_equals:n {##1} }
+          {
+            \clist_put_right:Nn \l_@@_latexe_options_clist {##1}
+            \clist_remove_all:Nn \@unusedoptionlist {##1}
+          }
       }
   }
 %    \end{macrocode}