summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx')
-rw-r--r--Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx46
1 files changed, 20 insertions, 26 deletions
diff --git a/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx b/Master/texmf-dist/source/latex/xpackages/xbase/xtemplate.dtx
index 0287282d898..d6f317c1072 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 1879 2010-03-29 17:48:38Z mittelba $
+\GetIdInfo$Id: xtemplate.dtx 1896 2010-04-14 17:40:38Z joseph $
{Prototype document functions}
%\iffalse
%<*driver>
@@ -1902,7 +1902,7 @@
\cs_new:Npn \xtemplate_split_keytype:n #1 {
\bool_set_false:N \l_xtemplate_error_bool
\tl_set:Nn \l_xtemplate_tmp_tl {#1}
- \tl_replace_all_in:Nnn \l_xtemplate_tmp_tl { ~ } { }
+ \tl_remove_all_in:Nn \l_xtemplate_tmp_tl { ~ }
\tl_replace_all_in:Nnn \l_xtemplate_tmp_tl { : } { @ }
\tl_if_in:VnTF \l_xtemplate_tmp_tl { @ } {
\exp_after:wN \xtemplate_split_keytype_aux:w \l_xtemplate_tmp_tl
@@ -2699,9 +2699,9 @@
% \begin{macrocode}
\cs_new_nopar:Npn \xtemplate_assign_code: {
\tl_put_left:Nx \l_xtemplate_assignments_tl {
- \exp_not:N \cs_set:Npn \exp_not:N \xtemplate_assign_code:n ##1 {
- \exp_not:V \l_xtemplate_var_tl
- }
+ \exp_not:N \cs_set:Npn \exp_not:N \xtemplate_assign_code:n
+ \exp_not:n {##1}
+ { \exp_not:V \l_xtemplate_var_tl }
\exp_not:N \xtemplate_assign_code:n
{ \exp_not:V \l_xtemplate_value_tl }
}
@@ -3024,7 +3024,7 @@
% The text for error messages: short and long text for all of them.
% \begin{macrocode}
\msg_kernel_new:nnnn { xtemplate } { argument-number-mismatch }
- { Object~type~'#1'~takes~'#2' ~not~'#3'~argument(s). }
+ { Object~type~'#1'~takes~'#2'~not~'#3'~argument(s). }
{
Objects~of~type~'#1'~require~'#2'~arguments.\\
You~have~tried~to~make~a~template~for~'#1'\\
@@ -3058,7 +3058,7 @@
{ The~choice~'unknown'~cannot~be~given~for~a~template~key.}
{
The~'unknown'~choice~is~automatically~checked~by~template~when \\
- a~choice~key~is~given with~an~unknown~value.~It~should~not~be \\
+ a~choice~key~is~given~with~an~unknown~value.~It~should~not~be \\
included~in~the~list~of~named~choices~for~a~key,~and~is~always \\
given~last~in~the~implementation~of~choices.
}
@@ -3085,24 +3085,23 @@
\msg_kernel_new:nnnn { xtemplate } { key-no-variable }
{ The~key~'#1'~requires~implementation~details~\msg_line_context:. }
{
- When~creating~template~code~using~
- \token_to_str:N \DeclareTemplateCode,\\
+ When~creating~template~code~using~\DeclareTemplateCode,\\
each~key~name~must~have~an~associated~implementation.\\
This~should~be~given~after~a~'='~sign:~I~did~not~find~one.
}
\msg_kernel_new:nnnn { xtemplate } { key-not-implemented }
{ Key~'#1'~has~no~implementation~\msg_line_context:. }
{
- The~definition~of key implementations~for~template~'#2'\\
+ The~definition~of~key~implementations~for~template~'#2'\\
of~object~type~'#3'~does not~include~any~details~for~key~'#1'.\\
- The~key was declared~in~the~interface definition,\\
+ The~key~was~declared~in~the~interface~definition,\\
and~so~an~implementation~is~required.
}
\msg_kernel_new:nnnn { xtemplate } { keytype-requires-argument }
{ The~keytype~'#1'~requires~an~argument~\msg_line_context:. }
{
You~should~have~put:\\
- \c_space_tl \c_space_tl <key-name>~:~#1
+ \c_space_tl \c_space_tl <key-name>~:~#1~
\token_to_str:N {~<argument>~\token_to_str:N } \\
but~I~did~not~find~an~<argument>.
}
@@ -3119,21 +3118,17 @@
or~has~no~implementation.
}
{
- You~need~to~declare~a~templat~with
- \token_to_str:N \DeclareTemplateInterface \\
- and~its~code~with
- \token_to_str:N \DeclareTemplateCode \c_space_tl
- prior~to~using~it.
+ You~need~to~declare~a~template~with~\DeclareTemplateInterface \\
+ and~its~code~with~\DeclareTemplateCode prior~to~using~it.
}
\msg_kernel_new:nnnn { xtemplate } { type-mismatch }
{ Object~types~'#1'~and~'#2'~do~not~agree. }
{
- You~are~trying~to~use~a~template~directly~with
- \token_to_str:N \UseInstance \\
+ You~are~trying~to~use~a~template~directly~with~\UseInstance \\
(or~a~similar~function),~but~the~object~types~do~not~match.
}
\msg_kernel_new:nnnn { xtemplate } { undeclared-variable }
- {The~variable~#1~has~not~been~declared. }
+ { The~variable~#1~has~not~been~declared. }
{
Before~declaring~an~instance,~all~of~the~required~variables\\
used~in~template~keys~must~be~created.
@@ -3149,13 +3144,13 @@
\msg_kernel_new:nnnn { xtemplate } { unknown-choice }
{ The~choice~'#1'~was~not~declared~for~key~'#2'~\msg_line_context:. }
{
- The~key '#2'~takes~a~fixed~number~of~choices:\\
+ The~key~'#2'~takes~a~fixed~number~of~choices:\\
\clist_map_function:NN #3 \xtemplate_unknown_choice_aux:n
and~this~list~does~not~include~'#1'.
}
\cs_new:Npn \xtemplate_unknown_choice_aux:n #1 { -~ #1 ;\\}
\msg_kernel_new:nnnn { xtemplate } { unknown-keytype }
- { The~keytype '#1'~is~unknown~\msg_line_context:. }
+ { The~keytype~'#1'~is~unknown~\msg_line_context:. }
{
Valid~keytypes~are:\\
-~boolean;\\
@@ -3170,11 +3165,10 @@
-~tokenlist.
}
\msg_kernel_new:nnnn { xtemplate } { unknown-object-type }
- { The ~object~type~'#1'~is~unknown~\msg_line_context:. }
+ { The~object~type~'#1'~is~unknown~\msg_line_context:. }
{
- An~object~type~needs~to~be~declared~with
- \token_to_str:N \DeclareObjectType \c_space_tl
- prior~to~using~it.
+ An~object~type~needs~to~be~declared~with~
+ \DeclareObjectType prior~to~using~it.
}
\msg_kernel_new:nnnn { xtemplate } { unknown-instance }
{ The~instance~'#2'~of~type~'#1'~is~unknown. }