diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-23 17:15:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-23 17:15:15 +0000 |
commit | dadf86ec2d90ed4529037604a8dcea9f660045b8 (patch) | |
tree | 819b3708bda1e2a087ebd5fb0f0f55ebe0b4d157 /Master/texmf-dist/tex/latex/l3packages/l3keys2e | |
parent | 134349701bddf7cbbacf6030c6b9f9838aff96fa (diff) |
l3packages 3990 (17jul12)
git-svn-id: svn://tug.org/texlive/trunk@27109 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages/l3keys2e')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 5d4ecde4e55..fdd3f37a919 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -46,30 +46,30 @@ %% %% ----------------------------------------------------------------------- %% -\RequirePackage{expl3}[2012/04/23] -\@ifpackagelater{expl3}{2012/04/23} +\RequirePackage{expl3}[2012/07/16] +\@ifpackagelater{expl3}{2012/07/16} {} - { + {% \PackageError{l3keys2e}{Support package l3kernel too old.} - { + {% Please install an up to date version of l3kernel using your TeX package manager or from CTAN.\\ \\ - Loading l3keys2e will abort! - } + Loading l3keys2e will abort!% + }% \endinput } \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 3570 2012-04-23 13:24:55Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 3990 2012-07-16 07:46:03Z joseph $ {LaTeX2e option processing using LaTeX3 keys} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\clist_new:N \keys_latexe_options_clist -\bool_new:N \_l_keys_process_class_bool -\cs_new_protected:Npn \keys_latexe_options:n #1 +\clist_new:N \__keys_latexe_options_clist +\bool_new:N \l__keys_process_class_bool +\cs_new_protected:Npn \__keys_latexe_options:n #1 { - \clist_clear:N \keys_latexe_options_clist - \keys_latexe_options_global:n {#1} - \keys_latexe_options_local: + \clist_clear:N \__keys_latexe_options_clist + \__keys_latexe_options_global:n {#1} + \__keys_latexe_options_local: \keys_if_exist:nnF {#1} { unknown } { \keys_define:nn {#1} @@ -81,68 +81,68 @@ } } } - \keys_set:nV {#1} \keys_latexe_options_clist + \keys_set:nV {#1} \__keys_latexe_options_clist \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: } } -\cs_new_protected:Npn \keys_latexe_options_global:n #1 +\cs_new_protected:Npn \__keys_latexe_options_global:n #1 { \cs_if_eq:NNF \@classoptionslist \scan_stop: { \cs_if_eq:NNTF \@currext \@clsextension - { \keys_latexe_options_class:n {#1} } + { \__keys_latexe_options_class:n {#1} } { - \bool_if:NT \_l_keys_process_class_bool - { \keys_latexe_options_package:n {#1} } + \bool_if:NT \l__keys_process_class_bool + { \__keys_latexe_options_package:n {#1} } } } } -\cs_new_protected:Npn \keys_latexe_options_class:n #1 +\cs_new_protected:Npn \__keys_latexe_options_class:n #1 { \keys_if_exist:nnTF {#1} { unknown } - { \clist_put_right:No \keys_latexe_options_clist \@classoptionslist } + { \clist_put_right:No \__keys_latexe_options_clist \@classoptionslist } { \clist_map_inline:Nn \@classoptionslist { - \keys_if_exist:nnTF {#1} { \keys_latexe_remove_equals:n {##1} } - { \clist_put_right:Nn \keys_latexe_options_clist {##1} } + \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} } + { \clist_put_right:Nn \__keys_latexe_options_clist {##1} } { \clist_put_right:Nn \@unusedoptionlist {##1} } } } } -\cs_new_protected:Npn \keys_latexe_options_package:n #1 +\cs_new_protected:Npn \__keys_latexe_options_package:n #1 { \clist_map_inline:Nn \@classoptionslist { - \keys_if_exist:nnT {#1} { \keys_latexe_remove_equals:n {##1} } + \keys_if_exist:nnT {#1} { \__keys_latexe_remove_equals:n {##1} } { - \clist_put_right:Nn \keys_latexe_options_clist {##1} + \clist_put_right:Nn \__keys_latexe_options_clist {##1} \clist_remove_all:Nn \@unusedoptionlist {##1} } } } -\cs_new_protected_nopar:Npn \keys_latexe_options_local: +\cs_new_protected_nopar:Npn \__keys_latexe_options_local: { \cs_if_eq:NNF \@currext \@clsextension { \cs_if_exist:cT { opt@ \@currname . \@currext } { - \exp_args:NNc \clist_put_right:NV \keys_latexe_options_clist + \exp_args:NNc \clist_put_right:NV \__keys_latexe_options_clist { opt@ \@currname . \@currext } } } } -\cs_new:Npn \keys_latexe_remove_equals:n #1 - { \keys_latexe_remove_equals:w #1 = \q_stop } -\cs_new:Npn \keys_latexe_remove_equals:w #1 = #2 \q_stop {#1} +\cs_new:Npn \__keys_latexe_remove_equals:n #1 + { \__keys_latexe_remove_equals:w #1 = \q_stop } +\cs_new:Npn \__keys_latexe_remove_equals:w #1 = #2 \q_stop {#1} \cs_new_protected_nopar:Npn \ProcessKeysOptions #1 { - \bool_set_true:N \_l_keys_process_class_bool - \keys_latexe_options:n {#1} + \bool_set_true:N \l__keys_process_class_bool + \__keys_latexe_options:n {#1} } \cs_new_protected_nopar:Npn \ProcessKeysPackageOptions #1 { - \bool_set_false:N \_l_keys_process_class_bool - \keys_latexe_options:n {#1} + \bool_set_false:N \l__keys_process_class_bool + \__keys_latexe_options:n {#1} } \@onlypreamble \ProcessKeysOptions \@onlypreamble \ProcessKeysPackageOptions |