From d169595175488e9e35570df5f4b22214627896e0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Nov 2008 02:08:50 +0000 Subject: koma-script update git-svn-id: svn://tug.org/texlive/trunk@11355 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 | 2 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.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 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 33 +++++--- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 91 ++++++++-------------- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 3 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 58 ++++++++++---- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 82 ++++++++----------- .../tex/latex/koma-script/scrsize10pt.clo | 4 +- .../tex/latex/koma-script/scrsize11pt.clo | 4 +- .../tex/latex/koma-script/scrsize12pt.clo | 4 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 24 +++--- .../texmf-dist/tex/latex/koma-script/typearea.sty | 2 +- 23 files changed, 167 insertions(+), 164 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 c5fcc7520aa..737de55beba 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 3793a25d073..ffdc38880a0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 1d0b29f9602..05f7ae37b8c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -61,7 +61,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 f87b625ec3a..fc220f43538 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup %%% From File: japanlco.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 7a8a4f4fb4e..bd13cc5abe4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 5ec193c74b3..6fdb8841c8b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 4cf876780dc..0b142b692b9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 3cf08f9f442..ffdb806363c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 abb06dd244a..fe7509b936e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 a09a6215f7a..d765e54b7c1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 699adafb9b6..38b11deed8b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 bda5b6d1a5b..9dc74cf92f6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrartcl% @@ -106,7 +106,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2008/10/06 v1.0} +\def\tocbasicversion{2008/11/13 v3.01} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \addtotoclist{toc} @@ -157,6 +157,7 @@ \@namedef{scr@v@2.98b}{6} \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -2800,13 +2801,7 @@ \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } \newcommand*{\float@listhead}[1]{% - \ClassWarning{\KOMAClassName}{% - usage of deprecated \string\float@listhead!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@listhead.\MessageBreak - Definition of \string\float@listhead\space my be removed from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@listhead@warning \float@@listhead{#1}% \@mkboth{#1}{#1}% \if@dynlist% @@ -2817,6 +2812,26 @@ }% \fi } +\newcommand*{\scr@float@listhead@warning}{% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated \string\float@listhead!\MessageBreak + You should use the features of package `tocbasic'\MessageBreak + instead of \string\float@listhead.\MessageBreak + Definition of \string\float@listhead\space my be removed from\MessageBreak + `\KOMAClassName' soon, so it should not be used + }% +} +\newcommand*{\scr@float@addtolists@warning}{% + \ClassWarningNoLine{\KOMAClassName}{% + \string\float@addtolists\space detected!\MessageBreak + You should use the features of package `tocbasic'\MessageBreak + instead of \string\float@addtolists.\MessageBreak + Support for \string\float@addtolists\space may be removed + from\MessageBreak + `\KOMAClassName' soon + }% + \global\let\scr@float@addtolists@warning\relax +} \newcommand*\listfigurename{List of Figures} \newcommand*\listoflofname{\listfigurename} \newcommand*\listtablename{List of Tables} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 648b5fdfa2f..d19931d6d6f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 732ea3e7b4e..83417dde5e0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -6,7 +6,7 @@ %% %% scrkvers.dtx (with options: `class,book') %% scrkbase.dtx (with options: `load') -%% tocbasic.dtx (with options: `load') +%% tocbasic.dtx (with options: `load,chapter') %% scrkcomp.dtx (with options: `class,book,option') %% scrkmisc.dtx (with options: `class,book,option') %% scrklang.dtx (with options: `class,book,option') @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrbook% @@ -106,9 +106,11 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2008/10/06 v1.0} +\def\tocbasicversion{2008/11/13 v3.01} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa +\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% +\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} @@ -157,6 +159,7 @@ \@namedef{scr@v@2.98b}{6} \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -1997,14 +2000,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{% @@ -2027,14 +2023,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{#1}{\thepage}% @@ -2056,14 +2045,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{#1}{\thepage}% @@ -2084,14 +2066,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% \fi @@ -2177,14 +2152,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{#1}{\thepage}% @@ -2204,14 +2172,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% \fi @@ -3365,13 +3326,7 @@ \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } \newcommand*{\float@listhead}[1]{% - \ClassWarning{\KOMAClassName}{% - usage of deprecated \string\float@listhead!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@listhead.\MessageBreak - Definition of \string\float@listhead\space my be removed from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@listhead@warning \float@@listhead{#1}% \@mkboth{#1}{#1}% \if@dynlist% @@ -3382,6 +3337,26 @@ }% \fi } +\newcommand*{\scr@float@listhead@warning}{% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated \string\float@listhead!\MessageBreak + You should use the features of package `tocbasic'\MessageBreak + instead of \string\float@listhead.\MessageBreak + Definition of \string\float@listhead\space my be removed from\MessageBreak + `\KOMAClassName' soon, so it should not be used + }% +} +\newcommand*{\scr@float@addtolists@warning}{% + \ClassWarningNoLine{\KOMAClassName}{% + \string\float@addtolists\space detected!\MessageBreak + You should use the features of package `tocbasic'\MessageBreak + instead of \string\float@addtolists.\MessageBreak + Support for \string\float@addtolists\space may be removed + from\MessageBreak + `\KOMAClassName' soon + }% + \global\let\scr@float@addtolists@warning\relax +} \newcommand*\listfigurename{List of Figures} \newcommand*\listoflofname{\listfigurename} \newcommand*\listtablename{List of Tables} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 632c77df03a..ec2243895dc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -107,7 +107,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] @@ -183,6 +183,7 @@ \@namedef{scr@v@2.98b}{6} \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 1095efc3d19..62cd1cf6bd5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 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 515a3e9f1ae..124ff301da3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -91,7 +91,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrlttr2% @@ -149,6 +149,7 @@ \@namedef{scr@v@2.98b}{6} \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -3020,23 +3021,46 @@ \typeout{Subject: no}% }{% \ifx\raggedsubject\@empty - \if@subjafter% - \typeout{Subject: after opening}% - \let\raggedsubject\centering% - \else% - \typeout{Subject: before opening}% + \ifdim\useplength{subjectvpos}=\z@ + \if@subjafter% + \typeout{Subject: after opening}% + \let\raggedsubject\centering% + \else + \typeout{Subject: before opening}% + \def\raggedsubject{\noindent\@hangfrom}% + \fi + \else + \typeout{Subject: at absolute vertical position}% \def\raggedsubject{\noindent\@hangfrom}% - \fi% + \fi + \fi + \ifdim\useplength{subjectvpos}=\z@ + \vskip\useplength{subjectbeforevskip}% + \begingroup + \else + \move@topt\vskip\useplength{subjectvpos}% + \expandafter\vb@t@z\expandafter{% + \fi + \usekomafont{subject}% + \raggedsubject{\if@subj \subject@format{\strut\ignorespaces + \usekomavar*{subject}}\fi}% + \subject@format{\strut\ignorespaces\usekomavar{subject}}\par + \ifdim\useplength{subjectvpos}=\z@ + \endgroup + \vskip\useplength{subjectaftervskip}% + \else + }% + \vskip-\useplength{subjectvpos}\move@frompt \fi - {% - \usekomafont{subject}% - \raggedsubject{\if@subj \subject@format{\strut\ignorespaces - \usekomavar*{subject}}\fi}% - \subject@format{\strut\ignorespaces\usekomavar{subject}}\par - }\vskip2\baselineskip% }% }% } +\@newplength{subjectvpos} +\@setplength{subjectvpos}{0pt} +\@newplength{subjectaftervskip} +\@setplength{subjectaftervskip}{2\baselineskip} +\@newplength{subjectbeforevskip} +\@setplength{subjectbeforevskip}{0pt} \newcommand*{\@nexthead}{% \rlap{\parbox[c]{\textwidth}{\raggedright\strut \ifnum\@pageat=0\pagemark\else\leftmark\fi\strut}}% @@ -3117,14 +3141,16 @@ \@gen@firsthead \@mkboth{\scr@fromname@var}{\scr@subject@var}% \thispagestyle{empty}\noindent - \@foldmarks\@firstheadfootfield\@addrfield\@locfield\@datefield + \@foldmarks\@firstheadfootfield\@addrfield\@locfield + \ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi + \@datefield \@maketitle - \if@subjafter\else\@subjfield\fi + \ifdim\useplength{subjectvpos}=\z@\if@subjafter\else\@subjfield\fi\fi {\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative#1\par}% {\setlength{\@tempdima}{\baselineskip}% \addtolength{\@tempdima}{-\parskip}% \ifdim \@tempdima>\z@\vskip\@tempdima\fi}% - \if@subjafter\@subjfield\fi% + \ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi \@afterindentfalse\@afterheading } \newcommand*{\@xtrimtempa}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index fcd7a998153..303b0d0c715 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -6,7 +6,7 @@ %% %% scrkvers.dtx (with options: `class,report') %% scrkbase.dtx (with options: `load') -%% tocbasic.dtx (with options: `load') +%% tocbasic.dtx (with options: `load,chapter') %% scrkcomp.dtx (with options: `class,report,option') %% scrkmisc.dtx (with options: `class,report,option') %% scrklang.dtx (with options: `class,report,option') @@ -92,7 +92,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -106,9 +106,11 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2008/10/06 v1.0} +\def\tocbasicversion{2008/11/13 v3.01} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa +\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% +\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} @@ -157,6 +159,7 @@ \@namedef{scr@v@2.98b}{6} \@namedef{scr@v@2.98c}{7} \@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} \@namedef{scr@v@last}{8} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -2013,14 +2016,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{% @@ -2043,14 +2039,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{#1}{\thepage}% @@ -2071,14 +2060,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% \fi @@ -2162,14 +2144,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \scr@ifundefinedorrelax{@currentHref}{% \float@addtolists{% \protect\contentsline{chapteratlist}{#1}{\thepage}% @@ -2189,14 +2164,7 @@ }{}% }% \@ifundefined{float@addtolists}{}{% - \ClassWarning{\KOMAClassName}{% - Usage of deprecated \string\float@addtolists!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@addtolists.\MessageBreak - Definition of \string\float@addtolists\space may be removed - from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@addtolists@warning \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% \fi @@ -3328,13 +3296,7 @@ \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } \newcommand*{\float@listhead}[1]{% - \ClassWarning{\KOMAClassName}{% - usage of deprecated \string\float@listhead!\MessageBreak - You should use the features of package `tocbasic'\MessageBreak - instead of \string\float@listhead.\MessageBreak - Definition of \string\float@listhead\space my be removed from\MessageBreak - KOMA-Script soon, so it should not be used - }% + \scr@float@listhead@warning \float@@listhead{#1}% \@mkboth{#1}{#1}% \if@dynlist% @@ -3345,6 +3307,26 @@ }% \fi } +\newcommand*{\scr@float@listhead@warning}{% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated \string\float@listhead!\MessageBreak + You should use the features of package `tocbasic'\MessageBreak + instead of \string\float@listhead.\MessageBreak + Definition of \string\float@listhead\space my be removed from\MessageBreak + `\KOMAClassName' soon, so it should not be used + }% +} +\newcommand*{\scr@float@addtolists@warning}{% + \ClassWarningNoLine{\KOMAClassName}{% + \string\float@addtolists\space detected!\MessageBreak + You should use the features of package `tocbasic'\MessageBreak + instead of \string\float@addtolists.\MessageBreak + Support for \string\float@addtolists\space may be removed + from\MessageBreak + `\KOMAClassName' soon + }% + \global\let\scr@float@addtolists@warning\relax +} \newcommand*\listfigurename{List of Figures} \newcommand*\listoflofname{\listfigurename} \newcommand*\listtablename{List of Tables} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 9bc58653dff..07fe5656f82 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% @@ -155,8 +155,8 @@ \l@addto@macro{\@listiii}{\@list@extra}% \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% - \@listi } +\@listi \endinput %% %% End of file `scrsize10pt.clo'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 95ec33a88e0..6f01dc3044b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% @@ -155,8 +155,8 @@ \l@addto@macro{\@listiii}{\@list@extra}% \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% - \@listi } +\@listi \endinput %% %% End of file `scrsize11pt.clo'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index a059699b1c8..9e05080cfdc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup %%% From File: scrkfont.dtx \ProvidesFile{% @@ -155,8 +155,8 @@ \l@addto@macro{\@listiii}{\@list@extra}% \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% - \@listi } +\@listi \endinput %% %% End of file `scrsize12pt.clo'. diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 2a7b81e1b32..1ff55e7203f 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{2008/10/06 v1.0} +\def\tocbasicversion{2008/11/13 v3.01} \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocbasic} [\tocbasicversion @@ -58,17 +58,17 @@ } \newcommand*{\addtotoclist}{% \@ifnextchar [%] - \@@addtotoclist\@addtotoclist + \scr@@addtotoclist\scr@addtotoclist } -\newcommand*{\@addtotoclist}{% +\newcommand*{\scr@addtotoclist}{% \ifx\@currname\@empty - \def\reserved@a{\@@addtotoclist[]}% + \def\reserved@a{\scr@@addtotoclist[]}% \else - \edef\reserved@a{\noexpand\@@addtotoclist[\@currname.\@currext]}% + \edef\reserved@a{\noexpand\scr@@addtotoclist[\@currname.\@currext]}% \fi \reserved@a } -\newcommand*{\@@addtotoclist}[2][]{% +\newcommand*{\scr@@addtotoclist}[2][]{% \ifattoclist{#2}{% \PackageError{tocbasic}{% file extension `#2' cannot be used twice @@ -256,10 +256,14 @@ }{% \expandafter\let\expandafter\list@fname\csname listof#2name\endcsname }% - \if@twocolumn - \aftergroup\twocolumne\onecolumn - \fi \def\@currext{#2}% + \iftocfeature{\@currext}{onecolumn}{% + \iftocfeature{\@currext}{leveldown}{}{% + \if@twocolumn + \aftergroup\twocolumn\onecolumn + \fi + }% + }{}% \tocbasic@listhead{#1}% \tocbasic@starttoc{#2}% \endgroup @@ -393,7 +397,7 @@ \BeforeStartingTOC{% \let\@starttoc\tb@saved@starttoc \expandafter\ifattoclist\expandafter{\@currext}{}{% - \@addtotoclist[tocbasicautomode]{\@currext}% + \addtotoclist[tocbasicautomode]{\@currext}% }% }% } diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index c612137313a..8a30c498428 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2008/11/03 v3.00 KOMA-Script}% + \@CheckKOMAScriptVersion{2008/11/14 v3.01 KOMA-Script}% \endgroup %%% From File: scrktare.dtx \ProvidesPackage{typearea}[% -- cgit v1.2.3