l3packages (12mar21)

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

23 files changed, 54 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md
index 05ef0709967..cf52f56e8ff 100644
--- a/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3packages/CHANGELOG.md
@@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+## [2021-03-12]
+
+### Fixed
+- Pass options to frozen `xparse`
+
 ## [2021-02-02]
 
 ### Changed
@@ -119,7 +124,8 @@ this project uses date-based 'snapshot' version identifiers.
 - Switch to ISO date format
 - Improve cross-module use of internal functions
 
-[Unreleased]: https://github.com/latex3/latex3/compare/2021-02-02...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-03-12...HEAD
+[2021-03-12]: https://github.com/latex3/latex3/compare/2021-02-02...2021-03-12
 [2021-02-02]: https://github.com/latex3/latex3/compare/2020-10-27...2021-02-02
 [2020-10-27]: https://github.com/latex3/latex3/compare/2020-10-05...2020-10-27
 [2020-10-05]: https://github.com/latex3/latex3/compare/2020-05-15...2020-10-05
diff --git a/Master/texmf-dist/doc/latex/l3packages/README.md b/Master/texmf-dist/doc/latex/l3packages/README.md
index f2629e79378..8319851b85a 100644
--- a/Master/texmf-dist/doc/latex/l3packages/README.md
+++ b/Master/texmf-dist/doc/latex/l3packages/README.md
@@ -1,7 +1,7 @@
 LaTeX3 High-Level Concepts
 ==========================
 
-Release 2021-02-02
+Release 2021-03-12
 
 Overview
 --------
diff --git a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
index 4acecdf5e11..e55211ccf90 100644
--- a/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
diff --git a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf
index 63d9c3bd2bc..d91a5561bb1 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xfp/xfp.pdf
diff --git a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
index 04b7f9106f0..ec7de169643 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xfrac/xfrac.pdf
diff --git a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
index bdd5f8bfb92..0722a7b93cd 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xparse/xparse.pdf
diff --git a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
index d0d755b8539..c4b96d62d26 100644
--- a/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
+++ b/Master/texmf-dist/doc/latex/l3packages/xtemplate/xtemplate.pdf
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
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 56979538a84..313116cba82 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}{2021-02-02}{}
+\ProvidesExplPackage{l3keys2e}{2021-03-12}{}
   {LaTeX2e option processing using LaTeX3 keys}
 \cs_generate_variant:Nn \clist_put_right:Nn { Nv }
 \cs_generate_variant:Nn \keys_if_exist:nnT  { nx }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index a3e657bf7a6..edaa73fdea1 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -32,8 +32,7 @@
       }%
     \endinput
   }
-\RequirePackage{xparse}
-\ProvidesExplPackage{xfp}{2021-02-02}{}
+\ProvidesExplPackage{xfp}{2021-03-12}{}
   {L3 Floating point unit}
 \NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
 \NewExpandableDocumentCommand \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 f45411dbc3c..cbbfab098b1 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}{2021-02-02}{}
+\ProvidesExplPackage{xfrac}{2021-03-12}{}
   {L3 Experimental split-level fractions}
 \keys_define:nn { xfrac }
   {
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 }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index d4ac8c86767..e417770b7d0 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}{2021-02-02}{}
+\ProvidesExplPackage{xtemplate}{2021-03-12}{}
   {L3 Experimental prototype document functions}
 \tl_const:Nn \c__xtemplate_code_root_tl      { template~code~>~ }
 \tl_const:Nn \c__xtemplate_defaults_root_tl  { template~defaults~>~ }