summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages/xtemplate
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-19 22:49:40 +0000
committerKarl Berry <karl@freefriends.org>2012-01-19 22:49:40 +0000
commit1148f4718708f720f250d1e258b9cc429bf30168 (patch)
tree53fa63c41b0c657d758836916573cc5a1cd10652 /Master/texmf-dist/tex/latex/l3packages/xtemplate
parent8764984f07460a77b8200111ddb513c8af6c23f3 (diff)
l3packages 3209 (19jan12)
git-svn-id: svn://tug.org/texlive/trunk@25159 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.sty45
1 files changed, 21 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 0e73815b3f6..a7d0663e2b8 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -17,7 +17,7 @@
%% David Carlisle
%% (C) Copyright 2004-2010 Frank Mittelbach,
%% The LaTeX3 Project
-%% (C) Copyright 2011 The LaTeX3 Project
+%% (C) Copyright 2011,2012 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,22 +50,22 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}
-\GetIdInfo$Id: xtemplate.dtx 3109 2011-12-29 10:42:27Z joseph $
- {L3 Experimental prototype document functions}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\@ifpackagelater { expl3 } { 2011/12/29 }
- { }
+\RequirePackage{expl3}[2012/01/19]
+\@ifpackagelater{expl3}{2012/01/19}
+ {}
{
- \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.\\ \\
- Loading~xtemplate~will~abort!
+ Please install an up to date~version of l3kernel
+ using your TeX package manager or from CTAN.\\ \\
+ Loading xtemplate will abort!
}
- \tex_endinput:D
+ \endinput
}
+\GetIdInfo$Id: xtemplate.dtx 3207 2012-01-19 08:50:24Z joseph $
+ {L3 Experimental prototype document functions}
+\ProvidesExplPackage
+ {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nn \c_xtemplate_code_root_tl { template~code~>~ }
\tl_const:Nn \c_xtemplate_defaults_root_tl { template~defaults~>~ }
\tl_const:Nn \c_xtemplate_instances_root_tl { template~instance~>~ }
@@ -1284,24 +1284,21 @@
\msg_line_context:.
}
\msg_new:nnn { xtemplate } { show-no-attribute }
- { Template~'#2'~of~object~type~'#1'~has~no~#3 . }
+ { The~template~'#2'~of~object~type~'#1'~has~no~#3 . }
\msg_new:nnn { xtemplate } { show-attribute }
- { Template~'#2'~of~object~type~'#1'~has~#3 : }
+ { The~template~'#2'~of~object~type~'#1'~has~#3 : }
\msg_new:nnn { xtemplate } { show-no-values }
{
- \tl_if_empty:nTF {#2}
- { Instance~'#3'~ }
- { Collection instance~'#3'~(from~collection~'#2')~ }
+ The~ \tl_if_empty:nF {#2} {collection~} instance~'#3'~
+ \tl_if_empty:nF {#2} { (from~collection~'#2')~ }
of~object~type~'#1'~has~no~values.
}
\msg_new:nnn { xtemplate } { show-values }
{
- \tl_if_empty:nTF {#2}
- { Instance~'#3'~ }
- { Collection instance~'#3'~(from~collection~'#2')~ }
- of~object~type~'#1'
- \quark_if_no_value:NF #4
- { ~(from~template~'#4')~ }
+ The~ \tl_if_empty:nF {#2} {collection~} instance~'#3'~
+ \tl_if_empty:nF {#2} { (from~collection~'#2')~ }
+ of~object~type~'#1'~
+ \quark_if_no_value:NF #4 { (from~template~'#4')~ }
has~values:
}
\cs_new_protected_nopar:Npn \DeclareObjectType #1#2