koma-script 3.09a (16jun11)

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

31 files changed, 83 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 2efce460920..aba7b08d84a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 35463aef556..aa7b1d02d8a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index e2858c958a4..d1b5919716c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -64,7 +64,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index 2f9c21e4757..4af891261a7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: japanlco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index fe384673955..58c65dc4f0a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index ee5f215d9db..a4955e865c9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: japanlco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index 5de910ffd59..0fa0e1962a4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: japanlco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index a9901de1b8c..f3ce7da56bf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: japanlco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index b8bdbf008c8..c30e86f7f93 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: japanlco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 249cb32a4f4..da5e8cd4529 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: japanlco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 9712972e1e2..bfdfccda6dd 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index b704cb86353..1292ed12a95 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index 4d246cd208f..cc5bd1616be 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -64,7 +64,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index f578e8e5711..8c1a94db26d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -64,7 +64,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index d300bb6b9d2..3378a6edbd1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -95,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrartcl%
@@ -109,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2011/03/23 v3.09}
+\def\tocbasicversion{2011/05/30 v3.09a}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \addtotoclist{toc}
@@ -184,6 +184,7 @@
 \@namedef{scr@v@3.08a}{10}
 \@namedef{scr@v@3.08b}{10}
 \@namedef{scr@v@3.09}{10}
+\@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -2560,7 +2561,12 @@
 \setcounter{dbltopnumber}{2}
 \renewcommand*\dbltopfraction{.7}
 \renewcommand*\dblfloatpagefraction{.5}
