From 66279a58ec36789c4d363e2d4598176d99f43c66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Jul 2020 21:47:49 +0000 Subject: koma-script (25jul20) git-svn-id: svn://tug.org/texlive/trunk@55944 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DIN5008A.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DIN5008B.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 4 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 4 +- .../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 | 4 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 4 +- .../tex/latex/koma-script/UScommercial9.lco | 4 +- .../tex/latex/koma-script/UScommercial9DW.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 10 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 10 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 10 +- .../texmf-dist/tex/latex/koma-script/nomencl.hak | 13 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 115 ++- .../tex/latex/koma-script/scrarticle.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 123 ++- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 32 +- .../tex/latex/koma-script/scrfontsizes.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 12 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 8 +- .../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 | 16 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 46 +- .../texmf-dist/tex/latex/koma-script/scrreport.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 123 ++- .../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 | 6 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../tex/latex/koma-script/standardsections.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 161 +++- .../texmf-dist/tex/latex/koma-script/tocstyle.sty | 958 --------------------- .../texmf-dist/tex/latex/koma-script/typearea.sty | 25 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 4 +- 50 files changed, 561 insertions(+), 1273 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/koma-script/tocstyle.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 270ce66f578..b5f4bdb1990 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco index 1b7da040d04..a1faaf053b3 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco index 5db32016da4..dd6274ad875 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 99efd0c23ba..0f3d44d1fcf 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 8b3b39becd8..36dc3fda79c 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 67b5660b712..375c752ee8c 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 c8b4527439d..7a6ba03b2cf 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index bb5c8a7eeac..4225c444962 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 8586be80aff..8183c8b84b6 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 ee876a3d0be..1e6a8b6f985 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 07f1cfa6683..f94d9ddb069 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 ab800f67bfe..ecdbaf23270 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 ab8e0196b9c..cc2091b686e 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index f93fc1795ff..65f0043440e 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 07b85c66de9..930562400c0 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index 574fc2bdf63..f4ed3ed9010 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index c06564a3b4e..40d060921d0 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{float.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 c56e466351b..085ce205eaa 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{floatrow.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 c72db0ec584..43b34a42aac 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{hyperref.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 a7e81f73d99..91a55e0d470 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{listings.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak index 6bc1707c667..7514655fe68 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{lscape.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 56fc715381e..0deb0dcdbc1 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{nomencl.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package nomencl)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \RequirePackage{tocbasic} \@ifpackagelater{nomencl}{2019/01/01}{% \PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}% @@ -152,9 +152,8 @@ } \newcommand*{\scr@hack@nomencl@head}{% \providecommand*{\listofnlsname}{\nomname}% - \let\list@fname\listofnlsname \def\@currext{nls}% - \tocbasic@listhead{\list@fname}% + \tocbasic@listhead{\nomname}% } \if@intoc \setuptoc{nls}{totoc} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index a8f81c4b206..4cf513824ec 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,7 +121,7 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script document class (\ClassName)% ] %%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ @@ -130,7 +130,7 @@ %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script ] \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% @@ -138,9 +138,9 @@ \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -192,7 +192,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -270,10 +270,11 @@ \@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 3470 2020-03-24 12:12:02Z kohm $ +\@namedef{scr@v@3.31}{18} +\@namedef{scr@v@last}{18} +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -348,7 +349,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -492,7 +493,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -555,8 +556,12 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{BCOR#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifdimen{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifdimen{#2}{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -565,8 +570,12 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{DIV#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifnumber{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifnumber{#2}{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -812,9 +821,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -1808,17 +1817,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 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2301,7 +2310,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2907,10 +2916,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2924,7 +2933,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% @@ -2943,17 +2952,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,subsection) \CloneTOCEntryStyle{tocline}{subsection} \TOCEntryStyleStartInitCode{subsection}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \providecommand*{\ifnumbered}{% @@ -3322,6 +3331,13 @@ \z@ \fi \let\@svsec\@empty + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \hy@insteadofrefstepcounter{#1}% \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname @@ -3343,8 +3359,7 @@ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname##1##2{% + \expandafter\gdef\csname add#1tocentry\endcsname##1##2{% \addtocentrydefault{#1}{##1}{##2}% }% }{}% @@ -3356,7 +3371,11 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% \@currenttocentry}% \fi \fi @@ -3373,8 +3392,7 @@ \expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname####1####2{% + \expandafter\gdef\csname add#1tocentry\endcsname####1####2{% \addtocentrydefault{#1}{####1}{####2}% }% }{}% @@ -3386,8 +3404,12 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \@currenttocentry}% + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% + \@currenttocentry}% \fi \fi \ExecuteDoHook{heading/endgroup/#1}% @@ -3466,7 +3488,14 @@ \string\scr@s@ct@@nn@m@\space locally.\MessageBreak This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% - }{}% + }{% + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@\scr@s@ct@@nn@m@\endcsname + \endgroup + \fi + }% \ifdim \scr@sect@runin{\z@}{\p@}{\glueexpr #3\relax}>\z@ \begingroup @@ -4506,15 +4535,19 @@ \fi \Ifnumbered{#1}{% \refstepcounter{#1}% - \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi }{% \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else @@ -4794,6 +4827,7 @@ beforeskip=3.25ex \@plus1ex \@minus.2ex,% afterskip=-1em,% tocstyle=subsection,% + tocindentfollows=subsubsection,% tocindent=7.0em,% tocnumwidth=4.1em% ]{paragraph} @@ -4814,7 +4848,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -4889,7 +4923,8 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \PackageWarning{scrbase}{Usage of deprecated command + \ClassWarning{\KOMAClasSName}{% + Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak recommendation of The LaTeX Project Team.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index ebf2c4fcced..1ef6b7c029f 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 1349e8b938d..b8ec62ff218 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -79,7 +79,7 @@ \ProvidesPackage{% scrbase% }[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (% KOMA-Script-independent @@ -480,7 +480,7 @@ %%% (run: option) %%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ \RequirePackage{scrlfile}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script ] %%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: body) diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index b3dea2ee566..38513d41388 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,7 +121,7 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script document class (\ClassName)% ] %%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ @@ -130,7 +130,7 @@ %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -141,9 +141,9 @@ \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z 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 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -297,10 +297,11 @@ \@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 3470 2020-03-24 12:12:02Z kohm $ +\@namedef{scr@v@3.31}{18} +\@namedef{scr@v@last}{18} +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z 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 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -518,7 +519,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -581,8 +582,12 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{BCOR#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifdimen{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifdimen{#2}{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -591,8 +596,12 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{DIV#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifnumber{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifnumber{#2}{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -835,9 +844,9 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -2015,18 +2024,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 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2516,7 +2525,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3089,10 +3098,10 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3106,7 +3115,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -3126,17 +3135,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -3505,6 +3514,13 @@ \z@ \fi \let\@svsec\@empty + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \hy@insteadofrefstepcounter{#1}% \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname @@ -3526,8 +3542,7 @@ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname##1##2{% + \expandafter\gdef\csname add#1tocentry\endcsname##1##2{% \addtocentrydefault{#1}{##1}{##2}% }% }{}% @@ -3539,7 +3554,11 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% \@currenttocentry}% \fi \fi @@ -3556,8 +3575,7 @@ \expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname####1####2{% + \expandafter\gdef\csname add#1tocentry\endcsname####1####2{% \addtocentrydefault{#1}{####1}{####2}% }% }{}% @@ -3569,8 +3587,12 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \@currenttocentry}% + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% + \@currenttocentry}% \fi \fi \ExecuteDoHook{heading/endgroup/#1}% @@ -3649,7 +3671,14 @@ \string\scr@s@ct@@nn@m@\space locally.\MessageBreak This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% - }{}% + }{% + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@\scr@s@ct@@nn@m@\endcsname + \endgroup + \fi + }% \ifdim \scr@sect@runin{\z@}{\p@}{\glueexpr #3\relax}>\z@ \begingroup @@ -4955,15 +4984,19 @@ \fi \Ifnumbered{#1}{% \refstepcounter{#1}% - \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi }{% \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else @@ -5165,11 +5198,16 @@ \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi \else \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else @@ -5591,6 +5629,7 @@ beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,% afterskip=2.3ex \@plus.2ex,% tocstyle=section,% + tocindentfollows=chapter,% tocindent=1.5em,% tocnumwidth=2.3em% ]{section} @@ -5629,6 +5668,7 @@ indent=\z@,% beforeskip=3.25ex \@plus1ex \@minus.2ex,% afterskip=-1em,% + tocindentfollows=subsubsection,% tocstyle=section,% tocindent=10em,% tocnumwidth=5em% @@ -5650,7 +5690,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5731,7 +5771,8 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \PackageWarning{scrbase}{Usage of deprecated command + \ClassWarning{\KOMAClasSName}{% + Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak recommendation of The LaTeX Project Team.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index ab6bf653ea3..64686c0be2b 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,7 +74,7 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (day of the week)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 59db42b2075..b3f5f9ac366 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -78,7 +78,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,7 +100,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -109,7 +109,7 @@ %%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: prepare) \ProvidesPackage{scrextend}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -136,10 +136,10 @@ %%% 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 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -217,7 +217,8 @@ \@namedef{scr@v@3.28}{17} \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} -\@namedef{scr@v@last}{17} +\@namedef{scr@v@3.31}{18} +\@namedef{scr@v@last}{18} %%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) \KOMA@key{extendedfeature}{% @@ -242,7 +243,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -297,7 +298,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -437,7 +438,7 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) @@ -596,12 +597,12 @@ \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -1348,11 +1349,11 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname @@ -1424,7 +1425,8 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \PackageWarning{scrbase}{Usage of deprecated command + \PackageWarning{scrextend}{% + Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak recommendation of The LaTeX Project Team.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 9cdd8a2d694..a5737641e14 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 1486ddd2d36..a6b1c4e46ad 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,22 +65,22 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (hacking other packages)% ] %%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 45dde483e11..5c2093c1fd4 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/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 3ee017dc50e..11ccda289ad 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -79,7 +79,7 @@ \ProvidesPackage{% scrkbase% }[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (% KOMA-Script-dependent @@ -250,7 +250,7 @@ %%% (run: option) %%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ \RequirePackage{scrlfile}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script ] %%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ %%% (run: body) 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 cf2be2185fc..f6c156c4bb8 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/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 48c075536eb..1c5b392c628 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/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 b9fa11e632c..aea5718e473 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 cd18c78cf3d..074e165252a 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,20 +83,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script letter package extending any KOMA-Script class% ] %%% 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 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -120,9 +120,9 @@ } \providecommand*{\par@updaterelative}{} }{} -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) @@ -735,12 +735,12 @@ \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 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z 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 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: body) \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 7cfe8807d36..b2c0a9fe1cd 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/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 60729877530..5f75c727961 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script document class (\ClassName)% ] %%% 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 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -194,10 +194,11 @@ \@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 3470 2020-03-24 12:12:02Z kohm $ +\@namedef{scr@v@3.31}{18} +\@namedef{scr@v@last}{18} +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -247,7 +248,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -425,7 +426,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 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -487,8 +488,12 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{BCOR#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifdimen{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifdimen{#2}{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -497,8 +502,12 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{DIV#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifnumber{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifnumber{#2}{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -1477,13 +1486,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 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1971,7 +1980,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2020,7 +2029,8 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \PackageWarning{scrbase}{Usage of deprecated command + \ClassWarning{\KOMAClasSName}{% + Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak recommendation of The LaTeX Project Team.\MessageBreak @@ -3121,7 +3131,7 @@ \@tempa% } \newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index 335ba79b408..a0269544fa0 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 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 a0f1557a506..a0080242c19 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,7 +121,7 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script document class (\ClassName)% ] %%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ @@ -130,7 +130,7 @@ %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -141,9 +141,9 @@ \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z 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 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -297,10 +297,11 @@ \@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 3470 2020-03-24 12:12:02Z kohm $ +\@namedef{scr@v@3.31}{18} +\@namedef{scr@v@last}{18} +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -375,7 +376,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -519,7 +520,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -582,8 +583,12 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \Ifstr{#1}{}{% \Ifstr{#3}{BCOR}{% - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{BCOR#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifdimen{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifdimen{#2}{\PassOptionsToPackage{BCOR#2}{typearea}}{\OptionNotUsed}% + }% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -592,8 +597,12 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \Ifstrstart{#2}{=}{\OptionNotUsed}{% - \PassOptionsToPackage{DIV#2}{typearea}}% + \Ifstrstart{#2}{=}{% + \edef\reserved@a{\noexpand\Ifnumber{\@gobble#2}}% + \reserved@a{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }{% + \Ifnumber{#2}{\PassOptionsToPackage{DIV#2}{typearea}}{\OptionNotUsed}% + }% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -839,9 +848,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -2019,18 +2028,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 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2513,7 +2522,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3120,10 +3129,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3137,7 +3146,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -3157,17 +3166,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3476 2020-04-08 14:42:59Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -3536,6 +3545,13 @@ \z@ \fi \let\@svsec\@empty + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@#1\endcsname + \endgroup + \fi + \hy@insteadofrefstepcounter{#1}% \else \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname @@ -3557,8 +3573,7 @@ \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname##1##2{% + \expandafter\gdef\csname add#1tocentry\endcsname##1##2{% \addtocentrydefault{#1}{##1}{##2}% }% }{}% @@ -3570,7 +3585,11 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% \@currenttocentry}% \fi \fi @@ -3587,8 +3606,7 @@ \expandafter{\@currentheadentry}% \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% - \expandafter\global\expandafter\def - \csname add#1tocentry\endcsname####1####2{% + \expandafter\gdef\csname add#1tocentry\endcsname####1####2{% \addtocentrydefault{#1}{####1}{####2}% }% }{}% @@ -3600,8 +3618,12 @@ \fi \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else - \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \@currenttocentry}% + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% + \csname add#1tocentry\endcsname{\csname #1tocformat\endcsname}{% + \@currenttocentry}% \fi \fi \ExecuteDoHook{heading/endgroup/#1}% @@ -3680,7 +3702,14 @@ \string\scr@s@ct@@nn@m@\space locally.\MessageBreak This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% - }{}% + }{% + \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \begingroup + \let\@elt\@stpelt + \csname cl@\scr@s@ct@@nn@m@\endcsname + \endgroup + \fi + }% \ifdim \scr@sect@runin{\z@}{\p@}{\glueexpr #3\relax}>\z@ \begingroup @@ -4974,15 +5003,19 @@ \fi \Ifnumbered{#1}{% \refstepcounter{#1}% - \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi }{% \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else @@ -5182,11 +5215,16 @@ \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% \ifx\@currenttocentry\@empty\else + \@ifundefined{#1tocformat}{% + \expandafter\gdef\csname #1tocformat\endcsname + {\csname the#1\endcsname}% + }{}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\@currenttocentry}% + }{\csname\@ifundefined{#1tocformat}{the#1}{#1tocformat}\endcsname}% + {\@currenttocentry}% \fi \else \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else @@ -5593,6 +5631,7 @@ beforeskip=-3.5ex \@plus -1ex \@minus -.2ex,% afterskip=2.3ex \@plus.2ex,% tocstyle=section,% + tocindentfollows=chapter,% tocindent=1.5em,% tocnumwidth=2.3em% ]{section} @@ -5631,6 +5670,7 @@ indent=\z@,% beforeskip=3.25ex \@plus1ex \@minus.2ex,% afterskip=-1em,% + tocindentfollows=subsubsection,% tocstyle=section,% tocindent=10em,% tocnumwidth=5em% @@ -5652,7 +5692,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5729,7 +5769,8 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \PackageWarning{scrbase}{Usage of deprecated command + \ClassWarning{\KOMAClasSName}{% + Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak recommendation of The LaTeX Project Team.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 63e510f2d65..f57ad709d2e 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 734aa50335a..07f7f86294a 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 adc57694c8b..a05858ec207 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 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 ebf49e2d194..297fafd9309 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,7 +74,7 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (time of LaTeX run)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 73ca1448583..12962b1ddb8 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{setspace.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 257d12de8cd..05e941bf1b0 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{standardsections.hak}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] -%%% From File: $Id: scrhack.dtx 3474 2020-04-08 09:34:56Z kohm $ +%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z 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 73df3ed8977..2bfaa0b9451 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 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% (run: body) \RequirePackage{scrbase} \AfterPackage*{multitoc}{% @@ -400,11 +400,11 @@ \newcommand*{\listoftoc}{% \kernel@ifstar \tocbasic@starttoc\@listoftoc } -\newcommand*{\@listoftoc}[2][\list@fname]{% +\newcommand*{\@listoftoc}[2][]{% \begingroup + \def\list@fname{#1}% \@ifundefined{listof#2name}{% - \let\list@fname\relax - \ifx\relax#1\relax + \ifx\list@fname\@empty \PackageWarning{tocbasic}{% You should either define \expandafter\string\csname listof#2name\endcsname\MessageBreak @@ -425,7 +425,7 @@ }% }{}% \Iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}% - \tocbasic@listhead{#1}% + \expandafter\tocbasic@listhead\expandafter{\list@fname}% \scr@ifundefinedorrelax{microtypesetup}{}{% \Iftocfeature{\@currext}{noprotrusion}{}{% \microtypesetup{protrusion=false}% @@ -1051,7 +1051,7 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% @@ -1112,6 +1112,58 @@ \do@endgroup } \newcommand{\scr@dte@gobbleopt}[1][]{} +\newcommand*{\@DefineTOCEntryListOption}[2]{% + \kernel@ifnextchar [%] + {\@DefineTOCEntryListOptionWithDefault{#1}{#2}} + {\@DefineTOCEntryListOptionWithoutDefault{#1}{#2}}% +} +\newcommand*{\@DefineTOCEntryListOptionWithoutDefault}[5]{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#3}{#4}{#2}{#5}% + \@DefineTOCEntryOption{#1}{#2}{% + \expandafter\protected@edef\csname #3\scr@dte@current#4\endcsname{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2:}{% + \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{% + \expandafter\let + \csname #3\scr@dte@current#4\expandafter\endcsname + \csname #3##1#4\endcsname + \FamilyKeyStateProcessed + }% + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2+}{% + \expandafter\protected@edef\csname #2\scr@dte@current#4\endcsname{% + \csname #2\scr@dte@current#4\endcsname,##1}% + \FamilyKeyStateProcessed + }% + \edef\scr@dte@doopts{% + \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}\noexpand\do{#2+}% + }% +} +\newcommand*{\@DefineTOCEntryListOptionWithDefault}{} +\def\@DefineTOCEntryListOptionWithDefault#1#2[#3]#4#5#6{% + \@TOCEntryStyleNeedsCommandByOption{#1}{#4}{#5}{#2}{#6}% + \@DefineTOCEntryOption{#1}{#2}[{#3]}{% + \expandafter\protected@edef\csname #4\scr@dte@current#5\endcsname{##1}% + \FamilyKeyStateProcessed + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2:}{% + \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{% + \expandafter\let + \csname #4\scr@dte@current#5\expandafter\endcsname + \csname #4##1#5\endcsname + \FamilyKeyStateProcessed + }% + }% + \DefineFamilyKey[.dte]{KOMAarg}{#2+}{% + \expandafter\protected@edef\csname #4\scr@dte@current#5\endcsname{% + \csname #4\scr@dte@current#5\endcsname,##1}% + \FamilyKeyStateProcessed + }% + \edef\scr@dte@doopts{% + \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}\noexpand\do{#2+}% + }% +} \newcommand*{\@DefineTOCEntryLengthOption}[2]{% \kernel@ifnextchar [%] {\@DefineTOCEntryLengthOptionWithDefault{#1}{#2}} @@ -1517,6 +1569,7 @@ \def\DefineTOCEntryCommandOption{\@DefineTOCEntryCommandOption{#1}}% \def\DefineTOCEntryIfOption{\@DefineTOCEntryIfOption{#1}}% \def\DefineTOCEntryLengthOption{\@DefineTOCEntryLengthOption{#1}}% + \def\DefineTOCEntryListOption{\@DefineTOCEntryListOption{#1}}% \def\DefineTOCEntryNumberOption{\@DefineTOCEntryNumberOption{#1}}% \def\DefineTOCEntryOption{\@DefineTOCEntryOption{#1}}% \def\AddToDeclareTOCEntryStylePreCheckNeeds{% @@ -1531,6 +1584,7 @@ \let\AddToDeclareTOCEntryStylePreCheckNeeds\relax \let\DefineTOCEntryOption\relax \let\DefineTOCEntryNumberOption\relax + \let\DefineTOCEntryListOption\relax \let\DefineTOCEntryLengthOption\relax \let\DefineTOCEntryIfOption\relax \let\DefineTOCEntryCommandOption\relax @@ -1652,10 +1706,10 @@ \providecommand*\@pnumwidth{1.55em} \providecommand*\@tocrmarg {2.55em} \providecommand*\@dotsep {4.5} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1789,7 +1843,7 @@ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1949,7 +2003,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -2062,7 +2116,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2071,6 +2125,10 @@ {scr@tso@}{@breakafternumber}{line break after number flag}% \DefineTOCEntryIfOption{dynnumwidth}% {scr@tso@}{@dynnumwidth}{dynamic number width flag}% + \DefineTOCEntryListOption{indentfollows}% + {scr@tso@}{@indentfollows}{list of levels that define the indent}% + \DefineTOCEntryIfOption{dynindent}% + {scr@tso@}{@dynindent}{dynamic indent width flag}% \DefineTOCEntryCommandOption{entryformat}% {scr@tso@}{@entryformat}[1]{entry format}% \DefineTOCEntryCommandOption{entrynumberformat}% @@ -2394,6 +2452,16 @@ \csname scr@tso@#1@pagenumberbox\endcsname[1]{% \hb@xt@\@nameuse{scr@dte@pagenumberwidth}{\hfil ##1}}% \expandafter\providecommand\csname Ifscr@tso@#1@dynnumwidth\endcsname[2]{##2}% + \expandafter\providecommand\csname Ifscr@tso@#1@dynindent\endcsname[2]{##2}% + \scr@ifundefinedorrelax{scr@tso@#1@indentfollows}{% + \Ifstrstart{#1}{sub}{% + \expandafter\edef\csname scr@tso@#1@indentfollows\endcsname{% + \scr@dte@nosub{#1}% + }% + }{% + \expandafter\let\csname scr@tso@#1@indentfollows\endcsname\@empty + }% + }{}% }]{% \scr@dte@tocline{#1}{##1}{##2}% } @@ -2427,6 +2495,41 @@ \else \tocbasic@DependOnPenaltyAndTOCLevel{#1}% \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax + \@nameuse{Ifscr@tso@#1@dynindent}{% + \expandafter\ifx\csname scr@tso@#1@indentfollows\endcsname\@empty + \PackageWarning{tocbasic}{`dynindent' for `#1' not available}% + \else + \edef\reserved@a{\@nameuse{scr@tso@#1@indentfollows}}% + \@for \reserved@a:=\reserved@a\do {% + \scr@trim@spaces\reserved@a + \ifx\reserved@a\@empty\else + \scr@ifundefinedorrelax{\reserved@a tocdepth}{% + }{% + \ifnum \@nameuse{\reserved@a tocdepth}<\@nameuse{#1tocdepth}% + \@tempdima\@nameuse{scr@tso@\reserved@a @indent}\relax + \@nameuse{Ifscr@tso@\reserved@a @dynnumwidth}{% + \scr@ifundefinedorrelax + {scr@dte@\reserved@a @lastmaxnumwidth}{% + \advance\@tempdima + \@nameuse{scr@tso@\reserved@a @numwidth}\relax + }{% + \advance\@tempdima + \@nameuse{scr@dte@\reserved@a @lastmaxnumwidth}\relax + }% + }{% + \advance\@tempdima + \@nameuse{scr@tso@\reserved@a @numwidth}\relax + }% + \ifdim \@tempdima>\@nameuse{scr@tso@#1@indent}\relax + \expandafter\edef\csname scr@tso@#1@indent\endcsname + {\the\@tempdima}% + \fi + \fi + }% + \fi + }% + \fi + }{}% {% \Iftocfeature{\@currext}{noindent}{% \leftskip \z@ @@ -2545,9 +2648,11 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,toctext) \DeclareTOCEntryStyle{toctext}[{% + \DefineTOCEntryLengthOption{beforeskip}% + {scr@tso@}{@beforeskip}{vertical skip before the entry}% \DefineTOCEntryCommandOption{entryformat}% {scr@tso@}{@entryformat}[1]{entry format}% \DefineTOCEntryCommandOption{entrynumberformat}% @@ -2693,6 +2798,8 @@ }% }{}% \expandafter\providecommand\expandafter*% + \csname scr@tso@#1@beforeskip\endcsname{\z@}% + \expandafter\providecommand\expandafter*% \csname scr@tso@#1@numsep\endcsname{.4em}% \expandafter\providecommand% \csname scr@tso@#1@onstartfirstentry\endcsname{}% @@ -2722,6 +2829,7 @@ \scr@dte@toctext@lastend \@nameuse{scr@tso@#1@onstartentry}% \else + \addvspace{\@nameuse{scr@tso@#1@beforeskip}}% \leavevmode \def\par{% \scr@dte@toctext@raggedright @@ -2740,8 +2848,17 @@ }% \rightskip \@nameuse{scr@tso@#1@rightindent}\relax \parfillskip \z@ \@plus 1fill\relax - \edef\@noitemerr{\unexpanded{\par\def\@noitemerr}% - {\unexpanded\expandafter{\@noitemerr}}}% + \ifx\addvspace\scr@dte@xaddvspace\else + \let\scr@dte@saddvspace\addvspace + \def\scr@dte@xaddvspace{% + \let\addvspace\scr@dte@saddvspace\par\addvspace}% + \let\addvspace\scr@dte@xaddvspace + \fi + \ifx\addpenalty\scr@dte@xaddpenalty\else + \let\scr@dte@saddpenalty\addpenalty + \def\scr@dte@xaddpenalty{% + \let\addpenalty\scr@dte@saddpenalty\par\addpenalty}% + \fi \@nameuse{scr@tso@#1@onstartfirstentry}% \fi \@nameuse{Ifscr@tso@#1@raggedright}{% @@ -2775,10 +2892,10 @@ \newcommand*{\scr@dte@toctext@raggedright}{} \newcommand*{\scr@dte@toctext@parend}{} \newcommand*{\scr@dte@toctext@lastend}{} -%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty deleted file mode 100644 index e6adcb7539f..00000000000 --- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty +++ /dev/null @@ -1,958 +0,0 @@ -%% -%% This is file `tocstyle.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% tocstyle.dtx (with options: `package,trace,tocstyle') -%% scrlogo.dtx (with options: `logo') -%% -%% Copyright (c) 2007-2019 by Markus Kohm -%% -%% This file was generated from file(s) of the KOMA-Script bundle. -%% --------------------------------------------------------------- -%% -%% This work may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, version 1.3c of the license. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later and of this work. -%% -%% This work has the LPPL maintenance status "author-maintained". -%% -%% The Current Maintainer and author of this work is Markus Kohm. -%% -%% This file may only be distributed together with the file -%% `tocstyle.dtx' and `scrlogo.dtx'. You may however distribute the files -%% `tocstyle.dtx' and `scrlogo.dtx' without this file. -%% -%% The english manual is in `tocstyle.dtx', too. -%% -%% THIS IS AN OBSOLETE PACKAGE! YOU SHOULD NOT USE IT! -%% -%%% From File: $Id: tocstyle.dtx 3249 2019-10-09 11:35:26Z kohm $ -\NeedsTeXFormat{LaTeX2e}[1995/06/01] -\ProvidesPackage{tocstyle} - [2019/10/09 v0.2j-alpha deprecated package (versatile toc styles)] -\PackageWarningNoLine{tocstyle}{% - THIS IS A DEPRECATED ALPHA VERSION!\MessageBreak - USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak - EVERYTHING MAY HAPPEN!\MessageBreak - THE PACKAGE IS FROZEN WITH ALL IT'S BUGS!\MessageBreak - IT WILL BE REMOVED FROM KOMA-SCRIPT SOON!\MessageBreak - THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak - Maybe it would be better, not to load this package% -} -\newif\if@tocstyle@penalties -\newif\iftocstyle@autolength -\newif\iftocstyle@indentnotnumbered -\newcount\tocstyle@indentstyle\tocstyle@indentstyle=\z@ -\newcommand*{\selecttocstyleoption}[1]{% - \begingroup - \edef\@tempa{#1}% - \edef\@tempb{tocbreaksstrict}% - \ifx\@tempa\@tempb\aftergroup\@tocstyle@penaltiestrue\else - \edef\@tempb{tocbreakscareless}% - \ifx\@tempa\@tempb\aftergroup\@tocstyle@penaltiesfalse\else - \edef\@tempb{tocindentauto} - \ifx\@tempa\@tempb\aftergroup\tocstyle@autolengthtrue\else - \edef\@tempb{tocindentmanual}% - \ifx\@tempa\@tempb\aftergroup\tocstyle@autolengthfalse\else - \edef\@tempb{tocgraduated}% - \ifx\@tempa\@tempb - \aftergroup\tocstyle@indentstyle\aftergroup\z@ - \else - \edef\@tempb{tocflat}% - \ifx\@tempa\@tempb - \aftergroup\tocstyle@indentstyle\aftergroup\@ne - \aftergroup\relax - \else - \edef\@tempb{tocfullflat}% - \ifx\@tempa\@tempb - \aftergroup\tocstyle@indentstyle\aftergroup\tw@ - \aftergroup\relax - \else - \edef\@tempb{toctextentriesindented}% - \ifx\@tempa\@tempb\aftergroup\tocstyle@indentnotnumberedtrue - \else - \edef\@tempb{toctextentriesleft}% - \ifx\@tempa\@tempb - \aftergroup\tocstyle@indentnotnumberedfalse - \else - \PackageError{tocstyle}{unknown option `#1'}{% - You've told me to select toc style option - `#1',\MessageBreak - but tocstyle doesn't know an option named `#1'}% - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \endgroup -} -\newif\iftochaschapter\tochaschapterfalse -\ifcsname l@chapter\endcsname - \ifcsname chapter\endcsname - \tochaschaptertrue - \fi -\fi -\DeclareOption{tocbreaksstrict}{\selecttocstyleoption\CurrentOption} -\DeclareOption{tocbreakscareless}{\selecttocstyleoption\CurrentOption} -\DeclareOption{tocindentauto}{\selecttocstyleoption\CurrentOption} -\DeclareOption{tocindentmanual}{\selecttocstyleoption\CurrentOption} -\DeclareOption{toctextentriesindented}{\selecttocstyleoption\CurrentOption} -\DeclareOption{toctextentriesleft}{\selecttocstyleoption\CurrentOption} -\DeclareOption{tocgraduated}{\selecttocstyleoption\CurrentOption} -\DeclareOption{tocflat}{\selecttocstyleoption\CurrentOption} -\DeclareOption{tocfullflat}{\selecttocstyleoption\CurrentOption} -\ExecuteOptions{tocbreaksstrict,tocindentauto,tocgraduated,% - toctextentriesleft} -\ProcessOptions\relax -\ifcsname if@tocleft\endcsname - \expandafter\let\csname if@tempswa\expandafter\endcsname - \csname if@tocleft\endcsname -\else - \@tempswafalse -\fi -\if@tempswa - \PackageWarningNoLine{tocstyle}{% - You should not use class option `toc=flat'!\MessageBreak - This may result in errors or unexpected results.\MessageBreak - I'll try to deactivate `toc=flat', now.\MessageBreak - You may use package options `tocflat' and\MessageBreak - `tocindentauto' instead of `toc=flat'}% - \csname @tocleftfalse\endcsname -\fi -\newcommand*\tocstyle@saved@starttoc{} -\let\tocstyle@saved@starttoc\@starttoc -\renewcommand*{\@starttoc}[1]{% - \tocstyle@pre@starttoc{#1}% - \tocstyle@saved@starttoc{#1}% - \tocstyle@post@starttoc{#1}% -} -\newcommand*{\tocstyle@saved@dottedtocline}{} -\newcommand*{\tocstyle@dottedtocline}[5]{% - \let\numberline\tocstyle@numberline - \ifnum #1>\c@tocdepth \else - \if@tocstyle@penalties - \begingroup - \@tempcnta 20010 - \advance \@tempcnta by -#1 - \ifnum \@tempcnta>\lastpenalty - \aftergroup\penalty\aftergroup\@lowpenalty - \fi - \endgroup - \fi - \edef\tocstyledepth{#1}% - \tocstyle@activate@features - \ifx\tocstyle@feature@entryvskip\relax - \vskip \z@ \@plus.2\p@ - \else - \addvspace{\tocstyle@feature@entryvskip}% - \fi - {% - \parskip \z@ \parindent \z@ \leftskip \z@ \rightskip \z@ - \tocstyle@feature@raggedhook - \@tempdima #3\relax - \@tempdimb #2\relax - \typeout{number indent by \string\l@... (\tocstyleTOC, \tocstyledepth): \space\the\@tempdimb}% - \typeout{text indent by \string\l@... (\tocstyleTOC, \tocstyledepth): \space\the\@tempdima}% - \ifnum #1>\z@\relax - \@tempcnta #1\relax \advance\@tempcnta \m@ne - \ifcsname tocstyle@maxskipwidth@\tocstyleTOC @\the\@tempcnta\endcsname - \ifcsname tocstyle@maxnumwidth@\tocstyleTOC @\the\@tempcnta\endcsname - \@tempdimb - \csname tocstyle@maxskipwidth@\tocstyleTOC @\the\@tempcnta\endcsname - \advance\@tempdimb - \csname tocstyle@maxnumwidth@\tocstyleTOC @\the\@tempcnta\endcsname - \fi - \fi - \fi - \typeout{number indent by parent (\tocstyleTOC, \tocstyledepth): \space\the\@tempdimb}% - \ifcsname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname - \ifdim \@tempdimb> - \csname tocstyle@skipwidth@\tocstyleTOC @#1\endcsname\relax - \expandafter\xdef\csname tocstyle@skipwidth@\tocstyleTOC - @#1\endcsname{\the\@tempdimb}% - \fi - \else - \expandafter\xdef\csname tocstyle@skipwidth@\tocstyleTOC - @#1\endcsname{\the\@tempdimb}% - \fi - \iftocstyle@autolength - \ifcsname tocstyle@maxskipwidth@\tocstyleTOC @#1\endcsname - \@tempdimb \csname tocstyle@maxskipwidth@\tocstyleTOC @#1\endcsname - \relax - \fi - \ifcsname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname - \@tempdima \csname tocstyle@maxnumwidth@\tocstyleTOC @#1\endcsname - \relax - \fi - \typeout{text indent calculated (\tocstyleTOC, \tocstyledepth): \the\@tempdima}% - \typeout{number indent calculated (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% - \else - \@tempdimb #2\relax - \typeout{number indent explicite (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% - \fi - \ifcsname tocstyle@unumwidth@\tocstyleTOC @\endcsname - \ifdim \@tempdima> - \csname tocstyle@unumwidth@\tocstyleTOC @\endcsname\relax - \expandafter\xdef\csname tocstyle@unumwidth@\tocstyleTOC - @\endcsname{\the\@tempdima}% - \fi - \else - \expandafter\xdef\csname tocstyle@unumwidth@\tocstyleTOC - @\endcsname{\the\@tempdima}% - \fi - \ifcase\tocstyle@indentstyle\relax\else - \@tempdimb \z@ - \ifcsname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname - \@tempdima \csname tocstyle@maxunumwidth@\tocstyleTOC @\endcsname - \relax - \fi - \typeout{text noindent (\tocstyleTOC, \tocstyledepth): \the\@tempdima}% - \typeout{number noindent (\tocstyleTOC, \tocstyledepth): \the\@tempdimb}% - \fi - \advance\parindent \@tempdimb\@afterindenttrue - \advance\leftskip \parindent - \advance\rightskip \@tocrmarg - \parfillskip -\rightskip - \ifx\tocstyle@feature@parfillskip\relax\else - \advance\parfillskip \tocstyle@feature@parfillskip\relax - \fi - \interlinepenalty\@M - \leavevmode - \advance\leftskip \@tempdima - \null\nobreak - \iftocstyle@indentnotnumbered\else - \hskip -\leftskip - \fi - \tocstyle@feature@entryhook - {#4}\nobreak - \ifx\tocstyle@feature@leaders\relax - \leaders\hbox{$\m@th - \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}% - \mkern \@dotsep mu$}\hfill - \else - \tocstyle@feature@leaders - \fi - \nobreak - \ifx\tocstyle@feature@pagenumberbox\relax - \hb@xt@\@pnumwidth{\hfil\tocstyle@feature@pagenumberhook #5% - \kern-\p@\kern\p@}% - \else - \tocstyle@feature@pagenumberbox{\tocstyle@feature@pagenumberhook #5% - \kern-\p@\kern\p@}% - \fi - \par - }% - \if@tocstyle@penalties - \bgroup - \@tempcnta 20009 - \advance\@tempcnta by -#1 - \edef\reserved@a{\egroup\penalty\the\@tempcnta\relax}% - \reserved@a - \fi - \fi} -\newcommand*{\tocstyle@saved@numberline}{} -\newcommand*{\tocstyle@numberline}[1]{% - \begingroup - \ifx\tocstyle@feature@spaceafternumber\relax - \settowidth\@tempdima{\tocstyle@@numberline{#1}\enskip}% - \else - \settowidth\@tempdima{\tocstyle@@numberline{#1}}% - \advance \@tempdima \tocstyle@feature@spaceafternumber\relax - \fi - \ifcsname tocstyle@numwidth@\tocstyleTOC @\tocstyledepth\endcsname - \ifdim \@tempdima > - \csname tocstyle@numwidth@\tocstyleTOC @\tocstyledepth\endcsname\relax - \expandafter\xdef\csname tocstyle@numwidth@\tocstyleTOC - @\tocstyledepth\endcsname{\the\@tempdima}% - \fi - \else - \expandafter\xdef\csname tocstyle@numwidth@\tocstyleTOC - @\tocstyledepth\endcsname{\the\@tempdima}% - \fi - \endgroup - \iftocstyle@indentnotnumbered - \hskip -\leftskip - \fi - \ifcase \tocstyle@indentstyle - \hb@xt@\@tempdima{\tocstyle@@numberline{#1}\hfil}% - \or - \hb@xt@\@tempdima{\tocstyle@@numberline{#1}\hfil}% - \else - \ifx\tocstyle@feature@spaceafternumber\relax - \hbox{\tocstyle@@numberline{#1}\enskip}% - \else - \hbox{\tocstyle@@numberline{#1}\hskip - \tocstyle@feature@spaceafternumber\relax}% - \fi - \fi -} -\newcommand*{\tocstyle@@numberline}[1]{% - #1\csname autodot\endcsname -} -\AtBeginDocument{% - \@ifpackageloaded{tocbasic}{% - \@ifpackagelater{tocbasic}{2016/03/01}{% - \PackageWarningNoLine{tocstyle}{% - Usage of `tocstyle' with new `tocbasic' detected.\MessageBreak - This is not an error! You can do this.\MessageBreak - Nevertheless, you should note, combining `tocstyle'\MessageBreak - with this version of `tocbasic' will break several\MessageBreak - features of `tocbasic'. You should use `tocstyle'\MessageBreak - features instead of `tocbasic' attributes for all\MessageBreak - entry changes you want.\MessageBreak - You may also get additional warnings because of\MessageBreak - redefined `\string\numberline'. Ignore them}% - }{}% - }{}% - \@ifpackageloaded{etoc}{% - \PackageWarningNoLine{tocstyle}{% - Usage of `tocstyle' with `etoc' detected.\MessageBreak - I suggest to use either `tocstyle' or `etoc'\MessageBreak - but not both of them together}% - }{}% - \@ifpackageloaded{titletoc}{% - \PackageWarningNoLine{tocstyle}{% - Usage of `tocstyle' with `titletoc' detected.\MessageBreak - I suggest to use either `tocstyle' or `titletoc'\MessageBreak - but not both of them together. I expect even\MessageBreak - error messages because of this combination}% - }{}% - \def\tocstyle@test@level{-1}% - \def\tocstyle@test@levelname{part}% - \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% - \setbox\@tempboxa\vbox{\hsize\maxdimen - \let\normalcolor\relax - \let\color\@gobble - \edef\reserved@a{% - \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% - \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% - {\tocstyle@test@level}% - }{}% - }% - \reserved@a - }% - \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% - \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% - }% - \ifnum\tocstyle@test@level<\z@ - \def\tocstyle@test@level{0}% - \fi - \def\tocstyle@test@levelname{chapter}% - \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% - \setbox\@tempboxa\vbox{\hsize\maxdimen - \let\normalcolor\relax - \let\color\@gobble - \edef\reserved@a{% - \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% - \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% - {\tocstyle@test@level}% - }{}% - }% - \reserved@a - }% - \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% - \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% - }% - \ifnum\tocstyle@test@level<\@ne - \def\tocstyle@test@level{1}% - \fi - \def\tocstyle@test@levelname{section}% - \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% - \setbox\@tempboxa\vbox{\hsize\maxdimen - \let\normalcolor\relax - \let\color\@gobble - \edef\reserved@a{% - \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% - \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% - {\tocstyle@test@level}% - }{}% - }% - \reserved@a - }% - \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% - \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% - }% - \def\tocstyle@test@levelname{paragraph}% - \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% - \setbox\@tempboxa\vbox{\hsize\maxdimen - \let\normalcolor\relax - \let\color\@gobble - \edef\reserved@a{% - \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% - \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% - {\tocstyle@test@level}% - }{}% - }% - \reserved@a - }% - \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% - \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% - }% - \def\tocstyle@test@level{1}% - \def\tocstyle@test@levelname{table}% - \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% - \setbox\@tempboxa\vbox{\hsize\maxdimen - \let\normalcolor\relax - \let\color\@gobble - \edef\reserved@a{% - \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% - \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% - {\tocstyle@test@level}% - }{}% - }% - \reserved@a - }% - \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% - \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% - }% - \def\tocstyle@test@level{1}% - \def\tocstyle@test@levelname{figure}% - \@whilesw\ifcsname l@\tocstyle@test@levelname\endcsname\fi{% - \setbox\@tempboxa\vbox{\hsize\maxdimen - \let\normalcolor\relax - \let\color\@gobble - \edef\reserved@a{% - \expandafter\noexpand\csname l@\tocstyle@test@levelname\endcsname{% - \noexpand\tocstyle@l@define{\tocstyle@test@levelname}% - {\tocstyle@test@level}% - }{}% - }% - \reserved@a - }% - \edef\tocstyle@test@levelname{sub\tocstyle@test@levelname}% - \edef\tocstyle@test@level{\the\numexpr\tocstyle@test@level+1}% - }% - \def\@tempa#1#2#3#4#5{% - \ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\p@ - {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip - \parindent #2\relax\@afterindenttrue - \interlinepenalty\@M - \leavevmode - \@tempdima #3\relax - \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip - {#4}\nobreak - \leaders\hbox{$\m@th - \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill - \nobreak - \hb@xt@\@pnumwidth{\hfil \normalfont \normalcolor #5}% - \par}% - \fi}% - \ifx\@dottedtocline\@tempa\else - \def\@tempa#1#2#3#4#5{% - \ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\p@ - {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip - \parindent #2\relax\@afterindenttrue - \interlinepenalty\@M - \leavevmode - \@tempdima #3\relax - \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip - {#4}\nobreak - \leaders\hbox{$\m@th - \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill - \nobreak - \hb@xt@\@pnumwidth{\hfil \normalfont \normalcolor #5\kern-\p@\kern\p@}% - \par}% - \fi}% - \ifx\@dottedtocline\@tempa\else - \tocstyle@macrochangewarning\@dottedtocline - \fi - \fi - \let\tocstyle@saved@dottedtocline\@dottedtocline - \def\@tempa#1{\hb@xt@\@tempdima{#1\autodot\hfil}}% - \ifx\numberline\@tempa\else - \def\@tempa#1{\hb@xt@\@tempdima{#1\hfil}}% - \ifx\numberline@tempa\else - \tocstyle@macrochangewarning\numberline - \fi - \fi - \let\tocstyle@saved@numberline\numberline -} -\newcommand*{\tocstyle@macrochangewarning}[1]{% - \PackageWarningNoLine{tocstyle}{% - unexpected \string#1\space definition!\MessageBreak - You are either using an unknown LaTeX kernel\MessageBreak - version, an unknown class or package, that redefines\MessageBreak - \string#1, or a \string#1\space - redefinition\MessageBreak - at the document preamble.\MessageBreak - Because of this you may get unexpected results!\MessageBreak - Maybe it would be better not to use package tocstyle}% - \PackageInfo{tocstyle}{Unexpected definition is:\MessageBreak - \meaning#1}% -} -\newcommand*{\tocstyle@activate@all@l}{} -\newcommand*{\tocstyle@l@define}[2]{% - \advance\leftskip-\@tempdima - \edef\@tempa{% - \noexpand\global\noexpand\let - \expandafter\noexpand\csname tocstyle@saved@l@#1\endcsname - \expandafter\noexpand\csname l@#1\endcsname - \noexpand\gdef - \expandafter\noexpand\csname tocstyle@l@#1\endcsname{% - \noexpand\@dottedtocline{#2}{\the\leftskip}{\the\@tempdima}}% - \noexpand\g@addto@macro\noexpand\tocstyle@activate@all@l{% - \noexpand\let\expandafter\noexpand\csname l@#1\endcsname - \expandafter\noexpand\csname tocstyle@l@#1\endcsname - }% - }% - \PackageInfo{tocstyle}{prepare \expandafter\string - \csname l@#1\endcsname\space for redefinition}% - \@tempa -} -\newcommand*{\showtoc}[2][\aliastoc\tocstyleTOC\tocstyleAliasTOC]{% - \ifcsname tocstyle@copyname@#2\endcsname - \@tempcnta \csname tocstyle@copyname@#2\endcsname\relax - \advance\@tempcnta \@ne - \expandafter\xdef\csname tocstyle@copyname@#2\endcsname{\the\@tempcnta}% - \else - \expandafter\xdef\csname tocstyle@copyname@#2\endcsname{1}% - \fi - \ifx\@dofilelist\relax\let\@dofilelist\@empty\fi - \edef\@tempa{\noexpand\g@addto@macro\noexpand\@dofilelist{% - \noexpand\tocstyle@copy@toc{#2}{\csname - tocstyle@copyname@#2\endcsname}}% - }\@tempa% - \begingroup - \edef\tocstyleAliasTOC{#2}% - \edef\tocstyleTOC{#2\csname tocstyle@copyname@#2\endcsname}% - #1 - \tocstyle@pre@starttoc{#2\csname tocstyle@copyname@#2\endcsname}% - \makeatletter - \@input{\jobname.#2\csname tocstyle@copyname@#2\endcsname}% - \@nobreakfalse - \tocstyle@post@starttoc{#2\csname tocstyle@copyname@#2\endcsname}% - \endgroup -} -\newcommand*{\tocstyle@copy@toc}[2]{% - \if@filesw - \begingroup - \endlinechar=\m@ne - \immediate\closeout\csname tf@#1\endcsname - \immediate\openin\@inputcheck \jobname.#1 - \immediate\openout\@partaux \jobname.#1#2 - \loop\unless\ifeof\@inputcheck - \immediate\readline\@inputcheck to \@tempa - \immediate\write\@partaux{\@tempa}% - \repeat - \immediate\closeout\@partaux - \immediate\closein\@inputcheck - \endgroup - \fi -} -\newcommand*{\aliastoc}[2]{% - \expandafter\edef\csname tocstyle@alias@TOC@#1\endcsname{#2}% -} -\newcommand*{\tocstyle@pre@starttoc}[1]{% - \begingroup - \expandafter\ifx\csname tocstyle@deactivated@\endcsname\relax - \expandafter\ifx\csname tocstyle@deactivated@#1\endcsname\relax\relax - \tocstyle@activetrue - \else - \tocstyle@activefalse - \fi - \else - \tocstyle@activefalse - \fi - \iftocstyle@active - \let\@dottedtocline\tocstyle@dottedtocline - \parskip \z@ - \parindent \z@ - \parfillskip \z@\@plus 1fil - \ifcsname tocstyle@alias@TOC@#1\endcsname - \edef\tocstyleAliasTOC{\csname tocstyle@alias@TOC@#1\endcsname}% - \else - \edef\tocstyleAliasTOC{#1}% - \fi - \edef\tocstyleTOC{#1}% - \tocstyle@activate@all@l - \fi -} -\newcommand*{\tocstyle@post@starttoc}[1]{% - \iftocstyle@active - \if@filesw - \ifcsname tocstyle@unumwidth@#1@\endcsname - \protected@write\@auxout{}{% - \protect\tocstyle@set@width{unum}{#1}{}{% - \csname tocstyle@unumwidth@#1@\endcsname}% - }% - \fi - \expandafter\let\expandafter\@tempa - \csname tocstyle@depthlist@#1\endcsname - \ifx\@tempa\relax\else - \expandafter\@for \expandafter\@tempa\expandafter:\expandafter=\@tempa - \do {% - \ifcsname tocstyle@numwidth@#1@\@tempa\endcsname - \protected@write\@auxout{}{% - \protect\tocstyle@set@width{num}{#1}{\@tempa}{% - \csname tocstyle@numwidth@#1@\@tempa\endcsname}% - }% - \fi - \ifcsname tocstyle@skipwidth@#1@\@tempa\endcsname - \protected@write\@auxout{}{% - \protect\tocstyle@set@width{skip}{#1}{\@tempa}{% - \csname tocstyle@skipwidth@#1@\@tempa\endcsname}% - }% - \fi - }% - \fi - \fi - \fi - \endgroup -} -\newcommand*{\tocstyle@set@width}[4]{% - \iftocstyle@indentnotnumbered - \ifdim #4<\z@ - \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{% - \dimexpr #4/2\relax}% - \else - \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{#4}% - \fi - \else - \ifdim #4<\z@ - \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{\z@}% - \else - \expandafter\gdef\csname tocstyle@max#1width@#2@#3\endcsname{#4}% - \fi - \fi -} -\AtBeginDocument{% - \if@filesw - \immediate\write\@auxout{% - \string\providecommand*\string\tocstyle@set@width[4]{}% - }% - \fi -} -\newcommand*{\tocstyleTOC}{} -\newcommand*{\tocstyleAliasTOC}{} -\newcommand*{\tocstyledepth}{} -\newif\iftocstyle@active -\newcommand*{\deactivatetocstyle}[1][]{% - \expandafter\let\csname tocstyle@deactivated@#1\endcsname\@empty} -\newcommand*{\reactivatetocstyle}[1][]{% - \expandafter\let\csname tocstyle@deactivated@#1\endcsname\relax} -\newcommand*{\@settocfeature}[1][]{% - \kernel@ifnextchar[ {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]} -} -\def\@@settocfeature[#1][#2]#3#4{% - \typeout{exclude: \tocstyle@feature@excludelist}% - \@expandtwoargs\in@{,#3,}{,\tocstyle@feature@excludelist,}% - \ifin@\else - \expandafter\ifcsname tocstyle@feature@#3\endcsname - \@namedef{tocstyle@feature@#3@#1@#2}{#4}% - \begingroup - \expandafter\let\expandafter\@tempa - \csname tocstyle@commandlist@#1\endcsname - \@expandtwoargs\in@{,tocstyle@feature@#3@#1@#2,}{,\@tempa,}% - \ifin@\let\@tempa\endgroup\else - \edef\@tempa{\endgroup - \noexpand\expandafter\noexpand\ifx - \noexpand\csname tocstyle@commandlist@#1\noexpand\endcsname\relax - \noexpand\expandafter\noexpand\expandafter\noexpand\expandafter - \noexpand\def - \noexpand\else - \noexpand\expandafter\noexpand\expandafter\noexpand\expandafter - \noexpand\l@addto@macro - \noexpand\fi - \noexpand\csname tocstyle@commandlist@#1\noexpand\endcsname% - {tocstyle@feature@#3@#1@#2,}}% - \fi - \@tempa - \else - \PackageError{tocstyle}{unkown feature `#3'}{% - You've told me to set up toc style feature `#3',\MessageBreak - but I don't know this feature.\MessageBreak - See the tocstyle manual for all known feature.\MessageBreak - }% - \fi - \fi -} -\newcommand*{\settocfeature}{} -\let\settocfeature\@settocfeature -\providecommand{\l@addto@macro}[2]{% - \edef#1{\unexpanded\expandafter{#1#2}}% -}% -\newcommand*{\@settocstylefeature}{% - \kernel@ifnextchar[ {\@settocfeature[]}{\@settocfeature[][]}% -} -\newcommand*{\settocstylefeature}{} -\let\settocstylefeature\@settocstylefeature -\newcommand*{\tocstyle@activate@features}{% - \expandafter\ifx\csname tocstyle@depthlist@\tocstyleTOC\endcsname\relax - \expandafter\xdef\csname tocstyle@depthlist@\tocstyleTOC\endcsname{% - \tocstyledepth}% - \else - \expandafter\let\expandafter\@tempa - \csname tocstyle@depthlist@\tocstyleTOC\endcsname - \@expandtwoargs\in@{,\tocstyledepth,}{,\@tempa,}% - \ifin@\else - \expandafter\xdef\csname tocstyle@depthlist@\tocstyleTOC\endcsname{% - \csname tocstyle@depthlist@\tocstyleTOC\endcsname,\tocstyledepth}% - \fi - \fi - \expandafter\@for \expandafter\@tempa - \expandafter:\expandafter=\tocstyle@featurelist \do - {% - \@ifundefined{tocstyle@feature@\@tempa @\tocstyleAliasTOC @\tocstyledepth}{% - \@ifundefined{tocstyle@feature@\@tempa @@\tocstyledepth}{% - \@ifundefined{tocstyle@feature@\@tempa @\tocstyleAliasTOC @}{% - \@ifundefined{tocstyle@feature@\@tempa @@}{% - \expandafter\let\csname tocstyle@feature@\@tempa\endcsname\relax - }{% - \expandafter\let\csname tocstyle@feature@\@tempa - \expandafter\endcsname - \csname tocstyle@feature@\@tempa @@\endcsname - }% - }{% - \expandafter\let\csname tocstyle@feature@\@tempa - \expandafter\endcsname - \csname tocstyle@feature@\@tempa @\tocstyleAliasTOC @\endcsname - }% - }{% - \expandafter\let\csname tocstyle@feature@\@tempa - \expandafter\endcsname - \csname tocstyle@feature@\@tempa @@\tocstyledepth\endcsname - }% - }{% - \expandafter\let\csname tocstyle@feature@\@tempa - \expandafter\endcsname - \csname tocstyle@feature@\@tempa @\tocstyleAliasTOC @\tocstyledepth\endcsname - }% - }% -} -\newcommand*{\newtocstyle}{% - \kernel@ifnextchar [{\@newtocstyle}{\@newtocstyle[]}} -\newcommand*{\@newtocstyle}{} -\def\@newtocstyle[#1]{% - \kernel@ifnextchar [{\@@newtocstyle[{#1}]}{\@newtocstyle[{#1}][]}} -\newcommand*{\@@newtocstyle}{} -\def\@@newtocstyle[#1][#2]#3#4{% - \@ifundefined{tocstyle@style@#3}{% - \@ifundefined{tocstyle@style@#1}{% - \ifx \relax#1\relax\else - \PackageError{tocstyle}{unknown parent TOC style `#1'}{% - You've told me to inheritate parent TOC style `#1',\MessageBreak - but there's no TOC style `#1' defined.}% - \fi - \expandafter\def\csname tocstyle@style@#3\endcsname{#4}% - }{% - \expandafter\def\csname tocstyle@style@#3\endcsname{% - \edef\reserved@a{% - \noexpand\l@addto@macro\noexpand\tocstyle@feature@excludelist{#2}% - \noexpand\@usetocstyle{#1}% - \noexpand\def\noexpand\tocstyle@feature@excludelist{% - \tocstyle@feature@excludelist}% - }\reserved@a - #4% - }% - }% - }{% - \PackageError{tocstyle}{TOC style `#3' already defined}{% - You've tried to define a new TOC style `#3',\MessageBreak - but there's already a TOC style named `#3'.}% - }% -} -\newcommand*{\tocstyle@feature@excludelist}{} -\newcommand*{\usetocstyle}[2][]{% - \@ifundefined{tocstyle@deprecated@style@#2}{% - \@ifundefined{tocstyle@style@#2}{% - \PackageError{tocstyle}{unknown TOC style `#2'}{% - You've told me to use TOC style `#2',\MessageBreak - but there's no TOC style `#2' defined.}% - }{% - \def\settocfeature{% - \kernel@ifnextchar[ %] - {\@@settocfeature[{#1}]}{\@@settocfeature[{#1}][]}% - }% - \let\settocstylefeature\settocfeature - \expandafter\ifx\csname tocstyle@commandlist@#1\endcsname\relax - \else - \expandafter\expandafter\expandafter\@for - \expandafter\expandafter\expandafter\@tempa - \expandafter\expandafter\expandafter:% - \expandafter\expandafter\expandafter=% - \csname tocstyle@commandlist@#1\endcsname - \do{% - \expandafter\let\csname \@tempa\endcsname\relax - }% - \expandafter\let\csname tocstyle@commandlist@#1\endcsname\relax - \fi - \@usetocstyle{#2}% - \let\settocfeature\@settocfeature - \let\settocstylefeature\@settocstylefeature - }% - }{% - \expandafter\ifx\csname tocstyle@deprecated@style@#2\endcsname\@empty - \PackageWarning{tocstyle}{% - deprecated TOC style `#2'!\MessageBreak - You should not longer use this style,\MessageBreak - because it will be removed soon.\MessageBreak - You should select another TOC style}% - \usetocstyle[{#1}]{deprecated@#2}% - \else - \PackageWarning{tocstyle}{% - deprecated TOC style `#2'!\MessageBreak - You should use TOC style '\csname - tocstyle@deprecated@style@#2\endcsname'\MessageBreak - instead of `#2'}% - \fi - }% -} -\newcommand*{\@usetocstyle}[1]{% - \csname tocstyle@style@#1\endcsname -} -\newcommand*{\tocstyle@featurelist}{% - pagenumberhook,entryhook,dothook,entryvskip,leaders,raggedhook,% - spaceafternumber,parfillskip,pagenumberbox,% -} -\newcommand*{\tocstyle@feature@pagenumberhook}{} -\let\tocstyle@feature@pagenumberhook\relax -\newcommand*{\tocstyle@feature@pagenumberbox}{} -\let\tocstyle@feature@pagenumberbox\relax -\newcommand*{\tocstye@feature@entryhook}{} -\let\tocstyle@feature@entryhook\relax -\newcommand*{\tocstye@feature@dothook}{} -\let\tocstyle@feature@dothook\relax -\newcommand*{\tocstye@feature@entryvskip}{} -\let\tocstyle@feature@entryvskip\relax -\newcommand*{\tocstye@feature@leaders}{} -\let\tocstyle@feature@leaders\relax -\newcommand*{\tocstye@feature@parfillskip}{} -\let\tocstyle@feature@parfillskip\relax -\newcommand*{\tocstye@feature@raggedhook}{} -\let\tocstyle@feature@raggedhook\relax -\newcommand*{\tocstye@feature@spaceafternumber}{} -\let\tocstyle@feature@spaceafternumber\relax -\newcommand*{\iftochasdepth}[2]{% - \begingroup - \expandafter\let\expandafter\@tempa\csname tocstyle@depthlist@#1\endcsname - \ifx\@tempa\relax - \aftergroup\@secondoftwo - \else - \@expandtwoargs\in@{,#2,}{,\@tempa}% - \expandafter\aftergroup\ifin@ - \@firstoftwo - \else - \@secondoftwo - \fi - \fi - \endgroup -} -\providecommand*{\ext@toc}{toc} -\newtocstyle{standard}{% - \settocfeature{dothook}{\normalfont}% - \settocfeature[-1]{entryhook}{\bfseries}% - \settocfeature[-1]{entryvskip}{2.25em\@plus\p@}% - \settocfeature[-1]{leaders}{\hfill}% - \settocfeature[0]{entryvskip}{1em\@plus\p@}% - \settocfeature[0]{leaders}{\hfill}% - \settocfeature[0]{entryhook}{\bfseries} - \iftochaschapter\else - \settocfeature[1]{entryvskip}{1em\@plus\p@}% - \settocfeature[1]{leaders}{\hfill}% - \settocfeature[1]{entryhook}{% - \ifx\tocstyleAliasTOC\ext@toc\bfseries\fi - }% - \fi -} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname KOMAClassName\endcsname\relax - \newtocstyle{KOMAlike}{% - \settocfeature{dothook}{\normalfont}% - \settocfeature[-1]{entryhook}{\sffamily\bfseries}% - \settocfeature[-1]{entryvskip}{2.25em\@plus\p@}% - \settocfeature[-1]{leaders}{\hfill}% - \settocfeature[-1]{pagenumberhook}{\sffamily\bfseries}% - \settocfeature[0]{entryvskip}{1em\@plus\p@}% - \settocfeature[0]{leaders}{\hfill}% - \settocfeature[0]{entryhook}{\sffamily\bfseries} - \settocfeature[0]{pagenumberhook}{\sffamily\bfseries}% - \iftochaschapter\else - \settocfeature[1]{entryvskip}{1em\@plus\p@}% - \settocfeature[1]{leaders}{\hfill}% - \settocfeature[1]{entryhook}{% - \ifx\tocstyleAliasTOC\ext@toc\sffamily\bfseries\fi - }% - \settocfeature[1]{pagenumberhook}{% - \ifx\tocstyleAliasTOC\ext@toc\sffamily\bfseries\fi - }% - \fi - } -\else - \newtocstyle{KOMAlike}{% - \settocfeature{dothook}{\normalfont}% - \settocfeature[-1]{entryhook}{\usekomafont{partentry}}% - \settocfeature[-1]{entryvskip}{2.25em\@plus\p@}% - \settocfeature[-1]{leaders}{\hfill}% - \settocfeature[-1]{pagenumberhook}{\usekomafont{partentrypagenumber}}% - \settocfeature[0]{entryvskip}{1em\@plus\p@}% - \settocfeature[0]{leaders}{\hfill}% - \settocfeature[0]{entryhook}{\usekomafont{chapterentry}}% - \settocfeature[0]{pagenumberhook}{\usekomafont{chapterentrypagenumber}}% - \iftochaschapter\else - \settocfeature[1]{entryvskip}{1em\@plus\p@}% - \settocfeature[1]{leaders}{\hfill}% - \settocfeature[1]{entryhook}{% - \begingroup - \ifx\tocstyleAliasTOC\ext@toc - \def\@tempa{\endgroup\usekomafont{sectionentry}}% - \else - \let\@tempa\endgroup - \fi - \@tempa - }% - \settocfeature[1]{pagenumberhook}{% - \begingroup - \ifx\tocstyleAliasTOC\ext@toc - \def\@tempa{\endgroup\usekomafont{sectionentrypagenumber}}% - \else - \let\@tempa\endgroup - \fi - \@tempa - }% - \fi - } -\fi -\newcommand*{\tocstyle@deprecated@style@KOMAScript}{KOMAlike}% -\newtocstyle[KOMAlike]{classic}{% - \settocfeature[-1]{pagenumberhook}{\normalfont\normalcolor}% - \settocfeature[0]{pagenumberhook}{\normalfont\normalcolor}% - \iftochaschapter\else - \settocfeature[1]{pagenumberhook}{\normalfont\normalcolor}% - \fi - \settocfeature{pagenumberhook}{\normalfont\normalcolor}% - \settocfeature{raggedhook}{\raggedright}% -} -\newtocstyle[classic][leaders]{allwithdot}{} -\newtocstyle[allwithdot]{noonewithdot}{% - \settocfeature{leaders}{\hfill}% -} -\newtocstyle[classic][leaders]{nopagecolumn}{% - \settocfeature{leaders}{\quad}% - \settocfeature{parfillskip}{\z@ plus 1fil}% - \settocfeature{pagenumberbox}{\hbox}% -} -\InputIfFileExists{tocstyle.cfg}{% - \PackageInfo{tocstyle}{using tocstyle.cfg}% -}{% - \PackageInfo{tocstyle}{no tocstyle.cfg found}% -} -%%% 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 `tocstyle.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index e7e96efb062..f56c4b5f32c 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2020/04/19 v3.30 KOMA-Script + 2020/07/22 v3.31 KOMA-Script package (type area)] %%% 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 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -165,13 +165,14 @@ \@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 3470 2020-03-24 12:12:02Z kohm $ +\@namedef{scr@v@3.31}{18} +\@namedef{scr@v@last}{18} +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} \newcommand*{\@lastdiv}{\z@}\let\@lastdiv\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -226,7 +227,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \Ifstr{#2}{letter}{% @@ -991,9 +992,9 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3451 2020-02-24 16:22:41Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) \newcommand*{\ta@divfor}[1]{% \ta@div=\z@ @@ -1733,7 +1734,7 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% From File: $Id: scrkernel-typearea.dtx 3470 2020-03-24 12:12:02Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z 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 a7d7dee8df0..88dfd947ac3 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 3481 2020-04-19 09:52:23Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/04/19 v3.30 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) -- cgit v1.2.3