From 28c9b4ce4d428d1582c35205f79c62da999cf4d0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Jul 2015 22:11:36 +0000 Subject: koma-script (2jul15) git-svn-id: svn://tug.org/texlive/trunk@37734 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 8 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 8 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 8 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 8 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 8 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 8 +- .../tex/latex/koma-script/UScommercial9.lco | 8 +- .../tex/latex/koma-script/UScommercial9DW.lco | 8 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 10 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 10 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 556 +++++++---- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 54 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 1026 +++++++++++--------- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 30 +- .../tex/latex/koma-script/scrfontsizes.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 44 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 12 +- .../tex/latex/koma-script/scrlayer-notecolumn.sty | 6 +- .../tex/latex/koma-script/scrlayer-scrpage.sty | 31 +- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 111 ++- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 68 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 80 +- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 1016 ++++++++++--------- .../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/scrtime.sty | 8 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 23 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 39 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 12 +- 43 files changed, 1971 insertions(+), 1319 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index ac53ae982b8..7798e4d789a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% DIN% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% DIN% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 7ef343d9c75..83f7b0929cd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% DINmtext% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% DINmtext% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 20bd3b3c5de..58c083339d9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% KOMAold% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% KOMAold% diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 54417ed5f41..2c784fe6b58 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index 9b9e79d2c18..f7178698b65 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% NF% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% NF% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index c426cd1a65d..7b6e128d3a3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 648f79d5eba..85a091832c9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index 48e65595457..b83e7b34860 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index 53bb4dff36b..2e15919da41 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index 8055655a4e3..2fe7017e7f1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 69731da9484..e24dd9b3339 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% SN% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% SN% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 704c1c81aea..4b5a667c9ca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% SNleft% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% SNleft% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 565f6c4da40..f36ebbbc423 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% UScommercial9 .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% UScommercial9% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index 65ee89145c7..af67a6d7cca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% UScommercial9DW .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% UScommercial9DW% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index 52483e2950f..a5907770954 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \ProvidesFile{float.hak}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \scr@ifexpected{\newfloat}{% \long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3} \let\float@do=\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index a82bbbfbed7..e5ea0b83de9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \ProvidesFile{floatrow.hak}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \scr@ifexpected{\DeclareNewFloatType}{% \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}% \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index da6e97a2953..2c95e198e78 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \ProvidesFile{hyperref.hak}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \scr@ifexpected\@schapter{% \def\@schapter#1{% \H@old@schapter{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 412cfb0326f..57dfc7ecb42 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \ProvidesFile{listings.hak}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index df79c3f9c47..befb01b633b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -23,6 +23,7 @@ %% scrkernel-bibliography.dtx (with options: `class,article,option') %% scrkernel-index.dtx (with options: `class,article,option') %% scrkernel-listsandtabulars.dtx (with options: `class,article,option') +%% scrkernel-sections.dtx (with options: `class,article,execoption') %% scrkernel-miscellaneous.dtx (with options: `class,article,execoption') %% scrkernel-compatibility.dtx (with options: `class,article,body') %% scrkernel-fonts.dtx (with options: `class,article,body') @@ -73,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,9 +96,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -\providecommand*{\scr@clsextenstion}{\@clsextenstion} +\providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } @@ -110,19 +111,20 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $ +%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script ] \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% change of end dot feature after \string\begin{document}% @@ -151,13 +153,29 @@ } \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} +\newcommand*{\scr@part@beforeskip}{% + 4ex +} +\newcommand*{\scr@part@afterskip}{% + 3ex +} +\newcommand*{\scr@part@style}{part} +\newcommand*{\partheadstartvskip}{% + \addvspace{\@tempskipa}% +} +\newcommand*{\partheadmidvskip}{% + \par\nobreak +} +\newcommand*{\partheadendvskip}{% + \vskip\@tempskipa +} \newcommand*{\size@section}{} \newcommand*{\size@subsection}{} \newcommand*{\size@subsubsection}{} \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -275,6 +293,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -378,7 +398,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -679,7 +699,8 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% {autoendperiod}{0},{autoenddot}{0},{auto}{0},% @@ -705,7 +726,6 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod} \KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot} \KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \KOMA@ifkey{sectionentrydots}{@sectionentrywithdots} @@ -805,7 +825,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% @@ -1135,31 +1155,34 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% {noindex}{0},{noidx}{0},% {index}{1},{idx}{1},% - {nolistof}{2},% - {listof}{3},% - {listofnumbered}{4},{numberedlistof}{4},% - {nobibliography}{5},{nobib}{5},% - {bibliography}{6},{bib}{6},% - {bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},% - {numberedbib}{7},% - {flat}{8},{left}{8},% - {graduated}{9},{indent}{9},{indented}{9},% - {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},% - {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},% - {sectionentrywithdots}{12},{sectionentrydotfill}{12}, - {sectionentrywithoutdots}{13},{sectionentryfill}{13}% + {indexnumbered}{2},% + {nolistof}{3},% + {listof}{4},% + {listofnumbered}{5},{numberedlistof}{5},% + {nobibliography}{6},{nobib}{6},% + {bibliography}{7},{bib}{7},% + {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},% + {numberedbib}{8},% + {flat}{9},{left}{9},% + {graduated}{10},{indent}{10},{indented}{10},% + {indenttextentries}{11},{indentunnumbered}{11},{numberline}{11},% + {leftaligntextentries}{12},{leftalignunnumbered}{12},{nonumberline}{12},% + {sectionentrywithdots}{13},{sectionentrydotfill}{13}, + {sectionentrywithoutdots}{14},{sectionentryfill}{14}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \ifcase \@tempa\relax % index + \ifcase \@tempa\relax % noindex \KOMAoptions{index=notoc}% - \or % noindex + \or % index \KOMAoptions{index=totoc}% + \or % indexnumbered + \KOMAoptions{index=numbered}% \or % listof \KOMAoptions{listof=notoc}% \or % nolistof @@ -1349,7 +1372,7 @@ \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} \KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} -%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1414,10 +1437,18 @@ \newcommand*\bib@heading{% \ifbib@leveldown \subsection*{\refname}% - \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\refname}}\fi + \scr@ifundefinedorrelax{@mkright}{% + \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\refname}}\fi + }{% + \@mkright{\MakeMarkcase{\refname}}% + }% \else \section*{\refname}% - \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}% + \scr@ifundefinedorrelax{@mkdouble}{% + \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}% + }{% + \@mkdouble{\MakeMarkcase{\refname}}% + }% \fi }% \newif\ifbib@leveldown @@ -1511,46 +1542,100 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ \newcommand*{\idx@@heading}{% - \section* + \ifidx@leveldown + \expandafter\subsection + \else + \expandafter\section + \fi*% } +\newif\ifidx@leveldown \KOMA@key{index}{% \KOMA@set@ncmdkey{index}{@tempa}{% {notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},% - {totoc}{1},{toc}{1},{notnumbered}{1}% + {totoc}{1},{toc}{1},{notnumbered}{1},% + {numbered}{2},{totocnumbered}{2},% + {leveldown}{3},% + {standardlevel}{4}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \ifcase \@tempa\relax + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}% \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}% \renewcommand*{\idx@@heading}{% - \section* + \ifidx@leveldown + \expandafter\subsection + \else + \expandafter\section + \fi*% }% \or + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}% \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}% \renewcommand*{\idx@@heading}{% - \addsec + \ifidx@leveldown + \expandafter\subsection\expandafter* + \else + \expandafter\addsec + \fi + }% + \or + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}% + \renewcommand*{\idx@@heading}{% + \ifidx@leveldown + \expandafter\subsection + \else + \expandafter\section + \fi }% + \or + \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}% + \idx@leveldowntrue + \or + \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}% + \idx@leveldownfalse \fi \fi } \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex} \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} +\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: execoption) +\KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1994,7 +2079,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2504,7 +2589,8 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: body) \setcounter{secnumdepth}{3} \newcommand*{\ifnumbered}[1]{% \scr@ifundefinedorrelax{#1numdepth}{% @@ -2528,6 +2614,10 @@ \fi }% } +\BeforeClosingMainAux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% + \string\global\string\@altsecnumformattrue}% + \fi\fi} \newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% \expandafter\@@maybeautodot #1\@stop\endgroup\fi } @@ -2568,7 +2658,7 @@ \newcommand*{\scr@startsection}[6]{% \if@noskipsec \leavevmode \fi \par - \@tempskipa #4\relax + \@tempskipa \glueexpr #4\relax \@afterindenttrue \ifdim \@tempskipa <\z@ \@tempskipa -\@tempskipa \@afterindentfalse @@ -2579,10 +2669,16 @@ \else \addpenalty\@secpenalty\addvspace\@tempskipa \fi - \@ifstar - {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}% - {\csname scr@preto@sect@hook\endcsname - \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}% + \@ifstar {% + \csname scr@preto@ssect@hook\endcsname + \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% + }{% + \csname scr@preto@sect@hook\endcsname + \scr@section@dblarg{% + \@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}% + {\glueexpr #5\relax}{#6}% + }% + }% } \else \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been @@ -2603,9 +2699,14 @@ }% \let\scr@saved@startsection\@startsection \newcommand*{\scr@startsection}[6]{% - \@ifstar - {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}% - {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}% + \@ifstar {% + \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% + {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*% + }{% + \scr@section@dblarg{% + \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% + {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}}% + }% } \fi \newcommand*{\At@startsection}[1]{% @@ -2701,18 +2802,19 @@ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% \fi \fi - \ifnum #2>\c@secnumdepth + \let\IfUsePrefixLine\@secondoftwo + \ifnum \numexpr #2\relax>\c@secnumdepth \let\@svsec\@empty \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname \protected@edef\@svsec{\@seccntformat{#1}\relax}% \fi - \@tempskipa #5\relax + \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup #6{% - \@hangfrom{\hskip #3\relax\@svsec}% + \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% \interlinepenalty \@M #8\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% @@ -2723,7 +2825,7 @@ \addtocentrydefault{#1}{##1}{##2}% }% }{}% - \ifnum #2>\c@secnumdepth + \ifnum \numexpr #2\relax>\c@secnumdepth \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% @@ -2732,10 +2834,10 @@ \fi \else \def\@svsechd{% - #6{\hskip #3\relax + #6{\hskip \glueexpr #3\relax \@svsec #8}% - \expandafter\csname #1mark\expandafter\endcsname\expandafter{% - \scr@ds@head}% + \expandafter\csname #1mark\expandafter\endcsname + \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def @@ -2743,7 +2845,7 @@ \addtocentrydefault{#1}{####1}{####2}% }% }{}% - \ifnum #2>\c@secnumdepth + \ifnum \numexpr #2\relax>\c@secnumdepth \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% @@ -2752,7 +2854,8 @@ \fi }% \fi - \@xsect{#5}% + \let\IfUsePrefixLine\scr@IfUsePrefixLineWarning + \@xsect{\glueexpr #5\relax}% } \DefineFamily{KOMAarg} \DefineFamilyMember[.section]{KOMAarg} @@ -2765,10 +2868,23 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa -\BeforeClosingMainAux{% - \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\@altsecnumformattrue}% - \fi\fi} +\newcommand*{\scr@IfUsePrefixLineWarning}[2]{% + \ClassWarning{\KOMAClassName}{% + usage of \string\IfUsePrefixLine\space outside + section command\MessageBreak + style makes no sense, because the behaviour not only\MessageBreak + depends on class options but also on the run-time\MessageBreak + section command style.\MessageBreak + Neither the then-code nor the else-code will be\MessageBreak + executed.\MessageBreak + You may change this and avoid the warning by LOCALLY\MessageBreak + setting \string\IsUsePrefixLine\space to either + \string\@firstoftwo\space or\MessageBreak + \string\@secondoftwo\space before using it% + }% +} +\newcommand*{\IfUsePrefixLine}[2]{} +\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning \newcommand*{\raggedsection}{} \let\raggedsection\raggedright \DefineFamily{KOMAarg} @@ -2837,13 +2953,36 @@ \DeclareSectionCommandStyleLengthOption{section} {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{section}{font}{}{} +\newcommand*{\scr@dsc@def@style@section@command}[1]{% + \@namedef{#1}{% + \scr@startsection{#1}% + {\csname #1numdepth\endcsname}% + {\csname scr@#1@sectionindent\endcsname}% + {\csname scr@#1@beforeskip\endcsname}% + {\csname scr@#1@afterskip\endcsname}% + {% + \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@ + \expandafter\ifnum\scr@v@is@gt{2.96}\relax + \setlength{\parfillskip}{\z@ plus 1fil}% + \fi + \fi + \raggedsection\normalfont\sectfont\nobreak + \usekomafont{#1}% + }% + }% +} \newcommand*{\scr@dsc@style@part@options}{} \DeclareSectionCommandStyleLengthOption{part} {beforeskip}{scr@}{@beforeskip} \DeclareSectionCommandStyleLengthOption{part} {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{part}{font}{}{} -\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number} +\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{prefix} +\newcommand*{\scr@dsc@def@style@part@command}[1]{% + \@namedef{#1}{\scr@startpart{#1}}% + \@namedef{@#1}{\scr@@startpart{#1}}% + \@namedef{@s#1}{\scr@@startspart{#1}}% +} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}% @@ -2872,7 +3011,7 @@ \IfExistskomafont{\scr@dsc@current}{}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{}% - \IfExistskomafont{\scr@dsc@current number}{}{% + \IfExistskomafont{\scr@dsc@current prefix}{}{% \scr@declaresectioncommanderror{\scr@dsc@current}{number font} {prefixfont}% }{}% @@ -2887,7 +3026,7 @@ \ifscr@dsc@parametersonlytrue \FamilyKeyStateProcessed }{% - \scr@ifundefinedorrelax{scr@start##1}{% + \scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{% \FamilyKeyStateUnknownValue }{% \@namedef{scr@\scr@dsc@current @style}{##1}% @@ -2963,7 +3102,7 @@ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% \the\@tempskipa}% \else - \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{ + \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% ##1}% \fi \fi @@ -3019,7 +3158,9 @@ empty section style option% }% \else - \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{% + \scr@ifundefinedorrelax{% + scr@dsc@def@style@\@nameuse{scr@#2@style}@command% + }{% \ClassWarning{\KOMAClassName}{% not defining `\expandafter\string\csname #2\endcsname' due\MessageBreak @@ -3027,28 +3168,7 @@ `\@nameuse{scr@#2@style}'% }% }{% - \expandafter\edef\csname #2\endcsname{% - \expandafter\noexpand - \csname scr@start\csname scr@#2@style\endcsname\endcsname - {#2}% - \expandafter\noexpand\csname #2numdepth\endcsname - \expandafter\noexpand\csname scr@#2@sectionindent\endcsname - \expandafter\noexpand\csname scr@#2@beforeskip\endcsname - \expandafter\noexpand\csname scr@#2@afterskip\endcsname{% - \noexpand\ifdim\noexpand\glueexpr - \expandafter\noexpand\csname scr@#2@beforeskip\endcsname - <\noexpand\z@ - \unexpanded{% - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \setlength{\parfillskip}{\z@ plus 1fil}% - \fi - }% - \noexpand\fi - \unexpanded{% - \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}% - }% - }% - }% + \@nameuse{scr@dsc@def@style@\@nameuse{scr@#2@style}@command}{#2}% }% \fi \@ifundefined{DeclareSectionNumberDepth}{% @@ -3079,6 +3199,7 @@ }{}% }% }% + \let\scr@dsc@current\relax } \newcommand*{\scr@declaresectioncommanderror}[3]{% \ClassError{\KOMAClassName}{% @@ -3264,61 +3385,61 @@ \gdef\thesection{\@Alph\c@section}% \csname appendixmore\endcsname } -\newcommand*{\partnumdepth}{% - \z@ -} -\newcommand*{\scr@part@beforeskip}{% - 4ex -} -\newcommand*{\partheadstartvskip}{% - \addvspace{\@tempskipa}% -} -\newcommand*{\partheadmidvskip}{% - \par\nobreak -} -\newcommand*{\scr@part@afterskip}{% - 3ex -} -\newcommand*{\partheadendvskip}{% - \vskip\@tempskipa -} -\newcommand*{\scr@part@style}{part} -\newcommand\part{\par - \@tempskipa=\glueexpr\scr@part@beforeskip\relax +\newcommand*{\scr@startpart}[1]{% + \par + \@tempskipa=\glueexpr\@nameuse{scr@#1@beforeskip}\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \partheadstartvskip% + \partheadstartvskip \@afterindentfalse - \SecDef\@part\@spart + \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname } -\newcommand*{\@part}{} -\def\@part[#1]#2{% +\newcommand{\scr@@startpart}{} +\long\def\scr@@startpart#1[#2]#3{% \ifnum \scr@osectarg=\z@ \@scr@tempswafalse \else - \scr@istest#1=\@nil + \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \fi \fi - \ifnumbered{part}{% - \refstepcounter{part}% + \ifnumbered{#1}{% + \refstepcounter{#1}% \@maybeautodot\thepart% + \expandafter\@maybeautodot\csname the#1\endcsname + \typeout{#1 \csname the#1\endcsname.}% \ifx\scr@ds@tocentry\@empty\else - \addparttocentry{\thepart}{\scr@ds@tocentry}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{\csname the#1\endcsname}{\scr@ds@tocentry}% \fi }{% + \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \typeout{#1 without number}% \ifx\scr@ds@tocentry\@empty\else - \addparttocentry{}{\scr@ds@tocentry}% + \hy@insteadofrefstepcounter{#1}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{}{\scr@ds@tocentry}% \fi }% \begingroup @@ -3326,91 +3447,83 @@ \raggedpart \interlinepenalty \@M \normalfont\sectfont\nobreak - \ifnumbered{part}{% - \size@partnumber{\partformat}% + \ifnumbered{#1}{% + \usekomafont{#1prefix}{\@nameuse{#1format}}% \partheadmidvskip }{}% - \size@part{#2}\strut - \ifx\partmark\@gobble - \@mkboth{}{}\par + \usekomafont{part}{#3}\strut + \expandafter\ifx\csname #1mark\endcsname\@gobble + \@mkboth{}{}% \else - \expandafter\partmark\expandafter{\scr@ds@head}\par + \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \fi + \par \endgroup \nobreak - \@tempskipa=\glueexpr\scr@part@afterskip\relax + \@tempskipa=\glueexpr\@nameuse{scr@#1@afterskip}\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \partheadendvskip \@afterheading } -\newcommand*{\@spart}[1]{% +\newcommand{\scr@@startspart}[2]{% + \begingroup + \let\@mkboth\@gobbletwo + \hy@insteadofrefstepcounter{#1}% + \endgroup \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \raggedpart \interlinepenalty \@M \normalfont - \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par + \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par \endgroup \nobreak - \@tempskipa=\glueexpr\scr@part@afterskip\relax + \@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \partheadendvskip \@afterheading } +\newcommand*{\hy@insteadofrefstepcounter}[1]{} +\let\hy@insteadofrefstepcounter\@gobble +\BeforePackage{hyperref}{% + \let\scr@orig@chapter\@chapter + \let\scr@orig@schapter\@schapter + \let\scr@orig@addchap\@addchap +} +\AfterPackage!{hyperref}{% + \let\@chapter\scr@orig@chapter + \let\@schapter\scr@orig@schapter + \let\@addchap\scr@orig@addchap + \ifx\hy@insteadofrefstepcounter\@gobble + \renewcommand*{\hy@insteadofrefstepcounter}[1]{% + \Hy@MakeCurrentHrefAuto{#1*}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% + }% + \fi +} \newcommand*{\addparttocentry}[2]{% \addtocentrydefault{part}{#1}{#2}% } \newcommand\addpart{% - \par - \partheadstartvskip - \@afterindentfalse \SecDef\@addpart\@saddpart } \newcommand*{\@addpart}{} -\def\@addpart[#1]#2{% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \csname phantomsection\endcsname - \ifx\scr@ds@tocentry\@empty\else - \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{% - \scr@ds@tocentry}% - \fi - \@spart{#2}% - \expandafter\addpartmark\expandafter{\scr@ds@head}% +\long\def\@addpart[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \part[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \partnumdepth-1\relax + \reserved@a } -\newcommand*{\@saddpart}{\@spart} -\newcommand*{\partmark}{} -\let\partmark\@gobble - -\newcommand*\addpartmark[1]{% - \begingroup - \expandafter\let\csname if@mainmatter\expandafter\endcsname - \csname iffalse\endcsname - \c@secnumdepth=-2 - \partmark{#1}% - \endgroup +\newcommand{\@saddpart}[1]{% + \part*{#1}% + \addpartmark{}% } -\newcommand*{\parttocdepth}{\m@ne} -\let\parttocdepth\m@ne -\newcommand*{\scr@part@tocindent}{\z@} -\let\scr@part@tocindent\z@ -\newcommand*{\scr@part@tocnumwidth}{2em} \newcommand*\l@part[2]{% \ifnum \c@tocdepth <\parttocdepth \else \addpenalty{\@secpenalty}% @@ -3448,10 +3561,20 @@ \renewcommand*{\thepart}{\@Roman\c@part} \newcommand*{\partformat}{\partname~\thepart\autodot} \newcommand*\partname{Part} +\newcommand*{\partmark}[1]{\@mkboth{}{}} +\newcommand*\addpartmark[1]{% + \begingroup + \expandafter\let\csname if@mainmatter\expandafter\endcsname + \csname iffalse\endcsname + \c@secnumdepth=\numexpr \partnumdepth-1\relax + \partmark{#1}% + \endgroup +} \newcommand*{\raggedpart}{} \let\raggedpart\raggedsection \newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\scr@fnt@partnumber}{\size@partnumber} +\aliaskomafont{partprefix}{partnumber} \newkomafont{partentry}{\usekomafont{disposition}\large} \newkomafont{partentrypagenumber}{} \newcommand*\l@section[2]{% @@ -3491,33 +3614,21 @@ \fi } \newcommand*{\raggedsectionentry}{} -\newcommand*\addsec{\SecDef\@addsec\@saddsec} +\newcommand\addsec{\SecDef\@addsec\@saddsec} \newcommand*{\@addsec}{} -\def\@addsec[#1]#2{\section*{#2}% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \ifx\scr@ds@tocentry\@empty\else - \addsectiontocentry{}{\scr@ds@tocentry}% - \fi - \expandafter\addsecmark\expandafter{\scr@ds@head}% +\def\@addsec[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \section[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \sectionnumdepth-1\relax + \reserved@a +} +\newcommand*{\@saddsec}[1]{% + \section*{#1}\addsecmark{}% } -\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}} \newkomafont{minisec}{} \newcommand\minisec[1]{% \expandafter\ifnum\scr@v@is@lt{3.13a}\relax @@ -3581,7 +3692,7 @@ } \newcommand*\addsecmark[1]{% \begingroup - \c@secnumdepth=\m@ne + \c@secnumdepth=\numexpr \sectionnumdepth-1\relax \sectionmark{#1}% \endgroup } @@ -3593,6 +3704,13 @@ \newkomafont{sectionentry}{\usekomafont{disposition}} \newkomafont{sectionentrypagenumber}{} \newkomafont{sectionentrydots}{\normalfont} +\DeclareSectionCommand[% + style=part,% + level=\z@,% + toclevel=\m@ne,% + tocindent=\z@,% + tocnumwidth=2em +]{part} \DeclareSectionCommand[% style=section,% level=1,% @@ -3820,7 +3938,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4596,7 +4714,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ \renewcommand*{\numberline}[1]{% \numberline@box{% \numberline@prefix @@ -4728,7 +4846,7 @@ \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} \newcommand*\listoftables{\listoftoc{lot}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ \newcommand*\refname{References} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -4813,14 +4931,26 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} \newcommand*{\idx@heading}{% \twocolumn[% \idx@@heading{\indexname}]% - \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}% + \ifidx@leveldown + \scr@ifundefinedorrelax{@mkright}{% + \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi + }{% + \@mkright{\MakeMarkcase{\indexname}}% + }% + \else + \scr@ifundefinedorrelax{@mkdouble}{% + \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}% + }{% + \@mkdouble{\MakeMarkcase{\indexname}}% + }% + \fi } \newenvironment{theindex}{% \if@twocolumn diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 6c348e721a4..64f173801d6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -246,24 +246,34 @@ This error is fatal. You should not continue.% }% \fi + \scr@ifundefinedorrelax{scr@before@process@options@#2@hook}{}{% + \@nameuse{scr@before@process@options@#2@hook}% + }% + \scr@ifundefinedorrelax{scr@before@process@options@#2#1@hook}{}{% + \@nameuse{scr@before@process@options@#2#1@hook}% + \expandafter\let\csname scr@before@process@options@#2#1@hook\endcsname + \relax + }% \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}% \let\ds@\@empty \edef\@curroptions{\@ptionlist{\@currname.\@currext}}% \ifx\@currext\@clsextension\else - \@for\CurrentOption:=\@globaloptionslist\do{% - \ifx\CurrentOption\@empty\else - \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}% - \ifin@ - \@use@ption - \expandafter\let\csname ds@\CurrentOption\endcsname\@empty - \else - \scr@ifprocess@curroption{#1}{#2}{% - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist - }{}% + \scr@ifundefinedorrelax{@globaloptionslist}{}{% + \@for\CurrentOption:=\@globaloptionslist\do{% + \ifx\CurrentOption\@empty\else + \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}% + \ifin@ + \@use@ption + \expandafter\let\csname ds@\CurrentOption\endcsname\@empty + \else + \scr@ifprocess@curroption{#1}{#2}{% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + }{}% + \fi \fi - \fi + }% }% \fi \@for\CurrentOption:=\@curroptions\do{% @@ -281,6 +291,14 @@ \@nameuse{scr@after@options@#1@hook}% } \@onlypreamble\FamilyProcessOptions +\newcommand*{\BeforeFamilyProcessOptions}[3][.\@currname.\@currext]{% + \scr@ifundefinedorrelax{scr@before@process@options@#2#1@hook}{% + \@namedef{scr@before@process@options@#2#1@hook}{#3}% + }{% + \expandafter\g@addto@macro + \csname scr@before@process@options@#2#1@hook\endcsname{#3}% + }% +} \newcommand*{\scr@AtEndOfFamilyOptions}{% \expandafter \l@addto@macro\csname scr@after@options@\FamilyOfKey @hook\endcsname @@ -372,9 +390,9 @@ %%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 743caeae070..a3bc316743b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -23,6 +23,7 @@ %% scrkernel-bibliography.dtx (with options: `class,book,option') %% scrkernel-index.dtx (with options: `class,book,option') %% scrkernel-listsandtabulars.dtx (with options: `class,book,option') +%% scrkernel-sections.dtx (with options: `class,book,execoption') %% scrkernel-miscellaneous.dtx (with options: `class,book,execoption') %% scrkernel-compatibility.dtx (with options: `class,book,body') %% scrkernel-fonts.dtx (with options: `class,book,body') @@ -73,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,9 +96,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -\providecommand*{\scr@clsextenstion}{\@clsextenstion} +\providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } @@ -110,21 +111,22 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $ +%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: prepare) \newif\if@openright \@openrighttrue \newcommand*{\scr@dotchangeatdocument}[1]{% @@ -155,6 +157,32 @@ } \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} +\newcommand*{\scr@part@beforeskip}{% + \z@ \@plus 1fil + \baselineskip +} +\newcommand*{\scr@part@innerskip}{20\p@} +\newcommand*{\scr@part@afterskip}{% + \z@ \@plus 1fil +} +\newcommand*{\scr@part@style}{part} +\newcommand*{\partheadstartvskip}{% + \null\vskip-\baselineskip\vskip\@tempskipa +} +\newcommand*{\partheadmidvskip}{% + \par\nobreak + \vskip\@tempskipa +} +\newcommand*{\partheadendvskip}{% + \vskip\@tempskipa\newpage +} +\newcommand*{\partheademptypage}{% + \if@twoside\if@openright + \null% + \thispagestyle{empty}% + \newpage + \fi\fi +} +\newif\if@chapterprefix \newcommand*{\size@chapter}{} \newcommand*{\size@chapterprefix}{\size@chapter} \newcommand*{\scr@chapter@beforeskip}{\z@} @@ -173,7 +201,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -291,6 +319,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -394,7 +424,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -692,7 +722,8 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% {any}{0},% @@ -719,8 +750,6 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{open}{right} -\KOMA@kav@add{.\KOMAClassFileName}{headings}{openright} \KOMA@DeclareStandardOption{openright}{open=right} \KOMA@DeclareStandardOption{openany}{open=any} \KOMA@key{numbers}{% @@ -748,10 +777,8 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod} \KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot} \KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} -\newif\if@chapterprefix \KOMA@key{chapterprefix}[true]{% \KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -822,7 +849,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}% - \renewcommand*{\scr@chapter@beforeskip}{3.3\baselineskip+\parskip}% + \renewcommand*{\scr@chapter@beforeskip}{-3.3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip }% @@ -848,7 +875,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}% - \renewcommand*{\scr@chapter@beforeskip}{3\baselineskip+\parskip}% + \renewcommand*{\scr@chapter@beforeskip}{-3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip }% @@ -874,7 +901,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}% - \renewcommand*{\scr@chapter@beforeskip}{2.8\baselineskip+\parskip}% + \renewcommand*{\scr@chapter@beforeskip}{-2.8\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip }% @@ -932,7 +959,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}% - \renewcommand*{\scr@chapter@beforeskip}{50\p@}% + \renewcommand*{\scr@chapter@beforeskip}{-50\p@}% \renewcommand*{\scr@chapter@afterskip}{40\p@}% \renewcommand*{\scr@chapter@innerskip}{20\p@}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% @@ -957,7 +984,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% @@ -1287,31 +1314,34 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% {noindex}{0},{noidx}{0},% {index}{1},{idx}{1},% - {nolistof}{2},% - {listof}{3},% - {listofnumbered}{4},{numberedlistof}{4},% - {nobibliography}{5},{nobib}{5},% - {bibliography}{6},{bib}{6},% - {bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},% - {numberedbib}{7},% - {flat}{8},{left}{8},% - {graduated}{9},{indent}{9},{indented}{9},% - {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},% - {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},% - {chapterentrywithdots}{12},{chapterentrydotfill}{12}, - {chapterentrywithoutdots}{13},{chapterentryfill}{13}% + {indexnumbered}{2},% + {nolistof}{3},% + {listof}{4},% + {listofnumbered}{5},{numberedlistof}{5},% + {nobibliography}{6},{nobib}{6},% + {bibliography}{7},{bib}{7},% + {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},% + {numberedbib}{8},% + {flat}{9},{left}{9},% + {graduated}{10},{indent}{10},{indented}{10},% + {indenttextentries}{11},{indentunnumbered}{11},{numberline}{11},% + {leftaligntextentries}{12},{leftalignunnumbered}{12},{nonumberline}{12},% + {chapterentrywithdots}{13},{chapterentrydotfill}{13}, + {chapterentrywithoutdots}{14},{chapterentryfill}{14}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \ifcase \@tempa\relax % index + \ifcase \@tempa\relax % noindex \KOMAoptions{index=notoc}% - \or % noindex + \or % index \KOMAoptions{index=totoc}% + \or % indexnumbered + \KOMAoptions{index=numbered}% \or % listof \KOMAoptions{listof=notoc}% \or % nolistof @@ -1548,7 +1578,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1613,10 +1643,18 @@ \newcommand*\bib@heading{% \ifbib@leveldown \section*{\bibname}% - \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi + \scr@ifundefinedorrelax{@mkright}{% + \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi + }{% + \@mkright{\MakeMarkcase{\bibname}}% + }% \else \chapter*{\bibname}% - \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}% + \scr@ifundefinedorrelax{@mkdouble}{% + \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}% + }{% + \@mkdouble{\MakeMarkcase{\bibname}}% + }% \fi }% \newif\ifbib@leveldown @@ -1714,46 +1752,101 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ \newcommand*{\idx@@heading}{% - \chapter* + \ifidx@leveldown + \expandafter\section + \else + \expandafter\chapter + \fi*% } +\newif\ifidx@leveldown \KOMA@key{index}{% \KOMA@set@ncmdkey{index}{@tempa}{% {notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},% - {totoc}{1},{toc}{1},{notnumbered}{1}% + {totoc}{1},{toc}{1},{notnumbered}{1},% + {numbered}{2},{totocnumbered}{2},% + {leveldown}{3},% + {standardlevel}{4}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \ifcase \@tempa\relax + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}% \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}% \renewcommand*{\idx@@heading}{% - \chapter* + \ifidx@leveldown + \expandafter\section + \else + \expandafter\chapter + \fi*% }% \or + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}% \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}% \renewcommand*{\idx@@heading}{% - \addchap + \ifidx@leveldown + \expandafter\addsec + \else + \expandafter\addchap + \fi }% + \or + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}% + \renewcommand*{\idx@@heading}{% + \ifidx@leveldown + \expandafter\section + \else + \expandafter\chapter + \fi + }% + \or + \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}% + \idx@leveldowntrue + \or + \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}% + \idx@leveldownfalse \fi \fi } \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex} \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} +\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: execoption) +\KOMAExecuteOptions{headings=openright} +\KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2204,7 +2297,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2681,7 +2774,8 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% \scr@ifundefinedorrelax{#1numdepth}{% @@ -2705,6 +2799,10 @@ \fi }% } +\BeforeClosingMainAux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% + \string\global\string\@altsecnumformattrue}% + \fi\fi} \newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% \expandafter\@@maybeautodot #1\@stop\endgroup\fi } @@ -2745,7 +2843,7 @@ \newcommand*{\scr@startsection}[6]{% \if@noskipsec \leavevmode \fi \par - \@tempskipa #4\relax + \@tempskipa \glueexpr #4\relax \@afterindenttrue \ifdim \@tempskipa <\z@ \@tempskipa -\@tempskipa \@afterindentfalse @@ -2756,10 +2854,16 @@ \else \addpenalty\@secpenalty\addvspace\@tempskipa \fi - \@ifstar - {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}% - {\csname scr@preto@sect@hook\endcsname - \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}% + \@ifstar {% + \csname scr@preto@ssect@hook\endcsname + \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% + }{% + \csname scr@preto@sect@hook\endcsname + \scr@section@dblarg{% + \@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}% + {\glueexpr #5\relax}{#6}% + }% + }% } \else \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been @@ -2780,9 +2884,14 @@ }% \let\scr@saved@startsection\@startsection \newcommand*{\scr@startsection}[6]{% - \@ifstar - {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}% - {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}% + \@ifstar {% + \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% + {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*% + }{% + \scr@section@dblarg{% + \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% + {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}}% + }% } \fi \newcommand*{\At@startsection}[1]{% @@ -2878,18 +2987,19 @@ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% \fi \fi - \ifnum #2>\c@secnumdepth + \let\IfUsePrefixLine\@secondoftwo + \ifnum \numexpr #2\relax>\c@secnumdepth \let\@svsec\@empty \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname \protected@edef\@svsec{\@seccntformat{#1}\relax}% \fi - \@tempskipa #5\relax + \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup #6{% - \@hangfrom{\hskip #3\relax\@svsec}% + \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% \interlinepenalty \@M #8\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% @@ -2900,7 +3010,7 @@ \addtocentrydefault{#1}{##1}{##2}% }% }{}% - \ifnum #2>\c@secnumdepth + \ifnum \numexpr #2\relax>\c@secnumdepth \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% @@ -2909,10 +3019,10 @@ \fi \else \def\@svsechd{% - #6{\hskip #3\relax + #6{\hskip \glueexpr #3\relax \@svsec #8}% - \expandafter\csname #1mark\expandafter\endcsname\expandafter{% - \scr@ds@head}% + \expandafter\csname #1mark\expandafter\endcsname + \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def @@ -2920,7 +3030,7 @@ \addtocentrydefault{#1}{####1}{####2}% }% }{}% - \ifnum #2>\c@secnumdepth + \ifnum \numexpr #2\relax>\c@secnumdepth \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% @@ -2929,7 +3039,8 @@ \fi }% \fi - \@xsect{#5}% + \let\IfUsePrefixLine\scr@IfUsePrefixLineWarning + \@xsect{\glueexpr #5\relax}% } \DefineFamily{KOMAarg} \DefineFamilyMember[.section]{KOMAarg} @@ -2942,10 +3053,23 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa -\BeforeClosingMainAux{% - \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\@altsecnumformattrue}% - \fi\fi} +\newcommand*{\scr@IfUsePrefixLineWarning}[2]{% + \ClassWarning{\KOMAClassName}{% + usage of \string\IfUsePrefixLine\space outside + section command\MessageBreak + style makes no sense, because the behaviour not only\MessageBreak + depends on class options but also on the run-time\MessageBreak + section command style.\MessageBreak + Neither the then-code nor the else-code will be\MessageBreak + executed.\MessageBreak + You may change this and avoid the warning by LOCALLY\MessageBreak + setting \string\IsUsePrefixLine\space to either + \string\@firstoftwo\space or\MessageBreak + \string\@secondoftwo\space before using it% + }% +} +\newcommand*{\IfUsePrefixLine}[2]{} +\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning \newcommand*{\raggedsection}{} \let\raggedsection\raggedright \DefineFamily{KOMAarg} @@ -3014,7 +3138,29 @@ \DeclareSectionCommandStyleLengthOption{section} {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{section}{font}{}{} +\newcommand*{\scr@dsc@def@style@section@command}[1]{% + \@namedef{#1}{% + \scr@startsection{#1}% + {\csname #1numdepth\endcsname}% + {\csname scr@#1@sectionindent\endcsname}% + {\csname scr@#1@beforeskip\endcsname}% + {\csname scr@#1@afterskip\endcsname}% + {% + \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@ + \expandafter\ifnum\scr@v@is@gt{2.96}\relax + \setlength{\parfillskip}{\z@ plus 1fil}% + \fi + \fi + \raggedsection\normalfont\sectfont\nobreak + \usekomafont{#1}% + }% + }% +} \newcommand*{\scr@dsc@style@chapter@options}{} +\DeclareSectionCommandStyleOption{chapter}{pagestyle}{% + \@namedef{\scr@dsc@current pagestyle}{#1}% + \FamilyKeyStateProcessed +}% \DeclareSectionCommandStyleLengthOption{chapter} {beforeskip}{scr@}{@beforeskip} \DeclareSectionCommandStyleLengthOption{chapter} @@ -3023,7 +3169,21 @@ {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{chapter}{font}{}{} \DeclareSectionCommandStyleFontOption{chapter}{prefixfont}{}{prefix} +\newcommand*{\scr@dsc@def@style@chapter@command}[1]{% + \@namedef{#1}{\scr@startchapter{#1}}% + \@namedef{@#1}{\scr@@startchapter{#1}}% + \@namedef{@s#1}{\scr@@startschapter{#1}}% + \@namedef{@make#1head}{\scr@makechapterhead{#1}}% + \@namedef{@makes#1head}{\scr@makeschapterhead{#1}}% + \@namedef{@@make#1head}{\scr@@makechapterhead{#1}}% + \@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}% + \@namedef{set#1preamble}{\set@preamble{#1}}% +} \newcommand*{\scr@dsc@style@part@options}{} +\DeclareSectionCommandStyleOption{part}{pagestyle}{% + \@namedef{\scr@dsc@current pagestyle}{#1}% + \FamilyKeyStateProcessed +}% \DeclareSectionCommandStyleLengthOption{part} {beforeskip}{scr@}{@beforeskip} \DeclareSectionCommandStyleLengthOption{part} @@ -3031,7 +3191,14 @@ \DeclareSectionCommandStyleLengthOption{part} {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{part}{font}{}{} -\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number} +\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{prefix} +\newcommand*{\scr@dsc@def@style@part@command}[1]{% + \@namedef{#1}{\scr@startpart{#1}}% + \@namedef{@#1}{\scr@@startpart{#1}}% + \@namedef{@s#1}{\scr@@startspart{#1}}% + \@namedef{@end#1}{\scr@@endpart{#1}}% + \@namedef{set#1preamble}{\set@preamble{#1}}% +} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}% @@ -3049,6 +3216,10 @@ }{}% } \newcommand*{\scr@dsc@style@chapter@neededoptionstest}{% + \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% + \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style} + {pagestyle}% + }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% \scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip} {innerskip}% @@ -3070,6 +3241,10 @@ }{}% } \newcommand*{\scr@dsc@style@part@neededoptionstest}{% + \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% + \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style} + {pagestyle}% + }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% \scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip} {innerskip}% @@ -3085,7 +3260,7 @@ \IfExistskomafont{\scr@dsc@current}{}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{}% - \IfExistskomafont{\scr@dsc@current number}{}{% + \IfExistskomafont{\scr@dsc@current prefix}{}{% \scr@declaresectioncommanderror{\scr@dsc@current}{number font} {prefixfont}% }{}% @@ -3100,7 +3275,7 @@ \ifscr@dsc@parametersonlytrue \FamilyKeyStateProcessed }{% - \scr@ifundefinedorrelax{scr@start##1}{% + \scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{% \FamilyKeyStateUnknownValue }{% \@namedef{scr@\scr@dsc@current @style}{##1}% @@ -3176,7 +3351,7 @@ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% \the\@tempskipa}% \else - \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{ + \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% ##1}% \fi \fi @@ -3232,7 +3407,9 @@ empty section style option% }% \else - \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{% + \scr@ifundefinedorrelax{% + scr@dsc@def@style@\@nameuse{scr@#2@style}@command% + }{% \ClassWarning{\KOMAClassName}{% not defining `\expandafter\string\csname #2\endcsname' due\MessageBreak @@ -3240,28 +3417,7 @@ `\@nameuse{scr@#2@style}'% }% }{% - \expandafter\edef\csname #2\endcsname{% - \expandafter\noexpand - \csname scr@start\csname scr@#2@style\endcsname\endcsname - {#2}% - \expandafter\noexpand\csname #2numdepth\endcsname - \expandafter\noexpand\csname scr@#2@sectionindent\endcsname - \expandafter\noexpand\csname scr@#2@beforeskip\endcsname - \expandafter\noexpand\csname scr@#2@afterskip\endcsname{% - \noexpand\ifdim\noexpand\glueexpr - \expandafter\noexpand\csname scr@#2@beforeskip\endcsname - <\noexpand\z@ - \unexpanded{% - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \setlength{\parfillskip}{\z@ plus 1fil}% - \fi - }% - \noexpand\fi - \unexpanded{% - \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}% - }% - }% - }% + \@nameuse{scr@dsc@def@style@\@nameuse{scr@#2@style}@command}{#2}% }% \fi \@ifundefined{DeclareSectionNumberDepth}{% @@ -3292,6 +3448,7 @@ }{}% }% }% + \let\scr@dsc@current\relax } \newcommand*{\scr@declaresectioncommanderror}[3]{% \ClassError{\KOMAClassName}{% @@ -3598,78 +3755,69 @@ \gdef\thechapter{\@Alph\c@chapter}% \csname appendixmore\endcsname } -\newcommand*{\partnumdepth}{% - \m@ne -} -\newcommand*{\scr@part@beforeskip}{% - \z@ \@plus 1fil + \baselineskip -} -\newcommand*{\partheadstartvskip}{% - \null\vskip-\baselineskip\vskip\@tempskipa -} -\newcommand*{\scr@part@innerskip}{20\p@} -\newcommand*{\partheadmidvskip}{% - \par\nobreak - \vskip\@tempskipa -} -\newcommand*{\scr@part@afterskip}{% - \z@ \@plus 1fil -} -\newcommand*{\partheadendvskip}{% - \vskip\@tempskipa\newpage -} -\newcommand*{\scr@part@style}{part} -\newcommand*{\partheademptypage}{% - \if@twoside\if@openright - \null% - \thispagestyle{empty}% - \newpage - \fi\fi -} -\newcommand\part{\if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\partpagestyle}% +\newcommand*{\scr@startpart}[1]{% + \if@openright\cleardoublepage\else\clearpage\fi + \thispagestyle{\@nameuse{#1pagestyle}}% \if@twocolumn \onecolumn \@tempswatrue \else \@tempswafalse \fi - \@tempskipa=\glueexpr\scr@part@beforeskip\relax + \@tempskipa=\glueexpr\@nameuse{scr@#1@beforeskip}\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \partheadstartvskip - \vbox to\z@{\vss\use@preamble{part@o}\strut\par}% - \vskip-\baselineskip\nobreak% - \SecDef\@part\@spart + \vbox to\z@{\vss\use@preamble{#1@o}\strut\par}% + \vskip-\baselineskip\nobreak + \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname } -\newcommand*{\@part}{} -\def\@part[#1]#2{% +\newcommand{\scr@@startpart}{} +\long\def\scr@@startpart#1[#2]#3{% \ifnum \scr@osectarg=\z@ \@scr@tempswafalse \else - \scr@istest#1=\@nil + \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \fi \fi - \ifnumbered{part}{% - \refstepcounter{part}% + \ifnumbered{#1}{% + \refstepcounter{#1}% \@maybeautodot\thepart% + \expandafter\@maybeautodot\csname the#1\endcsname + \typeout{#1 \csname the#1\endcsname.}% \ifx\scr@ds@tocentry\@empty\else - \addparttocentry{\thepart}{\scr@ds@tocentry}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{\csname the#1\endcsname}{\scr@ds@tocentry}% \fi }{% + \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \typeout{#1 without number}% \ifx\scr@ds@tocentry\@empty\else - \addparttocentry{}{\scr@ds@tocentry}% + \hy@insteadofrefstepcounter{#1}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{}{\scr@ds@tocentry}% \fi }% \begingroup @@ -3677,32 +3825,38 @@ \raggedpart \interlinepenalty \@M \normalfont\sectfont\nobreak - \ifnumbered{part}{% - \size@partnumber{\partformat}% - \setlength{\@tempskipa}{\scr@part@innerskip}% + \ifnumbered{#1}{% + \usekomafont{#1prefix}{\@nameuse{#1format}}% + \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}% \partheadmidvskip }{}% - \size@part{#2}\strut - \ifx\partmark\@gobble - \@mkboth{}{}\par + \usekomafont{part}{#3}\strut + \expandafter\ifx\csname #1mark\endcsname\@gobble + \@mkboth{}{}% \else - \expandafter\partmark\expandafter{\scr@ds@head}\par + \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \fi + \par \endgroup - \@endpart + \@nameuse{@end#1}% } -\newcommand*{\@spart}[1]{% +\newcommand{\scr@@startspart}[2]{% + \begingroup + \let\@mkboth\@gobbletwo + \hy@insteadofrefstepcounter{#1}% + \endgroup \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \raggedpart \interlinepenalty \@M \normalfont - \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par + \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par \endgroup - \@endpart + \@nameuse{@end#1}% } -\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}% - \@tempskipa=\glueexpr\scr@part@afterskip\relax +\newcommand*{\scr@@endpart}[1]{% + \vbox to\z@{\use@preamble{#1@u}\vss}% + \@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \partheadendvskip \partheademptypage @@ -3710,75 +3864,47 @@ \twocolumn \fi } -\newcommand*{\setpartpreamble}{\set@preamble{part}} -\newcommand*{\part@u@preamble}{} -\let\part@u@preamble\relax -\newcommand*{\part@o@preamble}{} -\let\part@o@preamble\relax +\newcommand*{\hy@insteadofrefstepcounter}[1]{} +\let\hy@insteadofrefstepcounter\@gobble +\BeforePackage{hyperref}{% + \let\scr@orig@chapter\@chapter + \let\scr@orig@schapter\@schapter + \let\scr@orig@addchap\@addchap +} +\AfterPackage!{hyperref}{% + \let\@chapter\scr@orig@chapter + \let\@schapter\scr@orig@schapter + \let\@addchap\scr@orig@addchap + \ifx\hy@insteadofrefstepcounter\@gobble + \renewcommand*{\hy@insteadofrefstepcounter}[1]{% + \Hy@MakeCurrentHrefAuto{#1*}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% + }% + \fi +} \newcommand*{\addparttocentry}[2]{% \addtocentrydefault{part}{#1}{#2}% } \newcommand\addpart{% - \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\partpagestyle}% - \if@twocolumn - \onecolumn - \@tempswatrue - \else - \@tempswafalse - \fi - \@tempskipa=\glueexpr\scr@part@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \partheadstartvskip - \vbox to\z@{\vss\use@preamble{part@o}\strut\par}% - \vskip-\baselineskip\nobreak% \SecDef\@addpart\@saddpart } \newcommand*{\@addpart}{} -\def\@addpart[#1]#2{% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \csname phantomsection\endcsname - \ifx\scr@ds@tocentry\@empty\else - \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{% - \scr@ds@tocentry}% - \fi - \@spart{#2}% - \expandafter\addpartmark\expandafter{\scr@ds@head}% +\long\def\@addpart[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \part[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \partnumdepth-1\relax + \reserved@a } -\newcommand*{\@saddpart}{\@spart} -\newcommand*{\partmark}{} -\let\partmark\@gobble - -\newcommand*\addpartmark[1]{% - \begingroup - \expandafter\let\csname if@mainmatter\expandafter\endcsname - \csname iffalse\endcsname - \c@secnumdepth=-2 - \partmark{#1}% - \endgroup +\newcommand{\@saddpart}[1]{% + \part*{#1}% + \addpartmark{}% } -\newcommand*{\parttocdepth}{\m@ne} -\let\parttocdepth\m@ne -\newcommand*{\scr@part@tocindent}{\z@} -\let\scr@part@tocindent\z@ -\newcommand*{\scr@part@tocnumwidth}{2em} \newcommand*\l@part[2]{% \ifnum \c@tocdepth <\parttocdepth \else \addpenalty{-\@highpenalty}% @@ -3811,123 +3937,83 @@ \renewcommand*{\thepart}{\@Roman\c@part} \newcommand*{\partformat}{\partname~\thepart\autodot} \newcommand*\partname{Part} +\newcommand*{\partmark}[1]{\@mkboth{}{}} +\newcommand*\addpartmark[1]{% + \begingroup + \expandafter\let\csname if@mainmatter\expandafter\endcsname + \csname iffalse\endcsname + \c@secnumdepth=\numexpr \partnumdepth-1\relax + \partmark{#1}% + \endgroup +} \newcommand*{\raggedpart}{} \let\raggedpart\centering \newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\scr@fnt@partnumber}{\size@partnumber} +\aliaskomafont{partprefix}{partnumber} \newkomafont{partentry}{\usekomafont{disposition}\large} \newkomafont{partentrypagenumber}{} -\newcommand*{\chapternumdepth}{\z@} -\newif\if@at@twocolumn -\newcommand*\scr@topnewpage{} -\let\scr@topnewpage\@topnewpage -\long\def\@topnewpage[#1]{% - \@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse -} -\newcommand*{\use@chapter@o@preamble}{% - {% - \settoheight{\@tempdima}{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \vbox{\chapterheadstartvskip}% - }% - \settodepth{\@tempdimb}{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \vbox{\chapterheadstartvskip}% - }% - \addtolength{\@tempdima}{\@tempdimb}% - \setbox\z@\vbox{% - \use@preamble{chapter@o}% - }% - \setlength{\@tempdimb}{\ht0}% - \addtolength{\@tempdimb}{\dp0}% - \vbox to \z@{% - \vskip-\baselineskip - \vbox to \@tempdima{% - \vfill - \box\z@ - }% - \vss - }\vskip-\parskip\vskip-\baselineskip - \ifdim \@tempdimb>\@tempdima% - \addtolength{\@tempdimb}{-\@tempdima}% - \ifdim\@tempdimb<\vfuzz - \ClassInfo{\KOMAClassName}{% - preamble before chapter is \the\@tempdimb\space too - high.\MessageBreak - Tolerated without warning because of\MessageBreak - \string\vfuzz\space = \the\vfuzz\space >= \the\@tempdimb - }% - \else - \ClassWarning{\KOMAClassName}{% - preamble before chapter is \the\@tempdimb\space too - high.\MessageBreak - To avoid the overfull \string\vbox\space you may - redefine\MessageBreak - \string\chapterheadstartvskip\space at the preamble of - your\MessageBreak - document. You may also change - \string\setchapterpreamble\MessageBreak - before the command, which generates the message - about\MessageBreak - an overfull \string\vbox - }% - \fi - \fi% - }% -} -\newcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\chapterpagestyle}% +\newcommand*{\scr@startchapter}[1]{% + \if@openright\cleardoublepage\else\clearpage\fi + \thispagestyle{\@nameuse{#1pagestyle}}% \global\@topnum\z@ \@afterindentfalse - \SecDef\@chapter\@schapter + \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname } -\newcommand*{\@chapter}{} -\def\@chapter[#1]#2{% +\newcommand*{\scr@@startchapter}{} +\def\scr@@startchapter#1[#2]#3{% \ifnum \scr@osectarg=\z@ \@scr@tempswafalse \else - \scr@istest#1=\@nil + \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \fi \fi - \ifnumbered{chapter}{% + \ifnumbered{#1}{% \if@mainmatter - \refstepcounter{chapter}% - \@maybeautodot\thechapter - \typeout{\@chapapp\space\thechapter.}% - \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{\thechapter}{\scr@ds@tocentry}% - \fi - \else - \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else - \begingroup - \let\@elt\@stpelt - \csname cl@chapter\endcsname - \endgroup - \fi - \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{}{\scr@ds@tocentry}% - \fi + \@tempswatrue + \else\@tempswafalse\fi + }{\@tempswafalse}% + \if@tempswa + \refstepcounter{#1}% + \expandafter\@maybeautodot\csname the#1\endcsname + \typeout{#1 \csname the#1\endcsname.}% + \ifx\scr@ds@tocentry\@empty\else + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{\csname the#1\endcsname}{\scr@ds@tocentry}% \fi - }{% + \else + \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \typeout{#1 without number}% \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{}{\scr@ds@tocentry}% + \hy@insteadofrefstepcounter{#1}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{}{\scr@ds@tocentry}% \fi - }% - \expandafter\chaptermark\expandafter{\scr@ds@head}% + \fi + \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifdim \@chapterlistsgap>\z@ \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -3941,29 +4027,58 @@ \fi \if@twocolumn \if@at@twocolumn - \@makechapterhead{#2}% + \@nameuse{@make#1head}{#3}% \else - \@topnewpage[\@makechapterhead{#2}]% + \@topnewpage[\@nameuse{@make#1head}{#3}]% \fi \else - \@makechapterhead{#2}% - \@afterheading + \@nameuse{@make#1head}{#3}% \fi + \@afterheading +} +\newcommand*{\scr@@startschapter}[2]{% + \begingroup + \let\@mkboth\@gobbletwo + \hy@insteadofrefstepcounter{#1}% + \endgroup + \if@twocolumn + \if@at@twocolumn + \@nameuse{@makes#1head}{#2}% + \else + \@topnewpage[\@nameuse{@makes#1head}{#2}]% + \fi + \else + \@nameuse{@makes#1head}{#2}% + \fi + \@afterheading +} +%% \begin{macro}{\if@at@twocolumn} +\newif\if@at@twocolumn +\newcommand*\scr@topnewpage{} +\let\scr@topnewpage\@topnewpage +\long\def\@topnewpage[#1]{% + \@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse +} +\newcommand*{\scr@makechapterhead}[2]{% + \use@chapter@o@preamble{#1}% + \@nameuse{@@make#1head}{#2}% + \use@preamble{#1@u}% } -\newcommand*{\@makechapterhead}[1]{% - \use@chapter@o@preamble - \@@makechapterhead{#1}% - \use@preamble{chapter@u}% +\newcommand*{\scr@makeschapterhead}[2]{% + \use@chapter@o@preamble{#1}% + \@nameuse{@@makes#1head}{#2}% + \use@preamble{#1@u}% } -\newcommand*{\@@makechapterhead}[1]{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax +\newcommand*{\scr@@makechapterhead}[2]{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usefontofkomafont{chapter}% + \normalfont\sectfont\nobreak\nobreak + \usefontofkomafont{#1}% \if@mainmatter - \def\IfUseNumber{\ifnumbered{chapter}}% + \def\IfUseNumber{\ifnumbered{#1}}% \else\let\IfUseNumber\@secondoftwo\fi \if@chapterprefix \raggedchapter @@ -3975,15 +4090,17 @@ \fi \@tempa{% \IfUseNumber{% - \usekomafont{chapter}{% + \usekomafont{#1}{% \IfUsePrefixLine{% - {\usekomafont{chapterprefix}{% - \chapterformat - \setlength{\@tempskipa}{\scr@chapter@innerskip}% + {\usekomafont{#1prefix}{% + \csname #1format\endcsname + \setlength{\@tempskipa}{% + \csname scr@#1@innerskip\endcsname + }% \chapterheadmidvskip }}% }{% - \chapterformat + \csname #1format\endcsname }% }% }{}% @@ -3991,19 +4108,79 @@ {% \IfUsePrefixLine{}{\raggedchapter}% \interlinepenalty \@M - \usekomafont{chapter}{#1}\par + \usekomafont{#1}{#2}\par }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \scr@chapter@afterskip\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \chapterheadendvskip +} +\newcommand*{\scr@@makeschapterhead}[2]{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \chapterheadstartvskip + {% + \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% + \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% + \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + }% + \nobreak\par\nobreak + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } -\newcommand*{\setchapterpreamble}{\set@preamble{chapter}} -\newcommand*{\chapter@u@preamble}{} -\let\chapter@u@preamble\relax -\newcommand*{\chapter@o@preamble}{} -\let\chapter@o@preamble\relax +\newcommand*{\use@chapter@o@preamble}[1]{% + {% + \settoheight{\@tempdima}{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \vbox{\chapterheadstartvskip}% + }% + \settodepth{\@tempdimb}{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \vbox{\chapterheadstartvskip}% + }% + \addtolength{\@tempdima}{\@tempdimb}% + \setbox\z@\vbox{% + \use@preamble{#1@o}% + }% + \setlength{\@tempdimb}{\ht0}% + \addtolength{\@tempdimb}{\dp0}% + \vbox to \z@{% + \vskip-\baselineskip + \vbox to \@tempdima{% + \vfill + \box\z@ + }% + \vss + }\vskip-\parskip\vskip-\baselineskip + \ifdim \@tempdimb>\@tempdima% + \addtolength{\@tempdimb}{-\@tempdima}% + \ifdim\@tempdimb<\vfuzz + \ClassInfo{\KOMAClassName}{% + preamble before #1 is \the\@tempdimb\space to high.\MessageBreak + Tolerated without warning because of\MessageBreak + \string\vfuzz\space = \the\vfuzz\space >= \the\@tempdimb + }% + \else + \ClassWarning{\KOMAClassName}{% + preamble before #1 is \the\@tempdimb\space to high.\MessageBreak + To avoid the overfull \string\vbox\space you may + change\MessageBreak + the `beforeskip' value using + \string\RedeclareSectionCommand\MessageBreak + at the preamble of your document.\MessageBreak + You may also change \string\setchapterpreamble\MessageBreak + before the command, which generates the message + about\MessageBreak + an overfull \string\vbox + }% + \fi + \fi% + }% +} \newcommand*{\addchaptertocentry}[2]{% \addtocentrydefault{chapter}{#1}{#2}% \if@chaptertolists @@ -4015,84 +4192,24 @@ \@ifundefined{float@addtolists}{}{\scr@float@addtolists@warning}% \fi } -\newcommand*{\@schapter}[1]{% - \if@twocolumn - \if@at@twocolumn - \@makeschapterhead{#1}% - \else - \@topnewpage[\@makeschapterhead{#1}]% - \fi - \else - \@makeschapterhead{#1}% - \@afterheading - \fi -} -\newcommand*{\@@makeschapterhead}[1]{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \chapterheadstartvskip - {% - \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par - }% - \nobreak\par\nobreak - \@tempskipa=\glueexpr \scr@chapter@afterskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \chapterheadendvskip% -} -\newcommand*{\@makeschapterhead}[1]{% - \use@chapter@o@preamble - \@@makeschapterhead{#1}% - \use@preamble{chapter@u}% -} \newcommand\addchap{% - \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\chapterpagestyle}% - \global\@topnum\z@ - \@afterindentfalse - \SecDef\@addchap\@saddchap% + \SecDef\@addchap\@saddchap }% \newcommand*{\@addchap}{}% -\def\@addchap[#1]#2{% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \@schapter{#2}% - \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{}{\scr@ds@tocentry}% - \fi - \ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax - \ifdim \@chapterlistsgap>\z@ - \doforeachtocfile{% - \iftocfeature{\@currext}{chapteratlist}{% - \addtocontents{\@currext}{\protect\addvspace{\@chapterlistsgap}}% - }{}% - }% - \@ifundefined{float@addtolists}{}{% - \scr@float@addtolists@warning - \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% - }% - \fi - \fi - \expandafter\addchapmark\expandafter{\scr@ds@head}% +\long\def\@addchap[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \chapter[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \chapternumdepth-1\relax + \reserved@a +} +\newcommand{\@saddchap}[1]{% + \chapter*{#1}% + \addchapmark{}% }% -\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}% \AfterPackage{hyperref}{% \@ifpackagelater{hyperref}{2001/02/19}{}{% \ClassWarningNoLine{\KOMAClassName}{% @@ -4101,11 +4218,6 @@ causing \string\addchap\space to behave strange.\MessageBreak% Please update hyperref to at least version 6.71b}}} -\newcommand*{\chaptertocdepth}{\z@} -\let\chaptertocdepth\z@ -\newcommand*{\scr@chapter@tocindent}{\z@} -\let\scr@chapter@tocindent\z@ -\newcommand*{\scr@chapter@tocnumwidth}{1.5em} \newcommand*\l@chapter[2]{% \ifnum \c@tocdepth <\chaptertocdepth \else \ifnum \lastpenalty<20010 @@ -4170,10 +4282,13 @@ obligatory instead of an optional argument. Use that\MessageBreak new command% }% - \if@chapterprefix\chapapp#1\fi + \chapappifchapterprefix{#1}% } \newcommand*{\chapappifchapterprefix}[1]{% - \if@chapterprefix\chapapp#1\fi + \IfChapterUsesPrefixLine{\chapapp#1}{}% +} +\newcommand*{\IfChapterUsesPrefixLine}{% + \if@chapterprefix\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } \newcommand*{\chapapp}{\@chapapp} \newcommand*\@chapapp{\chaptername} @@ -4182,7 +4297,7 @@ \begingroup \expandafter\let\csname if@mainmatter\expandafter\endcsname \csname iffalse\endcsname - \c@secnumdepth=\m@ne + \c@secnumdepth=\numexpr \chapternumdepth-1\relax \chaptermark{#1}% \endgroup } @@ -4192,33 +4307,21 @@ \newkomafont{chapterentry}{\usekomafont{disposition}} \newkomafont{chapterentrypagenumber}{} \newkomafont{chapterentrydots}{\normalfont} -\newcommand*\addsec{\SecDef\@addsec\@saddsec} +\newcommand\addsec{\SecDef\@addsec\@saddsec} \newcommand*{\@addsec}{} -\def\@addsec[#1]#2{\section*{#2}% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \ifx\scr@ds@tocentry\@empty\else - \addsectiontocentry{}{\scr@ds@tocentry}% - \fi - \expandafter\addsecmark\expandafter{\scr@ds@head}% +\def\@addsec[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \section[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \sectionnumdepth-1\relax + \reserved@a +} +\newcommand*{\@saddsec}[1]{% + \section*{#1}\addsecmark{}% } -\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}} \newkomafont{minisec}{} \newcommand\minisec[1]{% \expandafter\ifnum\scr@v@is@lt{3.13a}\relax @@ -4290,7 +4393,7 @@ } \newcommand*\addsecmark[1]{% \begingroup - \c@secnumdepth=\m@ne + \c@secnumdepth=\numexpr \sectionnumdepth-1\relax \sectionmark{#1}% \endgroup } @@ -4299,6 +4402,21 @@ \newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} +\DeclareSectionCommand[% + style=part,% + level=\m@ne,% + pagestyle=plain,% + toclevel=\m@ne,% + tocindent=\z@,% + tocnumwidth=2em +]{part} +\DeclareSectionCommand[% + style=chapter,% + level=\z@,% + pagestyle=plain,% + tocindent=\z@,% + tocnumwidth=1.5em +]{chapter} \DeclareSectionCommand[% style=section,% level=1,% @@ -4532,7 +4650,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4629,8 +4747,6 @@ \renewcommand*{\sectionmark}[1]{}% } \newcommand*{\titlepagestyle}{plain} -\newcommand*{\partpagestyle}{plain} -\newcommand*{\chapterpagestyle}{plain} \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} @@ -5328,7 +5444,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ \doforeachtocfile[float]{% \setuptoc{\@currext}{chapteratlist}% } @@ -5466,7 +5582,7 @@ \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} \newcommand*\listoftables{\listoftoc{lot}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ \newcommand*\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -5551,7 +5667,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5560,7 +5676,19 @@ \twocolumn[% \@chaptertolistsfalse \idx@@heading{\indexname}]% - \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}% + \ifidx@leveldown + \scr@ifundefinedorrelax{@mkright}{% + \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi + }{% + \@mkright{\MakeMarkcase{\indexname}}% + }% + \else + \scr@ifundefinedorrelax{@mkdouble}{% + \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}% + }{% + \@mkdouble{\MakeMarkcase{\indexname}}% + }% + \fi } \newenvironment{theindex}{% \if@twocolumn diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index cf9b3fc835e..adf367e8bc1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index d6f15005f86..465ea46b5f7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -19,6 +19,7 @@ %% scrkernel-floats.dtx (with options: `package,extend,option') %% scrkernel-footnotes.dtx (with options: `package,extend,option') %% scrkernel-listsandtabulars.dtx (with options: `package,extend,option') +%% scrkernel-sections.dtx (with options: `package,extend,execoption') %% scrkernel-miscellaneous.dtx (with options: `package,extend,execoption') %% scrkernel-compatibility.dtx (with options: `package,extend,body') %% scrkernel-fonts.dtx (with options: `package,extend,body') @@ -75,7 +76,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -97,7 +98,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -105,7 +106,7 @@ } %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ \ProvidesPackage{scrextend}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -129,9 +130,10 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ \KOMA@key{extendedfeature}{% @@ -156,7 +158,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -255,6 +257,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -370,8 +374,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \KOMA@key{cleardoublepage}{% \begingroup% \def\@tempc{% @@ -524,9 +529,11 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: execoption) %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1192,7 +1199,8 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ @@ -1268,7 +1276,7 @@ \providecommand*{\@textsubscript}[1]{% {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 38c9dd002c5..df975033151 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -72,7 +72,7 @@ } %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \ProvidesPackage{scrfontsizes}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (font size file generator)] %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \ProcessOptions\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 44d734039fc..bcff62f8862 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,21 +65,21 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% @@ -92,7 +92,7 @@ \KOMA@ifkey{setspace}{@scrhack@setspace} \KOMAExecuteOptions{setspace=true} \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -121,21 +121,31 @@ \PackageInfo{scrhack}{ignorring #2 hack}% }% } -\AfterPackage*{hyperref}{% - \@ifpackagelater{hyperref}{2009/11/24}{% +\BeforePackage{hyperref}{% + \scr@ifundefinedorrelax{hy@insteadofrefstepcounter}{}{% \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak - detection of hyperref version, that doesn't\MessageBreak + detection of KOMA-Script class, that doesn't\MessageBreak need that hack,}% \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}% - }{% - \AtEndOfPackage{% - \KOMA@key[.scrhack.sty]{hyperref}{% - \PackageWarning{scrhack}{option `hyperref=#1' ignored}% - \FamilyKeyStateProcessed + }% +} +\AfterPackage*{hyperref}{% + \if@scrhack@hyperref + \@ifpackagelater{hyperref}{2009/11/24}{% + \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak + detection of hyperref version, that doesn't\MessageBreak + need that hack,}% + \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}% + }{% + \AtEndOfPackage{% + \KOMA@key[.scrhack.sty]{hyperref}{% + \PackageWarning{scrhack}{option `hyperref=#1' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi }% - \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi }% - }% + \fi } \AfterPackage*{float}{% \KOMA@key[.scrhack.sty]{float}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 075c7cf076c..87d6f83823e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -38,10 +38,10 @@ %% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e %% standard classes created by The LaTeX3 Project 1994-1996. %% -%%% From File: $Id: scrjura.dtx 2094 2015-05-13 06:44:15Z kohm $ +%%% From File: $Id: scrjura.dtx 2098 2015-05-13 16:23:25Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura} - [2015/05/13 v0.9c KOMA-Script for jurists + [2015/05/13 v0.9d KOMA-Script for jurists (package)% ] \@ifpackageloaded{hyperref}{% @@ -398,7 +398,7 @@ \expandafter\DeclareRobustCommand\expandafter*% \csname #1@Clauseformat\endcsname[1]{\Clauseformat{##1}}% }{}% - \expandafter\providecommand\epxandafter*\csname the#1Clause\endcsname{% + \expandafter\renewcommand\expandafter*\csname the#1Clause\endcsname{% \csname #1@Clauseformat\endcsname{\arabic{#1Clause}}}% \newenvironment{#1}{% \par diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 6830db14d2f..f9a9a083acd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] @@ -244,9 +244,9 @@ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty index bae97046942..fe6cb8c9d4d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -52,7 +52,7 @@ 2014/06/03 v0.1.1760 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -83,7 +83,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -216,7 +216,7 @@ \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns} \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default} -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index 174a2ab4054..07cfaedda44 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -45,13 +45,13 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (identify) +%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -62,7 +62,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (init) +%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (init) \AtEndOfPackage{% \sls@auto@pagestyleset% } @@ -78,7 +78,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% \begingroup @@ -209,7 +209,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (options) +%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (options) \KOMA@key{headwidth}{% \begingroup \sls@split@at@iicolons#1:::\@nil @@ -616,6 +616,7 @@ } \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@olines} \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@olines@default} +\KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{} \KOMA@key{pagestyleset}{% \scr@ifundefinedorrelax{sls@ps@style@#1}{% \FamilyKeyStateUnknownValue @@ -666,10 +667,14 @@ \else \rightmark\fi}% \lefoot[\ifnum\@pageat=\thr@@\pagemark\fi] {\ifnum\@pageat=\thr@@\pagemark\fi}% + \lofoot[\ifnum\@pageat=\thr@@\pagemark\fi] + {\ifnum\@pageat=\thr@@\pagemark\fi}% \cfoot[\ifnum\@pageat=4 \pagemark\fi] {\ifnum\@pageat=4 \pagemark\fi}% \refoot[\ifnum\@pageat=5 \pagemark\fi] {\ifnum\@pageat=5 \pagemark\fi}% + \rofoot[\ifnum\@pageat=5 \pagemark\fi] + {\ifnum\@pageat=5 \pagemark\fi}% }{}% }% }% @@ -689,7 +694,7 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}% \scrlayer@AddCsToInterface{sls@leavevmode@linetrue} \scrlayer@AddCsToInterface{sls@leavevmode@linefalse} -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax @@ -760,7 +765,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (body) +%%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (body) \scrlayerAddToInterface\setheadwidth{% \newcommand*{\setheadwidth}[2][]{% \KOMAoptions{headwidth=#2:#1}% @@ -806,16 +811,18 @@ \ifstr{#2}{current}{}{% \setlength{\@tempdima}{#2}% \ifstr{#1}{headabove}{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]{headtopline=\@tempdima}% + \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + {headtopline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{\ifstr{#1}{headbelow}{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]{headsepline=\@tempdima}% + \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + {headsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% \ifstr{#1}{footabove}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% - {footsepline=\@tempdima}% + {footsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% - {footbotline=\@tempdima}% + {footbotline=\@tempdima:\csname sls@#1@linelength\endcsname}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index b08aa076da7..9cfcb3e9abd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,13 +43,13 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (identify) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -113,7 +113,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -265,7 +265,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} \newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty} @@ -622,6 +622,12 @@ \csname @scr@l@\scr@current@layer @backgroundfalse\endcsname \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname } +\DefineFamilyKey[.definelayer]{KOMAarg}{backandforeground}[\relax]{% + \FamilyKeyStateProcessed + \scrlayer@testunexpectedarg{backandforeground}{#1}% + \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname + \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname +} \DefineFamilyKey[.definelayer]{KOMAarg}{oddpage}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{oddpage}{#1}% @@ -634,6 +640,27 @@ \csname @scr@l@\scr@current@layer @oddfalse\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname } +\DefineFamilyKey[.definelayer]{KOMAarg}{oddorevenpage}[\relax]{% + \FamilyKeyStateProcessed + \scrlayer@testunexpectedarg{oddorevenpage}{#1}% + \csname @scr@l@\scr@current@layer @oddtrue\endcsname + \csname @scr@l@\scr@current@layer @eventrue\endcsname +} +\DefineFamilyKey[.definelayer]{KOMAarg}{evenoroddpage}[\relax]{% + \PackageWarning{scrlayer}{Option `evenoroddpage' unknown.\MessageBreak + Using `oddorevenpage' instead}% + \ExecuteFamilyOptions[.definelayer]{KOMAarg}{oddorevenpage=#1} +} +\DefineFamilyKey[.definelayer]{KOMAarg}{oddandevenpages}[\relax]{% + \PackageWarning{scrlayer}{Option `oddandevenpages' unknown.\MessageBreak + Using `oddorevenpage' instead}% + \ExecuteFamilyOptions[.definelayer]{KOMAarg}{oddorevenpage=#1} +} +\DefineFamilyKey[.definelayer]{KOMAarg}{evenandoddpages}[\relax]{% + \PackageWarning{scrlayer}{Option `evenandoddpages' unknown.\MessageBreak + Using `oddorevenpage' instead}% + \ExecuteFamilyOptions[.definelayer]{KOMAarg}{oddorevenpage=#1} +} \DefineFamilyKey[.definelayer]{KOMAarg}{floatpage}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{floatpage}{#1}% @@ -642,10 +669,41 @@ } \DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatpage}[\relax]{% \FamilyKeyStateProcessed - \scrlayer@testunexpectedarg{twoside}{#1}% + \scrlayer@testunexpectedarg{nonfloatpage}{#1}% \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname \csname @scr@l@\scr@current@layer @floatpagefalse\endcsname } +\DefineFamilyKey[.definelayer]{KOMAarg}{floatornonfloatpage}[\relax]{% + \FamilyKeyStateProcessed + \scrlayer@testunexpectedarg{floatornonfloatpage}{#1}% + \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname + \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname +} +\DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatorfloatpage}[\relax]{% + \PackageWarning{scrlayer}{Option `nonfloatorfloatpage' unknown.\MessageBreak + Using `floatornonfloatpage' instead}% + \FamilyExecuteOptions[.definelayer]{KOMAarg}{floatornonfloatpage=#1}% +} +\DefineFamilyKey[.definelayer]{KOMAarg}{floatandnonfloatpages}[\relax]{% + \PackageWarning{scrlayer}{Option `floatandnonfloatpages' unknown.\MessageBreak + Using `floatornonfloatpage' instead}% + \FamilyExecuteOptions[.definelayer]{KOMAarg}{floatornonfloatpage=#1}% +} +\DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatandfloatpages}[\relax]{% + \PackageWarning{scrlayer}{Option `nonfloatandfloatpages' unknown.\MessageBreak + Using `floatornonfloatpage' instead}% + \FamilyExecuteOptions[.definelayer]{KOMAarg}{floatornonfloatpage=#1}% +} +\DefineFamilyKey[.definelayer]{KOMAarg}{everypage}[\relax]{% + \FamilyKeyStateProcessed + \scrlayer@testunexpectedarg{everypage}{#1}% + \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname + \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname + \csname @scr@l@\scr@current@layer @oddtrue\endcsname + \csname @scr@l@\scr@current@layer @eventrue\endcsname + \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname + \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname +} \DefineFamilyKey[.definelayer]{KOMAarg}{oneside}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{oneside}{#1}% @@ -658,6 +716,22 @@ \csname @scr@l@\scr@current@layer @twosidetrue\endcsname \csname @scr@l@\scr@current@layer @onesidefalse\endcsname } +\DefineFamilyKey[.definelayer]{KOMAarg}{everyside}[\relax]{% + \FamilyKeyStateProcessed + \scrlayer@testunexpectedarg{everyside}{#1}% + \csname @scr@l@\scr@current@layer @twosidetrue\endcsname + \csname @scr@l@\scr@current@layer @onesidetrue\endcsname +} +\DefineFamilyKey[.definelayer]{KOMAarg}{unrestricted}[\relax]{% + \FamilyKeyStateProcessed + \scrlayer@testunexpectedarg{unrestricted}{#1}% + \csname @scr@l@\scr@current@layer @oddtrue\endcsname + \csname @scr@l@\scr@current@layer @eventrue\endcsname + \csname @scr@l@\scr@current@layer @nonfloatpagefalse\endcsname + \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname + \csname @scr@l@\scr@current@layer @twosidetrue\endcsname + \csname @scr@l@\scr@current@layer @onesidetrue\endcsname +} \DefineFamilyKey[.definelayer]{KOMAarg}{addhoffset}{% \expandafter\edef\csname scr@l@\scr@current@layer @x\endcsname{% \noexpand\dimexpr \unexpanded\expandafter\expandafter\expandafter{% @@ -1173,9 +1247,8 @@ \@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}% \@nameuse{@ps@@everystyle@@backgroundhook}% \@nameuse{@ps@#1@backgroundhook}% - \parbox[t][\headheight][t]{\textwidth}{% + \parbox[b][\headheight][t]{\textwidth}{% \vskip \dimexpr -\topmargin-1in - -\headheight -\ht\strutbox\relax \hskip \dimexpr -\oddsidemargin-1in\relax \strut\makebox[\z@][l]{% @@ -1204,9 +1277,8 @@ \@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}% \@nameuse{@ps@@everystyle@@backgroundhook}% \@nameuse{@ps@#1@backgroundhook}% - \parbox[t][\headheight][t]{\textwidth}{% + \parbox[b][\headheight][t]{\textwidth}{% \vskip \dimexpr -\topmargin-1in - -\headheight -\ht\strutbox\relax \hskip \dimexpr-\evensidemargin-1in\relax \strut\makebox[\z@][l]{% @@ -1298,13 +1370,28 @@ }% }% } -\newcommand*{\ForEachLayerOfPageStyle}[2]{% +\newcommand*{\ForEachLayerOfPageStyle}{% + \@ifstar {\@s@ForEachLayerOfPageStyle}{\@ForEachLayerOfPageStyle}% +} +\newcommand*{\@ForEachLayerOfPageStyle}[2]{% \begingroup \edef\reserved@a{\GetRealPageStyle{#1}}% \def\@elt##1{\ifscrlayer@deactivate@layers\else #2\fi}% \@nameuse{@ps@\reserved@a @layers}% \endgroup } +\newcommand*{\@s@ForEachLayerOfPageStyle}[2]{% + \begingroup + \edef\reserved@a{\GetRealPageStyle{#1}}% + \def\reserved@b{\endgroup}% + \def\@elt##1{% + \l@addto@macro\reserved@b{% + \ifscrlayer@deactivate@layers\else #2\fi + }% + }% + \@nameuse{@ps@\reserved@a @layers}% + \reserved@b +} \newcommand*{\scrlayer@do@page@style@element@layer}[3]{% \begingroup \expandafter\ifx\csname if@scr@l@#3@\if@fcolmade\else non\fi floatpage% @@ -2018,7 +2105,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (final) +%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 89a3c587f65..67cca69968b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -60,7 +60,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,17 +82,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% @@ -130,7 +130,7 @@ \let\do@renewforletter@list\@empty } %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -165,7 +165,7 @@ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ %%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -682,7 +682,7 @@ \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -700,7 +700,9 @@ \advance\@tempcnta by \@ne\relax \edef\@restore@catcode@level{\the\@tempcnta}% \KV@@sp@def\reserved@a{#1}% - \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{% + \edef\reserved@a{% + \noexpand\edef\noexpand\scr@currentlco{\reserved@a}% + \noexpand\InputIfFileExists{\reserved@a.lco}{% \noexpand\PackageInfo{scrletter% }{Letter-Class-Option `#1' loaded}% }{% @@ -712,8 +714,35 @@ to load\noexpand\MessageBreak the file `#1.lco'. But the file isn't available.}% }% + \scr@ifundefinedorrelax{scr@currentlco}{% + \unexpanded{\let\scr@currentlco\relax}% + }{% + \noexpand\def\noexpand\scr@currentlco{\scr@currentlco}% + }% }% - \reserved@a + \if@atdocument + \edef\reserved@a{% + \unexpanded\expandafter{\reserved@a}% + \ifx\RequirePackage\@notprerr + \unexpanded{\let\RequirePackage\@notprerr}% + \else + \noexpand\def\noexpand\RequirePackage{% + \unexpanded\expandafter{\RequirePackage}% + }% + \fi + \ifx\usepackage\@notprerr + \unexpanded{\let\usepackage\@notprerr}% + \else + \noexpand\def\noexpand\Rusepackage{% + \unexpanded\expandafter{\usepackage}% + }% + \fi + }% + \let\RequirePackage\lco@RequirePackage + \let\usepackage\lco@RequirePackage + \expandafter\reserved@a + \else \expandafter\reserved@a + \fi \@tempcnta=\@restore@catcode@level\relax \advance\@tempcnta by \m@ne\relax \edef\@restore@catcode@level{\the\@tempcnta}% @@ -721,6 +750,25 @@ \@restore@catcode \fi } +\newcommand*{\lco@RequirePackage}[2][]{% + \begingroup + \@for\reserved@a:=#2\do{% + \expandafter\KV@@sp@def\expandafter\reserved@a\expandafter{\reserved@a}% + \scr@ifundefinedorrelax{ver@\reserved@a.\scr@pkgextension}{% + \PackageError{scrletter}{% + lco-file `\scr@currentlco' can be used only in preamble% + }{% + The lco-file `\scr@currentlco' uses \string\RequirePackage\space or + \string\usepackage\space to load\MessageBreak + package `\reserved@a'. This means you have to either load + `\reserved@a'\MessageBreak + or lco-file `\scr@currentlco' in the document preamble. + }% + }{}% + }% + \endgroup + \scr@gobbleopt +} \newcommand*{\LoadLetterOptions}[1]{% \begingroup \def\reserved@a{\endgroup}% @@ -1491,7 +1539,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newcommand*{% \letterpagemark }{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 8cc54579154..5b336d88f95 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 @@ %% %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \ProvidesPackage{scrlfile}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% ^^J\@spaces\@spaces\@spaces\@spaces\space\space diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index ee81b329cbf..e72cb65fac8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -71,7 +71,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -93,9 +93,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -\providecommand*{\scr@clsextenstion}{\@clsextenstion} +\providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } @@ -108,12 +108,12 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -207,6 +207,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -240,7 +242,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{draft}{false} \KOMA@DeclareStandardOption {final}{draft=false} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -341,7 +343,7 @@ } %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -607,7 +609,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% @@ -1352,7 +1354,7 @@ parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1883,7 +1885,7 @@ commands} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage`} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -1901,7 +1903,9 @@ \advance\@tempcnta by \@ne\relax \edef\@restore@catcode@level{\the\@tempcnta}% \KV@@sp@def\reserved@a{#1}% - \edef\reserved@a{\noexpand\InputIfFileExists{\reserved@a.lco}{% + \edef\reserved@a{% + \noexpand\edef\noexpand\scr@currentlco{\reserved@a}% + \noexpand\InputIfFileExists{\reserved@a.lco}{% \noexpand\ClassInfo{scrlttr2% }{Letter-Class-Option `#1' loaded}% }{% @@ -1913,8 +1917,35 @@ to load\noexpand\MessageBreak the file `#1.lco'. But the file isn't available.}% }% + \scr@ifundefinedorrelax{scr@currentlco}{% + \unexpanded{\let\scr@currentlco\relax}% + }{% + \noexpand\def\noexpand\scr@currentlco{\scr@currentlco}% + }% }% - \reserved@a + \if@atdocument + \edef\reserved@a{% + \unexpanded\expandafter{\reserved@a}% + \ifx\RequirePackage\@notprerr + \unexpanded{\let\RequirePackage\@notprerr}% + \else + \noexpand\def\noexpand\RequirePackage{% + \unexpanded\expandafter{\RequirePackage}% + }% + \fi + \ifx\usepackage\@notprerr + \unexpanded{\let\usepackage\@notprerr}% + \else + \noexpand\def\noexpand\Rusepackage{% + \unexpanded\expandafter{\usepackage}% + }% + \fi + }% + \let\RequirePackage\lco@RequirePackage + \let\usepackage\lco@RequirePackage + \expandafter\reserved@a + \else \expandafter\reserved@a + \fi \@tempcnta=\@restore@catcode@level\relax \advance\@tempcnta by \m@ne\relax \edef\@restore@catcode@level{\the\@tempcnta}% @@ -1922,6 +1953,25 @@ \@restore@catcode \fi } +\newcommand*{\lco@RequirePackage}[2][]{% + \begingroup + \@for\reserved@a:=#2\do{% + \expandafter\KV@@sp@def\expandafter\reserved@a\expandafter{\reserved@a}% + \scr@ifundefinedorrelax{ver@\reserved@a.\scr@pkgextension}{% + \ClassError{\KOMAClassName}{% + lco-file `\scr@currentlco' can be used only in preamble% + }{% + The lco-file `\scr@currentlco' uses \string\RequirePackage\space or + \string\usepackage\space to load\MessageBreak + package `\reserved@a'. This means you have to either load + `\reserved@a'\MessageBreak + or lco-file `\scr@currentlco' in the document preamble. + }% + }{}% + }% + \endgroup + \scr@gobbleopt +} \newcommand*{\LoadLetterOptions}[1]{% \begingroup \def\reserved@a{\endgroup}% @@ -2692,7 +2742,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2829,7 +2879,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index 655df67691f..a11d3358c31 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -42,7 +42,7 @@ %%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (page head and foot)] \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 17f6056e127..b83c40c3456 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -23,6 +23,7 @@ %% scrkernel-bibliography.dtx (with options: `class,report,option') %% scrkernel-index.dtx (with options: `class,report,option') %% scrkernel-listsandtabulars.dtx (with options: `class,report,option') +%% scrkernel-sections.dtx (with options: `class,report,execoption') %% scrkernel-miscellaneous.dtx (with options: `class,report,execoption') %% scrkernel-compatibility.dtx (with options: `class,report,body') %% scrkernel-fonts.dtx (with options: `class,report,body') @@ -73,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,9 +96,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -\providecommand*{\scr@clsextenstion}{\@clsextenstion} +\providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } @@ -110,21 +111,22 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $ +%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: prepare) \newif\if@openright \@openrightfalse \newcommand*{\scr@dotchangeatdocument}[1]{% @@ -155,6 +157,32 @@ } \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} +\newcommand*{\scr@part@beforeskip}{% + \z@ \@plus 1fil + \baselineskip +} +\newcommand*{\scr@part@innerskip}{20\p@} +\newcommand*{\scr@part@afterskip}{% + \z@ \@plus 1fil +} +\newcommand*{\scr@part@style}{part} +\newcommand*{\partheadstartvskip}{% + \null\vskip-\baselineskip\vskip\@tempskipa +} +\newcommand*{\partheadmidvskip}{% + \par\nobreak + \vskip\@tempskipa +} +\newcommand*{\partheadendvskip}{% + \vskip\@tempskipa\newpage +} +\newcommand*{\partheademptypage}{% + \if@twoside\if@openright + \null% + \thispagestyle{empty}% + \newpage + \fi\fi +} +\newif\if@chapterprefix \newcommand*{\size@chapter}{} \newcommand*{\size@chapterprefix}{\size@chapter} \newcommand*{\scr@chapter@beforeskip}{\z@} @@ -173,7 +201,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -292,6 +320,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -395,7 +425,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -696,7 +726,8 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% {any}{0},% @@ -723,8 +754,6 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{open}{any} -\KOMA@kav@add{.\KOMAClassFileName}{headings}{openany} \KOMA@DeclareStandardOption{openright}{open=right} \KOMA@DeclareStandardOption{openany}{open=any} \KOMA@key{numbers}{% @@ -752,10 +781,8 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod} \KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot} \KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} -\newif\if@chapterprefix \KOMA@key{chapterprefix}[true]{% \KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -826,7 +853,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}% - \renewcommand*{\scr@chapter@beforeskip}{3.3\baselineskip+\parskip}% + \renewcommand*{\scr@chapter@beforeskip}{-3.3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip }% @@ -852,7 +879,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}% - \renewcommand*{\scr@chapter@beforeskip}{3\baselineskip+\parskip}% + \renewcommand*{\scr@chapter@beforeskip}{-3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip }% @@ -878,7 +905,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}% - \renewcommand*{\scr@chapter@beforeskip}{2.8\baselineskip+\parskip}% + \renewcommand*{\scr@chapter@beforeskip}{-2.8\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip }% @@ -936,7 +963,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}% - \renewcommand*{\scr@chapter@beforeskip}{50\p@}% + \renewcommand*{\scr@chapter@beforeskip}{-50\p@}% \renewcommand*{\scr@chapter@afterskip}{40\p@}% \renewcommand*{\scr@chapter@innerskip}{20\p@}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% @@ -961,7 +988,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% @@ -1291,31 +1318,34 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% {noindex}{0},{noidx}{0},% {index}{1},{idx}{1},% - {nolistof}{2},% - {listof}{3},% - {listofnumbered}{4},{numberedlistof}{4},% - {nobibliography}{5},{nobib}{5},% - {bibliography}{6},{bib}{6},% - {bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},% - {numberedbib}{7},% - {flat}{8},{left}{8},% - {graduated}{9},{indent}{9},{indented}{9},% - {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},% - {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},% - {chapterentrywithdots}{12},{chapterentrydotfill}{12}, - {chapterentrywithoutdots}{13},{chapterentryfill}{13}% + {indexnumbered}{2},% + {nolistof}{3},% + {listof}{4},% + {listofnumbered}{5},{numberedlistof}{5},% + {nobibliography}{6},{nobib}{6},% + {bibliography}{7},{bib}{7},% + {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},% + {numberedbib}{8},% + {flat}{9},{left}{9},% + {graduated}{10},{indent}{10},{indented}{10},% + {indenttextentries}{11},{indentunnumbered}{11},{numberline}{11},% + {leftaligntextentries}{12},{leftalignunnumbered}{12},{nonumberline}{12},% + {chapterentrywithdots}{13},{chapterentrydotfill}{13}, + {chapterentrywithoutdots}{14},{chapterentryfill}{14}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \ifcase \@tempa\relax % index + \ifcase \@tempa\relax % noindex \KOMAoptions{index=notoc}% - \or % noindex + \or % index \KOMAoptions{index=totoc}% + \or % indexnumbered + \KOMAoptions{index=numbered}% \or % listof \KOMAoptions{listof=notoc}% \or % nolistof @@ -1552,7 +1582,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1617,10 +1647,18 @@ \newcommand*\bib@heading{% \ifbib@leveldown \section*{\bibname}% - \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi + \scr@ifundefinedorrelax{@mkright}{% + \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi + }{% + \@mkright{\MakeMarkcase{\bibname}}% + }% \else \chapter*{\bibname}% - \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}% + \scr@ifundefinedorrelax{@mkdouble}{% + \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}% + }{% + \@mkdouble{\MakeMarkcase{\bibname}}% + }% \fi }% \newif\ifbib@leveldown @@ -1718,46 +1756,101 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ \newcommand*{\idx@@heading}{% - \chapter* + \ifidx@leveldown + \expandafter\section + \else + \expandafter\chapter + \fi*% } +\newif\ifidx@leveldown \KOMA@key{index}{% \KOMA@set@ncmdkey{index}{@tempa}{% {notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},% - {totoc}{1},{toc}{1},{notnumbered}{1}% + {totoc}{1},{toc}{1},{notnumbered}{1},% + {numbered}{2},{totocnumbered}{2},% + {leveldown}{3},% + {standardlevel}{4}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \ifcase \@tempa\relax + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}% \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}% \renewcommand*{\idx@@heading}{% - \chapter* + \ifidx@leveldown + \expandafter\section + \else + \expandafter\chapter + \fi*% }% \or + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}% \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}% \renewcommand*{\idx@@heading}{% - \addchap + \ifidx@leveldown + \expandafter\addsec + \else + \expandafter\addchap + \fi }% + \or + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}% + \renewcommand*{\idx@@heading}{% + \ifidx@leveldown + \expandafter\section + \else + \expandafter\chapter + \fi + }% + \or + \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}% + \idx@leveldowntrue + \or + \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}% + \idx@leveldownfalse \fi \fi } \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex} \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} +\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: execoption) +\KOMAExecuteOptions{headings=openany} +\KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2201,7 +2294,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2712,7 +2805,8 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% \scr@ifundefinedorrelax{#1numdepth}{% @@ -2736,6 +2830,10 @@ \fi }% } +\BeforeClosingMainAux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% + \string\global\string\@altsecnumformattrue}% + \fi\fi} \newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% \expandafter\@@maybeautodot #1\@stop\endgroup\fi } @@ -2776,7 +2874,7 @@ \newcommand*{\scr@startsection}[6]{% \if@noskipsec \leavevmode \fi \par - \@tempskipa #4\relax + \@tempskipa \glueexpr #4\relax \@afterindenttrue \ifdim \@tempskipa <\z@ \@tempskipa -\@tempskipa \@afterindentfalse @@ -2787,10 +2885,16 @@ \else \addpenalty\@secpenalty\addvspace\@tempskipa \fi - \@ifstar - {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}% - {\csname scr@preto@sect@hook\endcsname - \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}% + \@ifstar {% + \csname scr@preto@ssect@hook\endcsname + \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% + }{% + \csname scr@preto@sect@hook\endcsname + \scr@section@dblarg{% + \@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}% + {\glueexpr #5\relax}{#6}% + }% + }% } \else \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been @@ -2811,9 +2915,14 @@ }% \let\scr@saved@startsection\@startsection \newcommand*{\scr@startsection}[6]{% - \@ifstar - {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}% - {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}% + \@ifstar {% + \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% + {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*% + }{% + \scr@section@dblarg{% + \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}% + {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}}% + }% } \fi \newcommand*{\At@startsection}[1]{% @@ -2909,18 +3018,19 @@ \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% \fi \fi - \ifnum #2>\c@secnumdepth + \let\IfUsePrefixLine\@secondoftwo + \ifnum \numexpr #2\relax>\c@secnumdepth \let\@svsec\@empty \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname \protected@edef\@svsec{\@seccntformat{#1}\relax}% \fi - \@tempskipa #5\relax + \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup #6{% - \@hangfrom{\hskip #3\relax\@svsec}% + \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% \interlinepenalty \@M #8\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% @@ -2931,7 +3041,7 @@ \addtocentrydefault{#1}{##1}{##2}% }% }{}% - \ifnum #2>\c@secnumdepth + \ifnum \numexpr #2\relax>\c@secnumdepth \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% @@ -2940,10 +3050,10 @@ \fi \else \def\@svsechd{% - #6{\hskip #3\relax + #6{\hskip \glueexpr #3\relax \@svsec #8}% - \expandafter\csname #1mark\expandafter\endcsname\expandafter{% - \scr@ds@head}% + \expandafter\csname #1mark\expandafter\endcsname + \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def @@ -2951,7 +3061,7 @@ \addtocentrydefault{#1}{####1}{####2}% }% }{}% - \ifnum #2>\c@secnumdepth + \ifnum \numexpr #2\relax>\c@secnumdepth \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% @@ -2960,7 +3070,8 @@ \fi }% \fi - \@xsect{#5}% + \let\IfUsePrefixLine\scr@IfUsePrefixLineWarning + \@xsect{\glueexpr #5\relax}% } \DefineFamily{KOMAarg} \DefineFamilyMember[.section]{KOMAarg} @@ -2973,10 +3084,23 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa -\BeforeClosingMainAux{% - \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\@altsecnumformattrue}% - \fi\fi} +\newcommand*{\scr@IfUsePrefixLineWarning}[2]{% + \ClassWarning{\KOMAClassName}{% + usage of \string\IfUsePrefixLine\space outside + section command\MessageBreak + style makes no sense, because the behaviour not only\MessageBreak + depends on class options but also on the run-time\MessageBreak + section command style.\MessageBreak + Neither the then-code nor the else-code will be\MessageBreak + executed.\MessageBreak + You may change this and avoid the warning by LOCALLY\MessageBreak + setting \string\IsUsePrefixLine\space to either + \string\@firstoftwo\space or\MessageBreak + \string\@secondoftwo\space before using it% + }% +} +\newcommand*{\IfUsePrefixLine}[2]{} +\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning \newcommand*{\raggedsection}{} \let\raggedsection\raggedright \DefineFamily{KOMAarg} @@ -3045,7 +3169,29 @@ \DeclareSectionCommandStyleLengthOption{section} {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{section}{font}{}{} +\newcommand*{\scr@dsc@def@style@section@command}[1]{% + \@namedef{#1}{% + \scr@startsection{#1}% + {\csname #1numdepth\endcsname}% + {\csname scr@#1@sectionindent\endcsname}% + {\csname scr@#1@beforeskip\endcsname}% + {\csname scr@#1@afterskip\endcsname}% + {% + \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@ + \expandafter\ifnum\scr@v@is@gt{2.96}\relax + \setlength{\parfillskip}{\z@ plus 1fil}% + \fi + \fi + \raggedsection\normalfont\sectfont\nobreak + \usekomafont{#1}% + }% + }% +} \newcommand*{\scr@dsc@style@chapter@options}{} +\DeclareSectionCommandStyleOption{chapter}{pagestyle}{% + \@namedef{\scr@dsc@current pagestyle}{#1}% + \FamilyKeyStateProcessed +}% \DeclareSectionCommandStyleLengthOption{chapter} {beforeskip}{scr@}{@beforeskip} \DeclareSectionCommandStyleLengthOption{chapter} @@ -3054,7 +3200,21 @@ {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{chapter}{font}{}{} \DeclareSectionCommandStyleFontOption{chapter}{prefixfont}{}{prefix} +\newcommand*{\scr@dsc@def@style@chapter@command}[1]{% + \@namedef{#1}{\scr@startchapter{#1}}% + \@namedef{@#1}{\scr@@startchapter{#1}}% + \@namedef{@s#1}{\scr@@startschapter{#1}}% + \@namedef{@make#1head}{\scr@makechapterhead{#1}}% + \@namedef{@makes#1head}{\scr@makeschapterhead{#1}}% + \@namedef{@@make#1head}{\scr@@makechapterhead{#1}}% + \@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}% + \@namedef{set#1preamble}{\set@preamble{#1}}% +} \newcommand*{\scr@dsc@style@part@options}{} +\DeclareSectionCommandStyleOption{part}{pagestyle}{% + \@namedef{\scr@dsc@current pagestyle}{#1}% + \FamilyKeyStateProcessed +}% \DeclareSectionCommandStyleLengthOption{part} {beforeskip}{scr@}{@beforeskip} \DeclareSectionCommandStyleLengthOption{part} @@ -3062,7 +3222,14 @@ \DeclareSectionCommandStyleLengthOption{part} {afterskip}{scr@}{@afterskip} \DeclareSectionCommandStyleFontOption{part}{font}{}{} -\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number} +\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{prefix} +\newcommand*{\scr@dsc@def@style@part@command}[1]{% + \@namedef{#1}{\scr@startpart{#1}}% + \@namedef{@#1}{\scr@@startpart{#1}}% + \@namedef{@s#1}{\scr@@startspart{#1}}% + \@namedef{@end#1}{\scr@@endpart{#1}}% + \@namedef{set#1preamble}{\set@preamble{#1}}% +} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}% @@ -3080,6 +3247,10 @@ }{}% } \newcommand*{\scr@dsc@style@chapter@neededoptionstest}{% + \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% + \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style} + {pagestyle}% + }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% \scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip} {innerskip}% @@ -3101,6 +3272,10 @@ }{}% } \newcommand*{\scr@dsc@style@part@neededoptionstest}{% + \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% + \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style} + {pagestyle}% + }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% \scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip} {innerskip}% @@ -3116,7 +3291,7 @@ \IfExistskomafont{\scr@dsc@current}{}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{}% - \IfExistskomafont{\scr@dsc@current number}{}{% + \IfExistskomafont{\scr@dsc@current prefix}{}{% \scr@declaresectioncommanderror{\scr@dsc@current}{number font} {prefixfont}% }{}% @@ -3131,7 +3306,7 @@ \ifscr@dsc@parametersonlytrue \FamilyKeyStateProcessed }{% - \scr@ifundefinedorrelax{scr@start##1}{% + \scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{% \FamilyKeyStateUnknownValue }{% \@namedef{scr@\scr@dsc@current @style}{##1}% @@ -3207,7 +3382,7 @@ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% \the\@tempskipa}% \else - \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{ + \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{% ##1}% \fi \fi @@ -3263,7 +3438,9 @@ empty section style option% }% \else - \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{% + \scr@ifundefinedorrelax{% + scr@dsc@def@style@\@nameuse{scr@#2@style}@command% + }{% \ClassWarning{\KOMAClassName}{% not defining `\expandafter\string\csname #2\endcsname' due\MessageBreak @@ -3271,28 +3448,7 @@ `\@nameuse{scr@#2@style}'% }% }{% - \expandafter\edef\csname #2\endcsname{% - \expandafter\noexpand - \csname scr@start\csname scr@#2@style\endcsname\endcsname - {#2}% - \expandafter\noexpand\csname #2numdepth\endcsname - \expandafter\noexpand\csname scr@#2@sectionindent\endcsname - \expandafter\noexpand\csname scr@#2@beforeskip\endcsname - \expandafter\noexpand\csname scr@#2@afterskip\endcsname{% - \noexpand\ifdim\noexpand\glueexpr - \expandafter\noexpand\csname scr@#2@beforeskip\endcsname - <\noexpand\z@ - \unexpanded{% - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \setlength{\parfillskip}{\z@ plus 1fil}% - \fi - }% - \noexpand\fi - \unexpanded{% - \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}% - }% - }% - }% + \@nameuse{scr@dsc@def@style@\@nameuse{scr@#2@style}@command}{#2}% }% \fi \@ifundefined{DeclareSectionNumberDepth}{% @@ -3323,6 +3479,7 @@ }{}% }% }% + \let\scr@dsc@current\relax } \newcommand*{\scr@declaresectioncommanderror}[3]{% \ClassError{\KOMAClassName}{% @@ -3617,78 +3774,69 @@ \gdef\thechapter{\@Alph\c@chapter}% \csname appendixmore\endcsname } -\newcommand*{\partnumdepth}{% - \m@ne -} -\newcommand*{\scr@part@beforeskip}{% - \z@ \@plus 1fil + \baselineskip -} -\newcommand*{\partheadstartvskip}{% - \null\vskip-\baselineskip\vskip\@tempskipa -} -\newcommand*{\scr@part@innerskip}{20\p@} -\newcommand*{\partheadmidvskip}{% - \par\nobreak - \vskip\@tempskipa -} -\newcommand*{\scr@part@afterskip}{% - \z@ \@plus 1fil -} -\newcommand*{\partheadendvskip}{% - \vskip\@tempskipa\newpage -} -\newcommand*{\scr@part@style}{part} -\newcommand*{\partheademptypage}{% - \if@twoside\if@openright - \null% - \thispagestyle{empty}% - \newpage - \fi\fi -} -\newcommand\part{\if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\partpagestyle}% +\newcommand*{\scr@startpart}[1]{% + \if@openright\cleardoublepage\else\clearpage\fi + \thispagestyle{\@nameuse{#1pagestyle}}% \if@twocolumn \onecolumn \@tempswatrue \else \@tempswafalse \fi - \@tempskipa=\glueexpr\scr@part@beforeskip\relax + \@tempskipa=\glueexpr\@nameuse{scr@#1@beforeskip}\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \partheadstartvskip - \vbox to\z@{\vss\use@preamble{part@o}\strut\par}% - \vskip-\baselineskip\nobreak% - \SecDef\@part\@spart + \vbox to\z@{\vss\use@preamble{#1@o}\strut\par}% + \vskip-\baselineskip\nobreak + \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname } -\newcommand*{\@part}{} -\def\@part[#1]#2{% +\newcommand{\scr@@startpart}{} +\long\def\scr@@startpart#1[#2]#3{% \ifnum \scr@osectarg=\z@ \@scr@tempswafalse \else - \scr@istest#1=\@nil + \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \fi \fi - \ifnumbered{part}{% - \refstepcounter{part}% + \ifnumbered{#1}{% + \refstepcounter{#1}% \@maybeautodot\thepart% + \expandafter\@maybeautodot\csname the#1\endcsname + \typeout{#1 \csname the#1\endcsname.}% \ifx\scr@ds@tocentry\@empty\else - \addparttocentry{\thepart}{\scr@ds@tocentry}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{\csname the#1\endcsname}{\scr@ds@tocentry}% \fi }{% + \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \typeout{#1 without number}% \ifx\scr@ds@tocentry\@empty\else - \addparttocentry{}{\scr@ds@tocentry}% + \hy@insteadofrefstepcounter{#1}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{}{\scr@ds@tocentry}% \fi }% \begingroup @@ -3696,32 +3844,38 @@ \raggedpart \interlinepenalty \@M \normalfont\sectfont\nobreak - \ifnumbered{part}{% - \size@partnumber{\partformat}% - \setlength{\@tempskipa}{\scr@part@innerskip}% + \ifnumbered{#1}{% + \usekomafont{#1prefix}{\@nameuse{#1format}}% + \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}% \partheadmidvskip }{}% - \size@part{#2}\strut - \ifx\partmark\@gobble - \@mkboth{}{}\par + \usekomafont{part}{#3}\strut + \expandafter\ifx\csname #1mark\endcsname\@gobble + \@mkboth{}{}% \else - \expandafter\partmark\expandafter{\scr@ds@head}\par + \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \fi + \par \endgroup - \@endpart + \@nameuse{@end#1}% } -\newcommand*{\@spart}[1]{% +\newcommand{\scr@@startspart}[2]{% + \begingroup + \let\@mkboth\@gobbletwo + \hy@insteadofrefstepcounter{#1}% + \endgroup \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \raggedpart \interlinepenalty \@M \normalfont - \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par + \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par \endgroup - \@endpart + \@nameuse{@end#1}% } -\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}% - \@tempskipa=\glueexpr\scr@part@afterskip\relax +\newcommand*{\scr@@endpart}[1]{% + \vbox to\z@{\use@preamble{#1@u}\vss}% + \@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \partheadendvskip \partheademptypage @@ -3729,75 +3883,47 @@ \twocolumn \fi } -\newcommand*{\setpartpreamble}{\set@preamble{part}} -\newcommand*{\part@u@preamble}{} -\let\part@u@preamble\relax -\newcommand*{\part@o@preamble}{} -\let\part@o@preamble\relax +\newcommand*{\hy@insteadofrefstepcounter}[1]{} +\let\hy@insteadofrefstepcounter\@gobble +\BeforePackage{hyperref}{% + \let\scr@orig@chapter\@chapter + \let\scr@orig@schapter\@schapter + \let\scr@orig@addchap\@addchap +} +\AfterPackage!{hyperref}{% + \let\@chapter\scr@orig@chapter + \let\@schapter\scr@orig@schapter + \let\@addchap\scr@orig@addchap + \ifx\hy@insteadofrefstepcounter\@gobble + \renewcommand*{\hy@insteadofrefstepcounter}[1]{% + \Hy@MakeCurrentHrefAuto{#1*}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% + }% + \fi +} \newcommand*{\addparttocentry}[2]{% \addtocentrydefault{part}{#1}{#2}% } \newcommand\addpart{% - \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\partpagestyle}% - \if@twocolumn - \onecolumn - \@tempswatrue - \else - \@tempswafalse - \fi - \@tempskipa=\glueexpr\scr@part@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \partheadstartvskip - \vbox to\z@{\vss\use@preamble{part@o}\strut\par}% - \vskip-\baselineskip\nobreak% \SecDef\@addpart\@saddpart } \newcommand*{\@addpart}{} -\def\@addpart[#1]#2{% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \csname phantomsection\endcsname - \ifx\scr@ds@tocentry\@empty\else - \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{% - \scr@ds@tocentry}% - \fi - \@spart{#2}% - \expandafter\addpartmark\expandafter{\scr@ds@head}% +\long\def\@addpart[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \part[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \partnumdepth-1\relax + \reserved@a } -\newcommand*{\@saddpart}{\@spart} -\newcommand*{\partmark}{} -\let\partmark\@gobble - -\newcommand*\addpartmark[1]{% - \begingroup - \expandafter\let\csname if@mainmatter\expandafter\endcsname - \csname iffalse\endcsname - \c@secnumdepth=-2 - \partmark{#1}% - \endgroup +\newcommand{\@saddpart}[1]{% + \part*{#1}% + \addpartmark{}% } -\newcommand*{\parttocdepth}{\m@ne} -\let\parttocdepth\m@ne -\newcommand*{\scr@part@tocindent}{\z@} -\let\scr@part@tocindent\z@ -\newcommand*{\scr@part@tocnumwidth}{2em} \newcommand*\l@part[2]{% \ifnum \c@tocdepth <\parttocdepth \else \addpenalty{-\@highpenalty}% @@ -3830,111 +3956,81 @@ \renewcommand*{\thepart}{\@Roman\c@part} \newcommand*{\partformat}{\partname~\thepart\autodot} \newcommand*\partname{Part} +\newcommand*{\partmark}[1]{\@mkboth{}{}} +\newcommand*\addpartmark[1]{% + \begingroup + \expandafter\let\csname if@mainmatter\expandafter\endcsname + \csname iffalse\endcsname + \c@secnumdepth=\numexpr \partnumdepth-1\relax + \partmark{#1}% + \endgroup +} \newcommand*{\raggedpart}{} \let\raggedpart\centering \newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\scr@fnt@partnumber}{\size@partnumber} +\aliaskomafont{partprefix}{partnumber} \newkomafont{partentry}{\usekomafont{disposition}\large} \newkomafont{partentrypagenumber}{} -\newcommand*{\chapternumdepth}{\z@} -\newif\if@at@twocolumn -\newcommand*\scr@topnewpage{} -\let\scr@topnewpage\@topnewpage -\long\def\@topnewpage[#1]{% - \@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse -} -\newcommand*{\use@chapter@o@preamble}{% - {% - \settoheight{\@tempdima}{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \vbox{\chapterheadstartvskip}% - }% - \settodepth{\@tempdimb}{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \vbox{\chapterheadstartvskip}% - }% - \addtolength{\@tempdima}{\@tempdimb}% - \setbox\z@\vbox{% - \use@preamble{chapter@o}% - }% - \setlength{\@tempdimb}{\ht0}% - \addtolength{\@tempdimb}{\dp0}% - \vbox to \z@{% - \vskip-\baselineskip - \vbox to \@tempdima{% - \vfill - \box\z@ - }% - \vss - }\vskip-\parskip\vskip-\baselineskip - \ifdim \@tempdimb>\@tempdima% - \addtolength{\@tempdimb}{-\@tempdima}% - \ifdim\@tempdimb<\vfuzz - \ClassInfo{\KOMAClassName}{% - preamble before chapter is \the\@tempdimb\space too - high.\MessageBreak - Tolerated without warning because of\MessageBreak - \string\vfuzz\space = \the\vfuzz\space >= \the\@tempdimb - }% - \else - \ClassWarning{\KOMAClassName}{% - preamble before chapter is \the\@tempdimb\space too - high.\MessageBreak - To avoid the overfull \string\vbox\space you may - redefine\MessageBreak - \string\chapterheadstartvskip\space at the preamble of - your\MessageBreak - document. You may also change - \string\setchapterpreamble\MessageBreak - before the command, which generates the message - about\MessageBreak - an overfull \string\vbox - }% - \fi - \fi% - }% -} -\newcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\chapterpagestyle}% +\newcommand*{\scr@startchapter}[1]{% + \if@openright\cleardoublepage\else\clearpage\fi + \thispagestyle{\@nameuse{#1pagestyle}}% \global\@topnum\z@ \@afterindentfalse - \SecDef\@chapter\@schapter + \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname } -\newcommand*{\@chapter}{} -\def\@chapter[#1]#2{% +\newcommand*{\scr@@startchapter}{} +\def\scr@@startchapter#1[#2]#3{% \ifnum \scr@osectarg=\z@ \@scr@tempswafalse \else - \scr@istest#1=\@nil + \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% \fi \fi - \ifnumbered{chapter}{% - \refstepcounter{chapter}% - \@maybeautodot\thechapter - \typeout{\@chapapp\space\thechapter.}% - \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{\thechapter}{\scr@ds@tocentry}% - \fi - }{% + \ifnumbered{#1}{% + \@tempswatrue + }{\@tempswafalse}% + \if@tempswa + \refstepcounter{#1}% + \expandafter\@maybeautodot\csname the#1\endcsname + \typeout{#1 \csname the#1\endcsname.}% \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{}{\scr@ds@tocentry}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{\csname the#1\endcsname}{\scr@ds@tocentry}% \fi - }% - \expandafter\chaptermark\expandafter{\scr@ds@head}% + \else + \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \typeout{#1 without number}% + \ifx\scr@ds@tocentry\@empty\else + \hy@insteadofrefstepcounter{#1}% + \scr@ifundefinedorrelax{add#1tocentry}{% + \addtocentrydefault{#1}% + }{% + \@nameuse{add#1tocentry}% + }{}{\scr@ds@tocentry}% + \fi + \fi + \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifdim \@chapterlistsgap>\z@ \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -3948,28 +4044,57 @@ \fi \if@twocolumn \if@at@twocolumn - \@makechapterhead{#2}% + \@nameuse{@make#1head}{#3}% \else - \@topnewpage[\@makechapterhead{#2}]% + \@topnewpage[\@nameuse{@make#1head}{#3}]% \fi \else - \@makechapterhead{#2}% - \@afterheading + \@nameuse{@make#1head}{#3}% \fi + \@afterheading } -\newcommand*{\@makechapterhead}[1]{% - \use@chapter@o@preamble - \@@makechapterhead{#1}% - \use@preamble{chapter@u}% +\newcommand*{\scr@@startschapter}[2]{% + \begingroup + \let\@mkboth\@gobbletwo + \hy@insteadofrefstepcounter{#1}% + \endgroup + \if@twocolumn + \if@at@twocolumn + \@nameuse{@makes#1head}{#2}% + \else + \@topnewpage[\@nameuse{@makes#1head}{#2}]% + \fi + \else + \@nameuse{@makes#1head}{#2}% + \fi + \@afterheading } -\newcommand*{\@@makechapterhead}[1]{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax +%% \begin{macro}{\if@at@twocolumn} +\newif\if@at@twocolumn +\newcommand*\scr@topnewpage{} +\let\scr@topnewpage\@topnewpage +\long\def\@topnewpage[#1]{% + \@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse +} +\newcommand*{\scr@makechapterhead}[2]{% + \use@chapter@o@preamble{#1}% + \@nameuse{@@make#1head}{#2}% + \use@preamble{#1@u}% +} +\newcommand*{\scr@makeschapterhead}[2]{% + \use@chapter@o@preamble{#1}% + \@nameuse{@@makes#1head}{#2}% + \use@preamble{#1@u}% +} +\newcommand*{\scr@@makechapterhead}[2]{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usefontofkomafont{chapter}% - \def\IfUseNumber{\ifnumbered{chapter}}% + \normalfont\sectfont\nobreak\nobreak + \usefontofkomafont{#1}% + \def\IfUseNumber{\ifnumbered{#1}}% \if@chapterprefix \raggedchapter \let\IfUsePrefixLine\@firstoftwo @@ -3980,15 +4105,17 @@ \fi \@tempa{% \IfUseNumber{% - \usekomafont{chapter}{% + \usekomafont{#1}{% \IfUsePrefixLine{% - {\usekomafont{chapterprefix}{% - \chapterformat - \setlength{\@tempskipa}{\scr@chapter@innerskip}% + {\usekomafont{#1prefix}{% + \csname #1format\endcsname + \setlength{\@tempskipa}{% + \csname scr@#1@innerskip\endcsname + }% \chapterheadmidvskip }}% }{% - \chapterformat + \csname #1format\endcsname }% }% }{}% @@ -3996,19 +4123,79 @@ {% \IfUsePrefixLine{}{\raggedchapter}% \interlinepenalty \@M - \usekomafont{chapter}{#1}\par + \usekomafont{#1}{#2}\par }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \scr@chapter@afterskip\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } -\newcommand*{\setchapterpreamble}{\set@preamble{chapter}} -\newcommand*{\chapter@u@preamble}{} -\let\chapter@u@preamble\relax -\newcommand*{\chapter@o@preamble}{} -\let\chapter@o@preamble\relax +\newcommand*{\scr@@makeschapterhead}[2]{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \chapterheadstartvskip + {% + \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% + \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% + \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + }% + \nobreak\par\nobreak + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \chapterheadendvskip +} +\newcommand*{\use@chapter@o@preamble}[1]{% + {% + \settoheight{\@tempdima}{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \vbox{\chapterheadstartvskip}% + }% + \settodepth{\@tempdimb}{% + \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \vbox{\chapterheadstartvskip}% + }% + \addtolength{\@tempdima}{\@tempdimb}% + \setbox\z@\vbox{% + \use@preamble{#1@o}% + }% + \setlength{\@tempdimb}{\ht0}% + \addtolength{\@tempdimb}{\dp0}% + \vbox to \z@{% + \vskip-\baselineskip + \vbox to \@tempdima{% + \vfill + \box\z@ + }% + \vss + }\vskip-\parskip\vskip-\baselineskip + \ifdim \@tempdimb>\@tempdima% + \addtolength{\@tempdimb}{-\@tempdima}% + \ifdim\@tempdimb<\vfuzz + \ClassInfo{\KOMAClassName}{% + preamble before #1 is \the\@tempdimb\space to high.\MessageBreak + Tolerated without warning because of\MessageBreak + \string\vfuzz\space = \the\vfuzz\space >= \the\@tempdimb + }% + \else + \ClassWarning{\KOMAClassName}{% + preamble before #1 is \the\@tempdimb\space to high.\MessageBreak + To avoid the overfull \string\vbox\space you may + change\MessageBreak + the `beforeskip' value using + \string\RedeclareSectionCommand\MessageBreak + at the preamble of your document.\MessageBreak + You may also change \string\setchapterpreamble\MessageBreak + before the command, which generates the message + about\MessageBreak + an overfull \string\vbox + }% + \fi + \fi% + }% +} \newcommand*{\addchaptertocentry}[2]{% \addtocentrydefault{chapter}{#1}{#2}% \if@chaptertolists @@ -4020,89 +4207,24 @@ \@ifundefined{float@addtolists}{}{\scr@float@addtolists@warning}% \fi } -\newcommand*{\@schapter}[1]{% - \if@twocolumn - \if@at@twocolumn - \@makeschapterhead{#1}% - \else - \@topnewpage[\@makeschapterhead{#1}]% - \fi - \else - \@makeschapterhead{#1}% - \@afterheading - \fi -} -\newcommand*{\@@makeschapterhead}[1]{% - \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \chapterheadstartvskip - {% - \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par - }% - \nobreak\par\nobreak - \@tempskipa=\glueexpr \scr@chapter@afterskip\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi - \chapterheadendvskip% -} -\newcommand*{\@makeschapterhead}[1]{% - \use@chapter@o@preamble - \@@makeschapterhead{#1}% - \use@preamble{chapter@u}% -} \newcommand\addchap{% - \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\chapterpagestyle}% - \global\@topnum\z@ - \@afterindentfalse - \SecDef\@addchap\@saddchap% + \SecDef\@addchap\@saddchap }% \newcommand*{\@addchap}{}% -\def\@addchap[#1]#2{% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \@schapter{#2}% - \ifx\scr@ds@tocentry\@empty\else - \addchaptertocentry{}{\scr@ds@tocentry}% - \fi - \ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax - \ifdim \@chapterlistsgap>\z@ - \doforeachtocfile{% - \iftocfeature{\@currext}{chapteratlist}{% - \addtocontents{\@currext}{\protect\addvspace{\@chapterlistsgap}}% - }{}% - }% - \@ifundefined{float@addtolists}{}{% - \scr@float@addtolists@warning - \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% - }% - \fi - \fi - \expandafter\addchapmark\expandafter{\scr@ds@head}% +\long\def\@addchap[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \chapter[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \chapternumdepth-1\relax + \reserved@a +} +\newcommand{\@saddchap}[1]{% + \chapter*{#1}% + \addchapmark{}% }% -\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}% -\newcommand*{\chaptertocdepth}{\z@} -\let\chaptertocdepth\z@ -\newcommand*{\scr@chapter@tocindent}{\z@} -\let\scr@chapter@tocindent\z@ -\newcommand*{\scr@chapter@tocnumwidth}{1.5em} \newcommand*\l@chapter[2]{% \ifnum \c@tocdepth <\chaptertocdepth \else \ifnum \lastpenalty<20010 @@ -4167,10 +4289,13 @@ obligatory instead of an optional argument. Use that\MessageBreak new command% }% - \if@chapterprefix\chapapp#1\fi + \chapappifchapterprefix{#1}% } \newcommand*{\chapappifchapterprefix}[1]{% - \if@chapterprefix\chapapp#1\fi + \IfChapterUsesPrefixLine{\chapapp#1}{}% +} +\newcommand*{\IfChapterUsesPrefixLine}{% + \if@chapterprefix\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi } \newcommand*{\chapapp}{\@chapapp} \newcommand*\@chapapp{\chaptername} @@ -4179,7 +4304,7 @@ \begingroup \expandafter\let\csname if@mainmatter\expandafter\endcsname \csname iffalse\endcsname - \c@secnumdepth=\m@ne + \c@secnumdepth=\numexpr \chapternumdepth-1\relax \chaptermark{#1}% \endgroup } @@ -4189,33 +4314,21 @@ \newkomafont{chapterentry}{\usekomafont{disposition}} \newkomafont{chapterentrypagenumber}{} \newkomafont{chapterentrydots}{\normalfont} -\newcommand*\addsec{\SecDef\@addsec\@saddsec} +\newcommand\addsec{\SecDef\@addsec\@saddsec} \newcommand*{\@addsec}{} -\def\@addsec[#1]#2{\section*{#2}% - \ifnum \scr@osectarg=\z@ - \@scr@tempswafalse - \else - \scr@istest#1=\@nil - \fi - \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}% - \else - \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}% - \or - \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}% - \fi - \fi - \ifx\scr@ds@tocentry\@empty\else - \addsectiontocentry{}{\scr@ds@tocentry}% - \fi - \expandafter\addsecmark\expandafter{\scr@ds@head}% +\def\@addsec[#1]#2{% + \edef\reserved@a{% + \unexpanded{% + \section[{#1}]{#2}% + \c@secnumdepth= + }\the\c@secnumdepth\relax + }% + \c@secnumdepth=\numexpr \sectionnumdepth-1\relax + \reserved@a +} +\newcommand*{\@saddsec}[1]{% + \section*{#1}\addsecmark{}% } -\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}} \newkomafont{minisec}{} \newcommand\minisec[1]{% \expandafter\ifnum\scr@v@is@lt{3.13a}\relax @@ -4281,7 +4394,7 @@ } \newcommand*\addsecmark[1]{% \begingroup - \c@secnumdepth=\m@ne + \c@secnumdepth=\numexpr \sectionnumdepth-1\relax \sectionmark{#1}% \endgroup } @@ -4290,6 +4403,21 @@ \newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} +\DeclareSectionCommand[% + style=part,% + level=\m@ne,% + pagestyle=plain,% + toclevel=\m@ne,% + tocindent=\z@,% + tocnumwidth=2em +]{part} +\DeclareSectionCommand[% + style=chapter,% + level=\z@,% + pagestyle=plain,% + tocindent=\z@,% + tocnumwidth=1.5em +]{chapter} \DeclareSectionCommand[% style=section,% level=1,% @@ -4519,7 +4647,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4614,8 +4742,6 @@ \renewcommand*{\sectionmark}[1]{}% } \newcommand*{\titlepagestyle}{plain} -\newcommand*{\partpagestyle}{plain} -\newcommand*{\chapterpagestyle}{plain} \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} @@ -5305,7 +5431,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ \doforeachtocfile[float]{% \setuptoc{\@currext}{chapteratlist}% } @@ -5443,7 +5569,7 @@ \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} \newcommand*\listoftables{\listoftoc{lot}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ \newcommand*\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -5528,7 +5654,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5537,7 +5663,19 @@ \twocolumn[% \@chaptertolistsfalse \idx@@heading{\indexname}]% - \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}% + \ifidx@leveldown + \scr@ifundefinedorrelax{@mkright}{% + \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi + }{% + \@mkright{\MakeMarkcase{\indexname}}% + }% + \else + \scr@ifundefinedorrelax{@mkdouble}{% + \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}% + }{% + \@mkdouble{\MakeMarkcase{\indexname}}% + }% + \fi } \newenvironment{theindex}{% \if@twocolumn diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index cc29d8ad46e..805331f88f3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 91955f78466..c43550fe868 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 836b30d9e52..82dd886bf60 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index 6d25e20f587..81b6d291eea 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \newif\if@Hxii diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index f042072c113..90bbc5678ed 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \ProvidesFile{setspace.hak}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $ +%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 2a2e8d9070b..522e9af8727 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -39,10 +39,10 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $ +%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (handling toc-files)% ] @@ -571,7 +571,7 @@ \tb@ifvalueisnotempty{name}{#1}{\edef\tb@nt@name{#1}}% } \define@key{tocbasic}{listname}{% - \tb@ifvalueisnotempty{listname}{#1}{\edef\tb@nt@listname{#1}}% + \tb@ifvalueisnotempty{listname}{#1}{\def\tb@nt@listname{#1}}% } \newif\iftb@forcenames \define@key{tocbasic}{forcenames}[true]{% @@ -614,10 +614,10 @@ \def\tb@nt@floatpos{tbp}% \def\tb@nt@ext{#2}% \def\tb@nt@type{#2}% - \def\tb@nt@types{\tb@nt@type s}% + \let\tb@nt@types\relax \def\tb@nt@owner{float}% - \def\tb@nt@name{\expandafter\MakeUppercase\tb@nt@type}% - \def\tb@nt@listname{List of \expandafter\MakeUppercase\tb@nt@types}% + \def\tb@nt@name{\expandafter\protect\expandafter\MakeUppercase\tb@nt@type}% + \let\tb@nt@listname\relax \def\tb@nt@level{1}% \def\tb@nt@indent{1em}% \def\tb@nt@hang{1.5em}% @@ -628,11 +628,18 @@ \expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}% \expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext \addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}% + \scr@ifundefinedorrelax{tb@nt@types}{% + \edef\tb@nt@types{\tb@nt@type s}% + }{}% + \scr@ifundefinedorrelax{tb@nt@listname}{% + \protected@edef\tb@nt@listname{List of \protect\MakeUppercase\tb@nt@types}% + }{}% \@ifundefined{\tb@nt@type name}{% - \expandafter\let\csname \tb@nt@type name\endcsname\tb@nt@name + \expandafter\protected@edef\csname \tb@nt@type name\endcsname{\tb@nt@name}% }{% \iftb@forcenames - \expandafter\let\csname \tb@nt@type name\endcsname\tb@nt@name + \expandafter\protected@edef\csname \tb@nt@type name\endcsname + {\tb@nt@name}% \fi }% \@ifundefined{list\tb@nt@type name}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 777c1136df4..9f3d0233d9e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,16 +67,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (type area)] \typeout{% Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J% @@ -85,9 +85,9 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Markus Kohm, 1994-^^J% } -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -673,7 +673,7 @@ \KOMA@ifkey{usegeometry}{@ta@usegeometry} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \newcommand*{\scr@ta@compatibility}{\scr@compatibility} @@ -773,6 +773,8 @@ \@namedef{scr@v@3.16}{14} \@namedef{scr@v@3.17}{15} \@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} \@namedef{scr@v@last}{15} \newcommand*{\scr@ta@v@is@lt}[1]{% \scr@ta@compatibility<\@nameuse{scr@v@#1} @@ -786,7 +788,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1043,6 +1045,9 @@ \edef\reserved@a{% \noexpand\newcommand*{\unexpanded{#1}}{% \noexpand\scr@grouplevel@test\unexpanded{#1}% + \noexpand\csname scr@storeareas@before@hook\noexpand\endcsname + \unexpanded\expandafter\expandafter\expandafter{% + \csname scr@storeareas@before@current@hook\endcsname}% \noexpand\paperheight=\the\paperheight\space \noexpand\paperwidth=\the\paperwidth\space \noexpand\topmargin=\the\topmargin\space @@ -1076,10 +1081,26 @@ \unexpanded\expandafter\expandafter\expandafter{% \csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname}% }% + \unexpanded\expandafter\expandafter\expandafter{% + \csname scr@storeareas@after@current@hook\endcsname}% + \noexpand\csname scr@storeareas@after@hook\noexpand\endcsname }% }% \reserved@a } +\newcommand*{\BeforeRestoreareas}{% + \@ifstar{\scr@storeareashook{before@current}}{\scr@storeareashook{before}}% +} +\newcommand*{\AfterRestoreareas}{% + \@ifstar{\scr@storeareashook{after@current}}{\scr@storeareashook{after}}% +} +\newcommand*{\scr@storeareashook}[2]{% + \expandafter\l@addto@macro\csname scr@storeareas@#1@hook\endcsname{#2}% +} +\newcommand*{\scr@storeareas@before@hook}{} +\newcommand*{\scr@storeareas@before@current@hook}{} +\newcommand*{\scr@storeareas@after@hook}{} +\newcommand*{\scr@storeareas@after@current@hook}{} \newcommand*{\ta@divfor}[1]{% \if@mincl \PackageInfo{typearea}{% @@ -1483,7 +1504,7 @@ \fi } \typearea[current]{current} -%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 76315184ae1..864f3297486 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% visualize% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -79,8 +79,8 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $ -\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}} +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ +\RequirePackage{eso-pic} \newcommand*{\showfields}[1]{% \AtBeginLetter{% \begingroup @@ -294,7 +294,7 @@ {\useplength{refwidth}}{-1.5\baselineskip}% \endgroup } -\@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}} +\RequirePackage{graphicx} \newcommand*{\showenvelope}{} \newcommand*{\@@showenvelope}{} \newcommand*{\@@@showenvelope}{} -- cgit v1.2.3