summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ltxkeys
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-08-19 22:19:25 +0000
committerKarl Berry <karl@freefriends.org>2012-08-19 22:19:25 +0000
commite9d394d17c224d094859430ed2d214491caf0e45 (patch)
treebcc98b0bcd7a4a621fde96c8cc02b602141fa621 /Master/texmf-dist/tex/latex/ltxkeys
parentfc31e4178a0deb96c5f9c78ef8b269e4210473b6 (diff)
ltxkeys (19aug12)
git-svn-id: svn://tug.org/texlive/trunk@27462 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ltxkeys')
-rw-r--r--Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty22
1 files changed, 13 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty b/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty
index ad892504860..779a04a6270 100644
--- a/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty
+++ b/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty
@@ -1,6 +1,6 @@
%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
% %
-% This is file 'ltxkeys.sty', version 0.0.3, December 2011. %
+% This is file 'ltxkeys.sty', version 0.0.3a, August 02, 2012. %
% %
% This package and accompanying files may be distributed and/or %
% modified under the conditions of the LaTeX Project Public License, %
@@ -16,22 +16,22 @@
% implied warranties of merchantability and fitness for a particular %
% purpose. %
% %
-% Copyright (c) 2011 Ahmed Musa (amusa22@gmail.com). %
+% Copyright (c) 2011-2012 Ahmed Musa (amusa22@gmail.com). %
% %
%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
\@ifpackageloaded{catoptions}{%
- \@ifpackagelater{catoptions}{2011/12/10}{}{%
+ \@ifpackagelater{catoptions}{2012/08/02}{}{%
\@latex@error{Loaded version of catoptions package is
not current}\@ehc
}%
}{%
- \RequirePackage{catoptions}[2011/12/10]%
+ \RequirePackage{catoptions}[2012/08/02]%
}
\UseNormalCatcodes
\StyleFilePurpose{A robust key-value parser (AM)}
\StyleFileRCSInfo
-$Id: ltxkeys.sty,v 0.0.3 2011/12/17 09:00:00 Ahmed Musa Exp $
+$Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $
\ProvidesPackage{ltxkeys}[\StyleFileInfo]
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\SetStyleFileMessages[ltxkeys@]{info}{warn}{err}
@@ -293,14 +293,17 @@ $Id: ltxkeys.sty,v 0.0.3 2011/12/17 09:00:00 Ahmed Musa Exp $
\ifin@
}
\robust@def*\ltxkeys@ifchcfd#1\endgroup{%
- \let\@firstoftwo\relax
- \let\@secondoftwo\relax
+ % Don't make \@firstoftwo and \@secondoftwo equal to \relax
+ % here since \ifbool needs \ifnull, which in turn needs
+ % \@firstoftwo and \@secondoftwo.
\cptpassexpanded{%
\endgroup
\ifcase#1\relax
- \ifboolTF{cpt@choicefd}\@firstoftwo\@secondoftwo
+ \ifdefboolTF{cpt@choicefd}
+ {\noexpand\@firstoftwo}{\noexpand\@secondoftwo}%
\or
- \ifboolTF{cpt@choicefd}\@secondoftwo\@firstoftwo
+ \ifdefboolTF{cpt@choicefd}
+ {\noexpand\@secondoftwo}{\noexpand\@firstoftwo}%
\else
\ltxkeys@err{Invalid number '#1'}\ltxkeys@ehc
\fi
@@ -4234,6 +4237,7 @@ $Id: ltxkeys.sty,v 0.0.3 2011/12/17 09:00:00 Ahmed Musa Exp $
[true]{\ifltxkeys@allowemptypath\ltxkeys@useemptytrue\fi}
\ltxkeys@executeoptions[KV]<ltxkeys>
{keyparser,keydepthlimit=4}\relax
+
\ltxkeys@processoptions*[KV]<ltxkeys>\relax
\cpt@optioncleanup\ltxkeys@processedoptions