koma-script (5jul12)

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

35 files changed, 70 insertions, 50 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index d278b305c82..85b12978e5a 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 57826e4a000..120ba224ce2 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 3b805c60958..1aca32a645c 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 cf4be08dfbc..a3d39f93080 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 2467a41874a..1952a12bacd 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 69daecae666..741f258bbc6 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 3170a9e86f7..b6618d298e2 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 341b860e3f5..50523968162 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 98fbaac3323..d47d7183b8d 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 dd8aef8d769..7161a95663a 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 d6d7767a211..576d9661d3d 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 711fd2e817b..5e2384fc8cb 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 6f50762ee53..fbfd08d56a9 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 d1dcc7a3823..91ec57a6c5c 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index 7aad971320e..5c0fa97006f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrhack.dtx
 \ProvidesFile{float.hak}
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index 3f9ec6f8043..e31c7009511 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrhack.dtx
 \ProvidesFile{floatrow.hak}
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 1c0c50cba33..7069132897e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrhack.dtx
 \ProvidesFile{hyperref.hak}
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index 5b498c18d81..25b4af412d4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -63,7 +63,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrhack.dtx
 \ProvidesFile{listings.hak}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index f7ba793a4c6..8041b5d03d1 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrartcl%
@@ -189,6 +189,7 @@
 \@namedef{scr@v@3.10a}{10}
 \@namedef{scr@v@3.10b}{10}
 \@namedef{scr@v@3.11}{10}
