From d501b4397bbc0f4389add919be80ccfca5b3863e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Sep 2015 21:24:44 +0000 Subject: l3 (12sep15) git-svn-id: svn://tug.org/texlive/trunk@38360 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/l3packages/l3keys2e/l3keys2e.dtx | 6 +-- .../source/latex/l3packages/xparse/xparse.dtx | 6 +-- .../latex/l3packages/xtemplate/xtemplate.dtx | 57 ++++++++++++---------- 3 files changed, 37 insertions(+), 32 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 8cea3b578f7..b1c5171456a 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/09/06] -%\@ifpackagelater{expl3}{2015/09/06} +\RequirePackage{expl3}[2015/09/11] +%\@ifpackagelater{expl3}{2015/09/11} % {} % {% % \PackageError{l3keys2e}{Support package l3kernel too old} @@ -50,7 +50,7 @@ % }% % \endinput % } -\GetIdInfo$Id: l3keys2e.dtx 5925 2015-09-06 09:25:46Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 6001 2015-09-11 21:50:23Z 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 55d8aec5d41..d204fd20a94 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/09/06] -%\@ifpackagelater{expl3}{2015/09/06} +\RequirePackage{expl3}[2015/09/11] +%\@ifpackagelater{expl3}{2015/09/11} % {} % {% % \PackageError{xparse}{Support package l3kernel too old} @@ -54,7 +54,7 @@ % }% % \endinput % } -\GetIdInfo$Id: xparse.dtx 5925 2015-09-06 09:25:46Z joseph $ +\GetIdInfo$Id: xparse.dtx 6001 2015-09-11 21:50:23Z 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 9651fe12771..40bc1122621 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/09/06] -%\@ifpackagelater{expl3}{2015/09/06} +\RequirePackage{expl3}[2015/09/11] +%\@ifpackagelater{expl3}{2015/09/11} % {} % {% % \PackageError{xtemplate}{Support package l3kernel too old} @@ -54,7 +54,7 @@ % }% % \endinput % } -\GetIdInfo$Id: xtemplate.dtx 5925 2015-09-06 09:25:46Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 6001 2015-09-11 21:50:23Z joseph $ {L3 Experimental prototype document functions} % %<*driver> @@ -1281,41 +1281,46 @@ % that, the standard delimited argument method is used to separate the % two parts. % \begin{macrocode} -\group_begin: -\char_set_lccode:nn { `\@ } { `\: } -\char_set_catcode_other:N \@ -\tl_to_lowercase:n +\cs_new_protected:Npx \@@_split_keytype:n #1 { - \group_end: - \cs_new_protected:Npn \@@_split_keytype:n #1 + \exp_not:N \bool_set_false:N \exp_not:N \l_@@_error_bool + \tl_set:Nn \exp_not:N \l_@@_tmp_tl {#1} + \tl_remove_all:Nn \exp_not:N \l_@@_tmp_tl { ~ } + \tl_replace_all:Nnn \exp_not:N \l_@@_tmp_tl { : } { \token_to_str:N : } + \tl_if_in:onTF \exp_not:N \l_@@_tmp_tl { \token_to_str:N : } { - \bool_set_false:N \l_@@_error_bool - \tl_set:Nn \l_@@_tmp_tl {#1} - \tl_remove_all:Nn \l_@@_tmp_tl { ~ } - \tl_replace_all:Nnn \l_@@_tmp_tl { : } { @ } - \tl_if_in:onTF \l_@@_tmp_tl { @ } + \exp_not:n { \tl_clear:N \l_@@_key_name_tl \exp_after:wN \@@_split_keytype_aux:w \l_@@_tmp_tl \q_stop } - { - \bool_set_true:N \l_@@_error_bool - \msg_error:nnx { xtemplate } { missing-keytype } {#1} - } } - \cs_new_protected:Npn \@@_split_keytype_aux:w #1 @ #2 \q_stop { - \tl_put_right:Nx \l_@@_key_name_tl { \tl_to_str:n {#1} } - \tl_if_in:nnTF {#2} { @ } + \exp_not:N \bool_set_true:N \exp_not:N \l_@@_error_bool + \msg_error:nnx { xtemplate } { missing-keytype } {#1} + } + } +\use:x + { + \cs_new_protected:Npn \exp_not:N \@@_split_keytype_aux:w + ##1 \token_to_str:N : ##2 \exp_not:N \q_stop + { + \tl_put_right:Nx \exp_not:N \l_@@_key_name_tl + { \exp_not:N \tl_to_str:n {##1} } + \tl_if_in:nnTF {##2} { \token_to_str:N : } { - \tl_put_right:Nn \l_@@_key_name_tl { @ } - \@@_split_keytype_aux:w #2 \q_stop + \tl_put_right:Nn \exp_not:N \l_@@_key_name_tl + { \token_to_str:N : } + \exp_not:N \@@_split_keytype_aux:w ##2 \exp_not:N \q_stop } { - \tl_if_empty:NTF \l_@@_key_name_tl - { \msg_error:nnx { xtemplate } { empty-key-name } { @ #2 } } - { \@@_split_keytype_arg:n {#2} } + \exp_not:N \tl_if_empty:NTF \exp_not:N \l_@@_key_name_tl + { + \msg_error:nnx { xtemplate } { empty-key-name } + { \token_to_str:N : ##2 } + } + { \exp_not:N \@@_split_keytype_arg:n {##2} } } } } -- cgit v1.2.3