xkeyval update (17Oct)

git-svn-id: svn://tug.org/texlive/trunk@27995 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 29 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/latex/xkeyval/README b/Master/texmf-dist/doc/latex/xkeyval/README
index 48283b38f29..059f728ca05 100644
--- a/Master/texmf-dist/doc/latex/xkeyval/README
+++ b/Master/texmf-dist/doc/latex/xkeyval/README
@@ -1,16 +1,16 @@
-xkeyval v2.6
-------------
+xkeyval v2.6b
+-------------
 
 This package is an extension of the keyval package by David Carlisle
 and offers additional macros for setting keys and declaring and
 setting class or package options. This distribution also includes
 the following additional packages:
 
-xkvview  v1.5 : viewer utility for package programmers
-xkvltxp  v1.2 : LaTeX kernel patch to allow expandable macros in
-                package options
-pst-xkey v1.6 : specialization of the xkeyval package for PSTricks
-                packages
+xkvview  v1.4a : viewer utility for package programmers
+xkvltxp  v1.2  : LaTeX kernel patch to allow expandable macros in
+                 package options
+pst-xkey v1.6  : specialization of the xkeyval package for PSTricks
+                 packages
 
 See for more information the pdf documentation of this package.
 
@@ -60,7 +60,7 @@ xkeyval into your LaTeX distribution
 License
 -------
 
-Copyright (C) 2004-2008 Hendri Adriaens
+Copyright (C) 2004-2012 Hendri Adriaens
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
index 612797ba244..0f66d13c2c6 100644
--- a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
+++ b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
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]{}
diff --git a/Master/texmf-dist/tex/generic/xkeyval/keyval.tex b/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
index 2dbefd9fd74..fbabde0c57c 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvkeyval')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/generic/xkeyval/pst-xkey.tex b/Master/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
index 18820bf19f1..e6bbd7f8972 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `pxktex')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
index 9768071a791..1aaf4c68e54 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvtex')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -58,10 +58,10 @@
 \newif\ifXKV@preset
 \let\XKV@rm\@empty
 \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
 \long\def\@firstoftwo#1#2{#1}
@@ -312,7 +312,7 @@
 \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
   }%
diff --git a/Master/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex b/Master/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
index 2dc455c52ce..e535d8bf345 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvheader')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty
index 41d8f7a5138..ea39f3e8adf 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty
+++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `pxklatex')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty
index 17a176a4e5b..019ef906101 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty
+++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvlatex')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -35,7 +35,7 @@
 %%
 \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)]
 \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi
 \edef\XKVcatcodes{%
   \catcode`\noexpand\=\the\catcode`\=\relax
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty
index 6157a0daebf..76e586fd136 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty
+++ b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvltxpatch')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty
index 6051e36e00d..a6ba2a42761 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty
+++ b/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvview')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2008 Hendri Adriaens
+%% Copyright (C) 2004-2012 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the