From 52b5238ab893a61a4e2c64843d074cd296836359 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Apr 2020 21:21:23 +0000 Subject: koma-script (21apr20) git-svn-id: svn://tug.org/texlive/trunk@54825 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 8 +- .../texmf-dist/tex/latex/koma-script/DIN5008A.lco | 12 +- .../texmf-dist/tex/latex/koma-script/DIN5008B.lco | 12 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 8 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 10 +- 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 | 16 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 10 +- .../texmf-dist/tex/latex/koma-script/nomencl.hak | 12 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 168 +-- .../tex/latex/koma-script/scrarticle.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 72 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 163 +-- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 39 +- .../tex/latex/koma-script/scrfontsizes.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 14 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 14 +- .../tex/latex/koma-script/scrlayer-scrpage.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrletter.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 39 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 54 +- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 1088 -------------------- .../texmf-dist/tex/latex/koma-script/scrreport.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 165 +-- .../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/scrwfile.sty | 4 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../tex/latex/koma-script/standardsections.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 14 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 61 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 10 +- 51 files changed, 626 insertions(+), 1541 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/koma-script/scrpage2.sty (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 7e8438b0314..270ce66f578 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% DIN% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco index d8b8d8f6790..1b7da040d04 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,7 +73,7 @@ \LoadLetterOption{% DINmtext% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@setplength{toaddrindent}{% 5mm} @@ -134,7 +134,7 @@ \space\string\areaset[5mm]{% \the\dimexpr \paperwidth-45mm\relax}{% \the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak - to follow the norm + to follow the norm% }% \fi \ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else @@ -146,7 +146,7 @@ document does not conform DIN5008.\MessageBreak You shoud use, e.g.,\MessageBreak \space\string\KOMAoption{parskip}{full}\MessageBreak - to follow the norm + to follow the norm% }% \fi \endgroup diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco index 74ef56db575..5db32016da4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,7 +73,7 @@ \LoadLetterOption{% DIN% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@setplength{toaddrindent}{% 5mm} @@ -132,7 +132,7 @@ \space\string\areaset[5mm]{% \the\dimexpr \paperwidth-45mm\relax}{% \the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak - to follow the norm + to follow the norm% }% \fi \ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else @@ -144,7 +144,7 @@ document does not conform DIN5008.\MessageBreak You shoud use, e.g.,\MessageBreak \space\string\KOMAoption{parskip}{full}\MessageBreak - to follow the norm + to follow the norm% }% \fi \endgroup diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 83ee09b30ae..99efd0c23ba 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% DINmtext% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 168dd33a197..8b3b39becd8 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% KOMAold% @@ -80,7 +80,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -218,7 +218,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: body) \def\setpresigskip{\@setplength{sigbeforevskip}} \endinput diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index a2579a73a21..67b5660b712 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Kaku,LATE,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index d98fcb2d653..c8b4527439d 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% NF% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 6232da97fe1..bb5c8a7eeac 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,EARLY,HIGH,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index fda2ec98f0a..8586be80aff 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,EARLY,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index 8c8da52cf78..ee876a3d0be 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,LATE,HIGH,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index 3014348b382..07f1cfa6683 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,LATE,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index cfa8e6b4c72..ab800f67bfe 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,RIGHT,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 07fc912f6a5..ab8e0196b9c 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% SN% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 65c503f4211..f93fc1795ff 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% SNleft% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 1d5ef05106b..07b85c66de9 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9 @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index 906c2ec1468..574fc2bdf63 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9DW @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index 678f98a4638..c06564a3b4e 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{float.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 dc79b3405ec..c56e466351b 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{floatrow.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 6ccb73ea1a0..c72db0ec584 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{hyperref.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z 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 0be8a9d7e0a..a7e81f73d99 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{listings.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% @@ -99,6 +99,12 @@ }% }% }% + \expandafter\def\expandafter\lst@makecaption\expandafter{% + \expandafter\def\expandafter\@captype\expandafter{% + \expandafter l\expandafter s\expandafter t\expandafter l% + \expandafter i\expandafter s\expandafter t\expandafter i% + \expandafter n\expandafter g\expandafter}\lst@makecaption + }% \let\scr@do@hack@listings\relax } \scr@ifexpected{\lstlistoflistings}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak index 13b412e0d10..6bc1707c667 100644 --- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{lscape.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \xpatchcmd{\landscape}{\textheight=\vsize}{% \if@scrhack@lscape \scrh@LT@textheight=\vsize diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak index e03a7d57897..56fc715381e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak +++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{nomencl.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package nomencl)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \RequirePackage{tocbasic} \@ifpackagelater{nomencl}{2019/01/01}{% \PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}% @@ -138,7 +138,7 @@ release of package `nomencl'.\MessageBreak Mostly this patch does work too, but it also could\MessageBreak break `nomencl`. If this happens, please deactivate\MessageBreak - the `nomencl` hack of `scrhack` + the `nomencl` hack of `scrhack`% }% }{% \PackageWarning{scrhack}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 2d0265097a6..a8f81c4b206 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -6,7 +6,7 @@ %% %% scrkernel-version.dtx (with options: `class,article') %% scrkernel-basics.dtx (with options: `class,load') -%% scrkernel-listsof.dtx (with options: `class,book,prepare') +%% scrkernel-listsof.dtx (with options: `class,article,prepare') %% scrkernel-tocstyle.dtx (with options: `class,article,prepare') %% scrkernel-sections.dtx (with options: `class,article,prepare') %% scrkernel-compatibility.dtx (with options: `class,article,init') @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,29 +121,26 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script ] -\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% -\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% \expandafter\addtotoclist \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } -\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -195,7 +192,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -272,10 +269,11 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -350,7 +348,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -406,7 +404,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) @@ -494,7 +492,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -557,7 +555,8 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \PassOptionsToPackage{BCOR#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{BCOR#2}{typearea}}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -566,7 +565,8 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \PassOptionsToPackage{DIV#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{DIV#2}{typearea}}% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -814,7 +814,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -1323,7 +1323,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1808,17 +1808,17 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2295,13 +2295,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \def\today{\ifcase\month\or 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 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2314,37 +2314,39 @@ \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] \if@scr@emulatestandardclasses - \ifnum\@lastdiv=\z@ - \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax} - \ifdim \f@size\p@<10.5\p@ - \setlength{\@tempdimb}{345\p@} - \else\ifdim \f@size\p@<11.5\p@ - \setlength{\@tempdimb}{360\p@} - \else - \setlength{\@tempdimb}{390\p@} - \fi - \fi - \if@twocolumn - \ifdim\@textwidth>2\@tempdimb\relax - \setlength{\textwidth}{2\@tempdimb} + \Ifstr{\@lastdiv}{areaset}{}{% + \ifnum\@lastdiv=\z@ + \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax} + \ifdim \f@size\p@<10.5\p@ + \setlength{\@tempdimb}{345\p@} + \else\ifdim \f@size\p@<11.5\p@ + \setlength{\@tempdimb}{360\p@} + \else + \setlength{\@tempdimb}{390\p@} + \fi \fi - \else - \ifdim\textwidth>\@tempdimb - \setlength{\textwidth}{\@tempdimb} + \if@twocolumn + \ifdim\@textwidth>2\@tempdimb\relax + \setlength{\textwidth}{2\@tempdimb} + \fi + \else + \ifdim\textwidth>\@tempdimb + \setlength{\textwidth}{\@tempdimb} + \fi \fi + \@settopoint\textwidth + \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax} + \divide\@tempdima\baselineskip + \@tempcnta=\@tempdima + \setlength{\textheight}{\@tempcnta\baselineskip} + \addtolength{\textheight}{\topskip} + \edef\reserved@a{% + \noexpand\@areasetadvancedtrue + \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}% + \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi + }\reserved@a \fi - \@settopoint\textwidth - \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax} - \divide\@tempdima\baselineskip - \@tempcnta=\@tempdima - \setlength{\textheight}{\@tempcnta\baselineskip} - \addtolength{\textheight}{\topskip} - \edef\reserved@a{% - \noexpand\@areasetadvancedtrue - \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}% - \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi - }\reserved@a - \fi + }% \fi %%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: body) @@ -2951,7 +2953,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \providecommand*{\ifnumbered}{% @@ -3280,7 +3282,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@sect\space}% + of \string\@sect}% \fi \def\@sect#1#2#3#4#5#6[#7]#8{% \ifnum \scr@osectarg=\z@ @@ -3452,7 +3454,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@ssect\space}% + of \string\@ssect}% \fi \def\@ssect#1#2#3#4#5{% \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% @@ -3526,7 +3528,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@xsect\space}% + of \string\@xsect}% \fi \def\@xsect#1{% \@ifundefined{scr@sect@runin}{% @@ -3699,6 +3701,9 @@ }% }% } +\newcommand*{\scr@dsc@style@chapter@subcommands}[1]{% + @#1,@s#1,@make#1head,@makes#1head,@@make#1head,@@makes#1head,set#1preamble% +} \newcommand*{\scr@dsc@style@part@options}{} \DeclareSectionCommandStyleFuzzyOption{part} {afterindent}{scr@}{@afterindent} @@ -3714,6 +3719,9 @@ \@namedef{@#1}{\scr@@startpart{#1}}% \@namedef{@s#1}{\scr@@startspart{#1}}% } +\newcommand*{\scr@dsc@style@part@subcommands}[1]{% + @#1,@s#1,@end#1,set#1preamble% +} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommandwarning{\scr@dsc@current}% @@ -4173,8 +4181,38 @@ \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{% \@tempswafalse \edef\reserved@b{\expandafter\string\csname \reserved@a\endcsname}% - } - } + }% + }% + \if@tempswa + \expandafter\let\expandafter\scr@dsc@current + \csname scr@tso@##2@style\endcsname + \DefineFamilyKey[.dsc]{KOMAarg}{style}{% + \edef\scr@dsc@current{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}% + \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}% + \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}% + \RelaxFamilyKey[.dsc]{KOMAarg}{style}% + \@tempswatrue + \@ifundefined{scr@dsc@current}{}{% + \scr@ifundefinedorrelax{scr@dsc@style@\scr@dsc@current @subcommands}{% + }{% + \edef\reserved@b{% + \csname scr@dsc@style@\scr@dsc@current @subcommands\endcsname{#2}% + }% + \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=% + \reserved@b\do{% + \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{% + \@tempswafalse + \edef\reserved@b{% + \expandafter\string\csname \reserved@a\endcsname}% + }% + }% + } + }% + \let\scr@dsc@current\relax + \fi \if@tempswa \DeclareSectionCommand[{#1}]{#2}% \else @@ -4776,7 +4814,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -6170,7 +6208,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -6244,7 +6282,7 @@ You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak Definition of \string\toc@heading\space may be removed from\MessageBreak - KOMA-Script soon, so it should not be used + KOMA-Script soon, so it should not be used% }% \section*{\contentsname}% \@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}% @@ -6283,7 +6321,7 @@ Loading of package `scrhack' may help to\MessageBreak avoid this warning, if you are using a\MessageBreak a package that still implements the\MessageBreak - deprecated \string\float@listhead\space interface + deprecated \string\float@listhead\space interface% }% } \newcommand*{\scr@float@addtolists@warning}{% @@ -6300,7 +6338,7 @@ Loading of package `scrhack' may help to\MessageBreak avoid this warning, if you are using a\MessageBreak a package that still implements the\MessageBreak - deprecated \string\float@addtolist\space interface + deprecated \string\float@addtolist\space interface% }% \global\let\scr@float@addtolists@warning\relax } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index 68c382d43e0..ebf2c4fcced 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] \let\ClassName\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 08516529225..1349e8b938d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (% KOMA-Script-independent @@ -110,6 +110,16 @@ \expandafter\reserved@a\expandafter{\reserved@b} \RequirePackage{keyval} \providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} +\newcommand{\rloop}[1]{} +\long\def\rloop#1\repeat{% + \ifdefined\iterate + \edef\iterate{\unexpanded{#1\relax\expandafter\iterate\fi\def\iterate}% + {\unexpanded\expandafter{\iterate}}}% + \else + \def\iterate{#1\relax\expandafter\iterate\fi\let\iterate\relax}% + \fi + \iterate +} \newcommand{\scr@ifundefinedorrelax}[1]{% \ifcsname #1\endcsname \expandafter\ifx\csname #1\endcsname\relax @@ -454,7 +464,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: option) \DefineFamily{KOMA} \DefineFamilyMember{KOMA} @@ -466,13 +476,13 @@ \RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}% } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) %%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ \RequirePackage{scrlfile}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -1255,12 +1265,12 @@ }% }% } -\newcommand{\scr@ifpdftex}{\ifnotundefined{pdftexversion}} -\newcommand{\scr@ifluatex}{\ifnotundefined{luatexversion}} +\newcommand{\scr@ifpdftex}{\Ifnotundefined{pdftexversion}} +\newcommand{\scr@ifluatex}{\Ifnotundefined{luatexversion}} \newcommand*{\scr@ifpdforluatex}{% \scr@ifpdftex{\@firstoftwo}{\scr@ifluatex{\@firstoftwo}{\@secondoftwo}}% } -\newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}} +\newcommand{\scr@ifVTeX}{\Ifnotundefined{VTeXversion}} \newcommand{\scr@ifpdfoutput}{% \scr@ifundefinedorrelax{pdfoutput}{% \scr@ifundefinedorrelax{outputmode}{% @@ -1299,14 +1309,14 @@ } \newcommand*{\Ifpdfoutput}{\scr@ifpdfoutput} \newcommand*{\scr@ifpsoutput}{% - \ifnotundefined{if@dvips}{% + \Ifnotundefined{if@dvips}{% \if@dvips \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi }{% - \ifnotundefined{OpMode}{% + \Ifnotundefined{OpMode}{% \ifnum\OpMode=2 \expandafter\@firstoftwo \else @@ -1933,7 +1943,7 @@ Setting this command to a non empty\MessageBreak value for option `#2' of\MessageBreak family `#1' is deprecated,\MessageBreak - but has been found + but has been found% }% \fi } @@ -2247,18 +2257,20 @@ but do-hook specificators must not be empty.% }% }{% - \let\scr@hookname\relax - \edef\scr@hookargument{#1}% - \loop - \scr@hooksplit@specificator\scr@hookname\scr@hookargument - \scr@hookargument - \begingroup\edef\reserved@a{% - \unexpanded{\endgroup #2}{\scr@hookname}{\scr@hookargument}% - }\reserved@a - \ifx\scr@hookargument\@empty\else - \repeat - \let\scr@hookname\relax - \let\scr@hookargument\relax + \begingroup + \def\scr@hookrun{\endgroup}% + \let\scr@hookname\relax + \edef\scr@hookargument{#1}% + \rloop + \scr@hooksplit@specificator\scr@hookname\scr@hookargument + \scr@hookargument + \edef\scr@hookrun{% + \unexpanded\expandafter{\scr@hookrun}% + \unexpanded{#2}{\scr@hookname}{\scr@hookargument}% + }% + \ifx\scr@hookargument\@empty\else + \repeat + \scr@hookrun }% } \newcommand*{\SplitDoHook}[3]{% @@ -2331,7 +2343,7 @@ }% }% } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname @@ -2539,6 +2551,7 @@ \let#2\relax \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% + \let\renewcommand\providecommand \csname extras\scr@reserved@a\endcsname \csname captions\scr@reserved@a\endcsname \ifx #2\relax \aftergroup\@firstofone @@ -2582,6 +2595,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2629,6 +2643,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2679,6 +2694,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2732,6 +2748,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname captions\scr@reserved@a\endcsname @@ -2781,6 +2798,7 @@ \else \begingroup \let#2\relax + \let\renewcommand\providecommand \expandafter\providecommand\expandafter*% \csname abx@extras@\scr@reserved@a\endcsname{}% \csname extras\scr@reserved@a\endcsname diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index f9a0260b9cb..b3dea2ee566 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -143,7 +143,7 @@ \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -219,7 +219,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -296,10 +296,11 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -373,7 +374,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -429,7 +430,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) @@ -517,7 +518,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -580,7 +581,8 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \PassOptionsToPackage{BCOR#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{BCOR#2}{typearea}}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -589,7 +591,8 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \PassOptionsToPackage{DIV#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{DIV#2}{typearea}}% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -834,7 +837,7 @@ {notitlepage}{titlepage=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1479,7 +1482,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -2012,18 +2015,18 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2507,13 +2510,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \def\today{\ifcase\month\or 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 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2526,37 +2529,39 @@ \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] \if@scr@emulatestandardclasses - \ifnum\@lastdiv=\z@ - \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax} - \ifdim \f@size\p@<10.5\p@ - \setlength{\@tempdimb}{345\p@} - \else\ifdim \f@size\p@<11.5\p@ - \setlength{\@tempdimb}{360\p@} - \else - \setlength{\@tempdimb}{390\p@} - \fi - \fi - \if@twocolumn - \ifdim\@textwidth>2\@tempdimb\relax - \setlength{\textwidth}{2\@tempdimb} + \Ifstr{\@lastdiv}{areaset}{}{% + \ifnum\@lastdiv=\z@ + \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax} + \ifdim \f@size\p@<10.5\p@ + \setlength{\@tempdimb}{345\p@} + \else\ifdim \f@size\p@<11.5\p@ + \setlength{\@tempdimb}{360\p@} + \else + \setlength{\@tempdimb}{390\p@} + \fi \fi - \else - \ifdim\textwidth>\@tempdimb - \setlength{\textwidth}{\@tempdimb} + \if@twocolumn + \ifdim\@textwidth>2\@tempdimb\relax + \setlength{\textwidth}{2\@tempdimb} + \fi + \else + \ifdim\textwidth>\@tempdimb + \setlength{\textwidth}{\@tempdimb} + \fi \fi + \@settopoint\textwidth + \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax} + \divide\@tempdima\baselineskip + \@tempcnta=\@tempdima + \setlength{\textheight}{\@tempcnta\baselineskip} + \addtolength{\textheight}{\topskip} + \edef\reserved@a{% + \noexpand\@areasetadvancedtrue + \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}% + \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi + }\reserved@a \fi - \@settopoint\textwidth - \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax} - \divide\@tempdima\baselineskip - \@tempcnta=\@tempdima - \setlength{\textheight}{\@tempcnta\baselineskip} - \addtolength{\textheight}{\topskip} - \edef\reserved@a{% - \noexpand\@areasetadvancedtrue - \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}% - \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi - }\reserved@a - \fi + }% \fi %%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: body) @@ -3131,7 +3136,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -3460,7 +3465,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@sect\space}% + of \string\@sect}% \fi \def\@sect#1#2#3#4#5#6[#7]#8{% \ifnum \scr@osectarg=\z@ @@ -3632,7 +3637,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@ssect\space}% + of \string\@ssect}% \fi \def\@ssect#1#2#3#4#5{% \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% @@ -3706,7 +3711,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@xsect\space}% + of \string\@xsect}% \fi \def\@xsect#1{% \@ifundefined{scr@sect@runin}{% @@ -3905,6 +3910,9 @@ \@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}% \@namedef{set#1preamble}{\set@preamble{#1}}% } +\newcommand*{\scr@dsc@style@chapter@subcommands}[1]{% + @#1,@s#1,@make#1head,@makes#1head,@@make#1head,@@makes#1head,set#1preamble% +} \newcommand*{\scr@dsc@style@part@options}{} \DeclareSectionCommandStyleOption{part}{pagestyle}{% \@namedef{\scr@dsc@current pagestyle}{#1}% @@ -3928,6 +3936,9 @@ \@namedef{@end#1}{\scr@@endpart{#1}}% \@namedef{set#1preamble}{\set@preamble{#1}}% } +\newcommand*{\scr@dsc@style@part@subcommands}[1]{% + @#1,@s#1,@end#1,set#1preamble% +} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommandwarning{\scr@dsc@current}% @@ -4485,8 +4496,38 @@ \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{% \@tempswafalse \edef\reserved@b{\expandafter\string\csname \reserved@a\endcsname}% - } - } + }% + }% + \if@tempswa + \expandafter\let\expandafter\scr@dsc@current + \csname scr@tso@##2@style\endcsname + \DefineFamilyKey[.dsc]{KOMAarg}{style}{% + \edef\scr@dsc@current{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}% + \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}% + \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}% + \RelaxFamilyKey[.dsc]{KOMAarg}{style}% + \@tempswatrue + \@ifundefined{scr@dsc@current}{}{% + \scr@ifundefinedorrelax{scr@dsc@style@\scr@dsc@current @subcommands}{% + }{% + \edef\reserved@b{% + \csname scr@dsc@style@\scr@dsc@current @subcommands\endcsname{#2}% + }% + \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=% + \reserved@b\do{% + \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{% + \@tempswafalse + \edef\reserved@b{% + \expandafter\string\csname \reserved@a\endcsname}% + }% + }% + } + }% + \let\scr@dsc@current\relax + \fi \if@tempswa \DeclareSectionCommand[{#1}]{#2}% \else @@ -5609,7 +5650,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -7032,7 +7073,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7112,7 +7153,7 @@ You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak Definition of \string\toc@heading\space may be removed from\MessageBreak - KOMA-Script soon, so it should not be used + KOMA-Script soon, so it should not be used% }% \chapter*{\contentsname}% \@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}% @@ -7151,7 +7192,7 @@ Loading of package `scrhack' may help to\MessageBreak avoid this warning, if you are using a\MessageBreak a package that still implements the\MessageBreak - deprecated \string\float@listhead\space interface + deprecated \string\float@listhead\space interface% }% } \newcommand*{\scr@float@addtolists@warning}{% @@ -7168,7 +7209,7 @@ Loading of package `scrhack' may help to\MessageBreak avoid this warning, if you are using a\MessageBreak a package that still implements the\MessageBreak - deprecated \string\float@addtolist\space interface + deprecated \string\float@addtolist\space interface% }% \global\let\scr@float@addtolists@warning\relax } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 7c0bf8f1b8f..ab6bf653ea3 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index c2a5b1d6c6c..59db42b2075 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -65,20 +65,20 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: preidentify) \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname KOMAClassName\endcsname\relax\else - \PackageWarning{scrextend}{% + \PackageWarningNoLine{scrextend}{% This package was made to extend other classes but\MessageBreak KOMA-Script classes by some features of the\MessageBreak KOMA-Script classes.\MessageBreak It should never be used with a KOMA-Script class.\MessageBreak - Loading of the package will be aborted\@gobble% + Loading of the package will be aborted% }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,16 +100,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: prepare) \ProvidesPackage{scrextend}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -133,13 +133,13 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -216,8 +216,9 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{extendedfeature}{% \scr@ext@activate{#1}% @@ -241,7 +242,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -296,7 +297,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -436,7 +437,7 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) @@ -595,12 +596,12 @@ \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -1347,11 +1348,11 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 48a898e6746..9cdd8a2d694 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -73,7 +73,7 @@ %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \ProvidesPackage{scrfontsizes}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (font size file generator)] %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index e098f67436e..1486ddd2d36 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,22 +65,22 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% @@ -101,7 +101,7 @@ \KOMA@ifkey{standardsections}{@scrhack@standardsections} \KOMAExecuteOptions{standardsections=false} \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 913e922c6fd..45dde483e11 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -48,7 +48,7 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (for jurists) ] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index ee5c46eb480..3ee017dc50e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (% KOMA-Script-dependent @@ -243,16 +243,16 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: option) \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) %%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ \RequirePackage{scrlfile}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% 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 7f19155e76c..cf2be2185fc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -49,7 +49,7 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (end user interface for scrlayer)] %%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 103e1fa2893..48c075536eb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -47,7 +47,7 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (defining layers and page styles)] %%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index 90dd12ead4e..b9fa11e632c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] \let\ClassName\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 56dd8bfe29b..cd18c78cf3d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -61,7 +61,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,20 +83,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -120,11 +120,11 @@ } \providecommand*{\par@updaterelative}{} }{} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -142,7 +142,7 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -166,7 +166,7 @@ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -735,15 +735,15 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -915,7 +915,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -1802,7 +1802,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: body) \newkomavar{firsthead} \setkomavar{firsthead}{% @@ -2291,9 +2291,12 @@ \if@baddr \Ifkomavarempty{backaddress}{}{{% \noindent% - \def\\{\usekomavar{backaddressseparator}\@ogobble}% - \backaddr@format{\scriptsize\usekomafont{backaddress}% - \usekomavar{backaddress}}}}% + \backaddr@format{\scriptsize + {% + \def\\{\usekomavar{backaddressseparator}\@ogobble}% + \usekomafont{backaddress}% + {\usekomavar{backaddress}}% + }}}}% \fi }{backaddress}{backaddrheight}{\setkomavar}% \ifcase \ltr@priority diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index d2bcc82e22c..7cfe8807d36 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 3447 2020-01-06 16:40:47Z kohm $ \ProvidesPackage{scrlfile}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (loading files)] \ExecuteOptions{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index ef52912f715..60729877530 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -73,7 +73,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -193,10 +193,11 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -246,7 +247,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -300,7 +301,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -318,7 +319,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -424,7 +425,7 @@ %%% (run: option) %%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -486,7 +487,8 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \PassOptionsToPackage{BCOR#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{BCOR#2}{typearea}}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -495,7 +497,8 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \PassOptionsToPackage{DIV#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{DIV#2}{typearea}}% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -887,7 +890,7 @@ \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -1474,13 +1477,13 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1968,7 +1971,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2089,7 +2092,7 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -2263,7 +2266,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -3118,7 +3121,7 @@ \@tempa% } \newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3681,7 +3684,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: body) \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% @@ -4219,9 +4222,12 @@ \if@baddr \Ifkomavarempty{backaddress}{}{{% \noindent% - \def\\{\usekomavar{backaddressseparator}\@ogobble}% - \backaddr@format{\scriptsize\usekomafont{backaddress}% - \usekomavar{backaddress}}}}% + \backaddr@format{\scriptsize + {% + \def\\{\usekomavar{backaddressseparator}\@ogobble}% + \usekomafont{backaddress}% + {\usekomavar{backaddress}}% + }}}}% \fi }{backaddress}{backaddrheight}{\setkomavar}% \ifcase \ltr@priority diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty deleted file mode 100644 index f0c9624ba96..00000000000 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ /dev/null @@ -1,1088 +0,0 @@ -%% -%% This is file `scrpage2.sty', -%% generated with the docstrip utility, extended by scrdocstrip. -%% -%% The original source files were: -%% -%% scrpage.dtx (with options: `scrpage') -%% scrlogo.dtx (with options: `logo') -%% -%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info] -%% -%% This file was generated from file(s) of the KOMA-Script bundle. -%% --------------------------------------------------------------- -%% -%% It may be distributed under the conditions of the -%% LaTeX Project Public License in the version distributed together -%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. -%% -%% This file may only be distributed together with a copy of the -%% KOMA-Script bundle. You may however distribute the -%% KOMA-Script bundle without all such generated files. See also -%% `lppl.txt' or `lppl-de.txt' for additional information. -%% -%% The list of files belonging to KOMA-Script distribution is given in -%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for -%% additional information. -%% -%% If this file is a beta version, you may not be allowed to distribute -%% it. Look at the comments below to see if this is the case. -%% -%% English and German manuals are part of KOMA-Script bundle. -%% ---------------------------------------------------------- -%% -%% See `README'. -%% -%% The KOMA-Script bundle (but maybe not this file) was based upon the -%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. You can -%% find a complete unmodified copy of LaTeX2e at -%% . -%% -%%% From File: $Id: scrpage.dtx 3403 2019-11-23 15:38:36Z kohm $ -\NeedsTeXFormat{LaTeX2e}[1995/06/01] -\ProvidesPackage{scrpage2}[% - 2020/01/24 v3.29 KOMA-Script - package - (page head and foot)] -\PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak - Package `scrpage2' is obsolete.\MessageBreak - You should not longer use package `scrpage2'.\MessageBreak - You should replace usage of package `scrpage2'\MessageBreak - by `scrlayer-scrpage'} -\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% - \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% - \ifin@ - \PackageWarningNoLine{scrpage2}{% - deprecated passing option `\CurrentOption' to scrpage2.\MessageBreak - If you are using package typearea or\MessageBreak - a KOMA-Script class since version 3.00\MessageBreak - you may use `\string\KOMAoptions{#1}' and\MessageBreak - remove passing `\CurrentOption' to scrpage2% - }% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname KOMAoptions\endcsname\relax - \PassOptionsToPackage{#1}{typearea}% - \else - \KOMAoptions{#1}\csname relcalctypearea\endcsname - \fi - \fi -} -\DeclareOption{headinclude}{% - \@Pass@Obsolete@Option@To@Typearea{headinclude}% -} -\DeclareOption{headexclude}{% - \@Pass@Obsolete@Option@To@Typearea{headinclude=false}% -} -\DeclareOption{footinclude}{% - \@Pass@Obsolete@Option@To@Typearea{footinclude}% -} -\DeclareOption{footexclude}{% - \@Pass@Obsolete@Option@To@Typearea{footinclude=false}% -} -\@ifundefined{@mincltrue}{\newif\if@mincl}{} -\DeclareOption{mpinclude}{\@mincltrue} -\DeclareOption{mpexclude}{\@minclfalse} -\newcommand*{\scr@headabove@linethickness}{0pt} -\newcommand*{\scr@headbelow@linethickness}{0pt} -\newcommand*{\scr@footabove@linethickness}{0pt} -\newcommand*{\scr@footbelow@linethickness}{0pt} -\newcommand*{\scr@headabove@linelength}{\@headwidth} -\newcommand*{\scr@headbelow@linelength}{\@headwidth} -\newcommand*{\scr@footabove@linelength}{\@footwidth} -\newcommand*{\scr@footbelow@linelength}{\@footwidth} -\newcommand*{\scrplain@headabove@linelength}{0pt} -\newcommand*{\scrplain@headbelow@linelength}{0pt} -\newcommand*{\scrplain@footabove@linelength}{0pt} -\newcommand*{\scrplain@footbelow@linelength}{0pt} -\DeclareOption{headtopline}{% - \renewcommand*{\scr@headabove@linethickness}{.4pt} - \PassOptionsToPackage{headinclude}{typearea}} -\DeclareOption{headsepline}{% - \renewcommand*{\scr@headbelow@linethickness}{.4pt} - \PassOptionsToPackage{headinclude}{typearea}} -\DeclareOption{footsepline}{% - \renewcommand*{\scr@footabove@linethickness}{.4pt} - \PassOptionsToPackage{footinclude}{typearea}} -\DeclareOption{footbotline}{ - \renewcommand*{\scr@footbelow@linethickness}{.4pt} - \PassOptionsToPackage{footinclude}{typearea}} -\DeclareOption{plainheadtopline}{% - \renewcommand*{\scrplain@headabove@linelength}{\scr@headabove@linelength} - \PassOptionsToPackage{headinclude}{typearea}} -\DeclareOption{plainheadsepline}{% - \renewcommand*{\scrplain@headbelow@linelength}{\scr@headbelow@linelength} - \PassOptionsToPackage{headinclude}{typearea}} -\DeclareOption{plainfootsepline}{% - \renewcommand*{\scrplain@footabove@linelength}{\scr@footabove@linelength} - \PassOptionsToPackage{footinclude}{typearea}} -\DeclareOption{plainfootbotline}{ - \renewcommand*{\scrplain@footbelow@linelength}{\scr@footbelow@linelength} - \PassOptionsToPackage{footinclude}{typearea}} -\newcommand*{\hfline@adjust}{1} -\DeclareOption{ilines}{\renewcommand*{\hfline@adjust}{0}} -\DeclareOption{clines}{\renewcommand*{\hfline@adjust}{1}} -\DeclareOption{olines}{\renewcommand*{\hfline@adjust}{2}} -\DeclareOption{automark}{% - \AtEndOfPackage{\if@twoside% - \if@chapter\automark[section]{chapter}% - \else\automark[subsection]{section}\fi% - \else% - \if@chapter\automark{chapter}\else\automark{section}\fi% - \fi}} -\DeclareOption{manualmark}{\AtEndOfPackage{\manualmark}} -\newif\if@autooneside\@autoonesidefalse -\DeclareOption{autooneside}{\@autoonesidetrue} -\DeclareOption{markuppercase}{\let\MakeMarkcase\MakeUppercase} -\DeclareOption{markusedcase}{\let\MakeMarkcase\@empty} -\newcommand*{\scr@nouppercase}{} -\DeclareOption{nouppercase}{\renewcommand*{\scr@nouppercase}{% - \let\uppercase\relax\let\MakeUppercase\relax - \expandafter\let\csname MakeUppercase \endcsname\relax} - \ifx\MakeMarkcase\MakeUppercase - \PackageWarning{scrpage2}{% - Option 'markuppercase' will be ignored.\MessageBreak% - You shouldn't use option 'markuppercase' together\MessageBreak% - with option 'nouppercase'} - \let\MakeMarkcase\@empty - \fi} -\DeclareOption{komastyle}{\def\scrheadings@style{koma} - \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\relax}{}} -\DeclareOption{standardstyle}{\def\scrheadings@style{standard} - \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\MakeUppercase}{}} -\ExecuteOptions{} -\ProcessOptions\relax -\newif\if@chapter -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname chapter\endcsname\relax - \@chapterfalse -\else - \@chaptertrue -\fi -\def\@tempa{\newif\if@mainmatter\@mainmattertrue} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname mainmatter\endcsname\relax -\else - \@ifundefined{@mainmattertrue}{% - \PackageWarningNoLine{scrpage2}{% - \string\mainmatter\space defined without - \expandafter\string\csname if@mainmatter\endcsname!\MessageBreak - This switch is obligatory for scrpage2 to omit\MessageBreak - running head chapter numbers in front and\MessageBreak - back matter and will be defined now% - }% - }{% - \let\@tempa\relax - }% -\fi -\@tempa -\let\headmark\relax -\DeclareRobustCommand\pagemark{{\pnumfont\thepage}} -\newif\if@automark\@automarkfalse -\def\defpagestyle{% - \@ifstar - {\@defpagestyle[-]}% - {\@defpagestyle[+]}} -\def\@defpagestyle[#1]#2#3#4{% - \expandafter\def\csname ps@#2\endcsname{% - \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi - \def@head#3 - \def@foot#4 - }% -} -\def\def@head{% - \kernel@ifnextchar(%) - {\def@@head}% - {\def@@head(\scr@headabove@linelength,% - \scr@headabove@linethickness)}} -\def\def@@head(#1,#2)#3#4#5{% - \kernel@ifnextchar(%) - {\def@@@head({#1},{#2}){#3}{#4}{#5}}% - {\def@@@head({#1},{#2}){#3}{#4}{#5}% - (\scr@headbelow@linelength,% - \scr@headbelow@linethickness)}} -\def\def@@@head(#1,#2)#3#4#5(#6,#7){% - \def\@evenhead{% - \if@twoside - \let\headmark\leftmark% - \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax% - \hf@rule{#1}{#2}{\@headwidth}{headabove}% - \vskip#2 - \vskip\baselineskip - \hb@xt@\@headwidth{{% - \scr@nouppercase - \headfont\strut #3}}% - \hf@rule{#6}{#7}{\@headwidth}{headbelow}% - }\hskip\@oddheadshift\hss - \fi - }% - \def\@oddhead{\let\headmark\rightmark - \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax - \hf@rule{#1}{#2}{\@headwidth}{headabove}% - \vskip#2% - \vskip\baselineskip - \hb@xt@\@headwidth{{% - \scr@nouppercase - \headfont\strut \if@twoside #4\else #5\fi}}% - \hf@rule{#6}{#7}{\@headwidth}{headbelow}% - }\hskip\@evenheadshift\hss}% -} -\def\def@foot{% - \kernel@ifnextchar(%) - {\def@@foot} - {\def@@foot(\scr@footabove@linelength,% - \scr@footabove@linethickness)}} -\def\def@@foot(#1,#2)#3#4#5{% - \kernel@ifnextchar(%) - {\def@@@foot({#1},{#2}){#3}{#4}{#5}}% - {\def@@@foot({#1},{#2}){#3}{#4}{#5}% - (\scr@footbelow@linelength,% - \scr@footbelow@linethickness)}} -\def\def@@@foot(#1,#2)#3#4#5(#6,#7){% - \def\@evenfoot{% - \if@twoside - \let\headmark\leftmark - \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax - \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{% - \scr@nouppercase - \headfont\footfont\strut #3}}% - \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss - \fi - }% - \def\@oddfoot{\let\headmark\rightmark - \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax - \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{% - \scr@nouppercase - \headfont\footfont\strut \if@twoside #4\else #5\fi}}% - \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}% -} -\newcommand\topfoot@rule[2]{% - \@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip - \advance\@tempdima by -#2 - \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footabove}% - \vskip-\@tempdima} -\newcommand\botfoot@rule[2]{% - \@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip - \advance\@tempdima by #2 - \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footbelow}% -} -\newcommand*{\hf@rule}[4]{% - \setlength{\@tempdimb}{#1} - \begingroup - \csname scr@pre@#4@line\endcsname - \if@twoside - \ifodd\c@page - \edef\@tempa{\hfline@adjust}% - \else - \@tempcnta=2\advance\@tempcnta -\hfline@adjust - \edef\@tempa{\the\@tempcnta}% - \fi - \else - \edef\@tempa{\hfline@adjust}% - \fi - \ifnum\@tempa=1 - \setlength{\@tempdimb}{.5\@tempdimb}% - \fi - \hb@xt@#3{% - \ifnum\@tempa>0 - \hfill% - \llap{\vrule\@depth#2\@height\z@\@width\@tempdimb}% - \fi - \ifnum\@tempa<2 - \rlap{\vrule\@depth#2\@height\z@\@width\@tempdimb}% - \hfill% - \fi - }% - \endgroup -} -\newcommand*{\scr@pre@headabove@line}{} -\newcommand*{\scr@fnt@headtopline}{\scr@pre@headabove@line} -\newcommand*{\scr@pre@headbelow@line}{} -\newcommand*{\scr@fnt@headsepline}{\scr@pre@headbelow@line} -\newcommand*{\scr@pre@footabove@line}{} -\newcommand*{\scr@fnt@footsepline}{\scr@pre@footabove@line} -\newcommand*{\scr@pre@footbelow@line}{} -\newcommand*{\scr@fnt@footbottomline}{\scr@pre@footbelow@line} -\newcommand*{\scr@fnt@instead@footbotline}{footbottomline} -\def\newpagestyle{% - \@ifstar - {\@newpagestyle[-]}% - {\@newpagestyle[+]}} -\def\@newpagestyle[#1]#2#3#4{% - \expandafter\ifx\csname ps@#2\endcsname\relax - \@defpagestyle[#1]{#2}{#3}{#4}% - \else - \PackageError - {scrpage2}% - {Your command was ignored}% - {There is already a pagestyle named ``#1''.\MessageBreak% - Use \protect\defpagestyle\space, \protect\renewpagestyle or - \protect\providepagestyle.}% - \fi -} -\def\renewpagestyle{% - \@ifstar - {\@renewpagestyle[-]}% - {\@renewpagestyle[+]}} -\def\@renewpagestyle[#1]#2#3#4{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname ps@#2\endcsname\relax - \PackageError - {scrpage2}% - {Your command was ignored}% - {There is no pagestyle named ``#1''.\MessageBreak% - Use \protect\defpagestyle, \protect\newpagestyle or - \protect\providepagestyle.}% - \else - \@defpagestyle[#1]{#2}{#3}{#4}% - \fi -} -\def\providepagestyle{% - \@ifstar - {\@providepagestyle[-]}% - {\@providepagestyle[+]}} -\def\@providepagestyle[#1]#2#3#4{% - \expandafter\ifx\csname ps@#2\endcsname\relax - \@defpagestyle[#1]{#2}{#3}{#4}% - \else - \PackageInfo - {scrpage2}% - {\protect\providepagestyle\protect{#1\protect} ignored.}% - \fi -} -\def\deftripstyle{% - \@ifstar - {\@deftripstyle[-]}% - {\@deftripstyle[+]}} -\def\@deftripstyle[#1]#2{% - \kernel@ifnextchar[%] - {\@@deftripstyle[#1]{#2}}% - {\@@deftripstyle[#1]{#2}[\z@]}} -\def\@@deftripstyle[#1]#2[#3]{% - \def\@tempa{#1}% - \kernel@ifnextchar[%] - {\@@@deftripstyle#2[#3]}% - {\@@@deftripstyle#2[\z@][#3]}} -\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{% - \def\@tempb{+}% - \ifx\@tempa\@tempb - \defpagestyle{#1}% - {(\@headwidth,#2)% - {\rlap{#6}\hfill{#5}\hfill\llap{#4}}% - {\rlap{#4}\hfill{#5}\hfill\llap{#6}}% - {\rlap{#4}\hfill{#5}\hfill\llap{#6}}% - (\@headwidth,#3)}% - {(\@footwidth,#3)% - {\rlap{#9}\hfill{#8}\hfill\llap{#7}}% - {\rlap{#7}\hfill{#8}\hfill\llap{#9}}% - {\rlap{#7}\hfill{#8}\hfill\llap{#9}}% - (\@footwidth,#2)}% - \else - \defpagestyle*{#1}% - {(\@headwidth,#2)% - {\rlap{#6}\hfill{#5}\hfill\llap{#4}}% - {\rlap{#4}\hfill{#5}\hfill\llap{#6}}% - {\rlap{#4}\hfill{#5}\hfill\llap{#6}}% - (\@headwidth,#3)}% - {(\@footwidth,#3)% - {\rlap{#9}\hfill{#8}\hfill\llap{#7}}% - {\rlap{#7}\hfill{#8}\hfill\llap{#9}}% - {\rlap{#7}\hfill{#8}\hfill\llap{#9}}% - (\@footwidth,#2)}% - \fi -} -\newcommand*{\@iflevelok}[4]{% - \begingroup - \edef\@tempa{#1}\ifx\@tempa\@empty\def\@tempa{\endgroup #3}\else - \def\@tempa{\csname #1level\endcsname}% - \def\@tempb{\csname #2level\endcsname}% - \ifnum \@tempa>\@tempb - \def\@tempa{\endgroup#3}% - \else - \def\@tempa{\endgroup#4}% - \fi\fi\@tempa} -\providecommand{\markleft}[1]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markleft\@themark {#1}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi} -\providecommand{\@markleft}[3]{\@temptokena {#2}% - \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}} -\newcommand*{\automark}[2][\@empty]{% - \manualmark - \@automarktrue - \begingroup - \edef\@tempa{#2}\ifx\@tempa\@empty - \endgroup - \PackageWarning{scrpage2}% - {\string\automark\space with empty obligatory argument}% - \else - \endgroup - \expandafter\def\csname #2mark\endcsname##1{% - \begingroup - \def\@tempa{\csname #2level\endcsname}% - \@tempswafalse - \ifnum \c@secnumdepth <\@tempa\else\if@mainmatter - \@tempswatrue - \fi\fi - \edef\@tempa{#1}% - \if@twoside\edef\@tempb{#2}\else\let\@tempb\@tempa\fi - \ifx\@tempa\@tempb - \if@tempswa - \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname ##1}}% - {\MakeMarkcase{\csname #2markformat\endcsname ##1}}% - \else% - \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}% - \fi - \else - \if@tempswa - \@iflevelok{#1}{#2}{% - \@mkboth{\MakeMarkcase{\csname #2markformat\endcsname - ##1}}{}}{% - \ifx\@mkboth\markboth\markleft{\MakeMarkcase{\csname - #2markformat\endcsname ##1}}% - \fi} - \else - \@iflevelok{#1}{#2}{% - \@mkboth{\MakeMarkcase{##1}}{}}{% - \ifx\@mkboth\markboth\markleft{\MakeMarkcase{##1}}\fi}% - \fi - \fi - \endgroup - } - \fi - \begingroup - \edef\@tempa{#1}\edef\@tempb{#2}% - \if@autooneside\if@twoside\else\let\@tempa\@empty\fi\fi - \ifx\@tempa\@empty - \endgroup - \else - \ifx\@tempa\@tempb - \endgroup - \else - \endgroup - \expandafter\def\csname #1mark\endcsname##1{% - \begingroup - \def\@tempa{\csname #1level\endcsname}% - \@tempswafalse - \ifnum \c@secnumdepth <\@tempa\else\if@mainmatter - \@tempswatrue - \fi\fi - \if@tempswa - \@iflevelok{#1}{#2}{% - \ifx\@mkboth\markboth - \markright{\MakeMarkcase{\csname #1markformat\endcsname - ##1}}% - \fi}{% - \@mkboth{}{\MakeMarkcase{\csname #1markformat\endcsname - ##1}}}% - \else - \@iflevelok{#1}{#2}{% - \ifx\@mkboth\markboth - \markright{\MakeMarkcase{##1}}% - \fi}{% - \@mkboth{}{\MakeMarkcase{##1}}}% - \fi - \endgroup - } - \fi\fi% - \let\@mkboth\markboth -} -\newcommand*{\manualmark}{% - \if@chapter\let\chaptermark\@gobble\fi - \let\sectionmark\@gobble - \let\subsectionmark\@gobble - \let\subsubsectionmark\@gobble - \let\paragraphmark\@gobble - \let\subparagraphmark\@gobble - \let\@mkboth\@gobbletwo - \@automarkfalse -} -\newcommand*{\partlevel}{-1} -\newcommand*{\chapterlevel}{0} -\newcommand*{\sectionlevel}{1} -\newcommand*{\subsectionlevel}{2} -\newcommand*{\subsubsectionlevel}{3} -\newcommand*{\paragraphlevel}{4} -\newcommand*{\subparagraphlevel}{5} -\@ifundefined{MakeMarkcase}{% - \@ifclassloaded{scrbook}{\let\MakeMarkcase\relax}{% - \@ifclassloaded{scrreprt}{\let\MakeMarkcase\relax}{% - \@ifclassloaded{scrartcl}{\let\MakeMarkcase\relax}{% - \@ifclassloaded{scrlttr2}{\let\MakeMarkcase\relax}{% - \@ifclassloaded{book}{}{% - \@ifclassloaded{report}{}{% - \@ifclassloaded{article}{}{% - \PackageWarningNoLine{scrpage2}{% - use of scrpage2 with unknown class.\MessageBreak - Please mail to markus.kohm@gmx.de, if - headmarks\MessageBreak - are lower case without use of scrpage2}}}}% - \let\MakeMarkcase\MakeUppercase}}}}}{} -\@ifundefined{scrheadings@style}{% - \@ifclassloaded{scrbook}{\def\scrheadings@style{koma}}{% - \@ifclassloaded{scrreprt}{\def\scrheadings@style{koma}}{% - \@ifclassloaded{scrartcl}{\def\scrheadings@style{koma}}{% - \@ifclassloaded{scrlttr2}{\def\scrheadings@style{koma}}{% - \def\scrheadings@style{standard}}}}}}{} -\newcommand*{\settowidthof}[2]{% - \edef\@tempa{#2}% - \edef\@tempb{paper}\ifx\@tempa\@tempb - \setlength{#1}{\paperwidth}% - \else\edef\@tempb{text}\ifx\@tempa\@tempb - \setlength{#1}{\textwidth}% - \else\edef\@tempb{textwithmarginpar}\ifx\@tempa\@tempb - \setlength{#1}{\textwidth}% - \addtolength{#1}{\marginparwidth}% - \addtolength{#1}{\marginparsep}% - \else\edef\@tempb{head}\ifx\@tempa\@tempb - \setlength{#1}{\@headwidth}% - \else\edef\@tempb{foot}\ifx\@tempa\@tempb - \setlength{#1}{\@footwidth}% - \else\edef\@tempb{headtopline}\ifx\@tempa\@tempb - \setlength{#1}{\scr@headabove@linelength}% - \else\edef\@tempb{headsepline}\ifx\@tempa\@tempb - \setlength{#1}{\scr@headbelow@linelength}% - \else\edef\@tempb{footsepline}\ifx\@tempa\@tempb - \setlength{#1}{\scr@footabove@linelength}% - \else\edef\@tempb{footbotline}\ifx\@tempa\@tempb - \setlength{#1}{\scr@footbelow@linelength}% - \else\edef\@tempb{page}\ifx\@tempa\@tempb - \setlength{#1}{\paperwidth}% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname ta@bcor\endcsname\relax\else - \addtolength{#1}{-\ta@bcor}% - \fi - \else - \setlength{#1}{#2}% - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi -} -\newcommand*{\deftowidthof}[2]{% - \edef\@tempa{#2}\edef\@tempb{autohead}\ifx\@tempa\@tempb - \expandafter\def\csname #1\endcsname{\@headwidth}% - \else\edef\@tempb{autofoot}\ifx\@tempa\@tempb - \expandafter\def\csname #1\endcsname{\@footwidth}% - \else - \settowidthof{\@tempdima}{#2}% - \expandafter\edef\csname #1\endcsname{\the\@tempdima}% - \fi - \fi -} -\newcommand*{\setheadwidth}[2][\@empty]{% - \set@hf@width{head}{#1}{#2} % -} -\newcommand*{\setfootwidth}[2][\@empty]{% - \set@hf@width{foot}{#1}{#2}% -} -\newcommand*{\set@hf@width}[3]{% - \settowidthof{\@tempdima}{#3}% - \ifdim\@tempdima>\paperwidth - \PackageWarning - {scrpage2}% - {You've set width of #1 to a value\MessageBreak - greater than width of page!\MessageBreak% - I`ll reduce width of #1 to width of page}% - \setlength{\@tempdima}{\paperwidth}% - \else - \ifdim\@tempdima<\z@ - \PackageWarning - {scrpage2}% - {You've set width of #1 to negative value!\MessageBreak% - I'll set it to 0pt}% - \setlength{\@tempdima}{\z@}% - \fi - \fi - \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}% - \edef\@tempa{#2}% - \setlength{\@tempdima}{\textwidth}% - \addtolength{\@tempdima}{-\csname @#1width\endcsname}% - \ifx\@tempa\@empty - \if@twoside - \setlength{\@tempdimb}{.3333333333\@tempdima}% - \else - \setlength{\@tempdimb}{.5\@tempdima}% - \fi - \else - \setlength{\@tempdimb}{#2}% - \fi - \addtolength{\@tempdima}{-\@tempdimb}% - \ifdim\@tempdimb<\z@ - \setlength{\@tempdimb}{-\@tempdimb}% - \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}% - \else - \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}% - \fi - \ifdim\@tempdima<\z@ - \setlength{\@tempdima}{-\@tempdima}% - \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}% - \else - \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}% - \fi -} -\newcommand*{\@headwidth}{\textwidth}% -\newcommand*{\@oddheadshift}{\z@}% -\newcommand*{\@evenheadshift}{\z@}% -\newcommand*{\@footwidth}{\textwidth}% -\newcommand*{\@oddfootshift}{\z@}% -\newcommand*{\@evenfootshift}{\z@}% -\if@mincl - \renewcommand*{\@headwidth}{}% - \renewcommand*{\@footwidth}{}% - \AtBeginDocument{% - \ifx\@headwidth\@empty - \setheadwidth[0pt]{textwithmarginpar}% - \fi - \ifx\@footwidth\@empty - \setfootwidth[0pt]{textwithmarginpar}% - \fi - } -\fi -\providecommand*{\pnumfont}{\normalfont} -\providecommand*{\headfont}{\normalfont\slshape} -\def\scr@fnt@wrn@pagehead#1{% - `pagehead' is only an alias of `pageheadfoot'.\MessageBreak - Font of page foot may also be changed% -} -\providecommand*{\footfont}{\normalfont} -\providecommand*{\scr@fnt@pagefoot}{\footfont} -\let\scr@fnt@wrn@pagefoot\relax -\newcommand*{\setheadtopline}{\scr@setline{head}{above}} -\newcommand*{\setheadsepline}{\scr@setline{head}{below}} -\newcommand*{\setfootsepline}{\scr@setline{foot}{above}} -\newcommand*{\setfootbotline}{\scr@setline{foot}{below}} -\def\scr@setline#1#2{% - \kernel@ifnextchar[%] - {\@scr@setline{#1}{#2}}{\@@scr@setline{#1#2}}% -} -\def\@scr@setline#1#2[#3]{% - \edef\@tempa{#3}\edef\@tempa{auto}\ifx\@tempa\@tempb - \deftowidthof{scr@#1#2@linelength}{#3#1}% - \else - \deftowidthof{scr@#1#2@linelength}{#3}% - \fi - \@@scr@setline{#1#2}% -} -\def\@@scr@setline#1#2{% - \edef\@tempa{#2}\edef\@tempb{current}\ifx\@tempa\@empty\else - \ifx\@tempa\@tempb\else - \setlength{\@tempdima}{#2}% - \expandafter\edef\csname scr@#1@linethickness\endcsname% - {\the\@tempdima}% - \fi\fi - \kernel@ifnextchar[%] - {\@src@set@pre@line{#1}}{}% -} -\def\@src@set@pre@line#1[#2]{% - \expandafter\def\csname scr@pre@#1@line\endcsname{#2}% -} -\providecommand{\partmarkformat} {\partname\ \thepart. \ } -\if@chapter - \providecommand{\chaptermarkformat} {\@chapapp\ \thechapter. \ } - \providecommand{\sectionmarkformat} {\thesection. \ } - \providecommand{\subsectionmarkformat} {\@seccntmarkformat{subsection}} -\else - \providecommand{\sectionmarkformat} {\thesection\quad} - \providecommand{\subsectionmarkformat} {\thesubsection\quad} -\fi -\providecommand{\subsubsectionmarkformat}{\@seccntmarkformat{subsubsection}} -\providecommand{\paragraphmarkformat} {\@seccntmarkformat{paragraph}} -\providecommand{\subparagraphmarkformat} {\@seccntmarkformat{subparagraph}} -\providecommand{\@seccntmarkformat}[1] {\@seccntformat{#1}} -\newcommand*{\ps@save@plain}{} -\let\ps@save@plain\ps@plain -\newcommand*{\ps@use@plain}{\let\save@@mkboth\@mkboth - \ps@save@plain - \let\@mkboth\save@@mkboth} -\let\ps@plain\ps@use@plain -\newcommand*{\ps@save@headings}{} -\let\ps@save@headings\ps@headings -\newcommand*{\ps@save@myheadings}{} -\let\ps@save@myheadings\ps@myheadings -\def\ps@headings{% - \PackageWarning{scrpage2}% - {you've used pagestyle ``headings''.\MessageBreak - You should not use this pagestyle with a\MessageBreak - scrpage2-pagestyle!\MessageBreak - You should use pagestyle ``useheadings'' instead\MessageBreak}% - \let\ps@plain\ps@save@plain% - \ps@save@headings\@automarktrue} -\def\ps@myheadings{% - \PackageWarning{scrpage2}% - {you've used pagestyle ``myheadings''.\MessageBreak - You should not use this pagestyle with a\MessageBreak - scrpage2-pagestyle!\MessageBreak - You should use pagestyle ``useheadings'' instead\MessageBreak}% - \let\ps@plain\ps@save@plain% - \ps@save@myheadings\@automarkfalse} -\newcommand*{\ps@useheadings}{% - \if@automark\let\@mkboth\markboth\else\let\@mkboth\@gobbletwo\fi - \let\ps@plain\ps@use@plain - \let\save@@mkboth\@mkboth - \let\save@chaptermark\chaptermark - \let\save@sectionmark\sectionmark - \let\save@subsectionmark\subsectionmark - \ifx\@mkboth\markboth\ps@save@headings\else\ps@save@myheadings\fi - \let\@mkboth\save@@mkboth - \let\chaptermark\save@chaptermark - \let\sectionmark\save@sectionmark - \let\subsectionmark\save@subsectionmark -} -\newcommand*{\ps@scrplain}{\let\ps@plain\ps@@scrplain\ps@plain} -\newpagestyle{@scrplain} -{% - (\scrplain@headabove@linelength,\scr@headabove@linethickness)% - {% - \rlap{\parbox{\@headwidth}{\raggedright - \strut\scrplain@even@left@head\strut}}% - \hfill - \parbox{\@headwidth}{\centering\strut - \scrplain@even@middle@head\strut}% - \hfill - \llap{\parbox{\@headwidth}{\raggedleft - \strut\scrplain@even@right@head\strut}}}% - {% - \rlap{\parbox{\@headwidth}{\raggedright - \strut\scrplain@odd@left@head\strut}}% - \hfill - \parbox{\@headwidth}{\centering - \strut\scrplain@odd@middle@head\strut}% - \hfill - \llap{\parbox{\@headwidth}{\raggedleft - \strut\scrplain@odd@right@head\strut}}}% - {% - \rlap{\parbox{\@headwidth}{\raggedright - \strut\scrplain@odd@left@head\strut}}% - \hfill - \parbox{\@headwidth}{\centering - \strut\scrplain@odd@middle@head\strut}% - \hfill - \llap{\parbox{\@headwidth}{\raggedleft - \strut\scrplain@odd@right@head\strut}}}% - (\scrplain@headbelow@linelength,\scr@headbelow@linethickness) -}{% - (\scrplain@footabove@linelength,\scr@footabove@linethickness) - {% - \rlap{\parbox{\@footwidth}{\raggedright - \strut\scrplain@even@left@foot\strut}}% - \hfill - \parbox{\@footwidth}{\centering - \strut\scrplain@even@middle@foot\strut}% - \hfill - \llap{\parbox{\@footwidth}{\raggedleft - \strut\scrplain@even@right@foot\strut}}}% - {% - \rlap{\parbox{\@footwidth}{\raggedright - \strut\scrplain@odd@left@foot\strut}}% - \hfill - \parbox{\@footwidth}{\centering - \strut\scrplain@odd@middle@foot\strut}% - \hfill - \llap{\parbox{\@footwidth}{\raggedleft - \strut\scrplain@odd@right@foot\strut}}}% - {% - \rlap{\parbox{\@footwidth}{\raggedright - \strut\scrplain@odd@left@foot\strut}}% - \hfill - \parbox{\@footwidth}{\centering - \strut\scrplain@odd@middle@foot\strut}% - \hfill - \llap{\parbox{\@footwidth}{\raggedleft - \strut\scrplain@odd@right@foot\strut}}}% - (\scrplain@footbelow@linelength,\scr@footbelow@linethickness) -} -\newcommand*{\scrplain@even@left@head}{} -\newcommand*{\scrplain@even@middle@head}{} -\newcommand*{\scrplain@even@right@head}{} -\newcommand*{\scrplain@odd@left@head}{} -\newcommand*{\scrplain@odd@middle@head}{} -\newcommand*{\scrplain@odd@right@head}{} -\newcommand*{\scrplain@even@left@foot}{} -\newcommand*{\scrplain@even@middle@foot}{} -\newcommand*{\scrplain@even@right@foot}{} -\newcommand*{\scrplain@odd@left@foot}{} -\newcommand*{\scrplain@odd@middle@foot}{} -\newcommand*{\scrplain@odd@right@foot}{} -\newcommand*{\ps@scrheadings}{\let\ps@plain\ps@scrplain\ps@@scrheadings} -\newpagestyle{@scrheadings} -{% - {% - \rlap{\parbox{\@headwidth}{\raggedright - \strut\scrheadings@even@left@head\strut}}% - \hfill - \parbox{\@headwidth}{\centering - \strut\scrheadings@even@middle@head\strut}% - \hfill - \llap{\parbox{\@headwidth}{\raggedleft% - \strut\scrheadings@even@right@head\strut}}}% - {% - \rlap{\parbox{\@headwidth}{\raggedright - \strut\scrheadings@odd@left@head\strut}}% - \hfill - \parbox{\@headwidth}{\centering - \strut\scrheadings@odd@middle@head\strut}% - \hfill - \llap{\parbox{\@headwidth}{\raggedleft% - \strut\scrheadings@odd@right@head\strut}}}% - {% - \rlap{\parbox{\@headwidth}{\raggedright - \strut\scrheadings@odd@left@head\strut}}% - \hfill - \parbox{\@headwidth}{\centering - \strut\scrheadings@odd@middle@head\strut}% - \hfill - \llap{\parbox{\@headwidth}{\raggedleft - \strut\scrheadings@odd@right@head\strut}}}}% -{% - {% - \rlap{\parbox{\@footwidth}{\raggedright - \strut\scrheadings@even@left@foot\strut}}% - \hfill - \parbox{\@footwidth}{\centering - \strut\scrheadings@even@middle@foot\strut}% - \hfill - \llap{\parbox{\@footwidth}{\raggedleft - \strut\scrheadings@even@right@foot\strut}}}% - {% - \rlap{\parbox{\@footwidth}{\raggedright - \strut\scrheadings@odd@left@foot\strut}}% - \hfill - \parbox{\@footwidth}{\centering - \strut\scrheadings@odd@middle@foot\strut}% - \hfill - \llap{\parbox{\@footwidth}{\raggedleft - \strut\scrheadings@odd@right@foot\strut}}}% - {% - \rlap{\parbox{\@footwidth}{\raggedright - \strut\scrheadings@odd@left@foot\strut}}% - \hfill - \parbox{\@footwidth}{\centering - \strut\scrheadings@odd@middle@foot\strut}% - \hfill - \llap{\parbox{\@footwidth}{\raggedleft - \strut\scrheadings@odd@right@foot\strut}}% - }% -} -\newcommand*{\scrheadings@even@left@head}{} -\newcommand*{\scrheadings@even@middle@head}{} -\newcommand*{\scrheadings@even@right@head}{} -\newcommand*{\scrheadings@odd@left@head}{} -\newcommand*{\scrheadings@odd@middle@head}{} -\newcommand*{\scrheadings@odd@right@head}{} -\newcommand*{\scrheadings@even@left@foot}{} -\newcommand*{\scrheadings@even@middle@foot}{} -\newcommand*{\scrheadings@even@right@foot}{} -\newcommand*{\scrheadings@odd@left@foot}{} -\newcommand*{\scrheadings@odd@middle@foot}{} -\newcommand*{\scrheadings@odd@right@foot}{} -\newcommand{\ihead}{\kernel@ifnextchar[{\@@lhead}{\@lhead}} -\newcommand{\@lhead}[1]{\@rehead{#1}\@lohead{#1}} -\newcommand{\@@lhead}[2][]{\@@rehead[{#1}]{#2}\@@lohead[{#1}]{#2}} -\newcommand{\ohead}{\kernel@ifnextchar[{\@@rhead}{\@rhead}} -\newcommand{\@rhead}[1]{\@lehead{#1}\@rohead{#1}} -\newcommand{\@@rhead}[2][]{\@@lehead[{#1}]{#2}\@@rohead[{#1}]{#2}} -\newcommand{\chead}{\kernel@ifnextchar[{\@@chead}{\@chead}} -\newcommand{\@chead}[1]{\@cehead{#1}\@cohead{#1}} -\newcommand{\@@chead}[2][]{\@@cehead[{#1}]{#2}\@@cohead[{#1}]{#2}} -\newcommand{\lehead}{\kernel@ifnextchar[{\@@lehead}{\@lehead}} -\newcommand{\@lehead}[1]{\renewcommand*{\scrheadings@even@left@head}{#1}} -\newcommand{\@@lehead}[2][]{% - \renewcommand*{\scrplain@even@left@head}{#1}% - \renewcommand*{\scrheadings@even@left@head}{#2}} -\newcommand{\lohead}{\kernel@ifnextchar[{\@@lohead}{\@lohead}} -\newcommand{\@lohead}[1]{\renewcommand*{\scrheadings@odd@left@head}{#1}} -\newcommand{\@@lohead}[2][]{% - \renewcommand*{\scrplain@odd@left@head}{#1}% - \renewcommand*{\scrheadings@odd@left@head}{#2}} -\newcommand{\rehead}{\kernel@ifnextchar[{\@@rehead}{\@rehead}} -\newcommand{\@rehead}[1]{\renewcommand*{\scrheadings@even@right@head}{#1}} -\newcommand{\@@rehead}[2][]{% - \renewcommand*{\scrplain@even@right@head}{#1}% - \renewcommand*{\scrheadings@even@right@head}{#2}} -\newcommand{\rohead}{\kernel@ifnextchar[{\@@rohead}{\@rohead}} -\newcommand{\@rohead}[1]{\renewcommand*{\scrheadings@odd@right@head}{#1}} -\newcommand{\@@rohead}[2][]{% - \renewcommand*{\scrplain@odd@right@head}{#1}% - \renewcommand*{\scrheadings@odd@right@head}{#2}} -\newcommand{\cehead}{\kernel@ifnextchar[{\@@cehead}{\@cehead}} -\newcommand{\@cehead}[1]{\renewcommand*{\scrheadings@even@middle@head}{#1}} -\newcommand{\@@cehead}[2][]{% - \renewcommand*{\scrplain@even@middle@head}{#1}% - \renewcommand*{\scrheadings@even@middle@head}{#2}} -\newcommand{\cohead}{\kernel@ifnextchar[{\@@cohead}{\@cohead}} -\newcommand{\@cohead}[1]{\renewcommand*{\scrheadings@odd@middle@head}{#1}} -\newcommand{\@@cohead}[2][]{% - \renewcommand*{\scrplain@odd@middle@head}{#1}% - \renewcommand*{\scrheadings@odd@middle@head}{#2}} -\newcommand{\ifoot}{\kernel@ifnextchar[{\@@lfoot}{\@lfoot}} -\newcommand{\@lfoot}[1]{\@refoot{#1}\@lofoot{#1}} -\newcommand{\@@lfoot}[2][]{\@@refoot[{#1}]{#2}\@@lofoot[{#1}]{#2}} -\newcommand{\ofoot}{\kernel@ifnextchar[{\@@rfoot}{\@rfoot}} -\newcommand{\@rfoot}[1]{\@lefoot{#1}\@rofoot{#1}} -\newcommand{\@@rfoot}[2][]{\@@lefoot[{#1}]{#2}\@@rofoot[{#1}]{#2}} -\newcommand{\cfoot}{\kernel@ifnextchar[{\@@cfoot}{\@cfoot}} -\newcommand{\@cfoot}[1]{\@cefoot{#1}\@cofoot{#1}} -\newcommand{\@@cfoot}[2][]{\@@cefoot[{#1}]{#2}\@@cofoot[{#1}]{#2}} -\newcommand{\lefoot}{\kernel@ifnextchar[{\@@lefoot}{\@lefoot}} -\newcommand{\@lefoot}[1]{\renewcommand*{\scrheadings@even@left@foot}{#1}} -\newcommand{\@@lefoot}[2][]{% - \renewcommand*{\scrplain@even@left@foot}{#1}% - \renewcommand*{\scrheadings@even@left@foot}{#2}} -\newcommand{\lofoot}{\kernel@ifnextchar[{\@@lofoot}{\@lofoot}} -\newcommand{\@lofoot}[1]{\renewcommand*{\scrheadings@odd@left@foot}{#1}} -\newcommand{\@@lofoot}[2][]{% - \renewcommand*{\scrplain@odd@left@foot}{#1}% - \renewcommand*{\scrheadings@odd@left@foot}{#2}} -\newcommand{\refoot}{\kernel@ifnextchar[{\@@refoot}{\@refoot}} -\newcommand{\@refoot}[1]{\renewcommand*{\scrheadings@even@right@foot}{#1}} -\newcommand{\@@refoot}[2][]{% - \renewcommand*{\scrplain@even@right@foot}{#1}% - \renewcommand*{\scrheadings@even@right@foot}{#2}} -\newcommand{\rofoot}{\kernel@ifnextchar[{\@@rofoot}{\@rofoot}} -\newcommand{\@rofoot}[1]{\renewcommand*{\scrheadings@odd@right@foot}{#1}} -\newcommand{\@@rofoot}[2][]{% - \renewcommand*{\scrplain@odd@right@foot}{#1}% - \renewcommand*{\scrheadings@odd@right@foot}{#2}} -\newcommand{\cefoot}{\kernel@ifnextchar[{\@@cefoot}{\@cefoot}} -\newcommand{\@cefoot}[1]{\renewcommand*{\scrheadings@even@middle@foot}{#1}} -\newcommand{\@@cefoot}[2][]{% - \renewcommand*{\scrplain@even@middle@foot}{#1}% - \renewcommand*{\scrheadings@even@middle@foot}{#2}} -\newcommand{\cofoot}{\kernel@ifnextchar[{\@@cofoot}{\@cofoot}} -\newcommand{\@cofoot}[1]{\renewcommand*{\scrheadings@odd@middle@foot}{#1}} -\newcommand{\@@cofoot}[2][]{% - \renewcommand*{\scrplain@odd@middle@foot}{#1}% - \renewcommand*{\scrheadings@odd@middle@foot}{#2}} -\newcommand*{\clearscrheadings}{% - \ihead{}\chead{}\ohead{}\ifoot{}\cfoot{}\ofoot{}} -\newcommand*{\clearscrheadfoot}{% - \ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}} -\newcommand*{\clearscrplain}{% - \renewcommand*{\scrplain@even@left@head}{}% - \renewcommand*{\scrplain@even@middle@head}{}% - \renewcommand*{\scrplain@even@right@head}{}% - \renewcommand*{\scrplain@odd@left@head}{}% - \renewcommand*{\scrplain@odd@middle@head}{}% - \renewcommand*{\scrplain@odd@right@head}{}% - \renewcommand*{\scrplain@even@left@foot}{}% - \renewcommand*{\scrplain@even@middle@foot}{}% - \renewcommand*{\scrplain@even@right@foot}{}% - \renewcommand*{\scrplain@odd@left@foot}{}% - \renewcommand*{\scrplain@odd@middle@foot}{}% - \renewcommand*{\scrplain@odd@right@foot}{}% -} -\def\@tempa{koma}\ifx\scrheadings@style\@tempa - \@ifclassloaded{scrlttr2}{% - \ifcase\@pageat - \lehead[\pagemark]{\pagemark}\lohead[\pagemark]{\pagemark}% - \chead{\rightmark}% - \rehead{\leftmark}\rohead{\leftmark}% - \or - \lehead{\leftmark}\lohead{\leftmark}% - \chead[\pagemark]{\pagemark}% - \rehead{\rightmark}\rohead{\rightmark}% - \or - \lehead{\leftmark}\lohead{\leftmark}% - \chead{\rightmark}% - \rehead[\pagemark]{\pagemark}\rohead[\pagemark]{\pagemark}% - \or - \lehead{\leftmark}\lohead{\leftmark}% - \rehead{\rightmark}\rohead{\rightmark}% - \lefoot[\pagemark]{\pagemark}\lofoot[\pagemark]{\pagemark}% - \or - \lehead{\leftmark}\lohead{\leftmark}% - \rehead{\rightmark}\rohead{\rightmark}% - \cfoot[\pagemark]{\pagemark}% - \or - \lehead{\leftmark}\lohead{\leftmark}% - \rehead{\rightmark}\rohead{\rightmark}% - \refoot[\pagemark]{\pagemark}\rofoot[\pagemark]{\pagemark}% - \fi - \let\ps@save@myheadings=\ps@save@headings - }{% - \ohead{\if@twoside\headmark\fi}% - \chead{\if@twoside\else\headmark\fi}% - \cfoot[\if@twoside\else\pagemark\fi]{\if@twoside\else\pagemark\fi}% - \ofoot[\if@twoside\pagemark\fi]{\if@twoside\pagemark\fi}% - }% -\else\def\@tempa{standard}\ifx\scrheadings@style\@tempa - \ihead{\headmark} - \ohead{\pagemark} - \cfoot[\pagemark]{} - \else\PackageError{scrpage2}{unknown scrheadings style}% - {Somehow \string\scrheadings@style was - defined\MessageBreak - as ``\scrheadings@style''.\MessageBreak - scrpage2 doesn't know what to do. - If you'll continue, pagestyle - ``scrheadings''\MessageBreak - will be predefined empty.} -\fi\fi -\begingroup\expandafter\expandafter\expandafter\endgroup\expandafter -\ifx\csname chaptermark\endcsname\relax - \begingroup\expandafter\expandafter\expandafter\endgroup\expandafter - \ifx\csname sectionmark\endcsname\relax - \ifx\@mkboth\markboth\@automarktrue\fi - \else - \ifx\sectionmark\@gobble\else - \begingroup - \def\@gobble#1{}\ifx\sectionmark\@gobble\else - \aftergroup\@automarktrue - \fi - \endgroup - \fi - \fi -\else - \ifx\chaptermark\@gobble\else - \begingroup - \def\@gobble#1{}\ifx\chaptermark\@gobble\else - \aftergroup\@automarktrue - \fi - \endgroup - \fi -\fi -\InputIfFileExists{scrpage.cfg} - {\typeout{*************************************^^J% - * Local config file scrpage.cfg used^^J% - *************************************}} - {} -\AtBeginDocument{% - \ifdim\headheight=12pt - \PackageWarningNoLine{scrpage2}% - {seems you are using a constant headheight.\MessageBreak - If you get overfull \string\vbox\space warnings at almost every% - \MessageBreak - page, you should increase headheight e.g. writing\MessageBreak - \space\string\setlength{\string\headheight}{% - 1.1\string\baselineskip}\MessageBreak - into the preamble of your document.\MessageBreak - A better solution would be to use typearea package}% - \else\ifdim\headheight<1.07\baselineskip - \PackageWarningNoLine{scrpage2}% - {seems you are using a very small headheight.\MessageBreak - If you get overfull \string\vbox\space warnings at almost every% - \MessageBreak - page, you should increase headheight e.g. writing\MessageBreak - \space\string\setlength{\string\headheight}{% - 1.1\string\baselineskip}\MessageBreak - into the preamble of your document.\MessageBreak - A better solution would be to use typearea package}% - \fi\fi} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} -\endinput -%% -%% End of file `scrpage2.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index 6c9ba6c2994..335ba79b408 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] \let\ClassName\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 9c83fb39cac..a0f1557a506 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -6,7 +6,7 @@ %% %% scrkernel-version.dtx (with options: `class,report') %% scrkernel-basics.dtx (with options: `class,load') -%% scrkernel-listsof.dtx (with options: `class,book,prepare') +%% scrkernel-listsof.dtx (with options: `class,report,prepare') %% scrkernel-tocstyle.dtx (with options: `class,report,prepare') %% scrkernel-sections.dtx (with options: `class,report,prepare') %% scrkernel-compatibility.dtx (with options: `class,report,init') @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -143,7 +143,7 @@ \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -219,7 +219,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -296,10 +296,11 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -374,7 +375,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -430,7 +431,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) @@ -518,7 +519,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -581,7 +582,8 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \PassOptionsToPackage{BCOR#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{BCOR#2}{typearea}}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -590,7 +592,8 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \PassOptionsToPackage{DIV#2}{typearea}% + \Ifstrstart{#2}{=}{\OptionNotUsed}{% + \PassOptionsToPackage{DIV#2}{typearea}}% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -838,7 +841,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1483,7 +1486,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -2016,18 +2019,18 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2504,13 +2507,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: body) \def\today{\ifcase\month\or 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 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2523,37 +2526,39 @@ \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] \if@scr@emulatestandardclasses - \ifnum\@lastdiv=\z@ - \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax} - \ifdim \f@size\p@<10.5\p@ - \setlength{\@tempdimb}{345\p@} - \else\ifdim \f@size\p@<11.5\p@ - \setlength{\@tempdimb}{360\p@} - \else - \setlength{\@tempdimb}{390\p@} - \fi - \fi - \if@twocolumn - \ifdim\@textwidth>2\@tempdimb\relax - \setlength{\textwidth}{2\@tempdimb} + \Ifstr{\@lastdiv}{areaset}{}{% + \ifnum\@lastdiv=\z@ + \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax} + \ifdim \f@size\p@<10.5\p@ + \setlength{\@tempdimb}{345\p@} + \else\ifdim \f@size\p@<11.5\p@ + \setlength{\@tempdimb}{360\p@} + \else + \setlength{\@tempdimb}{390\p@} + \fi \fi - \else - \ifdim\textwidth>\@tempdimb - \setlength{\textwidth}{\@tempdimb} + \if@twocolumn + \ifdim\@textwidth>2\@tempdimb\relax + \setlength{\textwidth}{2\@tempdimb} + \fi + \else + \ifdim\textwidth>\@tempdimb + \setlength{\textwidth}{\@tempdimb} + \fi \fi + \@settopoint\textwidth + \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax} + \divide\@tempdima\baselineskip + \@tempcnta=\@tempdima + \setlength{\textheight}{\@tempcnta\baselineskip} + \addtolength{\textheight}{\topskip} + \edef\reserved@a{% + \noexpand\@areasetadvancedtrue + \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}% + \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi + }\reserved@a \fi - \@settopoint\textwidth - \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax} - \divide\@tempdima\baselineskip - \@tempcnta=\@tempdima - \setlength{\textheight}{\@tempcnta\baselineskip} - \addtolength{\textheight}{\topskip} - \edef\reserved@a{% - \noexpand\@areasetadvancedtrue - \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}% - \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi - }\reserved@a - \fi + }% \fi %%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: body) @@ -3162,7 +3167,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -3491,7 +3496,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@sect\space}% + of \string\@sect}% \fi \def\@sect#1#2#3#4#5#6[#7]#8{% \ifnum \scr@osectarg=\z@ @@ -3663,7 +3668,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@ssect\space}% + of \string\@ssect}% \fi \def\@ssect#1#2#3#4#5{% \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% @@ -3737,7 +3742,7 @@ Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak - of \string\@xsect\space}% + of \string\@xsect}% \fi \def\@xsect#1{% \@ifundefined{scr@sect@runin}{% @@ -3936,6 +3941,9 @@ \@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}% \@namedef{set#1preamble}{\set@preamble{#1}}% } +\newcommand*{\scr@dsc@style@chapter@subcommands}[1]{% + @#1,@s#1,@make#1head,@makes#1head,@@make#1head,@@makes#1head,set#1preamble% +} \newcommand*{\scr@dsc@style@part@options}{} \DeclareSectionCommandStyleOption{part}{pagestyle}{% \@namedef{\scr@dsc@current pagestyle}{#1}% @@ -3959,6 +3967,9 @@ \@namedef{@end#1}{\scr@@endpart{#1}}% \@namedef{set#1preamble}{\set@preamble{#1}}% } +\newcommand*{\scr@dsc@style@part@subcommands}[1]{% + @#1,@s#1,@end#1,set#1preamble% +} \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% \scr@declaresectioncommandwarning{\scr@dsc@current}% @@ -4516,8 +4527,38 @@ \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{% \@tempswafalse \edef\reserved@b{\expandafter\string\csname \reserved@a\endcsname}% - } - } + }% + }% + \if@tempswa + \expandafter\let\expandafter\scr@dsc@current + \csname scr@tso@##2@style\endcsname + \DefineFamilyKey[.dsc]{KOMAarg}{style}{% + \edef\scr@dsc@current{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dsc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}% + \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}% + \RelaxFamilyKey[.dsc]{KOMAarg}{@else@}% + \RelaxFamilyKey[.dsc]{KOMAarg}{style}% + \@tempswatrue + \@ifundefined{scr@dsc@current}{}{% + \scr@ifundefinedorrelax{scr@dsc@style@\scr@dsc@current @subcommands}{% + }{% + \edef\reserved@b{% + \csname scr@dsc@style@\scr@dsc@current @subcommands\endcsname{#2}% + }% + \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=% + \reserved@b\do{% + \expandafter\scr@ifundefinedorrelax\expandafter{\reserved@a}{}{% + \@tempswafalse + \edef\reserved@b{% + \expandafter\string\csname \reserved@a\endcsname}% + }% + }% + } + }% + \let\scr@dsc@current\relax + \fi \if@tempswa \DeclareSectionCommand[{#1}]{#2}% \else @@ -5611,7 +5652,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -7020,7 +7061,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7100,7 +7141,7 @@ You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak Definition of \string\toc@heading\space may be removed from\MessageBreak - KOMA-Script soon, so it should not be used + KOMA-Script soon, so it should not be used% }% \chapter*{\contentsname}% \@mkboth{\MakeMarkcase{\contentsname}}{\MakeMarkcase{\contentsname}}% @@ -7139,7 +7180,7 @@ Loading of package `scrhack' may help to\MessageBreak avoid this warning, if you are using a\MessageBreak a package that still implements the\MessageBreak - deprecated \string\float@listhead\space interface + deprecated \string\float@listhead\space interface% }% } \newcommand*{\scr@float@addtolists@warning}{% @@ -7156,7 +7197,7 @@ Loading of package `scrhack' may help to\MessageBreak avoid this warning, if you are using a\MessageBreak a package that still implements the\MessageBreak - deprecated \string\float@addtolist\space interface + deprecated \string\float@addtolist\space interface% }% \global\let\scr@float@addtolists@warning\relax } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 7a8281bb2b2..63e510f2d65 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 10pt) diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 84215305550..734aa50335a 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 11pt) diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 74905834dd5..adc57694c8b 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z 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 05423ef1705..ebf49e2d194 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index 9e8023682e8..79a805162d4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -39,7 +39,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrwfile.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrwfile.dtx 3453 2020-02-25 07:33:30Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrwfile} [2013/08/05 v0.1f-alpha KOMA-Script package (write and clone files)] @@ -217,7 +217,7 @@ \Ifattoclist{#3}{% \PackageWarning{scrwfile}{`#3' already under control of tocbasic.\MessageBreak - Nevertheless features will be set + Nevertheless features will be set% }% }{% \addtotoclist[TOCclone]{#3}% diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 84fd0c9dc14..73ca1448583 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{setspace.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak index 02f2c1ab5f8..257d12de8cd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak +++ b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \ProvidesFile{standardsections.hak}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] -%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ \PackageWarningNoLine{scrhack}{% You are loosing every kind of support because of\MessageBreak using the dangerous standard classes sections hack!\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 57df7c9baa6..73df3ed8977 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -53,24 +53,24 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ +%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ +%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: prepare) %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ +%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \ProcessOptions\relax %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ +%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \RequirePackage{scrbase} \AfterPackage*{multitoc}{% @@ -841,7 +841,7 @@ \PackageWarning{tocbasic}{% deprecated option `level'.\MessageBreak You should replace option `level' by option\MessageBreak - `tocentrylevel' + `tocentrylevel'% }% \l@addto@macro\tb@nt@tocstyle@options{,level={##1}}% \FamilyKeyStateProcessed @@ -2778,7 +2778,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ +%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index c35793e90e8..e7e96efb062 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -48,7 +48,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2020/01/24 v3.29 KOMA-Script + 2020/04/19 v3.30 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3448 2020-01-17 14:56:41Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -164,12 +164,14 @@ \@namedef{scr@v@3.27a}{17} \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} +\@namedef{scr@v@3.30}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: init) \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +\newcommand*{\@lastdiv}{\z@}\let\@lastdiv\relax +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -224,7 +226,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \Ifstr{#2}{letter}{% @@ -817,20 +819,35 @@ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}% }% } +\def\movet@reserved@a@to@nnil#1\@nnil{\def\reserved@a{#1}}% \KOMA@key{DIV}[calc]{% \edef\@tempa{#1}% - \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi + \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv + \ifx\@tempa\relax\def\@tempa{current}\fi + \fi \def\@tempb{current}\ifx\@tempa\@tempb\else \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=\z@ \else \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=\tw@ \else \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=\thr@@ \else - \ta@div=\@tempa + \expandafter\def\expandafter\@tempa\expandafter{\expandafter0\@tempa}% + \afterassignment\movet@reserved@a@to@nnil + \@tempcnta=\@tempa\relax\@nnil + \def\@tempb{\relax}\ifx\reserved@a\@tempb + \ta@div=\@tempcnta + \edef\@tempa{\the\ta@div}% + \else + \let\@tempa\relax + \fi \fi \fi \fi \fi - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#1}% + \ifx\@tempa\relax + \FamilyKeyStateUnknownValue + \else + \FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{\@tempa}% + \fi } \AtEndOfPackage{% \KOMA@key{DIV}{% @@ -974,9 +991,9 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3446 2020-01-06 16:31:11Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: body) \newcommand*{\ta@divfor}[1]{% \ta@div=\z@ @@ -1118,7 +1135,7 @@ marginpar (\the\marginparwidth) while using option\MessageBreak `mpinclude'.\MessageBreak Because of this, I'm exchanging the values.\MessageBreak - You should increase DIV to avoid such problems.\MessageBreak + You should increase DIV to avoid such problems% }% \@tempskipa=\marginparwidth \marginparwidth=\textwidth @@ -1278,14 +1295,16 @@ \fi \edef\@tempa{#2}% \def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv - \ifx\csname @tempa\endcsname\relax - \def\@tempa{current}% - \fi + \ifx\@tempa\relax \def\@tempa{current}\fi \fi + \Ifstr{\@tempa}{current}{% + \Ifstr{\@lastdiv}{areaset}{\let\@tempa\@lastdiv}{}% + }{}% \def\@tempb{areaset}\ifx\@tempa\@tempb \areaset[current]{\textwidth}{\textheight}% \else - \def\@tempb{current}\ifx\@tempa\@tempb\else + \def\@tempb{current}\ifx\@tempa\@tempb + \else \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=\z@ \else \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=\tw@ \else \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=\thr@@ \else @@ -1714,7 +1733,7 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ %%% (run: final) \typearea[current]{current} %%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 70e4ad257c1..a7d7dee8df0 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 3449 2020-01-24 07:28:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/01/24 v3.29 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) \ProvidesFile{% visualize% @@ -80,7 +80,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: body) \RequirePackage{eso-pic} \newcommand*{\showfields}[1]{% @@ -577,7 +577,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ %%% (run: body) \endinput %% -- cgit v1.2.3