-\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption}
+\newcommand*{\captionof}[1]{\def\@captype{#1}%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname if@#1captionabove\endcsname\iftrue
+    \@captionabovetrue
+  \fi
+  \scr@caption}
 \newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
 \newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
 \BeforePackage{capt-of}{\let\captionof\relax}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index e563d128946..904c702015f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -67,7 +67,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \ProvidesPackage{%
@@ -554,11 +554,16 @@
           \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{%
             \scr@key@found@true
             \protected@edef\reserved@a{%
-              \noexpand\setkeys{\@tempa}{\scr@key@atlist}%
-              \noexpand\def\noexpand\@tempa{\@tempa}%
-              \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}%
-              \noexpand\def\noexpand\scr@key@name{\scr@key@name}%
-              \noexpand\def\noexpand\scr@key@value{\scr@key@value}%
+              \noexpand\setkeys{\@tempa}{%
+                \unexpanded\expandafter{\scr@key@atlist}}%
+              \noexpand\def\noexpand\@tempa{%
+                \unexpanded\expandafter{\@tempa}}%
+              \noexpand\def\noexpand\scr@key@atlist{%
+                \unexpanded\expandafter{\scr@key@atlist}}%
+              \noexpand\def\noexpand\scr@key@name{%
+                \unexpanded\expandafter{\scr@key@name}}%
+              \noexpand\def\noexpand\scr@key@value{%
+                \unexpanded\expandafter{\scr@key@value}}%
             }%
             \reserved@a
           }%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index c1e18435e6d..cf35d07efdc 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{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrbook%
@@ -109,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2011/03/23 v3.09}
+\def\tocbasicversion{2011/05/30 v3.09a}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -186,6 +186,7 @@
 \@namedef{scr@v@3.08a}{10}
 \@namedef{scr@v@3.08b}{10}
 \@namedef{scr@v@3.09}{10}
+\@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -3076,7 +3077,12 @@
 \setcounter{dbltopnumber}{2}
 \renewcommand*\dbltopfraction{.7}
 \renewcommand*\dblfloatpagefraction{.5}
-\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption}
+\newcommand*{\captionof}[1]{\def\@captype{#1}%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname if@#1captionabove\endcsname\iftrue
+    \@captionabovetrue
+  \fi
+  \scr@caption}
 \newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
 \newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
 \BeforePackage{capt-of}{\let\captionof\relax}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 0261487420d..255c8bb0acf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -66,7 +66,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrtime.dtx
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 8757a288438..f64d14dd229 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -97,7 +97,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrextend.dtx
 \ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
@@ -225,6 +225,7 @@
 \@namedef{scr@v@3.08a}{10}
 \@namedef{scr@v@3.08b}{10}
 \@namedef{scr@v@3.09}{10}
+\@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 7bae22fb1e5..8412663320f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -65,7 +65,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrkfont.dtx
 \ProvidesPackage{scrfontsizes}[%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 0866e3a42ab..6a9a78d8f8e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -66,7 +66,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrhack.dtx
 %%% using: package,identify
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 845428567d3..ae5fd72eff0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -67,7 +67,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \ProvidesPackage{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index df5aec63777..97fe236e763 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -94,7 +94,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrlttr2%
@@ -176,6 +176,7 @@
 \@namedef{scr@v@3.08a}{10}
 \@namedef{scr@v@3.08b}{10}
 \@namedef{scr@v@3.09}{10}
+\@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 9ff72bd7063..9bcdedab971 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -95,7 +95,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrreprt%
@@ -109,7 +109,7 @@
 %%% From File: scrkbase.dtx
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2011/03/23 v3.09}
+\def\tocbasicversion{2011/05/30 v3.09a}
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -186,6 +186,7 @@
 \@namedef{scr@v@3.08a}{10}
 \@namedef{scr@v@3.08b}{10}
 \@namedef{scr@v@3.09}{10}
+\@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -3052,7 +3053,12 @@
 \setcounter{dbltopnumber}{2}
 \renewcommand*\dbltopfraction{.7}
 \renewcommand*\dblfloatpagefraction{.5}
-\newcommand*{\captionof}[1]{\def\@captype{#1}\scr@caption}
+\newcommand*{\captionof}[1]{\def\@captype{#1}%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname if@#1captionabove\endcsname\iftrue
+    \@captionabovetrue
+  \fi
+  \scr@caption}
 \newcommand*{\captionaboveof}{\@captionabovetrue\captionof}
 \newcommand*{\captionbelowof}{\@captionabovefalse\captionof}
 \BeforePackage{capt-of}{\let\captionof\relax}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 17ae5f11ab1..8b62604e61f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrkfont.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index 333c44f6926..af5bd1cdf16 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrkfont.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index 1f97731ee81..e212b5b1d51 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrkfont.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index 674fcc05614..c1b30bded36 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -66,7 +66,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrtime.dtx
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index cb4c3c93e70..fa009f9d22d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,7 +39,7 @@
 %% standard classes created by The LaTeX3 Project 1994-1996.
 %% 
 %%% From File: tocbasic.dtx
-\def\tocbasicversion{2011/03/23 v3.09}
+\def\tocbasicversion{2011/05/30 v3.09a}
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{tocbasic}
                 [\tocbasicversion\space KOMA-Script package
@@ -331,7 +331,7 @@
           }%
         }{%
           \iftocfeature{\@currext}{numbered}{%
-            \section[##1]{##1\@mkboth{##1}{##1}}%
+            \section[##1]{##1}%
           }{%
             \section*{##1}%
             \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
@@ -355,7 +355,7 @@
           }%
         }{%
           \iftocfeature{\@currext}{numbered}{%
-            \chapter[##1]{##1\@mkboth{##1}{##1}}%
+            \chapter[##1]{##1}%
           }{%
             \chapter*{##1}%
             \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
@@ -564,15 +564,19 @@
       \edef\@tempa{%
         \noexpand\endgroup
         \noexpand\newenvironment{\tb@nt@type}{%
-          \noexpand\@float{\tb@nt@type}%
-          \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
+          \noexpand\@ifnextchar[%]
+          {\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}}%
+          {\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}%
+            [\expandafter\noexpand\csname fps@\tb@nt@type\endcsname]}%
         }{%
           \noexpand\csname \tb@nt@type @atend\noexpand\endcsname
           \noexpand\end@float
         }%
         \noexpand\newenvironment{\tb@nt@type*}{%
-          \noexpand\@dblfloat{\tb@nt@type}%
-          \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
+          \noexpand\@ifnextchar[%]
+          {\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}}%
+          {\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}%
+            [\expandafter\noexpand\csname fps@\tb@nt@type\endcsname]}%
         }{%
           \noexpand\csname \tb@nt@type @atend\noexpand\endcsname
           \noexpand\end@dblfloat
@@ -637,6 +641,11 @@
     \endcsname\expandafter{\tb@nt@atend}%
   \fi
 }
+\newcommand*{\tb@atbegin@after}[3]{}
+\def\tb@atbegin@after#1#2[#3]{%
+  #1{#2}[#3]%
+  \csname #2@atbegin\endcsname
+}
 \newcommand*{\tb@ifvalueisnotempty}[2]{%
   \begingroup
     \edef\@tempa{#2}\ifx\@tempa\@empty
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index d260c8e8207..1e3c7af6104 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -68,7 +68,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrktare.dtx
 \ProvidesPackage{typearea}[%
@@ -627,6 +627,7 @@
 \@namedef{scr@v@3.08a}{10}
 \@namedef{scr@v@3.08b}{10}
 \@namedef{scr@v@3.09}{10}
+\@namedef{scr@v@3.09a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrktare.dtx
 \InputIfFileExists{typearea.cfg}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 04ab8e94271..b5a42396083 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -65,7 +65,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2011/04/02 v3.09 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2011/06/16 v3.09a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%