summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-19 20:38:20 +0000
committerKarl Berry <karl@freefriends.org>2016-10-19 20:38:20 +0000
commit52b787d36c60fda90673669dd2809c95c1fdfca5 (patch)
treebeb7faf87e1ab5be65f7437e500619b20eba20a1 /Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
parent97a401ad817da2dafd1069df9d87a28ed39df69b (diff)
l3 (19oct16)
git-svn-id: svn://tug.org/texlive/trunk@42306 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty106
1 files changed, 53 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 04efdce2561..8f389e34ab5 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/05/18]
-\@ifpackagelater{expl3}{2016/05/18}
+\RequirePackage{expl3}[2016/10/19]
+\@ifpackagelater{expl3}{2016/10/19}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\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}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }
@@ -295,7 +295,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_parse_keys_elt_aux:n #1
+\cs_new_protected:Npn \__xtemplate_parse_keys_elt_aux:n #1
{
\str_if_eq:onT \l__xtemplate_keytype_tl {#1}
{
@@ -308,7 +308,7 @@
}
}
}
-\cs_new_nopar:Npn \__xtemplate_parse_keys_elt_aux:
+\cs_new:Npn \__xtemplate_parse_keys_elt_aux:
{
\tl_set:Nx \l__xtemplate_tmp_tl
{
@@ -377,7 +377,7 @@
{
\tl_set:Nn \l__xtemplate_keytype_tl {#1}
\tl_clear:N \l__xtemplate_keytype_arg_tl
- \cs_set_protected_nopar:Npn \__xtemplate_split_keytype_arg_aux:n ##1
+ \cs_set_protected:Npn \__xtemplate_split_keytype_arg_aux:n ##1
{
\tl_if_in:nnT {#1} {##1}
{
@@ -398,8 +398,8 @@
\__xtemplate_split_keytype_arg_aux:n
}
\cs_generate_variant:Nn \__xtemplate_split_keytype_arg:n { o }
-\cs_new_nopar:Npn \__xtemplate_split_keytype_arg_aux:n #1 { }
-\cs_new_nopar:Npn \__xtemplate_split_keytype_arg_aux:w #1 \q_stop { }
+\cs_new:Npn \__xtemplate_split_keytype_arg_aux:n #1 { }
+\cs_new:Npn \__xtemplate_split_keytype_arg_aux:w #1 \q_stop { }
\cs_new_protected:Npn \__xtemplate_store_value_boolean:n #1
{
\__xtemplate_if_eval_now:nTF {#1}
@@ -573,7 +573,7 @@
{ \tl_to_str:n { #1 global #2 } }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_create_variable:N #1
+\cs_new_protected:Npn \__xtemplate_create_variable:N #1
{
\str_case:onF \l__xtemplate_keytype_tl
{
@@ -607,7 +607,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_implement_choices_default:
+\cs_new_protected:Npn \__xtemplate_implement_choices_default:
{
\tl_set:Nx \l__xtemplate_tmp_tl
{ \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_tmp_tl }
@@ -789,7 +789,7 @@
\__xtemplate_declare_instance_aux:nnnnn {#1} {#2}
}
\cs_generate_variant:Nn \__xtemplate_edit_instance_aux:nnnnn { no }
-\cs_new_protected_nopar:Npn \__xtemplate_convert_to_assignments:
+\cs_new_protected:Npn \__xtemplate_convert_to_assignments:
{
\tl_clear:N \l__xtemplate_assignments_tl
\seq_map_function:NN \l__xtemplate_key_order_seq
@@ -819,7 +819,7 @@
}
}
\cs_generate_variant:Nn \__xtemplate_convert_to_assignments_aux:nn { no }
-\cs_new_protected_nopar:Npn \__xtemplate_find_global:
+\cs_new_protected:Npn \__xtemplate_find_global:
{
\bool_set_false:N \l__xtemplate_global_bool
\tl_if_in:onT \l__xtemplate_var_tl { global }
@@ -843,13 +843,13 @@
\use:c { \c__xtemplate_code_root_tl #1 / #2 }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean:
+\cs_new_protected:Npn \__xtemplate_assign_boolean:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_boolean_aux:n { bool_gset } }
{ \__xtemplate_assign_boolean_aux:n { bool_set } }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean_aux:n #1
+\cs_new_protected:Npn \__xtemplate_assign_boolean_aux:n #1
{
\__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
{
@@ -869,7 +869,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_choice:
+\cs_new_protected:Npn \__xtemplate_assign_choice:
{
\__xtemplate_assign_choice_aux:xF
{ \l__xtemplate_key_name_tl \c_space_tl \l__xtemplate_value_tl }
@@ -886,7 +886,7 @@
}
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_choice_aux:nF #1
+\cs_new_protected:Npn \__xtemplate_assign_choice_aux:nF #1
{
\prop_get:NnNTF
\l__xtemplate_vars_prop
@@ -895,7 +895,7 @@
{ \tl_put_right:No \l__xtemplate_assignments_tl \l__xtemplate_tmp_tl }
}
\cs_generate_variant:Nn \__xtemplate_assign_choice_aux:nF { x }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_code:
+\cs_new_protected:Npn \__xtemplate_assign_code:
{
\tl_put_right:Nx \l__xtemplate_assignments_tl
{
@@ -905,13 +905,13 @@
}
}
\cs_new_protected:Npn \__xtemplate_assign_code:n #1 { }
-\cs_new_protected_nopar:Npn \__xtemplate_assign_function:
+\cs_new_protected:Npn \__xtemplate_assign_function:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_function_aux:N \cs_gset:Npn }
{ \__xtemplate_assign_function_aux:N \cs_set:Npn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_function_aux:N #1
+\cs_new_protected:Npn \__xtemplate_assign_function_aux:N #1
{
\tl_put_right:Nx \l__xtemplate_assignments_tl
{
@@ -922,13 +922,13 @@
{ \exp_not:o \l__xtemplate_value_tl }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_instance:
+\cs_new_protected:Npn \__xtemplate_assign_instance:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_instance_aux:N \cs_gset_protected:Npn }
{ \__xtemplate_assign_instance_aux:N \cs_set_protected:Npn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_instance_aux:N #1
+\cs_new_protected:Npn \__xtemplate_assign_instance_aux:N #1
{
\tl_put_right:Nx \l__xtemplate_assignments_tl
{
@@ -940,43 +940,43 @@
}
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_integer:
+\cs_new_protected:Npn \__xtemplate_assign_integer:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_variable:N \int_gset:Nn }
{ \__xtemplate_assign_variable:N \int_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_length:
+\cs_new_protected:Npn \__xtemplate_assign_length:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_variable:N \dim_gset:Nn }
{ \__xtemplate_assign_variable:N \dim_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_muskip:
+\cs_new_protected:Npn \__xtemplate_assign_muskip:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_variable:N \muskip_gset:Nn }
{ \__xtemplate_assign_variable:N \muskip_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_real:
+\cs_new_protected:Npn \__xtemplate_assign_real:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_variable:N \fp_gset:Nn }
{ \__xtemplate_assign_variable:N \fp_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_skip:
+\cs_new_protected:Npn \__xtemplate_assign_skip:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_variable:N \skip_gset:Nn }
{ \__xtemplate_assign_variable:N \skip_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist:
+\cs_new_protected:Npn \__xtemplate_assign_tokenlist:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_tokenlist_aux:NN \tl_gset:NV \tl_gset:Nn }
{ \__xtemplate_assign_tokenlist_aux:NN \tl_set:NV \tl_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_tokenlist_aux:NN #1#2
+\cs_new_protected:Npn \__xtemplate_assign_tokenlist_aux:NN #1#2
{
\__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
{
@@ -995,13 +995,13 @@
}
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_commalist:
+\cs_new_protected:Npn \__xtemplate_assign_commalist:
{
\bool_if:NTF \l__xtemplate_global_bool
{ \__xtemplate_assign_tokenlist_aux:NN \clist_gset:NV \clist_gset:Nn }
{ \__xtemplate_assign_tokenlist_aux:NN \clist_set:NV \clist_set:Nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_assign_variable:N #1
+\cs_new_protected:Npn \__xtemplate_assign_variable:N #1
{
\__xtemplate_if_key_value:oT \l__xtemplate_value_tl
{ \__xtemplate_key_to_value: }
@@ -1011,7 +1011,7 @@
{ \exp_not:o \l__xtemplate_value_tl }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_key_to_value:
+\cs_new_protected:Npn \__xtemplate_key_to_value:
{ \exp_after:wN \__xtemplate_key_to_value_auxi:w \l__xtemplate_value_tl }
\cs_new_protected:Npn \__xtemplate_key_to_value_auxi:w \KeyValue #1
{
@@ -1076,12 +1076,12 @@
\l__xtemplate_collection_tl
{ \tl_clear:N \l__xtemplate_collection_tl }
}
-\cs_new_nopar:Npn \__xtemplate_assignments_pop: { \l__xtemplate_assignments_tl }
+\cs_new:Npn \__xtemplate_assignments_pop: { \l__xtemplate_assignments_tl }
\cs_new_protected:Npn \__xtemplate_assignments_push:n #1
{ \tl_set:Nn \l__xtemplate_assignments_tl {#1} }
-\cs_new_protected_nopar:Npn \__xtemplate_show_code:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_code:nn #1#2
{ \cs_show:c { \c__xtemplate_code_root_tl #1 / #2 } }
-\cs_new_protected_nopar:Npn \__xtemplate_show_defaults:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_defaults:nn #1#2
{
\__xtemplate_if_keys_exist:nnT {#1} {#2}
{
@@ -1090,7 +1090,7 @@
{#1} {#2} { default~values }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_show_keytypes:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_keytypes:nn #1#2
{
\__xtemplate_if_keys_exist:nnT {#1} {#2}
{
@@ -1099,7 +1099,7 @@
{#1} {#2} { interface }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_show_vars:nn #1#2
+\cs_new_protected:Npn \__xtemplate_show_vars:nn #1#2
{
\__xtemplate_execute_if_code_exist:nnT {#1} {#2}
{
@@ -1108,7 +1108,7 @@
{#1} {#2} { variable~mapping }
}
}
-\cs_new_protected_nopar:Npn \__xtemplate_show:Nnnn #1#2#3#4
+\cs_new_protected:Npn \__xtemplate_show:Nnnn #1#2#3#4
{
\__msg_show_pre:nnnnnn { xtemplate }
{ \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } }
@@ -1116,7 +1116,7 @@
\__msg_show_wrap:n
{ \prop_map_function:NN #1 \__msg_show_item_unbraced:nn }
}
-\cs_new_protected_nopar:Npn \__xtemplate_show_values:nnn #1#2#3
+\cs_new_protected:Npn \__xtemplate_show_values:nnn #1#2#3
{
\__xtemplate_if_instance_exist:nnnT {#1} {#2} {#3}
{
@@ -1341,7 +1341,7 @@
\tl_if_empty:nF {#4} { (from~template~'#4')~ }
has~values:
}
-\cs_new_protected_nopar:Npn \DeclareObjectType #1#2
+\cs_new_protected:Npn \DeclareObjectType #1#2
{ \__xtemplate_declare_object_type:nn {#1} {#2} }
\cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4
{ \__xtemplate_declare_template_keys:nnnn {#1} {#2} {#3} {#4} }
@@ -1359,33 +1359,33 @@
{ \__xtemplate_edit_instance:nnnn {#1} { } {#2} {#3} }
\cs_new_protected:Npn \EditCollectionInstance #1#2#3#4
{ \__xtemplate_edit_instance:nnnn {#2} {#1} {#3} {#4} }
-\cs_new_protected_nopar:Npn \UseTemplate #1#2#3
+\cs_new_protected:Npn \UseTemplate #1#2#3
{ \__xtemplate_use_template:nnn {#1} {#2} {#3} }
-\cs_new_protected_nopar:Npn \UseInstance #1#2
+\cs_new_protected:Npn \UseInstance #1#2
{ \__xtemplate_use_instance:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \UseCollection #1#2
+\cs_new_protected:Npn \UseCollection #1#2
{ \__xtemplate_use_collection:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateCode #1#2
+\cs_new_protected:Npn \ShowTemplateCode #1#2
{ \__xtemplate_show_code:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateDefaults #1#2
+\cs_new_protected:Npn \ShowTemplateDefaults #1#2
{ \__xtemplate_show_defaults:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateInterface #1#2
+\cs_new_protected:Npn \ShowTemplateInterface #1#2
{ \__xtemplate_show_keytypes:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowTemplateVariables #1#2
+\cs_new_protected:Npn \ShowTemplateVariables #1#2
{ \__xtemplate_show_vars:nn {#1} {#2} }
-\cs_new_protected_nopar:Npn \ShowInstanceValues #1#2
+\cs_new_protected:Npn \ShowInstanceValues #1#2
{ \__xtemplate_show_values:nnn {#1} { } {#2} }
-\cs_new_protected_nopar:Npn \ShowCollectionInstanceValues #1#2#3
+\cs_new_protected:Npn \ShowCollectionInstanceValues #1#2#3
{ \__xtemplate_show_values:nnn {#1} {#2} {#3} }
-\cs_new_nopar:Npn \IfInstanceExistTF #1#2
+\cs_new:Npn \IfInstanceExistTF #1#2
{ \__xtemplate_if_instance_exist:nnnTF {#1} { } {#2} }
-\cs_new_nopar:Npn \IfInstanceExistT #1#2
+\cs_new:Npn \IfInstanceExistT #1#2
{ \__xtemplate_if_instance_exist:nnnT {#1} { } {#2} }
-\cs_new_nopar:Npn \IfInstanceExistF #1#2
+\cs_new:Npn \IfInstanceExistF #1#2
{ \__xtemplate_if_instance_exist:nnnF {#1} { } {#2} }
\cs_new_protected:Npn \EvaluateNow #1 {#1}
\cs_new_protected:Npn \KeyValue #1 {#1}
-\cs_new_protected_nopar:Npn \AssignTemplateKeys
+\cs_new_protected:Npn \AssignTemplateKeys
{ \__xtemplate_assignments_pop: }
\cs_new_eq:NN \ShowTemplateKeytypes \ShowTemplateInterface
%%