diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
54 files changed, 551 insertions, 543 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index a6aecc677ad..84a2697c20d 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 17cfe360d9f..ac9206c1362 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 c5f6b05d92a..44e1b86912f 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 562b9c52c7d..afca438a585 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 5c2f49d453c..1f5e02b3c21 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index e8980e61ecb..65db57f3e0b 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 5a1ddb78341..51a61c569ac 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 66c59aed635..fc98df73836 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 26ab8737045..a321b399e5a 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 5ad42c2ae08..731da3a43ee 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 ea989ccc066..22462f863e1 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 6de88e51bd6..ffa3248c684 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 f073dcce0a7..0a5983e542a 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 d88f539d0f8..e6e077ed64e 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 3bc07355bff..321b4b16bc4 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 743d7108670..93e769b70ae 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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 81b8d15906f..6c8f4fc47aa 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{float.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \scr@ifexpected{\newfloat}{% \long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3} \let\float@do=\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index 525626ba4af..b10a8187cca 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{floatrow.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \scr@ifexpected{\DeclareNewFloatType}{% \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}% \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 3a4781ce6f3..5e233b636f3 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{hyperref.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \scr@ifexpected\@schapter{% \def\@schapter#1{% \H@old@schapter{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 319d87693d2..f2111c7356f 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{listings.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak index e35848eca38..314671e43e0 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{lscape.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \xpatchcmd{\landscape}{\textheight=\vsize}{% \if@scrhack@lscape \scrh@LT@textheight=\vsize diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak index c7d47ed7793..42a578a04df 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{nomencl.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package nomencl)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \RequirePackage{tocbasic} \@ifpackagelater{nomencl}{2019/01/01}{% \PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 5460d403262..5752dece681 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -168,6 +168,7 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } +\IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{} \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\scr@part@beforeskip}{% @@ -192,7 +193,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -273,10 +274,11 @@ \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} \@namedef{scr@v@3.33}{18} +\@namedef{scr@v@3.34}{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 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -409,7 +411,7 @@ } %%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -622,7 +624,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -825,7 +827,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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -1144,7 +1146,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1835,7 +1837,7 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ @@ -1845,9 +1847,9 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2375,13 +2377,13 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} \setlength{\columnseprule}{\z@} -\IfLTXAtLeastTF{2021/01/05}{% +\IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% @@ -2390,7 +2392,7 @@ }{% 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 + version >= 2021/06/01 and KOMA-Script >= 3.33. This combination is\MessageBreak not supported.\MessageBreak You could switch back to an older LaTeX using package @@ -3014,7 +3016,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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \providecommand*{\ifnumbered}{% @@ -4539,12 +4541,15 @@ `\string\appendix'% }% }{}% - \par% + \par \setcounter{section}{0}% \setcounter{subsection}{0}% \gdef\thesection{\@Alph\c@section}% - \csname appendixmore\endcsname } +\IfLTXAtLeastTF{2020/10/01}{% + \g@addto@macro{\appendix}{\UseOneTimeHook{\KOMAClassName/appendix}}% +}{} +\g@addto@macro{\appendix}{\csname appendixmore\endcsname} \newcommand*{\scr@startpart}[1]{% \ExecuteDoHook{heading/preinit/#1}% \par @@ -5339,7 +5344,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% @@ -5482,32 +5487,7 @@ \edef\cap@indent{\the\@tempdima}% \dofullc@pfalse\@capbreaktrue } -\AfterPackage{caption2}{% - \renewcommand*{\setcapindent}{% - \ClassWarning{\KOMAClassName}{% - You're using package `caption2'.\MessageBreak - Because of this you should also use `\string\captionstyle' - and\MessageBreak - set length '\string\captionindent' instead of - using\MessageBreak - `\string\setcapindent'% - }% - \captionstyle{indent}% - \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}% - }% -} \newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse} -\AfterPackage{caption2}{% - \renewcommand*{\setcaphanging}{% - \ClassWarning{\KOMAClassName}{% - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\captionstyle'\MessageBreak - instead of `\string\setcaphang'% - } - \captionstyle{hang}% - }% -} \newcommand{\@makecaption}[2]{% \if@captionabove \vskip\belowcaptionskip @@ -5590,18 +5570,6 @@ \endgroup \fi\fi\fi\fi\fi } -\AfterPackage{caption2}{% - \renewcommand*{\setcapwidth}[2][]{% - \ClassWarning{\KOMAClassName}{% - Ignorring optional argument of `\string\setcapwidth'!\MessageBreak - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\setcaptionwidth'\MessageBreak - instead of `\string\setcapwidth'% - }% - \setcaptionwidth{#2}% - }% -}% \newcommand*{\setcapdynwidth}[2][]{% \def\cap@width{#2}% \begingroup @@ -5743,23 +5711,6 @@ \@tempa }% } -\AfterPackage{caption2}{% - \renewcommand*{\@setcapmargin}[2][\@tempdimb]{% - \setlength{\@tempdimb}{#2}% - \setlength{\@tempdima}{#1}% - \ifdim\@tempdima\@tempdimb\else - \ClassWarning{\KOMAClassName}{% - Can set only centered caption!\MessageBreak - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\setcaptionmargin'\MessageBreak - instead of `\string\setcapmargin'% - }% - \fi - \addtolength{\@tempdimb}{\@tempdimb}% - \setcaptionmargin{.5\@tempdimb}}% - \let\@@setcapmargin=\@setcapmargin -} \newcommand{\@@makecaption}[3]{% \cap@margin \begingroup @@ -5788,7 +5739,7 @@ \unexpanded\expandafter{\@xcentercr}% }% \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}% - \ifdim\@tempdima>\linewidth + \ifdim\@tempdima>\cap@width \aftergroup\scr@makemultilinecaption \else \aftergroup\scr@makesinglelinecaption @@ -6026,9 +5977,6 @@ }% } \AfterPackage{longtable}{% - \@ifpackageloaded{caption2}{\@komalongtablefalse - \scr@caption@before@longtable@warning{caption2}% - }{}% \if@komalongtable \renewcommand{\LT@makecaption}[3]{% \noalign{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index 565c301e6c1..b09bbfccbd5 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 760e50da1fb..ad2958d298f 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (% KOMA-Script-independent @@ -248,8 +248,8 @@ \newcommand*{\FamilyOfKey}{} \newcommand*{\FamilyMemberOfKey}{} \newcommand*{\@globaloptionslist}{} -\IncludeInRelease{2021/05/01}{\FamilyProcessOptions}{% - Usage of raw option list} +\IncludeInRelease{2021/05/01}{\FamilyProcessOptions}% + {Usage of raw or classic option list} \newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{% \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions \PackageError{scrbase}{nested \string\FamilyProcessOptions\space @@ -300,24 +300,55 @@ \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 + \@ifundefined{@raw@classoptionslist}{}{% + \@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 + \@for\reserved@a:=\@curroptions\do{% + \scr@trim@spaces\reserved@a + \def\reserved@b{\CurrentOption}% + \ifx\reserved@a\reserved@b + \PackageError{scrbase}{% + \string\CurrentOption\space loop detected\MessageBreak + Perhaps someone uses:\MessageBreak\space\space + \ifx\@currext\@clsextension + \string\PassOptionsToClass + \else + \string\PassOptionsToPackage + \fi + {\string\CurrentOption}{^^e2^^80^^a6}.\MessageBreak + With LaTeX 2020/10/01 or 2021/06/01 this results in + \string\CurrentOption\MessageBreak + in the raw option list and therefore is not allowed.\MessageBreak + Please ask the class or package author to use:\MessageBreak\space\space + \string\expandafter + \ifx\@currext\@clsextension + \string\PassOptionsToClass + \else + \string\PassOptionsToPackage + \fi + \MessageBreak\space\space\space + \string\expandafter{\string\CurrentOption}{^^e2^^80^^a6}\MessageBreak + instead or update LaTeX (if possible)% + }% + \let\CurrentOption\@empty + \else + \let\CurrentOption\reserved@a + \fi \@ifundefined{ds@\CurrentOption}{% \@use@ption \scr@ifprocess@curroption{#1}{#2}{}\default@ds @@ -333,8 +364,8 @@ \@nameuse{scr@after@options@#2@hook}% } \EndIncludeInRelease -\IncludeInRelease{0000/00/00}{\FamilyProcessOptions}{% - compatibility for LaTeX before 2021/05/01} +\IncludeInRelease{0000/00/00}{\FamilyProcessOptions}% + {Usage of raw or classic option list} \newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{% \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions \PackageError{scrbase}{nested \string\FamilyProcessOptions\space @@ -566,7 +597,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: option) \DefineFamily{KOMA} \DefineFamilyMember{KOMA} @@ -580,7 +611,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 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 45832b43a0d..6d73cbba9c5 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -173,6 +173,7 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } +\IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{} \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\scr@part@beforeskip}{% @@ -219,7 +220,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -300,10 +301,11 @@ \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} \@namedef{scr@v@3.33}{18} +\@namedef{scr@v@3.34}{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 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -435,7 +437,7 @@ } %%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -648,7 +650,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -848,7 +850,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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1010,28 +1012,61 @@ } \KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}% -\KOMA@key{appendixprefix}[true]{% - \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% - \if@tempswa - \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}% - \@ifundefined{appendixmore}{% - \def\appendixmore{\@chapterprefixtrue}% - }{% - \l@addto@macro\appendixmore{\@chapterprefixtrue}% - }% - \else - \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% - \@ifundefined{appendixmore}{% - \def\appendixmore{\@chapterprefixfalse}% - }{% - \l@addto@macro\appendixmore{\@chapterprefixfalse}% +\IfLTXAtLeastTF{2020/10/01}{% + \KOMA@key{appendixprefix}[true]{% + \Ifstr{#1}{default}{% + \KOMA@kav@removekey{.\KOMAClassFileName}{appendixprefix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% + \IfHookEmptyTF{\KOMAClassName/appendix}{}{% + \RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]% }% + \FamilyKeyStateProcessed + }{% + \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% + \IfHookEmptyTF{\KOMAClassName/appendix}{}{% + \RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]% + }% + \if@tempswa + \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}% + \AddToHook{\KOMAClassName/appendix}[appendixprefix]% + {\@chapterprefixtrue}% + \else + \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \AddToHook{\KOMAClassName/appendix}[appendixprefix]% + {\@chapterprefixfalse}% + \fi + \fi + }% + }% +}{% + \KOMA@key{appendixprefix}[true]{% + \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% + \if@tempswa + \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}% + \@ifundefined{appendixmore}{% + \def\appendixmore{\@chapterprefixtrue}% + }{% + \l@addto@macro\appendixmore{\@chapterprefixtrue}% + }% + \else + \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \@ifundefined{appendixmore}{% + \def\appendixmore{\@chapterprefixfalse}% + }{% + \l@addto@macro\appendixmore{\@chapterprefixfalse}% + }% + \fi \fi - \fi + }% } \KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false} \KOMA@ifkey{chapterentrydots}{@chapterentrywithdots} @@ -1303,7 +1338,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -2042,7 +2077,7 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} @@ -2053,9 +2088,9 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2590,13 +2625,13 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} \setlength{\columnseprule}{\z@} -\IfLTXAtLeastTF{2021/01/05}{% +\IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% @@ -2605,7 +2640,7 @@ }{% 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 + version >= 2021/06/01 and KOMA-Script >= 3.33. This combination is\MessageBreak not supported.\MessageBreak You could switch back to an older LaTeX using package @@ -3197,7 +3232,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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -4974,13 +5009,16 @@ `\string\appendix'% }% }{}% - \par% + \par \setcounter{chapter}{0}% \setcounter{section}{0}% \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@Alph\c@chapter}% - \csname appendixmore\endcsname } +\IfLTXAtLeastTF{2020/10/01}{% + \g@addto@macro{\appendix}{\UseOneTimeHook{\KOMAClassName/appendix}}% +}{} +\g@addto@macro{\appendix}{\csname appendixmore\endcsname} \newcommand*{\scr@startpart}[1]{% \ExecuteDoHook{heading/preinit/#1}% \if@openright\cleardoublepage\else\clearpage\fi @@ -6191,7 +6229,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% @@ -6334,32 +6372,7 @@ \edef\cap@indent{\the\@tempdima}% \dofullc@pfalse\@capbreaktrue } -\AfterPackage{caption2}{% - \renewcommand*{\setcapindent}{% - \ClassWarning{\KOMAClassName}{% - You're using package `caption2'.\MessageBreak - Because of this you should also use `\string\captionstyle' - and\MessageBreak - set length '\string\captionindent' instead of - using\MessageBreak - `\string\setcapindent'% - }% - \captionstyle{indent}% - \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}% - }% -} \newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse} -\AfterPackage{caption2}{% - \renewcommand*{\setcaphanging}{% - \ClassWarning{\KOMAClassName}{% - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\captionstyle'\MessageBreak - instead of `\string\setcaphang'% - } - \captionstyle{hang}% - }% -} \newcommand{\@makecaption}[2]{% \if@captionabove \vskip\belowcaptionskip @@ -6442,18 +6455,6 @@ \endgroup \fi\fi\fi\fi\fi } -\AfterPackage{caption2}{% - \renewcommand*{\setcapwidth}[2][]{% - \ClassWarning{\KOMAClassName}{% - Ignorring optional argument of `\string\setcapwidth'!\MessageBreak - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\setcaptionwidth'\MessageBreak - instead of `\string\setcapwidth'% - }% - \setcaptionwidth{#2}% - }% -}% \newcommand*{\setcapdynwidth}[2][]{% \def\cap@width{#2}% \begingroup @@ -6595,23 +6596,6 @@ \@tempa }% } -\AfterPackage{caption2}{% - \renewcommand*{\@setcapmargin}[2][\@tempdimb]{% - \setlength{\@tempdimb}{#2}% - \setlength{\@tempdima}{#1}% - \ifdim\@tempdima\@tempdimb\else - \ClassWarning{\KOMAClassName}{% - Can set only centered caption!\MessageBreak - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\setcaptionmargin'\MessageBreak - instead of `\string\setcapmargin'% - }% - \fi - \addtolength{\@tempdimb}{\@tempdimb}% - \setcaptionmargin{.5\@tempdimb}}% - \let\@@setcapmargin=\@setcapmargin -} \newcommand{\@@makecaption}[3]{% \cap@margin \begingroup @@ -6640,7 +6624,7 @@ \unexpanded\expandafter{\@xcentercr}% }% \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}% - \ifdim\@tempdima>\linewidth + \ifdim\@tempdima>\cap@width \aftergroup\scr@makemultilinecaption \else \aftergroup\scr@makesinglelinecaption @@ -6878,9 +6862,6 @@ }% } \AfterPackage{longtable}{% - \@ifpackageloaded{caption2}{\@komalongtablefalse - \scr@caption@before@longtable@warning{caption2}% - }{}% \if@komalongtable \renewcommand{\LT@makecaption}[3]{% \noalign{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index bde6a4f3f44..68e6378a5ac 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z 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 767e4fffaa3..44964131238 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,7 +100,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -220,6 +220,7 @@ \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} \@namedef{scr@v@3.33}{18} +\@namedef{scr@v@3.34}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) @@ -245,7 +246,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -359,7 +360,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% @@ -440,7 +441,7 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) @@ -524,7 +525,7 @@ {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) @@ -599,14 +600,14 @@ \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: execoption) %%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1351,7 +1352,7 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} @@ -1461,7 +1462,7 @@ \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 44678efb22c..ee239b20306 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,21 +64,21 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: identify) \ProvidesPackage{scrfontsizes}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 477cd7414a9..1b9c1ece7ca 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,29 +65,29 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% -\KOMA@ifkey{float}{@scrhack@float}% -\KOMAExecuteOptions{float=true}% \KOMA@ifkey{floatrow}{@scrhack@floatrow} \KOMAExecuteOptions{floatrow=true} +\KOMA@ifkey{float}{@scrhack@float}% +\KOMAExecuteOptions{float=true}% \KOMA@ifkey{listings}{@scrhack@listings} \KOMAExecuteOptions{listings=true} \RequirePackage{xpatch}% @@ -101,7 +101,7 @@ \KOMA@ifkey{standardsections}{@scrhack@standardsections} \KOMAExecuteOptions{standardsections=false} \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -160,20 +160,22 @@ }% \fi } -\AfterPackage*{float}{% - \KOMA@key[.scrhack.sty]{float}{% - \PackageWarning{scrhack}{option `float' ignored}% - \FamilyKeyStateProcessed - }% - \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi -} \AfterPackage*{floatrow}{% + \KOMAoptions{float=false}% + \PackageInfo{scrhack}{option `float' deactivated}% \KOMA@key[.scrhack.sty]{floatrow}{% \PackageWarning{scrhack}{option `floatrow' ignored}% \FamilyKeyStateProcessed }% \if@scrhack@floatrow\scr@hack@load\@pkgextension{floatrow}\fi } +\AfterPackage*{float}{% + \KOMA@key[.scrhack.sty]{float}{% + \PackageWarning{scrhack}{option `float' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi +} \AfterPackage*{listings}{% \KOMA@key[.scrhack.sty]{listings}{% \PackageWarning{scrhack}{option `listings' ignored}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index a7cffc0557f..7bd2960f0c7 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}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 8b0ab6d2af3..eb58cefda4e 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (% KOMA-Script-dependent @@ -242,12 +242,12 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: option) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% @@ -415,7 +415,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \newcommand*{\IfExistskomafont}[1]{% \scr@ifundefinedorrelax{scr@fnt@#1}{% @@ -521,14 +521,13 @@ \newcommand*{\usesizeofkomafont}[1]{% \begingroup \scr@prepareforkomafont - \def\selectfont{% - \global\let\g@scr@f@size\f@size - \global\let\g@scr@f@baselineskip\f@baselineskip - \global\let\g@scr@f@linespread\f@linespread - }% - \selectfont \sbox\@tempboxa{% - \usekomafont{#1}{\relax}% + \usekomafont{#1}{% + \selectfont + \global\let\g@scr@f@size\f@size + \global\let\g@scr@f@baselineskip\f@baselineskip + \global\let\g@scr@f@linespread\f@linespread + }% }% \endgroup \linespread{\g@scr@f@linespread}% @@ -542,34 +541,32 @@ \newcommand*{\usefontofkomafont}[1]{% \begingroup \scr@prepareforkomafont - \def\selectfont{% - \global\let\g@scr@f@encoding\f@encoding - \global\let\g@scr@f@family\f@family - \global\let\g@scr@f@series\f@series - \global\let\g@scr@f@shape\f@shape - \global\let\g@scr@f@size\f@size - \global\let\g@scr@f@baselineskip\f@baselineskip - \global\let\g@scr@f@linespread\f@linespread - }% - \selectfont \sbox\@tempboxa{% - \usekomafont{#1}{\relax}% + \usekomafont{#1}{% + \selectfont + \global\let\g@scr@f@encoding\f@encoding + \global\let\g@scr@f@family\f@family + \global\let\g@scr@f@series\f@series + \global\let\g@scr@f@shape\f@shape + \global\let\g@scr@f@size\f@size + \global\let\g@scr@f@baselineskip\f@baselineskip + \global\let\g@scr@f@linespread\f@linespread + }% }% \endgroup \linespread{\g@scr@f@linespread}% \fontsize{\g@scr@f@size}{\g@scr@f@baselineskip}% \usefont{\g@scr@f@encoding}{\g@scr@f@family}{\g@scr@f@series}{\g@scr@f@shape}% -} +}% \newcommand*{\use@ofkomafont}[2]{% \begingroup \scr@prepareforkomafont - \def\selectfont{% - \global\expandafter\let\csname g@scr@f@#1\expandafter\endcsname - \csname f@#1\endcsname - }% - \selectfont \sbox\@tempboxa{% - \usekomafont{#2}{\relax}% + \usekomafont{#2}{% + \selectfont + \global\expandafter\let\csname g@scr@f@#1\expandafter\endcsname + \csname f@#1\endcsname + }% }% \endgroup \@nameuse{font#1}{\csname g@scr@f@#1\endcsname}% 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 64d39da0052..0b59f557bc6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -46,11 +46,11 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2020/09/11 v0.3.3533 KOMA-Script + 2021/05/30 v0.3.3601 KOMA-Script package (end user interface for scrlayer)] %%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ @@ -64,7 +64,7 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ %%% (run: init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% @@ -241,7 +241,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ %%% (run: options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns} \slnc@autoclearnotecolumnstrue @@ -317,7 +317,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ %%% (run: body) \newcommand*{\DeclareNoteColumn}[2][]{% \@ifundefined{slnc@#2@box}{% @@ -545,7 +545,7 @@ \scr@ifundefinedorrelax{pdfmdfivesum}{% \scr@ifundefinedorrelax{mdfivesum}{% \ifdefined\directlua - \edef\reserved@a{\directlua{slncmdfivesum("\jobname.slnc")}}% + \edef\reserved@a{\directlua{slnc.mdfivesum(slnc.slncfile)}}% \else \let\reserved@a\relax \fi @@ -583,6 +583,10 @@ \fi \endgroup } +\AfterPackage*{scrwfile}{% + \@ifundefined{scrwfile@never}{\def}{\g@addto@macro}% + \scrwfile@never{slnc}% +} \newcommand*{\slnc@unexpanded}{} \let\slnc@unexpanded\detokenize \newcommand*{\makenote}{% @@ -911,7 +915,8 @@ \scr@ifundefinedorrelax{mdfivesum}{% \ifdefined\directlua \directlua{% - function slncmdfivesum(filename) + slnc = slnc or {} + function slnc.mdfivesum(filename) local fh = io.open(filename,"rb") if fh then local sum=md5.sumhexa(fh:read("*a")) @@ -919,8 +924,16 @@ fh:close() end end + if (string.sub(tex.jobname,1,1) == '"') + and (string.sub(tex.jobname,string.len(tex.jobname),-1) == '"') + then + slnc.slncfile = string.sub(tex.jobname,2,-2) + else + slnc.slncfile = tex.jobname + end + slnc.slncfile = slnc.slncfile .. '.slnc' }% - \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}% + \xdef\slnc@mdfivesum{\directlua{slnc.mdfivesum(slnc.slncfile)}}% \fi }{% \xdef\slnc@mdfivesum{\mdfivesum file {\jobname.slnc}}% @@ -1296,7 +1309,7 @@ \vadjust{#1}% \@esphack } -%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ %%% (run: final) \DeclareNoteColumn{marginpar} \let\reserved@a\clearpage 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 e7156a68e7f..23ce22461aa 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -45,11 +45,11 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (end user interface for scrlayer)] %%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ @@ -63,7 +63,7 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% @@ -226,7 +226,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -703,7 +703,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ %%% (run: body) \newcommand*{\setheadwidth}[2][]{% \KOMAoptions{headwidth=#2:#1}% @@ -1014,7 +1014,7 @@ \begingroup \setbox\z@\vbox{% \ifsls@leavevmode\leavevmode\expandafter\ignorespaces\fi - #2% + #2\par }% \ifdim #1<\dimexpr \ht\z@+\dp\z@\relax \PackageWarning{scrlayer-scrpage}{% @@ -1127,6 +1127,7 @@ \if@tempswa \hskip \z@\@plus 1fill\@minus \paperwidth\null \fi + \par }% }% \endgroup diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 259edb36f7f..d1c9a177fa6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -47,7 +47,7 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (defining layers and page styles)] %%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index aafa2dfe268..d11a4ef2be1 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 8e5dfa91c92..223b8d7e80c 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,17 +83,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ @@ -158,7 +158,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) @@ -738,7 +738,7 @@ %%% 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 $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ %%% (run: body) 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 c60da49d8a3..b4ba26aadfd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty @@ -40,20 +40,34 @@ %% %%% From File: $Id: scrlfile-hook.dtx$ \ProvidesPackage{scrlfile-hook}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (using LaTeX hooks)] -\@ifundefined{AddToHook}{% - \PackageError{scrlfile-hook}{LaTeX too old for this package}{% - \string\AddToHook\space of LaTeX 2020-10-01 or newer is - needed.\MessageBreak - Please update LaTeX or use package scrlfile-patch instead of\MessageBreak - scrlfile-hook.\MessageBreak - If you would continue, I will try to load scrlfile-patch +\@ifundefined{IfFormatAtLeastTF}{% + \PackageError{scrlfile-hook}{not recommended usage of package}{% + It seems this package has been loaded directly using a LaTeX + version\MessageBreak + prior to 2020-10-01. This is not recommend. Please always load + package\MessageBreak + scrlfile instead of scrlfile-hook.\MessageBreak + If you would continue, I will try to load scrlfile-patcholdlatex% }% - \RequirePackage{scrlfile-patch}% + \RequirePackage{scrlfile-patcholdlatex}% \endinput -}{} +}{% + \IfFormatAtLeastTF{2020/10/01}{}{% + \PackageError{scrlfile-hook}{LaTeX too old for this package}{% + It seems this package has been loaded directly using a LaTeX + version\MessageBreak + prior to 2020-10-01. This is not recommend. Please always load + package\MessageBreak + scrlfile instead of scrlfile-hook.\MessageBreak + If you would continue, I will try to load scrlfile-patcholdlatex% + }% + \RequirePackage{scrlfile-patcholdlatex}% + \endinput + }{}% +} \ExplSyntaxOn \NewDocumentCommand \BeforeFile { m } { 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 c32135a9d95..d76457b66cc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty @@ -38,11 +38,25 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlfile-patcholdlatex.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrlfile-patcholdlatex.dtx 3593 2021-04-21 10:11:38Z kohm $ \ProvidesPackage{scrlfile-patcholdlatex}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (patching old LaTeX kernels)] +\@ifundefined{IfFormatAtLeastTF}{}{% + \IfFormatAtLeastTF{2020/10/01}{% + \PackageError{scrlfile-hook}{LaTeX too young for this package}{% + It seems this package has been loaded directly using a LaTeX + version\MessageBreak + 2020-10-01 or newer. This is not recommend. Please always load + package\MessageBreak + scrlfile instead of scrlfile-patcholdlatex.\MessageBreak + If you would continue, I will try to load scrlfile-hook% + }% + \RequirePackage{scrlfile-hook}% + \endinput + }{}% +} \@ifclassloaded{memoir}{% \PackageInfo{scrlfile}{class `memoir' detected.\MessageBreak Using a compatible redefinition of \string\InputIfFileExists,\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 9381e05b9a2..2d48ce67bdc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -40,7 +40,7 @@ %% %%% From File: $Id: scrlfile.dtx 3565 2021-02-16 10:43:38Z kohm $ \ProvidesPackage{scrlfile}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (file load hooks)] \@ifundefined{IfFormatAtLeastTF}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty index 55f746f8928..ee6e1381fbb 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}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 9b99eabb5d4..1eed1baff20 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -197,10 +197,11 @@ \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} \@namedef{scr@v@3.33}{18} +\@namedef{scr@v@3.34}{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 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -338,7 +339,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 12% @@ -555,7 +556,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -826,7 +827,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ %%% (run: option) @@ -1494,7 +1495,7 @@ parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1507,7 +1508,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -3145,11 +3146,11 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} -\IfLTXAtLeastTF{2021/01/05}{% +\IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% @@ -3158,7 +3159,7 @@ }{% 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 + version >= 2021/06/01 and KOMA-Script >= 3.33. This combination is\MessageBreak not supported.\MessageBreak You could switch back to an older LaTeX using package @@ -3416,7 +3417,7 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index b3059c170c9..f91a737abbe 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 6f61e46ce56..f5aa2d22903 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -173,6 +173,7 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } +\IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{} \newcommand*{\size@part}{} \newcommand*{\size@partnumber}{} \newcommand*{\scr@part@beforeskip}{% @@ -219,7 +220,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -300,10 +301,11 @@ \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} \@namedef{scr@v@3.33}{18} +\@namedef{scr@v@3.34}{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 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -436,7 +438,7 @@ } %%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -649,7 +651,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -852,7 +854,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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1014,28 +1016,61 @@ } \KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}% -\KOMA@key{appendixprefix}[true]{% - \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% - \if@tempswa - \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}% - \@ifundefined{appendixmore}{% - \def\appendixmore{\@chapterprefixtrue}% - }{% - \l@addto@macro\appendixmore{\@chapterprefixtrue}% - }% - \else - \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% - \@ifundefined{appendixmore}{% - \def\appendixmore{\@chapterprefixfalse}% - }{% - \l@addto@macro\appendixmore{\@chapterprefixfalse}% +\IfLTXAtLeastTF{2020/10/01}{% + \KOMA@key{appendixprefix}[true]{% + \Ifstr{#1}{default}{% + \KOMA@kav@removekey{.\KOMAClassFileName}{appendixprefix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% + \IfHookEmptyTF{\KOMAClassName/appendix}{}{% + \RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]% }% + \FamilyKeyStateProcessed + }{% + \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% + \IfHookEmptyTF{\KOMAClassName/appendix}{}{% + \RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]% + }% + \if@tempswa + \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}% + \AddToHook{\KOMAClassName/appendix}[appendixprefix]% + {\@chapterprefixtrue}% + \else + \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \AddToHook{\KOMAClassName/appendix}[appendixprefix]% + {\@chapterprefixfalse}% + \fi + \fi + }% + }% +}{% + \KOMA@key{appendixprefix}[true]{% + \KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}% + \if@tempswa + \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}% + \@ifundefined{appendixmore}{% + \def\appendixmore{\@chapterprefixtrue}% + }{% + \l@addto@macro\appendixmore{\@chapterprefixtrue}% + }% + \else + \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \@ifundefined{appendixmore}{% + \def\appendixmore{\@chapterprefixfalse}% + }{% + \l@addto@macro\appendixmore{\@chapterprefixfalse}% + }% + \fi \fi - \fi + }% } \KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false} \KOMA@ifkey{chapterentrydots}{@chapterentrywithdots} @@ -1307,7 +1342,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -2046,7 +2081,7 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} @@ -2057,9 +2092,9 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2587,13 +2622,13 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ %%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} \setlength{\columnseprule}{\z@} -\IfLTXAtLeastTF{2021/01/05}{% +\IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% \IfPackageAtLeastTF{everysel}{2021/01/18}{}{% @@ -2602,7 +2637,7 @@ }{% 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 + version >= 2021/06/01 and KOMA-Script >= 3.33. This combination is\MessageBreak not supported.\MessageBreak You could switch back to an older LaTeX using package @@ -3228,7 +3263,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 3567 2021-02-17 10:01:38Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -4993,13 +5028,16 @@ `\string\appendix'% }% }{}% - \par% + \par \setcounter{chapter}{0}% \setcounter{section}{0}% \gdef\@chapapp{\appendixname}% \gdef\thechapter{\@Alph\c@chapter}% - \csname appendixmore\endcsname } +\IfLTXAtLeastTF{2020/10/01}{% + \g@addto@macro{\appendix}{\UseOneTimeHook{\KOMAClassName/appendix}}% +}{} +\g@addto@macro{\appendix}{\csname appendixmore\endcsname} \newcommand*{\scr@startpart}[1]{% \ExecuteDoHook{heading/preinit/#1}% \if@openright\cleardoublepage\else\clearpage\fi @@ -6187,7 +6225,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% @@ -6330,32 +6368,7 @@ \edef\cap@indent{\the\@tempdima}% \dofullc@pfalse\@capbreaktrue } -\AfterPackage{caption2}{% - \renewcommand*{\setcapindent}{% - \ClassWarning{\KOMAClassName}{% - You're using package `caption2'.\MessageBreak - Because of this you should also use `\string\captionstyle' - and\MessageBreak - set length '\string\captionindent' instead of - using\MessageBreak - `\string\setcapindent'% - }% - \captionstyle{indent}% - \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}% - }% -} \newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse} -\AfterPackage{caption2}{% - \renewcommand*{\setcaphanging}{% - \ClassWarning{\KOMAClassName}{% - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\captionstyle'\MessageBreak - instead of `\string\setcaphang'% - } - \captionstyle{hang}% - }% -} \newcommand{\@makecaption}[2]{% \if@captionabove \vskip\belowcaptionskip @@ -6438,18 +6451,6 @@ \endgroup \fi\fi\fi\fi\fi } -\AfterPackage{caption2}{% - \renewcommand*{\setcapwidth}[2][]{% - \ClassWarning{\KOMAClassName}{% - Ignorring optional argument of `\string\setcapwidth'!\MessageBreak - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\setcaptionwidth'\MessageBreak - instead of `\string\setcapwidth'% - }% - \setcaptionwidth{#2}% - }% -}% \newcommand*{\setcapdynwidth}[2][]{% \def\cap@width{#2}% \begingroup @@ -6591,23 +6592,6 @@ \@tempa }% } -\AfterPackage{caption2}{% - \renewcommand*{\@setcapmargin}[2][\@tempdimb]{% - \setlength{\@tempdimb}{#2}% - \setlength{\@tempdima}{#1}% - \ifdim\@tempdima\@tempdimb\else - \ClassWarning{\KOMAClassName}{% - Can set only centered caption!\MessageBreak - You're using package `caption2'.\MessageBreak - Because of this you should also use - `\string\setcaptionmargin'\MessageBreak - instead of `\string\setcapmargin'% - }% - \fi - \addtolength{\@tempdimb}{\@tempdimb}% - \setcaptionmargin{.5\@tempdimb}}% - \let\@@setcapmargin=\@setcapmargin -} \newcommand{\@@makecaption}[3]{% \cap@margin \begingroup @@ -6636,7 +6620,7 @@ \unexpanded\expandafter{\@xcentercr}% }% \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}% - \ifdim\@tempdima>\linewidth + \ifdim\@tempdima>\cap@width \aftergroup\scr@makemultilinecaption \else \aftergroup\scr@makesinglelinecaption @@ -6874,9 +6858,6 @@ }% } \AfterPackage{longtable}{% - \@ifpackageloaded{caption2}{\@komalongtablefalse - \scr@caption@before@longtable@warning{caption2}% - }{}% \if@komalongtable \renewcommand{\LT@makecaption}[3]{% \noalign{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 4917f2119c1..9ce30ebf1cf 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: 10pt) \ProvidesFile{% scrsize10pt.clo% @@ -150,7 +150,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z 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 ef0dc7590cd..3cadde4c240 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ %%% (run: 11pt) %%% (run: 12pt) \ProvidesFile{% @@ -151,7 +151,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z 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 037fd01833e..8ea372265d5 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z 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 29266bc7f2c..dcf399d1d8e 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 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}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index 06a1f8308e8..3ef71245202 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -39,10 +39,10 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrwfile.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrwfile.dtx 3600 2021-05-30 19:00:56Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrwfile} - [2013/08/05 v0.1f-alpha KOMA-Script package (write and clone files)] + [2021/05/30 v0.1.9-alpha KOMA-Script package (write and clone files)] \PackageWarningNoLine{scrwfile}{% THIS IS AN ALPHA VERSION!\MessageBreak USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak @@ -52,8 +52,14 @@ Maybe, it would be better not to load this package.% } \RequirePackage{scrbase}[2010/09/17] -\RequirePackage{tocbasic}[2010/10/01] \RequirePackage{scrlfile}[2010/09/30] +\scr@ifluatex{% + \PackageInfoNoLine{scrwfile}{LuaLaTeX detected.\MessageBreak + With LuaLaTeX you should never get an error message:\MessageBreak + \space\space`No room for a new \string\write'.\MessageBreak + So scrwfile could make much more harm than benefit\MessageBreak + and using it is not recommended}% +}{} \newcommand*{\scrwfile@if@only}[1]{% \begingroup \scr@ifundefinedorrelax{scrwfile@only}{\@tempswatrue}{% @@ -65,7 +71,7 @@ \if@tempswa \scr@ifundefinedorrelax{scrwfile@never}{}{% \edef\reserved@b{#1}% - \@for\reserved@a:=\scrwfile@only\do + \@for\reserved@a:=\scrwfile@never\do {\ifx\reserved@a\reserved@b\@tempswafalse\fi}% }% \fi @@ -137,6 +143,21 @@ \endgroup \fi } +\IfLTXAtLeastTF{2020/10/01}{% + \DeclareHookRule{enddocument/afteraux}% + {scrwfile}{before}{scrlayer-notecolumn}% +}{% + \@ifpackageloaded{scrlayer-notecolumn}{% + \PackageWarningNoLine{scrwfile}{% + Dangerous package order detected!\MessageBreak + As a general rule, you should load scrwfile as soon\MessageBreak + as possible, maybe even before `\string\documentclass'\MessageBreak + (using `\string\RequirePackage' instead of + `\string\usepackage').\MessageBreak + Following packages should be loaded after scrwfile:\MessageBreak + \space - scrlayer-notecolumn}% + }{}% +} \newcommand*{\scrwfile@saved@starttoc}{} \AtBeginDocument{% \begingroup @@ -199,6 +220,7 @@ }% }% \newcommand*{\TOCclone}[3][]{% + \RequirePackage{tocbasic}% \scr@ifundefinedorrelax{scrwfile@clone@#2}{% \expandafter\protected@edef\csname scrwfile@clone@#2\endcsname{% #3,\protect\csname scrwfile@clone@#3\endcsname @@ -233,6 +255,7 @@ \Iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}% }% } +\@onlypreamble\TOCClone %%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 49e3403e8d5..1019a071268 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{setspace.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak index ce59490064f..82bc507b8c9 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \ProvidesFile{standardsections.hak}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] -%%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ \PackageWarningNoLine{scrhack}{% You are loosing every kind of support because of\MessageBreak using the dangerous standard classes sections hack!\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 13e7a28108d..1a3ca811d31 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}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 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 747402660bf..47d60b13a79 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,7 +70,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -80,13 +80,13 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2021/03/17 v3.33 KOMA-Script + 2021/06/25 v3.34 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -168,13 +168,14 @@ \@namedef{scr@v@3.31}{18} \@namedef{scr@v@3.32}{18} \@namedef{scr@v@3.33}{18} +\@namedef{scr@v@3.34}{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 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -994,7 +995,7 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z 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 8c78c0f4d6e..92145a4eaf3 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 3586 2021-03-17 13:57:48Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}% + \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) |