summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/xpackages/template.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/xpackages/template.sty')
-rw-r--r--Master/texmf-dist/tex/latex/xpackages/template.sty400
1 files changed, 199 insertions, 201 deletions
diff --git a/Master/texmf-dist/tex/latex/xpackages/template.sty b/Master/texmf-dist/tex/latex/xpackages/template.sty
index 354eee4abd0..a64a9cf4cc9 100644
--- a/Master/texmf-dist/tex/latex/xpackages/template.sty
+++ b/Master/texmf-dist/tex/latex/xpackages/template.sty
@@ -20,7 +20,7 @@
%% ======================================================================
%%
%% File: template.dtx (C) Copyright 1999-2001 David Carlisle, Frank Mittelbach
-%% (C) Copyright 2004-2008 Frank Mittelbach, LaTeX3 Project
+%% (C) Copyright 2004-2009 Frank Mittelbach, LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -53,20 +53,20 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{l3names}
-\GetIdInfo$Id: template.dtx 749 2008-08-03 19:01:36Z morten $
+\RequirePackage{expl3}
+\GetIdInfo$Id: template.dtx 1295 2009-05-06 08:32:25Z will $
{template}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
+\RequirePackage{expl3}
\RequirePackage{ldcsetup,xparse}
-\RequirePackage{l3toks,l3tlp,l3skip,l3int,l3clist,l3token,l3calc}
\toks_new:N\l_TP_KV_assignments_toks
\toks_new:N\l_TP_default_assignments_toks
-\def_new:NNn \TP_declare_instance:Nnn 3{
+\cs_new_nopar:Nn \TP_declare_instance:Nnn {
\group_begin:
\TP_instdecl_generate_assignments:nn {#2}{#3}
- \gdef:Npx #1 {
- \tlp_if_eq:cNTF { TP>/#2 } \c_TP_doparameterassignments_tlp
+ \cs_gset_nopar:Npx #1 {
+ \tl_if_eq:cNTF { TP>/#2 } \c_TP_doparameterassignments_tl
{ \toks_use:N \l_TP_KV_assignments_toks }
{
\exp_not:N \TP_push_assignments:n
@@ -75,175 +75,177 @@
}
}
\group_end:}
-\def_new:Npn \TP_declare_instance:cnn{\exp_args:Nc\TP_declare_instance:Nnn}
-\tlp_set:Nn \c_TP_doparameterassignments_tlp {\DoParameterAssignments}
-\def_new:NNn \UseTemplate 3{
+\cs_generate_variant:Nn \TP_declare_instance:Nnn {cnn}
+\tl_set:Nn \c_TP_doparameterassignments_tl {\DoParameterAssignments}
+\cs_new_nopar:Npn \UseTemplate #1#2#3{
\TP_instdecl_generate_assignments:nn {#1/#2}{#3}
\TP_push_assignments:
- \cs_use:c { TP>/#1/#2 }
+ \use:c { TP>/#1/#2 }
}
-\def_new:Npn \DoParameterAssignments{
- \exp_after:NN
+\cs_new_nopar:Npn \DoParameterAssignments{
+ \exp_after:wN
\TP_pop_and_execute_assignments:nw
\toks_use:N \g_TP_assignments_stack_toks \q_stop
}
-\def_new:Npn \TP_pop_and_execute_assignments:nw#1#2\q_stop{
+\cs_new_nopar:Npn \TP_pop_and_execute_assignments:nw#1#2\q_stop{
\toks_gset:Nn \g_TP_assignments_stack_toks {#2}
#1}
\toks_new:N \g_TP_assignments_stack_toks
\toks_gset:Nn \g_TP_assignments_stack_toks {\scan_stop:}% avoid brace loss
-\def_long_new:Npn \TP_push_assignments:n#1{
+\cs_new:Npn \TP_push_assignments:n#1{
\toks_gput_left:Nn\g_TP_assignments_stack_toks{{#1}}
}
-\def_new:Npn \TP_push_assignments:{
+\cs_new_nopar:Npn \TP_push_assignments:{
\toks_gset:No \g_TP_assignments_stack_toks
- {\exp_after:NN
- {\toks_use:N\exp_after:NN\l_TP_KV_assignments_toks\exp_after:NN}
+ {\exp_after:wN
+ {\toks_use:N\exp_after:wN\l_TP_KV_assignments_toks\exp_after:wN}
\toks_use:N\g_TP_assignments_stack_toks}
}
-\def_new:NNn \DeclareTemplateType 2{
- \tlp_set:cn {TP@<#1>} {{}#2}}
-\def_new:Npn \TP_get_csname_prefix:n#1{
- <\exp_after:NN\exp_after:NN\exp_after:NN
- \use_arg_i:nn
+\cs_new_nopar:Npn \DeclareTemplateType #1#2{
+ \tl_set:cn {TP@<#1>} {{}#2}}
+\cs_new_nopar:Nn \TP_get_csname_prefix:n {
+ <\exp_after:wN\exp_after:wN\exp_after:wN
+ \use_i:nn
\cs:w TP@<#1>\cs_end:>#1/
}
-\def_new:Npn \TP_get_arg_count:n#1{
- \exp_after:NN\exp_after:NN\exp_after:NN
- \use_arg_ii:nn
+\cs_new_nopar:Nn \TP_get_arg_count:n {
+ \exp_after:wN\exp_after:wN\exp_after:wN
+ \use_ii:nn
\cs:w TP@<#1>\cs_end:
}
-\def_long_new:NNn\DeclareTemplate 5{
+\cs_new:Npn\DeclareTemplate #1#2#3#4#5{
\cs_if_free:cTF{TP@<#1>}
{\undefinedtype\DeclareTemplateType{#1}#3}
{
- \int_compare:nNnF{#3}={\TP_get_arg_count:n{#1}}
+ \intexpr_compare:nNnF{#3}={\TP_get_arg_count:n{#1}}
{ \BadArgCount }
}
- \let:NN \KV_elt:nn \TP_templdecl_process_KV:nn
- \def:Npn \KV_default_elt:n##1{
+ \cs_set_eq:NN \KV_elt:nn \TP_templdecl_process_KV:nn
+ \cs_set_nopar:Npn \KV_default_elt:n##1{
\PackageError{template}{Missing~ =~ after~ ##1}\@ehd}
- \let:NN\KV@elt\KV_elt:nn
- \let:NN\KV@default@elt\KV_default_elt:n
- \tlp_set:Nn \l_TP_curr_name_tlp {#1/#2}
+ \cs_set_eq:NN\KV@elt\KV_elt:nn
+ \cs_set_eq:NN\KV@default@elt\KV_default_elt:n
+ \tl_set:Nn \l_TP_curr_name_tl {#1/#2}
\toks_clear:N\l_TP_default_assignments_toks
- %\int_compare:nNnTF{\char_value_catcode:n{`\ }}=\c_nine
+ %\intexpr_compare:nNnTF{\char_value_catcode:n{`\ }}=\c_nine
%\KV_parse_picky_no_space_removal_no_sanitize:n
%\KV_parse_picky_space_removal_no_sanitize:n
\KV@parse{#4}
- \tlp_set:cx { TPD>/\l_TP_curr_name_tlp }
+ \cs_set_nopar:cpx { TPD>/\l_TP_curr_name_tl }
{\toks_use:N\l_TP_default_assignments_toks}
- \tlp_clear:c {TPR>/\l_TP_curr_name_tlp}
+ \tl_clear:c {TPR>/\l_TP_curr_name_tl}
- \tlp_set_eq:cN {TPO>/\l_TP_curr_name_tlp}\l_TP_curr_name_tlp
- \def_long:cNn {TP>/\l_TP_curr_name_tlp}{#3}{#5}
+ \tl_set_eq:cN {TPO>/\l_TP_curr_name_tl}\l_TP_curr_name_tl
+ \cs_generate_from_arg_count:cNnn {TP>/\l_TP_curr_name_tl}
+ \cs_set:Npn {#3}{#5}
}
-\def_new:Npn \TP_templdecl_process_KV:nn#1#2{%
- \let:NN \TP_templdecl_add_global_or_nothing: \use_noop:
+\cs_set:Npn \tl_set:cx {\exp_args:Nc \tl_set:Nx}
+\cs_new_nopar:Nn \TP_templdecl_process_KV:nn {%
+ \cs_set_eq:NN \TP_templdecl_add_global_or_nothing: \prg_do_nothing:
\bool_set_false:N\l_TP_global_assignment_bool
- \tlp_set:Nn\l_TP_currkey_tlp{#1}
+ \tl_set:Nn\l_TP_currkey_tl{#1}
\TP_templdecl_parse_KV:N#2\q_stop}
-\def_new:Npn \TP_templdecl_parse_KV:N#1{
+\cs_new_nopar:Nn \TP_templdecl_parse_KV:N {
\cs_if_free:cTF{TP_use_arg_type_#1:w}
- {\PackageError{template}{Unknown~key~type~ (#1)~for~\l_TP_currkey_tlp}\@eha}
- {\cs_use:c{TP_use_arg_type_#1:w}}
+ {\PackageError{template}{Unknown~key~type~ (#1)~for~\l_TP_currkey_tl}\@eha}
+ {\use:c{TP_use_arg_type_#1:w}}
}
\bool_new:N \l_TP_global_assignment_bool
-\def_new:cpn{TP_use_arg_type_+:w} {
+\cs_new_nopar:cpn{TP_use_arg_type_+:w} {
\bool_set_true:N\l_TP_global_assignment_bool
- \def:Npn \TP_templdecl_add_global_or_nothing:
+ \cs_set_nopar:Npn \TP_templdecl_add_global_or_nothing:
{\toks_put_right:Nn \l_TP_KV_assignments_toks {\pref_global:D} }
\TP_templdecl_parse_KV:N
}
-\def_new:Npn\TP_use_arg_type_l:w {
+\cs_new_nopar:Npn\TP_use_arg_type_l:w {
\TP_parse_optional_key_default:nw
{
- \let:NN \TP_templdecl_add_global_or_nothing: \use_noop:
+ \cs_set_eq:NN \TP_templdecl_add_global_or_nothing: \prg_do_nothing:
\bool_if:NTF \l_TP_global_assignment_bool
{\TP_templdecl_setup_register_key:Nn\gsetlength}
{\TP_templdecl_setup_register_key:Nn\setlength}
}
}
-\def_new:Npn\TP_use_arg_type_L:w {
+\cs_new_nopar:Npn\TP_use_arg_type_L:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_fakeregister_key:NNn\setlength\l_tmpa_skip}
}
-\def_new:Npn\TP_use_arg_type_c:w {
+\cs_new_nopar:Npn\TP_use_arg_type_c:w {
\TP_parse_optional_key_default:nw
{
- \let:NN\TP_templdecl_add_global_or_nothing:\use_noop:
+ \cs_set_eq:NN\TP_templdecl_add_global_or_nothing:\prg_do_nothing:
\bool_if:NTF \l_TP_global_assignment_bool
{\TP_templdecl_setup_register_key:Nn\GSetInternalCounter}
{\TP_templdecl_setup_register_key:Nn\SetInternalCounter}
}
}
-\def_new:Npn\TP_use_arg_type_C:w {
+\cs_new_nopar:Npn\TP_use_arg_type_C:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_fakeregister_key:NNn
\SetInternalCounter\l_tmpa_int}
}
-\def_new:Npn\TP_use_arg_type_n:w {
+\cs_new_nopar:Npn\TP_use_arg_type_n:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_n_key:N}
}
-\def_new:Npn\TP_use_arg_type_f:w #1{
+\cs_new_nopar:Npn\TP_use_arg_type_f:w #1{
%\TP_templdecl_parse_f_arg:nw {#1}
\TP_parse_optional_key_default:nw{\TP_templdecl_setup_f_key:Nn{#1}}
}
-\def_new:Npn \TP_templdecl_parse_f_arg:nw#1#2{
+\cs_new_nopar:Npn \TP_templdecl_parse_f_arg:nw#1#2{
\TP_parse_optional_key_default:nw{\TP_templdecl_setup_f_key:Nn{#1}{#2}}
}
-\def_new:Npn\TP_use_arg_type_b:w {
+\cs_new_nopar:Npn\TP_use_arg_type_b:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_b_key:n}
}
-\def_new:Npn \TP_templdecl_setup_b_key:n#1{
- \let:cN { if#1 } \if_true:
+\cs_new_nopar:Npn \TP_templdecl_setup_b_key:n#1{
+ \cs_set_eq:cN { if#1 } \if_true:
\TP_templdecl_define_key:n
{ \TP_templdecl_eval_b_key_value:nn {#1}{##1} }
}
-\def_new:Npn \TP_templdecl_eval_b_key_value:nn#1#2{
+\cs_new_nopar:Npn \TP_templdecl_eval_b_key_value:nn#1#2{
\cs_if_free:cTF {if#2}
{ \PackageError{template}{Bad~boolean~setting~#1=#2}\@eha }
- { \tlp_set_eq:cc {if_#1:}{if_#2:}
+ { \tl_set_eq:cc {if_#1:}{if_#2:}
\toks_put_right:Nf \l_TP_KV_assignments_toks
- { \tlp_set_eq:cc {if_#1:}{if_#2:} }
+ { \tl_set_eq:cc {if_#1:}{if_#2:} }
}
}
-\def_new:Npn\TP_use_arg_type_s:w {
+\cs_new_nopar:Npn\TP_use_arg_type_s:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_s_key:n}
}
-\def_new:Npn \TP_templdecl_setup_s_key:n #1 {
+\cs_new_nopar:Npn \TP_templdecl_setup_s_key:n #1 {
\TP_templdecl_define_key:n
{ \TP_templdecl_eval_s_key_value:nnn{##1}#1 }
}
-\def_new:Npn\TP_use_arg_type_i:w #1{
+\cs_new_nopar:Npn\TP_use_arg_type_i:w #1{
\TP_parse_optional_key_default:nw{\TP_templdecl_setup_i_key:nnn{#1}}
}
-\def_new:Npn \TP_templdecl_setup_i_key:nnn#1#2{
+\cs_new_nopar:Npn \TP_templdecl_setup_i_key:nnn#1#2{
\TP_templdecl_define_key:n
{
\TP_templdecl_eval_i_key_value:Nnn #2 {#1}{##1}
}
}
-\def_new:Npn \TP_templdecl_eval_i_key_value:Nnn #1#2#3 {
- \tlist_if_head_eq_meaning:nNTF {#3.}\UseTemplate
+\cs_new_nopar:Npn \TP_templdecl_eval_i_key_value:Nnn #1#2#3 {
+ \tl_if_head_eq_meaning:nNTF {#3.}\UseTemplate
{
- \io_put_term:x{\token_to_string:N\UseTemplate\space seen}
+ \iow_term:x{\token_to_str:N\UseTemplate\space seen}
{\TP_templdecl_declare_tmp_instance:nnnn #3 }
\toks_put_right:No \l_TP_KV_assignments_toks
- { \exp_after:NN \KV@toks \exp_after:NN {\g_tmpa_tlp} }
+ { \exp_after:wN \KV@toks \exp_after:wN {\g_tmpa_tl} }
%\TP_templdecl_add_global_or_nothing:
%\toks_put_right:Nn \l_TP_KV_assignments_toks
- % { \def:Npx #1{ \toks_use:N \KV@toks} }
+ % { \cs_set_nopar:Npx #1{ \toks_use:N \KV@toks} }
\bool_if:NTF \l_TP_global_assignment_bool
{\toks_put_right:Nn \l_TP_KV_assignments_toks
- {\gdef:Npx #1 { \toks_use:N \KV@toks}}
+ {\cs_gset_nopar:Npx #1 { \toks_use:N \KV@toks}}
}
{\toks_put_right:Nn \l_TP_KV_assignments_toks
- {\def:Npx #1 { \toks_use:N \KV@toks}}
+ {\cs_set_nopar:Npx #1 { \toks_use:N \KV@toks}}
}
}
{
@@ -252,34 +254,37 @@
{ \TP_let_instance:Nnn#1{#2}{#3} }
}
}
-\def_new:Npn\TP_use_arg_type_x:w {
+\cs_new_nopar:Npn\TP_use_arg_type_x:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_x_key:n}
}
-\def_new:Npn \TP_templdecl_setup_x_key:n#1{
+\cs_new_nopar:Npn \TP_templdecl_setup_x_key:n#1{
\TP_templdecl_define_key:n
{ \toks_put_right:Nn\l_TP_KV_assignments_toks{#1} }
}
-\def_new:Npn\TP_use_arg_type_g:w {
+\cs_new_nopar:Npn\TP_use_arg_type_g:w {
\TP_parse_optional_key_default:nw
{\TP_templdecl_setup_g_key:n}
}
-\def_new:Npn \TP_templdecl_setup_g_key:n #1 {
+\cs_new_nopar:Npn \TP_templdecl_setup_g_key:n #1 {
\TP_templdecl_define_key:n{#1}}
-\def_new:Npn \TP_templdecl_define_key:n#1{
- \tlp_set:Nx \l_tmpa_tlp {
- \exp_not:N \TP_templdecl_remove_from_default_assignments:N
- \exp_not:c{KV@\l_TP_curr_name_tlp @\l_TP_currkey_tlp}
- \exp_not:o {\TP_templdecl_add_global_or_nothing: }
- }
- \exp_args:NcNo \def:NNn {KV@\l_TP_curr_name_tlp @\l_TP_currkey_tlp} 1
- { \l_tmpa_tlp #1 }
-}
-\def_long:Npn \TP_ignore_leading_space_in_arg_ii:nn#1#2{
+\cs_new_nopar:Npn \TP_templdecl_define_key:n#1{
+ \exp_after:wN \cs_set:Npn \cs:w
+ KV@\l_TP_curr_name_tl @\l_TP_currkey_tl
+ \exp_after:wN\cs_end:
+ \exp_after:wN##\exp_after:wN1\exp_after:wN{
+ \exp_after:wN\TP_templdecl_remove_from_default_assignments:N
+ \cs:w KV@\l_TP_curr_name_tl @\l_TP_currkey_tl
+ \exp_after:wN \cs_end:
+ \TP_templdecl_add_global_or_nothing:
+ #1
+ }
+}
+\cs_set:Npn \TP_ignore_leading_space_in_arg_ii:nn#1#2{
\exp_args:Nf\TP_ignore_leading_space_in_arg_ii_aux:nn
{\exp_not:N #2}{#1}
}
-\def_long:Npn \TP_ignore_leading_space_in_arg_ii_aux:nn#1#2{#2{#1}}
+\cs_set:Npn \TP_ignore_leading_space_in_arg_ii_aux:nn#1#2{#2{#1}}
\DeclareArgumentType t[{meaning}{}{\NoValue}{#1[#2]}{#2}
\DeclareDocumentCommand\TP_parse_optional_key_default:nw{mt}{
@@ -287,132 +292,134 @@
{\TP_templdecl_finish_key_setup:nw{#1}}
{\TP_templdecl_finish_key_setup_with_default:nnw{#1}{#2}}
}
-\def_new:Npn \TP_templdecl_finish_key_setup:nw#1#2\q_stop{
+\cs_new_nopar:Npn \TP_templdecl_finish_key_setup:nw#1#2\q_stop{
\TP_ignore_leading_space_in_arg_ii:nn{#1}{#2}
%%%#1{#2}
}
-\def_new:Npn \TP_templdecl_finish_key_setup_with_default:nnw#1#2#3\q_stop{
+\cs_new_nopar:Npn \TP_templdecl_finish_key_setup_with_default:nnw#1#2#3\q_stop{
\TP_ignore_leading_space_in_arg_ii:nn{#1}{#3}
%%% #1 {#3}
\group_begin:
\toks_clear:N \l_TP_KV_assignments_toks
- \let:NN \TP_templdecl_remove_from_default_assignments:N \use_none:n
- \cs_use:c{KV@\l_TP_curr_name_tlp @\l_TP_currkey_tlp}{#2}
- \exp_after:NN
+ \cs_set_eq:NN \TP_templdecl_remove_from_default_assignments:N \use_none:n
+ \use:c{KV@\l_TP_curr_name_tl @\l_TP_currkey_tl}{#2}
+ \exp_after:wN
\group_end:
- \exp_after:NN
+ \exp_after:wN
\toks_set:Nn
- \exp_after:NN
+ \exp_after:wN
\l_TP_default_assignments_toks
- \exp_after:NN
- { \cs:w KV@\l_TP_curr_name_tlp @\l_TP_currkey_tlp \exp_after:NN \cs_end:
- \exp_after:NN
- { \toks_use:N \exp_after:NN \l_TP_KV_assignments_toks
- \exp_after:NN
+ \exp_after:wN
+ { \cs:w KV@\l_TP_curr_name_tl @\l_TP_currkey_tl \exp_after:wN \cs_end:
+ \exp_after:wN
+ { \toks_use:N \exp_after:wN \l_TP_KV_assignments_toks
+ \exp_after:wN
}
\toks_use:N\l_TP_default_assignments_toks
}
}
-\tlp_new:Nn \c_TP_true_tlp {true}
-\def_new:Npn \TP_templdecl_eval_s_key_value:nnn#1#2#3 {
- \tlp_set:Nn \l_tmpa_tlp {#1}
- \tlp_if_eq:NNTF \l_tmpa_tlp \c_TP_true_tlp
+\tl_new:Nn \c_TP_true_tl {true}
+\cs_new_nopar:Npn \TP_templdecl_eval_s_key_value:nnn#1#2#3 {
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \tl_if_eq:NNTF \l_tmpa_tl \c_TP_true_tl
{ \toks_put_right:Nn \l_TP_KV_assignments_toks {#2} }
{ \toks_put_right:Nn \l_TP_KV_assignments_toks {#3} }
}
-\def_new:Npn \TP_templdecl_setup_register_key:Nn #1#2{
+\cs_new_nopar:Npn \TP_templdecl_setup_register_key:Nn #1#2{
\TP_templdecl_define_key:n{
- \tlist_if_head_eq_meaning:nNTF{##1}\DelayEvaluation
+ \tl_if_head_eq_meaning:nNTF{##1}\DelayEvaluation
{
\toks_put_right:Nn \l_TP_KV_assignments_toks {#1#2{##1}}
- %\toks_set:No\l_tmpa_toks{\use_arg_ii:nn ##1}
+ %\toks_set:No\l_tmpa_toks{\use_ii:nn ##1}
%\toks_put_right:Nx \l_TP_KV_assignments_toks
% {\exp_not:n{#1#2}{\toks_use:N \l_tmpa_toks}}
}
{
- \tlist_if_head_eq_meaning:nNTF{##1..}\MultiSelection
+ \tl_if_head_eq_meaning:nNTF{##1..}\MultiSelection
{
\group_begin:
\TP_multiselection_add:nnnnnn #1#2##1
\group_end:
- \tlist_if_in:onTF{\toks_use:N\g_TP_multiselection_toks}\DelayEvaluation
+ \tl_if_in:onTF{\toks_use:N\g_TP_multiselection_toks}\DelayEvaluation
{
\toks_put_right:No\l_TP_KV_assignments_toks
{
- \exp_after:NN#1\exp_after:NN#2\exp_after:NN
+ \exp_after:wN#1\exp_after:wN#2\exp_after:wN
{\toks_use:N\g_TP_multiselection_toks}
}
}
{
\toks_put_right:No\l_TP_KV_assignments_toks
{
- \exp_after:NN #2
- \exp_after:NN= \toks_use:N\g_TP_multiselection_toks\scan_stop:
+ \exp_after:wN #2
+ \exp_after:wN= \toks_use:N\g_TP_multiselection_toks\scan_stop:
}
}
}
{
#1#2{##1}
\toks_put_right:No\l_TP_KV_assignments_toks {
- \exp_after:NN #2 \exp_after:NN = \tex_the:D #2\scan_stop:
+ \exp_after:wN #2 \exp_after:wN = \tex_the:D #2\scan_stop:
}
}
}
}
}
-\def_new:NNn\DelayEvaluation 1{\use_none:n{\DelayEvaluation}#1}
-\def_new:NNn\MultiSelection 1{\use_none:n{\MultiSelection}#1}
-\def_new:Npn \TP_templdecl_remove_from_default_assignments:N#1{
- \def:Npn \tmp:w ##1#1##2##3#1##4\q_stop{
+\cs_new_nopar:Npn\DelayEvaluation #1{\use_none:n{\DelayEvaluation}#1}
+\cs_new_nopar:Npn\MultiSelection #1{\use_none:n{\MultiSelection}#1}
+\cs_new_nopar:Npn \TP_templdecl_remove_from_default_assignments:N#1{
+ \cs_set_nopar:Npn \TP_tmp:w ##1#1##2##3#1##4\q_stop{
\l_TP_default_assignments_toks{##1##3}
}
- \exp_after:NN \tmp:w
+ \exp_after:wN \TP_tmp:w
\toks_use:N\l_TP_default_assignments_toks #1\scan_stop:#1\q_stop}
-\def_new:Npn \TP_templdecl_setup_f_key:Nn#1#2{
+\cs_new_nopar:Npn \TP_templdecl_setup_f_key:Nn#1#2{
\TP_templdecl_define_key:n
{ \TP_templdecl_define_function:NNn#1#2{##1} }
}
-\def_new:Npn \TP_templdecl_define_function:NNn#1#2#3{
- \def:NNn #2 #1 {#3}
- \toks_put_right:Nf \l_TP_KV_assignments_toks { \def:NNn #2 #1 {#3} }
+\cs_new_nopar:Npn \TP_templdecl_define_function:NNn#1#2#3{
+ \cs_generate_from_arg_count:NNnn #2 \cs_set:Npn {#1}{#3}
+ \toks_put_right:Nf \l_TP_KV_assignments_toks {
+ \cs_generate_from_arg_count:NNnn #2 \cs_set:Npn {#1}{#3}
+ }
}
-\def_new:Npn \TP_templdecl_setup_n_key:N#1{
+\cs_new_nopar:Npn \TP_templdecl_setup_n_key:N#1{
\TP_templdecl_define_key:n{
- \tlist_if_head_eq_meaning:nNTF{##1..}\MultiSelection
+ \tl_if_head_eq_meaning:nNTF{##1..}\MultiSelection
{
\group_begin:
\TP_templdecl_multiselection:nnnn ##1
\group_end:
\toks_put_right:Nx\l_TP_KV_assignments_toks {
- \exp_not:n{\tlp_set:Nf #1} { \toks_use:N \g_TP_multiselection_toks}
+ \exp_not:n{\tl_set:Nf #1} { \toks_use:N \g_TP_multiselection_toks}
}
}
{
- \def:Npn #1{##1} % setting it?
+ \cs_set_nopar:Npn #1{##1} % setting it?
\toks_put_right:Nn \l_TP_KV_assignments_toks
- { \tlp_set:Nn #1{##1} }
+ { \tl_set:Nn #1{##1} }
}
}
}
-\def_new:Npn \TP_templdecl_multiselection:nnnn #1#2#3#4{
+\cs_new_nopar:Npn \TP_templdecl_multiselection:nnnn #1#2#3#4{
\toks_gset:Nn \g_TP_multiselection_toks {\if_case:w #2}
\clist_map_inline:nn {#3}{
\TP_multiselection_add_or_case:n {\exp_stop_f:##1}
}
\toks_gput_right:Nn\g_TP_multiselection_toks {
- \else: \use_arg_i_after_fi:nw { \exp_stop_f: #4} \fi:
+ \else: \use_i_after_fi:nw { \exp_stop_f: #4} \fi:
}
}
-\def_new:Npn \DeclareInstance { \DeclareCollectionInstance{} }
-\def_long_new:Npn \DeclareCollectionInstance#1#2#3#4{
+\cs_new_nopar:Npn \DeclareInstance { \DeclareCollectionInstance{} }
+\cs_new:Npn \DeclareCollectionInstance#1#2#3#4{
\TP_declare_instance:cnn { <#1>#2/#3 }{ #2/#4 }
}
-\def_new:Npn \UseCollection#1#2{
- \tlp_set:cx { TP@<#1> }
+\cs_new_nopar:Npn \UseCollection#1#2{
+ \tl_set:cx { TP@<#1> }
{ {#2} \TP_get_arg_count:n{#1} }
}
-\def_new:Npn \TP_let_instance:Nnn#1#2#3{
- \let:Nc #1
+\cs_new_nopar:Npn \TP_let_instance:Nnn#1#2#3{
+ \cs_set_eq:Nc #1
{
\cs_if_free:cTF { \TP_get_csname_prefix:n{#2} #3 }
{ <>#2/ }
@@ -420,68 +427,68 @@
#3
}
}
-\def_new:Npn \UseInstance#1#2{
- \TP_let_instance:Nnn \l_tmpa_tlp {#1}{#2}
- \tlp_if_eq:NNTF \l_tmpa_tlp \scan_stop:
+\cs_new_nopar:Npn \UseInstance#1#2{
+ \TP_let_instance:Nnn \l_tmpa_tl {#1}{#2}
+ \tl_if_eq:NNTF \l_tmpa_tl \scan_stop:
\INSTANCEundefined
- \l_tmpa_tlp
-}
-\def_long_new:Npn \TP_templdecl_declare_tmp_instance:nnnn#1#2#3{%
- \TP_declare_instance:Nnn \g_tmpa_tlp {#2/#3} }
-\def_new:Npn \ShowTemplate#1#2{
- \io_put_term:x{*******~ Template:~ #1/#2~ *******}
- \io_put_term:x{*}
- \io_put_term:x{*~ Defaults:}
- \io_put_term:x{*}
- \io_put_term:x{\token_to_string:N\TPD>/#1/#2=
+ \l_tmpa_tl
+}
+\cs_new:Npn \TP_templdecl_declare_tmp_instance:nnnn#1#2#3{%
+ \TP_declare_instance:Nnn \g_tmpa_tl {#2/#3} }
+\cs_new_nopar:Npn \ShowTemplate#1#2{
+ \iow_term:x{*******~ Template:~ #1/#2~ *******}
+ \iow_term:x{*}
+ \iow_term:x{*~ Defaults:}
+ \iow_term:x{*}
+ \iow_term:x{\token_to_str:N\TPD>/#1/#2=
\cs_meaning:c{TPD>/#1/#2}}
- \io_put_term:x{*}
- \io_put_term:x{*~ Restrictions:}
- \io_put_term:x{*}
- \io_put_term:x{\token_to_string:N\TPR>/#1/#2=
+ \iow_term:x{*}
+ \iow_term:x{*~ Restrictions:}
+ \iow_term:x{*}
+ \iow_term:x{\token_to_str:N\TPR>/#1/#2=
\cs_meaning:c{TPR>/#1/#2}}
- \io_put_term:x{*}
- \io_put_term:x{*~ Body:}
- \io_put_term:x{*}
+ \iow_term:x{*}
+ \iow_term:x{*~ Body:}
+ \iow_term:x{*}
\cs_show:c {TP>/#1/#2}}
-\def_new:Npn \ShowCollectionInstance#1#2#3{
- \io_put_term:x{*******~ Instance:~ <#1>#2/#3~ *******}
- \io_put_term:x{*}
+\cs_new_nopar:Npn \ShowCollectionInstance#1#2#3{
+ \iow_term:x{*******~ Instance:~ <#1>#2/#3~ *******}
+ \iow_term:x{*}
\cs_show:c {<#1>#2/#3}}
-\def_new:Npn \ShowInstance{\ShowCollectionInstance{}}
-\def_new:Npn \TP_templdecl_setup_fakeregister_key:NNn#1#2#3{
+\cs_new_nopar:Npn \ShowInstance{\ShowCollectionInstance{}}
+\cs_new_nopar:Npn \TP_templdecl_setup_fakeregister_key:NNn#1#2#3{
\TP_templdecl_define_key:n{
- \tlist_if_head_eq_meaning:nNTF{##1..}\DelayEvaluation
+ \tl_if_head_eq_meaning:nNTF{##1..}\DelayEvaluation
{
- \toks_set:No \l_tmpa_toks {\use_arg_ii:nn ##1}
+ \toks_set:No \l_tmpa_toks {\use_ii:nn ##1}
\toks_put_right:Nx \l_TP_KV_assignments_toks {
\exp_not:n{#1#2}{\toks_use:N \l_tmpa_toks}
- \exp_not:n{ \def:Npx #3{\toks_use:N#2} }
+ \exp_not:n{ \cs_set_nopar:Npx #3{\toks_use:N#2} }
}
}
{
- \tlist_if_head_eq_meaning:nNTF{##1..}\MultiSelection
+ \tl_if_head_eq_meaning:nNTF{##1..}\MultiSelection
{
\group_begin:
\TP_multiselection_add:nnnnnn#1#2##1
\group_end:
\toks_put_right:Nx\l_TP_KV_assignments_toks
- {\exp_not:n{\def:Npn #3} {\toks_use:N\g_TP_multiselection_toks}}
+ {\exp_not:n{\cs_set_nopar:Npn #3} {\toks_use:N\g_TP_multiselection_toks}}
}
{
#1#2{##1}
\toks_put_right:Nx\l_TP_KV_assignments_toks
- {\exp_not:n{\def:Npn#3} {\toks_use:N#2}}
+ {\exp_not:n{\cs_set_nopar:Npn#3} {\toks_use:N#2}}
}
}
}
}
\toks_new:N \g_TP_multiselection_toks
-\def_new:Npn \TP_multiselection_add:nnnnnn #1#2#3#4#5#6{
+\cs_new_nopar:Npn \TP_multiselection_add:nnnnnn #1#2#3#4#5#6{
\toks_gset:Nn \g_TP_multiselection_toks {\if_case:w #4}
\clist_map_inline:nn {#5}{
- \tlist_if_head_eq_meaning:nNTF{##1..}\DelayEvaluation
+ \tl_if_head_eq_meaning:nNTF{##1..}\DelayEvaluation
{
\TP_multiselection_add_or_case:n {##1}
}
@@ -491,74 +498,65 @@
}
}
\toks_gput_right:Nn \g_TP_multiselection_toks {
- \else: \use_arg_i_after_fi:nw{#6}\fi:
+ \else: \use_i_after_fi:nw{#6}\fi:
}
}
-\def_new:Npn \TP_multiselection_add_or_case:n #1 {
+\cs_new_nopar:Npn \TP_multiselection_add_or_case:n #1 {
\toks_gput_right:Nn \g_TP_multiselection_toks {
- \or: \use_arg_i_after_orelse:nw{#1}
+ \or: \use_i_after_orelse:nw{#1}
}
}
-\def_new:Npn \TP_multiselection_add_or_case:o {
- \exp_args:No \TP_multiselection_add_or_case:n
-}
-\def_new:Npn \IfExistsInstanceTF#1#2{
+\cs_generate_variant:Nn \TP_multiselection_add_or_case:n {o}
+\cs_new_nopar:Npn \IfExistsInstanceTF#1#2{
\cs_if_exist:cTF{<>#1/#2}
}
-\def:Npn \IfExistsInstanceTF#1#2{
- \TP_let_instance:Nnn \l_tmpa_tlp {#1}{#2}
- \if_meaning:NN\l_tmpa_tlp\scan_stop:
- \exp_after:NN\use_arg_ii:nn
+\cs_set_nopar:Npn \IfExistsInstanceTF#1#2{
+ \TP_let_instance:Nnn \l_tmpa_tl {#1}{#2}
+ \if_meaning:w\l_tmpa_tl\scan_stop:
+ \exp_after:wN\use_ii:nn
\else:
- \exp_after:NN\use_arg_i:nn
+ \exp_after:wN\use_i:nn
\fi:}
-\def_new:Npn \DeclareRestrictedTemplate#1#2#3#4{
+\cs_new_nopar:Npn \DeclareRestrictedTemplate#1#2#3#4{
% CCC do we need a group here??
- \tlp_set_eq:cc { TPD>/#1/#2 } { TPD>/#1/#3 }
- \tlp_set_eq:cc { TP>/#1/#2 } { TP>/#1/#3 }
-
- \toks_set:Nd \l_TP_KV_assignments_toks
- {\cs:w TPR>/#1/#3\cs_end:}
-
+ \tl_set_eq:cc { TPD>/#1/#2 } { TPD>/#1/#3 }
+ \tl_set_eq:cc { TP>/#1/#2 } { TP>/#1/#3 }
+ \toks_set:Nv \l_TP_KV_assignments_toks { TPR>/ #1 / #3 }
\setkeys {\cs:w TPO>/#1/#3\cs_end:}{#4}
- \tlp_set:cx { TPR>/#1/#2 }
+ \tl_set:cx { TPR>/#1/#2 }
{ \toks_use:N \l_TP_KV_assignments_toks }
\cs_if_free:cTF { TPO>/#1/#3 }
- { \tlp_set:cn {TPO>/#1/#2}{#1/#3} }
- { \tlp_set_eq:cc {TPO>/#1/#2}{TPO>/#1/#3} }
+ { \tl_set:cn {TPO>/#1/#2}{#1/#3} }
+ { \tl_set_eq:cc {TPO>/#1/#2}{TPO>/#1/#3} }
}
-\def_new:Npn \TP_instdecl_generate_assignments:nn#1#2 {
+\cs_new_nopar:Npn \TP_instdecl_generate_assignments:nn#1#2 {
% Returns to \l_TP_KV_assignments_toks
% the restrictions
% stored in the TP-structure (at present
% in YAM) of the template #1
-
- \toks_set:Nd \l_TP_default_assignments_toks
+ \exp_args:NNo \toks_set:No \l_TP_default_assignments_toks
{\cs:w TPD>/#1\cs_end:\scan_stop:\scan_stop:}
-
- \toks_set:Nd \l_TP_KV_assignments_toks
- {\cs:w TPR>/#1\cs_end:}
-
+ \toks_set:Nv \l_TP_KV_assignments_toks { TPR>/ #1 }
\setkeys { \cs:w TPO>/#1 \cs_end: }
{ #2 } % adds stuff to \l_TP_KV_assignments_toks
- \exp_after:NN\TP_instdecl_add_default_recurse:nn
+ \exp_after:wN\TP_instdecl_add_default_recurse:nn
\toks_use:N\l_TP_default_assignments_toks
}
-\def_new:Npn \TP_instdecl_add_default_recurse:nn#1#2{
+\cs_new_nopar:Npn \TP_instdecl_add_default_recurse:nn#1#2{
\token_if_eq_meaning:NNF #1\scan_stop:
{
\l_tmpa_toks{#2}
- \tlp_set:Nx \l_tmpa_tlp {
+ \tl_set:Nx \l_tmpa_tl {
{\toks_use:N \l_tmpa_toks \toks_use:N \l_TP_KV_assignments_toks}
}
- \l_TP_KV_assignments_toks \l_tmpa_tlp
+ \l_TP_KV_assignments_toks \l_tmpa_tl
\TP_instdecl_add_default_recurse:nn
}
}
-\def_new:Npn \TP_split_finite_skip_value:nnNN #1#2{
+\cs_new_nopar:Npn \TP_split_finite_skip_value:nnNN #1#2{
\skip_split_finite_else_action:nnNN {#1} {
\PackageError{template}{Value~ for~ key~ #2~ contains~ `fil(ll)'}
{Only~ finite~ minus~ or~ plus~ parts~ are~ allowed~ for~ this~ key.}