diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index ec99bc7a32c..d0cc5e4f09a 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-03-06}{} +\ProvidesExplPackage{xtemplate}{2020-05-14}{} {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~>~ } @@ -68,6 +68,10 @@ \muskip_new:N \l__xtemplate_tmp_muskip \skip_new:N \l__xtemplate_tmp_skip \tl_new:N \l__xtemplate_tmp_tl +\scan_new:N \s__xtemplate_mark +\scan_new:N \s__xtemplate_stop +\quark_new:N \q__xtemplate_nil +\__kernel_quark_new_conditional:Nn \__xtemplate_quark_if_nil:N { F } \cs_generate_variant:Nn \prop_get:NnNTF { No } \cs_generate_variant:Nn \prop_get:NnNT { No } \cs_generate_variant:Nn \prop_get:NnNF { No } @@ -330,7 +334,7 @@ { \tl_clear:N \l__xtemplate_key_name_tl \exp_after:wN \__xtemplate_split_keytype_aux:w - \l__xtemplate_tmp_tl \q_stop + \l__xtemplate_tmp_tl \s__xtemplate_stop } } { @@ -341,7 +345,7 @@ \use:x { \cs_new_protected:Npn \exp_not:N \__xtemplate_split_keytype_aux:w - ##1 \token_to_str:N : ##2 \exp_not:N \q_stop + ##1 \token_to_str:N : ##2 \s__xtemplate_stop { \tl_put_right:Nx \exp_not:N \l__xtemplate_key_name_tl { \exp_not:N \tl_to_str:n {##1} } @@ -349,7 +353,7 @@ { \tl_put_right:Nn \exp_not:N \l__xtemplate_key_name_tl { \token_to_str:N : } - \exp_not:N \__xtemplate_split_keytype_aux:w ##2 \exp_not:N \q_stop + \exp_not:N \__xtemplate_split_keytype_aux:w ##2 \s__xtemplate_stop } { \exp_not:N \tl_if_empty:NTF \exp_not:N \l__xtemplate_key_name_tl @@ -370,7 +374,7 @@ \tl_if_in:nnT {#1} {##1} { \cs_set:Npn \__xtemplate_split_keytype_arg_aux:w - ####1 ##1 ####2 \q_stop + ####1 ##1 ####2 \s__xtemplate_stop { \tl_if_empty:nT {####1} { @@ -379,7 +383,7 @@ \seq_map_break: } } - \__xtemplate_split_keytype_arg_aux:w #1 \q_stop + \__xtemplate_split_keytype_arg_aux:w #1 \s__xtemplate_stop } } \seq_map_function:NN \c__xtemplate_keytypes_arg_seq @@ -387,7 +391,7 @@ } \cs_generate_variant:Nn \__xtemplate_split_keytype_arg:n { o } \cs_new:Npn \__xtemplate_split_keytype_arg_aux:n #1 { } -\cs_new:Npn \__xtemplate_split_keytype_arg_aux:w #1 \q_stop { } +\cs_new:Npn \__xtemplate_split_keytype_arg_aux:w #1 \s__xtemplate_stop { } \cs_new_protected:Npn \__xtemplate_store_value_boolean:n #1 { \__xtemplate_if_eval_now:nTF {#1} @@ -531,7 +535,7 @@ } { \tl_if_in:nnTF {#1} { global } - { \__xtemplate_parse_vars_elt_aux:w #1 \q_stop } + { \__xtemplate_parse_vars_elt_aux:w #1 \s__xtemplate_stop } { \msg_error:nnx { xtemplate } { bad-variable } { \tl_to_str:n {#1} } @@ -540,7 +544,7 @@ } } } -\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:w #1 global #2 \q_stop +\cs_new_protected:Npn \__xtemplate_parse_vars_elt_aux:w #1 global #2 \s__xtemplate_stop { \tl_if_empty:nTF {#1} { @@ -812,10 +816,10 @@ \bool_set_false:N \l__xtemplate_global_bool \tl_if_in:onT \l__xtemplate_var_tl { global } { - \exp_after:wN \__xtemplate_find_global_aux:w \l__xtemplate_var_tl \q_stop + \exp_after:wN \__xtemplate_find_global_aux:w \l__xtemplate_var_tl \s__xtemplate_stop } } -\cs_new_protected:Npn \__xtemplate_find_global_aux:w #1 global #2 \q_stop +\cs_new_protected:Npn \__xtemplate_find_global_aux:w #1 global #2 \s__xtemplate_stop { \tl_set:Nn \l__xtemplate_var_tl {#2} \bool_set_true:N \l__xtemplate_global_bool @@ -1011,16 +1015,16 @@ \l__xtemplate_value_tl { \exp_after:wN \__xtemplate_key_to_value_auxii:w \l__xtemplate_value_tl - \q_mark global \q_nil \q_stop + \s__xtemplate_mark global \q__xtemplate_nil \s__xtemplate_stop } { \msg_error:nnx { xtemplate } { unknown-attribute } { \l__xtemplate_tmp_tl } } } -\cs_new_protected:Npn \__xtemplate_key_to_value_auxii:w #1 global #2#3 \q_stop +\cs_new_protected:Npn \__xtemplate_key_to_value_auxii:w #1 global #2#3 \s__xtemplate_stop { - \quark_if_nil:NF #2 + \__xtemplate_quark_if_nil:NF #2 { \tl_set:Nn \l__xtemplate_value_tl {#2} } } \cs_new_protected:Npn \__xtemplate_use_instance:nn #1#2 |