diff options
| author | Karl Berry <karl@freefriends.org> | 2021-03-21 21:34:33 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-03-21 21:34:33 +0000 |
| commit | 81cddd7517e67e55f78f585fe591499404736882 (patch) | |
| tree | 8295511489c0cc4fa8d050ad16ba9188d97af21a /Master/texmf-dist/tex/latex/koma-script | |
| parent | 18662b9a3d569ac82849d73b96ae9004c8200c3a (diff) | |
koma-script (21mar21)
git-svn-id: svn://tug.org/texlive/trunk@58585 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
54 files changed, 777 insertions, 743 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index bc11da30614..a6aecc677ad 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 30b23b51b70..17cfe360d9f 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 4b90e9aed0b..c5f6b05d92a 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 3a26615bc55..562b9c52c7d 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 2f90b6a2af8..5c2f49d453c 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) @@ -218,7 +218,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ %%% (run: body) \def\setpresigskip{\@setplength{sigbeforevskip}} \endinput diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 53d2f5649b9..e8980e61ecb 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 167d41acfd9..5a1ddb78341 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 5114c833b5e..66c59aed635 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 63a9e97987b..26ab8737045 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 7ae08e2f012..5ad42c2ae08 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 a885322a211..ea989ccc066 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 19527e6d47e..6de88e51bd6 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 c6b333e4eea..f073dcce0a7 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 429e69755a4..d88f539d0f8 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 029cc8c1aa9..3bc07355bff 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 65a26a855f4..743d7108670 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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 0dade3f5a97..81b8d15906f 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{float.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package float)% diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index 1b941db8e06..525626ba4af 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{floatrow.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package floatrow)% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index b13d7eb556b..3a4781ce6f3 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{hyperref.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package hyperref)% diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 0455e99330b..319d87693d2 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{listings.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package listings)% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak index cc635d0a15d..e35848eca38 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{lscape.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package lscape)% diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak index 5dbead76ebb..c7d47ed7793 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{nomencl.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package nomencl)% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 6f74a1787e6..5460d403262 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script ] \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% @@ -140,7 +140,7 @@ } %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z 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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -272,10 +272,11 @@ \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} +\@namedef{scr@v@3.33}{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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -350,7 +351,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -621,7 +622,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -824,7 +825,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -900,7 +901,23 @@ }{bookmark}\MessageBreak before \string\begin{document}% }% - \RequirePackage{bookmark}% + \@ifundefined{es@quoting}{% + \RequirePackage{bookmark}% + }{% + \ifx\es@quoting\activatequoting + \ClassInfo{\KOMAClassName}{% + temporary deactivation of babel-spanish quoting + }% + \deactivatequoting + \RequirePackage{bookmark}% + \ClassInfo{\KOMAClassName}{% + reactivation of babel-spanish quoting + }% + \activatequoting + \else + \RequirePackage{bookmark}% + \fi + }% \ifx\@beginmainauxhook\relax \else \if@filesw @@ -1262,7 +1279,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1816,19 +1833,19 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2358,48 +2375,82 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} \setlength{\columnseprule}{\z@} -\newcommand*{\scr@selectfont}{} -\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname -\BeforePackage{everysel}{% - \AtBeginDocument{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else - \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}% - \fi - \expandafter\let\csname selectfont \endcsname\scr@selectfont +\IfLTXAtLeastTF{2021/01/05}{% + \AddToHook{selectfont}{\par@update}% + \AfterPackage{everysel}{% + \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% + \ClassError{\KOMAClassName}{% + incompatible `everysel' detected + }{% + You are using an old version of `everysel' in combination with a + LaTeX\MessageBreak + version >= 2021/01/05 and KOMA-Script >= 3.33. This combination + is\MessageBreak + not supported.\MessageBreak + You could switch back to an older LaTeX using package + `latexrelease'.\MessageBreak + But I recommend to update `everysel'% + }% + }% }% -} -\AfterPackage{everysel}{% - \scr@ifundefinedorrelax{@EverySelectfont@Init}{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont - \ClassWarningNoLine{\KOMAClassName}{% - \string\selectfont\space already changed}% - \else - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname - \fi - }{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname + \AfterPackage{tracefnt}{% + \IfPackageAtLeastTF{tracefnt}{2020/12/22}{}{% + \ClassError{\KOMAClassName}{% + incompatible `tracefnt' detected + }{% + `tracefnt' is a LaTeX base package and therefore should be updated + together\MessageBreak + with LaTeX kernel. So this should never happen! Please check + your\MessageBreak + LaTeX installation% + }% }% }% -} -\AfterPackage{tracefnt}{% +}{% + \newcommand*{\scr@selectfont}{} \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \BeforePackage{everysel}{% + \AtBeginDocument{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else + \ClassWarningNoLine{\KOMAClassName}{% + discard change of \string\selectfont}% + \fi + \expandafter\let\csname selectfont \endcsname\scr@selectfont + }% + }% + \AfterPackage{everysel}{% + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% + }% + }% + \AfterPackage{tracefnt}{% + \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + }% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} + \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} -\newcommand*{\scr@new@selectfont}{} -\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname \newcommand*{\par@updaterelative}{% \begingroup \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent @@ -2963,7 +3014,7 @@ %%% 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 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \providecommand*{\ifnumbered}{% @@ -4849,7 +4900,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5154,7 +5205,7 @@ \fi } \AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2019/07/17}{% + \@ifpackagelater{titlesec}{2019/10/17}{% \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak Cross your fingers, that is compatible% }% @@ -5277,7 +5328,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6086,7 +6137,7 @@ \else\expandafter\captionbelow\fi } ]{lot} -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -6238,7 +6289,7 @@ \newcommand*{\thefootnotemark}{\@thefnmark} \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} \deffootnotemark{\textsuperscript{\thefootnotemark}} -\newcommand*{\footref}[1]{% +\providecommand*{\footref}[1]{% \begingroup \unrestored@protected@xdef\@thefnmark{\ref{#1}}% \endgroup @@ -6516,7 +6567,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -6556,10 +6607,10 @@ \renewcommand*\p@enumii{\theenumi} \renewcommand*\p@enumiii{\p@enumii(\theenumii)} \renewcommand*\p@enumiv{\p@enumiii\theenumiii} -\newcommand*\labelitemi{\textbullet} -\newcommand*\labelitemii{\normalfont\bfseries\textendash} -\newcommand*\labelitemiii{\textasteriskcentered} -\newcommand*\labelitemiv{\textperiodcentered} +\newcommand*\labelitemi{\usekomafont{labelitemi}{\textbullet}} +\newcommand*\labelitemii{\usekomafont{labelitemii}{\textendash}} +\newcommand*\labelitemiii{\usekomafont{labelitemiii}{\textasteriskcentered}} +\newcommand*\labelitemiv{\usekomafont{labelitemiv}{\textperiodcentered}} \newenvironment{description}{% \list{}{\labelwidth\z@ \itemindent-\leftmargin \let\makelabel\descriptionlabel}% @@ -6674,6 +6725,12 @@ } \newcommand*\descfont{\@gr@gsffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newcommand*{\labelitemfont}{\normalfont} +\newcommand*\scr@fnt@itemizelabel{\labelitemfont} +\newkomafont{labelitemi}{\usekomafont{itemizelabel}} +\newkomafont{labelitemii}{\usekomafont{itemizelabel}\bfseries} +\newkomafont{labelitemiii}{\usekomafont{itemizelabel}} +\newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} %%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index 961f98df543..565c301e6c1 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 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 022b2bc6f75..760e50da1fb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (% KOMA-Script-independent @@ -120,6 +120,11 @@ \fi \iterate } +\newcommand*{\IfLTXAtLeastTF}{\@ifl@t@r\fmtversion} +\ifcsname IfFormatAtLeastTF\endcsname + \let\IfLTXAtLeastTF\IfFormatAtLeastTF +\fi +\@onlypreamble\IfLTXAtLeastTF \newcommand{\scr@ifundefinedorrelax}[1]{% \ifcsname #1\endcsname \expandafter\ifx\csname #1\endcsname\relax @@ -243,6 +248,93 @@ \newcommand*{\FamilyOfKey}{} \newcommand*{\FamilyMemberOfKey}{} \newcommand*{\@globaloptionslist}{} +\IncludeInRelease{2021/05/01}{\FamilyProcessOptions}{% + Usage of raw option list} +\newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{% + \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions + \PackageError{scrbase}{nested \string\FamilyProcessOptions\space + detected\MessageBreak}{% + \string\FamilyProcessOptions\space has been used while processing or + setting options.\MessageBreak + This is currently not allowed. You should contact the author of the + causing\MessageBreak + code.\MessageBreak + This error is fatal. You should not continue.% + }% + \fi + \scr@ifundefinedorrelax{scr@before@process@options@#2@hook}{}{% + \@nameuse{scr@before@process@options@#2@hook}% + }% + \scr@ifundefinedorrelax{scr@before@process@options@#2#1@hook}{}{% + \@nameuse{scr@before@process@options@#2#1@hook}% + \expandafter\let\csname scr@before@process@options@#2#1@hook\endcsname + \relax + }% + \scr@ifundefinedorrelax{scr@after@options@#2@hook}{% + \@namedef{scr@after@options@#2@hook}{% + \@namedef{scr@after@options@#2@hook}{}% + }% + }{% + \expandafter\edef\csname scr@after@options@#2@hook\endcsname{% + \noexpand\@namedef{scr@after@options@#2@hook}{% + \unexpanded\expandafter\expandafter\expandafter + {\csname scr@after@options@#2@hook\endcsname}% + }% + }% + }% + \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate + \@namedef{scr@after@options@#2@hook@topmost}{% + \@namedef{scr@after@options@#2@hook@topmost}{}% + }% + \expandafter\l@addto@macro\csname scr@after@options@#2@hook\endcsname{% + \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate + \@nameuse{scr@after@options@#2@hook@topmost}% + }% + \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions + \fi + \let\ds@\@empty + \@ifundefined{@raw@opt@\@currname.\@currext}{% + \let\@curroptions\@empty + }{% + \expandafter\let\expandafter\@curroptions + \csname @raw@opt@\@currname.\@currext\endcsname + }% + \ifx\@currext\@clsextension\else + \@for\CurrentOption:=\@raw@classoptionslist\do{% + \scr@trim@spaces\CurrentOption + \ifx\CurrentOption\@empty\else + \@ifundefined{ds@\CurrentOption}{% + \scr@ifprocess@curroption{#1}{#2}{% + \@expandtwoargs\@removeelement{% + \expandafter\@remove@eq@value\CurrentOption=\@nil}% + \@unusedoptionlist\@unusedoptionlist + }{}% + }{% + \@use@ption + \expandafter\let\csname ds@\CurrentOption\endcsname\@empty + }% + \fi + }% + \fi + \@for\CurrentOption:=\@curroptions\do{% + \scr@trim@spaces\CurrentOption + \@ifundefined{ds@\CurrentOption}{% + \@use@ption + \scr@ifprocess@curroption{#1}{#2}{}\default@ds + }\@use@ption + }% + \@for\CurrentOption:=\@declaredoptions\do{% + \expandafter\let\csname ds@\CurrentOption\endcsname\relax}% + \let\CurrentOption\@empty + \let\@fileswith@pti@ns\@@fileswith@pti@ns + \AtEndOfPackage{\expandafter\let + \csname unprocessedoptions-\@currname.\@currext\endcsname + \relax}% + \@nameuse{scr@after@options@#2@hook}% +} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\FamilyProcessOptions}{% + compatibility for LaTeX before 2021/05/01} \newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{% \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions \PackageError{scrbase}{nested \string\FamilyProcessOptions\space @@ -325,9 +417,16 @@ \expandafter\let\csname ds@\CurrentOption\endcsname\relax}% \let\CurrentOption\@empty \let\@fileswith@pti@ns\@@fileswith@pti@ns - \AtEndOfPackage{\let\@unprocessedoptions\relax}% + \IfLTXAtLeastTF{2020/10/01}{% + \AtEndOfPackage{\expandafter\let + \csname unprocessedoptions-\@currname.\@currext\endcsname + \relax}% + }{% + \AtEndOfPackage{\let\@unprocessedoptions\relax}% + }% \@nameuse{scr@after@options@#2@hook}% } +\EndIncludeInRelease \@onlypreamble\FamilyProcessOptions \newcommand*{\BeforeFamilyProcessOptions}[3][.\@currname.\@currext]{% \scr@ifundefinedorrelax{scr@before@process@options@#2#1@hook}{% @@ -429,6 +528,9 @@ } \@tempa{ } \long\def\scr@sp@c#1\@nil#2\relax#3{\@temptokena{#1}\edef#3{\the\@temptokena}} +\newcommand\scr@trim@spaces[1]{% + \expandafter\scr@sp@def\expandafter#1\expandafter{#1}% +} \newcommand{\IfArgIsEmpty}[1]{% \if\relax\detokenize{#1}\relax \expandafter\@firstoftwo @@ -464,7 +566,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: option) \DefineFamily{KOMA} \DefineFamilyMember{KOMA} @@ -478,7 +580,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -500,9 +602,6 @@ }% \reserved@a } -\newcommand\scr@trim@spaces[1]{% - \expandafter\scr@sp@def\expandafter#1\expandafter{#1}% -} \newif\if@atdocument \AtBeginDocument{\@atdocumenttrue} \@onlypreamble\@atdocumentrue diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index c42b4bdeb84..45832b43a0d 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -143,7 +143,7 @@ \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z 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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -299,10 +299,11 @@ \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} +\@namedef{scr@v@3.33}{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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -376,7 +377,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -647,7 +648,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -847,7 +848,7 @@ {notitlepage}{titlepage=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -951,7 +952,23 @@ }{bookmark}\MessageBreak before \string\begin{document}% }% - \RequirePackage{bookmark}% + \@ifundefined{es@quoting}{% + \RequirePackage{bookmark}% + }{% + \ifx\es@quoting\activatequoting + \ClassInfo{\KOMAClassName}{% + temporary deactivation of babel-spanish quoting + }% + \deactivatequoting + \RequirePackage{bookmark}% + \ClassInfo{\KOMAClassName}{% + reactivation of babel-spanish quoting + }% + \activatequoting + \else + \RequirePackage{bookmark}% + \fi + }% \ifx\@beginmainauxhook\relax \else \if@filesw @@ -1421,7 +1438,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -2023,20 +2040,20 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2573,48 +2590,82 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} \setlength{\columnseprule}{\z@} -\newcommand*{\scr@selectfont}{} -\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname -\BeforePackage{everysel}{% - \AtBeginDocument{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else - \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}% - \fi - \expandafter\let\csname selectfont \endcsname\scr@selectfont +\IfLTXAtLeastTF{2021/01/05}{% + \AddToHook{selectfont}{\par@update}% + \AfterPackage{everysel}{% + \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% + \ClassError{\KOMAClassName}{% + incompatible `everysel' detected + }{% + You are using an old version of `everysel' in combination with a + LaTeX\MessageBreak + version >= 2021/01/05 and KOMA-Script >= 3.33. This combination + is\MessageBreak + not supported.\MessageBreak + You could switch back to an older LaTeX using package + `latexrelease'.\MessageBreak + But I recommend to update `everysel'% + }% + }% }% -} -\AfterPackage{everysel}{% - \scr@ifundefinedorrelax{@EverySelectfont@Init}{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont - \ClassWarningNoLine{\KOMAClassName}{% - \string\selectfont\space already changed}% - \else - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname - \fi - }{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname + \AfterPackage{tracefnt}{% + \IfPackageAtLeastTF{tracefnt}{2020/12/22}{}{% + \ClassError{\KOMAClassName}{% + incompatible `tracefnt' detected + }{% + `tracefnt' is a LaTeX base package and therefore should be updated + together\MessageBreak + with LaTeX kernel. So this should never happen! Please check + your\MessageBreak + LaTeX installation% + }% }% }% -} -\AfterPackage{tracefnt}{% +}{% + \newcommand*{\scr@selectfont}{} \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \BeforePackage{everysel}{% + \AtBeginDocument{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else + \ClassWarningNoLine{\KOMAClassName}{% + discard change of \string\selectfont}% + \fi + \expandafter\let\csname selectfont \endcsname\scr@selectfont + }% + }% + \AfterPackage{everysel}{% + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% + }% + }% + \AfterPackage{tracefnt}{% + \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + }% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} + \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} -\newcommand*{\scr@new@selectfont}{} -\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname \newcommand*{\par@updaterelative}{% \begingroup \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent @@ -3146,7 +3197,7 @@ %%% 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 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -5691,7 +5742,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -6001,7 +6052,7 @@ \fi } \AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2019/07/17}{% + \@ifpackagelater{titlesec}{2019/10/17}{% \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak Cross your fingers, that is compatible% }% @@ -6129,7 +6180,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6956,7 +7007,7 @@ \fi \@arabic\c@table } -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -7109,7 +7160,7 @@ \newcommand*{\thefootnotemark}{\@thefnmark} \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} \deffootnotemark{\textsuperscript{\thefootnotemark}} -\newcommand*{\footref}[1]{% +\providecommand*{\footref}[1]{% \begingroup \unrestored@protected@xdef\@thefnmark{\ref{#1}}% \endgroup @@ -7392,7 +7443,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7432,10 +7483,10 @@ \renewcommand*\p@enumii{\theenumi} \renewcommand*\p@enumiii{\p@enumii(\theenumii)} \renewcommand*\p@enumiv{\p@enumiii\theenumiii} -\newcommand*\labelitemi{\textbullet} -\newcommand*\labelitemii{\normalfont\bfseries\textendash} -\newcommand*\labelitemiii{\textasteriskcentered} -\newcommand*\labelitemiv{\textperiodcentered} +\newcommand*\labelitemi{\usekomafont{labelitemi}{\textbullet}} +\newcommand*\labelitemii{\usekomafont{labelitemii}{\textendash}} +\newcommand*\labelitemiii{\usekomafont{labelitemiii}{\textasteriskcentered}} +\newcommand*\labelitemiv{\usekomafont{labelitemiv}{\textperiodcentered}} \newenvironment{description}{% \list{}{\labelwidth\z@ \itemindent-\leftmargin \let\makelabel\descriptionlabel}% @@ -7550,6 +7601,12 @@ } \newcommand*\descfont{\@gr@gsffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newcommand*{\labelitemfont}{\normalfont} +\newcommand*\scr@fnt@itemizelabel{\labelitemfont} +\newkomafont{labelitemi}{\usekomafont{itemizelabel}} +\newkomafont{labelitemii}{\usekomafont{itemizelabel}\bfseries} +\newkomafont{labelitemiii}{\usekomafont{itemizelabel}} +\newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} %%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 62c37a0a303..bde6a4f3f44 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 0bf021ee7b9..767e4fffaa3 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 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,7 +100,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -133,13 +133,13 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -219,6 +219,7 @@ \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} +\@namedef{scr@v@3.33}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) @@ -244,7 +245,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -299,7 +300,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -439,7 +440,7 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) @@ -525,7 +526,7 @@ \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} %%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -596,14 +597,14 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -1350,11 +1351,11 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname @@ -1465,7 +1466,7 @@ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: body) \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax @@ -1597,7 +1598,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: body) \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index aa62aad0c5e..44678efb22c 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 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/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 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 6d533b39e93..477cd7414a9 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,10 +74,10 @@ %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index a81cbdceaa7..a7cffc0557f 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/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 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 a72a7b52b07..8b0ab6d2af3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (% KOMA-Script-dependent @@ -242,12 +242,12 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: option) \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty deleted file mode 100644 index 605f5ffa24c..00000000000 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty +++ /dev/null @@ -1,330 +0,0 @@ -%% -%% This is file `scrlayer-fancyhdr.sty', -%% generated with the docstrip utility, extended by scrdocstrip. -%% -%% The original source files were: -%% -%% scrlayer-fancyhdr.dtx (with options: `interface,trace,fancyhdr,identify') -%% scrlayer.dtx (with options: `interface,trace,fancyhdr,init') -%% scrlayer-fancyhdr.dtx (with options: `interface,trace,fancyhdr,init') -%% scrlayer.dtx (with options: `interface,trace,fancyhdr,options') -%% scrlayer-fancyhdr.dtx (with options: `interface,trace,fancyhdr,options') -%% scrlayer.dtx (with options: `interface,trace,fancyhdr,body') -%% scrlayer-fancyhdr.dtx (with options: `interface,trace,fancyhdr,body') -%% scrlogo.dtx (with options: `logo') -%% -%% Copyright (c) 2018-2019 Markus Kohm [komascript at gmx info] -%% -%% This file was generated from file(s) of the KOMA-Script bundle. -%% --------------------------------------------------------------- -%% -%% It may be distributed under the conditions of the -%% LaTeX Project Public License in the version distributed together -%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. -%% -%% This file may only be distributed together with a copy of the -%% KOMA-Script bundle. You may however distribute the -%% KOMA-Script bundle without all such generated files. See also -%% `lppl.txt' or `lppl-de.txt' for additional information. -%% -%% The list of files belonging to KOMA-Script distribution is given in -%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for -%% additional information. -%% -%% If this file is a beta version, you may not be allowed to distribute -%% it. Look at the comments below to see if this is the case. -%% -%% English and German manuals are part of KOMA-Script bundle. -%% ---------------------------------------------------------- -%% -%% See `README'. -%% -%% The KOMA-Script bundle (but maybe not this file) was based upon the -%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. You can -%% find a complete unmodified copy of LaTeX2e at -%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. -%% -%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ -%%% (run: identify) -\NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{scrlayer-fancyhdr}[% - 2018/05/03 v0.1.3138 ALPHA KOMA-Script - package - (end user interface for scrlayer)] -\PackageWarningNoLine{scrlayer-fancyhdr}{% - THIS IS AN ALPHA VERSION OF AN\MessageBreak - EXPERIMENTAL PACKAGE!\MessageBreak - YOU SHOULD NOT USE THIS PACKAGE FOR\MessageBreak - ANYTHING ELSE BUT TESTING% -} -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ -%%% (run: init) -\RequirePackage{scrlayer} -\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% - \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% -}{% - \ifx\scrlayer@AtEndOfPackage\@firstofone - \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% - \fi -} -\let\scrlayer@AtEndOfPackage\AtEndOfPackage -%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ -%%% (run: init) -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ -%%% (run: options) -\KOMA@key{markcase}{% - \begingroup - \KOMA@set@ncmdkey{markcase}{reserved@a}{% - {upper}{0},{lower}{1},{used}{2},% - {ignoreuppercase}{3},{nouppercase}{3},% - {ignoreupper}{3},{noupper}{3}% - }{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \aftergroup\FamilyKeyStateProcessed - \ifnum \reserved@a>\m@ne - \aftergroup\let\aftergroup\MakeMarkcase - \ifcase \reserved@a - \aftergroup\MakeUppercase - \aftergroup\scrlayer@forceignoreuppercasefalse - \or - \aftergroup\MakeLowercase - \aftergroup\scrlayer@forceignoreuppercasefalse - \or - \aftergroup\@firstofone - \aftergroup\scrlayer@forceignoreuppercasefalse - \else - \aftergroup\scrlayer@ignoreuppercase - \aftergroup\scrlayer@forceignoreuppercasetrue - \fi - \fi - \else - \aftergroup\FamilyKeyStateUnknownValue - \fi - \endgroup - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{markcase}% - \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% - \fi -} -\KOMA@key{autooneside}[true]{% - \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}% -} -\KOMA@key{automark}[]{% - \scrlayer@testunexpectedarg{automark}{#1}% - \scrlayer@AtEndOfPackage{% - \if@chapter - \scr@ifundefinedorrelax{section}{% - \automark{chapter}% - }{% - \automark[section]{chapter}% - }% - \else - \scr@ifundefinedorrelax{section}{% - \automark{}% - }{% - \scr@ifundefinedorrelax{subsection}{% - \automark{section}% - }{% - \automark[subsection]{section}% - } - }% - \fi - }% - \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{automark}{}% -} -\KOMA@key{manualmark}[]{% - \scrlayer@testunexpectedarg{manualmark}{#1}% - \scrlayer@AtEndOfPackage{\manualmark}% - \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{manualmark}{}% -} -\KOMA@key{onpsselect}{% - \l@addto@macro{\@ps@initialhook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% -} -\KOMA@key{onpsinit}{% - \l@addto@macro{\@ps@hook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% -} -\KOMA@key{onpsoneside}{% - \l@addto@macro{\@ps@onesidehook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% -} -\KOMA@key{onpstwoside}{% - \l@addto@macro{\@ps@twosidehook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% -} -\KOMA@key{onpsoddpage}{% - \l@addto@macro{\@ps@oddpagehook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% -} -\KOMA@key{onpsevenpage}{% - \l@addto@macro{\@ps@evenpagehook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% -} -\KOMA@key{onpsfloatpage}{% - \l@addto@macro{\@ps@floatpagehook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% -} -\KOMA@key{onpsnonfloatpage}{% - \l@addto@macro{\@ps@nonfloatpagehook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% -} -\KOMA@key{onpsbackground}{% - \l@addto@macro{\@ps@backgroundhook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% -} -\KOMA@key{onpsforeground}{% - \l@addto@macro{\@ps@foregroundhook}{#1}% - \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% -} -\KOMA@ifkey{singlespacing}{@ps@singlespacing} -\KOMA@key{deactivatepagestylelayers}[true]{% - \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers} - {scrlayer@deactivate@layers}% -} -\KOMA@key{draft}[true]{% - \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}% -} -\KOMA@key{forceoverwrite}[true]{% - \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% -} -\KOMA@key{autoremoveinterfaces}[true]{% - \scrlayer@report@deprecated{#1}{autoremoveinterface}% - \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} - {scrlayer@autoremoveinterfaces}% -} -%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ -%%% (run: options) -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ -%%% (run: body) -\KOMAProcessOptions\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @autooneside\endcsname\relax -\expandafter\let\csname KV@KOMA.\@currname.\@currext @automark\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @automark@default\endcsname\relax -\expandafter\let\csname KV@KOMA.\@currname.\@currext @manualmark\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @manualmark@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsselect\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsselect@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsinit\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsinit@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsoneside\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsoneside@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpstwoside\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpstwoside@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsoddpage\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsoddpage@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsevenpage\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsevenpage@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsfloatpage\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsfloatpage@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsbackground\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsbackground@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsforeground\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @onpsforeground@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers\endcsname - \relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default\endcsname - \relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @draft\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @draft@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @forceoverwrite\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @forceoverwrite@default\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces\endcsname\relax -\expandafter\let - \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname - \relax -%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ -%%% (run: body) -\RequirePackage{fancyhdr} -\DeclareNewLayer[% - background,oddpage, - head, - contents={\hb@xt@ \layerwidth{% - \f@nch@head\f@nch@Oolh\f@nch@olh\f@nch@och\f@nch@orh\f@nch@Oorh}} -]{fancy.head.odd} -\DeclareNewLayer[% - background,evenpage, - head, - contents={\hb@xt@ \layerwidth{% - \f@nch@head\f@nch@Oelh\f@nch@elh\f@nch@ech\f@nch@erh\f@nch@Oerh}} -]{fancy.head.even} -\DeclareNewLayer[% - foreground,oddpage, - foot, - contents={\hb@xt@ \layerwidth{% - \f@nch@foot\f@nch@Oolf\f@nch@olf\f@nch@ocf\f@nch@orf\f@nch@Oorf}} -]{fancy.foot.odd} -\DeclareNewLayer[% - foreground,evenpage, - foot, - contents={\hb@xt@ \layerwidth{% - \f@nch@foot\f@nch@Oelf\f@nch@elf\f@nch@ecf\f@nch@erf\f@nch@Oerf}} -]{fancy.foot.even} -\DeclarePageStyleByLayers[ - onselect={\def\@mkboth{\protect\markboth}}, -]{@fancy}{% - fancy.head.odd,fancy.head.even,fancy.foot.odd,fancy.foot.even -} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z 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 `scrlayer-fancyhdr.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty index 8aa7397c570..64d39da0052 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -53,7 +53,7 @@ 2020/09/11 v0.3.3533 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -97,7 +97,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -245,7 +245,7 @@ %%% (run: options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns} \slnc@autoclearnotecolumnstrue -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let 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 31d7a7c1862..e7156a68e7f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -49,10 +49,10 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -80,7 +80,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% @@ -631,7 +631,7 @@ \KOMA@ifkey{hmode}{sls@leavevmode} \KOMA@ifkey{autoenlargeheadfoot}{sls@autoenlarge} \KOMAExecuteOptions{autoenlargeheadfoot=true} -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index ea1dc267f96..259edb36f7f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,15 +43,42 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: init) +\newcommand*{\scrlayer@@inherited@options@cslist}{} +\newcommand*{\scrlayer@@add@inherited@option}[1]{% + \ifx\scrlayer@@inherited@options@cslist\@empty + \g@addto@macro\scrlayer@@inherited@options@cslist{#1}% + \else + \g@addto@macro\scrlayer@@inherited@options@cslist{,#1}% + \fi +} +\newcommand*{\scrlayer@do@inherited@options}[2][.\@currname.\@currext]{% + \@for \reserved@a:=\scrlayer@@inherited@options@cslist \do {% + \edef\reserved@a{\unexpanded{#2}{#1}{\reserved@a}}% + \reserved@a + }% +} +\newcommand*{\scrlayer@inherit@option}[2]{% + \typeout{TRACE: Define key `#2' of member `#1'}% + \DefineFamilyMember[#1]{KOMA}% + \expandafter\let\csname KV@KOMA#1@#2\expandafter\endcsname + \csname KV@KOMA.scrlayer.sty@#2\endcsname + \expandafter\let\csname KV@KOMA#1@#2@default\expandafter\endcsname + \csname KV@KOMA.scrlayer.sty@#2@default\expandafter\endcsname + \AtEndOfPackage{% + \RelaxFamilyKey[{#1}]{KOMA}{#2}% + }% +} +\@onlypreamble\scr@do@inherited@options +\@onlypreamble\scr@inherit@option \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -125,7 +152,7 @@ \@namedef{scrlayer@deprecated@reported@for@#1}{\string #2}% }{}% } -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -161,6 +188,7 @@ \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% \fi } +\scrlayer@@add@inherited@option{markcase} \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\@firstofone}{} \ifx\MakeMarkcase\@firstofone \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{used}% @@ -181,6 +209,7 @@ } \newif\ifscrlayer@forceignoreuppercase \KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue +\scrlayer@@add@inherited@option{autooneside} \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside} \KOMA@key{automark}[]{% \scrlayer@testunexpectedarg{automark}{#1}% @@ -208,6 +237,7 @@ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% \KOMA@kav@add{.scrlayer.sty}{automark}{}% } +\scrlayer@@add@inherited@option{automark} \KOMA@key{manualmark}[]{% \scrlayer@testunexpectedarg{manualmark}{#1}% \scrlayer@AtEndOfPackage{\manualmark}% @@ -216,11 +246,13 @@ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% \KOMA@kav@add{.scrlayer.sty}{manualmark}{}% } +\scrlayer@@add@inherited@option{manualmark} \KOMA@key{onpsselect}{% \l@addto@macro{\@ps@initialhook}{#1}% \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% } +\scrlayer@@add@inherited@option{onpsselect} \newcommand*{\@ps@initialhook}{} \KOMA@kav@add{.scrlayer.sty}{onpsselect}{} \KOMA@key{onpsinit}{% @@ -228,6 +260,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% } +\scrlayer@@add@inherited@option{onpsinit} \newcommand*{\@ps@hook}{} \KOMA@kav@add{.scrlayer.sty}{onpsinit}{} \KOMA@key{onpsoneside}{% @@ -235,6 +268,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% } +\scrlayer@@add@inherited@option{onpsoneside} \newcommand*{\@ps@onesidehook}{} \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{} \KOMA@key{onpstwoside}{% @@ -242,6 +276,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% } +\scrlayer@@add@inherited@option{onpstwoside} \newcommand*{\@ps@twosidehook}{} \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{} \KOMA@key{onpsoddpage}{% @@ -249,6 +284,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% } +\scrlayer@@add@inherited@option{onpsoddpage} \newcommand*{\@ps@oddpagehook}{} \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{} \KOMA@key{onpsevenpage}{% @@ -256,6 +292,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% } +\scrlayer@@add@inherited@option{onpsevenpage} \newcommand*{\@ps@evenpagehook}{} \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{} \KOMA@key{onpsfloatpage}{% @@ -263,6 +300,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% } +\scrlayer@@add@inherited@option{onpsfloatpage} \newcommand*{\@ps@floatpagehook}{} \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{} \KOMA@key{onpsnonfloatpage}{% @@ -270,6 +308,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% } +\scrlayer@@add@inherited@option{onpsnonfloatpage} \newcommand*{\@ps@nonfloatpagehook}{} \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{} \KOMA@key{onpsbackground}{% @@ -277,6 +316,7 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% } +\scrlayer@@add@inherited@option{onpsbackground} \newcommand*{\@ps@backgroundhook}{} \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{} \KOMA@key{onpsforeground}{% @@ -284,14 +324,20 @@ \FamilyKeyStateProcessed \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% } +\scrlayer@@add@inherited@option{onpsforeground} \newcommand*{\@ps@foregroundhook}{} \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{} \KOMA@ifkey{singlespacing}{@ps@singlespacing} +\scrlayer@@add@inherited@option{singlespacing} \KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers} +\scrlayer@@add@inherited@option{deactivatepagestylelayers} \KOMA@ifkey{draft}{scrlayer@draft} +\scrlayer@@add@inherited@option{draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} +\scrlayer@@add@inherited@option{forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +\scrlayer@@add@inherited@option{autoremoveinterfaces} +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} @@ -2296,7 +2342,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index e61009c37ad..aafa2dfe268 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 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 5d3ab9570e9..8e5dfa91c92 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,20 +83,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -122,7 +122,7 @@ }{} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) @@ -166,7 +166,7 @@ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -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 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z 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 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z 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 $ @@ -1802,7 +1802,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ %%% (run: body) \newkomavar{firsthead} \setkomavar{firsthead}{% @@ -2914,14 +2914,13 @@ \newcommand*{\stopbreaks}{\interlinepenalty \@M \def\par{\@@par\nobreak}\let\\=\@nobreakcr \let\vspace\@nobreakvspace} -\newcommand*{\@nobreakvspace}{% +\DeclareRobustCommand*{\@nobreakvspace}{% \kernel@ifstar{\@nobreakvspacex}{\@nobreakvspacex}} \newcommand*{\@nobreakvspacex}[1]{\ifvmode\nobreak\vskip #1\relax\else \@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi} -\newcommand*{\@nobreakcr}{% - \vadjust{\penalty\@M}\kernel@ifstar{\@xnewline}{\@xnewline}} +\newcommand*{\@nobreakcr}{\kernel@ifstar{\@normalcr*}{\@normalcr*}} \newcommand*{\startbreaks}{\let\\=\@normalcr - \interlinepenalty 200\def\par{\@@par\penalty 200}} + \interlinepenalty 200\def\par{\@@par\penalty 200\relax}} \newcommand{\opening}[1]{% \@PapersizeWarning \@gen@firsthead diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty index ac3d109d5e1..c60da49d8a3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty @@ -40,7 +40,7 @@ %% %%% From File: $Id: scrlfile-hook.dtx$ \ProvidesPackage{scrlfile-hook}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (using LaTeX hooks)] \@ifundefined{AddToHook}{% @@ -94,19 +94,19 @@ \seq_new:N \g__scrlfile_input_file_seq \hook_gput_code:nnn { file / before } { . } { \seq_gpush:Nx \g__scrlfile_input_file_seq { \CurrentFile } } +\msg_new:nnn { scrlfile-hook } { too-many-pops } + { + More~file~names~popped~from~stack~than~put~to.~ + This~should~never~happen.~ + However,~it~could~happen~if~scrlfile-hook~is~loaded~by~another~ + package~or~class.~In~this~case~some~packages~or~classes~are~not~ + recognised~correctly. + } \hook_gput_code:nnn { file / after } { . } { \seq_gpop:NNF \g__scrlfile_input_file_seq \l_tmpa_seq { - \msg_new:nnn { scrlfile-hook } { to-much-pops } - { - More~file~names~popped~from~stack~than~put~to.~ - This~should~never~happen.~ - However,~it~could~happen~if~scrlfile-hook~is~loaded~by~another~ - package~or~class.~In~this~case~some~packages~or~classes~are~not~ - recognised~correctly. - } - \msg_warning:nn { scrlfile-hook } { to-much-pops } + \msg_warning:nn { scrlfile-hook } { too-many-pops } } } \cs_if_exist:NTF \g__filehook_input_file_seq diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty index 7e053e405a2..c32135a9d95 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty @@ -40,7 +40,7 @@ %% %%% From File: $Id: scrlfile-patcholdlatex.dtx 3527 2020-09-11 09:44:32Z kohm $ \ProvidesPackage{scrlfile-patcholdlatex}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (patching old LaTeX kernels)] \@ifclassloaded{memoir}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 5849374f9e0..9381e05b9a2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -38,16 +38,23 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlfile.dtx 3537 2020-09-14 07:30:10Z kohm $ +%%% From File: $Id: scrlfile.dtx 3565 2021-02-16 10:43:38Z kohm $ \ProvidesPackage{scrlfile}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (file load hooks)] -\@ifundefined{AddToHook}{% +\@ifundefined{IfFormatAtLeastTF}{% \RequirePackage{scrlfile-patcholdlatex}% \RequirePackage{xparse}% + \ExplSyntaxOff }{% - \RequirePackage{scrlfile-hook}% + \IfFormatAtLeastTF{2020/10/01}{% + \RequirePackage{scrlfile-hook}% + }{% + \RequirePackage{scrlfile-patcholdlatex}% + \RequirePackage{xparse}% + \ExplSyntaxOff + }% } \DeclareOption{withdeprecated}{% \RenewDocumentCommand\AfterClass{}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty index 0409b511829..55f746f8928 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty @@ -40,7 +40,7 @@ %% %%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \ProvidesPackage{scrlogo}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (logo)] \@ifundefined{KOMAScript}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 633e662d302..9b99eabb5d4 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -196,10 +196,11 @@ \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} +\@namedef{scr@v@3.33}{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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -249,7 +250,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -554,7 +555,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -827,7 +828,7 @@ \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -898,9 +899,9 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -1487,13 +1488,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 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1981,7 +1982,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -3144,46 +3145,80 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} -\newcommand*{\scr@selectfont}{} -\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname -\BeforePackage{everysel}{% - \AtBeginDocument{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else - \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}% - \fi - \expandafter\let\csname selectfont \endcsname\scr@selectfont +\IfLTXAtLeastTF{2021/01/05}{% + \AddToHook{selectfont}{\par@update}% + \AfterPackage{everysel}{% + \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% + \ClassError{\KOMAClassName}{% + incompatible `everysel' detected + }{% + You are using an old version of `everysel' in combination with a + LaTeX\MessageBreak + version >= 2021/01/05 and KOMA-Script >= 3.33. This combination + is\MessageBreak + not supported.\MessageBreak + You could switch back to an older LaTeX using package + `latexrelease'.\MessageBreak + But I recommend to update `everysel'% + }% + }% }% -} -\AfterPackage{everysel}{% - \scr@ifundefinedorrelax{@EverySelectfont@Init}{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont - \ClassWarningNoLine{\KOMAClassName}{% - \string\selectfont\space already changed}% - \else - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname - \fi - }{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname + \AfterPackage{tracefnt}{% + \IfPackageAtLeastTF{tracefnt}{2020/12/22}{}{% + \ClassError{\KOMAClassName}{% + incompatible `tracefnt' detected + }{% + `tracefnt' is a LaTeX base package and therefore should be updated + together\MessageBreak + with LaTeX kernel. So this should never happen! Please check + your\MessageBreak + LaTeX installation% + }% }% }% -} -\AfterPackage{tracefnt}{% +}{% + \newcommand*{\scr@selectfont}{} \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \BeforePackage{everysel}{% + \AtBeginDocument{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else + \ClassWarningNoLine{\KOMAClassName}{% + discard change of \string\selectfont}% + \fi + \expandafter\let\csname selectfont \endcsname\scr@selectfont + }% + }% + \AfterPackage{everysel}{% + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% + }% + }% + \AfterPackage{tracefnt}{% + \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + }% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} + \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} -\newcommand*{\scr@new@selectfont}{} -\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname \newcommand*{\par@updaterelative}{% \begingroup \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent @@ -3386,7 +3421,7 @@ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -3538,13 +3573,13 @@ \newcommand*{\thefootnotemark}{\@thefnmark} \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} \deffootnotemark{\textsuperscript{\thefootnotemark}} -\newcommand*{\footref}[1]{% +\providecommand*{\footref}[1]{% \begingroup \unrestored@protected@xdef\@thefnmark{\ref{#1}}% \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: body) \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} @@ -3575,10 +3610,10 @@ \renewcommand*\p@enumii{\theenumi} \renewcommand*\p@enumiii{\p@enumii(\theenumii)} \renewcommand*\p@enumiv{\p@enumiii\theenumiii} -\newcommand*\labelitemi{\textbullet} -\newcommand*\labelitemii{\normalfont\bfseries\textendash} -\newcommand*\labelitemiii{\textasteriskcentered} -\newcommand*\labelitemiv{\textperiodcentered} +\newcommand*\labelitemi{\usekomafont{labelitemi}{\textbullet}} +\newcommand*\labelitemii{\usekomafont{labelitemii}{\textendash}} +\newcommand*\labelitemiii{\usekomafont{labelitemiii}{\textasteriskcentered}} +\newcommand*\labelitemiv{\usekomafont{labelitemiv}{\textperiodcentered}} \newenvironment{description}{% \list{}{\labelwidth\z@ \itemindent-\leftmargin \let\makelabel\descriptionlabel}% @@ -3693,9 +3728,15 @@ } \newcommand*\descfont{\@gr@gsffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newcommand*{\labelitemfont}{\normalfont} +\newcommand*\scr@fnt@itemizelabel{\labelitemfont} +\newkomafont{labelitemi}{\usekomafont{itemizelabel}} +\newkomafont{labelitemii}{\usekomafont{itemizelabel}\bfseries} +\newkomafont{labelitemiii}{\usekomafont{itemizelabel}} +\newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ %%% (run: body) \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% @@ -4886,14 +4927,13 @@ \newcommand*{\stopbreaks}{\interlinepenalty \@M \def\par{\@@par\nobreak}\let\\=\@nobreakcr \let\vspace\@nobreakvspace} -\newcommand*{\@nobreakvspace}{% +\DeclareRobustCommand*{\@nobreakvspace}{% \kernel@ifstar{\@nobreakvspacex}{\@nobreakvspacex}} \newcommand*{\@nobreakvspacex}[1]{\ifvmode\nobreak\vskip #1\relax\else \@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi} -\newcommand*{\@nobreakcr}{% - \vadjust{\penalty\@M}\kernel@ifstar{\@xnewline}{\@xnewline}} +\newcommand*{\@nobreakcr}{\kernel@ifstar{\@normalcr*}{\@normalcr*}} \newcommand*{\startbreaks}{\let\\=\@normalcr - \interlinepenalty 200\def\par{\@@par\penalty 200}} + \interlinepenalty 200\def\par{\@@par\penalty 200\relax}} \newcommand{\opening}[1]{% \@PapersizeWarning \@gen@firsthead diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index 8b4657e757e..b3059c170c9 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 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 c1458590550..6f61e46ce56 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -143,7 +143,7 @@ \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z 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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -299,10 +299,11 @@ \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} +\@namedef{scr@v@3.33}{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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -377,7 +378,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -648,7 +649,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -851,7 +852,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -955,7 +956,23 @@ }{bookmark}\MessageBreak before \string\begin{document}% }% - \RequirePackage{bookmark}% + \@ifundefined{es@quoting}{% + \RequirePackage{bookmark}% + }{% + \ifx\es@quoting\activatequoting + \ClassInfo{\KOMAClassName}{% + temporary deactivation of babel-spanish quoting + }% + \deactivatequoting + \RequirePackage{bookmark}% + \ClassInfo{\KOMAClassName}{% + reactivation of babel-spanish quoting + }% + \activatequoting + \else + \RequirePackage{bookmark}% + \fi + }% \ifx\@beginmainauxhook\relax \else \if@filesw @@ -1425,7 +1442,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -2027,20 +2044,20 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2570,48 +2587,82 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} \setlength{\columnseprule}{\z@} -\newcommand*{\scr@selectfont}{} -\expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname -\BeforePackage{everysel}{% - \AtBeginDocument{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else - \ClassWarningNoLine{\KOMAClassName}{discard change of \string\selectfont}% - \fi - \expandafter\let\csname selectfont \endcsname\scr@selectfont +\IfLTXAtLeastTF{2021/01/05}{% + \AddToHook{selectfont}{\par@update}% + \AfterPackage{everysel}{% + \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% + \ClassError{\KOMAClassName}{% + incompatible `everysel' detected + }{% + You are using an old version of `everysel' in combination with a + LaTeX\MessageBreak + version >= 2021/01/05 and KOMA-Script >= 3.33. This combination + is\MessageBreak + not supported.\MessageBreak + You could switch back to an older LaTeX using package + `latexrelease'.\MessageBreak + But I recommend to update `everysel'% + }% + }% }% -} -\AfterPackage{everysel}{% - \scr@ifundefinedorrelax{@EverySelectfont@Init}{% - \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont - \ClassWarningNoLine{\KOMAClassName}{% - \string\selectfont\space already changed}% - \else - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname - \fi - }{% - \g@addto@macro\@EverySelectfont@Init{% - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% - \expandafter\let\expandafter\scr@new@selectfont - \csname selectfont \endcsname + \AfterPackage{tracefnt}{% + \IfPackageAtLeastTF{tracefnt}{2020/12/22}{}{% + \ClassError{\KOMAClassName}{% + incompatible `tracefnt' detected + }{% + `tracefnt' is a LaTeX base package and therefore should be updated + together\MessageBreak + with LaTeX kernel. So this should never happen! Please check + your\MessageBreak + LaTeX installation% + }% }% }% -} -\AfterPackage{tracefnt}{% +}{% + \newcommand*{\scr@selectfont}{} \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname - \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \BeforePackage{everysel}{% + \AtBeginDocument{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont\else + \ClassWarningNoLine{\KOMAClassName}{% + discard change of \string\selectfont}% + \fi + \expandafter\let\csname selectfont \endcsname\scr@selectfont + }% + }% + \AfterPackage{everysel}{% + \scr@ifundefinedorrelax{@EverySelectfont@Init}{% + \expandafter\ifx\csname selectfont \endcsname\scr@new@selectfont + \ClassWarningNoLine{\KOMAClassName}{% + \string\selectfont\space already changed}% + \else + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + \fi + }{% + \g@addto@macro\@EverySelectfont@Init{% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont + \csname selectfont \endcsname + }% + }% + }% + \AfterPackage{tracefnt}{% + \expandafter\let\expandafter\scr@selectfont\csname selectfont \endcsname + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update}% + \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname + }% + \expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} + \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\expandafter\g@addto@macro\csname selectfont \endcsname{\par@update} -\newcommand*{\scr@new@selectfont}{} -\expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname \newcommand*{\par@updaterelative}{% \begingroup \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent @@ -3177,7 +3228,7 @@ %%% 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 3543 2020-09-14 16:21:00Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -5693,7 +5744,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5999,7 +6050,7 @@ \fi } \AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2019/07/17}{% + \@ifpackagelater{titlesec}{2019/10/17}{% \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak Cross your fingers, that is compatible% }% @@ -6125,7 +6176,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6944,7 +6995,7 @@ \thechapter.% \@arabic\c@table } -%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -7097,7 +7148,7 @@ \newcommand*{\thefootnotemark}{\@thefnmark} \deffootnote[1em]{1.5em}{1em}{\textsuperscript{\thefootnotemark}} \deffootnotemark{\textsuperscript{\thefootnotemark}} -\newcommand*{\footref}[1]{% +\providecommand*{\footref}[1]{% \begingroup \unrestored@protected@xdef\@thefnmark{\ref{#1}}% \endgroup @@ -7380,7 +7431,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7420,10 +7471,10 @@ \renewcommand*\p@enumii{\theenumi} \renewcommand*\p@enumiii{\p@enumii(\theenumii)} \renewcommand*\p@enumiv{\p@enumiii\theenumiii} -\newcommand*\labelitemi{\textbullet} -\newcommand*\labelitemii{\normalfont\bfseries\textendash} -\newcommand*\labelitemiii{\textasteriskcentered} -\newcommand*\labelitemiv{\textperiodcentered} +\newcommand*\labelitemi{\usekomafont{labelitemi}{\textbullet}} +\newcommand*\labelitemii{\usekomafont{labelitemii}{\textendash}} +\newcommand*\labelitemiii{\usekomafont{labelitemiii}{\textasteriskcentered}} +\newcommand*\labelitemiv{\usekomafont{labelitemiv}{\textperiodcentered}} \newenvironment{description}{% \list{}{\labelwidth\z@ \itemindent-\leftmargin \let\makelabel\descriptionlabel}% @@ -7538,6 +7589,12 @@ } \newcommand*\descfont{\@gr@gsffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} +\newcommand*{\labelitemfont}{\normalfont} +\newcommand*\scr@fnt@itemizelabel{\labelitemfont} +\newkomafont{labelitemi}{\usekomafont{itemizelabel}} +\newkomafont{labelitemii}{\usekomafont{itemizelabel}\bfseries} +\newkomafont{labelitemiii}{\usekomafont{itemizelabel}} +\newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} %%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 43fbd07200f..4917f2119c1 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 10pt) @@ -150,7 +150,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 6e8c23361b1..ef0dc7590cd 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 11pt) @@ -151,7 +151,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index d6dc017c0dc..037fd01833e 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ \ProvidesFile{% @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index a679408083b..29266bc7f2c 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 86eea989af7..49e3403e8d5 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{setspace.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (hacking package setspace)% diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak index a4fe40e03f0..ce59490064f 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{standardsections.hak}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index e3c63aaacce..13e7a28108d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -57,7 +57,7 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (handling toc-files)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 2c8e8249256..747402660bf 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,7 +70,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -80,13 +80,13 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2020/09/21 v3.32 KOMA-Script + 2021/03/17 v3.33 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -167,13 +167,14 @@ \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} +\@namedef{scr@v@3.33}{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 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -993,7 +994,7 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index d157e323efc..8c78c0f4d6e 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) @@ -577,7 +577,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 3472 2020-03-27 11:01:45Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ %%% (run: body) \endinput %% |