summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/xkeyval
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-10-17 11:31:02 +0000
committerNorbert Preining <preining@logic.at>2012-10-17 11:31:02 +0000
commitae7944d2e8e313e33e65a23696b241bd4ae087b3 (patch)
tree4ecbcb6ceb7caa1a26c69cbc87bc499795528c79 /Master/texmf-dist/source/latex/xkeyval
parent6b85cde95b0324c6206d67ff3674e79303beef8c (diff)
xkeyval update (17Oct)
git-svn-id: svn://tug.org/texlive/trunk@27995 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/xkeyval')
-rw-r--r--Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx16
1 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
index 939df4cdc05..ed264cf0a4a 100644
--- a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
+++ b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
@@ -25,7 +25,7 @@
% pst-xkey.sty
%
%% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
%% ---------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -231,7 +231,7 @@ macro. \PrintChangesX\PrintIndexX
%\texttt{/macros/latex/contrib/xkeyval}. See \texttt{xkeyval.dtx} for
%information on installing \pf{xkeyval} into your \TeX\ or \LaTeX\
%distribution and for the license of this package.}}
-%\author{\mktitledecor Hendri Adriaens\\\url{http://stuwww.uvt.nl/~hendri}}
+%\author{\mktitledecor Hendri Adriaens}
%\date{\fileversion\ (\filedate)}
%\maketitle
%
@@ -2054,10 +2054,10 @@ macro. \PrintChangesX\PrintIndexX
% Load \LaTeX\ primitives if necessary and provide information.
% \begin{macrocode}
\ifx\ProvidesFile\@undefined
- \message{2008/08/13 v2.6a key=value parser (HA)}
+ \message{2012/10/14 v2.6b key=value parser (HA)}
\input xkvtxhdr
\else
- \ProvidesFile{xkeyval.tex}[2008/08/13 v2.6a key=value parser (HA)]
+ \ProvidesFile{xkeyval.tex}[2012/10/14 v2.6b key=value parser (HA)]
\@addtofilelist{xkeyval.tex}
\fi
% \end{macrocode}
@@ -2718,6 +2718,8 @@ macro. \PrintChangesX\PrintIndexX
% \begin{macro}{\XKV@srstate}
% \changes{v2.5f}{2006/11/18}{Added \texttt{XKV@tkey} and \texttt{XKV@rm} to solve bugs}
% \changes{v2.5g}{2006/12/19}{Removed \texttt{XKV@rm} again on user request}
+% \changes{v2.6b}{2012/10/14}{Added \texttt{CurrentOption} to fix class options not being
+% removed from \cs{@unusedoptionlist} when \cs{setkeys} is nested in \cs{ProcessOptionsX}}
% \marg{postfix1}\marg{postfix2}\\
% Macro to save and restore \pf{xkeyval} internals to allow for
% nesting |\setkeys| commands. It executes a for loop over a set of
@@ -2731,7 +2733,7 @@ macro. \PrintChangesX\PrintIndexX
\def\XKV@srstate#1#2{%
\ifx\@empty#2\@empty\advance\XKV@depth\@ne\fi
\XKV@for@n{XKV@prefix,XKV@fams,XKV@tkey,XKV@na,%
- ifXKV@st,ifXKV@pl,ifXKV@knf}\XKV@resa{%
+ ifXKV@st,ifXKV@pl,ifXKV@knf,CurrentOption}\XKV@resa{%
\expandafter\let\csname\XKV@resa#1\expandafter
\endcsname\csname\XKV@resa#2\endcsname
}%
@@ -4024,7 +4026,7 @@ macro. \PrintChangesX\PrintIndexX
%<*xkvlatex>
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{xkeyval}
- [2008/08/13 v2.6a package option processing (HA)]
+ [2012/10/14 v2.6b package option processing (HA)]
% \end{macrocode}
% Initializations. Load |xkeyval.tex|, adjust some catcodes to define
% internal macros and initialize the |\DeclareOptionX*| working macro.
@@ -5224,7 +5226,7 @@ More complicated example of the preset
system and pointer system. See for more information about this
example the
\textsf{xkeyval} article on\par
-\url{http://stuwww.uvt.nl/~hendri/downloads/xkeyval.html}.
+\url{http://www.tug.org/TUGboat/tb25-2/tb81adriaens.pdf}.
\begin{verbatim}
\newdimen\shadowsize
\define@boolkey{Fbox}{frame}[true]{}