1 files changed, 32 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index f07c53f9347..e68e42b67e2 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: kvoptions
-%% Version: 2010/12/23 v3.10
+%% Version: 2011/06/30 v3.11
 %% 
-%% Copyright (C) 2004, 2006, 2007, 2009, 2010 by
+%% Copyright (C) 2004, 2006, 2007, 2009-2011 by
 %%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 %% 
 %% This work may be distributed and/or modified under the
@@ -105,7 +105,7 @@
   \fi
 \expandafter\x\csname ver@kvoptions.sty\endcsname
 \ProvidesPackage{kvoptions}%
-  [2010/12/23 v3.10 Keyval support for LaTeX options (HO)]%
+  [2011/06/30 v3.11 Key value format for package options (HO)]%
 \begingroup\catcode61\catcode48\catcode32=10\relax%
   \catcode13=5 % ^^M
   \endlinechar=13 %
@@ -176,7 +176,7 @@
 \DeclareOption{debugshow}{\catcode\@ne=9 }
 \DeclareOption{patch}{%
   \AtEndOfPackage{%
-    \RequirePackage{kvoptions-patch}[2010/12/23]%
+    \RequirePackage{kvoptions-patch}[2011/06/30]%
   }%
 }
 \ProcessOptions\relax
@@ -586,6 +586,31 @@
     }%
   \x
 }
+\def\KVO@IfDefThen#1#2{%
+  \ifx#1\ltx@undefined
+  \else
+    \ifx#1\relax
+    \else
+      #2%
+    \fi
+  \fi
+}%
+\def\KVO@GetClassOptionsList{%
+  \let\KVO@classoptionslist\@classoptionslist
+  \KVO@IfDefThen\@classoptionslist{%
+    \KVO@IfDefThen\XKV@documentclass{%
+      \ifx\XKV@documentclass\ltx@empty
+      \else
+        \KVO@IfDefThen\XKV@classoptionslist{%
+          \ifx\XKV@classoptionslist\ltx@empty
+          \else
+            \let\KVO@classoptionslist\XKV@classoptionslist
+          \fi
+        }%
+      \fi
+    }%
+  }%
+}%
 \newcommand*{\ProcessKeyvalOptions}{%
   \@ifstar{%
     \begingroup
@@ -601,9 +626,10 @@
   \let\KVO@temp\@empty
   \ifx\@currext\@clsextension
   \else
-    \ifx\@classoptionslist\relax
+    \KVO@GetClassOptionsList
+    \ifx\KVO@classoptionslist\relax
     \else
-      \@for\KVO@CurrentOption:=\@classoptionslist\do{%
+      \@for\KVO@CurrentOption:=\KVO@classoptionslist\do{%
         \@ifundefined{KV@#1@\expandafter\KVO@getkey
                       \KVO@CurrentOption=\@nil}{%
         }{%