From 52752914d310303b349c70869c5ae25c6d3436de Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 May 2022 20:39:25 +0000 Subject: koma-script (7may22) git-svn-id: svn://tug.org/texlive/trunk@63250 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 78 +-- .../texmf-dist/tex/latex/koma-script/DIN5008A.lco | 52 +- .../texmf-dist/tex/latex/koma-script/DIN5008B.lco | 50 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 78 +-- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 68 +-- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 76 +-- Master/texmf-dist/tex/latex/koma-script/NF.lco | 60 +-- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 76 +-- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 76 +-- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 76 +-- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 76 +-- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 76 +-- Master/texmf-dist/tex/latex/koma-script/SN.lco | 78 +-- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 78 +-- .../tex/latex/koma-script/UScommercial9.lco | 78 +-- .../tex/latex/koma-script/UScommercial9DW.lco | 76 +-- Master/texmf-dist/tex/latex/koma-script/float.hak | 10 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../latex/koma-script/koma-script-source-doc.cls | 290 +++++++++++ .../texmf-dist/tex/latex/koma-script/listings.hak | 10 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 10 +- .../texmf-dist/tex/latex/koma-script/nomencl.hak | 10 +- .../texmf-dist/tex/latex/koma-script/scraddr.sty | 10 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 454 ++++++++--------- .../tex/latex/koma-script/scrarticle.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 87 ++-- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 565 +++++++++++---------- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 20 +- Master/texmf-dist/tex/latex/koma-script/scrdoc.cls | 71 ++- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 168 ++---- .../tex/latex/koma-script/scrfontsizes.sty | 18 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 20 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 43 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 22 +- .../tex/latex/koma-script/scrlayer-notecolumn.sty | 57 +-- .../tex/latex/koma-script/scrlayer-scrpage.sty | 64 +-- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 56 +- .../texmf-dist/tex/latex/koma-script/scrletter.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 324 ++++++------ .../tex/latex/koma-script/scrlfile-hook-3.34.sty | 6 +- .../tex/latex/koma-script/scrlfile-hook.sty | 6 +- .../latex/koma-script/scrlfile-patcholdlatex.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 6 +- .../texmf-dist/tex/latex/koma-script/scrlogo.sty | 18 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 536 +++++++++---------- .../texmf-dist/tex/latex/koma-script/scrreport.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 559 ++++++++++---------- .../tex/latex/koma-script/scrsize10pt.clo | 10 +- .../tex/latex/koma-script/scrsize11pt.clo | 10 +- .../tex/latex/koma-script/scrsize12pt.clo | 10 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 20 +- .../texmf-dist/tex/latex/koma-script/scrwfile.sty | 29 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../tex/latex/koma-script/standardsections.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 55 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 33 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 48 +- 58 files changed, 2575 insertions(+), 2296 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/koma-script/koma-script-source-doc.cls (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index d79b7bdf186..4fa6783cacc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% DIN% @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% DIN% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,57 +97,57 @@ }{a4} \setkomavar*{fromzipcode}{% D} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 105mm} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 210mm} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 45mm} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% 20mm} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 85mm} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 45mm} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% 5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% 8mm} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 98.5mm} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco index d5e00b8166d..5054ed9d2bb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,42 +73,42 @@ \LoadLetterOption{% DINmtext% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% 5mm} -\@setplength{locvpos}{% +\setplength{specialmailindent}{\useplength{toaddrindent}} +\setplength{specialmailrightindent}{\z@} +\setplength{locvpos}{% \dimexpr\useplength{toaddrvpos}+\useplength{backaddrheight}} -\@setplength{specialmailindent}{\useplength{toaddrindent}} -\@setplength{specialmailrightindent}{\z@} -\@setplength{locwidth}{% +\setplength{locwidth}{% 75mm} -\@setplength{lochpos}{10mm} -\@setplength{firstheadhpos}{% +\setplength{lochpos}{10mm} +\setplength{firstheadhpos}{% \dimexpr \useplength{toaddrhpos}+\useplength{toaddrindent}} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \dimexpr 125mm-\useplength{firstheadhpos}} -\@setplength{firstfoothpos}{% +\setplength{firstfoothpos}{% \dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}% -\@setplength{firstfootwidth}{% +\setplength{firstfootwidth}{% \dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}% \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 79.4mm} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% 8.46mm} -\@newplength{specialmailheight} -\@setplength{specialmailheight}{12.7mm} +\newplength{specialmailheight} +\setplength{specialmailheight}{12.7mm} \areaset[5mm]{165mm}{233mm} \KOMAoptions{% fromalign=locationleft, diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco index 8a732b2443c..19b68c2fb45 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,40 +73,40 @@ \LoadLetterOption{% DIN% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% 5mm} -\@setplength{locvpos}{% +\setplength{specialmailindent}{\useplength{toaddrindent}} +\setplength{specialmailrightindent}{\z@} +\setplength{locvpos}{% \dimexpr\useplength{toaddrvpos}+\useplength{backaddrheight}} -\@setplength{specialmailindent}{\useplength{toaddrindent}} -\@setplength{specialmailrightindent}{\z@} -\@setplength{locwidth}{% +\setplength{locwidth}{% 75mm} -\@setplength{lochpos}{10mm} -\@setplength{firstheadhpos}{% +\setplength{lochpos}{10mm} +\setplength{firstheadhpos}{% \dimexpr \useplength{toaddrhpos}+\useplength{toaddrindent}} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \dimexpr 125mm-\useplength{firstheadhpos}} -\@setplength{firstfoothpos}{% +\setplength{firstfoothpos}{% \dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}% -\@setplength{firstfootwidth}{% +\setplength{firstfootwidth}{% \dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}% \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% 8.46mm} -\@newplength{specialmailheight} -\@setplength{specialmailheight}{12.7mm} +\newplength{specialmailheight} +\setplength{specialmailheight}{12.7mm} \areaset[5mm]{165mm}{233mm} \KOMAoptions{% fromalign=locationleft, diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 032fc7a82c9..a7d7ae4cd2f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% DINmtext% @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% DINmtext% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,57 +97,57 @@ }{a4} \setkomavar*{fromzipcode}{% D} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 87mm} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 192mm} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 27mm} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% 20mm} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 85mm} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 45mm} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% 5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% 8mm} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 80.5mm} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 20e4193c475..7a752f68e9c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% KOMAold% @@ -75,18 +75,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% KOMAold% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -96,44 +96,44 @@ \LetterOptionNeedsPapersize{% KOMAold% }{a4} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 103.5mm} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 202.5mm} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 49mm} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% 1in} -\@addtoplength{toaddrhpos}{\oddsidemargin} -\@setplength{toaddrwidth}{% +\addtoplength{toaddrhpos}{\oddsidemargin} +\setplength{toaddrwidth}{% 70mm} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 45mm} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% 5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% 6mm} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \textwidth} -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-2cm} -\@setplength{refvpos}{% +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-2cm} +\setplength{refvpos}{% 89.5mm} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% 2\baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\raggedright \def\yourref{\setkomavar{yourref}} \def\yourmail{\setkomavar{yourmail}} @@ -218,9 +218,9 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3742 2022-03-04 16:21:17Z kohm $ %%% (run: body) -\def\setpresigskip{\@setplength{sigbeforevskip}} +\def\setpresigskip{\setplength{sigbeforevskip}} \endinput %% %% End of file `KOMAold.lco'. diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 798f604bc59..8ea2fe7168d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head') %% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2007-2021 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Kaku,LATE,LOW,head) \ProvidesFile{% Kaku% L% L% -}[\KOMAScriptVersion\space Japanese letter-class-option] +}[% + 2022/05/01 v3.36 KOMA-Script +Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% } @@ -81,7 +83,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Kaku,LATE,LOW,body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -102,40 +104,40 @@ L% }{a4} \setkomavar*{fromzipcode}{J} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{83mm} -\@setplength{tfoldmarklength}{4mm} -\@setplength{mfoldmarkvpos}{116mm} -\@setplength{mfoldmarklength}{2mm} -\@setplength{bfoldmarkvpos}{232mm} -\@setplength{bfoldmarklength}{2mm} -\@setplength{foldmarkvpos}{3.5mm} -\@setplength{lfoldmarkhpos}{202mm} -\@setplength{refvpos}{69mm} -\@setplength{refaftervskip}{\baselineskip} -\@setplength{toaddrhpos}{25mm} -\@setplength{toaddrwidth}{90mm} -\@setplength{toaddrvpos}{24mm} -\@setplength{toaddrheight}{40mm} -\@setplength{toaddrindent}{\z@} -\@setplength{backaddrheight}{5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{\z@} -\@setplength{locheight}{45mm}% -\@setplength{firstheadvpos}{8mm} -\@setplength{firstheadwidth}{\paperwidth} +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{83mm} +\setplength{tfoldmarklength}{4mm} +\setplength{mfoldmarkvpos}{116mm} +\setplength{mfoldmarklength}{2mm} +\setplength{bfoldmarkvpos}{232mm} +\setplength{bfoldmarklength}{2mm} +\setplength{foldmarkvpos}{3.5mm} +\setplength{lfoldmarkhpos}{202mm} +\setplength{toaddrhpos}{25mm} +\setplength{toaddrwidth}{90mm} +\setplength{toaddrvpos}{24mm} +\setplength{toaddrheight}{40mm} +\setplength{toaddrindent}{\z@} +\setplength{backaddrheight}{5mm} +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{\z@} +\setplength{locheight}{45mm}% +\setplength{refvpos}{69mm} +\setplength{refaftervskip}{\baselineskip} +\setplength{refwidth}{\z@} +\setplength{firstheadvpos}{8mm} +\setplength{firstheadwidth}{\paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-16mm} -\@setplength{refwidth}{\z@} -\@setplength{sigindent}{\z@} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\setplength{sigindent}{\z@} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \ifcase\@alignfrom \KOMAoptions{fromalign=locationright}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index 551a4274d88..acd08e1fa25 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% NF% @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% NF% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,42 +97,42 @@ }{a4} \setkomavar*{fromzipcode}{% F} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 99mm} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 198mm} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 35mm} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% -10mm} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 100mm} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 45mm} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% 10mm} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% 5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% 15mm} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% 170mm} -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{266.679mm} -\@setplength{refvpos}{% +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{266.679mm} +\setplength{refvpos}{% \useplength{tfoldmarkvpos}} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\raggedright \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 1fbc540262a..8cc1586cc9b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head') %% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2007-2021 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,EARLY,HIGH,head) \ProvidesFile{% Nippon% E% H% -}[\KOMAScriptVersion\space Japanese letter-class-option] +}[% + 2022/05/01 v3.36 KOMA-Script +Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% } @@ -81,7 +83,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,EARLY,HIGH,body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -102,40 +104,40 @@ H% }{a4} \setkomavar*{fromzipcode}{J} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{83mm} -\@setplength{tfoldmarklength}{4mm} -\@setplength{mfoldmarkvpos}{116mm} -\@setplength{mfoldmarklength}{2mm} -\@setplength{bfoldmarkvpos}{232mm} -\@setplength{bfoldmarklength}{2mm} -\@setplength{foldmarkvpos}{3.5mm} -\@setplength{lfoldmarkhpos}{202mm} -\@setplength{refvpos}{69mm} -\@setplength{refaftervskip}{\baselineskip} -\@setplength{toaddrhpos}{22mm} -\@setplength{toaddrwidth}{90mm} -\@setplength{toaddrvpos}{12mm} -\@setplength{toaddrheight}{50mm} -\@setplength{toaddrindent}{\z@} -\@setplength{backaddrheight}{5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{\z@} -\@setplength{locheight}{55mm}% -\@setplength{firstheadvpos}{8mm} -\@setplength{firstheadwidth}{\paperwidth} +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{83mm} +\setplength{tfoldmarklength}{4mm} +\setplength{mfoldmarkvpos}{116mm} +\setplength{mfoldmarklength}{2mm} +\setplength{bfoldmarkvpos}{232mm} +\setplength{bfoldmarklength}{2mm} +\setplength{foldmarkvpos}{3.5mm} +\setplength{lfoldmarkhpos}{202mm} +\setplength{toaddrhpos}{22mm} +\setplength{toaddrwidth}{90mm} +\setplength{toaddrvpos}{12mm} +\setplength{toaddrheight}{50mm} +\setplength{toaddrindent}{\z@} +\setplength{backaddrheight}{5mm} +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{\z@} +\setplength{locheight}{55mm}% +\setplength{refvpos}{69mm} +\setplength{refaftervskip}{\baselineskip} +\setplength{refwidth}{\z@} +\setplength{firstheadvpos}{8mm} +\setplength{firstheadwidth}{\paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-16mm} -\@setplength{refwidth}{\z@} -\@setplength{sigindent}{\z@} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\setplength{sigindent}{\z@} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \ifcase\@alignfrom \KOMAoptions{fromalign=locationright}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 8f599f4c47d..02796e7c327 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head') %% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2007-2021 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,EARLY,LOW,head) \ProvidesFile{% Nippon% E% L% -}[\KOMAScriptVersion\space Japanese letter-class-option] +}[% + 2022/05/01 v3.36 KOMA-Script +Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% } @@ -81,7 +83,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,EARLY,LOW,body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -102,40 +104,40 @@ L% }{a4} \setkomavar*{fromzipcode}{J} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{83mm} -\@setplength{tfoldmarklength}{4mm} -\@setplength{mfoldmarkvpos}{116mm} -\@setplength{mfoldmarklength}{2mm} -\@setplength{bfoldmarkvpos}{232mm} -\@setplength{bfoldmarklength}{2mm} -\@setplength{foldmarkvpos}{3.5mm} -\@setplength{lfoldmarkhpos}{202mm} -\@setplength{refvpos}{69mm} -\@setplength{refaftervskip}{\baselineskip} -\@setplength{toaddrhpos}{22mm} -\@setplength{toaddrwidth}{90mm} -\@setplength{toaddrvpos}{12mm} -\@setplength{toaddrheight}{40mm} -\@setplength{toaddrindent}{\z@} -\@setplength{backaddrheight}{5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{\z@} -\@setplength{locheight}{55mm}% -\@setplength{firstheadvpos}{8mm} -\@setplength{firstheadwidth}{\paperwidth} +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{83mm} +\setplength{tfoldmarklength}{4mm} +\setplength{mfoldmarkvpos}{116mm} +\setplength{mfoldmarklength}{2mm} +\setplength{bfoldmarkvpos}{232mm} +\setplength{bfoldmarklength}{2mm} +\setplength{foldmarkvpos}{3.5mm} +\setplength{lfoldmarkhpos}{202mm} +\setplength{toaddrhpos}{22mm} +\setplength{toaddrwidth}{90mm} +\setplength{toaddrvpos}{12mm} +\setplength{toaddrheight}{40mm} +\setplength{toaddrindent}{\z@} +\setplength{backaddrheight}{5mm} +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{\z@} +\setplength{locheight}{55mm}% +\setplength{refvpos}{69mm} +\setplength{refaftervskip}{\baselineskip} +\setplength{refwidth}{\z@} +\setplength{firstheadvpos}{8mm} +\setplength{firstheadwidth}{\paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-16mm} -\@setplength{refwidth}{\z@} -\@setplength{sigindent}{\z@} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\setplength{sigindent}{\z@} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \ifcase\@alignfrom \KOMAoptions{fromalign=locationright}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index c9a86dda990..4ef52ecb1ef 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head') %% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2007-2021 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,LATE,HIGH,head) \ProvidesFile{% Nippon% L% H% -}[\KOMAScriptVersion\space Japanese letter-class-option] +}[% + 2022/05/01 v3.36 KOMA-Script +Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% } @@ -81,7 +83,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,LATE,HIGH,body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -102,40 +104,40 @@ H% }{a4} \setkomavar*{fromzipcode}{J} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{83mm} -\@setplength{tfoldmarklength}{4mm} -\@setplength{mfoldmarkvpos}{116mm} -\@setplength{mfoldmarklength}{2mm} -\@setplength{bfoldmarkvpos}{232mm} -\@setplength{bfoldmarklength}{2mm} -\@setplength{foldmarkvpos}{3.5mm} -\@setplength{lfoldmarkhpos}{202mm} -\@setplength{refvpos}{69mm} -\@setplength{refaftervskip}{\baselineskip} -\@setplength{toaddrhpos}{25mm} -\@setplength{toaddrwidth}{90mm} -\@setplength{toaddrvpos}{12mm} -\@setplength{toaddrheight}{50mm} -\@setplength{toaddrindent}{\z@} -\@setplength{backaddrheight}{5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{\z@} -\@setplength{locheight}{55mm}% -\@setplength{firstheadvpos}{8mm} -\@setplength{firstheadwidth}{\paperwidth} +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{83mm} +\setplength{tfoldmarklength}{4mm} +\setplength{mfoldmarkvpos}{116mm} +\setplength{mfoldmarklength}{2mm} +\setplength{bfoldmarkvpos}{232mm} +\setplength{bfoldmarklength}{2mm} +\setplength{foldmarkvpos}{3.5mm} +\setplength{lfoldmarkhpos}{202mm} +\setplength{toaddrhpos}{25mm} +\setplength{toaddrwidth}{90mm} +\setplength{toaddrvpos}{12mm} +\setplength{toaddrheight}{50mm} +\setplength{toaddrindent}{\z@} +\setplength{backaddrheight}{5mm} +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{\z@} +\setplength{locheight}{55mm}% +\setplength{refvpos}{69mm} +\setplength{refaftervskip}{\baselineskip} +\setplength{refwidth}{\z@} +\setplength{firstheadvpos}{8mm} +\setplength{firstheadwidth}{\paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-16mm} -\@setplength{refwidth}{\z@} -\@setplength{sigindent}{\z@} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\setplength{sigindent}{\z@} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \ifcase\@alignfrom \KOMAoptions{fromalign=locationright}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index e0eb10bd4fc..0ba7eea13dd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head') %% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2007-2021 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,LATE,LOW,head) \ProvidesFile{% Nippon% L% L% -}[\KOMAScriptVersion\space Japanese letter-class-option] +}[% + 2022/05/01 v3.36 KOMA-Script +Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% } @@ -81,7 +83,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,LATE,LOW,body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -102,40 +104,40 @@ L% }{a4} \setkomavar*{fromzipcode}{J} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{83mm} -\@setplength{tfoldmarklength}{4mm} -\@setplength{mfoldmarkvpos}{116mm} -\@setplength{mfoldmarklength}{2mm} -\@setplength{bfoldmarkvpos}{232mm} -\@setplength{bfoldmarklength}{2mm} -\@setplength{foldmarkvpos}{3.5mm} -\@setplength{lfoldmarkhpos}{202mm} -\@setplength{refvpos}{69mm} -\@setplength{refaftervskip}{\baselineskip} -\@setplength{toaddrhpos}{25mm} -\@setplength{toaddrwidth}{90mm} -\@setplength{toaddrvpos}{12mm} -\@setplength{toaddrheight}{40mm} -\@setplength{toaddrindent}{\z@} -\@setplength{backaddrheight}{5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{\z@} -\@setplength{locheight}{55mm}% -\@setplength{firstheadvpos}{8mm} -\@setplength{firstheadwidth}{\paperwidth} +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{83mm} +\setplength{tfoldmarklength}{4mm} +\setplength{mfoldmarkvpos}{116mm} +\setplength{mfoldmarklength}{2mm} +\setplength{bfoldmarkvpos}{232mm} +\setplength{bfoldmarklength}{2mm} +\setplength{foldmarkvpos}{3.5mm} +\setplength{lfoldmarkhpos}{202mm} +\setplength{toaddrhpos}{25mm} +\setplength{toaddrwidth}{90mm} +\setplength{toaddrvpos}{12mm} +\setplength{toaddrheight}{40mm} +\setplength{toaddrindent}{\z@} +\setplength{backaddrheight}{5mm} +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{\z@} +\setplength{locheight}{55mm}% +\setplength{refvpos}{69mm} +\setplength{refaftervskip}{\baselineskip} +\setplength{refwidth}{\z@} +\setplength{firstheadvpos}{8mm} +\setplength{firstheadwidth}{\paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-16mm} -\@setplength{refwidth}{\z@} -\@setplength{sigindent}{\z@} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\setplength{sigindent}{\z@} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \ifcase\@alignfrom \KOMAoptions{fromalign=locationright}% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index 76a864cd23b..edbaa2e1220 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -8,7 +8,7 @@ %% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head') %% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body') %% -%% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] +%% Copyright (c) 2007-2021 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,RIGHT,LOW,head) \ProvidesFile{% Nippon% R% L% -}[\KOMAScriptVersion\space Japanese letter-class-option] +}[% + 2022/05/01 v3.36 KOMA-Script +Japanese letter-class-option] \providecommand*\LCOWarningNoLine[2]{% \LCOWarning{#1}{#2\@gobble}% } @@ -81,7 +83,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: japanlco.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% (run: Ni,RIGHT,LOW,body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -102,40 +104,40 @@ L% }{a4} \setkomavar*{fromzipcode}{J} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{83mm} -\@setplength{tfoldmarklength}{4mm} -\@setplength{mfoldmarkvpos}{116mm} -\@setplength{mfoldmarklength}{2mm} -\@setplength{bfoldmarkvpos}{232mm} -\@setplength{bfoldmarklength}{2mm} -\@setplength{foldmarkvpos}{3.5mm} -\@setplength{lfoldmarkhpos}{202mm} -\@setplength{refvpos}{84mm} -\@setplength{refaftervskip}{\baselineskip} -\@setplength{toaddrhpos}{-22mm} -\@setplength{toaddrwidth}{90mm} -\@setplength{toaddrvpos}{28mm} -\@setplength{toaddrheight}{40mm} -\@setplength{toaddrindent}{\z@} -\@setplength{backaddrheight}{5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{\z@} -\@setplength{locheight}{55mm}% -\@setplength{firstheadvpos}{8mm} -\@setplength{firstheadwidth}{\paperwidth} +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{83mm} +\setplength{tfoldmarklength}{4mm} +\setplength{mfoldmarkvpos}{116mm} +\setplength{mfoldmarklength}{2mm} +\setplength{bfoldmarkvpos}{232mm} +\setplength{bfoldmarklength}{2mm} +\setplength{foldmarkvpos}{3.5mm} +\setplength{lfoldmarkhpos}{202mm} +\setplength{toaddrhpos}{-22mm} +\setplength{toaddrwidth}{90mm} +\setplength{toaddrvpos}{28mm} +\setplength{toaddrheight}{40mm} +\setplength{toaddrindent}{\z@} +\setplength{backaddrheight}{5mm} +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{\z@} +\setplength{locheight}{55mm}% +\setplength{refvpos}{84mm} +\setplength{refaftervskip}{\baselineskip} +\setplength{refwidth}{\z@} +\setplength{firstheadvpos}{8mm} +\setplength{firstheadwidth}{\paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} -\@setplength{firstfootvpos}{\paperheight} -\@addtoplength{firstfootvpos}{-16mm} -\@setplength{refwidth}{\z@} -\@setplength{sigindent}{\z@} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootvpos}{\paperheight} +\addtoplength{firstfootvpos}{-16mm} +\setplength{sigindent}{\z@} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \ifcase\@alignfrom \KOMAoptions{fromalign=locationright}% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index c84e6f8be5f..7a7e7e99c11 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% SN% @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% SN% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,57 +97,57 @@ }{a4} \setkomavar*{fromzipcode}{% CH} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 105mm} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 210mm} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 45mm} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% -8mm} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 90mm} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 45mm} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% 5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% 8mm} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 98.5mm} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 88d30c1f6a4..bc970c32be3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% SNleft% @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% SNleft% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,57 +97,57 @@ }{a4} \setkomavar*{fromzipcode}{% CH} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 105mm} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 210mm} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 35.5mm} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% 20mm} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 100mm} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 45mm} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% 5mm} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% 8mm} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 89mm} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\centering \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index f633d6c82fc..ab00292ac78 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9 @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% UScommercial9% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,58 +97,58 @@ }{letter} \setkomavar*{fromzipcode}{% US} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 3.75in} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 7.375in} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 2.1875in} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% 0.6875in} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 4.5in} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 1.125in} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% \z@} \KOMAoptions{backaddress=false} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% .4375in} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \paperwidth} \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[-2]{firstheadwidth}{\useplength{toaddrhpos}} \else - \@addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} + \addtoplength[2]{firstheadwidth}{\useplength{toaddrhpos}} \fi -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 3.4375in} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\raggedright \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index 1815a53896f..db9fa2c2e84 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9DW @@ -74,18 +74,18 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% UScommercial9DW% }{% - This letter class option file was made only\MessageBreak + This letter configuration option file was made only\MessageBreak to be used with KOMA-Script letter class\MessageBreak `scrlttr2' or letter package `scrletter'.\MessageBreak Use with other classes and without that package\MessageBreak @@ -97,54 +97,54 @@ }{letter} \setkomavar*{fromzipcode}{% US} -\@setplength{foldmarkhpos}{3.5mm} -\@setplength{tfoldmarkvpos}{% +\setplength{foldmarkhpos}{3.5mm} +\setplength{tfoldmarkvpos}{% 3.75in} -\@setplength{mfoldmarkvpos}{\z@} -\@setplength{bfoldmarkvpos}{% +\setplength{mfoldmarkvpos}{\z@} +\setplength{bfoldmarkvpos}{% 7.375in} -\@setplength{lfoldmarkhpos}{\z@} -\@setplength{toaddrvpos}{% +\setplength{lfoldmarkhpos}{\z@} +\setplength{toaddrvpos}{% 2.1875in} -\@setplength{toaddrhpos}{% +\setplength{toaddrhpos}{% .5625in} -\@setplength{toaddrwidth}{% +\setplength{toaddrwidth}{% 3.625in} -\@setplength{toaddrheight}{% +\setplength{toaddrheight}{% 1.125in} -\@setplength{toaddrindent}{% +\setplength{toaddrindent}{% \z@} -\@setplength{backaddrheight}{% +\setplength{backaddrheight}{% \z@} \KOMAoptions{backaddress=false} -\@setplength{specialmailindent}{\fill} -\@setplength{specialmailrightindent}{1em} -\@setplength{locwidth}{% +\setplength{specialmailindent}{\fill} +\setplength{specialmailrightindent}{1em} +\setplength{locwidth}{% \z@} -\@setplength{firstheadvpos}{% +\setplength{firstheadvpos}{% .4375in} -\@setplength{firstheadwidth}{% +\setplength{firstheadwidth}{% \paperwidth} -\@addtoplength[-]{firstheadwidth}{.25in} -\@setplength{firstfootwidth}{\useplength{firstheadwidth}} +\addtoplength[-]{firstheadwidth}{.25in} +\setplength{firstfootwidth}{\useplength{firstheadwidth}} \ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax - \@setplength{firstfootvpos}{\paperheight} - \@addtoplength{firstfootvpos}{-16mm} + \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} + \setplength{firstfootvpos}{1in} + \addtoplength{firstfootvpos}{\topmargin} + \addtoplength{firstfootvpos}{\headheight} + \addtoplength{firstfootvpos}{\headsep} + \addtoplength{firstfootvpos}{\textheight} + \addtoplength{firstfootvpos}{\footskip} \fi -\@setplength{refvpos}{% +\setplength{refvpos}{% 3.4375in} -\@setplength{refaftervskip}{% +\setplength{refaftervskip}{% \baselineskip} -\@setplength{refwidth}{0pt} -\@setplength{sigindent}{0mm} -\@setplength{sigbeforevskip}{2\baselineskip} +\setplength{refwidth}{0pt} +\setplength{sigindent}{0mm} +\setplength{sigbeforevskip}{2\baselineskip} \let\raggedsignature=\raggedright \newcommand*{\showUSletterCixDW}{% \showUScommercial9[{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index f01211895da..4e82e15eeef 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{float.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z 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 1de7ad1d9ab..092800ac69d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{floatrow.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z 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 48540ab320f..7c73e3bfe39 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{hyperref.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \scr@ifexpected\@schapter{% \def\@schapter#1{% \H@old@schapter{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/koma-script-source-doc.cls b/Master/texmf-dist/tex/latex/koma-script/koma-script-source-doc.cls new file mode 100644 index 00000000000..2f8f4dc535c --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/koma-script-source-doc.cls @@ -0,0 +1,290 @@ +%% +%% This is file `koma-script-source-doc.cls', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% koma-script-source-doc.dtx (with options: `class') +%% scrlogo.dtx (with options: `logo,forcedefine') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from koma-script-source-doc.cls. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file koma-script-source-doc.dtx scrlogo.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%% +\ProvidesClass{koma-script-source-doc} +[2022-03-10 v0.91 KOMA-Script source documentation] +\RequirePackage{l3keys2e} +\ExplSyntaxOn +\newif \ifkdoc@indexlatex \kdoc@indexlatexfalse +\keys_define:nn {kdoc} + { + indexlatex .choice:, + indexlatex / true .code:n = { \legacy_if_set_true:n { kdoc@indexlatex } }, + indexlatex / false .code:n = { \legacy_if_set_false:n { kdoc@indexlatex } }, + indexlatex .default:n = { true }, + } +\ExplSyntaxOff +\ProcessKeysOptions {kdoc} +\IfFileExists{scrartcl.cls}{% + \declare@file@substitution{article.cls}{scrartcl.cls} + \PassOptionsToClass{fontsize=10pt}{scrartcl} +}{% + \ClassWarningNoLine{koma-script-source-doc}{% + Usually this class should be used with KOMA-Script\MessageBreak + scrartcl. But as that class is not available we use\MessageBreak + standard class article as emergency fallback.\MessageBreak + It is recommended to repeat this LaTeX run after\MessageBreak + build/installation of a complete KOMA-Script% + }% +} +\LoadClassWithOptions{ltxdoc}[2021/12/07] +\IfPackageAtLeastTF{doc}{2022/06/01}{}{% + \ClassError{koma-script-source-doc}{old package `doc' detected}{% + This class needs `doc' v3. It cannot be used with\MessageBreak + `doc' v2. `doc' v3 is available at LaTeX developer\MessageBreak + release from at least January 2022}% + \csname fi\endcsname\csname @@end\endcsname\end\endinput +} +\SetupDoc{reportchangedates} +\CodelineIndex +\RecordChanges +\ifkdoc@indexlatex\else + \DoNotIndex{\.,\\,\ ,\@,\@Alph,\@M} + \DoNotIndex{\@abstrtfalse,\@abstrttrue,\@addtoreset,\@afterheading} + \DoNotIndex{\@afterindentfalse,\@alph,\@arabic} + \DoNotIndex{\@beginparpenalty} + \DoNotIndex{\@car,\@cdr,\@centercr} + \DoNotIndex{\@dblfloat,\@dotsep} + \DoNotIndex{\@dottedtocline,\@empty,\@endparpenalty} + \DoNotIndex{\@float,\@fontswitch} + \DoNotIndex{\@gobbletwo} + \DoNotIndex{\@hangfrom,\@highpenalty} + \DoNotIndex{\@ifnextchar,\@ifundefined,\@itempenalty} + \DoNotIndex{\@latex@warning} + \DoNotIndex{\@m,\@medpenalty,\@minus,\@mkboth,\@mparswitchfalse} + \DoNotIndex{\@mparswitchtrue} + \DoNotIndex{\@ne,\@nil,\@nobreakfalse,\@nobreaktrue,\@nomath} + \DoNotIndex{\@plus} + \DoNotIndex{\@Roman,\@roman} + \DoNotIndex{\@tempa,\@tempcnta,\@tempdima,\@tempskipka} + \DoNotIndex{\@tempswafalse,\@tempswatrue} + \DoNotIndex{\@tempb,\@tempcntb,\@tempdimb,\@tempskipkb} + \DoNotIndex{\@tempswbfalse,\@tempswbtrue} + \DoNotIndex{\@tempc,\@tempcntc,\@tempdimc,\@tempskipkc} + \DoNotIndex{\@tocrmarg,\@topnewpage,\@topnum,\@twocolumnfalse} + \DoNotIndex{\@twocolumntrue,\@twosidefalse,\@twosidetrue} + \DoNotIndex{\@whiledim,\@whilenum} + \DoNotIndex{\addcontentsline,\addpenalty,\addtocontents,\addtolength} + \DoNotIndex{\addvspace,\advance,\AtBeginDocument} + \DoNotIndex{\begin,\begingroup,\bfseries,\box,\bullet} + \DoNotIndex{\c@figure,\c@page,\c@secnumdepth,\c@table,\c@tocdepth} + \DoNotIndex{\cdot,\centering,\changes,\cleardoublepage,\clearpage} + \DoNotIndex{\cmd,\col@number,\CurrentOption,\CodelineIndex,\cs} + \DoNotIndex{\day,\dblfloatpagefraction,\dbltopfraction} + \DoNotIndex{\declare@file@substitution} + \DoNotIndex{\DeclareOldFontCommand,\DeclareOption,\def,\DisableCrossrefs} + \DoNotIndex{\divide,\DoNotIndex} + \DoNotIndex{\ifdim,\else,\fi,\empty,\em,\EnableCrossrefs,\end} + \DoNotIndex{\end@dblfloat} + \DoNotIndex{\end@float,\endgroup,\endlist,\endquotation,\endtitlepage} + \DoNotIndex{\everypar,\ExecuteOptions,\expandafter} + \DoNotIndex{\fboxrule,\fboxsep} + \DoNotIndex{\g@addto@macro,\gdef,\global} + \DoNotIndex{\hangindent,\hbox,\hfil,\hrule,\hsize,\hskip,\hspace,\hss} + \DoNotIndex{\if@tempswa,\ifcase,\or,\fi,\fi} + \DoNotIndex{\ifnum,\ifodd,\ifx,\fi,\fi,\fi} + \DoNotIndex{\include,\input,\InputIfFileExists,\item,\itshape} + \DoNotIndex{\kern,\kernel@ifnextchar} + \DoNotIndex{\leavevmode,\leftmark,\leftskip,\let,\lineskip} + \DoNotIndex{\list,\long,\LoadClass,\LoadClassWithOptions} + \DoNotIndex{\m@ne,\m@th,\marginpar,\markboth,\markright,\mathbf,\mathcal} + \DoNotIndex{\mathit,\mathnormal,\mathrm,\mathsf,\mathtt,\MessageBreak} + \DoNotIndex{\month} + \DoNotIndex{\newblock,\newcommand,\newcount,\newcounter,\newdimen} + \DoNotIndex{\newenvironment,\newlength,\newpage,\nobreak,\noindent} + \DoNotIndex{\normalfont,\normallineskip,\normalsize,\null,\number} + \DoNotIndex{\numberline,\normalcolor} + \DoNotIndex{\OldMakeindex,\OnlyDescription,\overfullrule} + \DoNotIndex{\p@,\PackageError,\PackageInfo,\PackageWarningNoLine} + \DoNotIndex{\pagenumbering,\pagestyle,\par,\paragraph,\parbox} + \DoNotIndex{\PassOptionsToPackage,\pcal,\penalty,\pmit,\PrintChanges} + \DoNotIndex{\PrintIndex,\ProcessOptions,\protect,\providecommand} + \DoNotIndex{\ProvidesClass} + \DoNotIndex{\raggedbottom,\raggedleft,\raggedright,\refstepcounter,\relax} + \DoNotIndex{\renewcommand,\RenewDocElement,\RequirePackage} + \DoNotIndex{\reserved@a,\reserved@b,\reserved@c,\reset@font} + \DoNotIndex{\rightmargin,\rightmark,\rightskip,\rmfamily} + \DoNotIndex{\scshape,\secdef,\setbox,\setcounter,\setlength} + \DoNotIndex{\settowidth,\sfcode,\sffamily,\skip,\sloppy,\slshape,\space} + \DoNotIndex{\string} + \DoNotIndex{\TeX,\textbf,\textit,\textrm,\textsf,\texttt,\textup} + \DoNotIndex{\the,\thispagestyle,\triangleright,\ttfamily} + \DoNotIndex{\twocolumn,\typeout} + \DoNotIndex{\undefined,\usecounter} + \DoNotIndex{\vfil,\vfill,\vspace} + \DoNotIndex{\wd,\xdef,\year,\z@} +\fi +\ifdefined\AfterCalculatingTypearea + \AfterCalculatingTypearea{% + \addtolength{\oddsidemargin} + {.5\dimexpr\oddsidemargin+1in\relax}% + \setlength{\marginparwidth} + {\dimexpr \oddsidemargin+1in-2\marginparsep\relax}% + \setlength{\marginparpush}{0pt}% + } + \KOMAoption{DIV}{9} +\fi +\RequirePackage{auxhook} +\expandafter\def\expandafter\index@prologue\expandafter{% + \expandafter\kssd@section@hack\index@prologue} +\expandafter\def\expandafter\glossary@prologue\expandafter{% + \expandafter\kssd@section@hack\glossary@prologue} +\newcommand*{\kssd@section@hack}{% + \let\ksdd@markboth\markboth + \def\markboth##1##2{% + \@ifundefined{addsectiontocentry}{% + \@ifundefined{addxcontentsline}{% + \addcontentsline{toc}{section}{\numberline{}##1}% + }{% + \addxcontentsline{toc}{section}{##1}% + }% + }{% + \addsectiontocentry{}{##1}% + }% + \let\markboth\ksdd@markboth + \markboth{##1}{##2}% + }% +} +\newcommand*{\file}{\texttt} +\newcommand*{\cls}{\pkg} +\NewDocumentCommand{\pkg}{sO{https://www.ctan.org/pkg/#3}m}{% + \IfBooleanTF{#1}{\@gobble}{% + \csname tl_if_blank:nTF\endcsname{#2}{\@gobble}{\href}% + }% + {#2}{\textsf{#3}}% +} +\newcommand*{\opt}{\texttt} +\newcommand*{\optvalue}{\texttt} +\newcommand*{\env}{\texttt} +\newcommand*{\len}{\cs} +\newcommand*{\cnt}{\texttt} +\newcommand*{\fnt}{\texttt} +\newcommand*{\var}{\texttt} +\newcommand*{\plen}{\texttt} +\newcommand*{\pstyle}{\texttt} +\newcommand*{\dhook}{\texttt} +\RenewDocElement[% + macrolike = true, + toplevel = false, + idxtype = , + idxgroup = TeX macros (internal)\actualchar\TeX{} macros (internal), + printtype = \textit{intern} +]{Macro}{macro} +\NewDocElement[% + macrolike = true, + toplevel = true, + idxtype = , + idxgroup = Commands, + printtype = , +]{Command}{command} +\RenewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{env.} , + idxgroup = Environments, + printtype = \textit{env.} +]{Env}{environment} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{opt.}, + idxgroup = Options, + printtype = \textit{opt.} +]{Option}{option} +\NewDocElement[% + macrolike = true, + toplevel = false, + idxtype = , + idxgroup = Lengths (internal), + printtype = \textit{ilen.} +]{ILength}{ilength} +\NewDocElement[% + macrolike = true, + toplevel = true, + idxtype = \textit{len.}, + idxgroup = Lengths (user), + printtype = \textit{len.}, +]{Length}{length} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{cnt.}, + idxgroup = Counters, + printtype = \textit{cnt.}, +]{Counter}{counter} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{font}, + idxgroup = KOMA-Script font elements\actualchar\KOMAScript{} font elements, + printtype = \textit{font}, +]{KOMAfont}{fontelement} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{var.}, + idxgroup = KOMA-Script variables\actualchar\KOMAScript{} variables, + printtype = \textit{var.}, +]{KOMAvar}{variable} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{plen.}, + idxgroup = KOMA-Script pseudo-lengths\actualchar\KOMAScript{} pseudo-lengths, + printtype = \textit{plen.}, +]{PLength}{pseudolength} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{pgstyle}, + idxgroup = page styles, + printtype = \textit{style} +]{PageStyle}{pgstyle} +\NewDocElement[% + macrolike = false, + toplevel = true, + idxtype = \textit{do hook}, + idxgroup = do hooks, + printtype = \textit{dohook} +]{DoHook}{dohook} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\IfFileExists{scrlogo.sty}{% +\RequirePackage{scrlogo} +}{}% +\@ifundefined{KOMAScript}{% + \DeclareRobustCommand*{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% + M\kern.05em A\kern.1em-\kern.1em Script}}% + \@ifundefined{pdfstringdefPreHook}{% + \def + }{% + \g@addto@macro + }% + \pdfstringdefPreHook{% + \def\KOMAScript{KOMA-Script}% + \expandafter\def\csname KOMAScript \endcsname{KOMA-Script}% + }% +}{} +\endinput +%% +%% End of file `koma-script-source-doc.cls'. diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index b859a08d7c7..8470c9efeec 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{listings.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z 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 dc0349cc244..697a10d7811 100644 --- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{lscape.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z 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 650429e0b94..e7d73e2bb7e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak +++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{nomencl.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package nomencl)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z 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/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty index c2cfea10972..b3c27a916ba 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty @@ -39,10 +39,10 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scraddr.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scraddr.dtx 3688 2022-02-10 08:26:37Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scraddr} - [2013/09/30 v1.1c KOMA-Script + [2022/01/24 v1.1d KOMA-Script package] \newcommand*{\@adrFIVerror}{} \DeclareOption{adrFreeIVempty}{\renewcommand*{\@adrFIVerror}{0}} @@ -105,10 +105,8 @@ \newcommand*{\FreeIII}[1]{\csname #1.FIII\endcsname} \let\Comment\FreeIII \newcommand*{\FreeIV}[1]{\csname #1.FIV\endcsname} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scraddr.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 63e44277116..1fc7ba5d0aa 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script ] \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% @@ -138,9 +138,9 @@ \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -151,10 +151,6 @@ See KOMA-Script manual for more information about.% }% } -\newcommand*{\scr@osectarg}{0} -\newcommand*{\scr@activate@xsection}[1]{% - \renewcommand*{\scr@osectarg}{#1}% -} \newif\if@altsecnumformat\@altsecnumformatfalse \newif\if@autodot \renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue} @@ -168,9 +164,16 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } +\newcommand*{\scr@osectarg}{0} +\newcommand*{\scr@activate@xsection}[1]{% + \renewcommand*{\scr@osectarg}{#1}% +} \IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{} \newcommand*{\size@part}{} +\newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\size@partnumber}{} +\newcommand*{\scr@fnt@partnumber}{\size@partnumber} +\aliaskomafont{partprefix}{partnumber} \newcommand*{\scr@part@beforeskip}{% 4ex } @@ -188,12 +191,17 @@ \vskip\@tempskipa } \newcommand*{\size@section}{} +\newcommand*{\scr@fnt@section}{\size@section} \newcommand*{\size@subsection}{} +\newcommand*{\scr@fnt@subsection}{\size@subsection} \newcommand*{\size@subsubsection}{} +\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\size@paragraph}{} +\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 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -276,10 +284,11 @@ \@namedef{scr@v@3.33}{18} \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} -\@namedef{scr@v@last}{19} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +\@namedef{scr@v@3.36}{20} +\@namedef{scr@v@last}{20} +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -354,7 +363,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -410,9 +419,9 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -498,7 +507,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -625,7 +634,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -652,6 +661,9 @@ \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} \newcommand*{\f@parfillskip}{\the\parfillskip} +\newcommand*{\scr@parindent}{1em} +\newcommand*{\scr@parskip}{\z@} +\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \AtEndOfClass{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -662,9 +674,6 @@ \newcommand*{\default@par@update}{} \let\default@par@update\relax \AtBeginDocument{\par@update} -\newcommand*{\scr@parindent}{1em} -\newcommand*{\scr@parskip}{\z@} -\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% @@ -791,7 +800,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagefalse @@ -826,9 +835,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -963,46 +972,46 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}% - \renewcommand*{\size@part}{\Huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\Huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \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}% - \renewcommand*{\size@part}{\huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@section}{\large}% - \renewcommand*{\size@subsection}{\normalsize}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{section}{\large}% + \setkomafont{subsection}{\normalsize}% + \setkomafont{subsubsection}{\normalsize}% + \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}% - \renewcommand*{\size@part}{\LARGE}% - \renewcommand*{\size@partnumber}{\LARGE}% - \renewcommand*{\size@section}{\normalsize}% - \renewcommand*{\size@subsection}{\normalsize}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\LARGE}% + \setkomafont{partnumber}{\LARGE}% + \setkomafont{section}{\normalsize}% + \setkomafont{subsection}{\normalsize}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % openany \or % openright \or % openleft \or % twolinechapter \or % onelinechapter \or % twolineappendix - \or % onelineappend + \or % onelineappendix \or % optiontotocandhead \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}% @@ -1027,13 +1036,13 @@ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}% \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}% - \renewcommand*{\size@part}{\huge}% - \renewcommand*{\size@partnumber}{\Large}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\huge}% + \setkomafont{partnumber}{\Large}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \renewcommand*{\sectfont}{\bfseries}% \fi \fi @@ -1042,7 +1051,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -1147,7 +1156,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1282,7 +1291,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1353,7 +1362,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1583,7 +1592,7 @@ \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} \KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} -%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1616,7 +1625,11 @@ \csname scr@bibstyle@#1\endcsname #3% }% - \g@addto@macro\scr@bibstylelist{, `#2'}% + \ifx\scr@bibstylelist\@empty + \edef\scr@bibstylelist{`#2'}% + \else + \edef\scr@bibstylelist{\scr@bibstylelist, `#2'}% + \fi }% }{% \ClassError{\KOMAClassName}{bibliography style `#2' already exists}{% @@ -1630,7 +1643,7 @@ \newcommand*{\scr@bibstyle@}{} \newcommand*{\bib@beginhook}{} \newcommand*{\bib@endhook}{} -\newcommand*{\scr@bibstylelist}{\@gobble} +\newcommand*{\scr@bibstylelist}{} \newcommand*{\@openbib@code}{} \newcommand*{\newblock}{} \newbibstyle{openstyle}{% @@ -1751,7 +1764,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3706 2022-02-15 09:36:50Z kohm $ %%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown @@ -1836,21 +1849,21 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2325,13 +2338,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z 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 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2378,12 +2391,50 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: body) +\newcommand*{\par@updaterelative}{% + \begingroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent + \aftergroup\parindent@update + \fi + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip + \aftergroup\parskip@update + \fi + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip + \aftergroup\parfillskip@update + \fi + \endgroup +} +\newcommand*{\parindent@update}{% + \scr@defaultunits\parindent\scr@parindent + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent\else + \def\reserved@b{\endgroup\edef\f@parindent{\the\parindent}}% + \fi + \reserved@b +} +\newcommand*{\parskip@update}{% + \scr@defaultunits\parskip\scr@parskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip\else + \def\reserved@b{\endgroup\edef\f@parskip{\the\parskip}}% + \fi + \reserved@b +} +\newcommand*{\parfillskip@update}{% + \scr@defaultunits\parfillskip\scr@parfillskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip\else + \def\reserved@b{\endgroup\edef\f@parfillskip{\the\parfillskip}}% + \fi + \reserved@b +} \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} -\setlength{\columnsep}{10\p@} -\setlength{\columnseprule}{\z@} \IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% @@ -2454,46 +2505,6 @@ \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\newcommand*{\par@updaterelative}{% - \begingroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent - \aftergroup\parindent@update - \fi - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip - \aftergroup\parskip@update - \fi - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip - \aftergroup\parfillskip@update - \fi - \endgroup -} -\newcommand*{\parindent@update}{% - \scr@defaultunits\parindent\scr@parindent - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent\else - \def\@tempb{\endgroup\edef\f@parindent{\the\parindent}}% - \fi - \@tempb -} -\newcommand*{\parskip@update}{% - \scr@defaultunits\parskip\scr@parskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip\else - \def\@tempb{\endgroup\edef\f@parskip{\the\parskip}}% - \fi - \@tempb -} -\newcommand*{\parfillskip@update}{% - \scr@defaultunits\parfillskip\scr@parfillskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip\else - \def\@tempb{\endgroup\edef\f@parfillskip{\the\parfillskip}}% - \fi - \@tempb -} \newcommand*{\scr@defaultunits}[2]{% \begingroup \edef\@tempa{#2}% @@ -2551,10 +2562,12 @@ \l@addto@macro{\@listiii}{\@list@extra}% \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% +\setlength{\columnsep}{10\p@} +\setlength{\columnseprule}{\z@} \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -2927,15 +2940,15 @@ }{% \if@restonecol\twocolumn \else \newpage \fi }% -\newcommand*\titlefont{\sectfont}% -\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newkomafont{subtitle}{\usekomafont{title}\large}% \newkomafont{titlehead}{}% \newkomafont{author}{\Large} \newkomafont{date}{\Large} \newkomafont{publishers}{\Large} \newkomafont{dedication}{\Large} +\newcommand*\titlefont{\sectfont}% \newcommand*{\scr@fnt@title}{\titlefont}% +\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newcommand*{\scr@fnt@subject}{\subject@font}% \newenvironment{abstract}{% \if@titlepage @@ -2971,10 +2984,12 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract} +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2988,7 +3003,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% @@ -3007,18 +3022,41 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z 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 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: body) +\BeforeClosingMainAux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% + \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% + \fi\fi} +\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% + \expandafter\@@maybeautodot #1\@stop\endgroup\fi +} +\newcommand*{\@@maybeautodot}[1]{% + \ifx #1\@stop\let\@@maybeautodot\relax + \else + \ifx #1\Alph \@autodottrue\fi + \ifx #1\alph \@autodottrue\fi + \ifx #1\Roman \@autodottrue\fi + \ifx #1\roman \@autodottrue\fi + \ifx #1\@Alph \@autodottrue\fi + \ifx #1\@alph \@autodottrue\fi + \ifx #1\@Roman \@autodottrue\fi + \ifx #1\@roman \@autodottrue\fi + \ifx #1\romannumeral \@autodottrue\fi + \fi + \@@maybeautodot +} +\newcommand*\autodot{\if@altsecnumformat.\fi} \setcounter{secnumdepth}{3} \providecommand*{\ifnumbered}{% \ClassWarning{\KOMAClassName}{Usage of deprecated command @@ -3056,29 +3094,6 @@ \newcommand*{\Ifunnumbered}[1]{% \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% } -\BeforeClosingMainAux{% - \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% - \fi\fi} -\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% - \expandafter\@@maybeautodot #1\@stop\endgroup\fi -} -\newcommand*{\@@maybeautodot}[1]{% - \ifx #1\@stop\let\@@maybeautodot\relax - \else - \ifx #1\Alph \@autodottrue\fi - \ifx #1\alph \@autodottrue\fi - \ifx #1\Roman \@autodottrue\fi - \ifx #1\roman \@autodottrue\fi - \ifx #1\@Alph \@autodottrue\fi - \ifx #1\@alph \@autodottrue\fi - \ifx #1\@Roman \@autodottrue\fi - \ifx #1\@roman \@autodottrue\fi - \ifx #1\romannumeral \@autodottrue\fi - \fi - \@@maybeautodot -} -\newcommand*\autodot{\if@altsecnumformat.\fi} \newcommand*{\scr@saved@startsection}[6]{% \if@noskipsec \leavevmode \fi \par @@ -4495,34 +4510,6 @@ }% \Ifstr{\@nameuse{scr@#1@style}}{#2}% } -\newcommand*{\bprot@dottedtocline}[5]{% - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \ClassWarning{\KOMAClassName}{% - usage of `\string\bprot@dottedtocline' is deprecated.\MessageBreak - Maybe an old auxiliary file has been used.\MessageBreak - Note, this command will be removed from\MessageBreak - KOMA-Script soon. So if this warning message\MessageBreak - persists after one more LaTeX run, you should\MessageBreak - redeclare the corresponding ToC entries using\MessageBreak - \string\DeclareTOCStyleEntry[\MessageBreak - \space\space level=\detokenize{#1},\MessageBreak - \space\space indent=\detokenize{#2},\MessageBreak - \space\space numwidth=\detokenize{#3}]{default}{...},\MessageBreak - where `...' is the name of the ToC level.\MessageBreak - Note, in future usage of `\string\bprot@dottedtocline'\MessageBreak - could result in an error% - }% - \ifnum #1>\c@tocdepth \else - \ifnum \lastpenalty<\numexpr 20010-#1\relax - \addpenalty{\@lowpenalty}% - \fi - \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \penalty \numexpr 20009-#1\relax - \fi - \else - \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \fi -} \newcommand*\appendix{% \Ifstr{\@currenvir}{appendix}{% \ClassWarning{\KOMAClassName}{% @@ -4732,6 +4719,8 @@ \renewcommand*{\thepart}{\@Roman\c@part} \newcommand*{\partformat}{\partname~\thepart\autodot} \newcommand*\partname{Part} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\partname{Part} \newcommand*{\partmark}[1]{\@mkboth{}{}} \newcommand*\addpartmark[1]{% \begingroup @@ -4743,9 +4732,6 @@ } \newcommand*{\raggedpart}{} \let\raggedpart\raggedsection -\newcommand*{\scr@fnt@part}{\size@part} -\newcommand*{\scr@fnt@partnumber}{\size@partnumber} -\aliaskomafont{partprefix}{partnumber} \newkomafont{partentry}{\usekomafont{disposition}\large} \newkomafont{partentrypagenumber}{} \newcommand*{\raggedsectionentry}{} @@ -4832,11 +4818,6 @@ \sectionmark{#1}% \endgroup } -\newcommand*{\scr@fnt@section}{\size@section} -\newcommand*{\scr@fnt@subsection}{\size@subsection} -\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} -\newcommand*{\scr@fnt@paragraph}{\size@paragraph} -\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} \newkomafont{sectionentry}{\usekomafont{disposition}} \newkomafont{sectionentrypagenumber}{} \newkomafont{sectionentrydots}{} @@ -4906,7 +4887,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -4934,9 +4915,6 @@ \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} -\renewcommand*\theequation{% - \@arabic\c@equation -} \newcommand*{\new@tpo@label}{\@newl@bel{tpo}} \AtBeginDocument{% \if@filesw @@ -4998,6 +4976,9 @@ \expandafter\@secondoftwo \fi } +\newcommand\marginline[1]{% + \marginpar[\raggedleft{#1}]{\raggedright #1}% +} \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% \@textsubscript{\selectfont#1}% @@ -5071,6 +5052,12 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} +\scr@package@not@recommended{titlesec}{% + KOMA-Script features\MessageBreak + like \string\setkomafont, \string\RedeclareSectionCommand, + \string\sectionlinesformat\MessageBreak + and several others to re-configure section\MessageBreak + headings} \AfterPackage*{sectsty}{% \@ifpackagelater{sectsty}{2002/02/26}{% \ClassInfo{\KOMAClassName}{Unknown `sectsty' release.\MessageBreak @@ -5210,35 +5197,7 @@ \let\scr@mt@saved@sect\relax \fi } -\AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2019/10/17}{% - \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak - Cross your fingers, that is compatible% - }% - }{% - \scr@class@titlesec@warning - }% -} -\providecommand*{\scr@class@titlesec@warning}{% - \ClassWarning{\KOMAClassName}{% - Usage of this version of package `titlesec'\MessageBreak - with KOMA-Script class `\KOMAClassName' is\MessageBreak - not recommended, because the package does not\MessageBreak - support KOMA-Script classes, but break them.\MessageBreak - If you want to use `titlesec' with KOMA-Script\MessageBreak - classes instead of using the KOMA-Script's\MessageBreak - user interface to configure the headings of\MessageBreak - parts, - sections, subsections - ... subparagraphs,\MessageBreak - please ask the author of `titlesec' for support.\MessageBreak - Expect errors like:\MessageBreak - \space\space- ``Illegal unit of measure (pt inserted).''\MessageBreak - \space\space- ``Missing number, treated as zero''\MessageBreak - after loading `titlesec'% - }% -} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -5334,7 +5293,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -5345,11 +5304,8 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) -\newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% -} \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} \setlength{\abovecaptionskip}{10\p@} @@ -5362,8 +5318,8 @@ \newcommand*{\scap@caption}{} \newcommand*{\scap@width}{\linewidth} \newcommand*{\scap@move}{\z@} -\newcommand*{\scap@currentlabel}{} \newif\ifscap@alt +\newcommand*{\scap@currentlabel}{} \newcommand*{\@captionbeside}{} \long\def\@captionbeside[#1]#2{% \kernel@ifnextchar [%] @@ -5414,7 +5370,7 @@ \begin{lrbox}{\c@pti@nb@sid@b@x}% } \newenvironment*{captionbeside}{% - \@dblarg\@captionbeside% + \@dblarg\@captionbeside }{% \end{lrbox}% \settowidth{\@tempdima}{\usebox\c@pti@nb@sid@b@x}% @@ -5471,7 +5427,8 @@ \newcommand*{\scr@fnt@captionlabel}{\caplabelfont} \newif\ifdofullc@p \dofullc@ptrue -\newif\if@capbreak\@capbreakfalse +\newif\if@capbreak +\@capbreakfalse \newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}} \newcommand*{\@setcapindent}[1]{% \setlength{\@tempdima}{#1}% @@ -6061,10 +6018,15 @@ \endcaptionbeside } \newcommand*\figurename{Figure} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\figurename{Figure} \newcommand*\tablename{Table} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\tablename{Table} \DeclareNewTOC[% type=figure, float, + nonfloat, floatpos=tbp, floattype=1, tocentryindent=1.5em, @@ -6080,6 +6042,7 @@ \DeclareNewTOC[% type=table, float, + nonfloat, floatpos=tbp, floattype=2, tocentryindent=1.5em, @@ -6092,7 +6055,7 @@ \expandafter\ifnum\scr@v@is@lt{3.35}% \renewcommand*\thetable{\@arabic\c@table} \fi -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -6148,6 +6111,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \ExecuteDoHook{footnote/text/begin}% \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% @@ -6158,6 +6122,7 @@ \hskip \dimexpr #1-#2\relax }% \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + \ExecuteDoHook{footnote/text/end}% }% \else \ClassInfo{\KOMAClassName}{% @@ -6193,15 +6158,16 @@ \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} -\newcommand*{\scr@fnt@footnotenumber}{\ftnm@font} +\aliaskomafont{footnotenumber}{footnotelabel} \newcommand*{\scr@fnt@footnotelabel}{\ftnm@font} -\newcommand*{\scr@fnt@instead@footnotetext}{footnote} +\aliaskomafont{footnotetext}{footnote} \newcommand*\deffootnotemark[1]{% \def\@makefnmark{\hbox{\ftntm@font{#1}}}% } \newcommand*{\ftntm@font}{} \newcommand*{\scr@fnt@footnotereference}{\ftntm@font} -\newcommand*{\scr@fnt@footnoteref}{\ftntm@font} +\aliaskomafont{footnoteref}{footnotereference} +\aliaskomafont{footnotemark}{footnotereference} \newcommand*{\FN@mf@check}{% \ifdim\lastkern=\multiplefootnotemarker\relax \edef\@x@sf{\the\spacefactor}% @@ -6250,7 +6216,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -6269,7 +6235,7 @@ \fi% } \newcommand*{\before@starttoc}[1]{% - \let\scr@dottedtocline=\@dottedtocline + \let\scr@dottedtocline=\@dottedtoclilne \renewcommand*{\@dottedtocline}[3]{% \scr@dottedtocline{##1}{\z@}{\last@l@number}}% \renewcommand*{\numberline@box}[1]{% @@ -6394,9 +6360,11 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \newcommand*\refname{References} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\refname{References} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax \newcommand{\setbibpreamble}[1]{\def\bibpreamble{#1}} @@ -6480,7 +6448,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3706 2022-02-15 09:36:50Z kohm $ %%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax @@ -6505,7 +6473,7 @@ \fi \columnseprule \z@ \columnsep 35\p@ - \idx@heading% + \idx@heading \index@preamble\par\nobreak \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi \parindent\z@ @@ -6522,7 +6490,9 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\indexname{Index} +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -6546,11 +6516,6 @@ \@beginparpenalty=-\@lowpenalty \@endparpenalty =-\@lowpenalty \@itempenalty =-\@lowpenalty -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} -\setlength\tabbingsep{\labelsep} \renewcommand*\theenumi{\@arabic\c@enumi} \renewcommand*\theenumii{\@alph\c@enumii} \renewcommand*\theenumiii{\@roman\c@enumiii} @@ -6573,7 +6538,7 @@ \endlist } \newcommand*{\descriptionlabel}[1]{% - \hspace{\labelsep}\descfont #1% + \hspace{\labelsep}\usekomafont{descriptionlabel}{#1}% } \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% @@ -6688,10 +6653,13 @@ \newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +\setlength\arraycolsep{5\p@} +\setlength\tabcolsep{6\p@} +\setlength\arrayrulewidth{.4\p@} +\setlength\doublerulesep{2\p@} +\setlength\tabbingsep{\labelsep} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrartcl.cls'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index 142da931a5b..6f159c9ee6d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 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 a517ac0036e..d1e3aecde4e 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 %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 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 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z 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 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -696,7 +696,16 @@ }% \reserved@a#1#2\@nil } -\newcommand*{\ifislengthprimitive}[1]{% +\providecommand*{\ifislengthprimitive}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifislengthprimitive'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifislengthprimitive' by `\string\Ifislengthprimitive'% + }% + \Ifislengthprimitive +} +\newcommand*{\Ifislengthprimitive}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifislengthprimitive#1\@nil}% } \newcommand*{\scr@ifislengthprimitive}[1]{% @@ -913,7 +922,16 @@ \endgroup #1% } -\newcommand*{\ifisdefchar}[1]{% +\providecommand*{\ifisdefchar}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdefchar'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdefchar' by `\string\Ifisdefchar'% + }% + \Ifisdefchar +} +\newcommand*{\Ifisdefchar}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdefchar#1\@nil}% } \newcommand*{\scr@ifisdefchar}[1]{% @@ -1257,7 +1275,7 @@ \Ifnumber } \newcommand\Ifnumber[1]{% - \begingroup\@tempswafalse\let\scr@next\test@number + \begingroup\@tempswafalse\let\scr@next\scr@test@number \IfArgIsEmpty{#1}{}{\expandafter\scr@next#1\scr@next}% \if@tempswa \aftergroup\@firstoftwo @@ -1266,7 +1284,7 @@ \fi \endgroup } -\newcommand*{\test@number}[1]{% +\newcommand*{\scr@test@number}[1]{% \ifx \scr@next#1% \let\scr@next\relax \else @@ -1310,7 +1328,7 @@ \else \ifx #1+% \else - \def\scr@next{\let\scr@next\test@number\scr@next #1}% + \def\scr@next{\let\scr@next\scr@test@number\scr@next #1}% \fi \fi \fi @@ -1326,20 +1344,20 @@ \Ifdimen } \newcommand{\Ifdimen}[1]{% - \begingroup\@tempswatrue\let\scr@next\test@posdimen - \expandafter\test@dimen#1\scr@next + \begingroup\@tempswatrue\let\scr@next\scr@test@posdimen + \expandafter\scr@test@dimen#1\scr@next \if@tempswa \endgroup\expandafter\@firstoftwo \else \endgroup\expandafter\@secondoftwo \fi } -\newcommand*{\test@dimen}[1]{% +\newcommand*{\scr@test@dimen}[1]{% \ifx -#1\else\ifx +#1\else - \def\scr@next{\let\scr@next\test@posdimen\scr@next#1}\fi\fi + \def\scr@next{\let\scr@next\scr@test@posdimen\scr@next#1}\fi\fi \scr@next } -\newcommand*{\test@posdimen}[1]{% +\newcommand*{\scr@test@posdimen}[1]{% \ifx \scr@next#1% \@tempswafalse\let\scr@next\relax \else @@ -1348,22 +1366,22 @@ \expandafter\expandafter\expandafter\number\expandafter`#1\relax \ifnum \@tempcnta>47 \ifnum \@tempcnta<58 - \else\def\scr@next{\test@dimunt#1}\fi - \else\def\scr@next{\test@dimunt#1}\fi + \else\def\scr@next{\scr@test@dimunt#1}\fi + \else\def\scr@next{\scr@test@dimunt#1}\fi \fi\fi \fi \scr@next } -\newcommand*{\test@dimunt}{} -\def\test@dimunt#1\scr@next{% - \expandafter\test@trueunt#1truetrue\test@trueunt +\newcommand*{\scr@test@dimunt}{} +\def\scr@test@dimunt#1\scr@next{% + \expandafter\scr@test@trueunt#1truetrue\scr@test@trueunt } -\newcommand*{\test@trueunt}{} -\def\test@trueunt#1true#2true#3\test@trueunt{% +\newcommand*{\scr@test@trueunt}{} +\def\scr@test@trueunt#1true#2true#3\scr@test@trueunt{% \edef\reserved@a{#1}% - \ifx\reserved@a\@empty\test@@ifdimunt{#2}\else\test@@ifdimunt{#1}\fi + \ifx\reserved@a\@empty\scr@test@@dimunt{#2}\else\scr@test@@dimunt{#1}\fi } -\newcommand*\test@@ifdimunt[1]{% +\newcommand*\scr@test@@dimunt[1]{% \@tempswafalse \Ifstr{#1}{pt}{\@tempswatrue}{% \Ifstr{#1}{pc}{\@tempswatrue}{% @@ -1500,9 +1518,10 @@ \Ifdvioutput } \newcommand*{\Ifdvioutput}{\scr@ifdvioutput} -\newcommand*{\scr@smashdp}[1]{% +\DeclareRobustCommand{\scr@smashdp}[1]{% + \relax \begingroup - \def\finsm@sh{\dp\z@\z@\box\z@}% + \def\finsm@sh{\dp\z@\z@ \leavevmode\box\z@}% \ifmmode \expandafter\mathpalette\expandafter\mathsm@sh \else @@ -1519,7 +1538,7 @@ \else \expandafter\@secondoftwo \fi - } + }% } \newcommand*{\IfLTR}{% \scr@ifundefinedorrelax{if@RTL}{\@firstoftwo}{% @@ -1529,7 +1548,7 @@ \else \expandafter\@firstoftwo \fi - } + }% } \providecommand*{\PackageInfoNoLine}[2]{% \PackageInfo{#1}{#2\@gobble}% @@ -2469,7 +2488,7 @@ }% }% } -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname @@ -2963,10 +2982,8 @@ \reserved@b }% } -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrbase.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index e32990aba3d..63d888571ba 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -141,9 +141,9 @@ \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -156,10 +156,6 @@ See KOMA-Script manual for more information about.% }% } -\newcommand*{\scr@osectarg}{0} -\newcommand*{\scr@activate@xsection}[1]{% - \renewcommand*{\scr@osectarg}{#1}% -} \newif\if@altsecnumformat\@altsecnumformatfalse \newif\if@autodot \renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue} @@ -173,9 +169,16 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } +\newcommand*{\scr@osectarg}{0} +\newcommand*{\scr@activate@xsection}[1]{% + \renewcommand*{\scr@osectarg}{#1}% +} \IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{} \newcommand*{\size@part}{} +\newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\size@partnumber}{} +\newcommand*{\scr@fnt@partnumber}{\size@partnumber} +\aliaskomafont{partprefix}{partnumber} \newcommand*{\scr@part@beforeskip}{% \z@ \@plus 1fil + \baselineskip } @@ -203,7 +206,9 @@ } \newif\if@chapterprefix \newcommand*{\size@chapter}{} +\newcommand*{\scr@fnt@chapter}{\size@chapter} \newcommand*{\size@chapterprefix}{\size@chapter} +\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newcommand*{\scr@chapter@beforeskip}{\z@} \let\scr@chapter@beforeskip\z@ \newcommand*{\scr@chapter@afterskip}{\z@} @@ -215,12 +220,17 @@ \newcommand*{\chapterheadendvskip}{\vskip\@tempskipa} \newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa} \newcommand*{\size@section}{} +\newcommand*{\scr@fnt@section}{\size@section} \newcommand*{\size@subsection}{} +\newcommand*{\scr@fnt@subsection}{\size@subsection} \newcommand*{\size@subsubsection}{} +\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\size@paragraph}{} +\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 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -303,10 +313,11 @@ \@namedef{scr@v@3.33}{18} \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} -\@namedef{scr@v@last}{19} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +\@namedef{scr@v@3.36}{20} +\@namedef{scr@v@last}{20} +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -380,7 +391,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -436,9 +447,9 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -524,7 +535,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -651,7 +662,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -678,6 +689,9 @@ \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} \newcommand*{\f@parfillskip}{\the\parfillskip} +\newcommand*{\scr@parindent}{1em} +\newcommand*{\scr@parskip}{\z@} +\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \AtEndOfClass{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -688,9 +702,6 @@ \newcommand*{\default@par@update}{} \let\default@par@update\relax \AtBeginDocument{\par@update} -\newcommand*{\scr@parindent}{1em} -\newcommand*{\scr@parskip}{\z@} -\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% @@ -817,7 +828,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagetrue @@ -849,9 +860,9 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1011,8 +1022,8 @@ }% \fi } -\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}% +\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \IfLTXAtLeastTF{2020/10/01}{% \KOMA@key{appendixprefix}[true]{% \Ifstr{#1}{default}{% @@ -1110,15 +1121,15 @@ \else\vskip\@tempskipa\fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\Huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@chapter}{\huge}% - \renewcommand*{\size@chapterprefix}{\size@chapter}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\Huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{chapter}{\huge}% + \setkomafont{chapterprefix}{\size@chapter}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % normal \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% @@ -1136,15 +1147,15 @@ \else\vskip\@tempskipa\fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@chapter}{\LARGE}% - \renewcommand*{\size@chapterprefix}{\size@chapter}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{chapter}{\LARGE}% + \setkomafont{chapterprefix}{\size@chapter}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % small \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% @@ -1162,15 +1173,15 @@ \else\vskip\@tempskipa\fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\LARGE}% - \renewcommand*{\size@partnumber}{\LARGE}% - \renewcommand*{\size@chapter}{\Large}% - \renewcommand*{\size@chapterprefix}{\size@chapter}% - \renewcommand*{\size@section}{\large}% - \renewcommand*{\size@subsection}{\normalsize}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\LARGE}% + \setkomafont{partnumber}{\LARGE}% + \setkomafont{chapter}{\Large}% + \setkomafont{chapterprefix}{\size@chapter}% + \setkomafont{section}{\large}% + \setkomafont{subsection}{\normalsize}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % openany \KOMAoptions{open=any}% \or % openright @@ -1183,7 +1194,7 @@ \KOMAoptions{chapterprefix=false}% \or % twolineappendix \KOMAoptions{appendixprefix=true}% - \or % onelineappend + \or % onelineappendix \KOMAoptions{appendixprefix=false}% \or % optiontotocandhead \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% @@ -1215,15 +1226,15 @@ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{\vskip\@tempskipa}% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\Huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@chapter}{\Huge}% - \renewcommand*{\size@chapterprefix}{\huge}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\Huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{chapter}{\Huge}% + \setkomafont{chapterprefix}{\huge}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \renewcommand*{\sectfont}{\bfseries}% \KOMAoptions{open=right,chapterprefix=true}% \fi @@ -1234,7 +1245,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -1339,7 +1350,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1474,7 +1485,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1545,7 +1556,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1822,7 +1833,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1855,7 +1866,11 @@ \csname scr@bibstyle@#1\endcsname #3% }% - \g@addto@macro\scr@bibstylelist{, `#2'}% + \ifx\scr@bibstylelist\@empty + \edef\scr@bibstylelist{`#2'}% + \else + \edef\scr@bibstylelist{\scr@bibstylelist, `#2'}% + \fi }% }{% \ClassError{\KOMAClassName}{bibliography style `#2' already exists}{% @@ -1869,7 +1884,7 @@ \newcommand*{\scr@bibstyle@}{} \newcommand*{\bib@beginhook}{} \newcommand*{\bib@endhook}{} -\newcommand*{\scr@bibstylelist}{\@gobble} +\newcommand*{\scr@bibstylelist}{} \newcommand*{\@openbib@code}{} \newcommand*{\newblock}{} \newbibstyle{openstyle}{% @@ -1991,7 +2006,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3706 2022-02-15 09:36:50Z kohm $ %%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown @@ -2076,22 +2091,22 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2573,13 +2588,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z 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 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2626,12 +2641,50 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: body) +\newcommand*{\par@updaterelative}{% + \begingroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent + \aftergroup\parindent@update + \fi + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip + \aftergroup\parskip@update + \fi + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip + \aftergroup\parfillskip@update + \fi + \endgroup +} +\newcommand*{\parindent@update}{% + \scr@defaultunits\parindent\scr@parindent + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent\else + \def\reserved@b{\endgroup\edef\f@parindent{\the\parindent}}% + \fi + \reserved@b +} +\newcommand*{\parskip@update}{% + \scr@defaultunits\parskip\scr@parskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip\else + \def\reserved@b{\endgroup\edef\f@parskip{\the\parskip}}% + \fi + \reserved@b +} +\newcommand*{\parfillskip@update}{% + \scr@defaultunits\parfillskip\scr@parfillskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip\else + \def\reserved@b{\endgroup\edef\f@parfillskip{\the\parfillskip}}% + \fi + \reserved@b +} \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} -\setlength{\columnsep}{10\p@} -\setlength{\columnseprule}{\z@} \IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% @@ -2702,46 +2755,6 @@ \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\newcommand*{\par@updaterelative}{% - \begingroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent - \aftergroup\parindent@update - \fi - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip - \aftergroup\parskip@update - \fi - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip - \aftergroup\parfillskip@update - \fi - \endgroup -} -\newcommand*{\parindent@update}{% - \scr@defaultunits\parindent\scr@parindent - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent\else - \def\@tempb{\endgroup\edef\f@parindent{\the\parindent}}% - \fi - \@tempb -} -\newcommand*{\parskip@update}{% - \scr@defaultunits\parskip\scr@parskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip\else - \def\@tempb{\endgroup\edef\f@parskip{\the\parskip}}% - \fi - \@tempb -} -\newcommand*{\parfillskip@update}{% - \scr@defaultunits\parfillskip\scr@parfillskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip\else - \def\@tempb{\endgroup\edef\f@parfillskip{\the\parfillskip}}% - \fi - \@tempb -} \newcommand*{\scr@defaultunits}[2]{% \begingroup \edef\@tempa{#2}% @@ -2799,10 +2812,12 @@ \l@addto@macro{\@listiii}{\@list@extra}% \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% +\setlength{\columnsep}{10\p@} +\setlength{\columnseprule}{\z@} \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -3176,20 +3191,20 @@ }{% \if@restonecol\twocolumn \else \newpage \fi }% -\newcommand*\titlefont{\sectfont}% -\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newkomafont{subtitle}{\usekomafont{title}\large}% \newkomafont{titlehead}{}% \newkomafont{author}{\Large} \newkomafont{date}{\Large} \newkomafont{publishers}{\Large} \newkomafont{dedication}{\Large} +\newcommand*\titlefont{\sectfont}% \newcommand*{\scr@fnt@title}{\titlefont}% +\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3203,7 +3218,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -3223,18 +3238,41 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z 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 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: body) +\BeforeClosingMainAux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% + \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% + \fi\fi} +\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% + \expandafter\@@maybeautodot #1\@stop\endgroup\fi +} +\newcommand*{\@@maybeautodot}[1]{% + \ifx #1\@stop\let\@@maybeautodot\relax + \else + \ifx #1\Alph \@autodottrue\fi + \ifx #1\alph \@autodottrue\fi + \ifx #1\Roman \@autodottrue\fi + \ifx #1\roman \@autodottrue\fi + \ifx #1\@Alph \@autodottrue\fi + \ifx #1\@alph \@autodottrue\fi + \ifx #1\@Roman \@autodottrue\fi + \ifx #1\@roman \@autodottrue\fi + \ifx #1\romannumeral \@autodottrue\fi + \fi + \@@maybeautodot +} +\newcommand*\autodot{\if@altsecnumformat.\fi} \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% \ClassWarning{\KOMAClassName}{Usage of deprecated command @@ -3272,29 +3310,6 @@ \newcommand*{\Ifunnumbered}[1]{% \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% } -\BeforeClosingMainAux{% - \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% - \fi\fi} -\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% - \expandafter\@@maybeautodot #1\@stop\endgroup\fi -} -\newcommand*{\@@maybeautodot}[1]{% - \ifx #1\@stop\let\@@maybeautodot\relax - \else - \ifx #1\Alph \@autodottrue\fi - \ifx #1\alph \@autodottrue\fi - \ifx #1\Roman \@autodottrue\fi - \ifx #1\roman \@autodottrue\fi - \ifx #1\@Alph \@autodottrue\fi - \ifx #1\@alph \@autodottrue\fi - \ifx #1\@Roman \@autodottrue\fi - \ifx #1\@roman \@autodottrue\fi - \ifx #1\romannumeral \@autodottrue\fi - \fi - \@@maybeautodot -} -\newcommand*\autodot{\if@altsecnumformat.\fi} \newcommand*{\scr@saved@startsection}[6]{% \if@noskipsec \leavevmode \fi \par @@ -4951,34 +4966,6 @@ \fi }% } -\newcommand*{\bprot@dottedtocline}[5]{% - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \ClassWarning{\KOMAClassName}{% - usage of `\string\bprot@dottedtocline' is deprecated.\MessageBreak - Maybe an old auxiliary file has been used.\MessageBreak - Note, this command will be removed from\MessageBreak - KOMA-Script soon. So if this warning message\MessageBreak - persists after one more LaTeX run, you should\MessageBreak - redeclare the corresponding ToC entries using\MessageBreak - \string\DeclareTOCStyleEntry[\MessageBreak - \space\space level=\detokenize{#1},\MessageBreak - \space\space indent=\detokenize{#2},\MessageBreak - \space\space numwidth=\detokenize{#3}]{default}{...},\MessageBreak - where `...' is the name of the ToC level.\MessageBreak - Note, in future usage of `\string\bprot@dottedtocline'\MessageBreak - could result in an error% - }% - \ifnum #1>\c@tocdepth \else - \ifnum \lastpenalty<\numexpr 20010-#1\relax - \addpenalty{\@lowpenalty}% - \fi - \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \penalty \numexpr 20009-#1\relax - \fi - \else - \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \fi -} \newif\if@mainmatter\@mainmattertrue \newcommand*\frontmatter{% \if@twoside\cleardoubleoddpage\else\clearpage\fi @@ -5218,6 +5205,8 @@ \renewcommand*{\thepart}{\@Roman\c@part} \newcommand*{\partformat}{\partname~\thepart\autodot} \newcommand*\partname{Part} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\partname{Part} \newcommand*{\partmark}[1]{\@mkboth{}{}} \newcommand*\addpartmark[1]{% \begingroup @@ -5229,9 +5218,6 @@ } \newcommand*{\raggedpart}{} \let\raggedpart\centering -\newcommand*{\scr@fnt@part}{\size@part} -\newcommand*{\scr@fnt@partnumber}{\size@partnumber} -\aliaskomafont{partprefix}{partnumber} \newkomafont{partentry}{\usekomafont{disposition}\large} \newkomafont{partentrypagenumber}{} \newcommand*{\scr@startchapter}[1]{% @@ -5329,6 +5315,7 @@ \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% \fi + \scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d{#1}% \if@twocolumn \if@at@twocolumn \@nameuse{@make#1head}{#3}% @@ -5340,12 +5327,37 @@ \fi \@afterheading } +\expandafter\ifnum\scr@v@is@ge{3.36}% + \newcommand*{\scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d}[1]{% + \Ifstr{#1}{chapter}{% + \begingroup + \def\reserved@a{\scr@makechapterhead{chapter}}% + \ifx\@makechapterhead\reserved@a\else + \ClassWarningNoLine{\KOMAClassName}{% + Redefinition of \string\@makechapterhead\space detected.\MessageBreak + Note: KOMA-Script does use styles for commands like\MessageBreak + \string\chapter. Currently it internally still provides and\MessageBreak + uses \string\@makechapterhead, but a completely different\MessageBreak + definition compared to the standard classes.\MessageBreak + So redefining or using internal \string\@makechapterhead\MessageBreak + by users or package authors may already break\MessageBreak + KOMA-Script and will not work with a coming version,\MessageBreak + that will remove this deprecated code}% + \let\scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d\@gobbble + \fi + \endgroup + }{}% + } +\else + \let\scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d\@gobble +\fi \newcommand*{\scr@@startschapter}[2]{% \ExecuteDoHook{heading/branch/star/#1}% \begingroup \let\@mkboth\@gobbletwo \hy@insteadofrefstepcounter{#1}% \endgroup + \scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d{#1}% \if@twocolumn \if@at@twocolumn \@nameuse{@makes#1head}{#2}% @@ -5357,7 +5369,31 @@ \fi \@afterheading } -%% \begin{macro}{\if@at@twocolumn} +\expandafter\ifnum\scr@v@is@ge{3.36}% + \newcommand*{\scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d}[1]{% + \Ifstr{#1}{chapter}{% + \begingroup + \def\reserved@a{\scr@makeschapterhead{chapter}}% + \ifx\@makeschapterhead\reserved@a\else + \ClassWarningNoLine{\KOMAClassName}{% + Redefinition of \string\@makeschapterhead\space detected.\MessageBreak + Note: KOMA-Script does use styles for commands like\MessageBreak + \string\chapter. Currently it internally still provides and\MessageBreak + uses \string\@makeschapterhead, but a completely different\MessageBreak + definition compared to the standard classes.\MessageBreak + So redefining or using internal \string\@makeschapterhead\MessageBreak + by users or package authors may already break\MessageBreak + KOMA-Script and will not work with a coming version,\MessageBreak + that will remove this deprecated code}% + \let\scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d\@gobble + \fi + \endgroup + }{}% + } +\else + \let\scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d\@gobble +\fi +%% \begin{macro}{\@at@twocolumntrue,\@at@twocolumnfalse,\if@at@twocolumn} \newif\if@at@twocolumn \newcommand*\scr@topnewpage{} \let\scr@topnewpage\@topnewpage @@ -5369,11 +5405,6 @@ \@nameuse{@@make#1head}{#2}% \use@preamble{#1@u}% } -\newcommand*{\scr@makeschapterhead}[2]{% - \use@chapter@o@preamble{#1}% - \@nameuse{@@makes#1head}{#2}% - \use@preamble{#1@u}% -} \newcommand*{\scr@@makechapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \csname scr@#1@afterindent\endcsname @@ -5431,6 +5462,11 @@ \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \chapterheadendvskip } +\newcommand*{\scr@makeschapterhead}[2]{% + \use@chapter@o@preamble{#1}% + \@nameuse{@@makes#1head}{#2}% + \use@preamble{#1@u}% +} \newcommand*{\scr@@makeschapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \csname scr@#1@afterindent\endcsname @@ -5576,18 +5612,11 @@ \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} \newcommand*\chaptername{Chapter} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\chaptername{Chapter} \newcommand*\appendixname{Appendix} -\newcommand*{\chapappifprefix}[1][]{% - \ClassWarning{\KOMAClassName}{% - Please don't use obsolete command - \string\chapappifprefix.\MessageBreak - The new command \string\chapappifchapterprefix\space has - an\MessageBreak - obligatory instead of an optional argument. Use that\MessageBreak - new command% - }% - \chapappifchapterprefix{#1}% -} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\appendixname{Appendix} \newcommand*{\chapappifchapterprefix}[1]{% \IfChapterUsesPrefixLine{\chapapp#1}{}% } @@ -5606,8 +5635,6 @@ \endgroup } \newcommand*{\raggedchapter}{\raggedsection} -\newcommand*{\scr@fnt@chapter}{\size@chapter} -\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newkomafont{chapterentry}{\usekomafont{disposition}} \newkomafont{chapterentrypagenumber}{} \newkomafont{chapterentrydots}{} @@ -5700,11 +5727,6 @@ \sectionmark{#1}% \endgroup } -\newcommand*{\scr@fnt@section}{\size@section} -\newcommand*{\scr@fnt@subsection}{\size@subsection} -\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} -\newcommand*{\scr@fnt@paragraph}{\size@paragraph} -\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} \DeclareSectionCommand[% style=chapter,% level=\z@,% @@ -5781,8 +5803,16 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: body) +\renewcommand*{\theequation}{% + \expandafter\ifnum\scr@v@is@gt{2.97d}% + \if@mainmatter\thechapter.\fi + \else + \thechapter.% + \fi + \@arabic\c@equation +} \newif\if@restonecol \newcommand{\dictum}[2][]{\par% \begingroup @@ -5809,15 +5839,6 @@ \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} -\@addtoreset{equation}{chapter} -\renewcommand*\theequation{% - \expandafter\ifnum\scr@v@is@gt{2.97d}% - \if@mainmatter\thechapter.\fi - \else - \thechapter.% - \fi - \@arabic\c@equation -} \newcommand*{\new@tpo@label}{\@newl@bel{tpo}} \AtBeginDocument{% \if@filesw @@ -5879,6 +5900,9 @@ \expandafter\@secondoftwo \fi } +\newcommand\marginline[1]{% + \marginpar[\raggedleft{#1}]{\raggedright #1}% +} \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% \@textsubscript{\selectfont#1}% @@ -5952,6 +5976,12 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} +\scr@package@not@recommended{titlesec}{% + KOMA-Script features\MessageBreak + like \string\setkomafont, \string\RedeclareSectionCommand, + \string\sectionlinesformat\MessageBreak + and several others to re-configure section\MessageBreak + headings} \AfterPackage*{sectsty}{% \@ifpackagelater{sectsty}{2002/02/26}{% \ClassInfo{\KOMAClassName}{Unknown `sectsty' release.\MessageBreak @@ -6090,35 +6120,7 @@ \let\scr@mt@saved@sect\relax \fi } -\AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2019/10/17}{% - \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak - Cross your fingers, that is compatible% - }% - }{% - \scr@class@titlesec@warning - }% -} -\providecommand*{\scr@class@titlesec@warning}{% - \ClassWarning{\KOMAClassName}{% - Usage of this version of package `titlesec'\MessageBreak - with KOMA-Script class `\KOMAClassName' is\MessageBreak - not recommended, because the package does not\MessageBreak - support KOMA-Script classes, but break them.\MessageBreak - If you want to use `titlesec' with KOMA-Script\MessageBreak - classes instead of using the KOMA-Script's\MessageBreak - user interface to configure the headings of\MessageBreak - parts, - chapters, sections - ... subparagraphs,\MessageBreak - please ask the author of `titlesec' for support.\MessageBreak - Expect errors like:\MessageBreak - \space\space- ``Illegal unit of measure (pt inserted).''\MessageBreak - \space\space- ``Missing number, treated as zero''\MessageBreak - after loading `titlesec'% - }% -} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -6219,7 +6221,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6230,11 +6232,8 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) -\newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% -} \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} \setlength{\abovecaptionskip}{10\p@} @@ -6247,8 +6246,8 @@ \newcommand*{\scap@caption}{} \newcommand*{\scap@width}{\linewidth} \newcommand*{\scap@move}{\z@} -\newcommand*{\scap@currentlabel}{} \newif\ifscap@alt +\newcommand*{\scap@currentlabel}{} \newcommand*{\@captionbeside}{} \long\def\@captionbeside[#1]#2{% \kernel@ifnextchar [%] @@ -6299,7 +6298,7 @@ \begin{lrbox}{\c@pti@nb@sid@b@x}% } \newenvironment*{captionbeside}{% - \@dblarg\@captionbeside% + \@dblarg\@captionbeside }{% \end{lrbox}% \settowidth{\@tempdima}{\usebox\c@pti@nb@sid@b@x}% @@ -6356,7 +6355,8 @@ \newcommand*{\scr@fnt@captionlabel}{\caplabelfont} \newif\ifdofullc@p \dofullc@ptrue -\newif\if@capbreak\@capbreakfalse +\newif\if@capbreak +\@capbreakfalse \newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}} \newcommand*{\@setcapindent}[1]{% \setlength{\@tempdima}{#1}% @@ -6946,10 +6946,15 @@ \endcaptionbeside } \newcommand*\figurename{Figure} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\figurename{Figure} \newcommand*\tablename{Table} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\tablename{Table} \DeclareNewTOC[% type=figure, float, + nonfloat, counterwithin=chapter, floatpos=tbp, floattype=1, @@ -6966,6 +6971,7 @@ \DeclareNewTOC[% type=table, float, + nonfloat, counterwithin=chapter, floatpos=tbp, floattype=2, @@ -6979,7 +6985,7 @@ \expandafter\ifnum\scr@v@is@le{2.97d}% \renewcommand*\thetable{\thechapter.\@arabic\c@table} \fi -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -7036,6 +7042,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \ExecuteDoHook{footnote/text/begin}% \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% @@ -7046,6 +7053,7 @@ \hskip \dimexpr #1-#2\relax }% \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + \ExecuteDoHook{footnote/text/end}% }% \else \ClassInfo{\KOMAClassName}{% @@ -7081,15 +7089,16 @@ \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} -\newcommand*{\scr@fnt@footnotenumber}{\ftnm@font} +\aliaskomafont{footnotenumber}{footnotelabel} \newcommand*{\scr@fnt@footnotelabel}{\ftnm@font} -\newcommand*{\scr@fnt@instead@footnotetext}{footnote} +\aliaskomafont{footnotetext}{footnote} \newcommand*\deffootnotemark[1]{% \def\@makefnmark{\hbox{\ftntm@font{#1}}}% } \newcommand*{\ftntm@font}{} \newcommand*{\scr@fnt@footnotereference}{\ftntm@font} -\newcommand*{\scr@fnt@footnoteref}{\ftntm@font} +\aliaskomafont{footnoteref}{footnotereference} +\aliaskomafont{footnotemark}{footnotereference} \newcommand*{\FN@mf@check}{% \ifdim\lastkern=\multiplefootnotemarker\relax \edef\@x@sf{\the\spacefactor}% @@ -7138,7 +7147,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7163,7 +7172,7 @@ \fi% } \newcommand*{\before@starttoc}[1]{% - \let\scr@dottedtocline=\@dottedtocline + \let\scr@dottedtocline=\@dottedtoclilne \renewcommand*{\@dottedtocline}[3]{% \scr@dottedtocline{##1}{\z@}{\last@l@number}}% \renewcommand*{\numberline@box}[1]{% @@ -7288,9 +7297,11 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \newcommand*\bibname{Bibliography} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax \newcommand{\setbibpreamble}[1]{\def\bibpreamble{#1}} @@ -7374,7 +7385,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3706 2022-02-15 09:36:50Z kohm $ %%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax @@ -7399,7 +7410,7 @@ \columnseprule \z@ \columnsep 35\p@ \setchapterpreamble{\index@preamble}% - \idx@heading% + \idx@heading \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% @@ -7415,7 +7426,9 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\indexname{Index} +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7439,11 +7452,6 @@ \@beginparpenalty=-\@lowpenalty \@endparpenalty =-\@lowpenalty \@itempenalty =-\@lowpenalty -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} -\setlength\tabbingsep{\labelsep} \renewcommand*\theenumi{\@arabic\c@enumi} \renewcommand*\theenumii{\@alph\c@enumii} \renewcommand*\theenumiii{\@roman\c@enumiii} @@ -7466,7 +7474,7 @@ \endlist } \newcommand*{\descriptionlabel}[1]{% - \hspace{\labelsep}\descfont #1% + \hspace{\labelsep}\usekomafont{descriptionlabel}{#1}% } \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% @@ -7581,10 +7589,13 @@ \newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +\setlength\arraycolsep{5\p@} +\setlength\tabcolsep{6\p@} +\setlength\arrayrulewidth{.4\p@} +\setlength\doublerulesep{2\p@} +\setlength\tabbingsep{\labelsep} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrbook.cls'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index d9cdb128f04..86400546cf6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,24 +65,24 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: scrtime.dtx 3688 2022-02-10 08:26:37Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ -%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: scrtime.dtx 3688 2022-02-10 08:26:37Z kohm $ +%%% From File: $Id: scrtime.dtx 3688 2022-02-10 08:26:37Z kohm $ \newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}} \newcommand*{\DecadePart}[1]{\XmodY{#1}{100}} \newcommand*{\@GaussYear}[3]{% @@ -248,10 +248,8 @@ * Local config file scrdate.cfg used^^J% *************************************}} {} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrdate.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls index ccb4e42cc74..99096df899e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrdoc.cls @@ -1,6 +1,6 @@ % ====================================================================== % scrdoc.dtx -% Copyright (c) Markus Kohm, 2002-2017 +% Copyright (c) Markus Kohm, 2002-2022 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -18,7 +18,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrdoc.dtx -% Copyright (c) Markus Kohm, 2002-2017 +% Copyright (c) Markus Kohm, 2002-2022 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -39,10 +39,66 @@ % Do not use this class for anything because it may change % incompatible from distribution to distribution % +\newcommand*{\UseOldscrdoc}{% + \def\reserved@a{scrsource}\edef\reserved@b{\jobname}% + \@onelevel@sanitize\reserved@a + \@onelevel@sanitize\reserved@b + \ifx\reserved@a\reserved@b + \AtBeginDocument{% + \ClassWarning{scrdoc}{% + Using emergency fallback definitions to make\MessageBreak + several new commands and environments of\MessageBreak + `koma-script-source-doc' available with\MessageBreak + deprecated `scrdoc'}% + \newcommand*{\cls}{\@ifstar\Class\Class}% + \newcommand*{\pkg}{\@ifstar\Package\Package}% + \newcommand*{\file}{\File}% + \newcommand*{\opt}{\Option}% + \newcommand*{\optvalue}{\texttt}% + \newcommand*{\fnt}{\texttt}% + \newenvironment{length}{\Length}{\endLength}% + \newenvironment{counter}{\Counter}{\endCounter}% + \newenvironment{fontelement}{\KOMAfont}{\endKOMAfont}% + \newenvironment{variable}{\KOMAvar}{\endKOMAvar}% + \newenvironment{command}{\macro}{\endmacro}% + \newcommand*{\MaybeStop}{\StopEventually}% + \newcommand*{\href}[2]{##2}% + }% + \fi +} +\ifdefined\IfFormatAtLeastTF + \IfFormatAtLeastTF{2022/06/01}{% + \IfFileExists{doc-2021-06-01.sty}{% + \renewcommand*{\UseOldscrdoc}{% + \ProvidesClass{scrdoc}[2022/01/16 v0.1zz + emulating deprecated class scrdoc using koma-script-source-doc] + \LoadClassWithOptions{koma-script-source-doc} + \RequirePackage{hologo} + \DeclareRobustCommand*{\eTeX}{\hologo{eTeX}}% + \NewCommandCopy\Class\cls + \NewCommandCopy\Package\pkg + \NewCommandCopy\Option\opt + \NewCommandCopy\File\file + \NewCommandCopy\Macro\cs + \NewCommandCopy\endLength\endlength + \NewCommandCopy\Length\length + \NewCommandCopy\endCounter\endcounter + \NewCommandCopy\Counter\counter + \NewCommandCopy\endKOMAfont\endfontelement + \NewCommandCopy\KOMAfont\fontelement + \NewCommandCopy\endKOMAvar\endvariable + \NewCommandCopy\KOMAvar\variable + \setcounter{IndexColumns}{2}% + \endinput + }% + }{}% + }{}% +\fi +\UseOldscrdoc \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{scrdoc}[% - 2016/04/12 v0.1e KOMA-Script source documentation class] + 2022/02/09 v0.1i KOMA-Script source documentation class] % Load standard LaTeX documentation class, passing all options to it % but use scrartcl instead of article. @@ -90,7 +146,16 @@ }% \newcommand*{\marginline}{\marginpar}% } +% scrdoc is incompatible with ltxdoc v3 and doc v3. Several changes will +% be needed to improve this. However, currently a kind of emergency +% workaround can be used. +\IfFileExists{doc-2021-06-01.sty}{% + \RequirePackage{scrlfile}% + \ReplaceInput{doc.sty}{doc-2021-06-01.sty}% + \PassOptionsToClass{nocfg}{ltxdoc}% +}{} \LoadClassWithOptions{ltxdoc} +\@ifundefined{cs}{\DeclareRobustCommand\cs[1]{\texttt{\bslash #1}}}{} % Use two columns at index \setcounter{IndexColumns}{2} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index cfe56f03e81..fa462611cae 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 %% . %% -%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrextend.dtx 3773 2022-03-29 06:27:55Z 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 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,16 +100,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrextend.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: prepare) \ProvidesPackage{scrextend}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 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 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -222,8 +222,9 @@ \@namedef{scr@v@3.33}{18} \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} -\@namedef{scr@v@last}{19} -%%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ +\@namedef{scr@v@3.36}{20} +\@namedef{scr@v@last}{20} +%%% From File: $Id: scrextend.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \KOMA@key{extendedfeature}{% \scr@ext@activate{#1}% @@ -247,7 +248,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -302,7 +303,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -361,7 +362,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% @@ -398,7 +399,7 @@ scrextend.\scr@pkgextension }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: option) \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% @@ -442,93 +443,13 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: option) -\KOMA@key{cleardoublepage}{% - \begingroup% - \def\@tempc{% - \endgroup% - \KOMA@unknown@keyval{cleardoublepage}{#1}{% - 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}% - }% - \Ifstr{#1}{current}{% - \def\@tempc{\endgroup% - \def\cleardoublepage{\cleardoublestandardpage}% - \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% - \def\cleardoubleevenpage{\cleardoubleevenstandardpage}% - \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% - scrextend.\scr@pkgextension - }{cleardoublepage}{current}% - }% - }{% - \Ifnotundefined{ps@#1}{% - \def\@tempc{\endgroup% - \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% - \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% - \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}% - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - scrextend.\scr@pkgextension - }{cleardoublepage}{#1}% - }% - }{% - }% - }% - \@tempc -} -\newcommand*{\cleardoubleoddstandardpage}{} -\let\cleardoubleoddstandardpage=\cleardoublepage -\newcommand*{\cleardoubleoddpageusingstyle}[1]{\clearpage - {\pagestyle{#1}\cleardoubleoddstandardpage}} -\newcommand*{\cleardoubleoddemptypage}{\cleardoubleoddpageusingstyle{empty}} -\newcommand*{\cleardoubleoddplainpage}{\cleardoubleoddpageusingstyle{plain}} -\newcommand*{\cleardoubleevenstandardpage}{% - \clearpage - \if@twoside\ifodd\c@page - \hbox{}\newpage\if@twocolumn\hbox{}\newpage\fi - \fi\fi -} -\newcommand*{\cleardoubleevenpageusingstyle}[1]{\clearpage - {\pagestyle{#1}\cleardoubleevenstandardpage}} -\newcommand*{\cleardoubleevenemptypage}{\cleardoubleevenpageusingstyle{empty}} -\newcommand*{\cleardoubleevenplainpage}{\cleardoubleevenpageusingstyle{plain}} -\newcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage} -\renewcommand*{\cleardoublepage}{% - \expandafter\ifnum \@nameuse{scr@v@2.98c}<\scr@compatibility\relax - \cleardoubleemptypage - \else - \cleardoublestandardpage - \fi -} -\KOMA@kav@add{.% - scrextend.\scr@pkgextension -}{cleardoublepage}{% - \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{.% - scrextend.\scr@pkgextension - }{cleardoublepage}% - \KOMA@kav@xadd{.% - scrextend.\scr@pkgextension - }{cleardoublepage}{\@tempa}% -} -\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage} -\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage} -\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage - {\pagestyle{#1}\cleardoublestandardpage}} -\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} -\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -599,16 +520,16 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -965,7 +886,7 @@ because I do not change it% }% } -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: body) \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% @@ -1343,21 +1264,19 @@ }% }{}% }\csname scr@ext@immediate@title\endcsname -\newcommand*\titlefont{\sectfont}% -\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newkomafont{subtitle}{\usekomafont{title}\large}% \newkomafont{titlehead}{}% \newkomafont{author}{\Large} \newkomafont{date}{\Large} \newkomafont{publishers}{\Large} \newkomafont{dedication}{\Large} +\newcommand*\titlefont{\sectfont}% \newcommand*{\scr@fnt@title}{\titlefont}% +\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: body) -\newcommand*{\scr@fnt@disposition}{\sectfont} -\aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname @@ -1446,6 +1365,9 @@ \expandafter\@secondoftwo \fi } +\newcommand\marginline[1]{% + \marginpar[\raggedleft{#1}]{\raggedright #1}% +} \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% \@textsubscript{\selectfont#1}% @@ -1461,18 +1383,16 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) -\newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% -} -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: body) \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \ExecuteDoHook{footnote/text/begin}% \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% @@ -1483,6 +1403,7 @@ \hskip \dimexpr #1-#2\relax }% \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + \ExecuteDoHook{footnote/text/end}% }% \else \PackageInfo{scrextend}{% @@ -1518,15 +1439,16 @@ \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} -\newcommand*{\scr@fnt@footnotenumber}{\ftnm@font} +\aliaskomafont{footnotenumber}{footnotelabel} \newcommand*{\scr@fnt@footnotelabel}{\ftnm@font} -\newcommand*{\scr@fnt@instead@footnotetext}{footnote} +\aliaskomafont{footnotetext}{footnote} \newcommand*\deffootnotemark[1]{% \def\@makefnmark{\hbox{\ftntm@font{#1}}}% } \newcommand*{\ftntm@font}{} \newcommand*{\scr@fnt@footnotereference}{\ftntm@font} -\newcommand*{\scr@fnt@footnoteref}{\ftntm@font} +\aliaskomafont{footnoteref}{footnotereference} +\aliaskomafont{footnotemark}{footnotereference} \providecommand*{\FN@mf@check}{% \ifdim\lastkern=\multiplefootnotemarker\relax \edef\@x@sf{\the\spacefactor}% @@ -1600,7 +1522,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: body) \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% @@ -1679,10 +1601,8 @@ } \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrextend.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index bf46a10f8c9..0449fe5250b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,21 +64,21 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: identify) \ProvidesPackage{scrfontsizes}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% @@ -366,10 +366,8 @@ \immediate\closeout\@fontfile } \@onlypreamble\generatefontfile -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrfontsizes.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 5824ccb9bac..853c2500f74 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,22 +65,22 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z 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 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -211,10 +211,8 @@ \input{standardsections.hak}% \fi } -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrhack.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 8c6b30ae3ac..4a529519d84 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -44,21 +44,21 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrjura.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (for jurists) ] -%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrjura.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: init) \@ifpackageloaded{hyperref}{% \PackageError{scrjura}{Package hyperref already loaded}{% - If you want to use package scrjura with package hyperref, you have to - use\MessageBreak - package scrjura before package hyperref.\MessageBreak + If you want to use package scrjura with package hyperref, you have + to\MessageBreak + load package scrjura before package hyperref.\MessageBreak To solve the problem, you just should move the loading of package hyperref\MessageBreak behind the loading of package scrjura.}% @@ -70,10 +70,19 @@ numwidth=2em, level=\maxdimen ]{default}{cpar} -%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrjura.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: options) -\DeclareOption{contract}{% - \g@addto@macro\document\contract% +\KOMA@ifkey{contract}{@documentcontract} +\IfLTXAtLeastTF{2020/10/01}{% + \AddToHook{begindocument/end}{% + \RelaxFamilyKey[.scrjura.sty]{KOMA}{contract}% + \if@documentcontract\expandafter\contract\fi + }% +}{% + \g@addto@macro\document{% + \RelaxFamilyKey[.scrjura.sty]{KOMA}{contract}% + \if@documentcontract\expandafter\contract\fi + }% } \KOMA@key{juratotoc}[true]{% \KOMA@set@ifkey{juratotoc}{@tempswa}{#1}% @@ -268,10 +277,10 @@ \KOMA@kav@add{.scrjura.sty}{ref}{sentencelong}% \KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong} \KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong} -%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrjura.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: postoptions) \KOMAProcessOptions\relax -%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrjura.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \providecommand*{\DeprecatedParagraph}{% \PackageError{scrjura}{modification of old document needed}{% @@ -340,7 +349,7 @@ \newcommand*{\parellipsis}{% \scr@ifundefinedorrelax{textellipsis}{\dots}{\textellipsis}% } -\newcommand*{\contract}{% +\newenvironment{contract}{% \ifx\scrjura@env@type\@empty \let\@doendpe\scrjura@doendpe \let\Clause\contract@paragraph @@ -358,7 +367,7 @@ a `\scrjura@env@type' environment or after loading\MessageBreak package `scrjura' with option `\scrjura@env@type'!}% \fi -} +}{} \let\if@scrjura@skiphyperref\iftrue \let\cl@Clause\@empty \let\cl@SubClause\@empty @@ -1106,12 +1115,10 @@ }% \fi } -%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrjura.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: final) -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrjura.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index dded3fafb21..f762d4a217f 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 %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (% KOMA-Script-dependent @@ -242,12 +242,12 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% @@ -415,7 +415,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \newcommand*{\IfExistskomafont}[1]{% \scr@ifundefinedorrelax{scr@fnt@#1}{% @@ -635,10 +635,8 @@ #2% }% } -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrkbase.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty index d9882b0ff39..3d078af4ca3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -5,11 +5,11 @@ %% The original source files were: %% %% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,identify') -%% scrlayer.dtx (with options: `interface,trace,notecolumn,init') +%% scrlayer.dtx (with options: `interface,notecolumn,init') %% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,init') -%% scrlayer.dtx (with options: `interface,trace,notecolumn,options') +%% scrlayer.dtx (with options: `interface,notecolumn,options') %% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,options') -%% scrlayer.dtx (with options: `interface,trace,notecolumn,body') +%% scrlayer.dtx (with options: `interface,notecolumn,body') %% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,body') %% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final') %% scrlogo.dtx (with options: `logo') @@ -46,14 +46,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3694 2022-02-10 13:53:33Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2021/05/30 v0.3.3601 KOMA-Script + 2022/02/10 v0.3.3694 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -64,7 +64,7 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3694 2022-02-10 13:53:33Z kohm $ %%% (run: init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% @@ -97,7 +97,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -241,11 +241,11 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3694 2022-02-10 13:53:33Z kohm $ %%% (run: options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns} \slnc@autoclearnotecolumnstrue -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -317,7 +317,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3694 2022-02-10 13:53:33Z kohm $ %%% (run: body) \newcommand*{\DeclareNoteColumn}[2][]{% \@ifundefined{slnc@#2@box}{% @@ -634,9 +634,9 @@ \fi }% \long\def\slnc@note##1##2##3##4{% - \typeout{TRACE (slnc): ##2<=\theslncpage?}% + \PackageInfo{scrlayer-notecolumn}{TRACE (slnc): ##2<=\theslncpage?}% \ifnum ##2>\value{slncpage}\relax - \typeout{TRACE (slnc): no: unprocess note}% + \PackageInfo{scrlayer-notecolumn}{TRACE (slnc): no: unprocess note}% \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{% \slnc@note{##1}{##2}{##3}{##4}% }% @@ -674,7 +674,6 @@ \@tempdimb=\dimexpr \expandafter\ht\csname slnc@#1@box\endcsname +\expandafter\dp\csname slnc@#1@box\endcsname \relax - \typeout{Soll: \the\@tempdima^^JIst: \space\the\@tempdimb}% \ifdim\@tempdima<\@tempdimb \PackageInfo{scrlayer-notecolumn}{% Note moved down from\MessageBreak @@ -770,10 +769,10 @@ \scr@ifundefinedorrelax{slnc@#1@colorstack}{% \def\set@color{% \PackageWarningNoLine{scrlayer-notecolumn}{% - unsupported change of colour!\MessageBreak + unsupported change of color!\MessageBreak It seems you are using a TeX engine,\MessageBreak that does not support switching the\MessageBreak - colour stack like pdfTeX or luaTeX do.\MessageBreak + color stack like pdfTeX or luaTeX do.\MessageBreak Because of this, usage of \string\color,\MessageBreak \string\textcolor\space etc. inside a note column\MessageBreak @@ -789,7 +788,7 @@ \scr@ifundefinedorrelax{pdfcolorstack}{% \scr@ifundefinedorrelax{pdfextension}{% \PackageError{scrlayer-notecolumm}{% - colour stack defined but not usable% + color stack defined but not usable% }{% \expandafter\string \csname slnc@#1@colorstack\endcsname\space defined @@ -976,12 +975,13 @@ \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}% \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}% }% - \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, + \PackageInfo{scrlayer-notecolumn}{% + TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, abspage=\the\value{slncpage}, until page=\slnc@cmp@value, process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}% \ifvmode\ifdim \pagetotal<\topskip \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}% - \typeout{TRACE (slnc): until page=\slnc@cmp@value}% + \PackageInfo{scrlayer-notecolumn}{TRACE (slnc): until page=\slnc@cmp@value}% \fi\fi \ifnum \reserved@a=\z@ \ifvmode @@ -1019,7 +1019,7 @@ \@tempswatrue \fi \@whilesw\if@tempswa\fi{% - \typeout{TRACE (slnc): add \string\clearpage}% + \PackageInfo{scrlayer-notecolumn}{TRACE (slnc): add \string\clearpage}% \clearpage \expandafter\ifcase \slnc@voidtest{#1}% \begingroup @@ -1091,12 +1091,13 @@ \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}% \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}% }% - \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, + \PackageInfo{scrlayer-notecolumn}{% + TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, abspage=\theslncpage, until page=\slnc@cmp@value, process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}% \ifvmode\ifdim \pagetotal<\topskip \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}% - \typeout{TRACE (slnc): until page=\slnc@cmp@value}% + \PackageInfo{scrlayer-notecolumn}{TRACE (slnc): until page=\slnc@cmp@value}% \fi\fi \ifnum \reserved@a=\z@ \ifvmode @@ -1135,7 +1136,7 @@ \@tempswatrue \fi \@whilesw\if@tempswa\fi{% - \typeout{TRACE (slnc): add \string\clearpage}% + \PackageInfo{scrlayer-notecolumn}{TRACE (slnc): adding \string\clearpage}% \clearpage \begingroup \def\@elt##1{+\slnc@voidtest{##1}}% @@ -1195,7 +1196,7 @@ Using \string\syncwithnotecolumn\space in horizontal\MessageBreak mode may result in unwanted vertical\MessageBreak space inside paragraphs and may lost\MessageBreak - colours of text of notes. \space So perhaps you\MessageBreak + colors of text of notes. \space So perhaps you\MessageBreak should move \string\syncwithnotecolumn\space before\MessageBreak or after the paragraph% }% @@ -1309,7 +1310,7 @@ \vadjust{#1}% \@esphack } -%%% From File: $Id: scrlayer-notecolumn.dtx 3601 2021-05-30 19:11:44Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3694 2022-02-10 13:53:33Z kohm $ %%% (run: final) \DeclareNoteColumn{marginpar} \let\reserved@a\clearpage @@ -1317,10 +1318,8 @@ \ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi }% \expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrlayer-notecolumn.sty'. 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 887081a1efc..bb9904b2f61 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,identify') -%% scrlayer.dtx (with options: `interface,trace,scrpage,init') -%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,init') -%% scrlayer.dtx (with options: `interface,trace,scrpage,options') -%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,options') -%% scrlayer.dtx (with options: `interface,trace,scrpage,body') -%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body') +%% scrlayer-scrpage.dtx (with options: `interface,scrpage,identify') +%% scrlayer.dtx (with options: `interface,scrpage,init') +%% scrlayer-scrpage.dtx (with options: `interface,scrpage,init') +%% scrlayer.dtx (with options: `interface,scrpage,options') +%% scrlayer-scrpage.dtx (with options: `interface,scrpage,options') +%% scrlayer.dtx (with options: `interface,scrpage,body') +%% scrlayer-scrpage.dtx (with options: `interface,scrpage,body') %% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 2012-2021 Markus Kohm [komascript at gmx info] @@ -45,14 +45,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3693 2022-02-10 13:20:09Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -63,24 +63,20 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3693 2022-02-10 13:20:09Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% } \newcommand*{\sls@auto@pagestyleset}{% \scr@ifundefinedorrelax{KOMAClassName}{% - \PackageInfoNoLine{scrlayer-scrpage}{% - auto-selection of `pagestyleset=standard'}% \FamilyExecuteOptions[.scrlayer-scrpage.sty]{KOMA}{pagestyleset=standard}% }{% - \PackageInfoNoLine{scrlayer-scrpage}{% - auto-selection of `pagestyleset=KOMA-Script'}% \FamilyExecuteOptions[.scrlayer-scrpage.sty]{KOMA}% {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% @@ -226,7 +222,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3693 2022-02-10 13:20:09Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -631,7 +627,7 @@ \KOMA@ifkey{hmode}{sls@leavevmode} \KOMA@ifkey{autoenlargeheadfoot}{sls@autoenlarge} \KOMAExecuteOptions{autoenlargeheadfoot=true} -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -703,12 +699,20 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 3595 2021-05-16 07:11:07Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3693 2022-02-10 13:20:09Z kohm $ %%% (run: body) \newcommand*{\setheadwidth}[2][]{% + \PackageWarning{scrlayer-scrpage}{% + Command `\string\setheadwidth' is deprecated.\MessageBreak + I'm using \detokenize{\KOMAoptions{headwidth=#2:#1}} instead,\MessageBreak + and so should you do}% \KOMAoptions{headwidth=#2:#1}% }% \newcommand*{\setfootwidth}[2][]{% + \PackageWarning{scrlayer-scrpage}{% + Command `\string\setfootwidth' is deprecated.\MessageBreak + I'm using \detokenize{\KOMAoptions{footwidth=#2:#1}} instead,\MessageBreak + and so should you do}% \KOMAoptions{footwidth=#2:#1}% }% \newcommand*{\setheadtopline}{\sls@setline{head}{above}}% @@ -1090,9 +1094,6 @@ }{} }{} \scr@ifundefinedorrelax{scr@fnt@wrn@pagehead}{}{% - \PackageInfo{scrlayer-scrpage}{% - deactivating warning for font element\MessageBreak - `pagehead'}% \let\scr@fnt@wrn@pagehead\relax } \@ifundefined{scr@fnt@pagefoot}{% @@ -1102,9 +1103,6 @@ }{}% }{} \scr@ifundefinedorrelax{scr@fnt@wrn@pagefoot}{}{% - \PackageInfo{scrlayer-scrpage}{% - deactivating warning for font element\MessageBreak - `pagefoot'}% \let\scr@fnt@wrn@pagefoot\relax } \newcommand*\sls@hf@rule[3]{% @@ -1212,10 +1210,6 @@ \@ifundefined{ps@#1}{% \defpagestyle{#1}{#2}{#3}% }{% - \PackageInfo{scrlayer-scrpage}{% - page style `#1' already defined.\MessageBreak - New definition ignored% - }% }% } \newcommand*{\deftriplepagestyle}[1]{% @@ -1532,14 +1526,8 @@ \newcommand*{\providepairofpagestyles}[3][]{% \scr@ifundefinedorrelax{ps@#2}{% \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{% - \PackageInfo{scrlayer-scrpage}{% - Plain page style of `#2' already\MessageBreak - defined. Definition ignored}% }% }{% - \PackageInfo{scrlayer-scrpage}{% - Page style of `#2' already defined.\MessageBreak - Definition ignored}% }% }% \newpairofpagestyles{scrheadings}{}% @@ -1665,10 +1653,8 @@ \expandafter\newcommand\expandafter*\csname ps@plain.useheadings\endcsname{% \@nameuse{ps@plain.scrheadings}% }% -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrlayer-scrpage.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 97fe9433fa2..d19462d64e5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -4,11 +4,11 @@ %% %% The original source files were: %% -%% scrlayer.dtx (with options: `package,trace,scrlayer,identify') -%% scrlayer.dtx (with options: `package,trace,scrlayer,init') -%% scrlayer.dtx (with options: `package,trace,scrlayer,options') -%% scrlayer.dtx (with options: `package,trace,scrlayer,body') -%% scrlayer.dtx (with options: `package,trace,scrlayer,final') +%% scrlayer.dtx (with options: `package,scrlayer,identify') +%% scrlayer.dtx (with options: `package,scrlayer,init') +%% scrlayer.dtx (with options: `package,scrlayer,options') +%% scrlayer.dtx (with options: `package,scrlayer,body') +%% scrlayer.dtx (with options: `package,scrlayer,final') %% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 2012-2021 Markus Kohm [komascript at gmx info] @@ -43,14 +43,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: init) \newcommand*{\scrlayer@@inherited@options@cslist}{} \newcommand*{\scrlayer@@add@inherited@option}[1]{% @@ -67,7 +67,6 @@ }% } \newcommand*{\scrlayer@inherit@option}[2]{% - \typeout{TRACE: Define key `#2' of member `#1'}% \DefineFamilyMember[#1]{KOMA}% \expandafter\let\csname KV@KOMA#1@#2\expandafter\endcsname \csname KV@KOMA.scrlayer.sty@#2\endcsname @@ -130,15 +129,9 @@ \newlength{\footheight}% \setlength{\footheight}{-12345sp}% }{% - \PackageInfo{scrlayer}{Using already defined \string\footheight\MessageBreak - hoping, that this is a length and\MessageBreak - not only a macro}% } \AtBeginDocument{% \ifdim\footheight=-12345sp - \PackageInfo{scrlayer}{Setting magic \string\footheight\space to - \string\baselineskip\space while\MessageBreak - \string\begin{document}}% \setlength{\footheight}{\baselineskip} \fi } @@ -152,7 +145,7 @@ \@namedef{scrlayer@deprecated@reported@for@#1}{\string #2}% }{}% } -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -337,7 +330,7 @@ \scrlayer@@add@inherited@option{forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} \scrlayer@@add@inherited@option{autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} @@ -1096,8 +1089,6 @@ } \newcommand{\ProvideLayer}[2][]{% \IfLayerExists{#2}{% - \PackageInfo{scrlayer}{\string\ProvideLayer{#2} ignored,\MessageBreak - because of already defined layer}% }{\DeclareNewLayer[{#1}]{#2}}% } \newcommand{\RedeclareLayer}[2][]{% @@ -1192,10 +1183,6 @@ \expandafter\let\csname scr@l@#1@postcontents@hook\relax \expandafter\let\csname scr@l@#1@artifact\relax }{% - \PackageInfo{scrlayer}{\string\DestroyLayer{#1} ignored,\MessageBreak - because that layer doesn't exist\MessageBreak - (any longer)% - }% }% } \newcommand*{\layercontentsmeasure}{% @@ -1713,11 +1700,6 @@ \@ifundefined{ps@#2}{% \DeclarePageStyleByLayers[{#1}]{#2}{#3}% }{% - \PackageInfo{scrlayer}{% - \string\ProvidePageStyleByLayers{#2}{#3} ignored,\MessageBreak - because page style `#2'\MessageBreak - already exists% - }% }% } \newcommand*{\RedeclarePageStyleByLayers}[2][]{% @@ -2003,11 +1985,6 @@ \@ifundefined{ps@#1}{% \DeclarePageStyleAlias{#1}{#2}% }{% - \PackageInfo{scrlayer}{% - \string\ProvidePageStyleAlias{#1}{#2} ignored,\MessageBreak - because page style `#1' already\MessageBreak - exists% - }% }% } \newcommand*{\RedeclarePageStyleAlias}[1]{% @@ -2151,11 +2128,6 @@ }{}% \fi }{% - \PackageInfo{scrlayer}{% - \string\DestroyRealLayerPageStyle{#1} ignored,\MessageBreak - because the layer page style isn't\MessageBreak - defined (any longer)% - }% }% } \newcommand*{\currentpagestyle}{} @@ -2342,14 +2314,12 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrlayer.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index b9a58584818..c7a6041d683 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 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 8d1d515d19f..3f58f3ca34a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -16,7 +16,7 @@ %% scrkernel-pseudolengths.dtx (with options: `package,letter,option') %% scrkernel-pagestyles.dtx (with options: `package,letter,option') %% scrkernel-notepaper.dtx (with options: `package,letter,option') -%% scrkernel-circularletters.dtx (with options: `package,letter,option') +%% scrkernel-addressfiles.dtx (with options: `package,letter,option') %% scrkernel-miscellaneous.dtx (with options: `package,letter,execoption') %% scrkernel-fonts.dtx (with options: `package,letter,body') %% scrkernel-miscellaneous.dtx (with options: `package,letter,body') @@ -26,7 +26,7 @@ %% scrkernel-pseudolengths.dtx (with options: `package,letter,body') %% scrkernel-pagestyles.dtx (with options: `package,letter,body') %% scrkernel-notepaper.dtx (with options: `package,letter,body') -%% scrkernel-circularletters.dtx (with options: `package,letter,body') +%% scrkernel-addressfiles.dtx (with options: `package,letter,body') %% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] @@ -61,7 +61,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,20 +83,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -120,29 +120,15 @@ } \providecommand*{\par@updaterelative}{} }{} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: option) -\newcommand*{\lco@test}{% - \IfFileExists{\CurrentOption.lco}{% - \expandafter - \AtEndOfPackage - \expandafter{% - \expandafter\LoadLetterOption\expandafter{\CurrentOption}% - }% - \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{% - \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{% - \scr@pti@nerr@r - }% - }% - }{}% -} \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -155,18 +141,18 @@ } \KOMA@kav@add{.% scrletter.\scr@pkgextension -}{orgdate}{true} +}{numericaldate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3707 2022-02-15 10:40:57Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3701 2022-02-14 09:17:40Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3742 2022-03-04 16:21:17Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -222,7 +208,7 @@ scrletter.\scr@pkgextension }{addrfield}{true} \KOMA@ncmdkey{priority}[A]{ltr@priority}{% - {no}{0},{off}{0},{false}{0},{manual}{1},% + {no}{0},{off}{0},{false}{0},{manual}{0},% {B}{1},{b}{1},% {economy}{1},{Economy}{1},{ECONOMY}{1},% {B-ECONOMY}{1},{B-Economy}{1},{b-economy}{1},% @@ -317,6 +303,7 @@ }{locfield}{narrow} \KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} \KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow} + \newif\if@fold\@foldtrue \newcommand*{\@usefolds}{TMBPL} \KOMA@key{foldmarks}[true]{% @@ -733,17 +720,17 @@ \newcommand*{\scr@symbol@email}{\undefined} \newcommand*{\scr@symbol@mobilephone}{\undefined} \newcommand*{\scr@symbol@www}{\undefined} -%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-addressfiles.dtx 3697 2022-02-11 09:48:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: body) \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -915,7 +902,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -1486,7 +1473,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3707 2022-02-15 10:40:57Z kohm $ %%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} @@ -1671,13 +1658,18 @@ \fi }% } -%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3701 2022-02-14 09:17:40Z kohm $ %%% (run: body) -\newcommand*{\if@plength}[1]{% +\newcommand*{\Ifplength}[1]{% \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}% } -\newcommand*{\Ifplength}{\if@plength} -\newcommand*{\@newplength}[1]{% +\newcommand*{\if@plength}{% + \PackageWarning{scrletter}{% + Internal macro `\string\if@plength' is deprecated.\MessageBreak + Please use `\string\Ifplength' instead}% + \Ifplength +} +\newcommand*{\newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% }{% @@ -1685,20 +1677,26 @@ }{% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% - }{% + }{% You've tried to define a new pseudo-length using\MessageBreak \string\@newplength\space or \string\newplength.\MessageBreak - Please, try another name}% + Please, try another name% }% - } -\newcommand*{\newplength}{\@newplength} + }% +} +\newcommand*{\@newplength}{% + \PackageWarning{scrletter}{% + Internal macro `\string\@newplength' is deprecated.\MessageBreak + Please use `\string\newplength' instead}% + \newplength +} \newcommand*{\useplength}[1]{% \glueexpr \csname ltr@len@#1\endcsname\relax}% \newcommand*{\setlengthtoplength}[3][]{% \setlength{#2}{\useplength{#3}}% \setlength{#2}{#1#2}} -\newcommand*{\@setplength}[3][]{% +\newcommand*{\setplength}[3][]{% \begingroup% \setlength{\@tempskipa}{\glueexpr #3\relax}% \setlength{\@tempskipa}{#1\@tempskipa}% @@ -1708,7 +1706,12 @@ }% \@tempa } -\newcommand*{\setplength}{\@setplength} +\newcommand*{\@setplength}{% + \PackageWarning{scrletter}{% + Internal macro `\string\@setplength' is deprecated.\MessageBreak + Please use `\string\setplength' instead}% + \setplength +} \newcommand*{\setplengthtowidth}[3][]{% \begingroup \settowidth{\@tempdima}{#3}% @@ -1756,9 +1759,9 @@ \setlengthtoplength[{#1}]{\@tempskipa}{#3}% \edef\@tempa{\endgroup% \noexpand\addtolength{#2}{\the\@tempskipa}}% - \@tempa% - } -\newcommand*{\@addtoplength}[3][]{% + \@tempa% +} +\newcommand*{\addtoplength}[3][]{% \begingroup% \setlength{\@tempskipa}{\glueexpr #3\relax}% \setlength{\@tempskipa}{#1\@tempskipa}% @@ -1767,10 +1770,14 @@ \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*% \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempskipa}% }% - \@tempa% - } -\newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ + \@tempa% +} +\newcommand*{\@addtoplength}{% + \PackageWarning{scrletter}{% + Internal macro `\string\@addtoplength' is deprecated.\MessageBreak + Please use `\string\addtoplength' instead}% + \addtoplength} +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: body) \newcommand*{% \letterpagemark @@ -1802,8 +1809,9 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3742 2022-03-04 16:21:17Z kohm $ %%% (run: body) + \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -1988,52 +1996,52 @@ \scr@ifundefinedorrelax{scr@fnt@subject}{% \aliaskomafont{subject}{lettersubject}% }{} -\@newplength{foldmarkhpos} -\@newplength{foldmarkvpos} -\@newplength{tfoldmarkvpos} -\@newplength{mfoldmarkvpos} -\@newplength{bfoldmarkvpos} -\@newplength{lfoldmarkhpos} -\@newplength{pfoldmarklength} -\@newplength{tfoldmarklength} -\@newplength{mfoldmarklength} -\@newplength{bfoldmarklength} -\@newplength{lfoldmarklength} -\@newplength{foldmarkthickness} -\@setplength{foldmarkthickness}{.2pt} -\@newplength{toaddrvpos} -\@newplength{backaddrheight} -\@newplength{toaddrhpos} -\@newplength{specialmailindent} -\@newplength{specialmailrightindent} -\@newplength{toaddrindent} -\@newplength{PPheadheight} -\@newplength{PPheadwidth} -\@newplength{PPdatamatrixvskip} -\@newplength{toaddrwidth} -\@newplength{toaddrheight} -\@newplength{locvpos} -\@newplength{locwidth} -\@newplength{lochpos} -\@newplength{locheight} -\@newplength{refvpos} -\@newplength{refwidth} -\@newplength{refhpos} -\@newplength{refaftervskip} -\@newplength{sigbeforevskip} -\@newplength{sigindent} -\@newplength{firstfootvpos} -\@newplength{firstfootwidth} -\@newplength{firstfoothpos} -\@setplength{firstfoothpos}{\maxdimen} -\@newplength{firstheadvpos} -\@newplength{firstheadwidth} -\@newplength{firstheadhpos} -\@setplength{firstheadhpos}{\maxdimen} -\@newplength{fromrulewidth} -\@setplength{fromrulewidth}{0pt} -\@newplength{fromrulethickness} -\@setplength{fromrulethickness}{.4pt} +\newplength{foldmarkhpos} +\newplength{foldmarkvpos} +\newplength{tfoldmarkvpos} +\newplength{mfoldmarkvpos} +\newplength{bfoldmarkvpos} +\newplength{lfoldmarkhpos} +\newplength{pfoldmarklength} +\newplength{tfoldmarklength} +\newplength{mfoldmarklength} +\newplength{bfoldmarklength} +\newplength{lfoldmarklength} +\newplength{foldmarkthickness} +\setplength{foldmarkthickness}{.2pt} +\newplength{toaddrvpos} +\newplength{backaddrheight} +\newplength{toaddrhpos} +\newplength{specialmailindent} +\newplength{specialmailrightindent} +\newplength{toaddrindent} +\newplength{PPheadheight} +\newplength{PPheadwidth} +\newplength{PPdatamatrixvskip} +\newplength{toaddrwidth} +\newplength{toaddrheight} +\newplength{locvpos} +\newplength{locwidth} +\newplength{lochpos} +\newplength{locheight} +\newplength{refvpos} +\newplength{refwidth} +\newplength{refhpos} +\newplength{refaftervskip} +\newplength{sigbeforevskip} +\newplength{sigindent} +\newplength{firstfootvpos} +\newplength{firstfootwidth} +\newplength{firstfoothpos} +\setplength{firstfoothpos}{\maxdimen} +\newplength{firstheadvpos} +\newplength{firstheadwidth} +\newplength{firstheadhpos} +\setplength{firstheadhpos}{\maxdimen} +\newplength{fromrulewidth} +\setplength{fromrulewidth}{0pt} +\newplength{fromrulethickness} +\setplength{fromrulethickness}{.4pt} \newkomavar{firstfoot} \newcommand*{\move@topt}{% \null\vskip -1in\vskip -\topmargin% @@ -2109,19 +2117,19 @@ \typeout{Foldmarks: yes}% \move@topt \ifdim \useplength{pfoldmarklength}=\z@ - \@setplength{pfoldmarklength}{4mm}% + \setplength{pfoldmarklength}{4mm}% \fi \ifdim \useplength{tfoldmarklength}=\z@ - \@setplength{tfoldmarklength}{2mm}% + \setplength{tfoldmarklength}{2mm}% \fi \ifdim \useplength{mfoldmarklength}=\z@ - \@setplength{mfoldmarklength}{2mm}% + \setplength{mfoldmarklength}{2mm}% \fi \ifdim \useplength{bfoldmarklength}=\z@ - \@setplength{bfoldmarklength}{2mm}% + \setplength{bfoldmarklength}{2mm}% \fi \ifdim \useplength{lfoldmarklength}=\z@ - \@setplength{lfoldmarklength}{4mm}% + \setplength{lfoldmarklength}{4mm}% \fi \begingroup \@expandtwoargs\in@{P}{\@usefolds}% @@ -2367,16 +2375,16 @@ \vb@t@z{{% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \ifdim \useplength{toaddrindent}=\z@ - \@setplength{toaddrindent}{8mm}% + \setplength{toaddrindent}{8mm}% \fi \ifdim \useplength{PPheadheight}=\z@ - \@setplength{PPheadheight}{20.74pt}% + \setplength{PPheadheight}{20.74pt}% \fi \ifdim \useplength{PPheadwidth}=\z@ - \@setplength{PPheadwidth}{42mm}% + \setplength{PPheadwidth}{42mm}% \fi \ifdim \useplength{PPdatamatrixvskip}=\z@ - \@setplength{PPdatamatrixvskip}{9mm}% + \setplength{PPdatamatrixvskip}{9mm}% \fi \rlap{\move@topl \setlengthtoplength{\@tempskipa}{toaddrhpos}% @@ -2490,17 +2498,17 @@ \newcommand*{\@ogobble}[1][]{} \newcommand*{\@locfield}{% \ifdim \useplength{locwidth}=\z@% - \@setplength{locwidth}{\paperwidth}% + \setplength{locwidth}{\paperwidth}% \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}% + \addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}% \else - \@addtoplength[2]{locwidth}{\useplength{toaddrhpos}}% + \addtoplength[2]{locwidth}{\useplength{toaddrhpos}}% \fi - \@addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}% + \addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}% \if@bigloc% - \@setplength[.66667]{locwidth}{\useplength{locwidth}}% + \setplength[.66667]{locwidth}{\useplength{locwidth}}% \else% - \@setplength[.5]{locwidth}{\useplength{locwidth}}% + \setplength[.5]{locwidth}{\useplength{locwidth}}% \fi% \fi% \ifcase\@alignfrom @@ -2519,13 +2527,13 @@ }{% \typeout{Location field: yes}% \ifdim \useplength{lochpos}=\z@% - \@setplength{lochpos}{\useplength{toaddrhpos}}% + \setplength{lochpos}{\useplength{toaddrhpos}}% \fi \ifdim \useplength{locvpos}=\z@% - \@setplength{locvpos}{\useplength{toaddrvpos}}% + \setplength{locvpos}{\useplength{toaddrvpos}}% \fi \ifdim \useplength{locheight}=\z@% - \@setplength{locheight}{\useplength{toaddrheight}}% + \setplength{locheight}{\useplength{toaddrheight}}% \fi \move@topt\vskip\useplength{locvpos}% \vb@t@z{\noindent\makebox[0pt][l]{% @@ -2678,17 +2686,17 @@ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \ifdim\useplength{refwidth}=\z@ \if@refwide - \@setplength{refwidth}{\paperwidth}% + \setplength{refwidth}{\paperwidth}% \ifdim \useplength{toaddrhpos}>\z@ - \@setplength{refhpos}{\useplength{toaddrhpos}}% + \setplength{refhpos}{\useplength{toaddrhpos}}% \else - \@setplength[-]{refhpos}{\useplength{toaddrhpos}}% + \setplength[-]{refhpos}{\useplength{toaddrhpos}}% \fi - \@addtoplength[-2]{refwidth}{\useplength{refhpos}}% + \addtoplength[-2]{refwidth}{\useplength{refhpos}}% \else - \@setplength{refwidth}{\textwidth}% - \@setplength{refhpos}{\oddsidemargin}% - \@addtoplength{refhpos}{1in}% + \setplength{refwidth}{\textwidth}% + \setplength{refhpos}{\oddsidemargin}% + \addtoplength{refhpos}{1in}% \fi \else \ifdim\useplength{refhpos}=\z@ @@ -2706,7 +2714,7 @@ \divide\@tempdima by\@tempdimc \fi \edef\@tempa{\noexpand\endgroup - \noexpand\@setplength{refhpos}{\the\@tempdima}}% + \noexpand\setplength{refhpos}{\the\@tempdima}}% \@tempa \fi\fi \@tempswafalse @@ -2763,7 +2771,7 @@ }{% \typeout{Title: yes}% {\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative - \centering\LARGE\usekomafont{lettertitle}\usekomavar{title}\par}% + \centering\LARGE\usekomafont{lettertitle}\par}% \vskip\baselineskip% }% } @@ -2807,12 +2815,12 @@ }% }% } -\@newplength{subjectvpos} -\@setplength{subjectvpos}{0pt} -\@newplength{subjectaftervskip} -\@setplength{subjectaftervskip}{2\baselineskip} -\@newplength{subjectbeforevskip} -\@setplength{subjectbeforevskip}{0pt} +\newplength{subjectvpos} +\setplength{subjectvpos}{0pt} +\newplength{subjectaftervskip} +\setplength{subjectaftervskip}{2\baselineskip} +\newplength{subjectbeforevskip} +\setplength{subjectbeforevskip}{0pt} \newkomavar{nexthead} \setkomavar{nexthead}{% \rlap{\parbox[c]{\textwidth}{\raggedright\strut @@ -2902,7 +2910,7 @@ \def\reserved@a{#1}\def\reserved@b{#2}% } \g@addto@macro\flushbottom{% - \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% + \AtEndLetter{\vskip \z@\@plus.0001fil\relax}% } \newcounter{letter} \newcommand*{\letterpagestyle}{% @@ -2962,9 +2970,9 @@ \nobreak\vskip\baselineskip } \newcommand\ps{\par% - \ifdim\parskip=\z@% - \vskip\baselineskip% - \fi\startbreaks\noindent\ignorespaces% + \ifdim\parskip=\z@ + \vskip\baselineskip + \fi\startbreaks\noindent\ignorespaces } \newcommand*{\cc}[1]{\par% \ifdim\parskip=\z@% @@ -2994,10 +3002,17 @@ \setlength{\parfillskip}{\z@ \@plus 1fil}\par \endgroup } -\newkomavar{signature} -\setkomavar{signature}{\usekomavar{fromname}} \newkomavar{place} \newkomavar{location} +\newkomavar{specialmail} +\newkomavar{title} +\newkomavar{fromlogo} +\newkomavar{fromzipcode} +\newkomavar{PPcode} +\newkomavar{PPdatamatrix} +\newkomavar{addresseeimage} +\newkomavar{signature} +\setkomavar{signature}{\usekomavar{fromname}} \newkomavar{backaddress} \setkomavar{backaddress}{% \Ifkomavarempty{fromname}{}{% @@ -3006,13 +3021,6 @@ \Ifkomavarempty{fromaddress}{}{% \strut\ignorespaces\usekomavar{fromaddress}}% } -\newkomavar{specialmail} -\newkomavar{title} -\newkomavar{fromlogo} -\newkomavar{fromzipcode} -\newkomavar{PPcode} -\newkomavar{PPdatamatrix} -\newkomavar{addresseeimage} \newkomavar[\usekomavar{place}]{placeseparator} \setkomavar{placeseparator}{,\nobreakspace} \newkomavar[\subjectname]{subjectseparator} @@ -3076,22 +3084,28 @@ }% \scr@saved@date{#1}% } -%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-addressfiles.dtx 3697 2022-02-11 09:48:02Z kohm $ %%% (run: body) \newcommand*{\adrentry}[7]{% + \PackageWarning{scrletter}{% + command `\string\adrentry' is deprecated.\MessageBreak + You should use `\string\addrentry' with additional\MessageBreak + empty 8th argument}% \addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}} -\newcommand*{\adrchar}{\addrchar} \newcommand*{\addrentry}[9]{\def\@tempa{#1}\ifx \@tempa\@empty \else \def\@tempa{#2}\ifx \@tempa\@empty \expandafter\def\csname #9\endcsname{#1\\#3}% \else \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} +\newcommand*{\adrchar}{% + \PackageWarning{scrletter}{% + command `\string\adrchar' is deprecated.\MessageBreak + You should use `\string\addrchar'} + \addrchar} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrletter.sty'. 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 ccd40378fb8..fae8a106573 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 @@ -5,6 +5,7 @@ %% The original source files were: %% %% scrlfile-hook.dtx (with options: `package,3.34') +%% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 2002-2021 Markus Kohm [komascript at gmx info] %% @@ -40,7 +41,7 @@ %% %%% From File: $Id: scrlfile-hook.dtx$ \ProvidesPackage{scrlfile-hook-3.34}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (using LaTeX hooks)] \@ifundefined{IfFormatAtLeastTF}{% @@ -56,7 +57,7 @@ }{% \IfFormatAtLeastTF{2020/10/01}{% \IfFormatAtLeastTF{2021/11/15}{% - \PackageError{scrfile-hook-3.34}{LaTeX too new for this package}{% + \PackageError{scrlfile-hook-3.34}{LaTeX too new for this package}{% It seems this package has ben loaded directly using a LaTeX version\MessageBreak newer than 2021-06-01. This is not recommended. Please always load @@ -321,6 +322,7 @@ \endgroup \if@nobreak\ifvmode\nobreak\fi\fi } +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ \RequirePackage{scrlogo} \endinput %% 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 785440e44f3..2ae6c2b370e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty @@ -5,6 +5,7 @@ %% The original source files were: %% %% scrlfile-hook.dtx (with options: `package,current') +%% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 2002-2021 Markus Kohm [komascript at gmx info] %% @@ -40,7 +41,7 @@ %% %%% From File: $Id: scrlfile-hook.dtx$ \ProvidesPackage{scrlfile-hook}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (using LaTeX hooks)] \@ifundefined{IfFormatAtLeastTF}{% @@ -63,7 +64,7 @@ prior to 2021-11-15. This is not recommended. Please always load package\MessageBreak scrlfile instead of scrlfile-hook.\MessageBreak - If you would continue, I will try to load scrfile-hook-3.34% + If you would continue, I will try to load scrlfile-hook-3.34% }% \RequirePackage{scrlfile-hook-3.34}\endinput }% @@ -329,6 +330,7 @@ \endgroup \if@nobreak\ifvmode\nobreak\fi\fi } +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ \RequirePackage{scrlogo} \endinput %% 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 515e6a2f7d8..50afaad1033 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty @@ -5,6 +5,7 @@ %% The original source files were: %% %% scrlfile-patcholdlatex.dtx (with options: `package') +%% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 2002-2021 Markus Kohm [komascript at gmx info] %% @@ -38,9 +39,9 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlfile-patcholdlatex.dtx 3626 2021-11-01 10:57:06Z kohm $ +%%% From File: $Id: scrlfile-patcholdlatex.dtx 3773 2022-03-29 06:27:55Z kohm $ \ProvidesPackage{scrlfile-patcholdlatex}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (patching old LaTeX kernels)] \@ifundefined{IfFormatAtLeastTF}{}{% @@ -568,6 +569,7 @@ \endgroup \if@nobreak\ifvmode\nobreak\fi\fi } +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ \RequirePackage{scrlogo} \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 044d6bd475c..24b66e747f6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -5,6 +5,7 @@ %% The original source files were: %% %% scrlfile.dtx (with options: `package') +%% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 2002-2021 Markus Kohm [komascript at gmx info] %% @@ -38,9 +39,9 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlfile.dtx 3625 2021-10-31 12:45:26Z kohm $ +%%% From File: $Id: scrlfile.dtx 3688 2022-02-10 08:26:37Z kohm $ \ProvidesPackage{scrlfile}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (file load hooks)] \@ifundefined{IfFormatAtLeastTF}{% @@ -92,6 +93,7 @@ } \ExecuteOptions{} \ProcessOptions\relax +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ \RequirePackage{scrlogo} \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty index 69bcde1cb07..84aba2a8047 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty @@ -38,14 +38,24 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ \ProvidesPackage{scrlogo}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (logo)] \@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} + \DeclareRobustCommand*{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% + M\kern.05em A\kern.1em-\kern.1em Script}}% + \@ifundefined{pdfstringdefPreHook}{% + \def + }{% + \g@addto@macro + }% + \pdfstringdefPreHook{% + \def\KOMAScript{KOMA-Script}% + \expandafter\def\csname KOMAScript \endcsname{KOMA-Script}% + }% +}{} \endinput %% %% End of file `scrlogo.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 23cf7d163b8..5e56e256151 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -22,7 +22,7 @@ %% scrkernel-footnotes.dtx (with options: `class,letter,option') %% scrkernel-listsandtabulars.dtx (with options: `class,letter,option') %% scrkernel-notepaper.dtx (with options: `class,letter,option') -%% scrkernel-circularletters.dtx (with options: `class,letter,option') +%% scrkernel-addressfiles.dtx (with options: `class,letter,option') %% scrkernel-miscellaneous.dtx (with options: `class,letter,execoption') %% scrkernel-compatibility.dtx (with options: `class,letter,body') %% scrkernel-fonts.dtx (with options: `class,letter,body') @@ -38,7 +38,7 @@ %% scrkernel-footnotes.dtx (with options: `class,letter,body') %% scrkernel-listsandtabulars.dtx (with options: `class,letter,body') %% scrkernel-notepaper.dtx (with options: `class,letter,body') -%% scrkernel-circularletters.dtx (with options: `class,letter,body') +%% scrkernel-addressfiles.dtx (with options: `class,letter,body') %% scrlogo.dtx (with options: `logo') %% %% Copyright (c) 1994-2021 Markus Kohm [komascript at gmx info] @@ -73,7 +73,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -199,10 +199,11 @@ \@namedef{scr@v@3.33}{18} \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} -\@namedef{scr@v@last}{19} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +\@namedef{scr@v@3.36}{20} +\@namedef{scr@v@last}{20} +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -252,7 +253,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -306,13 +307,20 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% - \expandafter - \AtEndOfClass - \expandafter{% + \ClassWarningNoLine{\KOMAClassName}{% + loading of LCO via class option + `\CurrentOption'.\MessageBreak + Note: Loading a LCO via class option is deprecated.\MessageBreak + \space\space\space\space\space\space + You should use + `\string\LoadLetterOption\string{\CurrentOption\string}'\MessageBreak + instead% + }% + \expandafter\AtEndOfClass\expandafter{% \expandafter\LoadLetterOption\expandafter{\CurrentOption}% }% \expandafter\def\expandafter\scr@pti@nerr@r\expandafter{% @@ -324,7 +332,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -337,10 +345,10 @@ } \KOMA@kav@add{.% \KOMAClassFileName -}{orgdate}{true} +}{numericaldate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 12% @@ -426,11 +434,11 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3707 2022-02-15 10:40:57Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3701 2022-02-14 09:17:40Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -557,7 +565,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -584,6 +592,9 @@ \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} \newcommand*{\f@parfillskip}{\the\parfillskip} +\newcommand*{\scr@parindent}{1em} +\newcommand*{\scr@parskip}{\z@} +\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \AtEndOfClass{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -594,9 +605,6 @@ \newcommand*{\default@par@update}{} \let\default@par@update\relax \AtBeginDocument{\par@update} -\newcommand*{\scr@parindent}{1em} -\newcommand*{\scr@parskip}{\z@} -\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% @@ -723,7 +731,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -828,9 +836,9 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -901,9 +909,9 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3742 2022-03-04 16:21:17Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -940,36 +948,6 @@ \KOMA@ifkey{fromemail}{@email} \KOMA@ifkey{fromurl}{@www} \KOMA@ifkey{fromlogo}{@logo} -\newcommand*{\if@afield}{% - \ClassWarning{\KOMAClassName}{% - Usage of \string\if@afield\space deprecated.\MessageBreak - Internal macro \string\if@afield\space was removed at\MessageBreak - KOMA-Script version 3.03. I'll replace the usage of\MessageBreak - \string\if@afield\space by \string\ifnum - \string\@afieldmode=\string\@ne.\MessageBreak - This may result in errors. A better solution would be\MessageBreak - to change the code}% - \ifnum \@afieldmode=\@ne} -\newcommand*{\@afieldtrue}{% - \ClassWarning{\KOMAClassName}{% - Usage of \string\if@afield\space deprecated.\MessageBreak - Internal macro \string\if@afield\space was removed at\MessageBreak - KOMA-Script version 3.03. I'll replace the usage of\MessageBreak - \string\@afieldtrue\space by - \string\KOMAoptions{addrfield=true}.\MessageBreak - This may result in errors. A better solution would be\MessageBreak - to change the code}% - \KOMAoptions{addrfield=true}} -\newcommand*{\@afieldfalse}{% - \ClassWarning{\KOMAClassName}{% - Usage of \string\if@afield\space deprecated.\MessageBreak - Internal macro \string\if@afield\space was removed at\MessageBreak - KOMA-Script version 3.03. I'll replace the usage of\MessageBreak - \string\@afieldfalse\space by - \string\KOMAoptions{addrfield=false}.\MessageBreak - This may result in errors. A better solution would be\MessageBreak - to change the code}% - \KOMAoptions{addrfield=false}} \newcommand*{\@afieldmode}{\@ne} \KOMA@ncmdkey{addrfield}[true]{@afieldmode}{% {false}{0},{off}{0},{no}{0},% @@ -989,7 +967,7 @@ \KOMAClassFileName }{addrfield}{true} \KOMA@ncmdkey{priority}[A]{ltr@priority}{% - {no}{0},{off}{0},{false}{0},{manual}{1},% + {no}{0},{off}{0},{false}{0},{manual}{0},% {B}{1},{b}{1},% {economy}{1},{Economy}{1},{ECONOMY}{1},% {B-ECONOMY}{1},{B-Economy}{1},{b-economy}{1},% @@ -1084,6 +1062,7 @@ }{locfield}{narrow} \KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide} \KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow} + \newif\if@fold\@foldtrue \newcommand*{\@usefolds}{TMBPL} \KOMA@key{foldmarks}[true]{% @@ -1488,15 +1467,15 @@ \newcommand*{\scr@symbol@email}{\undefined} \newcommand*{\scr@symbol@mobilephone}{\undefined} \newcommand*{\scr@symbol@www}{\undefined} -%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-addressfiles.dtx 3697 2022-02-11 09:48:02Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1509,7 +1488,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1984,7 +1963,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2050,6 +2029,9 @@ \expandafter\@secondoftwo \fi } +\newcommand\marginline[1]{% + \marginpar[\raggedleft{#1}]{\raggedright #1}% +} \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% \@textsubscript{\selectfont#1}% @@ -2100,13 +2082,12 @@ `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak `\string\addtokomafont' for the page style elements need\MessageBreak explicite user intervention to work} -\scr@package@not@recommended{minitoc}{} \scr@package@not@recommended{parskip}{% option\MessageBreak `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -2280,7 +2261,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -2851,7 +2832,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3707 2022-02-15 10:40:57Z kohm $ %%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} @@ -3036,13 +3017,18 @@ \fi }% } -%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pseudolengths.dtx 3701 2022-02-14 09:17:40Z kohm $ %%% (run: body) -\newcommand*{\if@plength}[1]{% +\newcommand*{\Ifplength}[1]{% \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}% } -\newcommand*{\Ifplength}{\if@plength} -\newcommand*{\@newplength}[1]{% +\newcommand*{\if@plength}{% + \ClassWarning{\KOMAClassName}{% + Internal macro `\string\if@plength' is deprecated.\MessageBreak + Please use `\string\Ifplength' instead}% + \Ifplength +} +\newcommand*{\newplength}[1]{% \@ifundefined{ltr@len@#1}{% \expandafter\let\csname ltr@len@#1\endcsname=\z@% }{% @@ -3050,20 +3036,26 @@ }{% pseudo-length \expandafter\string\csname ltr@len@#1\endcsname already defined% - }{% + }{% You've tried to define a new pseudo-length using\MessageBreak \string\@newplength\space or \string\newplength.\MessageBreak - Please, try another name}% + Please, try another name% }% - } -\newcommand*{\newplength}{\@newplength} + }% +} +\newcommand*{\@newplength}{% + \ClassWarning{\KOMAClassName}{% + Internal macro `\string\@newplength' is deprecated.\MessageBreak + Please use `\string\newplength' instead}% + \newplength +} \newcommand*{\useplength}[1]{% \glueexpr \csname ltr@len@#1\endcsname\relax}% \newcommand*{\setlengthtoplength}[3][]{% \setlength{#2}{\useplength{#3}}% \setlength{#2}{#1#2}} -\newcommand*{\@setplength}[3][]{% +\newcommand*{\setplength}[3][]{% \begingroup% \setlength{\@tempskipa}{\glueexpr #3\relax}% \setlength{\@tempskipa}{#1\@tempskipa}% @@ -3073,7 +3065,12 @@ }% \@tempa } -\newcommand*{\setplength}{\@setplength} +\newcommand*{\@setplength}{% + \ClassWarning{\KOMAClassName}{% + Internal macro `\string\@setplength' is deprecated.\MessageBreak + Please use `\string\setplength' instead}% + \setplength +} \newcommand*{\setplengthtowidth}[3][]{% \begingroup \settowidth{\@tempdima}{#3}% @@ -3121,9 +3118,9 @@ \setlengthtoplength[{#1}]{\@tempskipa}{#3}% \edef\@tempa{\endgroup% \noexpand\addtolength{#2}{\the\@tempskipa}}% - \@tempa% - } -\newcommand*{\@addtoplength}[3][]{% + \@tempa% +} +\newcommand*{\addtoplength}[3][]{% \begingroup% \setlength{\@tempskipa}{\glueexpr #3\relax}% \setlength{\@tempskipa}{#1\@tempskipa}% @@ -3132,10 +3129,14 @@ \noexpand\expandafter\noexpand\renewcommand\noexpand\expandafter*% \noexpand\csname ltr@len@#2\noexpand\endcsname{\the\@tempskipa}% }% - \@tempa% - } -\newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ + \@tempa% +} +\newcommand*{\@addtoplength}{% + \ClassWarning{\KOMAClassName}{% + Internal macro `\string\@addtoplength' is deprecated.\MessageBreak + Please use `\string\addtoplength' instead}% + \addtoplength} +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3147,8 +3148,48 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: body) +\newcommand*{\par@updaterelative}{% + \begingroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent + \aftergroup\parindent@update + \fi + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip + \aftergroup\parskip@update + \fi + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip + \aftergroup\parfillskip@update + \fi + \endgroup +} +\newcommand*{\parindent@update}{% + \scr@defaultunits\parindent\scr@parindent + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent\else + \def\reserved@b{\endgroup\edef\f@parindent{\the\parindent}}% + \fi + \reserved@b +} +\newcommand*{\parskip@update}{% + \scr@defaultunits\parskip\scr@parskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip\else + \def\reserved@b{\endgroup\edef\f@parskip{\the\parskip}}% + \fi + \reserved@b +} +\newcommand*{\parfillskip@update}{% + \scr@defaultunits\parfillskip\scr@parfillskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip\else + \def\reserved@b{\endgroup\edef\f@parfillskip{\the\parfillskip}}% + \fi + \reserved@b +} \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \IfLTXAtLeastTF{2021/05/01}{% @@ -3221,46 +3262,6 @@ \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\newcommand*{\par@updaterelative}{% - \begingroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent - \aftergroup\parindent@update - \fi - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip - \aftergroup\parskip@update - \fi - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip - \aftergroup\parfillskip@update - \fi - \endgroup -} -\newcommand*{\parindent@update}{% - \scr@defaultunits\parindent\scr@parindent - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent\else - \def\@tempb{\endgroup\edef\f@parindent{\the\parindent}}% - \fi - \@tempb -} -\newcommand*{\parskip@update}{% - \scr@defaultunits\parskip\scr@parskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip\else - \def\@tempb{\endgroup\edef\f@parskip{\the\parskip}}% - \fi - \@tempb -} -\newcommand*{\parfillskip@update}{% - \scr@defaultunits\parfillskip\scr@parfillskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip\else - \def\@tempb{\endgroup\edef\f@parfillskip{\the\parfillskip}}% - \fi - \@tempb -} \newcommand*{\scr@defaultunits}[2]{% \begingroup \edef\@tempa{#2}% @@ -3321,7 +3322,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -3418,12 +3419,9 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) -\newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% -} -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -3479,6 +3477,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \ExecuteDoHook{footnote/text/begin}% \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% @@ -3489,6 +3488,7 @@ \hskip \dimexpr #1-#2\relax }% \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + \ExecuteDoHook{footnote/text/end}% }% \else \ClassInfo{\KOMAClassName}{% @@ -3524,15 +3524,16 @@ \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} -\newcommand*{\scr@fnt@footnotenumber}{\ftnm@font} +\aliaskomafont{footnotenumber}{footnotelabel} \newcommand*{\scr@fnt@footnotelabel}{\ftnm@font} -\newcommand*{\scr@fnt@instead@footnotetext}{footnote} +\aliaskomafont{footnotetext}{footnote} \newcommand*\deffootnotemark[1]{% \def\@makefnmark{\hbox{\ftntm@font{#1}}}% } \newcommand*{\ftntm@font}{} \newcommand*{\scr@fnt@footnotereference}{\ftntm@font} -\newcommand*{\scr@fnt@footnoteref}{\ftntm@font} +\aliaskomafont{footnoteref}{footnotereference} +\aliaskomafont{footnotemark}{footnotereference} \newcommand*{\FN@mf@check}{% \ifdim\lastkern=\multiplefootnotemarker\relax \edef\@x@sf{\the\spacefactor}% @@ -3581,7 +3582,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: body) \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} @@ -3596,11 +3597,6 @@ \@beginparpenalty=-\@lowpenalty \@endparpenalty =-\@lowpenalty \@itempenalty =-\@lowpenalty -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} -\setlength\tabbingsep{\labelsep} \renewcommand*\theenumi{\@arabic\c@enumi} \renewcommand*\theenumii{\@alph\c@enumii} \renewcommand*\theenumiii{\@roman\c@enumiii} @@ -3623,7 +3619,7 @@ \endlist } \newcommand*{\descriptionlabel}[1]{% - \hspace{\labelsep}\descfont #1% + \hspace{\labelsep}\usekomafont{descriptionlabel}{#1}% } \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% @@ -3738,16 +3734,14 @@ \newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ +\setlength\arraycolsep{5\p@} +\setlength\tabcolsep{6\p@} +\setlength\arrayrulewidth{.4\p@} +\setlength\doublerulesep{2\p@} +\setlength\tabbingsep{\labelsep} +%%% From File: $Id: scrkernel-notepaper.dtx 3742 2022-03-04 16:21:17Z kohm $ %%% (run: body) -\newcommand*{\@firsthead}{% - \ClassWarning{scrlttr2}{% - Deprecated usage of \string\@firsthead.\MessageBreak - \string\usekomavar{firsthead} should be used\MessageBreak - instead of \string\@firsthead - }% - \usekomavar{firsthead}% -} + \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -3908,6 +3902,14 @@ \renewcommand*{\@alignfrom}{2}% \fi } +\newcommand*{\@firsthead}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\@firsthead.\MessageBreak + \string\usekomavar{firsthead} should be used\MessageBreak + instead of \string\@firsthead + }% + \usekomavar{firsthead}% +} \newcommand{\firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\firsthead.\MessageBreak @@ -3940,52 +3942,52 @@ \aliaskomafont{title}{lettertitle}% \newkomafont{lettersubject}{\normalfont\bfseries} \aliaskomafont{subject}{lettersubject}% -\@newplength{foldmarkhpos} -\@newplength{foldmarkvpos} -\@newplength{tfoldmarkvpos} -\@newplength{mfoldmarkvpos} -\@newplength{bfoldmarkvpos} -\@newplength{lfoldmarkhpos} -\@newplength{pfoldmarklength} -\@newplength{tfoldmarklength} -\@newplength{mfoldmarklength} -\@newplength{bfoldmarklength} -\@newplength{lfoldmarklength} -\@newplength{foldmarkthickness} -\@setplength{foldmarkthickness}{.2pt} -\@newplength{toaddrvpos} -\@newplength{backaddrheight} -\@newplength{toaddrhpos} -\@newplength{specialmailindent} -\@newplength{specialmailrightindent} -\@newplength{toaddrindent} -\@newplength{PPheadheight} -\@newplength{PPheadwidth} -\@newplength{PPdatamatrixvskip} -\@newplength{toaddrwidth} -\@newplength{toaddrheight} -\@newplength{locvpos} -\@newplength{locwidth} -\@newplength{lochpos} -\@newplength{locheight} -\@newplength{refvpos} -\@newplength{refwidth} -\@newplength{refhpos} -\@newplength{refaftervskip} -\@newplength{sigbeforevskip} -\@newplength{sigindent} -\@newplength{firstfootvpos} -\@newplength{firstfootwidth} -\@newplength{firstfoothpos} -\@setplength{firstfoothpos}{\maxdimen} -\@newplength{firstheadvpos} -\@newplength{firstheadwidth} -\@newplength{firstheadhpos} -\@setplength{firstheadhpos}{\maxdimen} -\@newplength{fromrulewidth} -\@setplength{fromrulewidth}{0pt} -\@newplength{fromrulethickness} -\@setplength{fromrulethickness}{.4pt} +\newplength{foldmarkhpos} +\newplength{foldmarkvpos} +\newplength{tfoldmarkvpos} +\newplength{mfoldmarkvpos} +\newplength{bfoldmarkvpos} +\newplength{lfoldmarkhpos} +\newplength{pfoldmarklength} +\newplength{tfoldmarklength} +\newplength{mfoldmarklength} +\newplength{bfoldmarklength} +\newplength{lfoldmarklength} +\newplength{foldmarkthickness} +\setplength{foldmarkthickness}{.2pt} +\newplength{toaddrvpos} +\newplength{backaddrheight} +\newplength{toaddrhpos} +\newplength{specialmailindent} +\newplength{specialmailrightindent} +\newplength{toaddrindent} +\newplength{PPheadheight} +\newplength{PPheadwidth} +\newplength{PPdatamatrixvskip} +\newplength{toaddrwidth} +\newplength{toaddrheight} +\newplength{locvpos} +\newplength{locwidth} +\newplength{lochpos} +\newplength{locheight} +\newplength{refvpos} +\newplength{refwidth} +\newplength{refhpos} +\newplength{refaftervskip} +\newplength{sigbeforevskip} +\newplength{sigindent} +\newplength{firstfootvpos} +\newplength{firstfootwidth} +\newplength{firstfoothpos} +\setplength{firstfoothpos}{\maxdimen} +\newplength{firstheadvpos} +\newplength{firstheadwidth} +\newplength{firstheadhpos} +\setplength{firstheadhpos}{\maxdimen} +\newplength{fromrulewidth} +\setplength{fromrulewidth}{0pt} +\newplength{fromrulethickness} +\setplength{fromrulethickness}{.4pt} \newkomavar{firstfoot} \newcommand*{\@firstfoot}{% \ClassWarning{scrlttr2}{% @@ -4094,19 +4096,19 @@ \typeout{Foldmarks: yes}% \move@topt \ifdim \useplength{pfoldmarklength}=\z@ - \@setplength{pfoldmarklength}{4mm}% + \setplength{pfoldmarklength}{4mm}% \fi \ifdim \useplength{tfoldmarklength}=\z@ - \@setplength{tfoldmarklength}{2mm}% + \setplength{tfoldmarklength}{2mm}% \fi \ifdim \useplength{mfoldmarklength}=\z@ - \@setplength{mfoldmarklength}{2mm}% + \setplength{mfoldmarklength}{2mm}% \fi \ifdim \useplength{bfoldmarklength}=\z@ - \@setplength{bfoldmarklength}{2mm}% + \setplength{bfoldmarklength}{2mm}% \fi \ifdim \useplength{lfoldmarklength}=\z@ - \@setplength{lfoldmarklength}{4mm}% + \setplength{lfoldmarklength}{4mm}% \fi \begingroup \@expandtwoargs\in@{P}{\@usefolds}% @@ -4352,16 +4354,16 @@ \vb@t@z{{% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \ifdim \useplength{toaddrindent}=\z@ - \@setplength{toaddrindent}{8mm}% + \setplength{toaddrindent}{8mm}% \fi \ifdim \useplength{PPheadheight}=\z@ - \@setplength{PPheadheight}{20.74pt}% + \setplength{PPheadheight}{20.74pt}% \fi \ifdim \useplength{PPheadwidth}=\z@ - \@setplength{PPheadwidth}{42mm}% + \setplength{PPheadwidth}{42mm}% \fi \ifdim \useplength{PPdatamatrixvskip}=\z@ - \@setplength{PPdatamatrixvskip}{9mm}% + \setplength{PPdatamatrixvskip}{9mm}% \fi \rlap{\move@topl \setlengthtoplength{\@tempskipa}{toaddrhpos}% @@ -4475,17 +4477,17 @@ \newcommand*{\@ogobble}[1][]{} \newcommand*{\@locfield}{% \ifdim \useplength{locwidth}=\z@% - \@setplength{locwidth}{\paperwidth}% + \setplength{locwidth}{\paperwidth}% \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}% + \addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}% \else - \@addtoplength[2]{locwidth}{\useplength{toaddrhpos}}% + \addtoplength[2]{locwidth}{\useplength{toaddrhpos}}% \fi - \@addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}% + \addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}% \if@bigloc% - \@setplength[.66667]{locwidth}{\useplength{locwidth}}% + \setplength[.66667]{locwidth}{\useplength{locwidth}}% \else% - \@setplength[.5]{locwidth}{\useplength{locwidth}}% + \setplength[.5]{locwidth}{\useplength{locwidth}}% \fi% \fi% \ifcase\@alignfrom @@ -4504,13 +4506,13 @@ }{% \typeout{Location field: yes}% \ifdim \useplength{lochpos}=\z@% - \@setplength{lochpos}{\useplength{toaddrhpos}}% + \setplength{lochpos}{\useplength{toaddrhpos}}% \fi \ifdim \useplength{locvpos}=\z@% - \@setplength{locvpos}{\useplength{toaddrvpos}}% + \setplength{locvpos}{\useplength{toaddrvpos}}% \fi \ifdim \useplength{locheight}=\z@% - \@setplength{locheight}{\useplength{toaddrheight}}% + \setplength{locheight}{\useplength{toaddrheight}}% \fi \move@topt\vskip\useplength{locvpos}% \vb@t@z{\noindent\makebox[0pt][l]{% @@ -4663,17 +4665,17 @@ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative \ifdim\useplength{refwidth}=\z@ \if@refwide - \@setplength{refwidth}{\paperwidth}% + \setplength{refwidth}{\paperwidth}% \ifdim \useplength{toaddrhpos}>\z@ - \@setplength{refhpos}{\useplength{toaddrhpos}}% + \setplength{refhpos}{\useplength{toaddrhpos}}% \else - \@setplength[-]{refhpos}{\useplength{toaddrhpos}}% + \setplength[-]{refhpos}{\useplength{toaddrhpos}}% \fi - \@addtoplength[-2]{refwidth}{\useplength{refhpos}}% + \addtoplength[-2]{refwidth}{\useplength{refhpos}}% \else - \@setplength{refwidth}{\textwidth}% - \@setplength{refhpos}{\oddsidemargin}% - \@addtoplength{refhpos}{1in}% + \setplength{refwidth}{\textwidth}% + \setplength{refhpos}{\oddsidemargin}% + \addtoplength{refhpos}{1in}% \fi \else \ifdim\useplength{refhpos}=\z@ @@ -4691,7 +4693,7 @@ \divide\@tempdima by\@tempdimc \fi \edef\@tempa{\noexpand\endgroup - \noexpand\@setplength{refhpos}{\the\@tempdima}}% + \noexpand\setplength{refhpos}{\the\@tempdima}}% \@tempa \fi\fi \@tempswafalse @@ -4748,7 +4750,7 @@ }{% \typeout{Title: yes}% {\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative - \centering\LARGE\usekomafont{lettertitle}\usekomavar{title}\par}% + \centering\LARGE\usekomafont{lettertitle}\par}% \vskip\baselineskip% }% } @@ -4792,20 +4794,12 @@ }% }% } -\@newplength{subjectvpos} -\@setplength{subjectvpos}{0pt} -\@newplength{subjectaftervskip} -\@setplength{subjectaftervskip}{2\baselineskip} -\@newplength{subjectbeforevskip} -\@setplength{subjectbeforevskip}{0pt} -\newcommand*{\@nexthead}{% - \ClassWarning{scrlttr2}{% - Deprecated usage of \string\@nexthead.\MessageBreak - \string\usekomavar{nexthead} should be used\MessageBreak - instead of \string\@nexthead - }% - \usekomavar{nexthead}% -} +\newplength{subjectvpos} +\setplength{subjectvpos}{0pt} +\newplength{subjectaftervskip} +\setplength{subjectaftervskip}{2\baselineskip} +\newplength{subjectbeforevskip} +\setplength{subjectbeforevskip}{0pt} \newkomavar{nexthead} \setkomavar{nexthead}{% \rlap{\parbox[c]{\textwidth}{\raggedright\strut @@ -4838,13 +4832,13 @@ } \setkomavar{nexthead}% } -\newcommand*{\@nextfoot}{% +\newcommand*{\@nexthead}{% \ClassWarning{scrlttr2}{% - Deprecated usage of \string\@nextfoot.\MessageBreak - \string\usekomavar{nextfoot} should be used\MessageBreak - instead of \string\@nextfoot + Deprecated usage of \string\@nexthead.\MessageBreak + \string\usekomavar{nexthead} should be used\MessageBreak + instead of \string\@nexthead }% - \usekomavar{nextfoot}% + \usekomavar{nexthead}% } \newkomavar{nextfoot} \setkomavar{nextfoot}{% @@ -4863,6 +4857,14 @@ } \setkomavar{nextfoot}% } +\newcommand*{\@nextfoot}{% + \ClassWarning{scrlttr2}{% + Deprecated usage of \string\@nextfoot.\MessageBreak + \string\usekomavar{nextfoot} should be used\MessageBreak + instead of \string\@nextfoot + }% + \usekomavar{nextfoot}% +} \newenvironment{letter}[2][]{% \if@twocolumn \ClassWarning{\KOMAClassName}{% @@ -4918,7 +4920,7 @@ \def\reserved@a{#1}\def\reserved@b{#2}% } \g@addto@macro\flushbottom{% - \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% + \AtEndLetter{\vskip \z@\@plus.0001fil\relax}% } \newcounter{letter} \newcommand*{\letterpagestyle}{% @@ -4977,9 +4979,9 @@ \nobreak\vskip\baselineskip } \newcommand\ps{\par% - \ifdim\parskip=\z@% - \vskip\baselineskip% - \fi\startbreaks\noindent\ignorespaces% + \ifdim\parskip=\z@ + \vskip\baselineskip + \fi\startbreaks\noindent\ignorespaces } \newcommand*{\cc}[1]{\par% \ifdim\parskip=\z@% @@ -5009,10 +5011,17 @@ \setlength{\parfillskip}{\z@ \@plus 1fil}\par \endgroup } -\newkomavar{signature} -\setkomavar{signature}{\usekomavar{fromname}} \newkomavar{place} \newkomavar{location} +\newkomavar{specialmail} +\newkomavar{title} +\newkomavar{fromlogo} +\newkomavar{fromzipcode} +\newkomavar{PPcode} +\newkomavar{PPdatamatrix} +\newkomavar{addresseeimage} +\newkomavar{signature} +\setkomavar{signature}{\usekomavar{fromname}} \newkomavar{backaddress} \setkomavar{backaddress}{% \Ifkomavarempty{fromname}{}{% @@ -5021,13 +5030,6 @@ \Ifkomavarempty{fromaddress}{}{% \strut\ignorespaces\usekomavar{fromaddress}}% } -\newkomavar{specialmail} -\newkomavar{title} -\newkomavar{fromlogo} -\newkomavar{fromzipcode} -\newkomavar{PPcode} -\newkomavar{PPdatamatrix} -\newkomavar{addresseeimage} \newkomavar[\usekomavar{place}]{placeseparator} \setkomavar{placeseparator}{,\nobreakspace} \newkomavar[\subjectname]{subjectseparator} @@ -5091,22 +5093,28 @@ }% \scr@saved@date{#1}% } -%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-addressfiles.dtx 3697 2022-02-11 09:48:02Z kohm $ %%% (run: body) \newcommand*{\adrentry}[7]{% + \ClassWarning{\KOMAClassName}{% + command `\string\adrentry' is deprecated.\MessageBreak + You should use `\string\addrentry' with additional\MessageBreak + empty 8th argument}% \addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}} -\newcommand*{\adrchar}{\addrchar} \newcommand*{\addrentry}[9]{\def\@tempa{#1}\ifx \@tempa\@empty \else \def\@tempa{#2}\ifx \@tempa\@empty \expandafter\def\csname #9\endcsname{#1\\#3}% \else \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} +\newcommand*{\adrchar}{% + \ClassWarning{\KOMAClassName}{% + command `\string\adrchar' is deprecated.\MessageBreak + You should use `\string\addrchar'} + \addrchar} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrlttr2.cls'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index 635f44b47aa..3fb26ff9dc7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 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 d70f1529efd..11d406c0a67 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -141,9 +141,9 @@ \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -156,10 +156,6 @@ See KOMA-Script manual for more information about.% }% } -\newcommand*{\scr@osectarg}{0} -\newcommand*{\scr@activate@xsection}[1]{% - \renewcommand*{\scr@osectarg}{#1}% -} \newif\if@altsecnumformat\@altsecnumformatfalse \newif\if@autodot \renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue} @@ -173,9 +169,16 @@ \newcommand*{\scr@altsecnumhookfalse}{% \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse } +\newcommand*{\scr@osectarg}{0} +\newcommand*{\scr@activate@xsection}[1]{% + \renewcommand*{\scr@osectarg}{#1}% +} \IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{} \newcommand*{\size@part}{} +\newcommand*{\scr@fnt@part}{\size@part} \newcommand*{\size@partnumber}{} +\newcommand*{\scr@fnt@partnumber}{\size@partnumber} +\aliaskomafont{partprefix}{partnumber} \newcommand*{\scr@part@beforeskip}{% \z@ \@plus 1fil + \baselineskip } @@ -203,7 +206,9 @@ } \newif\if@chapterprefix \newcommand*{\size@chapter}{} +\newcommand*{\scr@fnt@chapter}{\size@chapter} \newcommand*{\size@chapterprefix}{\size@chapter} +\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newcommand*{\scr@chapter@beforeskip}{\z@} \let\scr@chapter@beforeskip\z@ \newcommand*{\scr@chapter@afterskip}{\z@} @@ -215,12 +220,17 @@ \newcommand*{\chapterheadendvskip}{\vskip\@tempskipa} \newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa} \newcommand*{\size@section}{} +\newcommand*{\scr@fnt@section}{\size@section} \newcommand*{\size@subsection}{} +\newcommand*{\scr@fnt@subsection}{\size@subsection} \newcommand*{\size@subsubsection}{} +\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} \newcommand*{\size@paragraph}{} +\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 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -303,10 +313,11 @@ \@namedef{scr@v@3.33}{18} \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} -\@namedef{scr@v@last}{19} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +\@namedef{scr@v@3.36}{20} +\@namedef{scr@v@last}{20} +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -381,7 +392,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -437,9 +448,9 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -525,7 +536,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% @@ -652,7 +663,7 @@ } \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -679,6 +690,9 @@ \newcommand*{\f@parindent}{\the\parindent} \newcommand*{\f@parskip}{\the\parskip} \newcommand*{\f@parfillskip}{\the\parfillskip} +\newcommand*{\scr@parindent}{1em} +\newcommand*{\scr@parskip}{\z@} +\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \AtEndOfClass{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -689,9 +703,6 @@ \newcommand*{\default@par@update}{} \let\default@par@update\relax \AtBeginDocument{\par@update} -\newcommand*{\scr@parindent}{1em} -\newcommand*{\scr@parskip}{\z@} -\newcommand*{\scr@parfillskip}{\z@ \@plus 1fil} \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% @@ -818,7 +829,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagetrue @@ -853,9 +864,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1015,8 +1026,8 @@ }% \fi } -\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}% +\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false} \IfLTXAtLeastTF{2020/10/01}{% \KOMA@key{appendixprefix}[true]{% \Ifstr{#1}{default}{% @@ -1114,15 +1125,15 @@ \else\vskip\@tempskipa\fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\Huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@chapter}{\huge}% - \renewcommand*{\size@chapterprefix}{\size@chapter}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\Huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{chapter}{\huge}% + \setkomafont{chapterprefix}{\size@chapter}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % normal \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% @@ -1140,15 +1151,15 @@ \else\vskip\@tempskipa\fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@chapter}{\LARGE}% - \renewcommand*{\size@chapterprefix}{\size@chapter}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{chapter}{\LARGE}% + \setkomafont{chapterprefix}{\size@chapter}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % small \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}% \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}% @@ -1166,15 +1177,15 @@ \else\vskip\@tempskipa\fi }% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\LARGE}% - \renewcommand*{\size@partnumber}{\LARGE}% - \renewcommand*{\size@chapter}{\Large}% - \renewcommand*{\size@chapterprefix}{\size@chapter}% - \renewcommand*{\size@section}{\large}% - \renewcommand*{\size@subsection}{\normalsize}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\LARGE}% + \setkomafont{partnumber}{\LARGE}% + \setkomafont{chapter}{\Large}% + \setkomafont{chapterprefix}{\size@chapter}% + \setkomafont{section}{\large}% + \setkomafont{subsection}{\normalsize}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \or % openany \KOMAoptions{open=any}% \or % openright @@ -1187,7 +1198,7 @@ \KOMAoptions{chapterprefix=false}% \or % twolineappendix \KOMAoptions{appendixprefix=true}% - \or % onelineappend + \or % onelineappendix \KOMAoptions{appendixprefix=false}% \or % optiontotocandhead \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}% @@ -1219,15 +1230,15 @@ \renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}% \renewcommand*{\chapterheadendvskip}{\vskip\@tempskipa}% \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}% - \renewcommand*{\size@part}{\Huge}% - \renewcommand*{\size@partnumber}{\huge}% - \renewcommand*{\size@chapter}{\Huge}% - \renewcommand*{\size@chapterprefix}{\huge}% - \renewcommand*{\size@section}{\Large}% - \renewcommand*{\size@subsection}{\large}% - \renewcommand*{\size@subsubsection}{\normalsize}% - \renewcommand*{\size@paragraph}{\normalsize}% - \renewcommand*{\size@subparagraph}{\normalsize}% + \setkomafont{part}{\Huge}% + \setkomafont{partnumber}{\huge}% + \setkomafont{chapter}{\Huge}% + \setkomafont{chapterprefix}{\huge}% + \setkomafont{section}{\Large}% + \setkomafont{subsection}{\large}% + \setkomafont{subsubsection}{\normalsize}% + \setkomafont{paragraph}{\normalsize}% + \setkomafont{subparagraph}{\normalsize}% \renewcommand*{\sectfont}{\bfseries}% \KOMAoptions{open=right,chapterprefix=true}% \fi @@ -1238,7 +1249,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -1343,7 +1354,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1478,7 +1489,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1549,7 +1560,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% @@ -1826,7 +1837,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1859,7 +1870,11 @@ \csname scr@bibstyle@#1\endcsname #3% }% - \g@addto@macro\scr@bibstylelist{, `#2'}% + \ifx\scr@bibstylelist\@empty + \edef\scr@bibstylelist{`#2'}% + \else + \edef\scr@bibstylelist{\scr@bibstylelist, `#2'}% + \fi }% }{% \ClassError{\KOMAClassName}{bibliography style `#2' already exists}{% @@ -1873,7 +1888,7 @@ \newcommand*{\scr@bibstyle@}{} \newcommand*{\bib@beginhook}{} \newcommand*{\bib@endhook}{} -\newcommand*{\scr@bibstylelist}{\@gobble} +\newcommand*{\scr@bibstylelist}{} \newcommand*{\@openbib@code}{} \newcommand*{\newblock}{} \newbibstyle{openstyle}{% @@ -1995,7 +2010,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3706 2022-02-15 09:36:50Z kohm $ %%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown @@ -2080,22 +2095,22 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2570,13 +2585,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3724 2022-02-25 10:28:44Z 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 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2623,12 +2638,50 @@ \fi }% \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ %%% (run: body) +\newcommand*{\par@updaterelative}{% + \begingroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent + \aftergroup\parindent@update + \fi + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip + \aftergroup\parskip@update + \fi + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip + \aftergroup\parfillskip@update + \fi + \endgroup +} +\newcommand*{\parindent@update}{% + \scr@defaultunits\parindent\scr@parindent + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parindent}\ifx\reserved@a\f@parindent\else + \def\reserved@b{\endgroup\edef\f@parindent{\the\parindent}}% + \fi + \reserved@b +} +\newcommand*{\parskip@update}{% + \scr@defaultunits\parskip\scr@parskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parskip}\ifx\reserved@a\f@parskip\else + \def\reserved@b{\endgroup\edef\f@parskip{\the\parskip}}% + \fi + \reserved@b +} +\newcommand*{\parfillskip@update}{% + \scr@defaultunits\parfillskip\scr@parfillskip + \begingroup + \let\reserved@b\endgroup + \edef\reserved@a{\the\parfillskip}\ifx\reserved@a\f@parfillskip\else + \def\reserved@b{\endgroup\edef\f@parfillskip{\the\parfillskip}}% + \fi + \reserved@b +} \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} -\setlength{\columnsep}{10\p@} -\setlength{\columnseprule}{\z@} \IfLTXAtLeastTF{2021/05/01}{% \AddToHook{selectfont}{\par@update}% \AfterPackage{everysel}{% @@ -2699,46 +2752,6 @@ \newcommand*{\scr@new@selectfont}{} \expandafter\let\expandafter\scr@new@selectfont\csname selectfont \endcsname } -\newcommand*{\par@updaterelative}{% - \begingroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent - \aftergroup\parindent@update - \fi - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip - \aftergroup\parskip@update - \fi - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip - \aftergroup\parfillskip@update - \fi - \endgroup -} -\newcommand*{\parindent@update}{% - \scr@defaultunits\parindent\scr@parindent - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parindent}\ifx\@tempa\f@parindent\else - \def\@tempb{\endgroup\edef\f@parindent{\the\parindent}}% - \fi - \@tempb -} -\newcommand*{\parskip@update}{% - \scr@defaultunits\parskip\scr@parskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parskip}\ifx\@tempa\f@parskip\else - \def\@tempb{\endgroup\edef\f@parskip{\the\parskip}}% - \fi - \@tempb -} -\newcommand*{\parfillskip@update}{% - \scr@defaultunits\parfillskip\scr@parfillskip - \begingroup - \let\@tempb\endgroup - \edef\@tempa{\the\parfillskip}\ifx\@tempa\f@parfillskip\else - \def\@tempb{\endgroup\edef\f@parfillskip{\the\parfillskip}}% - \fi - \@tempb -} \newcommand*{\scr@defaultunits}[2]{% \begingroup \edef\@tempa{#2}% @@ -2796,10 +2809,12 @@ \l@addto@macro{\@listiii}{\@list@extra}% \l@addto@macro{\footnotesize}{\protect\add@extra@listi{ftns}}% \l@addto@macro{\small}{\protect\add@extra@listi{sml}}% +\setlength{\columnsep}{10\p@} +\setlength{\columnseprule}{\z@} \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3747 2022-03-08 09:24:07Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -3173,15 +3188,15 @@ }{% \if@restonecol\twocolumn \else \newpage \fi }% -\newcommand*\titlefont{\sectfont}% -\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newkomafont{subtitle}{\usekomafont{title}\large}% \newkomafont{titlehead}{}% \newkomafont{author}{\Large} \newkomafont{date}{\Large} \newkomafont{publishers}{\Large} \newkomafont{dedication}{\Large} +\newcommand*\titlefont{\sectfont}% \newcommand*{\scr@fnt@title}{\titlefont}% +\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}% \newcommand*{\scr@fnt@subject}{\subject@font}% \newenvironment{abstract}{% \if@titlepage @@ -3217,10 +3232,12 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract} +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3234,7 +3251,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -3254,18 +3271,41 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z 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 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3621 2021-10-15 10:20:41Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3770 2022-03-22 16:27:02Z kohm $ %%% (run: body) +\BeforeClosingMainAux{% + \if@autodot\if@filesw\immediate\write\@mainaux{% + \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% + \fi\fi} +\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% + \expandafter\@@maybeautodot #1\@stop\endgroup\fi +} +\newcommand*{\@@maybeautodot}[1]{% + \ifx #1\@stop\let\@@maybeautodot\relax + \else + \ifx #1\Alph \@autodottrue\fi + \ifx #1\alph \@autodottrue\fi + \ifx #1\Roman \@autodottrue\fi + \ifx #1\roman \@autodottrue\fi + \ifx #1\@Alph \@autodottrue\fi + \ifx #1\@alph \@autodottrue\fi + \ifx #1\@Roman \@autodottrue\fi + \ifx #1\@roman \@autodottrue\fi + \ifx #1\romannumeral \@autodottrue\fi + \fi + \@@maybeautodot +} +\newcommand*\autodot{\if@altsecnumformat.\fi} \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% \ClassWarning{\KOMAClassName}{Usage of deprecated command @@ -3303,29 +3343,6 @@ \newcommand*{\Ifunnumbered}[1]{% \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% } -\BeforeClosingMainAux{% - \if@autodot\if@filesw\immediate\write\@mainaux{% - \string\global\string\csname\space @altsecnumformattrue\string\endcsname}% - \fi\fi} -\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup% - \expandafter\@@maybeautodot #1\@stop\endgroup\fi -} -\newcommand*{\@@maybeautodot}[1]{% - \ifx #1\@stop\let\@@maybeautodot\relax - \else - \ifx #1\Alph \@autodottrue\fi - \ifx #1\alph \@autodottrue\fi - \ifx #1\Roman \@autodottrue\fi - \ifx #1\roman \@autodottrue\fi - \ifx #1\@Alph \@autodottrue\fi - \ifx #1\@alph \@autodottrue\fi - \ifx #1\@Roman \@autodottrue\fi - \ifx #1\@roman \@autodottrue\fi - \ifx #1\romannumeral \@autodottrue\fi - \fi - \@@maybeautodot -} -\newcommand*\autodot{\if@altsecnumformat.\fi} \newcommand*{\scr@saved@startsection}[6]{% \if@noskipsec \leavevmode \fi \par @@ -4982,34 +4999,6 @@ \fi }% } -\newcommand*{\bprot@dottedtocline}[5]{% - \expandafter\ifnum\scr@v@is@gt{2.96}\relax - \ClassWarning{\KOMAClassName}{% - usage of `\string\bprot@dottedtocline' is deprecated.\MessageBreak - Maybe an old auxiliary file has been used.\MessageBreak - Note, this command will be removed from\MessageBreak - KOMA-Script soon. So if this warning message\MessageBreak - persists after one more LaTeX run, you should\MessageBreak - redeclare the corresponding ToC entries using\MessageBreak - \string\DeclareTOCStyleEntry[\MessageBreak - \space\space level=\detokenize{#1},\MessageBreak - \space\space indent=\detokenize{#2},\MessageBreak - \space\space numwidth=\detokenize{#3}]{default}{...},\MessageBreak - where `...' is the name of the ToC level.\MessageBreak - Note, in future usage of `\string\bprot@dottedtocline'\MessageBreak - could result in an error% - }% - \ifnum #1>\c@tocdepth \else - \ifnum \lastpenalty<\numexpr 20010-#1\relax - \addpenalty{\@lowpenalty}% - \fi - \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \penalty \numexpr 20009-#1\relax - \fi - \else - \@dottedtocline{#1}{#2}{#3}{#4}{#5}% - \fi -} \newcommand*\appendix{% \Ifstr{\@currenvir}{appendix}{% \ClassWarning{\KOMAClassName}{% @@ -5237,6 +5226,8 @@ \renewcommand*{\thepart}{\@Roman\c@part} \newcommand*{\partformat}{\partname~\thepart\autodot} \newcommand*\partname{Part} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\partname{Part} \newcommand*{\partmark}[1]{\@mkboth{}{}} \newcommand*\addpartmark[1]{% \begingroup @@ -5248,9 +5239,6 @@ } \newcommand*{\raggedpart}{} \let\raggedpart\centering -\newcommand*{\scr@fnt@part}{\size@part} -\newcommand*{\scr@fnt@partnumber}{\size@partnumber} -\aliaskomafont{partprefix}{partnumber} \newkomafont{partentry}{\usekomafont{disposition}\large} \newkomafont{partentrypagenumber}{} \newcommand*{\scr@startchapter}[1]{% @@ -5346,6 +5334,7 @@ \float@addtolists{\protect\addvspace{\@chapterlistsgap}}% }% \fi + \scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d{#1}% \if@twocolumn \if@at@twocolumn \@nameuse{@make#1head}{#3}% @@ -5357,12 +5346,37 @@ \fi \@afterheading } +\expandafter\ifnum\scr@v@is@ge{3.36}% + \newcommand*{\scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d}[1]{% + \Ifstr{#1}{chapter}{% + \begingroup + \def\reserved@a{\scr@makechapterhead{chapter}}% + \ifx\@makechapterhead\reserved@a\else + \ClassWarningNoLine{\KOMAClassName}{% + Redefinition of \string\@makechapterhead\space detected.\MessageBreak + Note: KOMA-Script does use styles for commands like\MessageBreak + \string\chapter. Currently it internally still provides and\MessageBreak + uses \string\@makechapterhead, but a completely different\MessageBreak + definition compared to the standard classes.\MessageBreak + So redefining or using internal \string\@makechapterhead\MessageBreak + by users or package authors may already break\MessageBreak + KOMA-Script and will not work with a coming version,\MessageBreak + that will remove this deprecated code}% + \let\scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d\@gobbble + \fi + \endgroup + }{}% + } +\else + \let\scr@t@st@nd@w@rn@m@k@ch@pt@rh@@d\@gobble +\fi \newcommand*{\scr@@startschapter}[2]{% \ExecuteDoHook{heading/branch/star/#1}% \begingroup \let\@mkboth\@gobbletwo \hy@insteadofrefstepcounter{#1}% \endgroup + \scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d{#1}% \if@twocolumn \if@at@twocolumn \@nameuse{@makes#1head}{#2}% @@ -5374,7 +5388,31 @@ \fi \@afterheading } -%% \begin{macro}{\if@at@twocolumn} +\expandafter\ifnum\scr@v@is@ge{3.36}% + \newcommand*{\scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d}[1]{% + \Ifstr{#1}{chapter}{% + \begingroup + \def\reserved@a{\scr@makeschapterhead{chapter}}% + \ifx\@makeschapterhead\reserved@a\else + \ClassWarningNoLine{\KOMAClassName}{% + Redefinition of \string\@makeschapterhead\space detected.\MessageBreak + Note: KOMA-Script does use styles for commands like\MessageBreak + \string\chapter. Currently it internally still provides and\MessageBreak + uses \string\@makeschapterhead, but a completely different\MessageBreak + definition compared to the standard classes.\MessageBreak + So redefining or using internal \string\@makeschapterhead\MessageBreak + by users or package authors may already break\MessageBreak + KOMA-Script and will not work with a coming version,\MessageBreak + that will remove this deprecated code}% + \let\scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d\@gobble + \fi + \endgroup + }{}% + } +\else + \let\scr@t@st@nd@w@rn@m@ks@ch@pt@rh@@d\@gobble +\fi +%% \begin{macro}{\@at@twocolumntrue,\@at@twocolumnfalse,\if@at@twocolumn} \newif\if@at@twocolumn \newcommand*\scr@topnewpage{} \let\scr@topnewpage\@topnewpage @@ -5386,11 +5424,6 @@ \@nameuse{@@make#1head}{#2}% \use@preamble{#1@u}% } -\newcommand*{\scr@makeschapterhead}[2]{% - \use@chapter@o@preamble{#1}% - \@nameuse{@@makes#1head}{#2}% - \use@preamble{#1@u}% -} \newcommand*{\scr@@makechapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \csname scr@#1@afterindent\endcsname @@ -5447,6 +5480,11 @@ \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \chapterheadendvskip } +\newcommand*{\scr@makeschapterhead}[2]{% + \use@chapter@o@preamble{#1}% + \@nameuse{@@makes#1head}{#2}% + \use@preamble{#1@u}% +} \newcommand*{\scr@@makeschapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax \csname scr@#1@afterindent\endcsname @@ -5582,18 +5620,11 @@ \newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }% \thechapter\autodot\enskip} \newcommand*\chaptername{Chapter} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\chaptername{Chapter} \newcommand*\appendixname{Appendix} -\newcommand*{\chapappifprefix}[1][]{% - \ClassWarning{\KOMAClassName}{% - Please don't use obsolete command - \string\chapappifprefix.\MessageBreak - The new command \string\chapappifchapterprefix\space has - an\MessageBreak - obligatory instead of an optional argument. Use that\MessageBreak - new command% - }% - \chapappifchapterprefix{#1}% -} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\appendixname{Appendix} \newcommand*{\chapappifchapterprefix}[1]{% \IfChapterUsesPrefixLine{\chapapp#1}{}% } @@ -5612,8 +5643,6 @@ \endgroup } \newcommand*{\raggedchapter}{\raggedsection} -\newcommand*{\scr@fnt@chapter}{\size@chapter} -\newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newkomafont{chapterentry}{\usekomafont{disposition}} \newkomafont{chapterentrypagenumber}{} \newkomafont{chapterentrydots}{} @@ -5702,11 +5731,6 @@ \sectionmark{#1}% \endgroup } -\newcommand*{\scr@fnt@section}{\size@section} -\newcommand*{\scr@fnt@subsection}{\size@subsection} -\newcommand*{\scr@fnt@subsubsection}{\size@subsubsection} -\newcommand*{\scr@fnt@paragraph}{\size@paragraph} -\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} \DeclareSectionCommand[% style=chapter,% level=\z@,% @@ -5783,8 +5807,12 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3743 2022-03-04 16:27:15Z kohm $ %%% (run: body) +\renewcommand*{\theequation}{% + \thechapter.% + \@arabic\c@equation +} \newif\if@restonecol \newcommand{\dictum}[2][]{\par% \begingroup @@ -5811,11 +5839,6 @@ \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} -\@addtoreset{equation}{chapter} -\renewcommand*\theequation{% - \thechapter.% - \@arabic\c@equation -} \newcommand*{\new@tpo@label}{\@newl@bel{tpo}} \AtBeginDocument{% \if@filesw @@ -5877,6 +5900,9 @@ \expandafter\@secondoftwo \fi } +\newcommand\marginline[1]{% + \marginpar[\raggedleft{#1}]{\raggedright #1}% +} \scr@ifundefinedorrelax{textsubscript}{% \DeclareRobustCommand*\textsubscript[1]{% \@textsubscript{\selectfont#1}% @@ -5950,6 +5976,12 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} +\scr@package@not@recommended{titlesec}{% + KOMA-Script features\MessageBreak + like \string\setkomafont, \string\RedeclareSectionCommand, + \string\sectionlinesformat\MessageBreak + and several others to re-configure section\MessageBreak + headings} \AfterPackage*{sectsty}{% \@ifpackagelater{sectsty}{2002/02/26}{% \ClassInfo{\KOMAClassName}{Unknown `sectsty' release.\MessageBreak @@ -6088,35 +6120,7 @@ \let\scr@mt@saved@sect\relax \fi } -\AfterPackage{titlesec}{% - \@ifpackagelater{titlesec}{2019/10/17}{% - \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak - Cross your fingers, that is compatible% - }% - }{% - \scr@class@titlesec@warning - }% -} -\providecommand*{\scr@class@titlesec@warning}{% - \ClassWarning{\KOMAClassName}{% - Usage of this version of package `titlesec'\MessageBreak - with KOMA-Script class `\KOMAClassName' is\MessageBreak - not recommended, because the package does not\MessageBreak - support KOMA-Script classes, but break them.\MessageBreak - If you want to use `titlesec' with KOMA-Script\MessageBreak - classes instead of using the KOMA-Script's\MessageBreak - user interface to configure the headings of\MessageBreak - parts, - chapters, sections - ... subparagraphs,\MessageBreak - please ask the author of `titlesec' for support.\MessageBreak - Expect errors like:\MessageBreak - \space\space- ``Illegal unit of measure (pt inserted).''\MessageBreak - \space\space- ``Missing number, treated as zero''\MessageBreak - after loading `titlesec'% - }% -} -%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3744 2022-03-05 16:30:02Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -6215,7 +6219,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3560 2021-02-15 13:20:12Z kohm $ +%%% From File: $Id: scrlayer.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6226,11 +6230,8 @@ \providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3620 2021-10-12 10:27:43Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) -\newcommand\marginline[1]{% - \marginpar[\raggedleft{#1}]{\raggedright #1}% -} \newlength{\abovecaptionskip} \newlength{\belowcaptionskip} \setlength{\abovecaptionskip}{10\p@} @@ -6243,8 +6244,8 @@ \newcommand*{\scap@caption}{} \newcommand*{\scap@width}{\linewidth} \newcommand*{\scap@move}{\z@} -\newcommand*{\scap@currentlabel}{} \newif\ifscap@alt +\newcommand*{\scap@currentlabel}{} \newcommand*{\@captionbeside}{} \long\def\@captionbeside[#1]#2{% \kernel@ifnextchar [%] @@ -6295,7 +6296,7 @@ \begin{lrbox}{\c@pti@nb@sid@b@x}% } \newenvironment*{captionbeside}{% - \@dblarg\@captionbeside% + \@dblarg\@captionbeside }{% \end{lrbox}% \settowidth{\@tempdima}{\usebox\c@pti@nb@sid@b@x}% @@ -6352,7 +6353,8 @@ \newcommand*{\scr@fnt@captionlabel}{\caplabelfont} \newif\ifdofullc@p \dofullc@ptrue -\newif\if@capbreak\@capbreakfalse +\newif\if@capbreak +\@capbreakfalse \newcommand*{\setcapindent}{\kernel@ifstar{\@@setcapindent}{\@setcapindent}} \newcommand*{\@setcapindent}[1]{% \setlength{\@tempdima}{#1}% @@ -6942,10 +6944,15 @@ \endcaptionbeside } \newcommand*\figurename{Figure} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\figurename{Figure} \newcommand*\tablename{Table} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\tablename{Table} \DeclareNewTOC[% type=figure, float, + nonfloat, counterwithin=chapter, floatpos=tbp, floattype=1, @@ -6962,6 +6969,7 @@ \DeclareNewTOC[% type=table, float, + nonfloat, counterwithin=chapter, floatpos=tbp, floattype=2, @@ -6975,7 +6983,7 @@ \expandafter\ifnum\scr@v@is@le{2.97d}% \renewcommand*\thetable{\thechapter.\@arabic\c@table} \fi -%%% From File: $Id: scrkernel-footnotes.dtx 3570 2021-02-24 10:08:31Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3711 2022-02-16 09:57:02Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -7032,6 +7040,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \ExecuteDoHook{footnote/text/begin}% \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% @@ -7042,6 +7051,7 @@ \hskip \dimexpr #1-#2\relax }% \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + \ExecuteDoHook{footnote/text/end}% }% \else \ClassInfo{\KOMAClassName}{% @@ -7077,15 +7087,16 @@ \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} -\newcommand*{\scr@fnt@footnotenumber}{\ftnm@font} +\aliaskomafont{footnotenumber}{footnotelabel} \newcommand*{\scr@fnt@footnotelabel}{\ftnm@font} -\newcommand*{\scr@fnt@instead@footnotetext}{footnote} +\aliaskomafont{footnotetext}{footnote} \newcommand*\deffootnotemark[1]{% \def\@makefnmark{\hbox{\ftntm@font{#1}}}% } \newcommand*{\ftntm@font}{} \newcommand*{\scr@fnt@footnotereference}{\ftntm@font} -\newcommand*{\scr@fnt@footnoteref}{\ftntm@font} +\aliaskomafont{footnoteref}{footnotereference} +\aliaskomafont{footnotemark}{footnotereference} \newcommand*{\FN@mf@check}{% \ifdim\lastkern=\multiplefootnotemarker\relax \edef\@x@sf{\the\spacefactor}% @@ -7134,7 +7145,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3733 2022-03-01 08:20:43Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7159,7 +7170,7 @@ \fi% } \newcommand*{\before@starttoc}[1]{% - \let\scr@dottedtocline=\@dottedtocline + \let\scr@dottedtocline=\@dottedtoclilne \renewcommand*{\@dottedtocline}[3]{% \scr@dottedtocline{##1}{\z@}{\last@l@number}}% \renewcommand*{\numberline@box}[1]{% @@ -7284,9 +7295,11 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: body) \newcommand*\bibname{Bibliography} +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax \newcommand{\setbibpreamble}[1]{\def\bibpreamble{#1}} @@ -7370,7 +7383,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 3706 2022-02-15 09:36:50Z kohm $ %%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax @@ -7395,7 +7408,7 @@ \columnseprule \z@ \columnsep 35\p@ \setchapterpreamble{\index@preamble}% - \idx@heading% + \idx@heading \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% @@ -7411,7 +7424,9 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $ +\providecaptionname{american,australian,british,canadian,english,newzealand,% + UKenglish,ukenglish,USenglish,usenglish}\indexname{Index} +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3708 2022-02-15 15:24:12Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7435,11 +7450,6 @@ \@beginparpenalty=-\@lowpenalty \@endparpenalty =-\@lowpenalty \@itempenalty =-\@lowpenalty -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} -\setlength\tabbingsep{\labelsep} \renewcommand*\theenumi{\@arabic\c@enumi} \renewcommand*\theenumii{\@alph\c@enumii} \renewcommand*\theenumiii{\@roman\c@enumiii} @@ -7462,7 +7472,7 @@ \endlist } \newcommand*{\descriptionlabel}[1]{% - \hspace{\labelsep}\descfont #1% + \hspace{\labelsep}\usekomafont{descriptionlabel}{#1}% } \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% @@ -7577,10 +7587,13 @@ \newkomafont{labelitemiv}{\usekomafont{itemizelabel}} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +\setlength\arraycolsep{5\p@} +\setlength\tabcolsep{6\p@} +\setlength\arrayrulewidth{.4\p@} +\setlength\doublerulesep{2\p@} +\setlength\tabbingsep{\labelsep} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrreprt.cls'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index d11296d6dc0..6425e3bd744 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: 10pt) \ProvidesFile{% scrsize10pt.clo% @@ -116,13 +116,13 @@ \setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} \setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} \setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} +\setlength\partopsep {2\p@ \@plus 1\p@ \@minus 1\p@} \setlength\@fptop {0\p@ \@plus 1fil} \setlength\@fpsep {8\p@ \@plus 2fil} \setlength\@fpbot {0\p@ \@plus 1fil} \setlength\@dblfptop {0\p@ \@plus 1fil} \setlength\@dblfpsep {8\p@ \@plus 2fil} \setlength\@dblfpbot {0\p@ \@plus 1fil} -\setlength\partopsep {2\p@ \@plus 1\p@ \@minus 1\p@} \def\@listi{\leftmargin\leftmargini \parsep 4\p@ \@plus2\p@ \@minus\p@ \topsep 8\p@ \@plus2\p@ \@minus4\p@ @@ -150,7 +150,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 08cb3672820..200d5d11cb6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ %%% (run: 11pt) %%% (run: 12pt) \ProvidesFile{% @@ -117,13 +117,13 @@ \setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} \setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} \setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} +\setlength\partopsep {3\p@ \@plus 1\p@ \@minus 1\p@} \setlength\@fptop {0\p@ \@plus 1fil} \setlength\@fpsep {8\p@ \@plus 2fil} \setlength\@fpbot {0\p@ \@plus 1fil} \setlength\@dblfptop {0\p@ \@plus 1fil} \setlength\@dblfpsep {8\p@ \@plus 2fil} \setlength\@dblfpbot {0\p@ \@plus 1fil} -\setlength\partopsep {3\p@ \@plus 1\p@ \@minus 1\p@} \def\@listi{\leftmargin\leftmargini \parsep 4.5\p@ \@plus2\p@ \@minus\p@ \topsep 9\p@ \@plus3\p@ \@minus5\p@ @@ -151,7 +151,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index f24d16db9ac..d0e2e43e6bc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3723 2022-02-23 14:53:44Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -115,13 +115,13 @@ \setlength\intextsep {14\p@ \@plus 4\p@ \@minus 4\p@} \setlength\dblfloatsep {14\p@ \@plus 2\p@ \@minus 4\p@} \setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} +\setlength\partopsep {3\p@ \@plus 2\p@ \@minus 2\p@} \setlength\@fptop {0\p@ \@plus 1fil} \setlength\@fpsep {10\p@ \@plus 2fil} \setlength\@fpbot {0\p@ \@plus 1fil} \setlength\@dblfptop {0\p@ \@plus 1fil} \setlength\@dblfpsep {10\p@ \@plus 2fil} \setlength\@dblfpbot {0\p@ \@plus 1fil} -\setlength\partopsep {3\p@ \@plus 2\p@ \@minus 2\p@} \def\@listi{\leftmargin\leftmargini \parsep 5\p@ \@plus2.5\p@ \@minus\p@ \topsep 10\p@ \@plus4\p@ \@minus6\p@ @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 3745 2022-03-07 09:14:34Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index 100bee54e6c..1b5d5c40eb0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,28 +65,28 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: scrtime.dtx 3688 2022-02-10 08:26:37Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: scrtime.dtx 3688 2022-02-10 08:26:37Z kohm $ \newif\if@Hxii \KOMA@ifkey{12h}{@Hxii} \KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false} \KOMAProcessOptions\relax -%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: scrtime.dtx 3688 2022-02-10 08:26:37Z kohm $ \def\thistime{% \kernel@ifstar {\let\@tempif\iffalse\@thistime} @@ -100,10 +100,8 @@ \the\@tempcnta{#1}\@tempif\ifnum\@tempcntb<10 0\fi\fi\the\@tempcntb% \endgroup} \newcommand*{\settime}[1]{\renewcommand*{\@thistime}[1][]{#1}} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `scrtime.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index 70326340ad7..358dc90b68c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -39,27 +39,28 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrwfile.dtx 3600 2021-05-30 19:00:56Z kohm $ +%%% From File: $Id: scrwfile.dtx 3773 2022-03-29 06:27:55Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrwfile} - [2021/05/30 v0.1.9-alpha KOMA-Script package (write and clone files)] + [2021/05/30 v0.1.10 KOMA-Script package (write and clone files)] \PackageWarningNoLine{scrwfile}{% - THIS IS AN ALPHA VERSION!\MessageBreak - USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak + 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.% + Maybe, it would be better not to load this package% } \RequirePackage{scrbase}[2010/09/17] \RequirePackage{scrlfile}[2010/09/30] -\scr@ifluatex{% - \PackageInfoNoLine{scrwfile}{LuaLaTeX detected.\MessageBreak +\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}{% @@ -86,7 +87,8 @@ \scrwfile@if@only{#1}{\scrwfile@@starttoc}{\scrwfile@saved@starttoc}{#1}% } \newcommand*{\scrwfile@@starttoc}[1]{% - \typeout{Use my own \string\@starttoc\space for #1}% + \PackageInfo{scrwfile}{% + Using my own \string\@starttoc\space for `#1'}% \begingroup \if@filesw \xdef\scrwfile@writefilelist{\scrwfile@writefilelist,#1}% @@ -99,7 +101,8 @@ \scrwfile@if@only{#1}{\scrwfile@@writefile}{\scrwfile@saved@writefile}{#1}% } \newcommand{\scrwfile@@writefile}[2]{% - \typeout{Use my own \string\@writefile\space for #1}% + \PackageInfo{scrwfile}{% + Using my own \string\@writefile\space for `#1'}% \ifnum\scrwfile@wrtout>0 \begingroup \@temptokena{#2}% @@ -256,10 +259,8 @@ }% } \@onlypreamble\TOCClone -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% 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 d25128231fe..78b37f96d4d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{setspace.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak index 20ffc0f2ebe..181c8eb5450 100644 --- a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak +++ b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \ProvidesFile{standardsections.hak}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] -%%% From File: $Id: scrhack.dtx 3602 2021-06-03 17:24:02Z kohm $ +%%% From File: $Id: scrhack.dtx 3690 2022-02-10 09:59:31Z kohm $ \PackageWarningNoLine{scrhack}{% You are loosing every kind of support because of\MessageBreak using the dangerous standard classes sections hack!\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 6a076a7b9b5..4de4ad3cee5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -53,28 +53,28 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: tocbasic.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: tocbasic.dtx 3689 2022-02-10 09:53:38Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: tocbasic.dtx 3689 2022-02-10 09:53:38Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: tocbasic.dtx 3689 2022-02-10 09:53:38Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: tocbasic.dtx 3689 2022-02-10 09:53:38Z kohm $ %%% (run: body) \RequirePackage{scrbase} \AfterPackage*{multitoc}{% - \@ifpackagelater{multitoc}{2018/08/31}{}{% + \@ifpackagelater{multitoc}{2022/02/10}{}{% \PackageWarningNoLine{tocbasic}{% Usage of package `multitoc' is not recommended!\MessageBreak Note, this package generally results in empty ToCs\MessageBreak @@ -1095,7 +1095,7 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% @@ -1500,8 +1500,7 @@ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}% }% \else - \PackageError{tocbasic% - }{only one argument supported}{% + \PackageError{tocbasic}{only one argument supported}{% \string\DefineTOCEntryCommandOption\space currently supports only commands with\MessageBreak at most one argument not #5}% @@ -1559,8 +1558,7 @@ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}% }% \else - \PackageError{tocbasic% - }{only one argument supported}{% + \PackageError{tocbasic}{only one argument supported}{% \string\DefineTOCEntryCommandOption\space currently supports only commands with\MessageBreak at most two argument not #6}% @@ -1637,8 +1635,7 @@ } \newcommand*{\DeclareTOCStyleEntry}[3][]{% \scr@ifundefinedorrelax{scr@dte@def@l@#2}{% - \PackageError{tocbasic% - }{toc entry style `#2' undefined}{% + \PackageError{tocbasic}{toc entry style `#2' undefined}{% Somebody told me to define toc entry `#3' with style `#2',\MessageBreak but I do not know style `#2'.\MessageBreak You should first define the style then define the entry.\MessageBreak @@ -1669,8 +1666,7 @@ \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}{% 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 @@ -1750,10 +1746,10 @@ \providecommand*\@pnumwidth{1.55em} \providecommand*\@tocrmarg {2.55em} \providecommand*\@dotsep {4.5} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1887,7 +1883,7 @@ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -2047,7 +2043,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -2160,7 +2156,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2632,8 +2628,7 @@ \ifdim \scr@dte@tocline@numberwidth >\dimexpr \@nameuse{scr@tso@#1@numwidth}% +\@nameuse{scr@tso@#1@numsep}\relax\relax - \PackageWarning{tocbasic% - }{% + \PackageWarning{tocbasic}{% number width of #1 toc entries should be increased!\MessageBreak Currently used number width = @@ -2692,7 +2687,7 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style,toctext) \DeclareTOCEntryStyle{toctext}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2936,10 +2931,10 @@ \newcommand*{\scr@dte@toctext@raggedright}{} \newcommand*{\scr@dte@toctext@parend}{} \newcommand*{\scr@dte@toctext@lastend}{} -%%% From File: $Id: scrkernel-tocstyle.dtx 3613 2021-07-15 12:25:10Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3703 2022-02-15 07:41:54Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: tocbasic.dtx 3689 2022-02-10 09:53:38Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% @@ -2950,10 +2945,8 @@ }% }{}% } -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `tocbasic.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 22fa7242e53..45dbffefffc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -48,7 +48,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2021/11/13 v3.35 KOMA-Script + 2022/05/01 v3.36 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3773 2022-03-29 06:27:55Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -170,13 +170,14 @@ \@namedef{scr@v@3.33}{18} \@namedef{scr@v@3.34}{18} \@namedef{scr@v@3.35}{19} -\@namedef{scr@v@last}{19} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +\@namedef{scr@v@3.36}{20} +\@namedef{scr@v@last}{20} +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z 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 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -231,7 +232,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% \Ifstr{#2}{letter}{% @@ -996,9 +997,9 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3617 2021-10-12 09:21:01Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3765 2022-03-16 09:25:29Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: body) \newcommand*{\ta@divfor}[1]{% \ta@div=\z@ @@ -1738,13 +1739,11 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3699 2022-02-11 15:53:36Z kohm $ %%% (run: final) \typearea[current]{current} -%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} +%%% From File: $Id: scrlogo.dtx 3688 2022-02-10 08:26:37Z kohm $ +\RequirePackage{scrlogo} \endinput %% %% End of file `typearea.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 73f30630635..db1c22cb68c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3636 2021-11-13 18:16:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3774 2022-04-28 07:46:52Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2021/11/13 v3.35 KOMA-Script}% + \@CheckKOMAScriptVersion{2022/05/01 v3.36 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: head) \ProvidesFile{% visualize% @@ -75,12 +75,12 @@ } \providecommand*\LCOWarning[2]{% \GenericWarning{% - (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces + (#1)\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces\@spaces }{% - Letter class option #1 Warning: #2% + Letter configuration option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3730 2022-02-26 14:38:06Z kohm $ %%% (run: body) \RequirePackage{eso-pic} \newcommand*{\showfields}[1]{% @@ -226,27 +226,27 @@ \newcommand*{\showfield@location}{% \begingroup \ifdim \useplength{locwidth}=\z@% - \@setplength{locwidth}{\paperwidth}% + \setplength{locwidth}{\paperwidth}% \ifdim \useplength{toaddrhpos}>\z@ - \@addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}% + \addtoplength[-2]{locwidth}{\useplength{toaddrhpos}}% \else - \@addtoplength[2]{locwidth}{\useplength{toaddrhpos}}% + \addtoplength[2]{locwidth}{\useplength{toaddrhpos}}% \fi - \@addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}% + \addtoplength[-1]{locwidth}{\useplength{toaddrwidth}}% \if@bigloc% - \@setplength[.66667]{locwidth}{\useplength{locwidth}}% + \setplength[.66667]{locwidth}{\useplength{locwidth}}% \else% - \@setplength[.5]{locwidth}{\useplength{locwidth}}% + \setplength[.5]{locwidth}{\useplength{locwidth}}% \fi% \fi% \ifdim \useplength{lochpos}=\z@% - \@setplength{lochpos}{\useplength{toaddrhpos}}% + \setplength{lochpos}{\useplength{toaddrhpos}}% \fi \ifdim \useplength{locvpos}=\z@% - \@setplength{locvpos}{\useplength{toaddrvpos}}% + \setplength{locvpos}{\useplength{toaddrvpos}}% \fi \ifdim \useplength{locheight}=\z@% - \@setplength{locheight}{\useplength{toaddrheight}}% + \setplength{locheight}{\useplength{toaddrheight}}% \fi \setlengthtoplength[-]{\@tempskipa}{lochpos}% \ifdim \@tempskipa<\z@ @@ -263,17 +263,17 @@ \begingroup \ifdim\useplength{refwidth}=\z@ \if@refwide - \@setplength{refwidth}{\paperwidth}% + \setplength{refwidth}{\paperwidth}% \ifdim \useplength{toaddrhpos}>\z@ - \@setplength{refhpos}{\useplength{toaddrhpos}}% + \setplength{refhpos}{\useplength{toaddrhpos}}% \else - \@setplength[-]{refhpos}{\useplength{toaddrhpos}}% + \setplength[-]{refhpos}{\useplength{toaddrhpos}}% \fi - \@addtoplength[-2]{refwidth}{\useplength{refhpos}}% + \addtoplength[-2]{refwidth}{\useplength{refhpos}}% \else - \@setplength{refwidth}{\textwidth}% - \@setplength{refhpos}{\oddsidemargin}% - \@addtoplength{refhpos}{1in}% + \setplength{refwidth}{\textwidth}% + \setplength{refhpos}{\oddsidemargin}% + \addtoplength{refhpos}{1in}% \fi \else\ifdim\useplength{refhpos}=\z@ \begingroup @@ -290,7 +290,7 @@ \divide\@tempdima by\@tempdimc \fi \edef\@tempa{\noexpand\endgroup - \noexpand\@setplength{refhpos}{\the\@tempdima}}% + \noexpand\setplength{refhpos}{\the\@tempdima}}% \@tempa \fi\fi \showfield{\useplength{refhpos}}{\useplength{refvpos}}% @@ -577,7 +577,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 3577 2021-03-05 10:17:58Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3742 2022-03-04 16:21:17Z kohm $ %%% (run: body) \endinput %% -- cgit v1.2.3