diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx b/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx index d6f317c1072..297291a3d7f 100644 --- a/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx @@ -38,7 +38,7 @@ \RequirePackage{l3names} %</driver|package> %\fi -\GetIdInfo$Id: xtemplate.dtx 1896 2010-04-14 17:40:38Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 2037 2010-09-20 21:22:45Z joseph $ {Prototype document functions} %\iffalse %<*driver> @@ -1576,10 +1576,10 @@ %\begin{macro}{\xtemplate_if_key_value:nT} %\begin{macro}{\xtemplate_if_key_value:VT} % Tests for the first token in a string being \cs{KeyValue}, where -% \cs{DelayEvaluation} is not important. +% \cs{EvaluateNow} is not important. % \begin{macrocode} \prg_set_conditional:Nnn \xtemplate_if_key_value:n { T } { - \tl_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_nil } { + \str_if_eq:noTF { \KeyValue } { \tl_head:w #1 \q_stop } { \prg_return_true: }{ \prg_return_false: @@ -1594,7 +1594,7 @@ % Tests for the first token in a string being \cs{EvaluateNow}. % \begin{macrocode} \prg_new_conditional:Nnn \xtemplate_if_eval_now:n { TF } { - \tl_if_eq:noTF { \EvaluateNow } { \tl_head:w #1 \q_nil } { + \str_if_eq:noTF { \EvaluateNow } { \tl_head:w #1 \q_stop } { \prg_return_true: }{ \prg_return_false: @@ -1620,7 +1620,7 @@ % Tests for the first token in a string being \cs{UseTemplate}. % \begin{macrocode} \prg_new_conditional:Nnn \xtemplate_if_use_template:n { TF } { - \tl_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_nil } { + \str_if_eq:noTF { \UseTemplate } { \tl_head:w #1 \q_stop } { \prg_return_true: }{ \prg_return_false: @@ -1840,7 +1840,7 @@ } } \cs_new_nopar:Npn \xtemplate_parse_keys_elt_aux:n #1 { - \tl_if_eq:VnT \l_xtemplate_keytype_tl {#1} { + \str_if_eq:VnT \l_xtemplate_keytype_tl {#1} { \tl_if_empty:NT \l_xtemplate_keytype_arg_tl { \msg_kernel_error:nnx { xtemplate } { keytype-requires-argument } {#1} @@ -1857,7 +1857,7 @@ \prop_put:NVV \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl \l_xtemplate_tmp_tl \seq_put_right:NV \l_xtemplate_key_seq \l_xtemplate_key_name_tl - \tl_if_eq:VnT \l_xtemplate_keytype_tl { choice } { + \str_if_eq:VnT \l_xtemplate_keytype_tl { choice } { \clist_if_in:NnT \l_xtemplate_keytype_arg_tl { unknown } { \msg_kernel_error:nn { xtemplate } { choice-unknown-reserved } } @@ -1877,7 +1877,7 @@ % \begin{macrocode} \cs_new:Npn \xtemplate_parse_keys_elt:nn #1#2 { \xtemplate_parse_keys_elt:n {#1} - \tl_if_eq:VnTF \l_xtemplate_keytype_tl { choice } { + \str_if_eq:VnTF \l_xtemplate_keytype_tl { choice } { \xtemplate_store_value_choice_name:n {#2} }{ \use:c { xtemplate_store_value_ \l_xtemplate_keytype_tl :n } {#2} @@ -2225,16 +2225,16 @@ % there are a few related checks to make. % \begin{macrocode} \cs_new:Npn \xtemplate_parse_vars_elt_aux:n #1 { - \tl_if_eq:VnTF \l_xtemplate_keytype_tl { choice } + \str_if_eq:VnTF \l_xtemplate_keytype_tl { choice } { \xtemplate_implement_choices:n {#1} } { - \tl_if_eq:VnTF \l_xtemplate_keytype_tl { code } + \str_if_eq:VnTF \l_xtemplate_keytype_tl { code } { \prop_put:NVn \l_xtemplate_vars_prop \l_xtemplate_key_name_tl {#1} } { - \tl_if_eq:noTF {#1} { \tl_head:w #1 \q_nil } + \str_if_eq:noTF {#1} { \tl_head:w #1 \q_stop } { \cs_if_exist:NTF #1 { @@ -2249,7 +2249,7 @@ } { \tl_if_in:nnTF {#1} { global } - { \xtemplate_parse_vars_elt_aux:w #1 \q_nil } + { \xtemplate_parse_vars_elt_aux:w #1 \q_stop } { \msg_kernel_error:nnx { xtemplate } { bad-variable } { \exp_not:n {#1} } @@ -2258,10 +2258,10 @@ } } } -\cs_new:Npn \xtemplate_parse_vars_elt_aux:w #1 global #2 \q_nil { +\cs_new:Npn \xtemplate_parse_vars_elt_aux:w #1 global #2 \q_stop { \tl_if_empty:nTF {#1} { - \tl_if_eq:noTF {#2} { \tl_head:w #2 \q_nil } + \str_if_eq:noTF {#2} { \tl_head:w #2 \q_stop } { \cs_if_exist:NTF #2 { @@ -2328,7 +2328,7 @@ % \begin{macrocode} \cs_new:Npn \xtemplate_implement_choice_elt:n #1 { \clist_if_empty:NTF \l_xtemplate_tmp_clist { - \tl_if_eq:nnF {#1} { unknown } { + \str_if_eq:nnF {#1} { unknown } { \prop_get:NVN \l_xtemplate_keytypes_prop \l_xtemplate_key_name_tl \l_xtemplate_tmp_tl \xtemplate_split_keytype_arg:V \l_xtemplate_tmp_tl @@ -2596,8 +2596,8 @@ \prop_get:NnN \l_xtemplate_values_prop {#1} \l_xtemplate_value_tl \prop_get:NnN \l_xtemplate_vars_prop {#1} \l_xtemplate_var_tl \xtemplate_split_keytype_arg:n {#2} - \tl_if_eq:VnF \l_xtemplate_keytype_tl { choice } { - \tl_if_eq:VnF \l_xtemplate_keytype_tl { code } { + \str_if_eq:VnF \l_xtemplate_keytype_tl { choice } { + \str_if_eq:VnF \l_xtemplate_keytype_tl { code } { \xtemplate_find_global: } } @@ -2885,7 +2885,7 @@ } } \cs_new:Npn \xtemplate_use_instance_aux:nNnnn #1#2#3#4#5 { - \tl_if_eq:nnTF {#1} {#3} { + \str_if_eq:nnTF {#1} {#3} { \xtemplate_use_template:nnn {#3} {#4} {#5} }{ \msg_kernel_error:nnxx { xtemplate } { type-mismatch } {#1} {#3} |