1 files changed, 20 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 3cd0a8feb95..3aa0b172fdc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -95,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2012/03/08 v3.10a KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrbook%
@@ -109,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2011/05/30 v3.09a}
+\def\tocbasicversion{2012/04/04 v3.10b}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -189,6 +189,8 @@
 \@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@3.10}{10}
 \@namedef{scr@v@3.10a}{10}
+\@namedef{scr@v@3.10b}{10}
+\@namedef{scr@v@3.11}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -1405,9 +1407,21 @@
   }%
 }
 \AfterPackage{everysel}{%
-  \g@addto@macro\@EverySelectfont@Init{%
-    \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
-    \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname
+  \scr@ifundefinedorrelax{@EverySelectfont@Init}{%
+    \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont
+      \ClassWarningNoLine{\KOMAClassName}{%
+        \string\selectfont\space already changed}%
+    \else
+      \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+      \expandafter\let\expandafter\scr@new@selectfont
+        \csname selectfont \endcsname
+    \fi
+  }{%
+    \g@addto@macro\@EverySelectfont@Init{%
+      \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}%
+      \expandafter\let\expandafter\scr@new@selectfont
+        \csname selectfont \endcsname
+    }%
   }%
 }
 \AfterPackage{tracefnt}{%
@@ -2084,6 +2098,7 @@
   \ifx\scr@ds@tocentry\@empty\else
     \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{%
       \scr@ds@tocentry}%
+  \fi
   \@spart{#2}%
   \ifx\partmark\@gobble
     \@mkboth{}{}%