diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty b/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty index 779a04a6270..4a1efbd718e 100644 --- a/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty +++ b/Master/texmf-dist/tex/latex/ltxkeys/ltxkeys.sty @@ -1,6 +1,5 @@ %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++% -% % -% This is file 'ltxkeys.sty', version 0.0.3a, August 02, 2012. % +% This is file 'ltxkeys.sty', version 0.0.3b, October 14, 2012. % % % % This package and accompanying files may be distributed and/or % % modified under the conditions of the LaTeX Project Public License, % @@ -17,21 +16,20 @@ % purpose. % % % % Copyright (c) 2011-2012 Ahmed Musa (amusa22@gmail.com). % -% % %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++% \@ifpackageloaded{catoptions}{% - \@ifpackagelater{catoptions}{2012/08/02}{}{% + \@ifpackagelater{catoptions}{2012/10/14}{}{% \@latex@error{Loaded version of catoptions package is not current}\@ehc }% }{% - \RequirePackage{catoptions}[2012/08/02]% + \RequirePackage{catoptions}[2012/10/14]% } \UseNormalCatcodes \StyleFilePurpose{A robust key-value parser (AM)} \StyleFileRCSInfo -$Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ +$Id: ltxkeys.sty,v 0.0.3b 2012/10/14 09:00:00 Ahmed Musa Exp $ \ProvidesPackage{ltxkeys}[\StyleFileInfo] \NeedsTeXFormat{LaTeX2e}[2011/06/27] \SetStyleFileMessages[ltxkeys@]{info}{warn}{err} @@ -64,11 +62,11 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ \new@def*\ltxkeys@antiquark{\@gobble\ltxkeys@antiquark} \new@def*\ltxkeys@cdr#1#2\ltxkeys@nil{#2} \new@def*\ltxkeys@spcdr#1#2\ltxkeys@nil{\detokenize{#2}} -\new@def\ltxkeys@ifxFT#1#2{\ltxkeys@ifxTF{#1}{#2}\iiofii\iofii} +\new@def\ltxkeys@ifxFT#1#2{\ltxkeys@ifxTF{#1}{#2}\cptiiofii\cptiofii} \new@def\ltxkeys@ifxTF#1#2{% \expandafter\cptswap\cpt@car#1\ltxkeys@quark\car@nil {\expandafter\ifx\cpt@car#2\ltxkeys@antiquark\car@nil}% - \expandafter\iofii\else\expandafter\iiofii\fi + \expandafter\cptiofii\else\expandafter\cptiiofii\fi } \new@def*\ltxkeys@ifcsemptyTF#1{% \expandafter\ltxkeys@ifxTF\cpt@car#1\ltxkeys@quark\car@nil\@empty @@ -166,11 +164,11 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ } \robust@def*\ltxkeys@teststpl#1{\ltxkeys@testst{\ltxkeys@testpl{#1}}} \robust@def*\ltxkeys@state{% - \ltxkeys@keys,\ltxkeys@prefs,\ltxkeys@fams,\ltxkeys@nakeys, - \ltxkeys@tpref,\ltxkeys@ttpref,\ltxkeys@tfam,\ltxkeys@tkey, - \ltxkeys@tval,\ifltxkeys@st,\ifltxkeys@pl,\ifltxkeys@cl, - \ifltxkeys@kf,\ifltxkeys@pxop,\ifltxkeys@exop,\ifltxkeys@ini, - \CurrentKeyval,\CurrentKey,\CurrentVal + \\\ltxkeys@keys\\\ltxkeys@prefs\\\ltxkeys@fams\\\ltxkeys@nakeys + \\\ltxkeys@tpref\\\ltxkeys@ttpref\\\ltxkeys@tfam\\\ltxkeys@tkey + \\\ltxkeys@tval\\\ifltxkeys@st\\\ifltxkeys@pl\\\ifltxkeys@cl + \\\ifltxkeys@kf\\\ifltxkeys@pxop\\\ifltxkeys@exop\\\ifltxkeys@ini + \\\CurrentKeyval\\\CurrentKey\\\CurrentVal } \robust@def\ltxkeys@trimspacesincs#1{% \expandafter\ltxkeys@trimspaces\expandafter{#1}{#1}% @@ -389,7 +387,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ \edef\reserved@a{\ifcpt@st*\fi}% \def\eltnum{0}% \def\ltxkeys@do##1{% - \pushnumber\eltnum + \cptpushnumber\eltnum }% \expandafter\ltxkeys@parse\reserved@a1[#1]{#4}% \aftercsname\endgroup{@\ifnum\eltnum#2\numexpr#3% @@ -436,7 +434,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ \provide@def\first@to@endif#1#2\endif{#1} \new@def*\ltxkeys@ifcassenumcmpTF#1#2#3{% \ifdim#1pt#2pt % - \expandafter\iofii\else\expandafter\iiofii\fi + \expandafter\cptiofii\else\expandafter\cptiiofii\fi } \new@def\ltxkeys@ifcasse#1{% \ifstrcmpTF{#1}\elseif{% @@ -642,7 +640,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ \ifstrcmpTF{##1}{#3}{% \cpt@choicefdtrue\loopbreak }{% - \pushnumber#2% + \cptpushnumber#2% }% }% \cptexpandsecond{\ltxkeys@parse0}{[\ltxkeys@ccparser]}{#4}% @@ -890,9 +888,10 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ } \robust@def*\ltxkeys@parse@b[#1]#2{% \cpt@stchoose{cpt@st}{#2}\ltxkeys@arg\ltxkeys@parse - \pushfunctions\ltxkeys@parse{\ifloopbreak,\ifltxkeys@useempty,% - \ltxkeys@doo,\ltxkeys@parse@c,\ltxkeys@parse@d,% - \ltxkeys@loopcbk}\cpt@csvdepth + \cptpushfunctions\ltxkeys@parse{% + \\\ifloopbreak\\\ifltxkeys@useempty\\\ltxkeys@doo + \\\ltxkeys@parse@c\\\ltxkeys@parse@d\\\ltxkeys@loopcbk + }\cpt@csvdepth \ifdefTF\ltxkeys@do {\let\ltxkeys@doo\ltxkeys@do}{\cpt@notdeferr\ltxkeys@do}% \def\ltxkeys@parse@c{% @@ -916,7 +915,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ }{}% \loopbreakfalse \expandafter\ltxkeys@parse@c\ltxkeys@arg#1\ltxkeys@nil#1% - \popfunctions\ltxkeys@parse\cpt@csvdepth + \cptpopfunctions\ltxkeys@parse\cpt@csvdepth \ifnum\cpt@csvdepth=\z@pt\undefcs\ltxkeys@do\fi } \def\ltxkeys@keyprefixhook{} @@ -3956,12 +3955,13 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ } \robust@def*\ltxkeys@keycommand@j#1(#2){% \ltxkeys@setkeys[CMDKEY]{ltxkeys@#1}{#2}% - \pushfunctions\ltxkeyscmd{\val,\ifval,\ifvalTF, - \keyval,\ifkeyval,\ifkeyvalTF}\ltxkeyscmd@depth + \cptpushfunctions\ltxkeyscmd{% + \\\val\\\ifval\\\ifvalTF\\\keyval\\\ifkeyval\\\ifkeyvalTF + }\ltxkeyscmd@depth \def\val##1{\usename{#1@\cpttrimspace{##1}}}% \def\ifval##1\then{\usename{if#1@\cpttrimspace{##1}}}% \def\ifvalTF##1{% - \ifval##1\then\expandafter\iofii\else\expandafter\iiofii\fi + \ifval##1\then\expandafter\cptiofii\else\expandafter\cptiiofii\fi }% \def\keyval##1{% \ifcsndefTF{#1@\cpttrimspace{##1}}{% @@ -3980,7 +3980,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ }% }% \def\ifkeyvalTF##1{% - \ifkeyval##1\then\expandafter\iofii\else\expandafter\iiofii\fi + \ifkeyval##1\then\expandafter\cptiofii\else\expandafter\cptiiofii\fi }% \long\def\reserved@a##1##2\ltxkeys@nil{% % \ifswitch won't work here: @@ -3988,7 +3988,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ ##2% }{% ##2% - \popfunctions\ltxkeyscmd\ltxkeyscmd@depth + \cptpopfunctions\ltxkeyscmd\ltxkeyscmd@depth }% }% \expandafter\reserved@a\ltxkeys@cmdbody\ltxkeys@nil @@ -4066,7 +4066,7 @@ $Id: ltxkeys.sty,v 0.0.3a 2012/08/02 09:00:00 Ahmed Musa Exp $ \l@ngrel@x\csn@def{end#1}{% \def\envarg####1{\usename{keyenvarg@\romannumeral####1}}% #6\relax - \popfunctions\ltxkeyscmd\ltxkeyscmd@depth + \cptpopfunctions\ltxkeyscmd\ltxkeyscmd@depth \ltxkeys@everyeoehook }% } |