l3packages (23jun22)

git-svn-id: svn://tug.org/texlive/trunk@63705 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 13 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 0801f7516ad..32bd085a846 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -32,7 +32,7 @@
       }%
     \endinput
   }
-\ProvidesExplPackage{l3keys2e}{2022-06-16}{}
+\ProvidesExplPackage{l3keys2e}{2022-06-22}{}
   {LaTeX2e option processing using LaTeX3 keys}
 \cs_if_exist:NT \ProcessKeysOptions
   { \file_input_stop: }
@@ -90,27 +90,22 @@
           {
             \clist_map_inline:cn { opt@ \@currname . \@currext }
               {
-                \__keys_latexe_options_remove:enn
-                  { \__keys_latexe_remove_equals:n {##1} }
-                  {##1} {#1}
+                \keys_if_exist:nxTF {#1} { \__keys_latexe_remove_equals:n {##1} }
+                  { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
+                  { \clist_put_right:Nn \@unusedoptionlist {##1} }
               }
           }
       }
   }
-\cs_new_protected:Npn \__keys_latexe_options_remove:nnn #1#2#3
-  {
-      \keys_if_exist:nnTF {#3} {#1}
-        { \clist_put_right:Nn \l__keys_latexe_options_clist {#2} }
-        { \clist_put_right:Nn \@unusedoptionlist {#1} }
-  }
-\cs_generate_variant:Nn \__keys_latexe_options_remove:nnn { e }
 \cs_new_protected:Npn \__keys_latexe_options_package:n #1
   {
     \clist_map_inline:Nn \@classoptionslist
       {
-        \__keys_latexe_options_remove:enn
-         { \__keys_latexe_remove_equals:n {##1} }
-         {##1} {#1}
+        \keys_if_exist:nxT {#1} { \__keys_latexe_remove_equals:n {##1} }
+          {
+            \clist_put_right:Nn \l__keys_latexe_options_clist {##1}
+            \clist_remove_all:Nn \@unusedoptionlist {##1}
+          }
       }
   }
 \cs_new_protected:Npn \__keys_latexe_options_local:
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index 9ea75822201..213c63c67f3 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -32,7 +32,7 @@
       }%
     \endinput
   }
-\ProvidesExplPackage{xfp}{2022-06-16}{}
+\ProvidesExplPackage{xfp}{2022-06-22}{}
   {L3 Floating point unit}
 \ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
 \ProvideExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 223a37dfe15..af712c60a32 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -34,7 +34,7 @@
     \endinput
   }
 \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\ProvidesExplPackage{xfrac}{2022-06-16}{}
+\ProvidesExplPackage{xfrac}{2022-06-22}{}
   {L3 Experimental split-level fractions}
 \keys_define:nn { xfrac }
   {
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index d58f8b77b30..846a1486c46 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -60,7 +60,7 @@
       }
   }
 \ExplSyntaxOff
-\ProvidesExplPackage{xparse}{2022-06-16}{}
+\ProvidesExplPackage{xparse}{2022-06-22}{}
   {L3 Experimental document command parser}
 \clist_new:N \l__cmd_options_clist
 \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 65818826a02..365b14451eb 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -32,7 +32,7 @@
       }%
     \endinput
   }
-\ProvidesExplPackage{xtemplate}{2022-06-16}{}
+\ProvidesExplPackage{xtemplate}{2022-06-22}{}
   {L3 Experimental prototype document functions}
 \cs_generate_variant:Nn \keys_define:nn { nx }
 \cs_generate_variant:Nn \tl_trim_spaces:n { e }