+\@namedef{scr@v@3.11a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 0c97aa6d666..4aa04ac1b6a 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \ProvidesPackage{%
@@ -206,17 +206,25 @@
         \scr@optiontest{#2#1}\CurrentOption{%
           \default@ds
         }{%
+          \let\scr@removeunused\relax
           \edef\reserved@a{%
             \noexpand\setkeys{#2#1}{\CurrentOption}%
             \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
           }\reserved@a
+          \ifx\scr@removeunused\relax\else\default@ds\fi
         }%
       }{%
-        \@expandtwoargs\setkeys{#2}%
-        \CurrentOption
+        \let\scr@removeunused\relax
+        \edef\reserved@a{%
+          \noexpand\setkeys{#2}{\CurrentOption}%
+          \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
+        }\reserved@a
+        \if\scr@removeunused\relax\else\default@ds\fi
         \scr@optiontest{#2#1}\CurrentOption{}{%
+          \let\scr@removeunused\relax
           \@expandtwoargs\setkeys{#2#1}%
           \CurrentOption
+          \ifx\scr@removeunused\relax\else\default@ds\fi
         }%
       }%
     }{%
@@ -253,7 +261,7 @@
 \FamilyProcessOptions{KOMA}\relax
 %%% From File: scrklang.dtx
 %%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/03/09 v3.09}
+\def\scrlfileversion{2012/06/15 v3.12}
 \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
 \@tempa
 %%% From File: scrkbase.dtx
@@ -661,7 +669,7 @@
       for more information about options and their values.%
     }%
   \else
-    \let\scr@removeunused\@empty
+    \global\let\scr@removeunused\@empty
     \PackageInfo{%
       scrbase%
     }{%
@@ -688,7 +696,7 @@
         \ifstr{#4}{false}{\@nameuse{#3false}}{%
           \ifstr{#4}{off}{\@nameuse{#3false}}{%
             \ifstr{#4}{no}{\@nameuse{#3false}}{%
-              \FamilyUnknownKeyValue{#1}{#2}{#3}{%
+              \FamilyUnknownKeyValue{#1}{#2}{#4}{%
                 `true', `on', `yes', `false', `off', `no'%
               }%
             }%
@@ -735,8 +743,9 @@
         \noexpand\@namedef{#3}{\@tempa}%
       }%
     \else
-      \FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}%
-      \let\@tempa=\endgroup
+      \edef\@tempa{\endgroup
+        \noexpand\FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}%
+      }%
     \fi
   \@tempa
   \let\FamilyElseValues\@empty
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 3aa0b172fdc..a3f01cb91d2 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/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrbook%
@@ -191,6 +191,7 @@
 \@namedef{scr@v@3.10a}{10}
 \@namedef{scr@v@3.10b}{10}
 \@namedef{scr@v@3.11}{10}
+\@namedef{scr@v@3.11a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index c3d48aa1162..5530b996b84 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 f5880c0b08d..2e1b4b377d0 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrextend.dtx
 \ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
@@ -230,6 +230,7 @@
 \@namedef{scr@v@3.10a}{10}
 \@namedef{scr@v@3.10b}{10}
 \@namedef{scr@v@3.11}{10}
+\@namedef{scr@v@3.11a}{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 794bc4168b0..4911e92f329 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 a7404a63447..26cdcda7b38 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 468ed54a0a4..54c63ddc138 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrkbase.dtx
 \ProvidesPackage{%
@@ -85,7 +85,7 @@
 \KOMAProcessOptions\relax
 %%% From File: scrkfont.dtx
 %%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/03/09 v3.09}
+\def\scrlfileversion{2012/06/15 v3.12}
 \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
 \@tempa
 %%% From File: scrkbase.dtx
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 7ce524a34c4..98982fb25e2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -41,7 +41,7 @@
 %% standard classes created by The LaTeX3 Project 1994-1996.
 %% 
 %%% From File: scrlfile.dtx
-\def\scrlfileversion{2011/03/09 v3.09}
+\def\scrlfileversion{2012/06/15 v3.12}
 \ProvidesPackage{scrlfile}[%
   \scrlfileversion\space KOMA-Script package (loading files)]
 \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
@@ -207,18 +207,22 @@
 \newcommand*{\scrlfile@excludedpackages}{}
 \let\scrlfile@excludedpackages\@empty
 \newcommand*{\scrlfile@saved@RequirePackage}{}
-\newcommand*{\PreventPackageFromLoading}[1]{%
-  \edef\reserved@b{#1}%
+\newcommand*{\PreventPackageFromLoading}{%
+  \@ifstar{\@PreventPackageFromLoading\PackageInfo}%
+          {\@PreventPackageFromLoading\PackageWarning}%
+}
+\newcommand*{\@PreventPackageFromLoading}[2]{%
+  \edef\reserved@b{#2}%
   \ifx \reserved@b\@empty
-    \PackageWarning{scrlfile}{%
-      \string\PreventPackageFromLoading\space with empty argument\MesageBreak
+    #1{scrlfile}{%
+      \string\PreventPackageFromLoading\space with empty argument\MessageBreak
       ignored%
     }%
   \else
     \ifx\scrlfile@excludedpackages\@empty
       \let\scrlfile@saved@RequirePackage\RequirePackage
       \let\RequirePackage\scrlfile@RequirePackage
-      \def\reserved@a#1{%
+      \def\reserved@a#2{%
         \@latex@error
         {\noexpand \usepackage before \string\documentclass}%
         {\noexpand \usepackage may only appear in the document
@@ -240,12 +244,13 @@
     \reserved@b\do {%
       \ifx\reserved@a\@empty\else
         \expandafter\@ifpackageloaded\expandafter{\reserved@a}{%
-          \PackageWarning{scrlfile}{%
+          #1{scrlfile}{%
             package `\reserved@a' already loaded.\MessageBreak
             Cannot prevent it from beeing loaded%
           }%
         }{%
-          \edef\scrlfile@excludedpackages{,\reserved@a}%
+          \edef\scrlfile@excludedpackages{\scrlfile@excludedpackages,%
+            \reserved@a}%
         }%
       \fi
     }%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index d7f9e2a372a..961d3d1aeb1 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrlttr2%
@@ -181,6 +181,7 @@
 \@namedef{scr@v@3.10a}{10}
 \@namedef{scr@v@3.10b}{10}
 \@namedef{scr@v@3.11}{10}
+\@namedef{scr@v@3.11a}{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 306ce0b4327..b5525b76094 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrreprt%
@@ -191,6 +191,7 @@
 \@namedef{scr@v@3.10a}{10}
 \@namedef{scr@v@3.10b}{10}
 \@namedef{scr@v@3.11}{10}
+\@namedef{scr@v@3.11a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index b2d051dbf0f..d47d706fa22 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 93b80934453..6e9a1fa92a6 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 7d060da0834..163acd69860 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a 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 77ab22ea69c..9575795d092 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrtime.dtx
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 4b7c03c7aca..c343c690284 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{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrktare.dtx
 \ProvidesPackage{typearea}[%
@@ -633,6 +633,7 @@
 \@namedef{scr@v@3.10a}{10}
 \@namedef{scr@v@3.10b}{10}
 \@namedef{scr@v@3.11}{10}
+\@namedef{scr@v@3.11a}{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 09dedcd6ccf..3b7fc36d21a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -64,7 +64,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}%
 \endgroup
 %%% From File: scrklco.dtx
 \ProvidesFile{%