summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages/xtemplate
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
committerKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
commit8bcf0c7ef3cd19666c206271cea9280846b5c7e6 (patch)
treeee538c7e2a14ad105a169fdd2e745356147577cc /Master/texmf-dist/tex/latex/l3packages/xtemplate
parentef0453041a9700a2d974c3c76e3398e40c4e4aeb (diff)
l3 (21dec12)
git-svn-id: svn://tug.org/texlive/trunk@28608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/xtemplate')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty33
1 files changed, 22 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index c2fa5195eba..7c33f8c0803 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,19 +50,20 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2012/11/21]
-\@ifpackagelater{expl3}{2012/11/21}
+\RequirePackage{expl3}[2012/12/21]
+\@ifpackagelater{expl3}{2012/12/21}
{}
{%
- \PackageError{xtemplate}{Support package l3kernel too old.}
+ \PackageError{xtemplate}{Support package l3kernel too old}
{%
- Please install an up to date version of l3kernel
- using your TeX package manager or from CTAN.\\ \\
+ Please install an up to date version of l3kernel\MessageBreak
+ using your TeX package manager or from CTAN.\MessageBreak
+ \MessageBreak
Loading xtemplate will abort!%
}%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 4332 2012-11-21 21:40:31Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4390 2012-12-21 06:59:20Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -843,12 +844,22 @@
}
\cs_new_protected_nopar:Npn \__xtemplate_assign_boolean_aux:n #1
{
- \__xtemplate_if_key_value:oT \l__xtemplate_value_tl
- { \__xtemplate_key_to_value: }
- \tl_put_right:Nx \l__xtemplate_assignments_tl
+ \__xtemplate_if_key_value:oTF \l__xtemplate_value_tl
{
- \exp_not:c { #1 _ \l__xtemplate_value_tl :N }
- \exp_not:o \l__xtemplate_var_tl
+ \__xtemplate_key_to_value:
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
+ {
+ \exp_not:c { #1 _eq:NN }
+ \exp_not:o \l__xtemplate_var_tl
+ \exp_not:o \l__xtemplate_value_tl
+ }
+ }
+ {
+ \tl_put_right:Nx \l__xtemplate_assignments_tl
+ {
+ \exp_not:c { #1 _ \l__xtemplate_value_tl :N }
+ \exp_not:o \l__xtemplate_var_tl
+ }
}
}
\cs_new_protected_nopar:Npn \__xtemplate_assign_choice: