From 8059015c6e46d916a33089e9ac465d6132386c9f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Jul 2009 21:54:04 +0000 Subject: koma-script update git-svn-id: svn://tug.org/texlive/trunk@14462 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 2 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 2 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 3 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 2 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 2 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 2 +- .../tex/latex/koma-script/UScommercial9.lco | 2 +- .../tex/latex/koma-script/UScommercial9DW.lco | 2 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 119 +++++++++------------ .../texmf-dist/tex/latex/koma-script/scrbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 99 +++++++---------- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 97 +++++++---------- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 4 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 119 +++++++++------------ .../tex/latex/koma-script/scrsize10pt.clo | 2 +- .../tex/latex/koma-script/scrsize11pt.clo | 2 +- .../tex/latex/koma-script/scrsize12pt.clo | 2 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 4 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 2 +- 27 files changed, 197 insertions(+), 288 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 8cf0afc3f98..3018033252b 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 93662e1b38e..5f84b401ded 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 44bc058dfd0..61be661340c 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% @@ -94,7 +94,6 @@ \LetterOptionNeedsPapersize{% KOMAold% }{a4} -\setkomavar*{fromzipcode}{% \@setplength{foldmarkhpos}{3.5mm} \@setplength{tfoldmarkvpos}{% 103.5mm} diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 45d952bc507..a9bd352e7c8 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 92fa50604b7..19ad9606489 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 0cb333cd35d..bbe34e4888d 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 872f5c25947..5ade2aad225 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 a610f26c136..90a4714b656 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 f2787b2e73e..ea31e0e6463 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 ce63eff245a..e52ee3d6c5f 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 3f1d7ddffbf..7ed32cc66c5 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 777e2a8ac7e..95d3532cc9a 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 960e0044efc..cbf736eba7e 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 39daefef8a0..1e72dff0647 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 ab3d1fe0a3d..c6a2202d5e1 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -175,6 +175,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]{% @@ -1436,8 +1438,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% @@ -1497,35 +1499,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 @@ -1552,35 +1527,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 @@ -1640,8 +1615,8 @@ \newkomafont{subtitle}{\usekomafont{title}\large}% \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -\if@titlepage - \newenvironment{abstract}{% +\newenvironment{abstract}{% + \if@titlepage \titlepage \null\vfil \@beginparpenalty\@lowpenalty @@ -1651,11 +1626,7 @@ \@endparpenalty\@M \end{center} \fi - }{% - \par\vfil\null\endtitlepage - } -\else - \newenvironment{abstract}{% + \else \if@twocolumn\if@abstrt \addsec*{\abstractname} \fi @@ -1669,10 +1640,14 @@ \fi \quotation \fi - }{% + \fi +}{% + \if@titlepage + \par\vfil\null\endtitlepage + \else \if@twocolumn\else\endquotation\fi - } -\fi + \fi +} %%% From File: scrksect.dtx \newcommand*\appendix{\par% \setcounter{section}{0}% @@ -2607,6 +2582,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} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index e64f3683f59..c9493cfb994 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% 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] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 1b2c5c4c2b4..8bc43bd0d98 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -117,7 +117,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -212,6 +212,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]{% @@ -760,8 +762,8 @@ }}% \newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}% \let\maketitle\relax\let\@maketitle\relax -\if@titlepage - \newcommand*\maketitle[1][1]{% +\newcommand*\maketitle[1][1]{% + \if@titlepage \begin{titlepage} \setcounter{page}{% ##1% @@ -821,35 +823,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 @@ -876,35 +851,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 diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 97215b5b0aa..d10ec1b27fb 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 6474b900bb2..2faffb9538c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 85f0523314e..0bebc90f6dc 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -167,6 +167,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]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 5ab4d4f180b..340f6b76eaa 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -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]{% @@ -1536,8 +1538,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% @@ -1597,35 +1599,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 @@ -1652,35 +1627,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 @@ -1741,8 +1716,8 @@ \newkomafont{subtitle}{\usekomafont{title}\large}% \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -\if@titlepage - \newenvironment{abstract}{% +\newenvironment{abstract}{% + \if@titlepage \titlepage \null\vfil \@beginparpenalty\@lowpenalty @@ -1752,11 +1727,7 @@ \@endparpenalty\@M \end{center} \fi - }{% - \par\vfil\null\endtitlepage - } -\else - \newenvironment{abstract}{% + \else \if@twocolumn\if@abstrt \addsec*{\abstractname} \fi @@ -1770,10 +1741,14 @@ \fi \quotation \fi - }{% + \fi +}{% + \if@titlepage + \par\vfil\null\endtitlepage + \else \if@twocolumn\else\endquotation\fi - } -\fi + \fi +} %%% From File: scrksect.dtx \newcommand*\appendix{\par% \setcounter{chapter}{0}% @@ -3098,6 +3073,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] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 1518b0f7b33..46e6d703580 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 5e9e181233b..3adda41cdf9 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a 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 ebc3fe270dc..c59634f57d6 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 7f603de9fe7..b9c74cee48e 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% @@ -602,6 +602,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: 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 34c03ea20f6..9b05ae56aa2 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{2009/07/07 v3.04 KOMA-Script}% + \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% \endgroup %%% From File: scrklco.dtx \ProvidesFile{% -- cgit v1.2.3