diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index f3ad7e8f289..394bb8b72ee 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2016/05/18] -%<package>\@ifpackagelater{expl3}{2016/05/18} +\RequirePackage{expl3}[2016/10/19] +%<package>\@ifpackagelater{expl3}{2016/10/19} %<package> {} %<package> {% %<package> \PackageError{xtemplate}{Support package l3kernel too old} @@ -56,8 +56,8 @@ %<package> } \def\ExplFileName{xtemplate} \def\ExplFileDescription{L3 Experimental prototype document functions} -\def\ExplFileDate{2016/05/18} -\def\ExplFileVersion{6512} +\def\ExplFileDate{2016/10/19} +\def\ExplFileVersion{6730} %</driver|package> %<*driver> \documentclass[full]{l3doc} @@ -501,7 +501,7 @@ % the general idea of fixing some settings. % \end{function} % -% \begin{function}[TF]{\IfInstanceExist} +% \begin{function}{\IfInstanceExistT, \IfInstanceExistF, \IfInstanceExistTF} % \begin{syntax} % \cs{IfInstanceExistTF} \Arg{object type} \Arg{instance} \Arg{true code} \Arg{false code} % \end{syntax} @@ -1227,7 +1227,7 @@ } } } -\cs_new_protected_nopar:Npn \@@_parse_keys_elt_aux:n #1 +\cs_new_protected:Npn \@@_parse_keys_elt_aux:n #1 { \str_if_eq:onT \l_@@_keytype_tl {#1} { @@ -1240,7 +1240,7 @@ } } } -\cs_new_nopar:Npn \@@_parse_keys_elt_aux: +\cs_new:Npn \@@_parse_keys_elt_aux: { \tl_set:Nx \l_@@_tmp_tl { @@ -1347,7 +1347,7 @@ { \tl_set:Nn \l_@@_keytype_tl {#1} \tl_clear:N \l_@@_keytype_arg_tl - \cs_set_protected_nopar:Npn \@@_split_keytype_arg_aux:n ##1 + \cs_set_protected:Npn \@@_split_keytype_arg_aux:n ##1 { \tl_if_in:nnT {#1} {##1} { @@ -1368,8 +1368,8 @@ \@@_split_keytype_arg_aux:n } \cs_generate_variant:Nn \@@_split_keytype_arg:n { o } -\cs_new_nopar:Npn \@@_split_keytype_arg_aux:n #1 { } -\cs_new_nopar:Npn \@@_split_keytype_arg_aux:w #1 \q_stop { } +\cs_new:Npn \@@_split_keytype_arg_aux:n #1 { } +\cs_new:Npn \@@_split_keytype_arg_aux:w #1 \q_stop { } % \end{macrocode} % \end{macro} % \end{macro} @@ -1661,7 +1661,7 @@ % A shortcut to create non-declared variables. Some types need a name % mapping, others can be used directly. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_create_variable:N #1 +\cs_new_protected:Npn \@@_create_variable:N #1 { \str_case:onF \l_@@_keytype_tl { @@ -1707,7 +1707,7 @@ % A sanity check for the default value, so that an error is raised % now and not when converting to assignments. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_implement_choices_default: +\cs_new_protected:Npn \@@_implement_choices_default: { \tl_set:Nx \l_@@_tmp_tl { \l_@@_key_name_tl \c_space_tl \l_@@_tmp_tl } @@ -2000,7 +2000,7 @@ % This is done using a sequence as property lists are not % \enquote{ordered}. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_convert_to_assignments: +\cs_new_protected:Npn \@@_convert_to_assignments: { \tl_clear:N \l_@@_assignments_tl \seq_map_function:NN \l_@@_key_order_seq @@ -2050,7 +2050,7 @@ % Global assignments should have the phrase |global| at the front. % This is pretty easy to find: no other error checking, though. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_find_global: +\cs_new_protected:Npn \@@_find_global: { \bool_set_false:N \l_@@_global_bool \tl_if_in:onT \l_@@_var_tl { global } @@ -2100,13 +2100,13 @@ % for the fact that the recovered value here will \emph{not} be expandable, % so needs to be converted to something that is. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_boolean: +\cs_new_protected:Npn \@@_assign_boolean: { \bool_if:NTF \l_@@_global_bool { \@@_assign_boolean_aux:n { bool_gset } } { \@@_assign_boolean_aux:n { bool_set } } } -\cs_new_protected_nopar:Npn \@@_assign_boolean_aux:n #1 +\cs_new_protected:Npn \@@_assign_boolean_aux:n #1 { \@@_if_key_value:oTF \l_@@_value_tl { @@ -2136,7 +2136,7 @@ % The idea here is to find either the choice as-given or else the % special |unknown| choice, and to copy the appropriate code across. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_choice: +\cs_new_protected:Npn \@@_assign_choice: { \@@_assign_choice_aux:xF { \l_@@_key_name_tl \c_space_tl \l_@@_value_tl } @@ -2153,7 +2153,7 @@ } } } -\cs_new_protected_nopar:Npn \@@_assign_choice_aux:nF #1 +\cs_new_protected:Npn \@@_assign_choice_aux:nF #1 { \prop_get:NnNTF \l_@@_vars_prop @@ -2172,7 +2172,7 @@ % and run when \cs{AssignTemplateKeys} is called. So the appropriate % definition then use is created in the token list variable. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_code: +\cs_new_protected:Npn \@@_assign_code: { \tl_put_right:Nx \l_@@_assignments_tl { @@ -2190,13 +2190,13 @@ % \begin{macro}[aux]{\@@_assign_function_aux:N} % This looks a bit messy but is only actually one function. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_function: +\cs_new_protected:Npn \@@_assign_function: { \bool_if:NTF \l_@@_global_bool { \@@_assign_function_aux:N \cs_gset:Npn } { \@@_assign_function_aux:N \cs_set:Npn } } -\cs_new_protected_nopar:Npn \@@_assign_function_aux:N #1 +\cs_new_protected:Npn \@@_assign_function_aux:N #1 { \tl_put_right:Nx \l_@@_assignments_tl { @@ -2217,13 +2217,13 @@ % the tl. No checks are made at this stage, so if the instance is % not valid then errors will arise later. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_instance: +\cs_new_protected:Npn \@@_assign_instance: { \bool_if:NTF \l_@@_global_bool { \@@_assign_instance_aux:N \cs_gset_protected:Npn } { \@@_assign_instance_aux:N \cs_set_protected:Npn } } -\cs_new_protected_nopar:Npn \@@_assign_instance_aux:N #1 +\cs_new_protected:Npn \@@_assign_instance_aux:N #1 { \tl_put_right:Nx \l_@@_assignments_tl { @@ -2247,31 +2247,31 @@ % All of the calculated assignments use the same underlying code, with % only the low-level assignment function changing. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_integer: +\cs_new_protected:Npn \@@_assign_integer: { \bool_if:NTF \l_@@_global_bool { \@@_assign_variable:N \int_gset:Nn } { \@@_assign_variable:N \int_set:Nn } } -\cs_new_protected_nopar:Npn \@@_assign_length: +\cs_new_protected:Npn \@@_assign_length: { \bool_if:NTF \l_@@_global_bool { \@@_assign_variable:N \dim_gset:Nn } { \@@_assign_variable:N \dim_set:Nn } } -\cs_new_protected_nopar:Npn \@@_assign_muskip: +\cs_new_protected:Npn \@@_assign_muskip: { \bool_if:NTF \l_@@_global_bool { \@@_assign_variable:N \muskip_gset:Nn } { \@@_assign_variable:N \muskip_set:Nn } } -\cs_new_protected_nopar:Npn \@@_assign_real: +\cs_new_protected:Npn \@@_assign_real: { \bool_if:NTF \l_@@_global_bool { \@@_assign_variable:N \fp_gset:Nn } { \@@_assign_variable:N \fp_set:Nn } } -\cs_new_protected_nopar:Npn \@@_assign_skip: +\cs_new_protected:Npn \@@_assign_skip: { \bool_if:NTF \l_@@_global_bool { \@@_assign_variable:N \skip_gset:Nn } @@ -2290,13 +2290,13 @@ % correctly with that, we need to allow for the recovery a a stored value % at point of use. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_tokenlist: +\cs_new_protected:Npn \@@_assign_tokenlist: { \bool_if:NTF \l_@@_global_bool { \@@_assign_tokenlist_aux:NN \tl_gset:NV \tl_gset:Nn } { \@@_assign_tokenlist_aux:NN \tl_set:NV \tl_set:Nn } } -\cs_new_protected_nopar:Npn \@@_assign_tokenlist_aux:NN #1#2 +\cs_new_protected:Npn \@@_assign_tokenlist_aux:NN #1#2 { \@@_if_key_value:oTF \l_@@_value_tl { @@ -2322,7 +2322,7 @@ % \begin{macro}{\@@_assign_commalist:} % Very similar for commas lists, so some code is shared. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_commalist: +\cs_new_protected:Npn \@@_assign_commalist: { \bool_if:NTF \l_@@_global_bool { \@@_assign_tokenlist_aux:NN \clist_gset:NV \clist_gset:Nn } @@ -2336,7 +2336,7 @@ % As long as the value is not coming from another variable, the stored % value is simply transferred for output. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_assign_variable:N #1 +\cs_new_protected:Npn \@@_assign_variable:N #1 { \@@_if_key_value:oT \l_@@_value_tl { \@@_key_to_value: } @@ -2360,7 +2360,7 @@ % There is also a need to check in case the copied value happens to be % \texttt{global}. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_key_to_value: +\cs_new_protected:Npn \@@_key_to_value: { \exp_after:wN \@@_key_to_value_auxi:w \l_@@_value_tl } \cs_new_protected:Npn \@@_key_to_value_auxi:w \KeyValue #1 { @@ -2470,7 +2470,7 @@ % \begin{macro}{\@@_assignments_pop:} % To actually use the assignments. % \begin{macrocode} -\cs_new_nopar:Npn \@@_assignments_pop: { \l_@@_assignments_tl } +\cs_new:Npn \@@_assignments_pop: { \l_@@_assignments_tl } % \end{macrocode} % \end{macro} % @@ -2488,7 +2488,7 @@ % Showing the code for a template is just a translation of % \cs{cs_show:c}. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_show_code:nn #1#2 +\cs_new_protected:Npn \@@_show_code:nn #1#2 { \cs_show:c { \c_@@_code_root_tl #1 / #2 } } % \end{macrocode} % \end{macro} @@ -2503,7 +2503,7 @@ % the output refers to templates and instances rather than to the % underlying structures. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_show_defaults:nn #1#2 +\cs_new_protected:Npn \@@_show_defaults:nn #1#2 { \@@_if_keys_exist:nnT {#1} {#2} { @@ -2512,7 +2512,7 @@ {#1} {#2} { default~values } } } -\cs_new_protected_nopar:Npn \@@_show_keytypes:nn #1#2 +\cs_new_protected:Npn \@@_show_keytypes:nn #1#2 { \@@_if_keys_exist:nnT {#1} {#2} { @@ -2521,7 +2521,7 @@ {#1} {#2} { interface } } } -\cs_new_protected_nopar:Npn \@@_show_vars:nn #1#2 +\cs_new_protected:Npn \@@_show_vars:nn #1#2 { \@@_execute_if_code_exist:nnT {#1} {#2} { @@ -2530,7 +2530,7 @@ {#1} {#2} { variable~mapping } } } -\cs_new_protected_nopar:Npn \@@_show:Nnnn #1#2#3#4 +\cs_new_protected:Npn \@@_show:Nnnn #1#2#3#4 { \__msg_show_pre:nnnnnn { xtemplate } { \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } } @@ -2546,7 +2546,7 @@ % Instance values are a little more complex, as there are the collection % and template to consider. % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_show_values:nnn #1#2#3 +\cs_new_protected:Npn \@@_show_values:nnn #1#2#3 { \@@_if_instance_exist:nnnT {#1} {#2} {#3} { @@ -2805,7 +2805,7 @@ % All simple translations, with the appropriate long/short argument % filtering. % \begin{macrocode} -\cs_new_protected_nopar:Npn \DeclareObjectType #1#2 +\cs_new_protected:Npn \DeclareObjectType #1#2 { \@@_declare_object_type:nn {#1} {#2} } \cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4 { \@@_declare_template_keys:nnnn {#1} {#2} {#3} {#4} } @@ -2823,11 +2823,11 @@ { \@@_edit_instance:nnnn {#1} { } {#2} {#3} } \cs_new_protected:Npn \EditCollectionInstance #1#2#3#4 { \@@_edit_instance:nnnn {#2} {#1} {#3} {#4} } -\cs_new_protected_nopar:Npn \UseTemplate #1#2#3 +\cs_new_protected:Npn \UseTemplate #1#2#3 { \@@_use_template:nnn {#1} {#2} {#3} } -\cs_new_protected_nopar:Npn \UseInstance #1#2 +\cs_new_protected:Npn \UseInstance #1#2 { \@@_use_instance:nn {#1} {#2} } -\cs_new_protected_nopar:Npn \UseCollection #1#2 +\cs_new_protected:Npn \UseCollection #1#2 { \@@_use_collection:nn {#1} {#2} } % \end{macrocode} % \end{macro} @@ -2851,17 +2851,17 @@ % \begin{macro}{\ShowCollectionInstanceValues} % The show functions are again just translation. % \begin{macrocode} -\cs_new_protected_nopar:Npn \ShowTemplateCode #1#2 +\cs_new_protected:Npn \ShowTemplateCode #1#2 { \@@_show_code:nn {#1} {#2} } -\cs_new_protected_nopar:Npn \ShowTemplateDefaults #1#2 +\cs_new_protected:Npn \ShowTemplateDefaults #1#2 { \@@_show_defaults:nn {#1} {#2} } -\cs_new_protected_nopar:Npn \ShowTemplateInterface #1#2 +\cs_new_protected:Npn \ShowTemplateInterface #1#2 { \@@_show_keytypes:nn {#1} {#2} } -\cs_new_protected_nopar:Npn \ShowTemplateVariables #1#2 +\cs_new_protected:Npn \ShowTemplateVariables #1#2 { \@@_show_vars:nn {#1} {#2} } -\cs_new_protected_nopar:Npn \ShowInstanceValues #1#2 +\cs_new_protected:Npn \ShowInstanceValues #1#2 { \@@_show_values:nnn {#1} { } {#2} } -\cs_new_protected_nopar:Npn \ShowCollectionInstanceValues #1#2#3 +\cs_new_protected:Npn \ShowCollectionInstanceValues #1#2#3 { \@@_show_values:nnn {#1} {#2} {#3} } % \end{macrocode} % \end{macro} @@ -2871,14 +2871,14 @@ % \end{macro} % \end{macro} % -% \begin{macro}[TF]{\IfInstanceExist} +% \begin{macro}{\IfInstanceExistT, \IfInstanceExistF, \IfInstanceExistTF} % More direct translation: only the base instance is checked for. % \begin{macrocode} -\cs_new_nopar:Npn \IfInstanceExistTF #1#2 +\cs_new:Npn \IfInstanceExistTF #1#2 { \@@_if_instance_exist:nnnTF {#1} { } {#2} } -\cs_new_nopar:Npn \IfInstanceExistT #1#2 +\cs_new:Npn \IfInstanceExistT #1#2 { \@@_if_instance_exist:nnnT {#1} { } {#2} } -\cs_new_nopar:Npn \IfInstanceExistF #1#2 +\cs_new:Npn \IfInstanceExistF #1#2 { \@@_if_instance_exist:nnnF {#1} { } {#2} } % \end{macrocode} % \end{macro} @@ -2897,7 +2897,7 @@ % \begin{macro}{\AssignTemplateKeys} % A short call to use a token register by proxy. % \begin{macrocode} -\cs_new_protected_nopar:Npn \AssignTemplateKeys +\cs_new_protected:Npn \AssignTemplateKeys { \@@_assignments_pop: } % \end{macrocode} % \end{macro} |