summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-11 22:31:42 +0000
committerKarl Berry <karl@freefriends.org>2011-12-11 22:31:42 +0000
commitc56f30c6154e55286a21f438d5ed545a5169f13b (patch)
tree78d305bd23e7a50cbbd320c30ffcff1e0fb193a5 /Master/texmf-dist/tex/latex
parenta57ec5a6dea711c791fc567803079341c6fbfae3 (diff)
l3packages 3036 (11dec11)
git-svn-id: svn://tug.org/texlive/trunk@24821 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty63
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty78
3 files changed, 71 insertions, 74 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index ec331202c34..64c7c7e3229 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -47,11 +47,11 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{xparse}
-\GetIdInfo$Id: l3keys2e.dtx 2966 2011-11-19 15:58:47Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 3036 2011-12-07 19:29:18Z joseph $
{LaTeX2e option processing using LaTeX3 keys}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\@ifpackagelater { expl3 } { 2011/11/09 }
+\@ifpackagelater { expl3 } { 2011/12/07 }
{ }
{
\PackageError { l3keys2e } { Support~package~l3kernel~too~old. }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 8e0d8a77b4d..ceb28c984f4 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -51,12 +51,12 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{expl3}
-\GetIdInfo$Id: xparse.dtx 2966 2011-11-19 15:58:47Z joseph $
+\GetIdInfo$Id: xparse.dtx 3036 2011-12-07 19:29:18Z joseph $
{L3 Experimental document command parser}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\RequirePackage{expl3}
-\@ifpackagelater { expl3 } { 2011/11/19 }
+\@ifpackagelater { expl3 } { 2011/12/07 }
{ }
{
\PackageError { xparse } { Support~package~l3kernel~too~old. }
@@ -910,36 +910,41 @@
{ \xparse_split_argument_aux_iii:w #2 \q_stop }
}
\cs_new_protected:Npn \xparse_split_argument_aux_iii:w { }
+\seq_new:N \l_xparse_split_list_seq
\tl_new:N \l_xparse_split_list_tl
-\group_begin:
- \char_set_catcode_active:N \@
- \cs_new_protected:Npn \xparse_split_list:nn #1#2
- {
- \tl_set:Nn \l_xparse_split_list_tl {#2}
- \group_begin:
- \char_set_lccode:nn { `\@ } { `#1 }
- \tl_to_lowercase:n
- {
- \group_end:
- \tl_replace_all:Nnn \l_xparse_split_list_tl { @ } {#1}
- }
- \cs_set:Npn \xparse_split_list_aux:w ##1 #1
- {
- \quark_if_recursion_tail_stop:n {##1}
- \tl_put_right:Nn \ProcessedArgument { {##1} }
- \xparse_split_list_aux:w
- }
- \tl_if_empty:NTF \l_xparse_split_list_tl
- { \tl_set:Nn \ProcessedArgument { { } } }
- {
- \tl_clear:N \ProcessedArgument
- \exp_after:wN \xparse_split_list_aux:w
- \l_xparse_split_list_tl #1
- \q_recursion_tail #1 \q_recursion_stop
- }
+\cs_new_protected:Npn \xparse_split_list:nn #1#2
+ {
+ \bool_if:nTF
+ {
+ \tl_if_single_p:n {#1} &&
+ ! (\token_if_cs_p:N #1 )
+ }
+ { \xparse_split_list_single:Nn #1 {#2} }
+ { \xparse_split_list_multi:nn {#1} {#2} }
}
+\cs_set_protected:Npn \xparse_split_list_multi:nn #1#2
+ {
+ \seq_set_split:Nnn \l_xparse_split_list_seq {#1} {#2}
+ \tl_clear:N \ProcessedArgument
+ \seq_map_inline:Nn \l_xparse_split_list_seq
+ { \tl_put_right:Nn \ProcessedArgument { {##1} } }
+ }
+\cs_generate_variant:Nn \xparse_split_list_multi:nn { nV }
+\group_begin:
+\char_set_catcode_active:N \@
+\cs_new_protected:Npn \xparse_split_list_single:Nn #1#2
+ {
+ \tl_set:Nn \l_xparse_split_list_tl {#2}
+ \group_begin:
+ \char_set_lccode:nn { `\@ } { `#1 }
+ \tl_to_lowercase:n
+ {
+ \group_end:
+ \tl_replace_all:Nnn \l_xparse_split_list_tl { @ } {#1}
+ }
+ \xparse_split_list_multi:nV {#1} \l_xparse_split_list_tl
+ }
\group_end:
-\cs_new_protected:Npn \xparse_split_list_aux:w { }
\cs_new_protected:Npn \xparse_trim_spaces:n #1
{ \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } }
\cs_new_protected:Npn \xparse_exp_add_type_d:w #1#2
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 590c9e2f461..42525d2e497 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -51,11 +51,11 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{expl3}
-\GetIdInfo$Id: xtemplate.dtx 2966 2011-11-19 15:58:47Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 3036 2011-12-07 19:29:18Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\@ifpackagelater { expl3 } { 2011/11/19 }
+\@ifpackagelater { expl3 } { 2011/12/07 }
{ }
{
\PackageError { xtemplate } { Support~package~l3kernel~too~old. }
@@ -1071,25 +1071,11 @@
}
\cs_new_protected_nopar:Npn \xtemplate_show:Nnnn #1#2#3#4
{
- \prop_if_empty:NTF #1
- {
- \iow_term:x { Template~'#3'~of~object~type~'#2'~has~no~#4 . }
- \tl_show:n { }
- }
- {
- \iow_term:x { Template~'#3'~of~object~type~'#2'~has~ #4 : }
- \tl_set:Nx \l_prop_show_tl
- { \prop_map_function:NN #1 \xtemplate_show_aux:nn }
- \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
- { \exp_after:wN \prop_show_aux:w \l_prop_show_tl }
- }
-}
-\cs_new:Npn \xtemplate_show_aux:nn #1#2
- {
- \iow_newline: > \c_space_tl \c_space_tl
- #1
- \c_space_tl \c_space_tl => \c_space_tl \c_space_tl
- \exp_not:n {#2}
+ \msg_aux_use:nnxxxx { xtemplate }
+ { \prop_if_empty:NTF #1 { show-no-attribute } { show-attribute } }
+ {#2} {#3} {#4} { }
+ \msg_aux_show:x
+ { \prop_map_function:NN #1 \msg_aux_show_unbraced:nn }
}
\cs_new_protected_nopar:Npn \xtemplate_show_values:nnn #1#2#3
{
@@ -1098,35 +1084,20 @@
\xtemplate_recover_values:n { #1 / #2 / #3 }
\prop_if_empty:NTF \l_xtemplate_values_prop
{
- \iow_term:x
- {
- \tl_if_empty:nTF {#2}
- { Instance~'#3'~ }
- { Collection instance~'#3'~(from~collection~'#2')~ }
- of~object~type~'#1'~has~no~values.
- }
- \tl_show:n { }
+ \msg_aux_use:nnxxxx { xtemplate } { show-no-values }
+ {#1} {#2} {#3} { }
+ \msg_aux_show:x { }
}
{
\prop_pop:NnN \l_xtemplate_values_prop { from~template }
\l_xtemplate_tmp_tl
- \iow_term:x
- {
- \tl_if_empty:nTF {#2}
- { Instance~'#3'~ }
- { Collection instance~'#3'~(from~collection~'#2')~ }
- of~object~type~'#1'
- \quark_if_no_value:NF \l_xtemplate_tmp_tl
- { ~(from~template~' \l_xtemplate_tmp_tl ')~ }
- has~values:
- }
- \tl_set:Nx \l_prop_show_tl
+ \msg_aux_use:nnxxxx { xtemplate } { show-values }
+ {#1} {#2} {#3} { \l_xtemplate_tmp_tl }
+ \msg_aux_show:x
{
\prop_map_function:NN \l_xtemplate_values_prop
- \xtemplate_show_aux:nn
+ \msg_aux_show_unbraced:nn
}
- \etex_showtokens:D \exp_after:wN \exp_after:wN \exp_after:wN
- { \exp_after:wN \prop_show_aux:w \l_prop_show_tl }
}
}
}
@@ -1312,6 +1283,27 @@
Declaring~interface~for~template~'#2'~of~object~type~'#1'~
\msg_line_context:.
}
+\msg_new:nnn { xtemplate } { show-no-attribute }
+ { Template~'#2'~of~object~type~'#1'~has~no~#3 . }
+\msg_new:nnn { xtemplate } { show-attribute }
+ { 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')~ }
+ 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')~ }
+ has~values:
+ }
\cs_new_protected_nopar:Npn \DeclareObjectType #1#2
{ \xtemplate_declare_object_type:nn {#1} {#2} }
\cs_new_protected:Npn \DeclareTemplateInterface #1#2#3#4