From 52b787d36c60fda90673669dd2809c95c1fdfca5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Oct 2016 20:38:20 +0000 Subject: l3 (19oct16) git-svn-id: svn://tug.org/texlive/trunk@42306 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3packages/xparse/xparse.sty | 76 +++++++++++----------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3packages/xparse') diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index 8a4664f615a..4777b58c255 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -50,8 +50,8 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2016/05/18] -\@ifpackagelater{expl3}{2016/05/18} +\RequirePackage{expl3}[2016/10/19] +\@ifpackagelater{expl3}{2016/10/19} {} {% \PackageError{xparse}{Support package l3kernel too old} @@ -65,8 +65,8 @@ } \def\ExplFileName{xparse} \def\ExplFileDescription{L3 Experimental document command parser} -\def\ExplFileDate{2016/05/18} -\def\ExplFileVersion{6512} +\def\ExplFileDate{2016/10/19} +\def\ExplFileVersion{6730} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} \tl_const:Nx \c__xparse_no_value_tl @@ -97,12 +97,12 @@ \int_new:N \l__xparse_processor_int \tl_new:N \l__xparse_signature_tl \tl_new:N \l__xparse_tmp_tl -\cs_new_protected_nopar:Npn \__xparse_declare_cmd:Nnn +\cs_new_protected:Npn \__xparse_declare_cmd:Nnn { \bool_set_false:N \l__xparse_expandable_bool \__xparse_declare_cmd_aux:Nnn } -\cs_new_protected_nopar:Npn \__xparse_declare_expandable_cmd:Nnn +\cs_new_protected:Npn \__xparse_declare_expandable_cmd:Nnn { \bool_set_true:N \l__xparse_expandable_bool \__xparse_declare_cmd_aux:Nnn @@ -267,7 +267,7 @@ \quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn } \__xparse_count_mandatory:N } -\cs_new_protected_nopar:Npn \__xparse_count_type_g:w +\cs_new_protected:Npn \__xparse_count_type_g:w { \__xparse_count_mandatory:N } \cs_new_protected:Npn \__xparse_count_type_G:w #1 { @@ -286,7 +286,7 @@ \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn } \__xparse_count_mandatory:N } -\cs_new_protected_nopar:Npn \__xparse_count_type_m:w +\cs_new_protected:Npn \__xparse_count_type_m:w { \int_incr:N \l__xparse_mandatory_args_int \__xparse_count_mandatory:N @@ -342,7 +342,7 @@ \tl_clear:N \l__xparse_signature_tl \__xparse_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop } -\cs_new_protected_nopar:Npn \__xparse_prepare_signature:N +\cs_new_protected:Npn \__xparse_prepare_signature:N { \bool_set_false:N \l__xparse_processor_bool \__xparse_prepare_signature_bypass:N @@ -373,7 +373,7 @@ { \__xparse_add_type_m:w } } } -\cs_new_protected_nopar:cpn { __xparse_add_type_+:w } +\cs_new_protected:cpn { __xparse_add_type_+:w } { \__xparse_flush_m_args: \bool_set_true:N \l__xparse_long_bool @@ -397,7 +397,7 @@ \tl_put_right:Nn \l__xparse_signature_tl { #1 #2 {#3} } \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_type_g:w +\cs_new_protected:Npn \__xparse_add_type_g:w { \exp_args:No \__xparse_add_type_G:w \c__xparse_no_value_tl } \cs_new_protected:Npn \__xparse_add_type_G:w #1 { @@ -415,13 +415,13 @@ \tl_put_right:Nn \l__xparse_signature_tl { #1 {#2} } \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_type_l:w +\cs_new_protected:Npn \__xparse_add_type_l:w { \__xparse_flush_m_args: \__xparse_add_grabber_mandatory:N l \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_type_m:w +\cs_new_protected:Npn \__xparse_add_type_m:w { \bool_if:nTF { \l__xparse_long_bool || \l__xparse_processor_bool } { @@ -454,13 +454,13 @@ \tl_put_right:Nn \l__xparse_signature_tl { {#1} } \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_type_v:w +\cs_new_protected:Npn \__xparse_add_type_v:w { \__xparse_flush_m_args: \__xparse_add_grabber_mandatory:N v \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_flush_m_args: +\cs_new_protected:Npn \__xparse_flush_m_args: { \int_compare:nNnT \l__xparse_m_args_int > \c_zero { @@ -470,7 +470,7 @@ } \int_zero:N \l__xparse_m_args_int } -\cs_new_protected_nopar:Npn \__xparse_add_grabber_mandatory:N #1 +\cs_new_protected:Npn \__xparse_add_grabber_mandatory:N #1 { \tl_put_right:Nx \l__xparse_signature_tl { @@ -480,7 +480,7 @@ \bool_set_false:N \l__xparse_long_bool \int_decr:N \l__xparse_mandatory_args_int } -\cs_new_protected_nopar:Npn \__xparse_add_grabber_optional:N #1 +\cs_new_protected:Npn \__xparse_add_grabber_optional:N #1 { \tl_put_right:Nx \l__xparse_signature_tl { @@ -495,7 +495,7 @@ } \bool_set_false:N \l__xparse_long_bool } -\cs_new_protected_nopar:cpn { __xparse_add_expandable_type_+:w } +\cs_new_protected:cpn { __xparse_add_expandable_type_+:w } { \bool_set_true:N \l__xparse_long_bool \int_compare:nNnTF \l__xparse_current_arg_int = \c_one @@ -561,24 +561,24 @@ \bool_set_false:N \l__xparse_long_bool \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_g:w +\cs_new_protected:Npn \__xparse_add_expandable_type_g:w { \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g } \__xparse_add_expandable_type_m:w } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_G:w #1 +\cs_new_protected:Npn \__xparse_add_expandable_type_G:w #1 { \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G } \__xparse_add_expandable_type_m:w } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_k:w #1 +\cs_new_protected:Npn \__xparse_add_expandable_type_k:w #1 { \exp_args:NNo \__xparse_add_expandable_type_K:w #1 \c__xparse_no_value_tl } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_K:w #1#2 +\cs_new_protected:Npn \__xparse_add_expandable_type_K:w #1#2 { \__xparse_add_expandable_grabber_optional:n { K } \bool_if:NTF \l__xparse_all_long_bool @@ -594,13 +594,13 @@ \bool_set_false:N \l__xparse_long_bool \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_l:w +\cs_new_protected:Npn \__xparse_add_expandable_type_l:w { \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l } \__xparse_add_expandable_type_m:w } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_m:w +\cs_new_protected:Npn \__xparse_add_expandable_type_m:w { \int_incr:N \l__xparse_m_args_int \__xparse_add_expandable_grabber_mandatory:n { m } @@ -624,7 +624,7 @@ \__xparse_add_expandable_type_D_aux:NNn #1#2 } } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_t:w #1 +\cs_new_protected:Npn \__xparse_add_expandable_type_t:w #1 { \__xparse_add_expandable_grabber_optional:n { t } \bool_if:NTF \l__xparse_all_long_bool @@ -639,19 +639,19 @@ \bool_set_false:N \l__xparse_long_bool \__xparse_prepare_signature:N } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_u:w #1 +\cs_new_protected:Npn \__xparse_add_expandable_type_u:w #1 { \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u } \__xparse_add_expandable_type_m:w } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_v:w +\cs_new_protected:Npn \__xparse_add_expandable_type_v:w { \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v } \__xparse_add_expandable_type_m:w } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_mandatory:n #1 +\cs_new_protected:Npn \__xparse_add_expandable_grabber_mandatory:n #1 { \__xparse_add_expandable_long_check: \tl_put_right:Nx \l__xparse_signature_tl @@ -659,7 +659,7 @@ \bool_set_false:N \l__xparse_long_bool \int_decr:N \l__xparse_mandatory_args_int } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_optional:n #1 +\cs_new_protected:Npn \__xparse_add_expandable_grabber_optional:n #1 { \__xparse_add_expandable_long_check: \int_compare:nNnF \l__xparse_mandatory_args_int > \c_zero @@ -668,7 +668,7 @@ { \exp_not:c { __xparse_expandable_grab_ #1 :w } } \bool_set_false:N \l__xparse_long_bool } -\cs_new_protected_nopar:Npn \__xparse_add_expandable_long_check: +\cs_new_protected:Npn \__xparse_add_expandable_long_check: { \bool_if:nT { \l__xparse_all_long_bool && ! \l__xparse_long_bool } { \__msg_kernel_error:nn { xparse } { inconsistent-long } } @@ -1010,12 +1010,12 @@ } \tl_new:N \l__xparse_v_rest_of_signature_tl \tl_new:N \l__xparse_v_arg_tl -\cs_new_protected_nopar:Npn \__xparse_grab_v:w +\cs_new_protected:Npn \__xparse_grab_v:w { \bool_set_false:N \l__xparse_long_bool \__xparse_grab_v_aux:w } -\cs_new_protected_nopar:Npn \__xparse_grab_v_long:w +\cs_new_protected:Npn \__xparse_grab_v_long:w { \bool_set_true:N \l__xparse_long_bool \__xparse_grab_v_aux:w @@ -1038,7 +1038,7 @@ { \__xparse_grab_v_aux_abort:n { } } } } -\cs_new_protected_nopar:Npn \__xparse_grab_v_group_end: +\cs_new_protected:Npn \__xparse_grab_v_group_end: { \group_align_safe_end: \exp_args:NNNo @@ -1074,14 +1074,14 @@ } { \__xparse_grab_v_aux_abort:n {#2} #2 } } -\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_loop_end: +\cs_new_protected:Npn \__xparse_grab_v_aux_loop_end: { \__xparse_grab_v_group_end: \exp_args:Nx \__xparse_add_arg:n { \tl_tail:N \l__xparse_v_arg_tl } \l__xparse_v_rest_of_signature_tl \l__xparse_args_tl } \int_new:N \l__xparse_v_nesting_int -\cs_new_protected_nopar:Npx \__xparse_grab_v_bgroup: +\cs_new_protected:Npx \__xparse_grab_v_bgroup: { \exp_not:N \__xparse_grab_v_aux_catcodes: \exp_not:n { \int_set_eq:NN \l__xparse_v_nesting_int \c_one } @@ -1117,7 +1117,7 @@ } { \__xparse_grab_v_aux_abort:n {#1} #1 } } -\cs_new_protected_nopar:Npn \__xparse_grab_v_aux_catcodes: +\cs_new_protected:Npn \__xparse_grab_v_aux_catcodes: { \cs_set_eq:NN \do \char_set_catcode_other:N \dospecials @@ -1759,8 +1759,8 @@ \cs_new_eq:NN \IfNoValueF \__xparse_if_no_value:nF \cs_new_eq:NN \IfNoValueT \__xparse_if_no_value:nT \cs_new_eq:NN \IfNoValueTF \__xparse_if_no_value:nTF -\cs_new_nopar:Npn \IfValueF { \__xparse_if_no_value:nT } -\cs_new_nopar:Npn \IfValueT { \__xparse_if_no_value:nF } +\cs_new:Npn \IfValueF { \__xparse_if_no_value:nT } +\cs_new:Npn \IfValueT { \__xparse_if_no_value:nF } \cs_new:Npn \IfValueTF #1#2#3 { \__xparse_if_no_value:nTF {#1} {#3} {#2} } \tl_new:N \ProcessedArgument \cs_new_eq:NN \ReverseBoolean \__xparse_bool_reverse:N -- cgit v1.2.3