diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-24 21:33:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-24 21:33:14 +0000 |
commit | 4659d41ea5da1bb6a6cde1a4d1cdabd339c6a053 (patch) | |
tree | 67f5f637dae41d69727f3c018a3ac832ccf16c02 /Master/texmf-dist/source/latex/l3packages/l3keys2e | |
parent | 45753dabbb93091efcea2a70996bcbdc51a39761 (diff) |
l3
git-svn-id: svn://tug.org/texlive/trunk@37947 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3packages/l3keys2e')
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index 13dd7cc48b2..1de701ee0ee 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/06/15] -%<package>\@ifpackagelater{expl3}{2015/06/15} +\RequirePackage{expl3}[2015/07/14] +%<package>\@ifpackagelater{expl3}{2015/07/14} %<package> {} %<package> {% %<package> \PackageError{l3keys2e}{Support package l3kernel too old} @@ -50,7 +50,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3keys2e.dtx 5630 2015-06-15 08:49:02Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 5662 2015-07-14 21:32:38Z joseph $ {LaTeX2e option processing using LaTeX3 keys} %</driver|package> %<*driver> @@ -153,9 +153,11 @@ {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} % \end{macrocode} % -% One non-standard variant needed. +% Non-standard variants. % \begin{macrocode} \cs_generate_variant:Nn \clist_put_right:Nn { Nv } +\cs_generate_variant:Nn \keys_if_exist:nnT { nx } +\cs_generate_variant:Nn \keys_if_exist:nnTF { nx } % \end{macrocode} % % \begin{macro}{\l_@@_latexe_options_clist} @@ -249,7 +251,7 @@ { \clist_map_inline:cn { opt@ \@currname . \@currext } { - \keys_if_exist:nnTF {#1} { \@@_latexe_remove_equals:n {##1} } + \keys_if_exist:nxTF {#1} { \@@_latexe_remove_equals:n {##1} } { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} } { \clist_put_right:Nn \@unusedoptionlist {##1} } } @@ -269,7 +271,7 @@ { \clist_map_inline:Nn \@classoptionslist { - \keys_if_exist:nnT {#1} { \@@_latexe_remove_equals:n {##1} } + \keys_if_exist:nxT {#1} { \@@_latexe_remove_equals:n {##1} } { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} \clist_remove_all:Nn \@unusedoptionlist {##1} @@ -306,7 +308,7 @@ % \begin{macrocode} \cs_new:Npn \@@_latexe_remove_equals:n #1 { \@@_latexe_remove_equals:w #1 = \q_stop } -\cs_new:Npn \@@_latexe_remove_equals:w #1 = #2 \q_stop {#1} +\cs_new:Npn \@@_latexe_remove_equals:w #1 = #2 \q_stop { \exp_not:n {#1} } % \end{macrocode} % \end{macro} % \end{macro} |