summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty27
1 files changed, 14 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index e9555109b6d..ba9d715489a 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}[2015/07/28]
-\@ifpackagelater{expl3}{2015/07/28}
+\RequirePackage{expl3}[2015/09/06]
+\@ifpackagelater{expl3}{2015/09/06}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 5700 2015-07-28 19:26:39Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 5925 2015-09-06 09:25:46Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -1103,10 +1103,10 @@
}
\cs_new_protected_nopar:Npn \__xtemplate_show:Nnnn #1#2#3#4
{
- \__msg_term:nnnnn { xtemplate }
+ \__msg_show_pre:nnnnnn { xtemplate }
{ \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } }
- {#2} {#3} {#4}
- \__msg_show_variable:n
+ {#2} {#3} {#4} { }
+ \__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
@@ -1116,16 +1116,17 @@
\__xtemplate_recover_values:n { #1 / #2 / #3 }
\prop_if_empty:NTF \l__xtemplate_values_prop
{
- \__msg_term:nnnnn { xtemplate } { show-no-values }
- {#1} {#2} {#3}
- \__msg_show_variable:n { }
+ \__msg_show_pre:nnnnnn { xtemplate } { show-no-values }
+ {#1} {#2} {#3} { }
+ \__msg_show_wrap:n { }
}
{
- \prop_pop:NnN \l__xtemplate_values_prop { from~template }
+ \prop_pop:NnNF \l__xtemplate_values_prop { from~template }
\l__xtemplate_tmp_tl
- \__msg_term:nnnnnV { xtemplate } { show-values }
+ { \tl_clear:N \l__xtemplate_tmp_tl }
+ \__msg_show_pre:nnnnnV { xtemplate } { show-values }
{#1} {#2} {#3} \l__xtemplate_tmp_tl
- \__msg_show_variable:n
+ \__msg_show_wrap:n
{
\prop_map_function:NN \l__xtemplate_values_prop
\__msg_show_item_unbraced:nn
@@ -1330,7 +1331,7 @@
The~ \tl_if_empty:nF {#2} {collection~} instance~'#3'~
\tl_if_empty:nF {#2} { (from~collection~'#2')~ }
of~object~type~'#1'~
- \str_if_eq:nnF { \q_no_value } {#4} { (from~template~'#4')~ }
+ \tl_if_empty:nF {#4} { (from~template~'#4')~ }
has~values:
}
\cs_new_protected_nopar:Npn \DeclareObjectType #1#2