koma-script update

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

1 files changed, 38 insertions, 61 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 8268961f4d5..a55f7a618c5 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{2009/07/07 v3.04 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}%
 \endgroup
 \newcommand*{\KOMAClassName}{%
   scrbook%
@@ -177,6 +177,8 @@
 \@namedef{scr@v@3.03a}{10}
 \@namedef{scr@v@3.03b}{10}
 \@namedef{scr@v@3.04}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.04a}{10}
 \@namedef{scr@v@last}{10}
 %%% From File: scrkmisc.dtx
 \KOMA@key{draft}[true]{%
@@ -1537,8 +1539,8 @@
     #1%
 }}%
 \newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}%
-\if@titlepage
-  \newcommand*\maketitle[1][1]{%
+\newcommand*\maketitle[1][1]{%
+  \if@titlepage
     \begin{titlepage}
       \setcounter{page}{%
         #1%
@@ -1598,35 +1600,8 @@
         \if@twoside \next@tpage\cleardoubleemptypage \fi
       \fi
     \end{titlepage}
-    \setcounter{footnote}{0}%
-    \global\let\thanks\relax
-    \global\let\maketitle\relax
-    \global\let\@thanks\@empty
-    \global\let\@author\@empty
-    \global\let\@date\@empty
-    \global\let\@title\@empty
-    \global\let\@subtitle\@empty
-    \global\let\@extratitle\@empty
-    \global\let\@titlehead\@empty
-    \global\let\@subject\@empty
-    \global\let\@publishers\@empty
-    \global\let\@uppertitleback\@empty
-    \global\let\@lowertitleback\@empty
-    \global\let\@dedication\@empty
-    \global\let\author\relax
-    \global\let\title\relax
-    \global\let\extratitle\relax
-    \global\let\titlehead\relax
-    \global\let\subject\relax
-    \global\let\publishers\relax
-    \global\let\uppertitleback\relax
-    \global\let\lowertitleback\relax
-    \global\let\dedication\relax
-    \global\let\date\relax
-    \global\let\and\relax
-  }%
-\else
-  \newcommand*\maketitle[1][1]{\par
+  \else
+    \par
     \@tempcnta=%
     #1%
     \relax\ifnum\@tempcnta=1\else
@@ -1653,35 +1628,35 @@
       \fi
       \thispagestyle{\titlepagestyle}\@thanks
     \endgroup
-    \setcounter{footnote}{0}%
-    \let\thanks\relax
-    \let\maketitle\relax
-    \let\@maketitle\relax
-    \global\let\@thanks\@empty
-    \global\let\@author\@empty
-    \global\let\@date\@empty
-    \global\let\@title\@empty
-    \global\let\@subtitle\@empty
-    \global\let\@extratitle\@empty
-    \global\let\@titlehead\@empty
-    \global\let\@subject\@empty
-    \global\let\@publishers\@empty
-    \global\let\@uppertitleback\@empty
-    \global\let\@lowertitleback\@empty
-    \global\let\@dedication\@empty
-    \global\let\author\relax
-    \global\let\title\relax
-    \global\let\extratitle\relax
-    \global\let\titlehead\relax
-    \global\let\subject\relax
-    \global\let\publishers\relax
-    \global\let\uppertitleback\relax
-    \global\let\lowertitleback\relax
-    \global\let\dedication\relax
-    \global\let\date\relax
-    \global\let\and\relax
-  }%
-\fi
+  \fi
+  \setcounter{footnote}{0}%
+  \let\thanks\relax
+  \let\maketitle\relax
+  \let\@maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\@subtitle\@empty
+  \global\let\@extratitle\@empty
+  \global\let\@titlehead\@empty
+  \global\let\@subject\@empty
+  \global\let\@publishers\@empty
+  \global\let\@uppertitleback\@empty
+  \global\let\@lowertitleback\@empty
+  \global\let\@dedication\@empty
+  \global\let\author\relax
+  \global\let\title\relax
+  \global\let\extratitle\relax
+  \global\let\titlehead\relax
+  \global\let\subject\relax
+  \global\let\publishers\relax
+  \global\let\uppertitleback\relax
+  \global\let\lowertitleback\relax
+  \global\let\dedication\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}%
 \newcommand*{\@maketitle}{%
   \clearpage
   \let\footnote\thanks
@@ -3122,6 +3097,8 @@
 \setcounter{dbltopnumber}{2}
 \renewcommand*\dbltopfraction{.7}
 \renewcommand*\dblfloatpagefraction{.5}
+\newcommand*{\captionof}[1]{\def\@captype{#1}\caption}
+\BeforePackage{capt-of}{\let\captionof\relax}
 \newcommand*\figurename{Figure}
 \newcommand*\tablename{Table}
 \newcounter{figure}[chapter]