diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-19 22:13:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-19 22:13:10 +0000 |
commit | a9b5c8812a42ed9fc7bd6323b1185a096ecb7c0e (patch) | |
tree | 3130ecf7e791b7a7bf9587e8d8d3a339921de401 /Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty | |
parent | dd8d54441efc71090eb7f91c1315b3d08ddbdcdc (diff) |
l3 (19mar17)
git-svn-id: svn://tug.org/texlive/trunk@43548 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index 12966bb5c87..33a8c34a06a 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -23,8 +23,8 @@ %% (C) Copyright 2004-2008 Frank Mittelbach, %% The LaTeX3 Project %% (C) Copyright 2009-2017 The LaTeX3 Project -\RequirePackage{expl3}[2017/03/11] -\@ifpackagelater{expl3}{2017/03/11} +\RequirePackage{expl3}[2017/03/18] +\@ifpackagelater{expl3}{2017/03/18} {} {% \PackageError{xparse}{Support package l3kernel too old} @@ -36,12 +36,10 @@ }% \endinput } -\def\ExplFileName{xparse} -\def\ExplFileDescription{L3 Experimental document command parser} -\def\ExplFileDate{2017/03/11} -\def\ExplFileVersion{6988} -\ProvidesExplPackage - {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} +\def\ExplFileDate{2017/03/18} +\def\ExplFileVersion{7019} +\ProvidesExplPackage{xparse}{\ExplFileDate}{\ExplFileVersion} + {L3 Experimental document command parser} \tl_const:Nx \c__xparse_no_value_tl { \char_generate:nn { `\- } { 11 } NoValue- } \tl_new:N \l__xparse_arg_spec_tl @@ -305,7 +303,7 @@ \__xparse_if_no_value:nTF {#2} { \tl_put_right:Nx \l__xparse_tmpa_tl - { { \exp_not:N \exp_not:n { \exp_not:o { \use_none:n #3 } } } } + { { \exp_not:N \exp_not:n { \exp_not:o {#3} } } } } { \tl_put_right:Nn \l__xparse_tmpa_tl @@ -379,7 +377,7 @@ } { \__xparse_if_no_value:nTF {#2} - { \exp_args:No \__xparse_end_expandable_defaults:nw { \use_none:n #1 } } + { \exp_args:No \__xparse_end_expandable_defaults:nw {#1} } { \__xparse_end_expandable_defaults:nw {#2} } } } @@ -698,7 +696,7 @@ \bool_set_true:N \l__xparse_prefixed_bool \bool_set_true:N \l__xparse_process_some_bool \int_decr:N \l__xparse_current_arg_int - \tl_put_right:Nn \l__xparse_process_one_tl { {#1} } + \tl_put_left:Nn \l__xparse_process_one_tl { {#1} } \__xparse_prepare_signature_bypass:N } \cs_new_protected:Npn \__xparse_add_type_D:w #1#2#3 @@ -815,30 +813,29 @@ } \cs_new_protected:Npn \__xparse_add_default:n #1 { - \bool_set_true:N \l__xparse_defaults_bool - \tl_put_right:Nn \l__xparse_defaults_tl { { . #1} } + \__xparse_if_no_value:nTF {#1} + { \__xparse_add_default: } + { + \bool_set_true:N \l__xparse_defaults_bool + \tl_put_right:Nn \l__xparse_defaults_tl { { \prg_do_nothing: #1 } } + } } \cs_new_protected:Npn \__xparse_add_default: - { \tl_put_right:Nn \l__xparse_defaults_tl { . } } + { \tl_put_right:Nn \l__xparse_defaults_tl { \c__xparse_no_value_tl } } \cs_new_protected:Npn \__xparse_add_default_E:nn #1#2 { \bool_set_true:N \l__xparse_defaults_bool - \tl_set:Nx \l__xparse_tmpa_tl - { - \exp_not:n {#2} - \prg_replicate:nn - { \tl_count:n {#1} - \tl_count:n {#2} } - { { \c__xparse_no_value_tl } } - } \tl_put_right:Nx \l__xparse_defaults_tl { { - \exp_not:f - { \exp_after:wN \__xparse_add_default_E_aux:n \l__xparse_tmpa_tl } + \tl_map_function:nN {#2} \__xparse_add_default_E_aux:n + \prg_replicate:nn + { \tl_count:n {#1} - \tl_count:n {#2} } + { { \c__xparse_no_value_tl } } } } } -\cs_new:Npn \__xparse_add_default_E_aux:n #1 { {#1} } +\cs_new:Npn \__xparse_add_default_E_aux:n #1 { \exp_not:n { {#1} } } \cs_new_protected:cpn { __xparse_add_expandable_type_+:w } { \bool_set_true:N \l__xparse_long_bool |