diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index f66febfeaeb..6158b9c21a9 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3keys2e.dtx (C) Copyright 2009,2011-2013 The LaTeX3 Project +%% File: l3keys2e.dtx (C) Copyright 2009,2011-2014 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 @@ -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}[2013/12/31] -%<package>\@ifpackagelater{expl3}{2013/12/31} +\RequirePackage{expl3}[2014/05/05] +%<package>\@ifpackagelater{expl3}{2014/05/05} %<package> {} %<package> {% %<package> \PackageError{l3keys2e}{Support package l3kernel too old} @@ -50,7 +50,7 @@ %<package> }% %<package> \endinput %<package> } -\GetIdInfo$Id: l3keys2e.dtx 4634 2013-12-31 17:32:19Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 4740 2014-05-05 14:04:24Z joseph $ {LaTeX2e option processing using LaTeX3 keys} %</driver|package> %<*driver> @@ -143,7 +143,7 @@ % \begin{macrocode} %<*package> % \end{macrocode} -% +% % \begin{macrocode} %<@@=keys> % \end{macrocode} @@ -153,6 +153,11 @@ {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} % \end{macrocode} % +% One non-standard variant needed. +% \begin{macrocode} +\cs_generate_variant:Nn \clist_put_right:Nn { Nv } +% \end{macrocode} +% % \begin{macro}{\l_@@_latexe_options_clist} % A single list is used for all options, into which they are collected % before processing. @@ -193,7 +198,11 @@ } } } - \keys_set:nV {#1} \l_@@_latexe_options_clist + \clist_map_inline:Nn \l_@@_latexe_options_clist + { + \tl_set:Nn \CurrentOption {##1} + \keys_set:nn {#1} {##1} + } \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: } } % \end{macrocode} @@ -230,14 +239,20 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_latexe_options_class:n #1 { - \keys_if_exist:nnTF {#1} { unknown } - { \clist_put_right:No \l_@@_latexe_options_clist \@classoptionslist } + \cs_if_free:cF { opt@ \@currname . \@currext } { - \clist_map_inline:Nn \@classoptionslist + \keys_if_exist:nnTF {#1} { unknown } { - \keys_if_exist:nnTF {#1} { \@@_latexe_remove_equals:n {##1} } - { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} } - { \clist_put_right:Nn \@unusedoptionlist {##1} } + \clist_put_right:Nv \l_@@_latexe_options_clist + { opt@ \@currname . \@currext } + } + { + \clist_map_inline:cn { opt@ \@currname . \@currext } + { + \keys_if_exist:nnTF {#1} { \@@_latexe_remove_equals:n {##1} } + { \clist_put_right:Nn \l_@@_latexe_options_clist {##1} } + { \clist_put_right:Nn \@unusedoptionlist {##1} } + } } } } |