diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
55 files changed, 2881 insertions, 2733 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index d21f4e6b84d..0b55942b2ce 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% DIN% @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -130,17 +130,18 @@ \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi \setplength{firstfootwidth}{\useplength{firstheadwidth}} -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 98.5mm} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco index a377a7db2fd..c9f38e64eec 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,7 +73,7 @@ \LoadLetterOption{% DINmtext% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \setplength{toaddrindent}{% 5mm} @@ -92,17 +92,18 @@ \dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}% \setplength{firstfootwidth}{% \dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}% -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 79.4mm} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco index 54cddc21e07..848fb99271b 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,7 +73,7 @@ \LoadLetterOption{% DIN% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \setplength{toaddrindent}{% 5mm} @@ -92,17 +92,18 @@ \dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}% \setplength{firstfootwidth}{% \dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}% -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refaftervskip}{% 8.46mm} \newplength{specialmailheight} diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 7a475f66a97..05aecf1a233 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% DINmtext% @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -130,17 +130,18 @@ \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi \setplength{firstfootwidth}{\useplength{firstheadwidth}} -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 80.5mm} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 78aec04a846..4d1d594d329 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% KOMAold% @@ -80,7 +80,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -218,7 +218,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \def\setpresigskip{\setplength{sigbeforevskip}} \endinput diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 51a8e01b1a1..f047a8aeccc 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: Kaku,LATE,LOW,head) @@ -71,7 +71,7 @@ L% L% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index 72f5e0abcc7..10f867e0c6c 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% NF% @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 758ce7842ba..346d6f9a8c3 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: Ni,EARLY,HIGH,head) @@ -71,7 +71,7 @@ E% H% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 4c35687c39a..590177b721f 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: Ni,EARLY,LOW,head) @@ -71,7 +71,7 @@ E% L% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index ecf5f30a9c1..7d11ff79055 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: Ni,LATE,HIGH,head) @@ -71,7 +71,7 @@ L% H% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index 12690a4caf4..c97c0b62753 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: Ni,LATE,LOW,head) @@ -71,7 +71,7 @@ L% L% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index 85eb83a5038..f83f18ad7d8 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3889 2022-06-09 12:11:14Z kohm $ %%% (run: Ni,RIGHT,LOW,head) @@ -71,7 +71,7 @@ R% L% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 943aa69984a..261e4b5d293 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% SN% @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -130,17 +130,18 @@ \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi \setplength{firstfootwidth}{\useplength{firstheadwidth}} -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 98.5mm} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 00b159446c0..a9e82ac989c 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% SNleft% @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -130,17 +130,18 @@ \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi \setplength{firstfootwidth}{\useplength{firstheadwidth}} -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 89mm} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 8a01d0b0c42..1ed4a4f24e5 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9 @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -131,17 +131,18 @@ \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi \setplength{firstfootwidth}{\useplength{firstheadwidth}} -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 3.4375in} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index abdb08a9c6e..773d4ad01fa 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9DW @@ -79,7 +79,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -127,17 +127,18 @@ \paperwidth} \addtoplength[-]{firstheadwidth}{.25in} \setplength{firstfootwidth}{\useplength{firstheadwidth}} -\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \setplength{firstfootvpos}{\paperheight} - \addtoplength{firstfootvpos}{-16mm} -\else - \setplength{firstfootvpos}{1in} - \addtoplength{firstfootvpos}{\topmargin} - \addtoplength{firstfootvpos}{\headheight} - \addtoplength{firstfootvpos}{\headsep} - \addtoplength{firstfootvpos}{\textheight} - \addtoplength{firstfootvpos}{\footskip} -\fi +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\scr@ifundefinedorrelax{scr@v@is@le}{}{% + \expandafter\ifnum \scr@v@is@le{2.9t}\relax\else + \setplength{firstfootvpos}{1in}% + \addtoplength{firstfootvpos}{\topmargin}% + \addtoplength{firstfootvpos}{\headheight}% + \addtoplength{firstfootvpos}{\headsep}% + \addtoplength{firstfootvpos}{\textheight}% + \addtoplength{firstfootvpos}{\footskip}% + \fi +}% \setplength{refvpos}{% 3.4375in} \setplength{refaftervskip}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index df41091085a..26b9d5e9ccc 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{float.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 11e424e5063..f276aa4a9c8 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{floatrow.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 d8094903c3b..dc3c4dfcbbc 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{hyperref.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 40945ed27c1..76e0c3b5580 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{listings.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 76d990b9fcd..b375e97a405 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{lscape.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 1d77f3d0d32..c9a1dd1e247 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{nomencl.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package nomencl)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z 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 342c03e23be..64403c55848 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,31 +106,29 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrartcl% -} +\newcommand*{\KOMAClassName}{scrartcl} \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \newcommand*{\ClassName}{% article% } \ProvidesClass{\KOMAClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script ] \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% @@ -138,9 +136,9 @@ \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -200,8 +198,8 @@ \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\size@subparagraph}{} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} -\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries} +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -287,10 +285,11 @@ \@namedef{scr@v@3.36}{20} \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} +\@namedef{scr@v@3.39}{20} \@namedef{scr@v@last}{20} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -326,7 +325,7 @@ Because of this, version was set to `first'% }% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{version}{first}% }{% @@ -335,7 +334,7 @@ }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{version}{#1}% \ifnum\scr@compatibility<\scr@v@last @@ -356,7 +355,7 @@ \fi }% } -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\KOMA@kav@add{\KOMAClassFileName}{version}{last} \AtEndOfClass{% \KOMA@key{version}[]{% \ClassError{\KOMAClassName}{% @@ -381,65 +380,64 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +\newcommand*{\scr@v@is@eq}[1]{% + \scr@compatibility=\@nameuse{scr@v@#1} +} +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{draft}{false} +\KOMA@kav@add{\KOMAClassFileName}{draft}{false} \KOMA@DeclareStandardOption {final}{draft=false} \KOMA@key{overfullrule}[true]{% \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false} +\KOMA@kav@add{\KOMAClassFileName}{overfullrule}{false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} -\newcommand*{\@gr@gsffamily}{% - \if@egregdoesnotlikesansseriftitles\else\sffamily\fi -} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -528,7 +526,7 @@ \@tempa }% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{fontsize}{#1}% } @@ -550,7 +548,52 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +\KOMA@ifkey{sfdefaults}{@sfdefaults} +\newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi} +\newcommand*{\textmaybesf}{% + \if@sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi +} +%% \begin{option}{egegdoesnotlikesansseriftitles} +\KOMA@key{egregdoesnotlikesansseriftitles}[true]{% + \ClassWarningNoLine{\KOMAClassName}% + {% + You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak + In 2016 this option has been implemented as a joke\MessageBreak + answer to egreg's comment:\MessageBreak + \space\space ``In my opinion there should be a document class\MessageBreak + \space\space option for it, instead of the + \string\setkomafont\MessageBreak + \space\space statement. And yes, I find imposing sans serif + for\MessageBreak + \space\space titles is not the best choice (one of the + reasons\MessageBreak + \space\space why I don't use Koma-script classes).''\MessageBreak + to question https://tex.stackexchange.com/q/289853\MessageBreak + at TeX.SX.\MessageBreak + The option has never been documented in the official\MessageBreak + user manuals and therefore should never have been\MessageBreak + used in real live documents. It was intended to be\MessageBreak + removed after some month.\MessageBreak + However, it has been used and also almost forgotten\MessageBreak + by the author.\MessageBreak + For this the author apologizes both to users but\MessageBreak + especially to egreg.\MessageBreak + Rightly, egreg has criticized the permanent retention\MessageBreak + of the option as unfunny to inappropriate and has\MessageBreak + asked that it be removed or replaced.\MessageBreak + It will be removed soon!\MessageBreak + You should use `sfdefaults=false` instead% + }% + \KOMA@set@ifkey{egregdoesnotlikesansseriftitles}% + {@sfdefaults}% + {#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% + {sfdefaults}{\if@sfdefaults true\else false\fi}% + \fi +} +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -570,9 +613,9 @@ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi \fi \fi - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{twoside}{#1}% + \KOMA@kav@xreplacevalue + {\KOMAClassFileName}% + {twoside}{#1}% \fi } \KOMAExecuteOptions{twoside=false} @@ -582,21 +625,23 @@ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - \KOMAClassFileName - }{twocolumn}{@twocolumn}% + \KOMA@kav@replacebool + {\KOMAClassFileName}% + {twocolumn}{@twocolumn}% \if@atdocument\expandafter\@firstofone \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} {\expandafter\AtEndOfClass}\fi - {\expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else - \onecolumn - \if@twoside\flushbottom\else - \raggedbottom + {% + \expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else + \onecolumn + \if@twoside\flushbottom\else + \raggedbottom + \fi \fi \fi - \fi}% + }% \fi } \AtEndOfClass{% @@ -677,7 +722,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -690,16 +735,16 @@ \if@atdocument\let\par@update\default@par@update\fi \par@updaterelative }% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half*}% } \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} @@ -738,66 +783,66 @@ \ifcase\number\@tempa% 0 \endgroup \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{never}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{false}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 2 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 4 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 6 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 8 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 10 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{relative}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -811,9 +856,9 @@ }% \or%11 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -841,9 +886,9 @@ \KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} \KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{parskip}{false} +\KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute} +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagefalse @@ -853,24 +898,24 @@ \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{titlepage}{firstiscover}% }{% \def\FamilyElseValue{, `firstiscover'}% \KOMA@set@ifkey{titlepage}{@titlepage}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{titlepage}{firstiscover}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{titlepage}{@titlepage}% \@titlepageiscoverpagefalse \fi }% } -\KOMA@kav@xadd{.% +\KOMA@kav@xadd{% \KOMAClassFileName }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% @@ -878,9 +923,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -891,7 +936,7 @@ {noenddot}{2},{nodotatend}{2}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}% \ifcase \@tempa\relax \if@atdocument\scr@dotchangeatdocument{#1}\else \let\scr@altsecnumhook\@empty @@ -911,7 +956,7 @@ \KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \KOMA@ifkey{bookmarkpackage}{@scr@autoloadbookmarkpackage} \@scr@autoloadbookmarkpackagetrue -\KOMA@kav@add{.\KOMAClassFileName}{bookmarkpackage}{true} +\KOMA@kav@add{\KOMAClassFileName}{bookmarkpackage}{true} \AfterAtEndOfPackage{hyperref}{% \AtBeginDocument{% \@ifpackageloaded{bookmark}{}{% @@ -1012,11 +1057,11 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax% big - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{big}% \setkomafont{part}{\Huge}% \setkomafont{partnumber}{\huge}% \setkomafont{section}{\Large}% @@ -1025,11 +1070,11 @@ \setkomafont{paragraph}{\normalsize}% \setkomafont{subparagraph}{\normalsize}% \or % normal - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{normal}% \setkomafont{part}{\huge}% \setkomafont{partnumber}{\huge}% \setkomafont{section}{\large}% @@ -1038,11 +1083,11 @@ \setkomafont{paragraph}{\normalsize}% \setkomafont{subparagraph}{\normalsize}% \or % small - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{small}% \setkomafont{part}{\LARGE}% \setkomafont{partnumber}{\LARGE}% \setkomafont{section}{\normalsize}% @@ -1058,29 +1103,29 @@ \or % twolineappendix \or % onelineappendix \or % optiontotocandhead - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}% \scr@activate@xsection{3}% \or % optiontotoc - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontotoc}% \scr@activate@xsection{2}% \or % optiontohead - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontohead}% \scr@activate@xsection{1}% \or % standardclasses - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{standardclasses}% \setkomafont{part}{\huge}% \setkomafont{partnumber}{\Large}% \setkomafont{section}{\Large}% @@ -1092,17 +1137,17 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{headings}{big} +\KOMA@kav@add{\KOMAClassFileName}{headings}{big} \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% -\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \KOMA@ifkey{footsepline}{@fsl}% -\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{footsepline}{false} \KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \KOMA@key{cleardoublepage}{% \begingroup @@ -1117,7 +1162,7 @@ \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{cleardoublepage}{current}% }% @@ -1128,7 +1173,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{cleardoublepage}{#1}% }% @@ -1141,7 +1186,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% {cleardoublepage}{#1}% }% }{}% @@ -1169,26 +1214,28 @@ \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} \renewcommand*{\cleardoublepage}{% - \expandafter\ifnum \@nameuse{scr@v@2.98c}<\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@gt{2.98c}% \cleardoubleemptypage \else \cleardoublestandardpage \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{cleardoublepage}{% - \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi + \expandafter\ifnum \scr@v@is@gt{2.98c} + empty% + \else current\fi } \AtEndOfClass{% \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]% {% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% \KOMAClassFileName }{cleardoublepage}{\@tempa}% } @@ -1201,7 +1248,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1235,108 +1282,108 @@ \@tablecaptionabovetrue \@figurecaptionabovetrue \@captionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{heading}% \or % signature \@tablecaptionabovefalse \@figurecaptionabovefalse \@captionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{signature}% \or % tableheading \@tablecaptionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{tableheading}% \or % tablesignature \@tablecaptionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{tablesignature}% \or % figureheading \@figurecaptionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{figureheading}% \or % figuresignature \@figurecaptionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{figuresignature}% \or % oneline \onelinecaptionstrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{oneline}% \or % nooneline \onelinecaptionsfalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{nooneline}% \or % rightbeside \renewcommand*{\scap@pos}{r}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{rightbeside}% \or % leftbeside \renewcommand*{\scap@pos}{l}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{leftbeside}% \or % innerbeside \renewcommand*{\scap@pos}{i}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{innerbeside}% \or % outerbeside \renewcommand*{\scap@pos}{o}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{outerbeside}% \or % topbeside \renewcommand*{\scap@valign}{t}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{topbeside}% \or % centeredbeside \renewcommand*{\scap@valign}{c}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{centeredbeside}% \or % bottombeside \renewcommand*{\scap@valign}{b}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{bottombeside}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{captions}{signature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside} +\KOMA@kav@add{\KOMAClassFileName}{captions}{signature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{tablesignature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{figuresignature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{oneline} +\KOMA@kav@add{\KOMAClassFileName}{captions}{rightbeside} +\KOMA@kav@add{\KOMAClassFileName}{captions}{bottombeside} \KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading} \KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature} \newif\if@komalongtable\@komalongtabletrue \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1356,7 +1403,7 @@ \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{multiple}% }{% @@ -1365,7 +1412,7 @@ \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{nomultiple}% }{% @@ -1375,17 +1422,17 @@ } \AtBeginDocument{% \ifx\@footnotemark\scr@saved@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{nomultiple}% \else\ifx\@footnotemark\scr@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{multiple}% \fi\fi @@ -1407,7 +1454,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1450,24 +1497,24 @@ \or % bibliographynumbered \KOMAoptions{bibliography=totocnumbered}% \or % flat - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{flat}% \@toclefttrue \or % graduated - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{graduated}% \@tocleftfalse \or % indenttextentries - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{indenttextentries}% \expandafter\setuptoc\expandafter{\ext@toc}{numberline}% \or % leftaligntextentries - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}% \expandafter\unsettoc\expandafter{\ext@toc}{numberline}% \or % chapterentrywithdots/sectionentrywithdots \KOMAoptions{sectionentrydots=true}% @@ -1498,14 +1545,14 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax % notoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{notoc}% \renewcommand*{\float@@listhead}{% \section* }% @@ -1518,14 +1565,14 @@ \unsettoc{\@currext}{totoc}% }% \or% totoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{totoc}% \renewcommand*{\float@@listhead}{% \addsec }% @@ -1538,14 +1585,14 @@ \setuptoc{\@currext}{totoc}% }% \or% numbered - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{numbered}% \renewcommand*{\float@@listhead}{% \section }% @@ -1558,18 +1605,18 @@ \setuptoc{\@currext}{totoc}% }% \or% flat - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{flat}% \@dynlisttrue \or% graduated - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{graduated}% \@dynlistfalse \or% leveldown - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{leveldown}% \doforeachtocfile[float]{% \setuptoc{\@currext}{leveldown}% }% @@ -1577,8 +1624,8 @@ \setuptoc{\@currext}{leveldown}% }% \or% standardlevel - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leveldown}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leveldown}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{standardlevel}% \doforeachtocfile[float]{% \unsettoc{\@currext}{leveldown}% }% @@ -1586,7 +1633,7 @@ \unsettoc{\@currext}{leveldown}% }% \or% entryprefix - \KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{entryprefix}% \@dynlisttrue \doforeachtocfile[float]{% \BeforeStartingTOC[\@currext]{% @@ -1607,9 +1654,9 @@ }% }% \or% indenttextentries - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{indenttextentries}% \doforeachtocfile[float]{% \setuptoc{\@currext}{numberline}% }% @@ -1617,9 +1664,9 @@ \setuptoc{\@currext}{numberline}% } \or% leftaligntextentries - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}% \doforeachtocfile[float]{% \unsettoc{\@currext}{numberline}% }% @@ -1629,15 +1676,15 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries} +\KOMA@kav@add{\KOMAClassFileName}{toc}{nolistof} +\KOMA@kav@add{\KOMAClassFileName}{listof}{notoc} +\KOMA@kav@add{\KOMAClassFileName}{listof}{graduated} +\KOMA@kav@add{\KOMAClassFileName}{listof}{leftaligntextentries} \KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc} \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} \KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} -%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1660,13 +1707,13 @@ \@ifundefined{scr@current@bibstyle}{}{% \Ifstr{\scr@current@bibstyle}{}{}{% \edef\reserved@a{% - \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% + \noexpand\KOMA@kav@remove{\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% }\reserved@a }% }% \def\scr@current@bibstyle{#2}% - \KOMA@kav@xadd{.\KOMAClassFileName}{bibliography}{#2}% + \KOMA@kav@xadd{\KOMAClassFileName}{bibliography}{#2}% \csname scr@bibstyle@#1\endcsname #3% }% @@ -1731,14 +1778,14 @@ {standardlevel}{4}% }{#1}% \ifcase \@tempa\relax % notoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{notoc}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \subsection*{##1}% @@ -1749,14 +1796,14 @@ \fi }% \or% totoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{totoc}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \subsection*{% @@ -1770,14 +1817,14 @@ \fi }% \or% numbered - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{numbered}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \subsection{##1}% @@ -1787,20 +1834,20 @@ \fi } \or% leveldown - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{leveldown}% \bib@leveldowntrue \or% standardlevel - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{standardlevel}% \bib@leveldownfalse \fi }{% \FamilyKeyStateProcessed \edef\reserved@a{% - \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% + \noexpand\KOMA@kav@remove{\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% }\reserved@a \csname scr@bibstyle@#1\endcsname @@ -1809,7 +1856,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ %%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown @@ -1830,14 +1877,14 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@add{\KOMAClassFileName}{index}{notoc}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection @@ -1846,14 +1893,14 @@ \fi*% }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@add{\KOMAClassFileName}{index}{toc}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection\expandafter* @@ -1862,14 +1909,14 @@ \fi }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{index}{numbered}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection @@ -1878,35 +1925,35 @@ \fi }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{index}{leveldown}% \idx@leveldowntrue \or - \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{index}{standardlevel}% \idx@leveldownfalse \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex} -\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} -\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} +\KOMA@kav@add{\KOMAClassFileName}{toc}{noindex} +\KOMA@kav@add{\KOMAClassFileName}{index}{notoc} +\KOMA@kav@add{\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \AtBeginDocument{% \begingroup @@ -1955,7 +2002,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1993,7 +2040,7 @@ \fi } \providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{fontsize}% \@defaultunits\@tempdima#2pt\relax\@nnil @@ -2142,7 +2189,9 @@ \let\Huge\@undefined \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved@a}% \normalsize - \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi + \expandafter\ifnum\scr@v@is@ge{3.17} + \@nameuse{par@updaterelative}% + \fi \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{\footnotesep}{.7\@tempdimc}% \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus @@ -2342,25 +2391,25 @@ \InputIfFileExists{\@fontsizefilebase\@tempa.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }{% \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}% }{% \InputIfFileExists{size\@tempb.clo}{% \ClassInfo{\KOMAClassName}{% File `size\@tempb.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}% }{% \edef\@tempa{% \noexpand\changefontsizes{\@tempa}% - \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \noexpand\KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }\@tempa }% }% @@ -2454,13 +2503,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: body) \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2507,7 +2556,7 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: body) \newcommand*{\par@updaterelative}{% \begingroup @@ -2683,7 +2732,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -2734,8 +2783,7 @@ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi } \newcommand*\maketitle[1][1]{% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \def\and{% \end{tabular}% \hskip 1em \@plus.17fil% @@ -2831,8 +2879,7 @@ \vfill\null \if@twoside \@tempswatrue - \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty \@tempswafalse \fi\fi @@ -2850,14 +2897,16 @@ \fi \else \ifx\@uppertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% @@ -2879,20 +2928,23 @@ \@tempcnta=% #1% \relax\ifnum\@tempcnta=1\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% Optional argument of \string\maketitle\space ignored\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@uppertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% @@ -2954,7 +3006,7 @@ \endgroup \fi \setcounter{footnote}{0}% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@lt{3.12}% \let\thanks\relax \let\maketitle\relax \let\@maketitle\relax @@ -3050,9 +3102,6 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \if@compatibility - \setcounter{page}{0}% - \fi }{% \if@restonecol\twocolumn \else \newpage \fi }% @@ -3102,10 +3151,10 @@ \newcommand*\abstractname{Abstract} \providecaptionname{american,australian,british,canadian,english,newzealand,% UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3119,7 +3168,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% @@ -3138,17 +3187,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,subsection) \CloneTOCEntryStyle{tocline}{subsection} \TOCEntryStyleStartInitCode{subsection}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: body) \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3517,7 +3566,7 @@ \z@ \fi \let\@svsec\@empty - \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.31}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -3675,7 +3724,7 @@ This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% }{% - \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.31}\relax \begingroup \let\@elt\@stpelt \csname cl@\scr@s@ct@@nn@m@\endcsname @@ -4756,7 +4805,7 @@ {\@currenttocentry}% \fi }{% - \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.18}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -4927,7 +4976,8 @@ \fi {\parindent \z@ \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \setlength{\parfillskip}{\z@ plus 1fil}\fi + \setlength{\parfillskip}{\z@ plus 1fil}% + \fi \raggedsection\normalfont\sectfont\nobreak \usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}% }\nobreak @@ -5048,7 +5098,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5070,7 +5120,7 @@ \newcommand*{\dictumauthorformat}[1]{(#1)} \newcommand*{\raggeddictumtext}{\raggedright} \newcommand*{\raggeddictumauthor}{\raggedleft} -\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small} +\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small} \newkomafont{dictumauthor}{\itshape} \aliaskomafont{dictumtext}{dictum} \setlength{\skip\@mpfootins}{\skip\footins} @@ -5138,7 +5188,7 @@ \fi } \newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% + \marginpar[{\raggedleft #1}]{\raggedright #1}% } \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% @@ -5358,7 +5408,7 @@ \let\scr@mt@saved@sect\relax \fi } -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -5454,7 +5504,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -5465,7 +5515,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: body) \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} @@ -6228,7 +6278,7 @@ \expandafter\ifnum\scr@v@is@lt{3.35}% \renewcommand*\thetable{\@arabic\c@table} \fi -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -6389,7 +6439,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -6533,7 +6583,7 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ %%% (run: body) \newcommand*\refname{References} \providecaptionname{american,australian,british,canadian,english,newzealand,% @@ -6621,7 +6671,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ %%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax @@ -6665,7 +6715,7 @@ \newcommand*\indexname{Index} \providecaptionname{american,australian,british,canadian,english,newzealand,% UKenglish,ukenglish,USenglish,usenglish}\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -6816,7 +6866,7 @@ \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } -\newcommand*\descfont{\@gr@gsffamily\bfseries} +\newcommand*\descfont{\maybesffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newcommand*{\labelitemfont}{\normalfont} \newcommand*\scr@fnt@itemizelabel{\labelitemfont} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index 10766ce5582..81a2d916728 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,15 +60,13 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrartcl% -} +\newcommand*{\KOMAClassName}{scrartcl} \newcommand*{\ClassName}{% article% } @@ -77,7 +75,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 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 d9aa255f8bc..f7b3a615c8a 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (% KOMA-Script-independent @@ -597,7 +597,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: option) \DefineFamily{KOMA} \DefineFamilyMember{KOMA} @@ -609,9 +609,9 @@ \RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}% } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -2496,7 +2496,7 @@ }% }% } -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 0330be15418..a469dd8d995 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,31 +106,29 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrbook% -} +\newcommand*{\KOMAClassName}{scrbook} \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \newcommand*{\ClassName}{% book% } \ProvidesClass{\KOMAClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -141,9 +139,9 @@ \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -229,8 +227,8 @@ \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\size@subparagraph}{} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} -\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries} +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -316,10 +314,11 @@ \@namedef{scr@v@3.36}{20} \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} +\@namedef{scr@v@3.39}{20} \@namedef{scr@v@last}{20} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -354,7 +353,7 @@ Because of this, version was set to `first'% }% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{version}{first}% }{% @@ -363,7 +362,7 @@ }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{version}{#1}% \ifnum\scr@compatibility<\scr@v@last @@ -384,7 +383,7 @@ \fi }% } -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\KOMA@kav@add{\KOMAClassFileName}{version}{last} \AtEndOfClass{% \KOMA@key{version}[]{% \ClassError{\KOMAClassName}{% @@ -409,65 +408,64 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +\newcommand*{\scr@v@is@eq}[1]{% + \scr@compatibility=\@nameuse{scr@v@#1} +} +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{draft}{false} +\KOMA@kav@add{\KOMAClassFileName}{draft}{false} \KOMA@DeclareStandardOption {final}{draft=false} \KOMA@key{overfullrule}[true]{% \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false} +\KOMA@kav@add{\KOMAClassFileName}{overfullrule}{false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} -\newcommand*{\@gr@gsffamily}{% - \if@egregdoesnotlikesansseriftitles\else\sffamily\fi -} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -556,7 +554,7 @@ \@tempa }% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{fontsize}{#1}% } @@ -578,7 +576,52 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +\KOMA@ifkey{sfdefaults}{@sfdefaults} +\newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi} +\newcommand*{\textmaybesf}{% + \if@sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi +} +%% \begin{option}{egegdoesnotlikesansseriftitles} +\KOMA@key{egregdoesnotlikesansseriftitles}[true]{% + \ClassWarningNoLine{\KOMAClassName}% + {% + You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak + In 2016 this option has been implemented as a joke\MessageBreak + answer to egreg's comment:\MessageBreak + \space\space ``In my opinion there should be a document class\MessageBreak + \space\space option for it, instead of the + \string\setkomafont\MessageBreak + \space\space statement. And yes, I find imposing sans serif + for\MessageBreak + \space\space titles is not the best choice (one of the + reasons\MessageBreak + \space\space why I don't use Koma-script classes).''\MessageBreak + to question https://tex.stackexchange.com/q/289853\MessageBreak + at TeX.SX.\MessageBreak + The option has never been documented in the official\MessageBreak + user manuals and therefore should never have been\MessageBreak + used in real live documents. It was intended to be\MessageBreak + removed after some month.\MessageBreak + However, it has been used and also almost forgotten\MessageBreak + by the author.\MessageBreak + For this the author apologizes both to users but\MessageBreak + especially to egreg.\MessageBreak + Rightly, egreg has criticized the permanent retention\MessageBreak + of the option as unfunny to inappropriate and has\MessageBreak + asked that it be removed or replaced.\MessageBreak + It will be removed soon!\MessageBreak + You should use `sfdefaults=false` instead% + }% + \KOMA@set@ifkey{egregdoesnotlikesansseriftitles}% + {@sfdefaults}% + {#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% + {sfdefaults}{\if@sfdefaults true\else false\fi}% + \fi +} +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -598,9 +641,9 @@ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi \fi \fi - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{twoside}{#1}% + \KOMA@kav@xreplacevalue + {\KOMAClassFileName}% + {twoside}{#1}% \fi } \KOMAExecuteOptions{twoside=true} @@ -610,21 +653,23 @@ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - \KOMAClassFileName - }{twocolumn}{@twocolumn}% + \KOMA@kav@replacebool + {\KOMAClassFileName}% + {twocolumn}{@twocolumn}% \if@atdocument\expandafter\@firstofone \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} {\expandafter\AtEndOfClass}\fi - {\expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else - \onecolumn - \if@twoside\flushbottom\else - \raggedbottom + {% + \expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else + \onecolumn + \if@twoside\flushbottom\else + \raggedbottom + \fi \fi \fi - \fi}% + }% \fi } \AtEndOfClass{% @@ -705,7 +750,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -718,16 +763,16 @@ \if@atdocument\let\par@update\default@par@update\fi \par@updaterelative }% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half*}% } \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} @@ -766,66 +811,66 @@ \ifcase\number\@tempa% 0 \endgroup \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{never}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{false}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 2 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 4 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 6 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 8 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 10 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{relative}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -839,9 +884,9 @@ }% \or%11 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -869,9 +914,9 @@ \KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} \KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{parskip}{false} +\KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute} +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagetrue @@ -881,31 +926,31 @@ \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{titlepage}{firstiscover}% }{% \def\FamilyElseValue{, `firstiscover'}% \KOMA@set@ifkey{titlepage}{@titlepage}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{titlepage}{firstiscover}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{titlepage}{@titlepage}% \@titlepageiscoverpagefalse \fi }% } -\KOMA@kav@xadd{.% +\KOMA@kav@xadd{% \KOMAClassFileName }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -914,20 +959,20 @@ {left}{2}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openany}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openright}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openleft}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}{open}{#1}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{openany}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{openright}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{openleft}% \ifcase \@tempa\relax - \KOMA@kav@add{.\KOMAClassFileName}{headings}{openany}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{openany}% \@openrightfalse \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}% \or - \KOMA@kav@add{.\KOMAClassFileName}{headings}{openright}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{openright}% \@openrighttrue \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}% \or - \KOMA@kav@add{.\KOMAClassFileName}{headings}{openleft}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{openleft}% \@openrighttrue \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}% \fi @@ -944,7 +989,7 @@ {noenddot}{2},{nodotatend}{2}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}% \ifcase \@tempa\relax \if@atdocument\scr@dotchangeatdocument{#1}\else \let\scr@altsecnumhook\@empty @@ -964,7 +1009,7 @@ \KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \KOMA@ifkey{bookmarkpackage}{@scr@autoloadbookmarkpackage} \@scr@autoloadbookmarkpackagetrue -\KOMA@kav@add{.\KOMAClassFileName}{bookmarkpackage}{true} +\KOMA@kav@add{\KOMAClassFileName}{bookmarkpackage}{true} \AfterAtEndOfPackage{hyperref}{% \AtBeginDocument{% \@ifpackageloaded{bookmark}{}{% @@ -1055,26 +1100,26 @@ \KOMA@key{chapterprefix}[true]{% \KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.\KOMAClassFileName}% + \KOMA@kav@replacebool{\KOMAClassFileName}% {chapterprefix}{@chapterprefix}% - \KOMA@kav@remove{.\KOMAClassFileName}% + \KOMA@kav@remove{\KOMAClassFileName}% {headings}{twolinechapter}% - \KOMA@kav@remove{.\KOMAClassFileName}% + \KOMA@kav@remove{\KOMAClassFileName}% {headings}{onelinechapter}% - \KOMA@kav@xadd{.\KOMAClassFileName}% + \KOMA@kav@xadd{\KOMAClassFileName}% {headings}{% \if@chapterprefix twolinechapter\else onelinechapter\fi }% \fi } -\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}% +\KOMA@kav@add{\KOMAClassFileName}{headings}{onelinechapter}% \KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \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}% + \KOMA@kav@removekey{\KOMAClassFileName}{appendixprefix}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{onelineappendix}% \IfHookEmptyTF{\KOMAClassName/appendix}{}{% \RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]% }% @@ -1082,18 +1127,18 @@ }{% \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}% + \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}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{twolineappendix}% \AddToHook{\KOMAClassName/appendix}[appendixprefix]% {\@chapterprefixtrue}% \else - \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{onelineappendix}% \AddToHook{\KOMAClassName/appendix}[appendixprefix]% {\@chapterprefixfalse}% \fi @@ -1104,18 +1149,18 @@ \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}% + \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}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{twolineappendix}% \@ifundefined{appendixmore}{% \def\appendixmore{\@chapterprefixtrue}% }{% \l@addto@macro\appendixmore{\@chapterprefixtrue}% }% \else - \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{onelineappendix}% \@ifundefined{appendixmore}{% \def\appendixmore{\@chapterprefixfalse}% }{% @@ -1150,11 +1195,11 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax% big - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{big}% \renewcommand*{\scr@chapter@beforeskip}{-3.3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip @@ -1162,8 +1207,9 @@ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{% - \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa - \else\vskip\@tempskipa\fi + \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa\else + \vskip\@tempskipa + \fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% \setkomafont{part}{\Huge}% @@ -1176,11 +1222,11 @@ \setkomafont{paragraph}{\normalsize}% \setkomafont{subparagraph}{\normalsize}% \or % normal - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{normal}% \renewcommand*{\scr@chapter@beforeskip}{-3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip @@ -1188,8 +1234,9 @@ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{% - \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa - \else\vskip\@tempskipa\fi + \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa\else + \vskip\@tempskipa + \fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% \setkomafont{part}{\huge}% @@ -1202,11 +1249,11 @@ \setkomafont{paragraph}{\normalsize}% \setkomafont{subparagraph}{\normalsize}% \or % small - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{small}% \renewcommand*{\scr@chapter@beforeskip}{-2.8\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip @@ -1214,8 +1261,9 @@ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{% - \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa - \else\vskip\@tempskipa\fi + \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa\else + \vskip\@tempskipa + \fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% \setkomafont{part}{\LARGE}% @@ -1242,29 +1290,29 @@ \or % onelineappendix \KOMAoptions{appendixprefix=false}% \or % optiontotocandhead - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}% \scr@activate@xsection{3}% \or % optiontotoc - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontotoc}% \scr@activate@xsection{2}% \or % optiontohead - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontohead}% \scr@activate@xsection{1}% \or % standardclasses - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{standardclasses}% \renewcommand*{\scr@chapter@beforeskip}{-50\p@}% \renewcommand*{\scr@chapter@afterskip}{40\p@}% \renewcommand*{\scr@chapter@innerskip}{20\p@}% @@ -1285,18 +1333,18 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{headings}{big} -\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter} +\KOMA@kav@add{\KOMAClassFileName}{headings}{big} +\KOMA@kav@add{\KOMAClassFileName}{headings}{onelinechapter} \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% -\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \KOMA@ifkey{footsepline}{@fsl}% -\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{footsepline}{false} \KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \KOMA@key{cleardoublepage}{% \begingroup @@ -1311,7 +1359,7 @@ \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{cleardoublepage}{current}% }% @@ -1322,7 +1370,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{cleardoublepage}{#1}% }% @@ -1335,7 +1383,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% {cleardoublepage}{#1}% }% }{}% @@ -1363,26 +1411,28 @@ \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} \renewcommand*{\cleardoublepage}{% - \expandafter\ifnum \@nameuse{scr@v@2.98c}<\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@gt{2.98c}% \cleardoubleemptypage \else \cleardoublestandardpage \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{cleardoublepage}{% - \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi + \expandafter\ifnum \scr@v@is@gt{2.98c} + empty% + \else current\fi } \AtEndOfClass{% \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]% {% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% \KOMAClassFileName }{cleardoublepage}{\@tempa}% } @@ -1395,7 +1445,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1429,108 +1479,108 @@ \@tablecaptionabovetrue \@figurecaptionabovetrue \@captionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{heading}% \or % signature \@tablecaptionabovefalse \@figurecaptionabovefalse \@captionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{signature}% \or % tableheading \@tablecaptionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{tableheading}% \or % tablesignature \@tablecaptionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{tablesignature}% \or % figureheading \@figurecaptionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{figureheading}% \or % figuresignature \@figurecaptionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{figuresignature}% \or % oneline \onelinecaptionstrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{oneline}% \or % nooneline \onelinecaptionsfalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{nooneline}% \or % rightbeside \renewcommand*{\scap@pos}{r}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{rightbeside}% \or % leftbeside \renewcommand*{\scap@pos}{l}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{leftbeside}% \or % innerbeside \renewcommand*{\scap@pos}{i}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{innerbeside}% \or % outerbeside \renewcommand*{\scap@pos}{o}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{outerbeside}% \or % topbeside \renewcommand*{\scap@valign}{t}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{topbeside}% \or % centeredbeside \renewcommand*{\scap@valign}{c}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{centeredbeside}% \or % bottombeside \renewcommand*{\scap@valign}{b}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{bottombeside}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{captions}{signature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside} +\KOMA@kav@add{\KOMAClassFileName}{captions}{signature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{tablesignature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{figuresignature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{oneline} +\KOMA@kav@add{\KOMAClassFileName}{captions}{rightbeside} +\KOMA@kav@add{\KOMAClassFileName}{captions}{bottombeside} \KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading} \KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature} \newif\if@komalongtable\@komalongtabletrue \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1550,7 +1600,7 @@ \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{multiple}% }{% @@ -1559,7 +1609,7 @@ \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{nomultiple}% }{% @@ -1569,17 +1619,17 @@ } \AtBeginDocument{% \ifx\@footnotemark\scr@saved@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{nomultiple}% \else\ifx\@footnotemark\scr@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{multiple}% \fi\fi @@ -1601,7 +1651,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1644,24 +1694,24 @@ \or % bibliographynumbered \KOMAoptions{bibliography=totocnumbered}% \or % flat - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{flat}% \@toclefttrue \or % graduated - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{graduated}% \@tocleftfalse \or % indenttextentries - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{indenttextentries}% \expandafter\setuptoc\expandafter{\ext@toc}{numberline}% \or % leftaligntextentries - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}% \expandafter\unsettoc\expandafter{\ext@toc}{numberline}% \or % chapterentrywithdots/sectionentrywithdots \KOMAoptions{chapterentrydots=true}% @@ -1696,14 +1746,14 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax % notoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{notoc}% \renewcommand*{\float@@listhead}{% \chapter* }% @@ -1716,14 +1766,14 @@ \unsettoc{\@currext}{totoc}% }% \or% totoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{totoc}% \renewcommand*{\float@@listhead}{% \addchap }% @@ -1736,14 +1786,14 @@ \setuptoc{\@currext}{totoc}% }% \or% numbered - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{numbered}% \renewcommand*{\float@@listhead}{% \chapter }% @@ -1756,18 +1806,18 @@ \setuptoc{\@currext}{totoc}% }% \or% flat - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{flat}% \@dynlisttrue \or% graduated - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{graduated}% \@dynlistfalse \or% leveldown - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{leveldown}% \doforeachtocfile[float]{% \setuptoc{\@currext}{leveldown}% }% @@ -1775,8 +1825,8 @@ \setuptoc{\@currext}{leveldown}% }% \or% standardlevel - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leveldown}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leveldown}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{standardlevel}% \doforeachtocfile[float]{% \unsettoc{\@currext}{leveldown}% }% @@ -1784,7 +1834,7 @@ \unsettoc{\@currext}{leveldown}% }% \or% entryprefix - \KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{entryprefix}% \@dynlisttrue \doforeachtocfile[float]{% \BeforeStartingTOC[\@currext]{% @@ -1805,9 +1855,9 @@ }% }% \or% indenttextentries - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{indenttextentries}% \doforeachtocfile[float]{% \setuptoc{\@currext}{numberline}% }% @@ -1815,9 +1865,9 @@ \setuptoc{\@currext}{numberline}% } \or% leftaligntextentries - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}% \doforeachtocfile[float]{% \unsettoc{\@currext}{numberline}% }% @@ -1835,10 +1885,10 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries} +\KOMA@kav@add{\KOMAClassFileName}{toc}{nolistof} +\KOMA@kav@add{\KOMAClassFileName}{listof}{notoc} +\KOMA@kav@add{\KOMAClassFileName}{listof}{graduated} +\KOMA@kav@add{\KOMAClassFileName}{listof}{leftaligntextentries} \KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc} \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} @@ -1847,38 +1897,38 @@ \newif\if@chaptertolists\@chaptertolistsfalse \KOMA@key{chapteratlists}[entry]{% \FamilyKeyStateProcessed - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chapterentry}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergap}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chapterentry}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chaptergap}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chaptergapsmall}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chaptergapline}% \Ifstr{#1}{entry}{% \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% - \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chapterentry}% + \KOMA@kav@replacevalue{\KOMAClassFileName}{chapteratlists}{entry}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chapterentry}% }{% \@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}% - \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}% + \KOMA@kav@replacevalue{\KOMAClassFileName}{chapteratlists}% {\@chapterlistsgap}% \def\reserved@a{\z@}% \ifx\@chapterlistsgap\reserved@a - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergap}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergap}% \else \def\reserved@a{10\p@}% \ifx\@chapterlistsgap\reserved@a - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}% \else \def\reserved@a{\baselineskip}% \ifx\@chapterlistsgap\reserved@a - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapline}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergapline}% \fi \fi \fi }% } \BeforeTOCHead{\@chaptertolistsfalse} -\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% -\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{chapteratlists}{10\p@}% +\KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}% +%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1901,13 +1951,13 @@ \@ifundefined{scr@current@bibstyle}{}{% \Ifstr{\scr@current@bibstyle}{}{}{% \edef\reserved@a{% - \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% + \noexpand\KOMA@kav@remove{\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% }\reserved@a }% }% \def\scr@current@bibstyle{#2}% - \KOMA@kav@xadd{.\KOMAClassFileName}{bibliography}{#2}% + \KOMA@kav@xadd{\KOMAClassFileName}{bibliography}{#2}% \csname scr@bibstyle@#1\endcsname #3% }% @@ -1969,14 +2019,14 @@ {standardlevel}{4}% }{#1}% \ifcase \@tempa\relax % notoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{notoc}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \section*{##1}% @@ -1987,14 +2037,14 @@ \fi }% \or% totoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{totoc}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \addsec{##1}% @@ -2008,14 +2058,14 @@ \fi }% \or% numbered - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{numbered}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \section{##1}% @@ -2029,20 +2079,20 @@ \fi } \or% leveldown - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{leveldown}% \bib@leveldowntrue \or% standardlevel - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{standardlevel}% \bib@leveldownfalse \fi }{% \FamilyKeyStateProcessed \edef\reserved@a{% - \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% + \noexpand\KOMA@kav@remove{\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% }\reserved@a \csname scr@bibstyle@#1\endcsname @@ -2051,7 +2101,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ %%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown @@ -2072,14 +2122,14 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@add{\KOMAClassFileName}{index}{notoc}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -2088,14 +2138,14 @@ \fi*% }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@add{\KOMAClassFileName}{index}{toc}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\addsec @@ -2104,14 +2154,14 @@ \fi }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{index}{numbered}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -2120,36 +2170,36 @@ \fi }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{index}{leveldown}% \idx@leveldowntrue \or - \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{index}{standardlevel}% \idx@leveldownfalse \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex} -\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} -\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} +\KOMA@kav@add{\KOMAClassFileName}{toc}{noindex} +\KOMA@kav@add{\KOMAClassFileName}{index}{notoc} +\KOMA@kav@add{\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \AtBeginDocument{% \begingroup @@ -2198,7 +2248,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2236,7 +2286,7 @@ \fi } \providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{fontsize}% \@defaultunits\@tempdima#2pt\relax\@nnil @@ -2385,7 +2435,9 @@ \let\Huge\@undefined \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved@a}% \normalsize - \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi + \expandafter\ifnum\scr@v@is@ge{3.17} + \@nameuse{par@updaterelative}% + \fi \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{\footnotesep}{.7\@tempdimc}% \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus @@ -2585,31 +2637,31 @@ \InputIfFileExists{\@fontsizefilebase\@tempa.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }{% \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}% }{% \InputIfFileExists{bk\@tempb.clo}{% \ClassInfo{\KOMAClassName}{% File `bk\@tempb.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}% }{% \InputIfFileExists{size\@tempb.clo}{% \ClassInfo{\KOMAClassName}{% File `size\@tempb.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}% }{% \edef\@tempa{% \noexpand\changefontsizes{\@tempa}% - \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \noexpand\KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }\@tempa }% }% @@ -2704,13 +2756,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: body) \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2757,7 +2809,7 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: body) \newcommand*{\par@updaterelative}{% \begingroup @@ -2933,7 +2985,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -2984,8 +3036,7 @@ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi } \newcommand*\maketitle[1][1]{% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \def\and{% \end{tabular}% \hskip 1em \@plus.17fil% @@ -3081,8 +3132,7 @@ \vfill\null \if@twoside \@tempswatrue - \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty \@tempswafalse \fi\fi @@ -3100,14 +3150,16 @@ \fi \else \ifx\@uppertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% @@ -3129,20 +3181,23 @@ \@tempcnta=% #1% \relax\ifnum\@tempcnta=1\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% Optional argument of \string\maketitle\space ignored\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@uppertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% @@ -3204,7 +3259,7 @@ \endgroup \fi \setcounter{footnote}{0}% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@lt{3.12}% \let\thanks\relax \let\maketitle\relax \let\@maketitle\relax @@ -3301,9 +3356,6 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \if@compatibility - \setcounter{page}{0}% - \fi }{% \if@restonecol\twocolumn \else \newpage \fi }% @@ -3317,10 +3369,10 @@ \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3334,7 +3386,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -3354,17 +3406,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: body) \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3733,7 +3785,7 @@ \z@ \fi \let\@svsec\@empty - \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.31}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -3891,7 +3943,7 @@ This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% }{% - \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.31}\relax \begingroup \let\@elt\@stpelt \csname cl@\scr@s@ct@@nn@m@\endcsname @@ -5238,7 +5290,7 @@ {\@currenttocentry}% \fi }{% - \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.18}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -5448,7 +5500,7 @@ {\@currenttocentry}% \fi \else - \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.15}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -5571,7 +5623,9 @@ \csname scr@#1@afterindent\endcsname {\@afterindenttrue}{\@afterindentfalse}{% \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else - \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \expandafter\ifnum\scr@v@is@ge{3.22} + \@afterindenttrue + \fi \fi }% \chapterheadstartvskip @@ -5633,7 +5687,9 @@ \csname scr@#1@afterindent\endcsname {\@afterindenttrue}{\@afterindentfalse}{% \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else - \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \expandafter\ifnum\scr@v@is@ge{3.22} + \@afterindenttrue + \fi \fi }% \chapterheadstartvskip @@ -5830,7 +5886,8 @@ \fi {\parindent \z@ \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \setlength{\parfillskip}{\z@ plus 1fil}\fi + \setlength{\parfillskip}{\z@ plus 1fil}% + \fi \raggedsection\normalfont\sectfont\nobreak \usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}% }\nobreak @@ -5964,7 +6021,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \@addtoreset{equation}{chapter} \renewcommand*{\theequation}{% @@ -5996,7 +6053,7 @@ \newcommand*{\dictumauthorformat}[1]{(#1)} \newcommand*{\raggeddictumtext}{\raggedright} \newcommand*{\raggeddictumauthor}{\raggedleft} -\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small} +\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small} \newkomafont{dictumauthor}{\itshape} \aliaskomafont{dictumtext}{dictum} \setlength{\skip\@mpfootins}{\skip\footins} @@ -6064,7 +6121,7 @@ \fi } \newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% + \marginpar[{\raggedleft #1}]{\raggedright #1}% } \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% @@ -6283,7 +6340,7 @@ \let\scr@mt@saved@sect\relax \fi } -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -6384,7 +6441,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6395,7 +6452,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: body) \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} @@ -7160,7 +7217,7 @@ \expandafter\ifnum\scr@v@is@le{2.97d}% \renewcommand*\thetable{\thechapter.\@arabic\c@table} \fi -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -7322,7 +7379,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7472,7 +7529,7 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ %%% (run: body) \newcommand*\bibname{Bibliography} \providecaptionname{american,australian,british,canadian,english,newzealand,% @@ -7560,7 +7617,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ %%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax @@ -7603,7 +7660,7 @@ \newcommand*\indexname{Index} \providecaptionname{american,australian,british,canadian,english,newzealand,% UKenglish,ukenglish,USenglish,usenglish}\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7754,7 +7811,7 @@ \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } -\newcommand*\descfont{\@gr@gsffamily\bfseries} +\newcommand*\descfont{\maybesffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newcommand*{\labelitemfont}{\normalfont} \newcommand*\scr@fnt@itemizelabel{\labelitemfont} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 2ffee7b4b64..eb440134dab 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,24 +65,24 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $ -%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ +%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ \newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}} \newcommand*{\DecadePart}[1]{\XmodY{#1}{100}} \newcommand*{\@GaussYear}[3]{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 305f1b52308..77da7e26a9a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -65,7 +65,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: preidentify) \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname KOMAClassName\endcsname\relax\else @@ -78,7 +78,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,16 +100,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: prepare) \ProvidesPackage{scrextend}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 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 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: prepare) -\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries} +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -225,8 +225,9 @@ \@namedef{scr@v@3.36}{20} \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} +\@namedef{scr@v@3.39}{20} \@namedef{scr@v@last}{20} -%%% From File: $Id: scrextend.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrextend.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{extendedfeature}{% \scr@ext@activate{#1}% @@ -243,14 +244,14 @@ }% }% \FamilyKeyStateProcessed - \KOMA@kav@xadd{.scrextend.sty}{extendedfeature}{#1}% + \KOMA@kav@xadd{scrextend.sty}{extendedfeature}{#1}% } \AtEndOfPackage{% \KOMA@key{extendedfeature}{% \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -263,7 +264,7 @@ Because of this, version was set to `first'% }% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrextend.\scr@pkgextension }{version}{first}% }{% @@ -274,7 +275,7 @@ }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrextend.\scr@pkgextension }{version}{#1}% \ifnum\scr@compatibility<\scr@v@last @@ -323,31 +324,34 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +\newcommand*{\scr@v@is@eq}[1]{% + \scr@compatibility=\@nameuse{scr@v@#1} +} +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@xadd{.scrextend.\scr@pkgextension}{draft}{% +\KOMA@kav@xadd{scrextend.\scr@pkgextension}{draft}{% \ifdim\overfullrule>\z@ true\else false\fi } \KOMA@DeclareStandardOption @@ -357,32 +361,28 @@ \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@xadd{.scrextend.\scr@pkgextension}{overfullrule}{% +\KOMA@kav@xadd{scrextend.\scr@pkgextension}{overfullrule}{% \ifdim\overfullrule>\z@ true\else false\fi } -\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} -\newcommand*{\@gr@gsffamily}{% - \if@egregdoesnotlikesansseriftitles\else\sffamily\fi -} -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% @@ -440,11 +440,56 @@ \@tempa }% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrextend.\scr@pkgextension }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@ifkey{sfdefaults}{@sfdefaults} +\newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi} +\newcommand*{\textmaybesf}{% + \if@sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi +} +%% \begin{option}{egegdoesnotlikesansseriftitles} +\KOMA@key{egregdoesnotlikesansseriftitles}[true]{% + \PackageWarningNoLine{scrextend}% + {% + You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak + In 2016 this option has been implemented as a joke\MessageBreak + answer to egreg's comment:\MessageBreak + \space\space ``In my opinion there should be a document class\MessageBreak + \space\space option for it, instead of the + \string\setkomafont\MessageBreak + \space\space statement. And yes, I find imposing sans serif + for\MessageBreak + \space\space titles is not the best choice (one of the + reasons\MessageBreak + \space\space why I don't use Koma-script classes).''\MessageBreak + to question https://tex.stackexchange.com/q/289853\MessageBreak + at TeX.SX.\MessageBreak + The option has never been documented in the official\MessageBreak + user manuals and therefore should never have been\MessageBreak + used in real live documents. It was intended to be\MessageBreak + removed after some month.\MessageBreak + However, it has been used and also almost forgotten\MessageBreak + by the author.\MessageBreak + For this the author apologizes both to users but\MessageBreak + especially to egreg.\MessageBreak + Rightly, egreg has criticized the permanent retention\MessageBreak + of the option as unfunny to inappropriate and has\MessageBreak + asked that it be removed or replaced.\MessageBreak + It will be removed soon!\MessageBreak + You should use `sfdefaults=false` instead% + }% + \KOMA@set@ifkey{egregdoesnotlikesansseriftitles}% + {@sfdefaults}% + {#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi + \KOMA@kav@xreplacevalue{scrextend.\scr@pkgextension}% + {sfdefaults}{\if@sfdefaults true\else false\fi}% + \fi +} +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: option) \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% @@ -460,24 +505,24 @@ \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrextend.\scr@pkgextension }{titlepage}{firstiscover}% }{% \def\FamilyElseValue{, `firstiscover'}% \KOMA@set@ifkey{titlepage}{@titlepage}{##1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrextend.\scr@pkgextension }{titlepage}{firstiscover}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrextend.\scr@pkgextension }{titlepage}{@titlepage}% \@titlepageiscoverpagefalse \fi }% } -\KOMA@kav@xadd{.% +\KOMA@kav@xadd{% scrextend.\scr@pkgextension }{titlepage}{\if@titlepage true\else false\fi} \def\scr@ext@immediate@title{% @@ -488,9 +533,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: option) \KOMA@key{cleardoublepage}{% \begingroup @@ -505,7 +550,7 @@ \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrextend.\scr@pkgextension }{cleardoublepage}{current}% }% @@ -516,7 +561,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrextend.\scr@pkgextension }{cleardoublepage}{#1}% }% @@ -543,26 +588,28 @@ \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} \renewcommand*{\cleardoublepage}{% - \expandafter\ifnum \@nameuse{scr@v@2.98c}<\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@gt{2.98c}% \cleardoubleemptypage \else \cleardoublestandardpage \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrextend.\scr@pkgextension }{cleardoublepage}{% - \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi + \expandafter\ifnum \scr@v@is@gt{2.98c} + empty% + \else current\fi } \AtEndOfPackage{% \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]% {% scrextend.\scr@pkgextension }{cleardoublepage}% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% scrextend.\scr@pkgextension }{cleardoublepage}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% scrextend.\scr@pkgextension }{cleardoublepage}{\@tempa}% } @@ -572,9 +619,9 @@ {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -594,7 +641,7 @@ \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrextend.\scr@pkgextension }{footnotes}{multiple}% }{% @@ -603,7 +650,7 @@ \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrextend.\scr@pkgextension }{footnotes}{nomultiple}% }{% @@ -613,17 +660,17 @@ } \AtBeginDocument{% \ifx\@footnotemark\scr@saved@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% scrextend.\scr@pkgextension }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrextend.\scr@pkgextension }{footnotes}{nomultiple}% \else\ifx\@footnotemark\scr@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% scrextend.\scr@pkgextension }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrextend.\scr@pkgextension }{footnotes}{multiple}% \fi\fi @@ -645,14 +692,14 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \AtBeginDocument{% \begingroup @@ -701,7 +748,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -739,7 +786,7 @@ \fi } \providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% scrextend.\scr@pkgextension }{fontsize}% \@defaultunits\@tempdima#2pt\relax\@nnil @@ -1078,7 +1125,7 @@ because I do not change it% }% } -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: body) \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% @@ -1131,8 +1178,7 @@ } \let\maketitle\relax\let\@maketitle\relax \newcommand*\maketitle[1][1]{% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \def\and{% \end{tabular}% \hskip 1em \@plus.17fil% @@ -1228,8 +1274,7 @@ \vfill\null \if@twoside \@tempswatrue - \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty \@tempswafalse \fi\fi @@ -1247,14 +1292,16 @@ \fi \else \ifx\@uppertitleback\@empty\else - \PackageWarning{scrextend}{% + \PackageWarning{scrextend}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \PackageWarning{scrextend}{% + \PackageWarning{scrextend}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% @@ -1276,20 +1323,23 @@ \@tempcnta=% ##1% \relax\ifnum\@tempcnta=1\else - \PackageWarning{scrextend}{% + \PackageWarning{scrextend}% + {% Optional argument of \string\maketitle\space ignored\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@uppertitleback\@empty\else - \PackageWarning{scrextend}{% + \PackageWarning{scrextend}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \PackageWarning{scrextend}{% + \PackageWarning{scrextend}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% @@ -1351,7 +1401,7 @@ \endgroup \fi \setcounter{footnote}{0}% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@lt{3.12}% \let\thanks\relax \let\maketitle\relax \let\@maketitle\relax @@ -1448,9 +1498,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \if@compatibility - \setcounter{page}{0}% - \fi + \if@compatibility \setcounter{page}{0}\fi }{% \if@restonecol\twocolumn \else \newpage \fi }% @@ -1466,9 +1514,11 @@ \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +\newcommand*{\scr@fnt@disposition}{\sectfont} +\aliaskomafont{sectioning}{disposition} +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname @@ -1493,7 +1543,7 @@ \newcommand*{\dictumauthorformat}[1]{(#1)} \newcommand*{\raggeddictumtext}{\raggedright} \newcommand*{\raggeddictumauthor}{\raggedleft} -\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small} +\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small} \newkomafont{dictumauthor}{\itshape} \aliaskomafont{dictumtext}{dictum} \newcommand*{\new@tpo@label}{\@newl@bel{tpo}} @@ -1558,7 +1608,7 @@ \fi } \newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% + \marginpar[{\raggedleft #1}]{\raggedright #1}% } \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% @@ -1575,11 +1625,11 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax @@ -1714,7 +1764,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index a9d8af64059..4ff6db2407b 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,21 +64,21 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: identify) \ProvidesPackage{scrfontsizes}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% @@ -354,8 +354,9 @@ \endgroup \immediate\write\@fontfile{% \string\@ifundefined{@list@extra}{}{\@percentchar^^J% - \string\expandafter\string\ifnum\string\scr@v@is@ge{3.17}% - \string\par@updaterelative\string\fi^^J% + \string\expandafter\string\ifnum\string\scr@v@is@ge{3.17}^^J% + \string\par@updaterelative^^J% + \string\fi^^J% \@ind\string\l@addto@macro{\string\@listi}{\string\@list@extra}% \@percentchar^^J% \@ind\string\let\string\@listI=\string\@listi^^J% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index a997aba0eba..860a5ace771 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,22 +65,22 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% @@ -101,7 +101,7 @@ \KOMA@ifkey{standardsections}{@scrhack@standardsections} \KOMAExecuteOptions{standardsections=false} \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -139,7 +139,7 @@ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak detection of KOMA-Script class, that doesn't\MessageBreak need that hack,}% - \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}% + \KOMAExecuteOptions[scrhack.sty]{hyperref=false}% }% } \AfterPackage*{hyperref}{% @@ -148,10 +148,10 @@ \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak detection of hyperref version, that doesn't\MessageBreak need that hack,}% - \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}% + \KOMAExecuteOptions[scrhack.sty]{hyperref=false}% }{% \AtEndOfPackage{% - \KOMA@key[.scrhack.sty]{hyperref}{% + \KOMA@key[scrhack.sty]{hyperref}{% \PackageWarning{scrhack}{option `hyperref=#1' ignored}% \FamilyKeyStateProcessed }% @@ -163,35 +163,35 @@ \AfterPackage*{floatrow}{% \KOMAoptions{float=false}% \PackageInfo{scrhack}{option `float' deactivated}% - \KOMA@key[.scrhack.sty]{floatrow}{% + \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}{% + \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}{% + \KOMA@key[scrhack.sty]{listings}{% \PackageWarning{scrhack}{option `listings' ignored}% \FamilyKeyStateProcessed }% \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi } \AfterPackage*{nomencl}{% - \KOMA@key[.scrhack.sty]{nomencl}{% + \KOMA@key[scrhack.sty]{nomencl}{% \PackageWarning{scrhack}{option `nomencl' ignored}% \FamilyKeyStateProcessed }% \if@scrhack@nomencl\scr@hack@load\@pkgextension{nomencl}\fi } \AfterPackage*{setspace}{% - \KOMA@key[.scrhack.sty]{setspace}{% + \KOMA@key[scrhack.sty]{setspace}{% \PackageWarning{scrhack}{option `setspace' ignored}% \FamilyKeyStateProcessed }% @@ -199,7 +199,7 @@ } \AfterPackage*{lscape}{% \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else - \KOMA@key[.scrhack.sty]{lscape}{% + \KOMA@key[scrhack.sty]{lscape}{% \PackageWarning{scrhack}{option `lscape' ignored}% \FamilyKeyStateProcessed }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 5139692f97a..72d310dc8fb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -44,15 +44,15 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (for jurists) ] -%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ %%% (run: init) \@ifpackageloaded{hyperref}{% \PackageError{scrjura}{Package hyperref already loaded}{% @@ -70,7 +70,7 @@ numwidth=2em, level=\maxdimen ]{default}{cpar} -%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ %%% (run: options) \KOMA@ifkey{contract}{@documentcontract} \IfLTXAtLeastTF{2020/10/01}{% @@ -95,45 +95,45 @@ \else \DeclareTOCStyleEntry[level=#1]{default}{cpar}% \fi - \KOMA@kav@xreplacevalue{.scrjura.sty}{juratotoc}{\cpartocdepth}% + \KOMA@kav@xreplacevalue{scrjura.sty}{juratotoc}{\cpartocdepth}% } -\KOMA@kav@xadd{.scrjura.sty}{juratotoc}{\cpartocdepth}% +\KOMA@kav@xadd{scrjura.sty}{juratotoc}{\cpartocdepth}% \KOMA@key{juratocnumberwidth}{% \DeclareTOCStyleEntry[numwidth=#1]{default}{cpar}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.scrjura.sty}{juratocnumberwidth}{#1}% + \KOMA@kav@replacevalue{scrjura.sty}{juratocnumberwidth}{#1}% } -\KOMA@kav@add{.scrjura.sty}{juratocnumberwidth}{2em} +\KOMA@kav@add{scrjura.sty}{juratocnumberwidth}{2em} \KOMA@key{juratocindent}{% \DeclareTOCStyleEntry[indent=#1]{default}{cpar}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.scrjura.sty}{juratocindent}{#1}% + \KOMA@kav@replacevalue{scrjura.sty}{juratocindent}{#1}% } -\KOMA@kav@add{.scrjura.sty}{juratocindent}{1.5em}% +\KOMA@kav@add{scrjura.sty}{juratocindent}{1.5em}% \KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak} \newif\ifparnumber \KOMA@key{parnumber}[true]{% \Ifstr{#1}{auto}{% \AutoPar \FamilyKeyStateProcessed - \KOMA@kav@remove{.scrjura.sty}{parnumber}{manual}% - \KOMA@kav@remove{.scrjura.sty}{parnumber}{auto}% - \KOMA@kav@add{.scrjura.sty}{parnumber}{auto}% + \KOMA@kav@remove{scrjura.sty}{parnumber}{manual}% + \KOMA@kav@remove{scrjura.sty}{parnumber}{auto}% + \KOMA@kav@add{scrjura.sty}{parnumber}{auto}% }{% \Ifstr{#1}{manual}{% \ManualPar \FamilyKeyStateProcessed - \KOMA@kav@remove{.scrjura.sty}{parnumber}{manual}% - \KOMA@kav@remove{.scrjura.sty}{parnumber}{auto}% - \KOMA@kav@add{.scrjura.sty}{parnumber}{manual}% + \KOMA@kav@remove{scrjura.sty}{parnumber}{manual}% + \KOMA@kav@remove{scrjura.sty}{parnumber}{auto}% + \KOMA@kav@add{scrjura.sty}{parnumber}{manual}% }{% \KOMA@set@ifkey{parnumber}{parnumber}{#1}% - \KOMA@kav@replacebool{.scrjura.sty}{parnumber}{parnumber}% + \KOMA@kav@replacebool{scrjura.sty}{parnumber}{parnumber}% }% }% } -\KOMA@kav@add{.scrjura.sty}{parnumber}{true} -\KOMA@kav@add{.scrjura.sty}{parnumber}{auto} +\KOMA@kav@add{scrjura.sty}{parnumber}{true} +\KOMA@kav@add{scrjura.sty}{parnumber}{auto} \newcommand*{\Clausemark}[1]{} \KOMA@key{clausemark}{% \begingroup @@ -178,11 +178,13 @@ \endgroup \FamilyKeyStateUnknownValue \fi - \KOMA@kav@xreplacevalue{.scrjura.sty}{clausemark}{#1}% + \KOMA@kav@xreplacevalue{scrjura.sty}{clausemark}{#1}% +} +\KOMA@kav@add{scrjura.sty}{clausemark}{false} +\@ifundefined{KOMA@DeclareDeprecatedOption}{}{% + \KOMA@DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright}% + \KOMA@DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth}% } -\KOMA@kav@add{.scrjura.sty}{clausemark}{false} -\KOMA@DeclareDeprecatedOption[scrjura]{markright}{clausemark=forceright} -\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{clausemark=forceboth} \KOMA@key{paragraphmark}{% \PackageWarningNoLine{scrjura}{% You've used obsolete option `paragraphmark'.\MessageBreak @@ -252,35 +254,37 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrjura.sty}{ref}% + \KOMA@kav@removekey{scrjura.sty}{ref}% \ifcase\parcite@format - \KOMA@kav@add{.scrjura.sty}{ref}{parlong}% + \KOMA@kav@add{scrjura.sty}{ref}{parlong}% \or - \KOMA@kav@add{.scrjura.sty}{ref}{parshort}% + \KOMA@kav@add{scrjura.sty}{ref}{parshort}% \or - \KOMA@kav@add{.scrjura.sty}{ref}{parnumeric}% + \KOMA@kav@add{scrjura.sty}{ref}{parnumeric}% \or - \KOMAQkav@add{.scrjura.sty}{ref}{paroff}% + \KOMA@kav@add{scrjura.sty}{ref}{paroff}% \fi \ifcase\sentencecite@format - \KOMA@kav@add{.scrjura.sty}{ref}{sentencelong}% + \KOMA@kav@add{scrjura.sty}{ref}{sentencelong}% \or - \KOMA@kav@add{.scrjura.sty}{ref}{sentenceshort}% + \KOMA@kav@add{scrjura.sty}{ref}{sentenceshort}% \or - \KOMA@kav@add{.scrjura.sty}{ref}{sentencenumeric}% + \KOMA@kav@add{scrjura.sty}{ref}{sentencenumeric}% \or - \KOMA@kav@add{.scrjura.sty}{ref}{sentenceoff}% + \KOMA@kav@add{scrjura.sty}{ref}{sentenceoff}% \fi \fi } -\KOMA@kav@add{.scrjura.sty}{ref}{parlong}% -\KOMA@kav@add{.scrjura.sty}{ref}{sentencelong}% -\KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong} -\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong} -%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{scrjura.sty}{ref}{parlong}% +\KOMA@kav@add{scrjura.sty}{ref}{sentencelong}% +\@ifundefined{KOMA@DeclareDeprecatedOption}{}{% + \KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong} + \KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong} +} +%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ %%% (run: postoptions) \KOMAProcessOptions\relax -%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ %%% (run: body) \providecommand*{\DeprecatedParagraph}{% \PackageError{scrjura}{modification of old document needed}{% @@ -1115,7 +1119,7 @@ }% \fi } -%%% From File: $Id: scrjura.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrjura.dtx 3991 2022-11-16 07:13:45Z kohm $ %%% (run: final) %%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ \RequirePackage{scrlogo} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 2242d41cce5..c26475fa7a5 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,91 +66,91 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] \RequirePackage{scrbase}[\KOMAScriptVersion] -\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{% - \DefineFamilyMember[{#1}]{KOMA}% - \@ifundefined{scr@kav@KOMA#1}{\@namedef{scr@kav@KOMA#1}{}}{}% - \DefineFamilyKey[{#1}]{KOMA}% +\newcommand*{\KOMA@key}[1][\@currname.\@currext]{% + \DefineFamilyMember[{.#1}]{KOMA}% + \@ifundefined{scr@kav@KOMA.#1}{\@namedef{scr@kav@KOMA.#1}{}}{}% + \DefineFamilyKey[{.#1}]{KOMA}% } \newcommand*{\KOMA@kav@add}[3]{% - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@add{#1}% }{% - \expandafter\l@addto@macro\csname scr@kav@KOMA#1\endcsname{\do{{#2}{#3}}}% + \expandafter\l@addto@macro\csname scr@kav@KOMA.#1\endcsname{\do{{#2}{#3}}}% }% } \newcommand*{\KOMA@kav@xadd}[3]{% - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@xadd{#1}% }{% \protected@edef\reserved@a{{#2}{#3}}% - \expandafter\l@addto@macro\csname scr@kav@KOMA#1\expandafter\endcsname + \expandafter\l@addto@macro\csname scr@kav@KOMA.#1\expandafter\endcsname \expandafter{\expandafter\do\expandafter{\reserved@a}}% }% } \newcommand*{\KOMA@kav@remove}[3]{% - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@remove{#1}% }{% \begingroup - \def\reserved@a{\endgroup\@namedef{scr@kav@KOMA#1}{}}% + \def\reserved@a{\endgroup\@namedef{scr@kav@KOMA.#1}{}}% \edef\reserved@b{\detokenize{{#2}{#3}}}% \def\do##1{% \edef\reserved@c{\detokenize{##1}}% \ifx\reserved@b\reserved@c\else \l@addto@macro\reserved@a{% - \expandafter\l@addto@macro\csname scr@kav@KOMA#1\endcsname{% + \expandafter\l@addto@macro\csname scr@kav@KOMA.#1\endcsname{% \do{##1}% }% }% \fi }% - \@nameuse{scr@kav@KOMA#1}% + \@nameuse{scr@kav@KOMA.#1}% \reserved@a }% } \newcommand*{\KOMA@kav@removekey}[2]{% - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@removekey{#1}% }{% \begingroup - \def\reserved@a{\endgroup\@namedef{scr@kav@KOMA#1}{}}% + \def\reserved@a{\endgroup\@namedef{scr@kav@KOMA.#1}{}}% \edef\reserved@b{\detokenize{#2}}% \def\reserved@d##1##2{\edef\reserved@c{\detokenize{##1}}}% \def\do##1{% \reserved@d##1\relax \ifx\reserved@b\reserved@c\else \l@addto@macro\reserved@a{% - \expandafter\l@addto@macro\csname scr@kav@KOMA#1\endcsname{% + \expandafter\l@addto@macro\csname scr@kav@KOMA.#1\endcsname{% \do{##1}% }% }% \fi }% - \@nameuse{scr@kav@KOMA#1}% + \@nameuse{scr@kav@KOMA.#1}% \reserved@a }% } \newcommand*{\KOMA@kav@replacevalue}[3]{% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@replacevalue{#1}% }{% \KOMA@kav@removekey{#1}{#2}% @@ -160,7 +160,7 @@ } \newcommand*{\KOMA@kav@xreplacevalue}[3]{% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@replacevalue{#1}% }{% \KOMA@kav@removekey{#1}{#2}% @@ -170,7 +170,7 @@ } \newcommand*{\KOMA@kav@replacebool}[3]{% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \@ifundefined{scr@kav@KOMA#1}{% + \@ifundefined{scr@kav@KOMA.#1}{% \KOMA@internal@error\KOMA@kav@replacebool{#1}% }{% \KOMA@kav@remove{#1}{#2}{false}% @@ -185,14 +185,14 @@ \fi } \newcommand*{\KOMA@kav@defall}[2]{% - \@ifundefined{scr@kav@KOMA#2}{% + \@ifundefined{scr@kav@KOMA.#2}{% \KOMA@internal@error\KOMA@kav@defall{#1}% }{% \begingroup \let\reserved@a\@empty \def\reserved@b##1##2{\l@addto@macro\reserved@a{,{##1=##2}}}% \def\do##1{\reserved@b##1}% - \@nameuse{scr@kav@KOMA#2}% + \@nameuse{scr@kav@KOMA.#2}% \ifx\reserved@a\@empty \def\reserved@b{\endgroup\let#1\@empty}% \else @@ -206,7 +206,7 @@ }% } \newcommand*{\KOMA@kav@defone}[3]{% - \@ifundefined{scr@kav@KOMA#2}{% + \@ifundefined{scr@kav@KOMA.#2}{% \KOMA@internal@error\KOMA@kav@defall{#1}% }{% \begingroup @@ -215,7 +215,7 @@ \Ifstr{##1}{#3}{\l@addto@macro\reserved@a{,{##2}}}{}% }% \def\do##1{\reserved@b##1}% - \@nameuse{scr@kav@KOMA#2}% + \@nameuse{scr@kav@KOMA.#2}% \ifx\reserved@a\@empty \def\reserved@b{\endgroup\let#1\@empty}% \else @@ -237,20 +237,29 @@ that\MessageBreak shows this error, to komascript at gmx dot info or report it at\MessageBreak - <http://www.komascript.de/forum/20> (you need an account to do so).% + <https://sf.net/p/koma-script/tickets/> (you need an account to do so).% }% } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: option) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: body) -\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% - \FamilyExecuteOptions[#1]{KOMA}% +\newcommand*{\KOMAExecuteOptions}[1][\@currname.\@currext]{% + \Ifstrstart{#1}{.}{% + \PackageWarning{scrkbase}{Deprecated initial dot of member + argument\MessageBreak + of \string\KOMAExecuteOptions\space detected% + }% + \expandafter\FamilyExecuteOptions[#1]% + }{% + \FamilyExecuteOptions[.#1]% + }% + {KOMA}% } \newcommand*{\KOMAoptions}{\FamilyOptions{KOMA}} \newcommand*{\KOMAoptionsOf}[2][\@firstofone]{% @@ -261,7 +270,7 @@ }{% \begingroup \def\reserved@a{#1}% - \KOMA@kav@defall\reserved@b{.#2}% + \KOMA@kav@defall\reserved@b{#2}% \expandafter\expandafter\expandafter\endgroup \expandafter\reserved@a\expandafter{\reserved@b}% }% @@ -274,7 +283,7 @@ }{% \begingroup \def\reserved@a{#1}% - \KOMA@kav@defone\reserved@b{.#2}{#3}% + \KOMA@kav@defone\reserved@b{#2}{#3}% \ifx\reserved@b\@empty \PackageWarning{scrkbase}{option `#3' for `#2' unset}% \endgroup @@ -287,7 +296,7 @@ \newcommand*{\AfterKOMAoptions}{\AtEndOfFamilyOptions} \newcommand*{\KOMAoption}{\FamilyOption{KOMA}} \newcommand*{\KOMA@unknown@keyval}{\FamilyUnknownKeyValue{KOMA}} -\newcommand*{\KOMA@ifkey}[2][.\@currname.\@currext]{% +\newcommand*{\KOMA@ifkey}[2][\@currname.\@currext]{% \begingroup\edef\reserved@a{\noexpand\KOMA@@ifkey{#1}{#2}}% \expandafter\endgroup\reserved@a } @@ -306,7 +315,7 @@ \fi } \newcommand*{\KOMA@set@ifkey}{\FamilySetBool{KOMA}} -\newcommand*{\KOMA@ncmdkey}[2][.\@currname.\@currext]{% +\newcommand*{\KOMA@ncmdkey}[2][\@currname.\@currext]{% \begingroup\edef\reserved@a{\noexpand\KOMA@@ncmdkey{#1}{#2}}% \expandafter\endgroup\reserved@a } @@ -415,7 +424,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newcommand*{\IfExistskomafont}[1]{% \scr@ifundefinedorrelax{scr@fnt@#1}{% 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 283354f4b34..1bf43dbccaa 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -66,7 +66,7 @@ 2022/06/29 v0.3.3915 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -110,7 +110,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -142,13 +142,13 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{markcase}% - \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% + \KOMA@kav@removekey{scrlayer.sty}{markcase}% + \KOMA@kav@xadd{scrlayer.sty}{markcase}{#1}% \fi } \KOMA@key{autooneside}[true]{% \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}% + \KOMA@kav@replacebool{scrlayer.sty}{autooneside}{scrlayer@autooneside}% } \KOMA@key{automark}[]{% \scrlayer@testunexpectedarg{automark}{#1}% @@ -172,93 +172,93 @@ \fi }% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{automark}{}% + \KOMA@kav@removekey{scrlayer.sty}{automark}% + \KOMA@kav@removekey{scrlayer.sty}{manualmark}% + \KOMA@kav@add{scrlayer.sty}{automark}{}% } \KOMA@key{manualmark}[]{% \scrlayer@testunexpectedarg{manualmark}{#1}% \scrlayer@AtEndOfPackage{\manualmark}% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{manualmark}{}% + \KOMA@kav@removekey{scrlayer.sty}{automark}% + \KOMA@kav@removekey{scrlayer.sty}{manualmark}% + \KOMA@kav@add{scrlayer.sty}{manualmark}{}% } \KOMA@key{onpsselect}{% \l@addto@macro{\@ps@initialhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsselect}{#1}% } \KOMA@key{onpsinit}{% \l@addto@macro{\@ps@hook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsinit}{#1}% } \KOMA@key{onpsoneside}{% \l@addto@macro{\@ps@onesidehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsoneside}{#1}% } \KOMA@key{onpstwoside}{% \l@addto@macro{\@ps@twosidehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpstwoside}{#1}% } \KOMA@key{onpsoddpage}{% \l@addto@macro{\@ps@oddpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsoddpage}{#1}% } \KOMA@key{onpsevenpage}{% \l@addto@macro{\@ps@evenpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsevenpage}{#1}% } \KOMA@key{onpsfloatpage}{% \l@addto@macro{\@ps@floatpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsfloatpage}{#1}% } \KOMA@key{onpsnonfloatpage}{% \l@addto@macro{\@ps@nonfloatpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}% } \KOMA@key{onpsbackground}{% \l@addto@macro{\@ps@backgroundhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsbackground}{#1}% } \KOMA@key{onpsforeground}{% \l@addto@macro{\@ps@foregroundhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsforeground}{#1}% } \KOMA@ifkey{singlespacing}{@ps@singlespacing} \KOMA@key{deactivatepagestylelayers}[true]{% \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers} + \KOMA@kav@replacebool{scrlayer.sty}{deactivatepagestylelayers} {scrlayer@deactivate@layers}% } \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}% + \KOMA@kav@replacebool{scrlayer.sty}{draft}{scrlayer@draft}% } \KOMA@key{forceoverwrite}[true]{% \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% + \KOMA@kav@replacebool{scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% } \KOMA@key{autoremoveinterfaces}[true]{% \scrlayer@report@deprecated{#1}{autoremoveinterface}% \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} + \KOMA@kav@replacebool{scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } %%% From File: $Id: scrlayer-notecolumn.dtx 3915 2022-06-29 07:09:48Z kohm $ %%% (run: options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns} \slnc@autoclearnotecolumnstrue -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index f661d4c3287..6a1f337eea7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -45,14 +45,14 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -63,7 +63,7 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% @@ -76,7 +76,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% @@ -109,14 +109,14 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{markcase}% - \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% + \KOMA@kav@removekey{scrlayer.sty}{markcase}% + \KOMA@kav@xadd{scrlayer.sty}{markcase}{#1}% \fi }% } \KOMA@key{autooneside}[true]{% \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}% + \KOMA@kav@replacebool{scrlayer.sty}{autooneside}{scrlayer@autooneside}% } \KOMA@key{automark}[]{% \scrlayer@testunexpectedarg{automark}{#1}% @@ -140,89 +140,89 @@ \fi }% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{automark}{}% + \KOMA@kav@removekey{scrlayer.sty}{automark}% + \KOMA@kav@removekey{scrlayer.sty}{manualmark}% + \KOMA@kav@add{scrlayer.sty}{automark}{}% } \KOMA@key{manualmark}[]{% \scrlayer@testunexpectedarg{manualmark}{#1}% \scrlayer@AtEndOfPackage{\manualmark}% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{manualmark}{}% + \KOMA@kav@removekey{scrlayer.sty}{automark}% + \KOMA@kav@removekey{scrlayer.sty}{manualmark}% + \KOMA@kav@add{scrlayer.sty}{manualmark}{}% } \KOMA@key{onpsselect}{% \l@addto@macro{\@ps@initialhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsselect}{#1}% } \KOMA@key{onpsinit}{% \l@addto@macro{\@ps@hook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsinit}{#1}% } \KOMA@key{onpsoneside}{% \l@addto@macro{\@ps@onesidehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsoneside}{#1}% } \KOMA@key{onpstwoside}{% \l@addto@macro{\@ps@twosidehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpstwoside}{#1}% } \KOMA@key{onpsoddpage}{% \l@addto@macro{\@ps@oddpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsoddpage}{#1}% } \KOMA@key{onpsevenpage}{% \l@addto@macro{\@ps@evenpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsevenpage}{#1}% } \KOMA@key{onpsfloatpage}{% \l@addto@macro{\@ps@floatpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsfloatpage}{#1}% } \KOMA@key{onpsnonfloatpage}{% \l@addto@macro{\@ps@nonfloatpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}% } \KOMA@key{onpsbackground}{% \l@addto@macro{\@ps@backgroundhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsbackground}{#1}% } \KOMA@key{onpsforeground}{% \l@addto@macro{\@ps@foregroundhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsforeground}{#1}% } \KOMA@ifkey{singlespacing}{@ps@singlespacing} \KOMA@key{deactivatepagestylelayers}[true]{% \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers} + \KOMA@kav@replacebool{scrlayer.sty}{deactivatepagestylelayers} {scrlayer@deactivate@layers}% } \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}% + \KOMA@kav@replacebool{scrlayer.sty}{draft}{scrlayer@draft}% } \KOMA@key{forceoverwrite}[true]{% \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% + \KOMA@kav@replacebool{scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% } \KOMA@key{autoremoveinterfaces}[true]{% \scrlayer@report@deprecated{#1}{autoremoveinterface}% \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% - \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} + \KOMA@kav@replacebool{scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -232,7 +232,7 @@ \noexpand\endgroup \noexpand\sls@set@hf@width{head}{\reserved@b}{\reserved@c}{\reserved@a}% \noexpand\FamilyKeyStateProcessed - \noexpand\KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{headwidth}{% + \noexpand\KOMA@kav@replacevalue{scrlayer-scrpage.sty}{headwidth}{% \reserved@a:\reserved@b:\reserved@c }% }% @@ -246,7 +246,7 @@ \noexpand\endgroup \noexpand\sls@set@hf@width{foot}{\reserved@b}{\reserved@c}{\reserved@a}% \noexpand\FamilyKeyStateProcessed - \noexpand\KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{footwidth}{% + \noexpand\KOMA@kav@replacevalue{scrlayer-scrpage.sty}{footwidth}{% \reserved@a:\reserved@b:\reserved@c }% }% @@ -292,8 +292,12 @@ \addtolength{\@tempdima}{-\csname sls@#1width\endcsname}% \Ifstr{#2}{}{% \ifdim \csname sls@#1width\endcsname - = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax - \setlength{\@tempdimb}{\z@} + = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax + \if@reversemargin + \setlength{\@tempdimb}{-\dimexpr \marginparwidth+\marginparsep\relax}% + \else + \setlength{\@tempdimb}{\z@}% + \fi \else \if@twoside \setlength{\@tempdimb}{.3333333333\@tempdima}% @@ -325,19 +329,19 @@ }% \scr@ifundefinedorrelax{@headwidth}{% \newcommand*{\sls@headwidth}{\textwidth}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}% + \KOMA@kav@add{scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}% }{% \newcommand*{\sls@headwidth}{\@headwidth}% - \KOMA@kav@xadd{.scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}% + \KOMA@kav@xadd{scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}% }% \newcommand*{\sls@oddheadshift}{0pt} \newcommand*{\sls@evenheadshift}{0pt} \scr@ifundefinedorrelax{@footwidth}{% \newcommand*{\sls@footwidth}{\textwidth}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt} + \KOMA@kav@add{scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt} }{% \newcommand*{\sls@footwidth}{\@footwidth}% - \KOMA@kav@xadd{.scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt} + \KOMA@kav@xadd{scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt} }% \newcommand*{\sls@oddfootshift}{0pt} \newcommand*{\sls@evenfootshift}{0pt} @@ -470,7 +474,7 @@ \reserved@b \FamilyKeyStateProcessed \Ifstr{#1}{}{}{% - \KOMA@kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{% + \KOMA@kav@xreplacevalue{scrlayer-scrpage.sty}{#1}{% \csname sls@#2#3@linethickness\endcsname :\csname sls@#2#3@linelength\endcsname }% @@ -492,25 +496,25 @@ }% \newcommand*{\sls@headabove@linelength}{\sls@headwidth}% \newcommand*{\sls@headabove@linethickness}{0pt}% -\KOMA@kav@xadd{.scrlayer-scrpage.sty}{headtopline}{% +\KOMA@kav@xadd{scrlayer-scrpage.sty}{headtopline}{% \expandafter\noexpand\sls@headabove@linethickness:% \expandafter\noexpand\sls@headabove@linelength } \newcommand*{\sls@headbelow@linelength}{\sls@headwidth}% \newcommand*{\sls@headbelow@linethickness}{0pt}% -\KOMA@kav@xadd{.scrlayer-scrpage.sty}{headsepline}{% +\KOMA@kav@xadd{scrlayer-scrpage.sty}{headsepline}{% \expandafter\noexpand\sls@headbelow@linethickness:% \expandafter\noexpand\sls@headbelow@linelength } \newcommand*{\sls@footabove@linelength}{\sls@footwidth}% \newcommand*{\sls@footabove@linethickness}{0pt}% -\KOMA@kav@xadd{.scrlayer-scrpage.sty}{footsepline}{% +\KOMA@kav@xadd{scrlayer-scrpage.sty}{footsepline}{% \expandafter\noexpand\sls@footabove@linethickness:% \expandafter\noexpand\sls@footabove@linelength } \newcommand*{\sls@footbelow@linelength}{\sls@footwidth}% \newcommand*{\sls@footbelow@linethickness}{0pt}% -\KOMA@kav@xadd{.scrlayer-scrpage.sty}{footbotline}{% +\KOMA@kav@xadd{scrlayer-scrpage.sty}{footbotline}{% \expandafter\noexpand\sls@footbelow@linethickness:% \expandafter\noexpand\sls@footbelow@linelength } @@ -519,15 +523,15 @@ \KOMA@ifkey{plainfootsepline}{sls@plain@foot@above@line}% \KOMA@ifkey{plainfootbotline}{sls@plain@foot@below@line}% \newcommand*{\sls@hfline@adjust}{0}% -\KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{} +\KOMA@kav@add{scrlayer-scrpage.sty}{ilines}{} \KOMA@key{ilines}[]{% \ifx\relax#1\relax \renewcommand*{\sls@hfline@adjust}{0}% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{ilines}% - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{clines}% - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{olines}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{ilines}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{clines}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{olines}% + \KOMA@kav@add{scrlayer-scrpage.sty}{ilines}{}% \else \def\FamilyKeyStateProcessed{unexpected value}% \fi @@ -536,10 +540,10 @@ \ifx\relax#1\relax \renewcommand*{\sls@hfline@adjust}{1}% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{ilines}% - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{clines}% - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{olines}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{clines}{}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{ilines}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{clines}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{olines}% + \KOMA@kav@add{scrlayer-scrpage.sty}{clines}{}% \else \def\FamilyKeyStateProcessed{unexpected value}% \fi @@ -548,15 +552,15 @@ \ifx\relax#1\relax \renewcommand*{\sls@hfline@adjust}{2}% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{ilines}% - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{clines}% - \KOMA@kav@removekey{.scrlayer-scrpage.sty}{olines}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{olines}{}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{ilines}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{clines}% + \KOMA@kav@removekey{scrlayer-scrpage.sty}{olines}% + \KOMA@kav@add{scrlayer-scrpage.sty}{olines}{}% \else \def\FamilyKeyStateProcessed{unexpected value}% \fi } -\KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{} +\KOMA@kav@add{scrlayer-scrpage.sty}{ilines}{} \KOMA@key{pagestyleset}{% \scr@ifundefinedorrelax{sls@ps@style@#1}{% \FamilyKeyStateUnknownValue @@ -564,7 +568,7 @@ \let\sls@auto@pagestyleset\relax \@nameuse{sls@ps@style@#1}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{pagestyleset}{#1}% + \KOMA@kav@replacevalue{scrlayer-scrpage.sty}{pagestyleset}{#1}% }% } \newcommand*{\sls@ps@style@standard}{% @@ -615,19 +619,23 @@ }% }% }% -\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{% - pagestyleset=KOMA-Script} -\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{% - pagestyleset=standard} -\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper} -\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used} -\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{% - markcase=ignoreuppercase% +\@ifundefined{KOMA@DeclareDeprecatedOption}{}{% + \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{% + pagestyleset=KOMA-Script}% + \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{% + pagestyleset=standard}% +} +\@ifundefined{KOMA@DeclareDeprecatedOption}{}{% + \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper} + \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used} + \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{% + markcase=ignoreuppercase% + } } \KOMA@ifkey{hmode}{sls@leavevmode} \KOMA@ifkey{autoenlargeheadfoot}{sls@autoenlarge} \KOMAExecuteOptions{autoenlargeheadfoot=true} -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -699,7 +707,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 4013 2023-02-02 11:11:34Z kohm $ %%% (run: body) \newcommand*{\setheadwidth}[2][]{% \PackageWarning{scrlayer-scrpage}{% @@ -738,17 +746,17 @@ \Ifstr{#2}{current}{}{% \setlength{\@tempdima}{#2}% \Ifstr{#1}{headabove}{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + \KOMAExecuteOptions[scrlayer-scrpage.sty]% {headtopline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{\Ifstr{#1}{headbelow}{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + \KOMAExecuteOptions[scrlayer-scrpage.sty]% {headsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% \Ifstr{#1}{footabove}{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + \KOMAExecuteOptions[scrlayer-scrpage.sty]% {footsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + \KOMAExecuteOptions[scrlayer-scrpage.sty]% {footbotline=\@tempdima:\csname sls@#1@linelength\endcsname}% }% }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 90e76725dce..b67740ff0f0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,14 +43,14 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \newcommand*{\scrlayer@@inherited@options@cslist}{} \newcommand*{\scrlayer@@add@inherited@option}[1]{% @@ -145,7 +145,7 @@ \@namedef{scrlayer@deprecated@reported@for@#1}{\string #2}% }{}% } -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -177,20 +177,20 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{markcase}% - \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}% + \KOMA@kav@removekey{scrlayer.sty}{markcase}% + \KOMA@kav@xadd{scrlayer.sty}{markcase}{#1}% \fi } \scrlayer@@add@inherited@option{markcase} \@ifundefined{MakeMarkcase}{\let\MakeMarkcase\@firstofone}{} \ifx\MakeMarkcase\@firstofone - \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{used}% + \KOMA@kav@replacevalue{scrlayer.sty}{markcase}{used}% \else\ifx\MakeMarkcase\MakeUppercase - \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{upper}% + \KOMA@kav@replacevalue{scrlayer.sty}{markcase}{upper}% \else\ifx\MakeMarkcase\MakeLowercase - \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{lower}% + \KOMA@kav@replacevalue{scrlayer.sty}{markcase}{lower}% \else\ifx\MakeMarkcase\scr@ignoreuppercase - \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{ignoreuppercase}% + \KOMA@kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}% \fi\fi\fi\fi \DeclareRobustCommand*{\scrlayer@ignoreuppercase}[1]{% \begingroup @@ -203,7 +203,7 @@ \newif\ifscrlayer@forceignoreuppercase \KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue \scrlayer@@add@inherited@option{autooneside} -\KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside} +\KOMA@kav@replacebool{scrlayer.sty}{autooneside}{scrlayer@autooneside} \KOMA@key{automark}[]{% \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% @@ -226,100 +226,100 @@ \fi }% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{automark}{}% + \KOMA@kav@removekey{scrlayer.sty}{automark}% + \KOMA@kav@removekey{scrlayer.sty}{manualmark}% + \KOMA@kav@add{scrlayer.sty}{automark}{}% } \scrlayer@@add@inherited@option{automark} \KOMA@key{manualmark}[]{% \scrlayer@testunexpectedarg{manualmark}{#1}% \scrlayer@AtEndOfPackage{\manualmark}% \FamilyKeyStateProcessed - \KOMA@kav@removekey{.scrlayer.sty}{automark}% - \KOMA@kav@removekey{.scrlayer.sty}{manualmark}% - \KOMA@kav@add{.scrlayer.sty}{manualmark}{}% + \KOMA@kav@removekey{scrlayer.sty}{automark}% + \KOMA@kav@removekey{scrlayer.sty}{manualmark}% + \KOMA@kav@add{scrlayer.sty}{manualmark}{}% } \scrlayer@@add@inherited@option{manualmark} \KOMA@key{onpsselect}{% \l@addto@macro{\@ps@initialhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsselect}{#1}% } \scrlayer@@add@inherited@option{onpsselect} \newcommand*{\@ps@initialhook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsselect}{} +\KOMA@kav@add{scrlayer.sty}{onpsselect}{} \KOMA@key{onpsinit}{% \l@addto@macro{\@ps@hook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsinit}{#1}% } \scrlayer@@add@inherited@option{onpsinit} \newcommand*{\@ps@hook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsinit}{} +\KOMA@kav@add{scrlayer.sty}{onpsinit}{} \KOMA@key{onpsoneside}{% \l@addto@macro{\@ps@onesidehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsoneside}{#1}% } \scrlayer@@add@inherited@option{onpsoneside} \newcommand*{\@ps@onesidehook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsoneside}{} +\KOMA@kav@add{scrlayer.sty}{onpsoneside}{} \KOMA@key{onpstwoside}{% \l@addto@macro{\@ps@twosidehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpstwoside}{#1}% } \scrlayer@@add@inherited@option{onpstwoside} \newcommand*{\@ps@twosidehook}{} -\KOMA@kav@add{.scrlayer.sty}{onpstwoside}{} +\KOMA@kav@add{scrlayer.sty}{onpstwoside}{} \KOMA@key{onpsoddpage}{% \l@addto@macro{\@ps@oddpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsoddpage}{#1}% } \scrlayer@@add@inherited@option{onpsoddpage} \newcommand*{\@ps@oddpagehook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{} +\KOMA@kav@add{scrlayer.sty}{onpsoddpage}{} \KOMA@key{onpsevenpage}{% \l@addto@macro{\@ps@evenpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsevenpage}{#1}% } \scrlayer@@add@inherited@option{onpsevenpage} \newcommand*{\@ps@evenpagehook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{} +\KOMA@kav@add{scrlayer.sty}{onpsevenpage}{} \KOMA@key{onpsfloatpage}{% \l@addto@macro{\@ps@floatpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsfloatpage}{#1}% } \scrlayer@@add@inherited@option{onpsfloatpage} \newcommand*{\@ps@floatpagehook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{} +\KOMA@kav@add{scrlayer.sty}{onpsfloatpage}{} \KOMA@key{onpsnonfloatpage}{% \l@addto@macro{\@ps@nonfloatpagehook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsnonfloatpage}{#1}% } \scrlayer@@add@inherited@option{onpsnonfloatpage} \newcommand*{\@ps@nonfloatpagehook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{} +\KOMA@kav@add{scrlayer.sty}{onpsnonfloatpage}{} \KOMA@key{onpsbackground}{% \l@addto@macro{\@ps@backgroundhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsbackground}{#1}% } \scrlayer@@add@inherited@option{onpsbackground} \newcommand*{\@ps@backgroundhook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsbackground}{} +\KOMA@kav@add{scrlayer.sty}{onpsbackground}{} \KOMA@key{onpsforeground}{% \l@addto@macro{\@ps@foregroundhook}{#1}% \FamilyKeyStateProcessed - \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}% + \KOMA@kav@add{scrlayer.sty}{onpsforeground}{#1}% } \scrlayer@@add@inherited@option{onpsforeground} \newcommand*{\@ps@foregroundhook}{} -\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{} +\KOMA@kav@add{scrlayer.sty}{onpsforeground}{} \KOMA@ifkey{singlespacing}{@ps@singlespacing} \scrlayer@@add@inherited@option{singlespacing} \KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers} @@ -330,7 +330,7 @@ \scrlayer@@add@inherited@option{forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} \scrlayer@@add@inherited@option{autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} @@ -2356,7 +2356,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index 265539528ec..20376782f1d 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,15 +60,13 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrartcl% -} +\newcommand*{\KOMAClassName}{scrartcl} \newcommand*{\ClassName}{% article% } @@ -77,7 +75,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 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 5fda02ea6f9..d592bfd3665 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -62,7 +62,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -84,20 +84,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -121,37 +121,37 @@ } \providecommand*{\par@updaterelative}{} }{} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: option) \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi \KOMA@set@ifkey{numericaldate}{@orgdate}{#1}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% scrletter.\scr@pkgextension }{numericaldate}{@orgdate}% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{numericaldate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \Ifstr{#2}{letter}{% @@ -242,9 +242,9 @@ because of unknown paper size.% }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -259,20 +259,20 @@ {no}{10000},{false}{10000},{off}{10000}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrletter.\scr@pkgextension }{fromalign}{#1}% \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{fromalign}{left} \KOMA@ncmdkey{fromrule}[below]{@rulefrom}{% {false}{0},{no}{0},{off}{0},{aftername}{1},% {below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}% } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{fromrule}{false} \KOMA@ifkey{fromphone}{@phone} @@ -296,7 +296,7 @@ {ppimage}{4},{ppImage}{4},% {topaligned}{5},{alignedtop}{5}% } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{addrfield}{true} \KOMA@ncmdkey{priority}[A]{ltr@priority}{% @@ -308,7 +308,7 @@ {priority}{2},{Priority}{2},{PRIORITY}{2},% {A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}% }% -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{priority}{false} \newcommand{\backaddr@format}[1]{} @@ -343,22 +343,22 @@ \fi \if@baddr \ifx\backaddr@format\underline - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrletter.\scr@pkgextension }{backaddress}{underlined}% \else \ifx\backaddr@format\@firstofone - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrletter.\scr@pkgextension }{backaddress}{plain}% \else - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrletter.\scr@pkgextension }{backaddress}{true}% \fi \fi \else - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrletter.\scr@pkgextension }{backaddress}{false}% \fi @@ -375,13 +375,13 @@ \ifcase\@tempa \endgroup \@bigloctrue - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrletter.\scr@pkgextension }{locfield}{wide}% \else \endgroup \@biglocfalse - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% scrletter.\scr@pkgextension }{locfield}{narrow}% \fi @@ -390,7 +390,7 @@ \FamilyKeyStateUnknownValue \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{locfield}{narrow} \KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} @@ -450,18 +450,18 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrletter.\scr@pkgextension }{foldmarks}{\@usefolds}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% scrletter.\scr@pkgextension }{foldmarks}{\if@fold true\else false\fi}% \fi } -\KOMA@kav@xadd{.% +\KOMA@kav@xadd{% scrletter.\scr@pkgextension }{foldmarks}{\@usefolds}% -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{foldmarks}{true}% \newcommand*{\scr@removechar}[2]{% @@ -489,91 +489,91 @@ \endgroup \@refwidetrue \@reflinetrue - \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{false}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{scrletter.\scr@pkgextension}{refline}{false}% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{wide}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{narrow}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{wide}% \or% narrow \endgroup \@refwidefalse \@reflinetrue - \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{false}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{scrletter.\scr@pkgextension}{refline}{false}% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{wide}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{narrow}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{narrow}% \or% dateleft \endgroup \def\@datepos{2}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{dateleft}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{dateright}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{nodate}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{dateleft}% \or% dateright \endgroup \def\@datepos{1}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{dateleft}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{dateright}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{nodate}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{dateright}% \or% nodate \endgroup \def\@datepos{0}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{dateleft}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{dateright}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% scrletter.\scr@pkgextension }{refline}{nodate}% - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{nodate}% \or% false \endgroup \@reflinefalse - \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{wide}% - \KOMA@kav@remove{.scrletter.\scr@pkgextension}{reline}{narrow}% - \KOMA@kav@add{.scrletter.\scr@pkgextension}{refline}{false}% + \KOMA@kav@remove{scrletter.\scr@pkgextension}{refline}{wide}% + \KOMA@kav@remove{scrletter.\scr@pkgextension}{reline}{narrow}% + \KOMA@kav@add{scrletter.\scr@pkgextension}{refline}{false}% \fi \else \endgroup \FamilyKeyStateUnknownValue \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{dateright}% -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{refline}{narrow}% \newcommand{\subject@format}[1]{#1} @@ -616,29 +616,29 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrletter.\scr@pkgextension }{subject}{\if@subj titled\else untitled\fi}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% scrletter.\scr@pkgextension }{subject}{\if@subjafter after\else before\fi opening}% \ifx\subject@format\underline - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{subject}{underlined}% \fi \ifx\raggedsubject\raggedright - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{subject}{left}% \else \ifx\raggedsubject\raggedleft - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{subject}{right}% \else \ifx\raggedsubject\centering - \KOMA@kav@add{.% + \KOMA@kav@add{% scrletter.\scr@pkgextension }{subject}{centered}% \fi @@ -646,10 +646,10 @@ \fi \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{subject}{untitled}% -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{subject}{beforeopening}% \KOMA@ifkey{enlargefirstpage}{@enlargefp} @@ -700,7 +700,7 @@ \def\@tempa{\endgroup\FamilyKeyStateUnknownValue}% \fi \@tempa - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrletter.\scr@pkgextension }{pagenumber}{% \ifcase \@pageat @@ -720,7 +720,7 @@ \fi }% } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{pagenumber}{botmiddle} \newif\if@scrsymbols @@ -743,7 +743,7 @@ \fi \fi \ifx \FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% scrletter.\scr@pkgextension }{symbolicnames}{#1}% \if@scrsymbols @@ -803,7 +803,7 @@ \fi \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% scrletter.\scr@pkgextension }{symbolicnames}{false}% \newcommand*{\scr@symbols@font}{} @@ -814,15 +814,15 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-addressfiles.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -844,11 +844,11 @@ \edef\reserved@a{% \noexpand\edef\noexpand\scr@currentlco{\reserved@a}% \noexpand\InputIfFileExists{\reserved@a.lco}{% - \noexpand\PackageInfo{scrletter% - }{Letter-Class-Option `#1' loaded}% + \noexpand\PackageInfo{scrletter}% + {Letter-Class-Option `#1' loaded}% }{% - \noexpand\PackageError{scrletter% - }{% + \noexpand\PackageError{scrletter}% + {% Letter-Class-Option file `#1.lco' not found% }{% You've told me to load the Letter-Class-Option `#1'. So I have @@ -972,34 +972,35 @@ } \newcommand*{\@@PapersizeWarning}{% \if@tempswa\else% - \PackageWarningNoLine{scrletter% - }{% - Letter option file `\LOPNP@option.lco'\MessageBreak - needs paper size `\LOPNP@size'.\MessageBreak - Current paper size is not `\LOPNP@size'!\MessageBreak - \scr@ifundefinedorrelax{KOMAClassName}{% - You should load package `typearea' either\MessageBreak - with option `paper=\LOPNP@size,paper=portrait' or - additionally\MessageBreak - }{% - You should add `paper=\LOPNP@size,paper=portrait' at the\MessageBreak - option list of `\string\documentclass' or\MessageBreak + \PackageWarningNoLine{scrletter}% + {% + Letter option file `\LOPNP@option.lco'\MessageBreak + needs paper size `\LOPNP@size'.\MessageBreak + Current paper size is not `\LOPNP@size'!\MessageBreak + \scr@ifundefinedorrelax{KOMAClassName}{% + You should load package `typearea' either\MessageBreak + with option `paper=\LOPNP@size,paper=portrait' or + additionally\MessageBreak + }{% + You should add `paper=\LOPNP@size,paper=portrait' at the\MessageBreak + option list of `\string\documentclass' or\MessageBreak + }% + add `\string\KOMAoptions{paper=\LOPNP@size,paper=portrait}'\MessageBreak + before starting this letter!\MessageBreak + Maybe you know what you are doing,\MessageBreak + so I do not change this myself% }% - add `\string\KOMAoptions{paper=\LOPNP@size,paper=portrait}'\MessageBreak - before starting this letter!\MessageBreak - Maybe you know what you are doing,\MessageBreak - so I do not change this myself}% \fi - } +} \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% - \PackageInfo{scrletter% - }{% + \PackageInfo{scrletter} + {% no date found for language `#1'\MessageBreak --> skipped% }% @@ -1364,8 +1365,8 @@ \dateenglish \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname date\languagename\endcsname\relax - \PackageWarningNoLine{scrletter% - }{% + \PackageWarningNoLine{scrletter} + {% \string\language\space is \the\language, \string\languagename\space is `\languagename'\MessageBreak but \expandafter\string\csname @@ -1376,8 +1377,8 @@ \let\languagename=\undefined \fi \ifx\languagename\undefined - \PackageWarningNoLine{scrletter% - }{\string\languagename\space not + \PackageWarningNoLine{scrletter} + {\string\languagename\space not defined, using \string\language.\MessageBreak This may result in use of wrong language!\MessageBreak You should use a compatible language @@ -1531,8 +1532,8 @@ \else \edef\@tempa{nohyphenation}% \ifx\languagename\@tempa - \PackageWarningNoLine{scrletter% - }{% + \PackageWarningNoLine{scrletter} + {% You've selected language `\languagename'.\MessageBreak Maybe your LaTeX format contains Babel extension\MessageBreak but you have not selected a language using\MessageBreak @@ -1542,15 +1543,15 @@ will be used% }% \else - \PackageInfo{scrletter% - }{% + \PackageInfo{scrletter} + {% trying to activate captions and date\MessageBreak of language `\languagename'% }% \csname date\languagename\endcsname \csname captions\languagename\endcsname - \PackageInfo{scrletter% - }{% + \PackageInfo{scrletter} + {% used language is `\languagename'.\MessageBreak Supported languages are: `english', `UKenglish',\MessageBreak `ukenglish', `british', `american', `USenglish',\MessageBreak @@ -1565,7 +1566,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} @@ -1580,8 +1581,8 @@ \expandafter\let\csname scr@#2@var\endcsname=\@empty \if@tempswa\addtoreffields{#2}\fi }{% - \PackageError{scrletter% - }{% + \PackageError{scrletter} + {% This should never happen% }{% The contents of the KOMA-Script variable `#2'\MessageBreak @@ -1591,8 +1592,8 @@ }% }% }{% - \PackageError{scrletter% - }{% + \PackageError{scrletter} + {% Variable `#2' already defined% }{% I'll ignore this command, if you'll continue.% @@ -1628,8 +1629,8 @@ }% } \newcommand*{\@komavar@err}[2]{% - \PackageError{scrletter% - }{% + \PackageError{scrletter} + {% KOMA-Script variable not defined% }{% You've tried to #1 the not defined KOMA-Script variable @@ -1750,7 +1751,7 @@ \fi }% } -%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \newcommand*{\Ifplength}[1]{% \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}% @@ -1765,8 +1766,8 @@ \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% }{% - \PackageError{scrletter% - }{% + \PackageError{scrletter}% + {% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% }{% @@ -1869,7 +1870,7 @@ Internal macro `\string\@addtoplength' is deprecated.\MessageBreak Please use `\string\addtoplength' instead}% \addtoplength} -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: body) \newcommand*{% \letterpagemark @@ -1901,7 +1902,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newkomavar{firsthead} @@ -1920,7 +1921,7 @@ }% } \newcommand*{\scr@firsthead@postsetvar}{% - \KOMAExecuteOptions[.% + \KOMAExecuteOptions[% scrletter.\scr@pkgextension ]{fromalign=no}% } @@ -2068,7 +2069,7 @@ \newkomafont{fromname}{} \newkomafont{fromaddress}{} \newkomafont{fromrule}{} -\newkomafont{backaddress}{\@gr@gsffamily} +\newkomafont{backaddress}{\maybesffamily} \newkomafont{specialmail}{} \newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries} \newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont} @@ -2077,10 +2078,10 @@ \newkomafont{addressee}{} \newkomafont{toname}{} \newkomafont{toaddress}{} -\newkomafont{refname}{\@gr@gsffamily\scriptsize} +\newkomafont{refname}{\maybesffamily\scriptsize} \newkomafont{refvalue}{} \newkomafont{placeanddate}{} -\newkomafont{lettertitle}{\normalcolor\@gr@gsffamily\bfseries} +\newkomafont{lettertitle}{\normalcolor\maybesffamily\bfseries} \scr@ifundefinedorrelax{scr@fnt@title}{% \aliaskomafont{title}{lettertitle}% }{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty index 9b7e70125a1..96e742dc8c4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile-hook.dtx$ \ProvidesPackage{scrlfile-hook-3.34}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (using LaTeX hooks)] \@ifundefined{IfFormatAtLeastTF}{% 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 2361c996d97..caafc193e38 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile-hook.dtx$ \ProvidesPackage{scrlfile-hook}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (using LaTeX hooks)] \@ifundefined{IfFormatAtLeastTF}{% 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 37c1ac8c1b6..cad7ed2564a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile-patcholdlatex.dtx 3874 2022-06-05 10:38:02Z kohm $ \ProvidesPackage{scrlfile-patcholdlatex}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (patching old LaTeX kernels)] \@ifundefined{IfFormatAtLeastTF}{}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index e515103041e..a55a065e8c8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile.dtx 3874 2022-06-05 10:38:02Z kohm $ \ProvidesPackage{scrlfile}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 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 e1491b9c14b..d91af7c910c 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 3688 2022-02-10 08:26:37Z kohm $ \ProvidesPackage{scrlogo}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 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 ea69668919c..385245c1896 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,28 +95,26 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrlttr2% -} +\newcommand*{\KOMAClassName}{scrlttr2} \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \newcommand*{\ClassName}{% letter% } \ProvidesClass{\KOMAClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -202,10 +200,11 @@ \@namedef{scr@v@3.36}{20} \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} +\@namedef{scr@v@3.39}{20} \@namedef{scr@v@last}{20} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -216,7 +215,7 @@ Because of this, version was set to `first'% }% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{version}{first}% }{% @@ -225,7 +224,7 @@ }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{version}{#1}% \ifnum\scr@compatibility<\scr@v@last @@ -246,7 +245,7 @@ \fi }% } -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\KOMA@kav@add{\KOMAClassFileName}{version}{last} \AtEndOfClass{% \KOMA@key{version}[]{% \ClassError{\KOMAClassName}{% @@ -271,61 +270,60 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +\newcommand*{\scr@v@is@eq}[1]{% + \scr@compatibility=\@nameuse{scr@v@#1} +} +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{draft}{false} +\KOMA@kav@add{\KOMAClassFileName}{draft}{false} \KOMA@DeclareStandardOption {final}{draft=false} \KOMA@key{overfullrule}[true]{% \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false} -\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} -\newcommand*{\@gr@gsffamily}{% - \if@egregdoesnotlikesansseriftitles\else\sffamily\fi -} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{overfullrule}{false} +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -350,23 +348,23 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi \KOMA@set@ifkey{numericaldate}{@orgdate}{#1}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{numericaldate}{@orgdate}% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{numericaldate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 12% @@ -455,7 +453,7 @@ \@tempa }% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{fontsize}{#1}% } @@ -477,11 +475,56 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@ifkey{sfdefaults}{@sfdefaults} +\newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi} +\newcommand*{\textmaybesf}{% + \if@sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi +} +%% \begin{option}{egegdoesnotlikesansseriftitles} +\KOMA@key{egregdoesnotlikesansseriftitles}[true]{% + \ClassWarningNoLine{\KOMAClassName}% + {% + You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak + In 2016 this option has been implemented as a joke\MessageBreak + answer to egreg's comment:\MessageBreak + \space\space ``In my opinion there should be a document class\MessageBreak + \space\space option for it, instead of the + \string\setkomafont\MessageBreak + \space\space statement. And yes, I find imposing sans serif + for\MessageBreak + \space\space titles is not the best choice (one of the + reasons\MessageBreak + \space\space why I don't use Koma-script classes).''\MessageBreak + to question https://tex.stackexchange.com/q/289853\MessageBreak + at TeX.SX.\MessageBreak + The option has never been documented in the official\MessageBreak + user manuals and therefore should never have been\MessageBreak + used in real live documents. It was intended to be\MessageBreak + removed after some month.\MessageBreak + However, it has been used and also almost forgotten\MessageBreak + by the author.\MessageBreak + For this the author apologizes both to users but\MessageBreak + especially to egreg.\MessageBreak + Rightly, egreg has criticized the permanent retention\MessageBreak + of the option as unfunny to inappropriate and has\MessageBreak + asked that it be removed or replaced.\MessageBreak + It will be removed soon!\MessageBreak + You should use `sfdefaults=false` instead% + }% + \KOMA@set@ifkey{egregdoesnotlikesansseriftitles}% + {@sfdefaults}% + {#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% + {sfdefaults}{\if@sfdefaults true\else false\fi}% + \fi +} +%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -501,9 +544,9 @@ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi \fi \fi - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{twoside}{#1}% + \KOMA@kav@xreplacevalue + {\KOMAClassFileName}% + {twoside}{#1}% \fi } \KOMAExecuteOptions{twoside=false} @@ -513,21 +556,23 @@ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - \KOMAClassFileName - }{twocolumn}{@twocolumn}% + \KOMA@kav@replacebool + {\KOMAClassFileName}% + {twocolumn}{@twocolumn}% \if@atdocument\expandafter\@firstofone \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} {\expandafter\AtEndOfClass}\fi - {\expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else - \onecolumn - \if@twoside\flushbottom\else - \raggedbottom + {% + \expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else + \onecolumn + \if@twoside\flushbottom\else + \raggedbottom + \fi \fi \fi - \fi}% + }% \fi } \AtEndOfClass{% @@ -608,7 +653,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -621,16 +666,16 @@ \if@atdocument\let\par@update\default@par@update\fi \par@updaterelative }% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half*}% } \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} @@ -669,66 +714,66 @@ \ifcase\number\@tempa% 0 \endgroup \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{never}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{false}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 2 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 4 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 6 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 8 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 10 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{relative}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -742,9 +787,9 @@ }% \or%11 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -772,15 +817,15 @@ \KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} \KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{parskip}{false} +\KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute} +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% -\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \KOMA@ifkey{footsepline}{@fsl}% -\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{footsepline}{false} \KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \KOMA@key{cleardoublepage}{% \begingroup @@ -795,7 +840,7 @@ \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{cleardoublepage}{current}% }% @@ -806,7 +851,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{cleardoublepage}{#1}% }% @@ -819,7 +864,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% {cleardoublepage}{#1}% }% }{}% @@ -847,26 +892,28 @@ \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} \renewcommand*{\cleardoublepage}{% - \expandafter\ifnum \@nameuse{scr@v@2.98c}<\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@gt{2.98c}% \cleardoubleemptypage \else \cleardoublestandardpage \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{cleardoublepage}{% - \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi + \expandafter\ifnum \scr@v@is@gt{2.98c} + empty% + \else current\fi } \AtEndOfClass{% \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]% {% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% \KOMAClassFileName }{cleardoublepage}{\@tempa}% } @@ -879,9 +926,9 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -901,7 +948,7 @@ \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{multiple}% }{% @@ -910,7 +957,7 @@ \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{nomultiple}% }{% @@ -920,17 +967,17 @@ } \AtBeginDocument{% \ifx\@footnotemark\scr@saved@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{nomultiple}% \else\ifx\@footnotemark\scr@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{multiple}% \fi\fi @@ -952,9 +999,9 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -969,20 +1016,20 @@ {no}{10000},{false}{10000},{off}{10000}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{fromalign}{#1}% \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{fromalign}{left} \KOMA@ncmdkey{fromrule}[below]{@rulefrom}{% {false}{0},{no}{0},{off}{0},{aftername}{1},% {below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}% } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{fromrule}{false} \KOMA@ifkey{fromphone}{@phone} @@ -1006,7 +1053,7 @@ {ppimage}{4},{ppImage}{4},% {topaligned}{5},{alignedtop}{5}% } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{addrfield}{true} \KOMA@ncmdkey{priority}[A]{ltr@priority}{% @@ -1018,7 +1065,7 @@ {priority}{2},{Priority}{2},{PRIORITY}{2},% {A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}% }% -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{priority}{false} \newcommand{\backaddr@format}[1]{} @@ -1053,22 +1100,22 @@ \fi \if@baddr \ifx\backaddr@format\underline - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{backaddress}{underlined}% \else \ifx\backaddr@format\@firstofone - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{backaddress}{plain}% \else - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{backaddress}{true}% \fi \fi \else - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{backaddress}{false}% \fi @@ -1085,13 +1132,13 @@ \ifcase\@tempa \endgroup \@bigloctrue - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{locfield}{wide}% \else \endgroup \@biglocfalse - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{locfield}{narrow}% \fi @@ -1100,7 +1147,7 @@ \FamilyKeyStateUnknownValue \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{locfield}{narrow} \KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} @@ -1160,18 +1207,18 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{foldmarks}{\@usefolds}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% \KOMAClassFileName }{foldmarks}{\if@fold true\else false\fi}% \fi } -\KOMA@kav@xadd{.% +\KOMA@kav@xadd{% \KOMAClassFileName }{foldmarks}{\@usefolds}% -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{foldmarks}{true}% \newcommand*{\scr@removechar}[2]{% @@ -1196,70 +1243,70 @@ \ifcase\@tempa% wide \endgroup \@refwidetrue - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{wide}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{narrow}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{refline}{wide}% \or% narrow \endgroup \@refwidefalse - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{wide}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{narrow}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{refline}{narrow}% \or% dateleft \endgroup \def\@datepos{2}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{dateleft}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{dateright}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{nodate}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{refline}{dateleft}% \or% dateright \endgroup \def\@datepos{1}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{dateleft}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{dateright}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{nodate}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{refline}{dateright}% \or% nodate \endgroup \def\@datepos{0}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{dateleft}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{dateright}% - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{refline}{nodate}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{refline}{nodate}% \fi @@ -1268,10 +1315,10 @@ \FamilyKeyStateUnknownValue \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{refline}{dateright}% -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{refline}{narrow}% \newcommand{\subject@format}[1]{#1} @@ -1314,29 +1361,29 @@ \fi \endgroup \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{subject}{\if@subj titled\else untitled\fi}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% \KOMAClassFileName }{subject}{\if@subjafter after\else before\fi opening}% \ifx\subject@format\underline - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{subject}{underlined}% \fi \ifx\raggedsubject\raggedright - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{subject}{left}% \else \ifx\raggedsubject\raggedleft - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{subject}{right}% \else \ifx\raggedsubject\centering - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{subject}{centered}% \fi @@ -1344,10 +1391,10 @@ \fi \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{subject}{untitled}% -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{subject}{beforeopening}% \KOMA@ifkey{enlargefirstpage}{@enlargefp} @@ -1398,7 +1445,7 @@ \def\@tempa{\endgroup\FamilyKeyStateUnknownValue}% \fi \@tempa - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{pagenumber}{% \ifcase \@pageat @@ -1418,7 +1465,7 @@ \fi }% } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{pagenumber}{botmiddle} \newif\if@scrsymbols @@ -1441,7 +1488,7 @@ \fi \fi \ifx \FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{symbolicnames}{#1}% \if@scrsymbols @@ -1501,7 +1548,7 @@ \fi \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{symbolicnames}{false}% \newcommand*{\scr@symbols@font}{} @@ -1512,13 +1559,13 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-addressfiles.dtx 3874 2022-06-05 10:38:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \AtBeginDocument{% \begingroup @@ -1578,7 +1625,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1616,7 +1663,7 @@ \fi } \providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{fontsize}% \@defaultunits\@tempdima#2pt\relax\@nnil @@ -1765,7 +1812,9 @@ \let\Huge\@undefined \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved@a}% \normalsize - \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi + \expandafter\ifnum\scr@v@is@ge{3.17} + \@nameuse{par@updaterelative}% + \fi \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{\footnotesep}{.7\@tempdimc}% \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus @@ -1965,25 +2014,25 @@ \InputIfFileExists{\@fontsizefilebase\@tempa.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }{% \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}% }{% \InputIfFileExists{size\@tempb.clo}{% \ClassInfo{\KOMAClassName}{% File `size\@tempb.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}% }{% \edef\@tempa{% \noexpand\changefontsizes{\@tempa}% - \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \noexpand\KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }\@tempa }% }% @@ -2077,7 +2126,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2144,7 +2193,7 @@ \fi } \newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% + \marginpar[{\raggedleft #1}]{\raggedright #1}% } \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% @@ -2201,7 +2250,7 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -2223,11 +2272,11 @@ \edef\reserved@a{% \noexpand\edef\noexpand\scr@currentlco{\reserved@a}% \noexpand\InputIfFileExists{\reserved@a.lco}{% - \noexpand\ClassInfo{scrlttr2% - }{Letter-Class-Option `#1' loaded}% + \noexpand\ClassInfo{scrlttr2}% + {Letter-Class-Option `#1' loaded}% }{% - \noexpand\ClassError{scrlttr2% - }{% + \noexpand\ClassError{scrlttr2}% + {% Letter-Class-Option file `#1.lco' not found% }{% You've told me to load the Letter-Class-Option `#1'. So I have @@ -2353,34 +2402,35 @@ } \newcommand*{\@@PapersizeWarning}{% \if@tempswa\else% - \ClassWarningNoLine{scrlttr2% - }{% - Letter option file `\LOPNP@option.lco'\MessageBreak - needs paper size `\LOPNP@size'.\MessageBreak - Current paper size is not `\LOPNP@size'!\MessageBreak - \scr@ifundefinedorrelax{KOMAClassName}{% - You should load package `typearea' either\MessageBreak - with option `paper=\LOPNP@size,paper=portrait' or - additionally\MessageBreak - }{% - You should add `paper=\LOPNP@size,paper=portrait' at the\MessageBreak - option list of `\string\documentclass' or\MessageBreak + \ClassWarningNoLine{scrlttr2}% + {% + Letter option file `\LOPNP@option.lco'\MessageBreak + needs paper size `\LOPNP@size'.\MessageBreak + Current paper size is not `\LOPNP@size'!\MessageBreak + \scr@ifundefinedorrelax{KOMAClassName}{% + You should load package `typearea' either\MessageBreak + with option `paper=\LOPNP@size,paper=portrait' or + additionally\MessageBreak + }{% + You should add `paper=\LOPNP@size,paper=portrait' at the\MessageBreak + option list of `\string\documentclass' or\MessageBreak + }% + add `\string\KOMAoptions{paper=\LOPNP@size,paper=portrait}'\MessageBreak + before starting this letter!\MessageBreak + Maybe you know what you are doing,\MessageBreak + so I do not change this myself% }% - add `\string\KOMAoptions{paper=\LOPNP@size,paper=portrait}'\MessageBreak - before starting this letter!\MessageBreak - Maybe you know what you are doing,\MessageBreak - so I do not change this myself}% \fi - } +} \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% - \ClassInfo{scrlttr2% - }{% + \ClassInfo{scrlttr2} + {% no date found for language `#1'\MessageBreak --> skipped% }% @@ -2745,8 +2795,8 @@ \dateenglish \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname date\languagename\endcsname\relax - \ClassWarningNoLine{scrlttr2% - }{% + \ClassWarningNoLine{scrlttr2} + {% \string\language\space is \the\language, \string\languagename\space is `\languagename'\MessageBreak but \expandafter\string\csname @@ -2757,8 +2807,8 @@ \let\languagename=\undefined \fi \ifx\languagename\undefined - \ClassWarningNoLine{scrlttr2% - }{\string\languagename\space not + \ClassWarningNoLine{scrlttr2} + {\string\languagename\space not defined, using \string\language.\MessageBreak This may result in use of wrong language!\MessageBreak You should use a compatible language @@ -2912,8 +2962,8 @@ \else \edef\@tempa{nohyphenation}% \ifx\languagename\@tempa - \ClassWarningNoLine{scrlttr2% - }{% + \ClassWarningNoLine{scrlttr2} + {% You've selected language `\languagename'.\MessageBreak Maybe your LaTeX format contains Babel extension\MessageBreak but you have not selected a language using\MessageBreak @@ -2923,15 +2973,15 @@ will be used% }% \else - \ClassInfo{scrlttr2% - }{% + \ClassInfo{scrlttr2} + {% trying to activate captions and date\MessageBreak of language `\languagename'% }% \csname date\languagename\endcsname \csname captions\languagename\endcsname - \ClassInfo{scrlttr2% - }{% + \ClassInfo{scrlttr2} + {% used language is `\languagename'.\MessageBreak Supported languages are: `english', `UKenglish',\MessageBreak `ukenglish', `british', `american', `USenglish',\MessageBreak @@ -2946,7 +2996,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} @@ -2961,8 +3011,8 @@ \expandafter\let\csname scr@#2@var\endcsname=\@empty \if@tempswa\addtoreffields{#2}\fi }{% - \ClassError{scrlttr2% - }{% + \ClassError{scrlttr2} + {% This should never happen% }{% The contents of the KOMA-Script variable `#2'\MessageBreak @@ -2972,8 +3022,8 @@ }% }% }{% - \ClassError{scrlttr2% - }{% + \ClassError{scrlttr2} + {% Variable `#2' already defined% }{% I'll ignore this command, if you'll continue.% @@ -3009,8 +3059,8 @@ }% } \newcommand*{\@komavar@err}[2]{% - \ClassError{scrlttr2% - }{% + \ClassError{scrlttr2} + {% KOMA-Script variable not defined% }{% You've tried to #1 the not defined KOMA-Script variable @@ -3131,7 +3181,7 @@ \fi }% } -%%% From File: $Id: scrkernel-pseudolengths.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \newcommand*{\Ifplength}[1]{% \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}% @@ -3146,8 +3196,8 @@ \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% }{% - \ClassError{scrlttr2% - }{% + \ClassError{scrlttr2}% + {% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% }{% @@ -3250,7 +3300,7 @@ Internal macro `\string\@addtoplength' is deprecated.\MessageBreak Please use `\string\addtoplength' instead}% \addtoplength} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3262,7 +3312,7 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: body) \newcommand*{\par@updaterelative}{% \begingroup @@ -3436,7 +3486,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -3533,9 +3583,9 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -3696,7 +3746,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} @@ -3838,7 +3888,7 @@ \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } -\newcommand*\descfont{\@gr@gsffamily\bfseries} +\newcommand*\descfont{\maybesffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newcommand*{\labelitemfont}{\normalfont} \newcommand*\scr@fnt@itemizelabel{\labelitemfont} @@ -3853,7 +3903,7 @@ \setlength\arrayrulewidth{.4\p@} \setlength\doublerulesep{2\p@} \setlength\tabbingsep{\labelsep} -%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newkomavar{firsthead} @@ -3872,7 +3922,7 @@ }% } \newcommand*{\scr@firsthead@postsetvar}{% - \KOMAExecuteOptions[.% + \KOMAExecuteOptions[% \KOMAClassFileName ]{fromalign=no}% } @@ -4036,7 +4086,7 @@ \newkomafont{fromname}{} \newkomafont{fromaddress}{} \newkomafont{fromrule}{} -\newkomafont{backaddress}{\@gr@gsffamily} +\newkomafont{backaddress}{\maybesffamily} \newkomafont{specialmail}{} \newkomafont{priority}{\fontsize{10pt}{10pt}\sffamily\bfseries} \newkomafont{prioritykey}{\fontsize{24.88pt}{24.88pt}\selectfont} @@ -4045,14 +4095,14 @@ \newkomafont{addressee}{} \newkomafont{toname}{} \newkomafont{toaddress}{} -\newkomafont{refname}{\@gr@gsffamily\scriptsize} -\ifnum\scr@compatibility=\@nameuse{scr@v@2.97}\relax +\newkomafont{refname}{\maybesffamily\scriptsize} +\expandafter\ifnum\scr@v@is@eq{2.97}% \newkomafont{refvalue}{\sffamily\scriptsize} \else \newkomafont{refvalue}{} \fi \newkomafont{placeanddate}{} -\newkomafont{lettertitle}{\normalcolor\@gr@gsffamily\bfseries} +\newkomafont{lettertitle}{\normalcolor\maybesffamily\bfseries} \aliaskomafont{title}{lettertitle}% \newkomafont{lettersubject}{\normalfont\bfseries} \aliaskomafont{subject}{lettersubject}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index 2cde666f5ee..c439fab778a 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,15 +60,13 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrreprt% -} +\newcommand*{\KOMAClassName}{scrreprt} \newcommand*{\ClassName}{% report% } @@ -77,7 +75,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 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 1ff5a4f3ece..7b0f4666085 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,31 +106,29 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% \let\scr@clsextension\@clsextension } -\newcommand*{\KOMAClassName}{% - scrreprt% -} +\newcommand*{\KOMAClassName}{scrreprt} \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \newcommand*{\ClassName}{% report% } \ProvidesClass{\KOMAClassName}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -141,9 +139,9 @@ \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -229,8 +227,8 @@ \newcommand*{\scr@fnt@paragraph}{\size@paragraph} \newcommand*{\size@subparagraph}{} \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} -\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries} +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -316,10 +314,11 @@ \@namedef{scr@v@3.36}{20} \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} +\@namedef{scr@v@3.39}{20} \@namedef{scr@v@last}{20} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -355,7 +354,7 @@ Because of this, version was set to `first'% }% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{version}{first}% }{% @@ -364,7 +363,7 @@ }% \edef\scr@compatibility{\@nameuse{scr@v@#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{version}{#1}% \ifnum\scr@compatibility<\scr@v@last @@ -385,7 +384,7 @@ \fi }% } -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\KOMA@kav@add{\KOMAClassFileName}{version}{last} \AtEndOfClass{% \KOMA@key{version}[]{% \ClassError{\KOMAClassName}{% @@ -410,65 +409,64 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +\newcommand*{\scr@v@is@eq}[1]{% + \scr@compatibility=\@nameuse{scr@v@#1} +} +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{draft}{false} +\KOMA@kav@add{\KOMAClassFileName}{draft}{false} \KOMA@DeclareStandardOption {final}{draft=false} \KOMA@key{overfullrule}[true]{% \KOMA@set@ifkey{overfullrule}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \if@tempswa - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{5pt}% \else - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{draft}{@tempswa}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{overfullrule}{@tempswa}% \setlength{\overfullrule}{\z@}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{overfullrule}{false} +\KOMA@kav@add{\KOMAClassFileName}{overfullrule}{false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -\KOMA@ifkey{egregdoesnotlikesansseriftitles}{@egregdoesnotlikesansseriftitles} -\newcommand*{\@gr@gsffamily}{% - \if@egregdoesnotlikesansseriftitles\else\sffamily\fi -} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -557,7 +555,7 @@ \@tempa }% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{fontsize}{#1}% } @@ -579,7 +577,52 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +\KOMA@ifkey{sfdefaults}{@sfdefaults} +\newcommand*{\maybesffamily}{\if@sfdefaults \sffamily \fi} +\newcommand*{\textmaybesf}{% + \if@sfdefaults \expandafter\textsf \else \expandafter\@firstofone \fi +} +%% \begin{option}{egegdoesnotlikesansseriftitles} +\KOMA@key{egregdoesnotlikesansseriftitles}[true]{% + \ClassWarningNoLine{\KOMAClassName}% + {% + You've used deprecated option `egregdoesnotlikesansseriftitles'.\MessageBreak + In 2016 this option has been implemented as a joke\MessageBreak + answer to egreg's comment:\MessageBreak + \space\space ``In my opinion there should be a document class\MessageBreak + \space\space option for it, instead of the + \string\setkomafont\MessageBreak + \space\space statement. And yes, I find imposing sans serif + for\MessageBreak + \space\space titles is not the best choice (one of the + reasons\MessageBreak + \space\space why I don't use Koma-script classes).''\MessageBreak + to question https://tex.stackexchange.com/q/289853\MessageBreak + at TeX.SX.\MessageBreak + The option has never been documented in the official\MessageBreak + user manuals and therefore should never have been\MessageBreak + used in real live documents. It was intended to be\MessageBreak + removed after some month.\MessageBreak + However, it has been used and also almost forgotten\MessageBreak + by the author.\MessageBreak + For this the author apologizes both to users but\MessageBreak + especially to egreg.\MessageBreak + Rightly, egreg has criticized the permanent retention\MessageBreak + of the option as unfunny to inappropriate and has\MessageBreak + asked that it be removed or replaced.\MessageBreak + It will be removed soon!\MessageBreak + You should use `sfdefaults=false` instead% + }% + \KOMA@set@ifkey{egregdoesnotlikesansseriftitles}% + {@sfdefaults}% + {#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@sfdefault \@sfdefaultsfalse \else \@sfdefaulttrue \fi + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% + {sfdefaults}{\if@sfdefaults true\else false\fi}% + \fi +} +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -599,9 +642,9 @@ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi \fi \fi - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{twoside}{#1}% + \KOMA@kav@xreplacevalue + {\KOMAClassFileName}% + {twoside}{#1}% \fi } \KOMAExecuteOptions{twoside=false} @@ -611,21 +654,23 @@ \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - \KOMAClassFileName - }{twocolumn}{@twocolumn}% + \KOMA@kav@replacebool + {\KOMAClassFileName}% + {twocolumn}{@twocolumn}% \if@atdocument\expandafter\@firstofone \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} {\expandafter\AtEndOfClass}\fi - {\expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else - \onecolumn - \if@twoside\flushbottom\else - \raggedbottom + {% + \expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else + \onecolumn + \if@twoside\flushbottom\else + \raggedbottom + \fi \fi \fi - \fi}% + }% \fi } \AtEndOfClass{% @@ -706,7 +751,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -719,16 +764,16 @@ \if@atdocument\let\par@update\default@par@update\fi \par@updaterelative }% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{half*}% } \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} @@ -767,66 +812,66 @@ \ifcase\number\@tempa% 0 \endgroup \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{never}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{false}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 2 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half-}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 4 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 6 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half+}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 8 \endgroup \setparsizes{\z@}{1\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{full*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{half*}% \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 10 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{relative}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -840,9 +885,9 @@ }% \or%11 \endgroup - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}% - \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}% - \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{absolute}% + \KOMA@kav@remove{\KOMAClassFileName}{parskip}{relative}% + \KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute}% \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass \else @@ -870,9 +915,9 @@ \KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+} \KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*} \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} -\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{parskip}{false} +\KOMA@kav@add{\KOMAClassFileName}{parskip}{absolute} +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagetrue @@ -882,24 +927,24 @@ \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{titlepage}{firstiscover}% }{% \def\FamilyElseValue{, `firstiscover'}% \KOMA@set@ifkey{titlepage}{@titlepage}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@remove{.% + \KOMA@kav@remove{% \KOMAClassFileName }{titlepage}{firstiscover}% - \KOMA@kav@replacebool{.% + \KOMA@kav@replacebool{% \KOMAClassFileName }{titlepage}{@titlepage}% \@titlepageiscoverpagefalse \fi }% } -\KOMA@kav@xadd{.% +\KOMA@kav@xadd{% \KOMAClassFileName }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% @@ -907,9 +952,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -918,20 +963,20 @@ {left}{2}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openany}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openright}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openleft}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}{open}{#1}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{openany}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{openright}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{openleft}% \ifcase \@tempa\relax - \KOMA@kav@add{.\KOMAClassFileName}{headings}{openany}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{openany}% \@openrightfalse \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}% \or - \KOMA@kav@add{.\KOMAClassFileName}{headings}{openright}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{openright}% \@openrighttrue \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}% \or - \KOMA@kav@add{.\KOMAClassFileName}{headings}{openleft}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{openleft}% \@openrighttrue \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}% \fi @@ -948,7 +993,7 @@ {noenddot}{2},{nodotatend}{2}% }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}{numbers}{#1}% \ifcase \@tempa\relax \if@atdocument\scr@dotchangeatdocument{#1}\else \let\scr@altsecnumhook\@empty @@ -968,7 +1013,7 @@ \KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot} \KOMA@ifkey{bookmarkpackage}{@scr@autoloadbookmarkpackage} \@scr@autoloadbookmarkpackagetrue -\KOMA@kav@add{.\KOMAClassFileName}{bookmarkpackage}{true} +\KOMA@kav@add{\KOMAClassFileName}{bookmarkpackage}{true} \AfterAtEndOfPackage{hyperref}{% \AtBeginDocument{% \@ifpackageloaded{bookmark}{}{% @@ -1059,26 +1104,26 @@ \KOMA@key{chapterprefix}[true]{% \KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.\KOMAClassFileName}% + \KOMA@kav@replacebool{\KOMAClassFileName}% {chapterprefix}{@chapterprefix}% - \KOMA@kav@remove{.\KOMAClassFileName}% + \KOMA@kav@remove{\KOMAClassFileName}% {headings}{twolinechapter}% - \KOMA@kav@remove{.\KOMAClassFileName}% + \KOMA@kav@remove{\KOMAClassFileName}% {headings}{onelinechapter}% - \KOMA@kav@xadd{.\KOMAClassFileName}% + \KOMA@kav@xadd{\KOMAClassFileName}% {headings}{% \if@chapterprefix twolinechapter\else onelinechapter\fi }% \fi } -\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}% +\KOMA@kav@add{\KOMAClassFileName}{headings}{onelinechapter}% \KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \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}% + \KOMA@kav@removekey{\KOMAClassFileName}{appendixprefix}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{twolineappendix}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{onelineappendix}% \IfHookEmptyTF{\KOMAClassName/appendix}{}{% \RemoveFromHook{\KOMAClassName/appendix}[appendixprefix]% }% @@ -1086,18 +1131,18 @@ }{% \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}% + \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}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{twolineappendix}% \AddToHook{\KOMAClassName/appendix}[appendixprefix]% {\@chapterprefixtrue}% \else - \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{onelineappendix}% \AddToHook{\KOMAClassName/appendix}[appendixprefix]% {\@chapterprefixfalse}% \fi @@ -1108,18 +1153,18 @@ \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}% + \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}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{twolineappendix}% \@ifundefined{appendixmore}{% \def\appendixmore{\@chapterprefixtrue}% }{% \l@addto@macro\appendixmore{\@chapterprefixtrue}% }% \else - \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{onelineappendix}% \@ifundefined{appendixmore}{% \def\appendixmore{\@chapterprefixfalse}% }{% @@ -1154,11 +1199,11 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax% big - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{big}% \renewcommand*{\scr@chapter@beforeskip}{-3.3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip @@ -1166,8 +1211,9 @@ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{% - \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa - \else\vskip\@tempskipa\fi + \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa\else + \vskip\@tempskipa + \fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% \setkomafont{part}{\Huge}% @@ -1180,11 +1226,11 @@ \setkomafont{paragraph}{\normalsize}% \setkomafont{subparagraph}{\normalsize}% \or % normal - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{normal}% \renewcommand*{\scr@chapter@beforeskip}{-3\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip @@ -1192,8 +1238,9 @@ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{% - \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa - \else\vskip\@tempskipa\fi + \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa\else + \vskip\@tempskipa + \fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% \setkomafont{part}{\huge}% @@ -1206,11 +1253,11 @@ \setkomafont{paragraph}{\normalsize}% \setkomafont{subparagraph}{\normalsize}% \or % small - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{small}% \renewcommand*{\scr@chapter@beforeskip}{-2.8\baselineskip-\parskip}% \renewcommand*{\scr@chapter@afterskip}{% 1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip @@ -1218,8 +1265,9 @@ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}% \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{% - \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa - \else\vskip\@tempskipa\fi + \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa\else + \vskip\@tempskipa + \fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% \setkomafont{part}{\LARGE}% @@ -1246,29 +1294,29 @@ \or % onelineappendix \KOMAoptions{appendixprefix=false}% \or % optiontotocandhead - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontotocandhead}% \scr@activate@xsection{3}% \or % optiontotoc - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontotoc}% \scr@activate@xsection{2}% \or % optiontohead - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotocandhead}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontotoc}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{optiontohead}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{optiontohead}% \scr@activate@xsection{1}% \or % standardclasses - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% - \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% - \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{big}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{normal}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{small}% + \KOMA@kav@remove{\KOMAClassFileName}{headings}{standardclasses}% + \KOMA@kav@add{\KOMAClassFileName}{headings}{standardclasses}% \renewcommand*{\scr@chapter@beforeskip}{-50\p@}% \renewcommand*{\scr@chapter@afterskip}{40\p@}% \renewcommand*{\scr@chapter@innerskip}{20\p@}% @@ -1289,18 +1337,18 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{headings}{big} -\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter} +\KOMA@kav@add{\KOMAClassFileName}{headings}{big} +\KOMA@kav@add{\KOMAClassFileName}{headings}{onelinechapter} \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% -\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} \KOMA@ifkey{footsepline}{@fsl}% -\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false} +\KOMA@kav@add{\KOMAClassFileName}{footsepline}{false} \KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false} \KOMA@key{cleardoublepage}{% \begingroup @@ -1315,7 +1363,7 @@ \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{cleardoublepage}{current}% }% @@ -1326,7 +1374,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% \KOMAClassFileName }{cleardoublepage}{#1}% }% @@ -1339,7 +1387,7 @@ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.\KOMAClassFileName}% + \KOMA@kav@xreplacevalue{\KOMAClassFileName}% {cleardoublepage}{#1}% }% }{}% @@ -1367,26 +1415,28 @@ \newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} \newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} \renewcommand*{\cleardoublepage}{% - \expandafter\ifnum \@nameuse{scr@v@2.98c}<\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@gt{2.98c}% \cleardoubleemptypage \else \cleardoublestandardpage \fi } -\KOMA@kav@add{.% +\KOMA@kav@add{% \KOMAClassFileName }{cleardoublepage}{% - \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi + \expandafter\ifnum \scr@v@is@gt{2.98c} + empty% + \else current\fi } \AtEndOfClass{% \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]% {% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{cleardoublepage}% - \KOMA@kav@xadd{.% + \KOMA@kav@xadd{% \KOMAClassFileName }{cleardoublepage}{\@tempa}% } @@ -1399,7 +1449,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1433,108 +1483,108 @@ \@tablecaptionabovetrue \@figurecaptionabovetrue \@captionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{heading}% \or % signature \@tablecaptionabovefalse \@figurecaptionabovefalse \@captionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{heading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{signature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{signature}% \or % tableheading \@tablecaptionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{tableheading}% \or % tablesignature \@tablecaptionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tableheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{tablesignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{tablesignature}% \or % figureheading \@figurecaptionabovetrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{figureheading}% \or % figuresignature \@figurecaptionabovefalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figureheading}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{figuresignature}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{figuresignature}% \or % oneline \onelinecaptionstrue - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{oneline}% \or % nooneline \onelinecaptionsfalse - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{oneline}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{nooneline}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{nooneline}% \or % rightbeside \renewcommand*{\scap@pos}{r}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{rightbeside}% \or % leftbeside \renewcommand*{\scap@pos}{l}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{leftbeside}% \or % innerbeside \renewcommand*{\scap@pos}{i}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{innerbeside}% \or % outerbeside \renewcommand*{\scap@pos}{o}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{rightbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{leftbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{innerbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{outerbeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{outerbeside}% \or % topbeside \renewcommand*{\scap@valign}{t}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{topbeside}% \or % centeredbeside \renewcommand*{\scap@valign}{c}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{centeredbeside}% \or % bottombeside \renewcommand*{\scap@valign}{b}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}% - \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}% - \KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{topbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{centeredbeside}% + \KOMA@kav@remove{\KOMAClassFileName}{captions}{bottombeside}% + \KOMA@kav@add{\KOMAClassFileName}{captions}{bottombeside}% \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{captions}{signature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside} -\KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside} +\KOMA@kav@add{\KOMAClassFileName}{captions}{signature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{tablesignature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{figuresignature} +\KOMA@kav@add{\KOMAClassFileName}{captions}{oneline} +\KOMA@kav@add{\KOMAClassFileName}{captions}{rightbeside} +\KOMA@kav@add{\KOMAClassFileName}{captions}{bottombeside} \KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading} \KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature} \newif\if@komalongtable\@komalongtabletrue \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1554,7 +1604,7 @@ \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{multiple}% }{% @@ -1563,7 +1613,7 @@ \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% \KOMAClassFileName }{footnotes}{nomultiple}% }{% @@ -1573,17 +1623,17 @@ } \AtBeginDocument{% \ifx\@footnotemark\scr@saved@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{nomultiple}% \else\ifx\@footnotemark\scr@footnotemark - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{footnotes}% - \KOMA@kav@add{.% + \KOMA@kav@add{% \KOMAClassFileName }{footnotes}{multiple}% \fi\fi @@ -1605,7 +1655,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1648,24 +1698,24 @@ \or % bibliographynumbered \KOMAoptions{bibliography=totocnumbered}% \or % flat - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{flat}% \@toclefttrue \or % graduated - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{graduated}% \@tocleftfalse \or % indenttextentries - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{indenttextentries}% \expandafter\setuptoc\expandafter{\ext@toc}{numberline}% \or % leftaligntextentries - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{leftaligntextentries}% \expandafter\unsettoc\expandafter{\ext@toc}{numberline}% \or % chapterentrywithdots/sectionentrywithdots \KOMAoptions{chapterentrydots=true}% @@ -1700,14 +1750,14 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax % notoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{notoc}% \renewcommand*{\float@@listhead}{% \chapter* }% @@ -1720,14 +1770,14 @@ \unsettoc{\@currext}{totoc}% }% \or% totoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{totoc}% \renewcommand*{\float@@listhead}{% \addchap }% @@ -1740,14 +1790,14 @@ \setuptoc{\@currext}{totoc}% }% \or% numbered - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{listofnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nolistof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listof}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{listofnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{numbered}% \renewcommand*{\float@@listhead}{% \chapter }% @@ -1760,18 +1810,18 @@ \setuptoc{\@currext}{totoc}% }% \or% flat - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{flat}% \@dynlisttrue \or% graduated - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{flat}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{graduated}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{graduated}% \@dynlistfalse \or% leveldown - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{leveldown}% \doforeachtocfile[float]{% \setuptoc{\@currext}{leveldown}% }% @@ -1779,8 +1829,8 @@ \setuptoc{\@currext}{leveldown}% }% \or% standardlevel - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leveldown}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leveldown}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{standardlevel}% \doforeachtocfile[float]{% \unsettoc{\@currext}{leveldown}% }% @@ -1788,7 +1838,7 @@ \unsettoc{\@currext}{leveldown}% }% \or% entryprefix - \KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{entryprefix}% \@dynlisttrue \doforeachtocfile[float]{% \BeforeStartingTOC[\@currext]{% @@ -1809,9 +1859,9 @@ }% }% \or% indenttextentries - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{indenttextentries}% \doforeachtocfile[float]{% \setuptoc{\@currext}{numberline}% }% @@ -1819,9 +1869,9 @@ \setuptoc{\@currext}{numberline}% } \or% leftaligntextentries - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{indenttextentries}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{leftaligntextentries}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{leftaligntextentries}% \doforeachtocfile[float]{% \unsettoc{\@currext}{numberline}% }% @@ -1839,10 +1889,10 @@ \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated} -\KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries} +\KOMA@kav@add{\KOMAClassFileName}{toc}{nolistof} +\KOMA@kav@add{\KOMAClassFileName}{listof}{notoc} +\KOMA@kav@add{\KOMAClassFileName}{listof}{graduated} +\KOMA@kav@add{\KOMAClassFileName}{listof}{leftaligntextentries} \KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc} \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} @@ -1851,38 +1901,38 @@ \newif\if@chaptertolists\@chaptertolistsfalse \KOMA@key{chapteratlists}[entry]{% \FamilyKeyStateProcessed - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chapterentry}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergap}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}% - \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chapterentry}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chaptergap}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chaptergapsmall}% + \KOMA@kav@remove{\KOMAClassFileName}{listof}{chaptergapline}% \Ifstr{#1}{entry}{% \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% - \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}% - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chapterentry}% + \KOMA@kav@replacevalue{\KOMAClassFileName}{chapteratlists}{entry}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chapterentry}% }{% \@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}% - \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}% + \KOMA@kav@replacevalue{\KOMAClassFileName}{chapteratlists}% {\@chapterlistsgap}% \def\reserved@a{\z@}% \ifx\@chapterlistsgap\reserved@a - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergap}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergap}% \else \def\reserved@a{10\p@}% \ifx\@chapterlistsgap\reserved@a - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}% \else \def\reserved@a{\baselineskip}% \ifx\@chapterlistsgap\reserved@a - \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapline}% + \KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergapline}% \fi \fi \fi }% } \BeforeTOCHead{\@chaptertolistsfalse} -\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% -\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $ +\KOMA@kav@add{\KOMAClassFileName}{chapteratlists}{10\p@}% +\KOMA@kav@add{\KOMAClassFileName}{listof}{chaptergapsmall}% +%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1905,13 +1955,13 @@ \@ifundefined{scr@current@bibstyle}{}{% \Ifstr{\scr@current@bibstyle}{}{}{% \edef\reserved@a{% - \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% + \noexpand\KOMA@kav@remove{\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% }\reserved@a }% }% \def\scr@current@bibstyle{#2}% - \KOMA@kav@xadd{.\KOMAClassFileName}{bibliography}{#2}% + \KOMA@kav@xadd{\KOMAClassFileName}{bibliography}{#2}% \csname scr@bibstyle@#1\endcsname #3% }% @@ -1973,14 +2023,14 @@ {standardlevel}{4}% }{#1}% \ifcase \@tempa\relax % notoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{notoc}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \section*{##1}% @@ -1991,14 +2041,14 @@ \fi }% \or% totoc - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{totoc}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \addsec{##1}% @@ -2012,14 +2062,14 @@ \fi }% \or% numbered - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{nobibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliography}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{bibliographynumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{totoc}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{numbered}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{numbered}% \renewcommand*{\bibliography@heading}[1]{% \ifbib@leveldown \section{##1}% @@ -2033,20 +2083,20 @@ \fi } \or% leveldown - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{leveldown}% \bib@leveldowntrue \or% standardlevel - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{bibliography}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{bibliography}{standardlevel}% \bib@leveldownfalse \fi }{% \FamilyKeyStateProcessed \edef\reserved@a{% - \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% + \noexpand\KOMA@kav@remove{\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% }\reserved@a \csname scr@bibstyle@#1\endcsname @@ -2055,7 +2105,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ %%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown @@ -2076,14 +2126,14 @@ }{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \ifcase \@tempa\relax - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@add{\KOMAClassFileName}{index}{notoc}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -2092,14 +2142,14 @@ \fi*% }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@add{\KOMAClassFileName}{index}{toc}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\addsec @@ -2108,14 +2158,14 @@ \fi }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}% - \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{noindex}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@remove{\KOMAClassFileName}{toc}{index}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{notoc}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{numbered}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{toc}% + \KOMA@kav@add{\KOMAClassFileName}{toc}{indexnumbered}% + \KOMA@kav@add{\KOMAClassFileName}{index}{numbered}% \renewcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -2124,36 +2174,36 @@ \fi }% \or - \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{index}{leveldown}% \idx@leveldowntrue \or - \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}% - \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}% - \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{leveldown}% + \KOMA@kav@remove{\KOMAClassFileName}{index}{standardlevel}% + \KOMA@kav@add{\KOMAClassFileName}{index}{standardlevel}% \idx@leveldownfalse \fi \fi } -\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex} -\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} -\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} +\KOMA@kav@add{\KOMAClassFileName}{toc}{noindex} +\KOMA@kav@add{\KOMAClassFileName}{index}{notoc} +\KOMA@kav@add{\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \AtBeginDocument{% \begingroup @@ -2202,7 +2252,7 @@ }% \endgroup } -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2240,7 +2290,7 @@ \fi } \providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{% - \KOMA@kav@removekey{.% + \KOMA@kav@removekey{% \KOMAClassFileName }{fontsize}% \@defaultunits\@tempdima#2pt\relax\@nnil @@ -2389,7 +2439,9 @@ \let\Huge\@undefined \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved@a}% \normalsize - \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi + \expandafter\ifnum\scr@v@is@ge{3.17} + \@nameuse{par@updaterelative}% + \fi \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{\footnotesep}{.7\@tempdimc}% \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus @@ -2589,25 +2641,25 @@ \InputIfFileExists{\@fontsizefilebase\@tempa.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }{% \InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{% \ClassInfo{\KOMAClassName}{% File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak file `\@fontsizefilebase\@tempa.clo' to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb pt}% }{% \InputIfFileExists{size\@tempb.clo}{% \ClassInfo{\KOMAClassName}{% File `size\@tempb.clo' used to setup font sizes}% - \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}% - \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}% + \KOMA@kav@removekey{\KOMAClassFileName}{fontsize}% + \KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempb}% }{% \edef\@tempa{% \noexpand\changefontsizes{\@tempa}% - \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}% + \noexpand\KOMA@kav@xadd{\KOMAClassFileName}{fontsize}{\@tempa}% }\@tempa }% }% @@ -2701,13 +2753,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3994 2022-11-16 07:18:05Z kohm $ %%% (run: body) \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2754,7 +2806,7 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ %%% (run: body) \newcommand*{\par@updaterelative}{% \begingroup @@ -2930,7 +2982,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 4000 2022-11-16 07:32:52Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -2981,8 +3033,7 @@ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi } \newcommand*\maketitle[1][1]{% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \def\and{% \end{tabular}% \hskip 1em \@plus.17fil% @@ -3078,8 +3129,7 @@ \vfill\null \if@twoside \@tempswatrue - \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax - \else + \expandafter\ifnum \scr@v@is@ge{3.12}% \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty \@tempswafalse \fi\fi @@ -3097,14 +3147,16 @@ \fi \else \ifx\@uppertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `twoside=false' mode% @@ -3126,20 +3178,23 @@ \@tempcnta=% #1% \relax\ifnum\@tempcnta=1\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% Optional argument of \string\maketitle\space ignored\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@uppertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\uppertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% }% \fi \ifx\@lowertitleback\@empty\else - \ClassWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}% + {% non empty \string\lowertitleback\space ignored by \string\maketitle\MessageBreak in `titlepage=false' mode% @@ -3201,7 +3256,7 @@ \endgroup \fi \setcounter{footnote}{0}% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \expandafter\ifnum \scr@v@is@lt{3.12}% \let\thanks\relax \let\maketitle\relax \let\@maketitle\relax @@ -3298,9 +3353,6 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \if@compatibility - \setcounter{page}{0}% - \fi }{% \if@restonecol\twocolumn \else \newpage \fi }% @@ -3350,10 +3402,10 @@ \newcommand*\abstractname{Abstract} \providecaptionname{american,australian,british,canadian,english,newzealand,% UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3367,7 +3419,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -3387,17 +3439,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 4022 2023-04-04 11:38:26Z kohm $ %%% (run: body) \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3766,7 +3818,7 @@ \z@ \fi \let\@svsec\@empty - \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.31}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -3924,7 +3976,7 @@ This could result in several error messages}% \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% }{% - \expandafter\ifnum\scr@v@is@lt{3.31}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.31}\relax \begingroup \let\@elt\@stpelt \csname cl@\scr@s@ct@@nn@m@\endcsname @@ -5259,7 +5311,7 @@ {\@currenttocentry}% \fi }{% - \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.18}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -5467,7 +5519,7 @@ {\@currenttocentry}% \fi \else - \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else + \expandafter\ifnum\scr@v@is@ge{3.15}\relax \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname @@ -5590,7 +5642,9 @@ \csname scr@#1@afterindent\endcsname {\@afterindenttrue}{\@afterindentfalse}{% \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else - \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \expandafter\ifnum\scr@v@is@ge{3.22} + \@afterindenttrue + \fi \fi }% \chapterheadstartvskip @@ -5651,7 +5705,9 @@ \csname scr@#1@afterindent\endcsname {\@afterindenttrue}{\@afterindentfalse}{% \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else - \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \expandafter\ifnum\scr@v@is@ge{3.22} + \@afterindenttrue + \fi \fi }% \chapterheadstartvskip @@ -5838,7 +5894,8 @@ \fi {\parindent \z@ \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \setlength{\parfillskip}{\z@ plus 1fil}\fi + \setlength{\parfillskip}{\z@ plus 1fil}% + \fi \raggedsection\normalfont\sectfont\nobreak \usekomafont{minisec}{\nobreak\interlinepenalty \@M #1\par\nobreak}% }\nobreak @@ -5968,7 +6025,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \@addtoreset{equation}{chapter} \renewcommand*{\theequation}{% @@ -5996,7 +6053,7 @@ \newcommand*{\dictumauthorformat}[1]{(#1)} \newcommand*{\raggeddictumtext}{\raggedright} \newcommand*{\raggeddictumauthor}{\raggedleft} -\newkomafont{dictum}{\normalfont\normalcolor\@gr@gsffamily\small} +\newkomafont{dictum}{\normalfont\normalcolor\maybesffamily\small} \newkomafont{dictumauthor}{\itshape} \aliaskomafont{dictumtext}{dictum} \setlength{\skip\@mpfootins}{\skip\footins} @@ -6064,7 +6121,7 @@ \fi } \newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% + \marginpar[{\raggedleft #1}]{\raggedright #1}% } \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% @@ -6283,7 +6340,7 @@ \let\scr@mt@saved@sect\relax \fi } -%%% From File: $Id: scrkernel-pagestyles.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3997 2022-11-16 07:24:11Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -6382,7 +6439,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $ +%%% From File: $Id: scrlayer.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6393,7 +6450,7 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3992 2022-11-16 07:14:51Z kohm $ %%% (run: body) \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} @@ -7158,7 +7215,7 @@ \expandafter\ifnum\scr@v@is@le{2.97d}% \renewcommand*\thetable{\thechapter.\@arabic\c@table} \fi -%%% From File: $Id: scrkernel-footnotes.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -7320,7 +7377,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3892 2022-06-17 16:26:06Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3995 2022-11-16 07:20:20Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7470,7 +7527,7 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3990 2022-11-16 07:11:05Z kohm $ %%% (run: body) \newcommand*\bibname{Bibliography} \providecaptionname{american,australian,british,canadian,english,newzealand,% @@ -7558,7 +7615,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3993 2022-11-16 07:17:09Z kohm $ %%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax @@ -7601,7 +7658,7 @@ \newcommand*\indexname{Index} \providecaptionname{american,australian,british,canadian,english,newzealand,% UKenglish,ukenglish,USenglish,usenglish}\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7752,7 +7809,7 @@ \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } -\newcommand*\descfont{\@gr@gsffamily\bfseries} +\newcommand*\descfont{\maybesffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newcommand*{\labelitemfont}{\normalfont} \newcommand*\scr@fnt@itemizelabel{\labelitemfont} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 60537036b4c..50aa845d364 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: 10pt) \ProvidesFile{% scrsize10pt.clo% @@ -160,9 +160,11 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ \@ifundefined{@list@extra}{}{% - \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + \scr@ifundefinedorrelax{scr@v@is@ge}{\par@updaterelative}{% + \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + }% \l@addto@macro{\@listi}{\@list@extra}% \let\@listI=\@listi \l@addto@macro{\@listii}{\@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 846ae540abf..5c3f6cb53c9 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: 11pt) %%% (run: 12pt) \ProvidesFile{% @@ -161,9 +161,11 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ \@ifundefined{@list@extra}{}{% - \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + \scr@ifundefinedorrelax{scr@v@is@ge}{\par@updaterelative}{% + \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + }% \l@addto@macro{\@listi}{\@list@extra}% \let\@listI=\@listi \l@addto@macro{\@listii}{\@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 d8913489e03..8ea15fc99fb 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 4021 2023-04-04 11:29:59Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -162,9 +162,11 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3998 2022-11-16 07:25:23Z kohm $ \@ifundefined{@list@extra}{}{% - \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + \scr@ifundefinedorrelax{scr@v@is@ge}{\par@updaterelative}{% + \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi + }% \l@addto@macro{\@listi}{\@list@extra}% \let\@listI=\@listi \l@addto@macro{\@listii}{\@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 33385b2fd21..06b20673332 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,28 +65,30 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ \newif\if@Hxii \KOMA@ifkey{12h}{@Hxii} -\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false} +\@ifundefined{KOMA@DeclareDeprecatedOption}{}{% + \KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}% +} \KOMAProcessOptions\relax -%%% From File: $Id: scrtime.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrtime.dtx 3986 2022-11-16 06:52:39Z kohm $ \def\thistime{% \kernel@ifstar {\let\@tempif\iffalse\@thistime} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty deleted file mode 100644 index 64a54317089..00000000000 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ /dev/null @@ -1,268 +0,0 @@ -%% -%% This is file `scrwfile.sty', -%% generated with the docstrip utility, extended by scrdocstrip. -%% -%% The original source files were: -%% -%% scrwfile.dtx (with options: `package,scrwfile,identify,option,body') -%% scrlogo.dtx (with options: `logo') -%% -%% Copyright (c) 2010-2022 Markus Kohm [komascript at gmx info] -%% -%% This file was generated from file(s) of the KOMA-Script bundle. -%% --------------------------------------------------------------- -%% -%% It may be distributed under the conditions of the -%% LaTeX Project Public License in the version distributed together -%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. -%% -%% This file may only be distributed together with a copy of the -%% KOMA-Script bundle. You may however distribute the -%% KOMA-Script bundle without all such generated files. See also -%% `lppl.txt' or `lppl-de.txt' for additional information. -%% -%% The list of files belonging to KOMA-Script distribution is given in -%% the file `MANIFEST.md'. See also `lppl.txt' or `lppl-de.txt' for -%% additional information. -%% -%% If this file is a beta version, you may not be allowed to distribute -%% it. Look at the comments below to see if this is the case. -%% -%% English and German manuals are part of KOMA-Script bundle. -%% ---------------------------------------------------------- -%% -%% See `README'. -%% -%% The KOMA-Script bundle (but maybe not this file) was based upon the -%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. You can -%% find a complete unmodified copy of LaTeX2e at -%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. -%% -%%% From File: $Id: scrwfile.dtx 3955 2022-10-06 08:13:32Z kohm $ -\NeedsTeXFormat{LaTeX2e}[1995/06/01] -\ProvidesPackage{scrwfile} - [2022/10/06 v0.1.11 KOMA-Script package (write and clone files)] -\PackageWarningNoLine{scrwfile}{% - THIS IS AN EXPERIMENTAL PACKAGE!\MessageBreak - USAGE OF THIS PACKAGE IS ON YOUR OWN RISK!\MessageBreak - EVERYTHING MAY HAPPEN!\MessageBreak - EVERYTHING MAY CHANGE IN FUTURE!\MessageBreak - THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak - Maybe, it would be better not to load this package% -} -\RequirePackage{scrbase}[2010/09/17] -\RequirePackage{scrlfile}[2010/09/30] -\RequirePackage{iftex} -\ifluatex - \PackageWarningNoLine{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}% -\fi -\newcommand*{\scrwfile@if@only}[1]{% - \begingroup - \scr@ifundefinedorrelax{scrwfile@only}{\@tempswatrue}{% - \@tempswafalse - \edef\reserved@b{#1}% - \@for\reserved@a:=\scrwfile@only\do - {\ifx\reserved@a\reserved@b\@tempswatrue\fi}% - }% - \if@tempswa - \scr@ifundefinedorrelax{scrwfile@never}{}{% - \edef\reserved@b{#1}% - \@for\reserved@a:=\scrwfile@never\do - {\ifx\reserved@a\reserved@b\@tempswafalse\fi}% - }% - \fi - \expandafter\endgroup - \if@tempswa - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi -} -\newcommand*{\scrwfile@starttoc}[1]{% - \scrwfile@if@only{#1}{\scrwfile@@starttoc}{\scrwfile@saved@starttoc}{#1}% -} -\newcommand*{\scrwfile@@starttoc}[1]{% - \begingroup - \if@filesw - \xdef\scrwfile@writefilelist{\scrwfile@writefilelist,#1}% - \fi - \@fileswfalse - \scrwfile@saved@starttoc{#1}% - \endgroup -} -\newcommand*{\scrwfile@writefile}[1]{% - \scrwfile@if@only{#1}{\scrwfile@@writefile}{\scrwfile@saved@writefile}{#1}% -} -\newcommand{\scrwfile@@writefile}[2]{% - \ifnum\scrwfile@wrtout>0 - \begingroup - \@temptokena{#2}% - \immediate\write\scrwfile@wrtout{% - \string\@writefile{#1}{\the\@temptokena}% - }% - \scrwfile@process@clones{#1}% - \endgroup - \fi -} -\chardef\scrwfile@wrtout\z@ -\newcommand*{\scrwfile@writefilelist}{} -\newcommand*{\scrwfile@saved@writefile}{} -\BeforeClosingMainAux{% - \ifx\scrwfile@writefilelist\@empty\else - \let\scrwfile@saved@writefile\@writefile - \let\scrwfile@wrtout\@partaux - \immediate\openout\scrwfile@wrtout \jobname.wrt - \let\@writefile\scrwfile@writefile - \fi -} -\AfterReadingMainAux{% - \ifx\scrwfile@writefilelist\@empty\else - \immediate\closeout\scrwfile@wrtout - \chardef\scrwfile@wrtout\z@ - \begingroup - \let\@writefile\scrwfile@saved@writefile - \@for\@currext:=\scrwfile@writefilelist\do{% - \begingroup - \ifx\@currext\@empty\else - \scr@ifundefinedorrelax{tf@\@currext}{% - \immediate\openout\@partaux \jobname.\@currext - \expandafter\let\csname tf@\@currext\endcsname\@partaux - \@input@{\jobname.wrt}% - \immediate\closeout\@partaux - }{}% - \fi - \endgroup - }% - \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 - \@ifpackageloaded{hyperref}{% - \scr@ifundefinedorrelax{Hy@AtBeginDocument}{% - \PackageInfo{scrwfile}{% - Using immediate redefinition of `\string\@starttoc'% - }% - \aftergroup\@firstofone - }{% - \ifx\Hy@AtBeginDocumentHook\@undefined - \PackageInfo{scrwfile}{% - Using immediate redefinition of `\string\@starttoc'% - }% - \aftergroup\@firstofone - \else - \@ifpackagelater{hyperref}{2022/02/22}{% newer than v7.00n - \PackageInfo{scrwfile}{% - Using immediate redefinition of `\string\@starttoc'% - }% - \aftergroup\@firstofone - }{% - \PackageWarning{scrwfile}{% - Outdated package `hyperref' detected.\MessageBreak - Using `\string\Hy@AtBeginDocument' for redefinition of - `\string\@starttoc'.\MessageBreak - We recommend to update `hyperref' - }% - \aftergroup\Hy@AtBeginDocument - }% - \fi - }% - }{% - \PackageInfo{scrwfile}{% - Using immediate redefinition of `\string\@starttoc'% - }% - \aftergroup\@firstofone - }% - \endgroup - {% - \PackageInfo{scrwfile}{% - Extending `\string\@starttoc` - }% - \let\scrwfile@saved@starttoc\@starttoc - \let\@starttoc\scrwfile@starttoc - }% -} -\newcommand*{\scrwfile@process@clones}[1]{% - \scr@ifundefinedorrelax{scrwfile@clone@#1}{}{% - \begingroup - \let\@@protect\protect\let\protect\@empty\afterassignment\restore@protect - \edef\reserved@b{\csname scrwfile@clone@#1\endcsname}% - \edef\reserved@c{,#1}% - \@for \reserved@a:=\reserved@b\do {% - \@tempswatrue - \@for \reserved@d:=\reserved@c\do {% - \ifx\reserved@d\reserved@a\@tempswafalse\fi - }% - \if@tempswa - \immediate\write\scrwfile@wrtout{% - \string\@writefile{\reserved@a}{\the\@temptokena}% - }% - \edef\reserved@c{\reserved@c,\reserved@a}% - \fi - }% - \endgroup - }% -}% -\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 - }% - }{% - \edef\reserved@b{\csname scrwfile@clone@#2\endcsname}% - \expandafter\protected@edef\csname scrwfile@clone@#2\endcsname{% - \csname scrwfile@clone@#2\endcsname,% - #3,% - \protect\csname scrwfile@clone@#3\endcsname - }% - }% - \scr@ifundefinedorrelax{scrwfile@clone@#3}{% - \expandafter\let\csname scrwfile@clone@#3\endcsname\@empty - }{}% - \Ifattoclist{#3}{% - \PackageWarning{scrwfile}{`#3' already under control of - tocbasic.\MessageBreak - Nevertheless features will be set% - }% - }{% - \addtotoclist[TOCclone]{#3}% - }% - \setuptoc{#3}{nobabel}% - \Ifstr{#1}{}{% - }{% - \@namedef{listof#3name}{#1}% - \@namedef{listof#3}{\listoftoc{#3}}% - \Iftocfeature{#2}{leveldown}{\setuptoc{#3}{leveldown}}{}% - \Iftocfeature{#2}{numbered}{\setuptoc{#3}{numbered}}{}% - \Iftocfeature{#2}{onecolumn}{\setuptoc{#3}{leveldownonecolumn}}{}% - \Iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}% - }% -} -\@onlypreamble\TOCClone -%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ -\RequirePackage{scrlogo} -\endinput -%% -%% End of file `scrwfile.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 9173d32a472..113ed7ff3e5 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{setspace.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default @@ -90,9 +90,30 @@ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% }% }{% - \PackageWarning{scrhack}{unknown \string\onehalfspacing\space - definition found!\MessageBreak - Maybe you are using a unsupported setpace version}% + \scr@ifexpected{\onehalfspacing}{% + \long\def\onehalfspacing{% + \setstretch{1.25}% default + \ifx\@ptsize\@undefined\else + \ifcase \@ptsize \relax % 10pt + \setstretch {1.25}% + \or % 11pt + \setstretch {1.213}% + \or % 12pt + \setstretch {1.241}% + \fi + \fi + }% + }{% + \renewcommand*{\onehalfspacing}{% + \@tempdima=\dimexpr (\f@size pt)*1500/ + (\dimexpr \f@baselineskip\relax)*\p@/1000\relax + \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% + }% + }{% + \PackageWarning{scrhack}{unknown \string\onehalfspacing\space + definition found!\MessageBreak + Maybe you are using a unsupported setpace version}% + }% } \scr@ifexpected{\doublespacing}{% \long\def\doublespacing{% @@ -112,9 +133,30 @@ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% }% }{% - \PackageWarning{scrhack}{unknown \string\doublespacing\space - definition found!\MessageBreak - Maybe you are using a unsupported setpace version}% + \scr@ifexpected{\doublespacing}{% + \long\def\doublespacing{% + \setstretch {1.667}% default + \ifx\@ptsize\@undefined\else + \ifcase \@ptsize \relax % 10pt + \setstretch {1.667}% + \or % 11pt + \setstretch {1.618}% + \or % 12pt + \setstretch {1.655}% + \fi + \fi + }% + }{% + \renewcommand*{\doublespacing}{% + \@tempdima=\dimexpr (\f@size pt)*2000/ + (\dimexpr \f@baselineskip\relax)*\p@/1000\relax + \expandafter\setstretch\expandafter{\strip@pt\@tempdima}% + }% + }{% + \PackageWarning{scrhack}{unknown \string\doublespacing\space + definition found!\MessageBreak + Maybe you are using a unsupported setpace version}% + }% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak index 56575a760e9..f3c4392b6b2 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \ProvidesFile{standardsections.hak}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] -%%% From File: $Id: scrhack.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrhack.dtx 4015 2023-03-15 16:09:39Z kohm $ \PackageWarningNoLine{scrhack}{% You are loosing every kind of support because of\MessageBreak using the dangerous standard classes sections hack!\MessageBreak @@ -600,7 +600,7 @@ because of loading standard classes sections hack% }% \RelaxFamilyKey[.\KOMAClassFileName]{KOMA}{headings}% - \KOMA@kav@removekey{.\KOMAClassFileName}{headings}% + \KOMA@kav@removekey{\KOMAClassFileName}{headings}% } \def\scr@class@titlesec@warning{% \PackageWarning{scrhack}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 465ad431acb..69ae935341d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -57,18 +57,18 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (handling toc-files)% ] %%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: prepare) %%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: option) %%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $ %%% (run: body) @@ -1095,7 +1095,7 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% @@ -1666,7 +1666,8 @@ \aftergroup\@tempswatrue \def\do##1##2##3##4{% \scr@ifundefinedorrelax{##1#3##2}{% - \PackageError{tocbasic}{toc style `#2' needs ##4}{% + \PackageError{tocbasic}{toc style `#2' needs ##4\MessageBreak + of `#3'}{% Usually the ##4 is defined using option `##3'.\MessageBreak In some cases it may be set defining command `\expandafter\string\csname ##1#3##2\endcsname'.\MessageBreak @@ -1746,10 +1747,10 @@ \providecommand*\@pnumwidth{1.55em} \providecommand*\@tocrmarg {2.55em} \providecommand*\@dotsep {4.5} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1766,8 +1767,10 @@ \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% - \expandafter\let\csname #1tocdepth\expandafter\endcsname - \csname #1numdepth\endcsname + \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname #1numdepth\endcsname + }% }% }% }% @@ -1778,41 +1781,47 @@ }% }% }{}% + \@ifundefined{#1tocdepth}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname toclevel@#1\endcsname + }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% - \scr@ifundefinedorrelax{l@chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{3.8em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{7em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \scr@ifundefinedorrelax{l@chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{7em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{7.0em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{12em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{10em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{12em}% + }{% + }% }% }% }% @@ -1831,36 +1840,38 @@ \@ifundefined{scr@#1@tocnumwidth}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \scr@ifundefinedorrelax{chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@numwidth}{3.2em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@numwidth}{4.1em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \scr@ifundefinedorrelax{chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@numwidth}{5m}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{5m}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@numwidth}{3.1em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@numwidth}{5em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@numwidth}{6em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{5em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{6em}% + }{% + }% }% }% }% @@ -1883,7 +1894,7 @@ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1900,8 +1911,10 @@ \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% - \expandafter\let\csname #1tocdepth\expandafter\endcsname - \csname #1numdepth\endcsname + \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname #1numdepth\endcsname + }% }% }% }% @@ -1912,41 +1925,47 @@ }% }% }{}% + \@ifundefined{#1tocdepth}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname toclevel@#1\endcsname + }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% - \scr@ifundefinedorrelax{l@chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{3.8em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{7em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \scr@ifundefinedorrelax{l@chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{7em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{7.0em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{12em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{10em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{12em}% + }{% + }% }% }% }% @@ -1965,36 +1984,38 @@ \@ifundefined{scr@#1@tocnumwidth}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \scr@ifundefinedorrelax{chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@numwidth}{3.2em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@numwidth}{4.1em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \scr@ifundefinedorrelax{chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@numwidth}{5m}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{5m}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@numwidth}{3.1em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@numwidth}{5em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@numwidth}{6em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{5em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{6em}% + }{% + }% }% }% }% @@ -2043,7 +2064,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -2058,8 +2079,10 @@ \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% - \expandafter\let\csname #1tocdepth\expandafter\endcsname - \csname #1numdepth\endcsname + \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname #1numdepth\endcsname + }% }% }% }% @@ -2070,41 +2093,47 @@ }% }% }{}% + \@ifundefined{#1tocdepth}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname toclevel@#1\endcsname + }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% - \scr@ifundefinedorrelax{l@chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{3.8em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{7em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \scr@ifundefinedorrelax{l@chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{7em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{7.0em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{12em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{10em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{12em}% + }{% + }% }% }% }% @@ -2156,7 +2185,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2228,8 +2257,10 @@ \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% - \expandafter\let\csname #1tocdepth\expandafter\endcsname - \csname #1numdepth\endcsname + \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname #1numdepth\endcsname + }% }% }% }% @@ -2240,6 +2271,10 @@ }% }% }{}% + \@ifundefined{#1tocdepth}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname toclevel@#1\endcsname + }{}% \scr@ifundefinedorrelax{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% \Ifstrstart{#1}{sub}{% @@ -2298,37 +2333,39 @@ \@ifundefined{scr@tso@#1@indent}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% - \scr@ifundefinedorrelax{l@chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{3.8em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{7em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \scr@ifundefinedorrelax{l@chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{7em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{7.0em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{12em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{10em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{12em}% + }{% + }% }% }% }% @@ -2358,36 +2395,38 @@ \@ifundefined{scr@tso@#1@numwidth}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \scr@ifundefinedorrelax{chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@numwidth}{3.2em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@numwidth}{4.1em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \scr@ifundefinedorrelax{chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@numwidth}{5m}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{5m}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@numwidth}{3.1em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@numwidth}{5em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@numwidth}{6em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@numwidth}{5em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@numwidth}{6em}% + }{% + }% }% }% }% @@ -2687,7 +2726,7 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style,toctext) \DeclareTOCEntryStyle{toctext}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2737,8 +2776,10 @@ \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% - \expandafter\let\csname #1tocdepth\expandafter\endcsname - \csname #1numdepth\endcsname + \Ifstr{#1}{lstlisting}{\@namedef{#1tocdepth}{1}}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname #1numdepth\endcsname + }% }% }% }% @@ -2749,6 +2790,10 @@ }% }% }{}% + \@ifundefined{#1tocdepth}{% + \expandafter\let\csname #1tocdepth\expandafter\endcsname + \csname toclevel@#1\endcsname + }{}% \scr@ifundefinedorrelax{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% \Ifstrstart{#1}{sub}{% @@ -2794,37 +2839,39 @@ \@ifundefined{scr@tso@#1@indent}{% \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% - \scr@ifundefinedorrelax{l@chapter}{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{3.8em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{7em}% + \Ifstr{#1}{lstlisting}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \scr@ifundefinedorrelax{l@chapter}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{7em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{10em}% + }{% + }% }% }% }% }% - }% - }{% - \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \Ifstr{#1}{subsubsection}{% - \@namedef{scr@tso@#1@indent}{7.0em}% - }{% - \Ifstr{#1}{paragraph}{% - \@namedef{scr@tso@#1@indent}{10em}% + }{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% + \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \Ifstr{#1}{subparagraph}{% - \@namedef{scr@tso@#1@indent}{12em}% + \Ifstr{#1}{paragraph}{% + \@namedef{scr@tso@#1@indent}{10em}% }{% + \Ifstr{#1}{subparagraph}{% + \@namedef{scr@tso@#1@indent}{12em}% + }{% + }% }% }% }% @@ -2931,7 +2978,7 @@ \newcommand*{\scr@dte@toctext@raggedright}{} \newcommand*{\scr@dte@toctext@parend}{} \newcommand*{\scr@dte@toctext@lastend}{} -%%% From File: $Id: scrkernel-tocstyle.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3972 2022-10-24 08:08:05Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} %%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index e145a547db5..1237fa2f357 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2022/10/12 v3.38 KOMA-Script + 2023/04/17 v3.39 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3913 2022-06-28 07:45:49Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4004 2022-11-16 10:43:42Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -173,13 +173,14 @@ \@namedef{scr@v@3.36}{20} \@namedef{scr@v@3.37}{20} \@namedef{scr@v@3.38}{20} +\@namedef{scr@v@3.39}{20} \@namedef{scr@v@last}{20} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z 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 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -192,7 +193,7 @@ Because of this, version was set to `first'% }% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% + \KOMA@kav@replacevalue{% typearea.\scr@pkgextension }{version}{first}% }{% @@ -203,7 +204,7 @@ }% \edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% + \KOMA@kav@xreplacevalue{% typearea.\scr@pkgextension }{version}{#1}% \ifnum\scr@compatibility<\scr@v@last @@ -252,7 +253,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \Ifstr{#2}{letter}{% @@ -344,18 +345,14 @@ }% } \ProvideUnknownPaperSizeError{warning}{% - \PackageWarning{% - typearea% - }{% + \PackageWarning{typearea}{% \string\paperwidth\space and \string\paperheight\space stay unchanged, because\MessageBreak of unknown paper size #1% }% } \ProvideUnknownPaperSizeError{info}{% - \PackageInfo{% - typearea - }{% + \PackageInfo{typearea}{% \string\paperwidth\space and \string\paperheight\space stay unchanged, because\MessageBreak of unknown paper size #1% @@ -380,10 +377,10 @@ \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi \fi \FamilyKeyStateProcessed - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}% - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}% - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@add{typearea.\scr@pkgextension}{paper}{seascape}% }{% \Ifstr{#1}{landscape}{% \@seascapefalse @@ -394,10 +391,10 @@ \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi \fi \FamilyKeyStateProcessed - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}% - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}% - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@add{typearea.\scr@pkgextension}{paper}{landscape}% }{% \Ifstr{#1}{portrait}{% \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax @@ -407,10 +404,10 @@ \if@landscape\scr@switchpapersizes\@landscapefalse\fi \fi \FamilyKeyStateProcessed - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}% - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}% - \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@add{typearea.\scr@pkgextension}{paper}{portrait}% }{% \Ifstr{#1}{letter}{% \if@landscape @@ -421,9 +418,9 @@ \setlength\paperwidth {8.5in}% \fi \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{paper}% + \KOMA@kav@add{typearea.\scr@pkgextension}{paper}{letter}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{% \if@seascape seascape\else \if@landscape landscape\else portrait\fi\fi }% @@ -437,9 +434,9 @@ \setlength\paperwidth {8.5in}% \fi \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{paper}% + \KOMA@kav@add{typearea.\scr@pkgextension}{paper}{legal}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{% \if@seascape seascape\else \if@landscape landscape\else portrait\fi\fi }% @@ -453,9 +450,9 @@ \setlength\paperwidth {7.25in}% \fi \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{paper}% + \KOMA@kav@add{typearea.\scr@pkgextension}{paper}{executive}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{% \if@seascape seascape\else \if@landscape landscape\else portrait\fi\fi }% @@ -463,9 +460,9 @@ \iso@paper{#1}% \if@tempswa \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{paper}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{#1}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{% \if@seascape seascape\else \if@landscape landscape\else portrait\fi\fi }% @@ -473,7 +470,7 @@ \expandafter\maybe@pair#1::\@nil \if@tempswa \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{paper}% \expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax \PackageWarningNoLine{typearea}{% You may have to exchange height and width!\MessageBreak @@ -490,16 +487,16 @@ \fi \expandafter\ifnum \scr@ta@v@is@lt{3.22}\relax \if@landscape - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}% \else - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}% \fi \else \scr@setpaperorientation - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{% \the\paperwidth:\the\paperheight}% \fi - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{paper}{% \if@seascape seascape\else \if@landscape landscape\else portrait\fi\fi }% @@ -565,13 +562,13 @@ \else \edef\@pagesizelast{false}% \fi - \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}% + \KOMA@kav@xreplacevalue{typearea.\scr@pkgextension}% {pagesize}{\@pagesizelast}% \fi } \newcommand\@pagesizelast{auto} \AtBeginDocument{% - \KOMAExecuteOptions[.typearea.\scr@pkgextension]{pagesize=\@pagesizelast}% + \KOMAExecuteOptions[typearea.\scr@pkgextension]{pagesize=\@pagesizelast}% \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax \renewcommand*{\set@dvipspagesize}{% \begingroup @@ -736,9 +733,9 @@ }{#1}% }% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - typearea.\scr@pkgextension - }{twoside}{#1}% + \KOMA@kav@xreplacevalue + {typearea.\scr@pkgextension}% + {twoside}{#1}% \if@twoside \if@semitwoside \@mparswitchfalse @@ -751,7 +748,7 @@ \csname recalctypearea\endcsname \fi } -\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twoside}{% +\KOMA@kav@xadd{typearea.\scr@pkgextension}{twoside}{% \if@twoside true\else false\fi } \KOMA@DeclareStandardOption% @@ -761,13 +758,13 @@ \if@atdocument\clearpage\fi \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - typearea.\scr@pkgextension - }{twocolumn}{@twocolumn}% + \KOMA@kav@replacebool + {typearea.\scr@pkgextension}% + {twocolumn}{@twocolumn}% \csname recalctypearea\endcsname \fi } -\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twocolumn}{% +\KOMA@kav@xadd{typearea.\scr@pkgextension}{twocolumn}{% \if@twocolumn true\else false\fi } \KOMA@DeclareStandardOption% @@ -779,8 +776,8 @@ \endgroup \def\ta@hh{#1\baselineskip}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headlines}{#1}% - \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1\baselineskip}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{headlines}{#1}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{headheight}{#1\baselineskip}% } \KOMA@key{footlines}{% \begingroup @@ -788,8 +785,8 @@ \endgroup \def\ta@fh{#1\baselineskip}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footlines}{#1}% - \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1\baselineskip}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{footlines}{#1}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{footheight}{#1\baselineskip}% } \KOMA@key{headheight}{% \begingroup @@ -797,8 +794,8 @@ \endgroup \def\ta@hh{#1}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1}% - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{headlines}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{headheight}{#1}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{headlines}% } \KOMA@key{footheight}{% \begingroup @@ -806,8 +803,8 @@ \endgroup \def\ta@fh{#1}% \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1}% - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{footlines}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{footheight}{#1}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{footlines}% } \newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl} \KOMA@ifkey{headinclude}{@hincl} @@ -815,7 +812,7 @@ \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headinclude}{@hincl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{headinclude}{@hincl}% + \KOMA@kav@replacebool{typearea.\scr@pkgextension}{headinclude}{@hincl}% \fi } \newif\if@fincl\@ifundefined{if@fsl}{}{\let\if@fincl\if@fsl} @@ -824,7 +821,7 @@ \KOMA@key{footsepline}[true]{% \KOMA@set@ifkey{footinclude}{@fincl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@fincl}% + \KOMA@kav@replacebool{typearea.\scr@pkgextension}{footinclude}{@fincl}% \fi } \KOMA@ifkey{mpinclude}{@mincl} @@ -836,13 +833,13 @@ \setlength{\ta@bcor}{#1}% }% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}% + \KOMA@kav@xreplacevalue{typearea.\scr@pkgextension}{BCOR}{#1}% } \AtEndOfPackage{% \KOMA@key{BCOR}{% \typearea[{#1}]{last} \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}% + \KOMA@kav@xreplacevalue{typearea.\scr@pkgextension}{BCOR}{#1}% }% } \def\movet@reserved@a@to@nnil#1\@nnil{\def\reserved@a{#1}}% @@ -872,16 +869,41 @@ \FamilyKeyStateUnknownValue \else \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{\@tempa}% + \KOMA@kav@xreplacevalue{typearea.\scr@pkgextension}{DIV}{\@tempa}% \fi } \AtEndOfPackage{% \KOMA@key{DIV}{% \typearea[current]{#1}% \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#1}% + \KOMA@kav@xreplacevalue{typearea.\scr@pkgextension}{DIV}{#1}% }% } +\newcommand*{\ta@warnlimit}{\numexpr 15\relax} +\newcommand*{\ta@infolimit}{\numexpr 15\relax} +\KOMA@key{typeareawarnlimit}{% + \FamilySetCounterMacro{KOMA}{typeareawarnlimit}{\ta@warnlimit}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@removekey{typearea.\scr@pkgextension}{typeareawarninfolimit}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{typeareawarnlimit}{#1}% + \fi +} +\KOMA@key{typeareainfolimit}{% + \FamilySetCounterMacro{KOMA}{typeareainfolimit}{\ta@infolimit}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@removekey{typearea.\scr@pkgextension}{typeareawarninfolimit}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{typeareainfolimit}{#1}% + \fi +} +\KOMA@key{typeareawarninfolimit}{% + \FamilySetCounterMacro{KOMA}{typeareawarninfolimit}{\ta@warnlimit}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \let\ta@infolimit\ta@warnlimit + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{typeareawarninfolimit}{#1}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{typeareawarnlimit}{#1}% + \KOMA@kav@replacevalue{typearea.\scr@pkgextension}{typeareainfolimit}{#1}% + \fi +} \KOMA@ifkey{areasetadvanced}{@areasetadvanced} \KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc} \KOMA@DeclareDeprecatedOption[typearea]{DIVclassic}{DIV=classic} @@ -940,7 +962,9 @@ \Ifdimen{#2}{% \KOMA@UseDeprecatedOption{% \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}% - }{\scr@pti@nerr@r}% + }{% + \scr@pti@nerr@r + }% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -952,7 +976,9 @@ \Ifnumber{#2}{% \KOMA@UseDeprecatedOption{% \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}% - }{\scr@pti@nerr@r}% + }{% + \scr@pti@nerr@r + }% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -1017,9 +1043,9 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3985 2022-11-11 11:24:31Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: body) \newcommand*{\ta@divfor}[1]{% \ta@div=\z@ @@ -1460,23 +1486,26 @@ \else \advance\@tempcnta by-4 \fi - \ifnum\@tempcnta <-15 - \@tempcnta=-\@tempcnta - \PackageWarningNoLine{typearea}{% - Bad type area settings!\MessageBreak - The detected line width is about - \the\@tempcnta\@percentchar\MessageBreak - larger than the heuristically estimated maximum\MessageBreak - limit of typographical good line width.\MessageBreak - You should e.g. - \ifnum\ta@div >6 decrease DIV, \fi - \ifdim\f@size\p@<\@xiipt\p@ increase fontsize\else - (increase fontsize)\fi\MessageBreak - or change papersize% - }% - \@tempcnta=-\@tempcnta - \else - \ifnum\@tempcnta>15 + \ifnum \ta@warnlimit<\z@\else + \ifnum\@tempcnta <-\numexpr \ta@warnlimit\relax + \@tempcnta=-\@tempcnta + \PackageWarningNoLine{typearea}{% + Bad type area settings!\MessageBreak + The detected line width is about + \the\@tempcnta\@percentchar\MessageBreak + larger than the heuristically estimated maximum\MessageBreak + limit of typographical good line width.\MessageBreak + You should e.g. + \ifnum\ta@div >6 decrease DIV, \fi + \ifdim\f@size\p@<\@xiipt\p@ increase fontsize\else + (increase fontsize)\fi\MessageBreak + or change papersize% + }% + \@tempcnta=-\@tempcnta + \fi + \fi + \ifnum \ta@infolimit<\z@\else + \ifnum\@tempcnta>\numexpr \ta@infolimit\relax \PackageInfoNoLine{typearea}{% Maybe no optimal type area settings!\MessageBreak The detected line width is about @@ -1487,7 +1516,8 @@ \ifdim\f@size\p@>\@xpt\p@, decrease fontsize\fi\MessageBreak or change the papersize% }% - \fi\fi + \fi + \fi \ifnum\ta@div <6 \PackageWarningNoLine{typearea}{% Very low DIV value!\MessageBreak @@ -1498,10 +1528,10 @@ } \fi \ta@layoutinfo{\number\ta@div}{\the\@tempcnta}% - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{DIV}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{DIV}{\@lastdiv}% - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{BCOR}% - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{DIV}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{DIV}{\@lastdiv}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{BCOR}% + \KOMA@kav@xadd{typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}% \@typearea@end \activateareas \ifdim \dimexpr 1in+\topmargin @@ -1637,10 +1667,10 @@ \setlength{\textwidth}{#2}% \setlength{\textheight}{#3}% \def\@lastdiv{areaset}% - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{DIV}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{DIV}{areaset}% - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{BCOR}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{DIV}% + \KOMA@kav@add{typearea.\scr@pkgextension}{DIV}{areaset}% + \KOMA@kav@removekey{typearea.\scr@pkgextension}{BCOR}% + \KOMA@kav@add{typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}% \ta@hblk=\paperwidth \advance\ta@hblk by-\ta@bcor \advance\ta@hblk by-\textwidth @@ -1762,7 +1792,7 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% From File: $Id: scrkernel-typearea.dtx 3889 2022-06-09 12:11:14Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 4014 2023-02-10 10:25:25Z kohm $ %%% (run: final) \typearea[current]{current} %%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 9e57275e1be..fc164a41ffd 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 3962 2022-10-12 06:33:06Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 4028 2023-04-17 07:36:28Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}% + \@CheckKOMAScriptVersion{2023/04/17 v3.39 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: head) \ProvidesFile{% visualize% @@ -80,7 +80,7 @@ Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3874 2022-06-05 10:38:02Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3981 2022-11-09 10:07:16Z kohm $ %%% (run: body) \RequirePackage{eso-pic} \newcommand*{\showfields}[1]{% @@ -577,7 +577,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 3895 2022-06-20 10:37:02Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 4021 2023-04-04 11:29:59Z kohm $ %%% (run: body) \endinput %% |