From 5887a5eebe6eb65039f6e778d037d710d689a42d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Mar 2020 01:01:48 +0000 Subject: l3 (4mar20) git-svn-id: svn://tug.org/texlive/trunk@54099 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3packages/l3keys2e/l3keys2e.sty | 2 +- Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty | 2 +- .../tex/latex/l3packages/xfrac/xfrac.sty | 2 +- .../tex/latex/l3packages/xparse/xparse.sty | 131 ++++++++++++++++----- .../tex/latex/l3packages/xtemplate/xtemplate.sty | 2 +- 5 files changed, 104 insertions(+), 35 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 9efae7c423e..61eba78735f 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}{2020-02-25}{} +\ProvidesExplPackage{l3keys2e}{2020-03-03}{} {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 47575d64cd9..3dec6878540 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty @@ -33,7 +33,7 @@ \endinput } \RequirePackage{xparse} -\ProvidesExplPackage{xfp}{2020-02-25}{} +\ProvidesExplPackage{xfp}{2020-03-03}{} {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 8cd79cadcb4..b7e157493c7 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}{2020-02-25}{} +\ProvidesExplPackage{xfrac}{2020-03-03}{} {L3 Experimental split-level fractions} \keys_define:nn { xfrac } { diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index 38b099379ce..4965ed65475 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xparse}{2020-02-25}{} +\ProvidesExplPackage{xparse}{2020-03-03}{} {L3 Experimental document command parser} \tl_new:N \l__xparse_arg_spec_tl \tl_new:N \l__xparse_args_tl @@ -503,8 +503,8 @@ \cs_new_protected:Npn \__xparse_normalize_type_D:w #1#2#3 { \quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn } - \__xparse_single_char_check:n {#1} - \__xparse_single_char_check:n {#2} + \__xparse_single_token_check:n {#1} \__xparse_allowed_token_check:N #1 + \__xparse_single_token_check:n {#2} \__xparse_add_arg_spec:n { D #1 #2 {#3} } \tl_put_right:Nn \l__xparse_last_delimiters_tl {#1} \bool_set_false:N \l__xparse_grab_expandably_bool @@ -514,7 +514,8 @@ { \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn } \tl_if_blank:nT {#1} { \__xparse_bad_arg_spec:wn } - \tl_map_function:nN {#1} \__xparse_single_char_check:n + \tl_map_function:nN {#1} \__xparse_single_token_check:n + \tl_map_function:nN {#1} \__xparse_allowed_token_check:N \__xparse_normalize_E_unique_check:w #1 \q_nil \q_stop \int_compare:nNnT { \tl_count:n {#2} } > { \tl_count:n {#1} } { \__xparse_bad_arg_spec:wn } @@ -543,7 +544,7 @@ \cs_new_protected:Npn \__xparse_normalize_type_t:w #1 { \quark_if_recursion_tail_stop_do:Nn #1 { \__xparse_bad_arg_spec:wn } - \__xparse_single_char_check:n {#1} + \__xparse_single_token_check:n {#1} \__xparse_allowed_token_check:N #1 \tl_put_right:Nx \l__xparse_arg_spec_tl { \bool_if:NT \l__xparse_obey_spaces_bool { ! } @@ -570,8 +571,8 @@ \cs_new_protected:Npn \__xparse_normalize_type_R:w #1#2#3 { \quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn } - \__xparse_single_char_check:n {#1} - \__xparse_single_char_check:n {#2} + \__xparse_single_token_check:n {#1} \__xparse_allowed_token_check:N #1 + \__xparse_single_token_check:n {#2} \__xparse_delimiter_check:nnn {#1} { R/r } { \tl_to_str:n {#1} } \bool_set_false:N \l__xparse_grab_expandably_bool \__xparse_add_arg_spec_mandatory:n { R #1 #2 {#3} } @@ -607,23 +608,32 @@ { \tl_to_str:n {#1} } \__xparse_bad_def:wn } -\cs_new_protected:Npn \__xparse_single_char_check:n #1 +\cs_new_protected:Npn \__xparse_single_token_check:n #1 { - \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nTF + \tl_trim_spaces_apply:nN {#1} \tl_if_single_token:nF { - \group_begin: - \tex_escapechar:D = 92 \scan_stop: - \exp_args:Nx \tl_if_single_token:nF - { \exp_args:No \tl_to_str:n { \use:nn #1 { } } } - { - \__kernel_msg_warning:nnxx { xparse } { not-single-char } - { \__xparse_environment_or_command: } { \tl_to_str:n {#1} } - } - \group_end: + \__kernel_msg_error:nnxx { xparse } { not-single-token } + { \__xparse_environment_or_command: } { \tl_to_str:n {#1} } + \__xparse_bad_def:wn } + } +\cs_new_protected:Npn \__xparse_allowed_token_check:N #1 + { + \token_if_eq_meaning:NNTF #1 \c_group_begin_token + { \use:n } + { + \token_if_eq_meaning:NNTF #1 \c_group_end_token + { \use:n } + { \use_none:n } + } { - \__kernel_msg_error:nnxx { xparse } { not-single-char } + \__kernel_msg_error:nnxxx + { xparse } { forbidden-implicit-group-token } { \__xparse_environment_or_command: } { \tl_to_str:n {#1} } + { + \token_if_eq_meaning:NNTF #1 \c_group_begin_token + { begin } { end } + } \__xparse_bad_def:wn } } @@ -1055,12 +1065,12 @@ \cs_new_protected:Npn \__xparse_grab_D_obey_spaces:w #1#2#3 \__xparse_run_code: { \__xparse_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected_nopar:Npn - \peek_meaning_remove:NTF + \__xparse_peek_meaning_remove:NTF } \cs_new_protected:Npn \__xparse_grab_D_long_obey_spaces:w #1#2#3 \__xparse_run_code: { \__xparse_grab_D_aux:NNnNN #1 #2 {#3} \cs_set_protected:Npn - \peek_meaning_remove:NTF + \__xparse_peek_meaning_remove:NTF } \cs_new_protected:Npn \__xparse_grab_D_aux:NNnNN #1#2#3#4#5 { @@ -1134,8 +1144,15 @@ \l__xparse_fn_tl \char_generate:nn { `#1 } { 11 } } { - \exp_after:wN \l__xparse_fn_tl - \token_to_str:N #1 + \__xparse_token_if_cs:NTF #1 + { + \exp_after:wN \l__xparse_fn_tl + \cs:w \cs_to_str:N #1 ~ \cs_end: + } + { + \exp_after:wN \l__xparse_fn_tl + \token_to_str:N #1 + } } } \cs_new_protected:Npn \__xparse_grab_E:w #1#2 \__xparse_run_code: @@ -1154,13 +1171,13 @@ { \__xparse_grab_E:nnNN {#1} {#2} \cs_set_protected_nopar:Npn - \peek_meaning_remove:NTF + \__xparse_peek_meaning_remove:NTF } \cs_new_protected:Npn \__xparse_grab_E_long_obey_spaces:w #1#2 \__xparse_run_code: { \__xparse_grab_E:nnNN {#1} {#2} \cs_set_protected:Npn - \peek_meaning_remove:NTF + \__xparse_peek_meaning_remove:NTF } \cs_new_protected:Npn \__xparse_grab_E:nnNN #1#2#3#4 { @@ -1327,7 +1344,7 @@ \cs_new_protected:Npn \__xparse_grab_t:w { \__xparse_grab_t_aux:NNw \__xparse_peek_nonspace_remove:NTF } \cs_new_protected:Npn \__xparse_grab_t_obey_spaces:w - { \__xparse_grab_t_aux:NNw \peek_meaning_remove:NTF } + { \__xparse_grab_t_aux:NNw \__xparse_peek_meaning_remove:NTF } \cs_new_protected:Npn \__xparse_grab_t_aux:NNw #1#2#3 \__xparse_run_code: { \tl_set:Nn \l__xparse_signature_tl {#3} @@ -1878,6 +1895,15 @@ } } \group_end: +\cs_new_protected:Npn \__xparse_token_if_cs:NTF #1 + { + \group_begin: + \int_set:Nn \tex_escapechar:D { 92 } + \exp_args:Nx \tl_if_empty:nTF + { \exp_args:No \str_tail:n { \token_to_str:N #1 } } + { \group_end: \use_ii:nn } + { \group_end: \use_i:nn } + } \cs_new:Npn \__xparse_tl_mapthread_function:NNN #1#2#3 { \exp_after:wN \exp_after:wN @@ -1922,15 +1948,51 @@ } \cs_new:Npn \__xparse_cmd_if_xparse_aux:w #1 ~ #2 \q_stop {#1} \cs_new_protected:Npn \__xparse_peek_nonspace:NTF - { \__xparse_peek_nonspace_aux:nNNTF { } \peek_meaning:NTF } + { \__xparse_peek_nonspace_aux:nNNTF { } \__xparse_peek_meaning:NTF } \cs_new_protected:Npn \__xparse_peek_nonspace_remove:NTF - { \__xparse_peek_nonspace_aux:nNNTF { } \peek_meaning_remove:NTF } + { \__xparse_peek_nonspace_aux:nNNTF { } \__xparse_peek_meaning_remove:NTF } \cs_new_protected:Npn \__xparse_peek_nonspace_aux:nNNTF #1#2#3#4#5 { \peek_meaning_remove:NTF \c_space_token { \__xparse_peek_nonspace_aux:nNNTF { #1 ~ } #2 #3 {#4} {#5} } { #2 #3 { #4 } { #5 #1 } } } +\cs_new_protected:Npn \__xparse_peek_meaning:NTF + { \__xparse_peek_meaning_aux:NNTF \c_false_bool } +\cs_new_protected:Npn \__xparse_peek_meaning_remove:NTF + { \__xparse_peek_meaning_aux:NNTF \c_true_bool } +\cs_new_protected:Npn \__xparse_peek_meaning_aux:NNTF #1#2#3#4 + { + \tl_set:Nn \l__xparse_tmpa_tl {#3} + \tl_set:Nn \l__xparse_tmpb_tl {#4} + \peek_meaning:NTF #2 + { + \token_if_eq_meaning:NNTF #2 \c_group_begin_token + { \__xparse_peek_true_remove:Nw #1 } + { + \__xparse_token_if_cs:NTF #2 + { \__xparse_peek_cs_check_equal:NNN #1 #2 } + { \__xparse_peek_true_remove:Nw #1 } + } + } + { \l__xparse_tmpb_tl } + } +\cs_new_protected:Npn \__xparse_peek_cs_check_equal:NNN #1#2#3 + { + \str_if_eq:nnTF {#2} {#3} + { \__xparse_peek_true_remove:Nw #1 } + { \l__xparse_tmpb_tl } + #3 + } +\cs_new_protected:Npn \__xparse_peek_true_remove:Nw #1 + { + \bool_if:NTF #1 + { + \tex_afterassignment:D \l__xparse_tmpa_tl + \cs_set_eq:NN \__xparse_tmp:w + } + { \l__xparse_tmpa_tl } + } \cs_new:Npn \__xparse_environment_or_command: { \bool_if:NTF \l__xparse_environment_bool @@ -2049,14 +2111,21 @@ token.~Perhaps~a~backslash~is~missing? \c__xparse_ignore_def_tl } -\__kernel_msg_new:nnnn { xparse } { not-single-char } +\__kernel_msg_new:nnnn { xparse } { not-single-token } { Argument~delimiter~'#2'~for~the~#1~should~be~ - a~single~character. + a~single~non-space~token. } { The~argument~specification~provided~was~not~valid:~in~a~place~ - where~a~single~character~is~required,~LaTeX~found~'#2'. + where~a~single~token~is~required,~LaTeX~found~'#2'. + \c__xparse_ignore_def_tl + } +\__kernel_msg_new:nnnn { xparse } { forbidden-implicit-group-token } + { Argument~delimiter~'#2'~for~the~#1~is~not~allowed. } + { + The~argument~specification~provided~was~not~valid:~the~implicit~ + #3-group~token~'#2'~is~not~allowed~as~an~argument~delimiter. \c__xparse_ignore_def_tl } \__kernel_msg_new:nnnn { xparse } { processor-in-expandable } diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index f2a76f35ec2..539568fc4a7 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}{2020-02-25}{} +\ProvidesExplPackage{xtemplate}{2020-03-03}{} {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