From 3cb4e75696df6c7abebf17fbc606ca86dcdfb520 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Sep 2015 23:19:17 +0000 Subject: l3 (6sep15) git-svn-id: svn://tug.org/texlive/trunk@38305 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/l3packages/l3keys2e/l3keys2e.dtx | 6 ++-- .../source/latex/l3packages/xparse/xparse.dtx | 6 ++-- .../latex/l3packages/xtemplate/xtemplate.dtx | 40 ++++++++++++---------- 3 files changed, 28 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3packages') diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index 2924b08d1ba..8cea3b578f7 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -37,8 +37,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2015/07/28] -%\@ifpackagelater{expl3}{2015/07/28} +\RequirePackage{expl3}[2015/09/06] +%\@ifpackagelater{expl3}{2015/09/06} % {} % {% % \PackageError{l3keys2e}{Support package l3kernel too old} @@ -50,7 +50,7 @@ % }% % \endinput % } -\GetIdInfo$Id: l3keys2e.dtx 5700 2015-07-28 19:26:39Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 5925 2015-09-06 09:25:46Z joseph $ {LaTeX2e option processing using LaTeX3 keys} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index 45d8088dbb7..55d8aec5d41 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\RequirePackage{expl3}[2015/07/28] -%\@ifpackagelater{expl3}{2015/07/28} +\RequirePackage{expl3}[2015/09/06] +%\@ifpackagelater{expl3}{2015/09/06} % {} % {% % \PackageError{xparse}{Support package l3kernel too old} @@ -54,7 +54,7 @@ % }% % \endinput % } -\GetIdInfo$Id: xparse.dtx 5700 2015-07-28 19:26:39Z joseph $ +\GetIdInfo$Id: xparse.dtx 5925 2015-09-06 09:25:46Z joseph $ {L3 Experimental document command parser} % %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 09c46d3be52..9651fe12771 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -41,8 +41,8 @@ %<*driver|package> % The version of expl3 required is tested as early as possible, as % some really old versions do not define \ProvidesExplPackage. -\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} @@ -54,7 +54,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} % %<*driver> @@ -230,14 +230,15 @@ % agree with the object type declaration. The interface itself is % defined by the \meta{key list}, which is itself a key--value list % taking a specialized format: -% -% \begin{syntax} +% \begin{quotation} +% \obeylines +% \noindent % \meta{key1}~":"~\meta{key type1}~"," % \meta{key2}~":"~\meta{key type2}~"," % \meta{key3}~":"~\meta{key type3}~"="~\meta{default3}~"," % \meta{key4}~":"~\meta{key type4}~"="~\meta{default4}~"," % \ldots -% \end{syntax} +% \end{quotation} % Each \meta{key} name should consist of \textsc{ascii} characters, % with the exception of |,|, |=| and \verb*| |. The recommended form % for key names is to use lower case letters, with dashes to separate @@ -315,13 +316,15 @@ % between each \meta{key} of the template interface with an % underlying\meta{variable}. % -% \begin{syntax} +% \begin{quotation} +% \obeylines +% \noindent % \meta{key1}~"="~\meta{variable1}, % \meta{key2}~"="~\meta{variable2}, % \meta{key3}~"="~global~\meta{variable3}, % \meta{key4}~"="~global~\meta{variable4}, % \ldots -% \end{syntax} +% \end{quotation} % With the exception of the choice, code and function key types, % the \meta{variable} here should be the name of an existing % \LaTeX3 register. As illustrated, the key word \enquote{global} @@ -2522,10 +2525,10 @@ } \cs_new_protected_nopar:Npn \@@_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 } } % \end{macrocode} @@ -2543,16 +2546,17 @@ \@@_recover_values:n { #1 / #2 / #3 } \prop_if_empty:NTF \l_@@_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_@@_values_prop { from~template } + \prop_pop:NnNF \l_@@_values_prop { from~template } \l_@@_tmp_tl - \__msg_term:nnnnnV { xtemplate } { show-values } + { \tl_clear:N \l_@@_tmp_tl } + \__msg_show_pre:nnnnnV { xtemplate } { show-values } {#1} {#2} {#3} \l_@@_tmp_tl - \__msg_show_variable:n + \__msg_show_wrap:n { \prop_map_function:NN \l_@@_values_prop \__msg_show_item_unbraced:nn @@ -2768,7 +2772,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: } % \end{macrocode} -- cgit v1.2.3