8 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/xkeyval/keyval.tex b/Master/texmf-dist/tex/latex/xkeyval/keyval.tex
index 0aed1d328ab..38a505abeee 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/keyval.tex
+++ b/Master/texmf-dist/tex/latex/xkeyval/keyval.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvkeyval')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 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 b8aebc251d7..c7fdde29d96 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-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex
index cad6b16f6e3..e2067f99909 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex
+++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `pxktex')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 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 34b6222bcec..41c8b5aa1cb 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-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -35,7 +35,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{xkeyval}
-  [2005/11/25 v2.5e package option processing (HA)]
+  [2006/11/18 v2.5f 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/xkeyval.tex b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex
index aca45ff5443..ed42476ca6f 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex
+++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvtex')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
@@ -57,10 +57,10 @@
 \newif\ifXKV@preset
 \let\XKV@rm\@empty
 \ifx\ProvidesFile\@undefined
-  \message{2005/11/25 v2.5e key=value parser (HA)}
+  \message{2006/11/18 v2.5f key=value parser (HA)}
   \input xkvtxhdr
 \else
-  \ProvidesFile{xkeyval.tex}[2005/11/25 v2.5e key=value parser (HA)]
+  \ProvidesFile{xkeyval.tex}[2006/11/18 v2.5f key=value parser (HA)]
   \@addtofilelist{xkeyval.tex}
 \fi
 \long\def\@firstoftwo#1#2{#1}
@@ -309,8 +309,9 @@
 }
 \def\XKV@srstate#1#2{%
   \ifx\@empty#2\@empty\advance\XKV@depth\@ne\fi
-  \XKV@for@n{XKV@prefix,XKV@fams,XKV@na,ifXKV@st,ifXKV@pl,ifXKV@knf}%
-    \XKV@resa{\expandafter\let\csname\XKV@resa#1\expandafter
+  \XKV@for@n{XKV@prefix,XKV@fams,XKV@tkey,XKV@na,%
+    XKV@rm,ifXKV@st,ifXKV@pl,ifXKV@knf}\XKV@resa{%
+    \expandafter\let\csname\XKV@resa#1\expandafter
       \endcsname\csname\XKV@resa#2\endcsname
   }%
   \ifx\@empty#1\@empty\advance\XKV@depth\m@ne\fi
@@ -666,6 +667,7 @@
   \XKV@usepresetkeys{#1}{preseth}%
   \expandafter\XKV@s@tkeys\expandafter{\XKV@resb}{#1}%
   \XKV@usepresetkeys{#1}{presett}%
+  \let\CurrentOption\@empty
 }
 \def\XKV@usepresetkeys#1#2{%
   \XKV@presettrue
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty
index 9f66ecccc60..ca06bc13af8 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-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex b/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex
index f86969290f7..5beb03c3bd2 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex
+++ b/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex
@@ -7,7 +7,7 @@
 %% xkeyval.dtx  (with options: `xkvheader')
 %% 
 %% ---------------------------------------
-%% Copyright (C) 2004-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 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 112f2b7cfea..ec2d24e9a6b 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-2005 Hendri Adriaens
+%% Copyright (C) 2004-2006 Hendri Adriaens
 %% ---------------------------------------
 %%
 %% This work may be distributed and/or modified under the