l3packages (12mar21)

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

10 files changed, 24 insertions, 19 deletions

diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
index cd3f5206a95..501e4c5aaa9 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx
@@ -62,7 +62,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-02}
+% \date{Released 2021-03-12}
 %
 % \maketitle
 %
@@ -139,7 +139,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2021-02-02}{}
+\ProvidesExplPackage{l3keys2e}{2021-03-12}{}
   {LaTeX2e option processing using LaTeX3 keys}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.ins b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.ins
index f5b81f896be..3c437d8ee80 100644
--- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.ins
+++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.ins
@@ -18,7 +18,7 @@ The released version of this bundle is available from CTAN.
 
 \fi
 
-\input l3docstrip.tex
+\input docstrip %
 \askforoverwritefalse
 
 \preamble
diff --git a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx
index 7a86c63782b..0093447c2e8 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.dtx
@@ -38,7 +38,6 @@
 %<package>      }%
 %<package>    \endinput
 %<package>  }
-%<package>\RequirePackage{xparse}
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
@@ -64,7 +63,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-02}
+% \date{Released 2021-03-12}
 %
 % \maketitle
 %
@@ -167,7 +166,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xfp}{2021-02-02}{}
+\ProvidesExplPackage{xfp}{2021-03-12}{}
   {L3 Floating point unit}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.ins b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.ins
index 736445226bf..b5c1d4eea9a 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfp/xfp.ins
+++ b/Master/texmf-dist/source/latex/l3packages/xfp/xfp.ins
@@ -18,7 +18,7 @@ The released version of this bundle is available from CTAN.
 
 \fi
 
-\input l3docstrip.tex
+\input docstrip %
 \askforoverwritefalse
 
 \preamble
diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
index dfdbf25f6aa..dbbdeaf65aa 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx
@@ -65,7 +65,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-02}
+% \date{Released 2021-03-12}
 %
 % \maketitle
 %
@@ -535,7 +535,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2021-02-02}{}
+\ProvidesExplPackage{xfrac}{2021-03-12}{}
   {L3 Experimental split-level fractions}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.ins b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.ins
index d08a89b6d36..20d01acd7b0 100644
--- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.ins
+++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.ins
@@ -19,7 +19,7 @@ The released version of this bundle is available from CTAN.
 
 \fi
 
-\input l3docstrip.tex
+\input docstrip %
 \askforoverwritefalse
 
 \preamble
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index 3ea422301a5..b612ed6d23b 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -67,7 +67,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-02}
+% \date{Released 2021-03-12}
 %
 % \maketitle
 %
@@ -1009,16 +1009,22 @@
   \if\relax#2\relax\else#1\fi#2#3#4 }
 %</2ekernel>
 \ExplSyntaxOn
+\cs_set_protected:Npn \@@_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}
+      \@@_tmp:w { xparse-2018-04-12 }
     \else
 %<2ekernel>      \@@@@input xparse-generic.tex ~
-%<package>      \RequirePackage{xparse-2020-10-01}
+%<package>      \@@_tmp:w { xparse-2020-10-01 }
     \fi
     \file_input_stop:
   }
@@ -1036,7 +1042,7 @@
     \ExplSyntaxOff
     \cs_if_exist:NF \@@_start:nNNnnn
       {
-        \RequirePackage{xparse-2020-10-01}
+        \@@_tmp:w { xparse-2020-10-01 }
         \file_input_stop:
       }
   }
@@ -1058,7 +1064,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xparse}{2021-02-02}{}
+\ProvidesExplPackage{xparse}{2021-03-12}{}
   {L3 Experimental document command parser}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins
index da55996744b..98a6dd8a394 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins
@@ -18,7 +18,7 @@ The released version of this bundle is available from CTAN.
 
 \fi
 
-\input l3docstrip.tex
+\input docstrip %
 \askforoverwritefalse
 
 \preamble
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
index a20b55892e2..d80d3480708 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx
@@ -63,7 +63,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-02}
+% \date{Released 2021-03-12}
 %
 % \maketitle
 %
@@ -682,7 +682,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2021-02-02}{}
+\ProvidesExplPackage{xtemplate}{2021-03-12}{}
   {L3 Experimental prototype document functions}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.ins b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.ins
index 3e88b5e52c4..2e459227f7d 100644
--- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.ins
+++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.ins
@@ -29,7 +29,7 @@ license information is placed in the derived files.
 
 \fi
 
-\input l3docstrip.tex
+\input docstrip %
 \askforoverwritefalse
 
 \preamble