l3packages (12mar21)

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

2 files changed, 18 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx
index 8c6b1eff62e..eea16b67952 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx
@@ -24,13 +24,19 @@
 \def\@parse@version@dash#1-#2-#3#4#5\@nil{%
   \if\relax#2\relax\else#1\fi#2#3#4 }
 \ExplSyntaxOn
+\cs_set_protected:Npn \__cmd_tmp:w #1
+  {
+    \DeclareOption* { \PassOptionsToPackage { \CurrentOption } {#1} }
+    \ProcessOptions \relax
+    \RequirePackage {#1}
+  }
 \cs_if_free:NTF \NewDocumentCommand
   {
     \ExplSyntaxOff
     \ifnum\expandafter
         \@parse@version\fmtversion//00\@nil <
         \@parse@version 2020-10-01//00\@nil
-      \RequirePackage{xparse-2018-04-12}
+      \__cmd_tmp:w { xparse-2018-04-12 }
     \else
       \@@input xparse-generic.tex ~
     \fi
@@ -40,7 +46,7 @@
     \ExplSyntaxOff
     \cs_if_exist:NF \__cmd_start:nNNnnn
       {
-        \RequirePackage{xparse-2020-10-01}
+        \__cmd_tmp:w { xparse-2020-10-01 }
         \file_input_stop:
       }
   }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index eb1ba7110ab..049e1de44bf 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -33,15 +33,21 @@
     \endinput
   }
 \ExplSyntaxOn
+\cs_set_protected:Npn \__cmd_tmp:w #1
+  {
+    \DeclareOption* { \PassOptionsToPackage { \CurrentOption } {#1} }
+    \ProcessOptions \relax
+    \RequirePackage {#1}
+  }
 \cs_if_free:NTF \NewDocumentCommand
   {
     \ExplSyntaxOff
     \ifnum\expandafter
         \@parse@version\fmtversion//00\@nil <
         \@parse@version 2020-10-01//00\@nil
-      \RequirePackage{xparse-2018-04-12}
+      \__cmd_tmp:w { xparse-2018-04-12 }
     \else
-      \RequirePackage{xparse-2020-10-01}
+      \__cmd_tmp:w { xparse-2020-10-01 }
     \fi
     \file_input_stop:
   }
@@ -49,12 +55,12 @@
     \ExplSyntaxOff
     \cs_if_exist:NF \__cmd_start:nNNnnn
       {
-        \RequirePackage{xparse-2020-10-01}
+        \__cmd_tmp:w { xparse-2020-10-01 }
         \file_input_stop:
       }
   }
 \ExplSyntaxOff
-\ProvidesExplPackage{xparse}{2021-02-02}{}
+\ProvidesExplPackage{xparse}{2021-03-12}{}
   {L3 Experimental document command parser}
 \clist_new:N \l__cmd_options_clist
 \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption }