From 1db23bcff288c7facf4492441aa44a69b6cfb4ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Mar 2021 23:00:17 +0000 Subject: l3packages (12mar21) git-svn-id: svn://tug.org/texlive/trunk@58296 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty | 2 +- Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty | 3 +-- Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty | 2 +- Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx | 10 ++++++++-- Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty | 14 ++++++++++---- .../tex/latex/l3packages/xtemplate/xtemplate.sty | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3packages') 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~>~ } -- cgit v1.2.3