From aab00778035c28a028f94e501e3c13f6b4081f87 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Dec 2019 22:17:03 +0000 Subject: koma-script (30dec19) git-svn-id: svn://tug.org/texlive/trunk@53270 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 8 +- .../texmf-dist/tex/latex/koma-script/DIN5008A.lco | 8 +- .../texmf-dist/tex/latex/koma-script/DIN5008B.lco | 8 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 8 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 29 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 8 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 8 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 8 +- .../tex/latex/koma-script/UScommercial9.lco | 8 +- .../tex/latex/koma-script/UScommercial9DW.lco | 8 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 12 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../texmf-dist/tex/latex/koma-script/komamarks.sty | 276 ------------ .../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/scrartcl.cls | 292 +++++++------ .../tex/latex/koma-script/scrarticle.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 485 ++++++++++++--------- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 333 +++++++------- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 79 ++-- .../tex/latex/koma-script/scrfontsizes.sty | 14 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 14 +- .../texmf-dist/tex/latex/koma-script/scrjura.sty | 20 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 24 +- .../tex/latex/koma-script/scrlayer-fancyhdr.sty | 6 +- .../tex/latex/koma-script/scrlayer-notecolumn.sty | 19 +- .../tex/latex/koma-script/scrlayer-scrpage.sty | 84 ++-- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 113 +++-- .../texmf-dist/tex/latex/koma-script/scrletter.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 140 +++--- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 203 +++++---- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 217 +++++---- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 20 +- .../texmf-dist/tex/latex/koma-script/scrreport.cls | 6 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 321 ++++++++------ .../tex/latex/koma-script/scrsize10pt.clo | 6 +- .../tex/latex/koma-script/scrsize11pt.clo | 6 +- .../tex/latex/koma-script/scrsize12pt.clo | 6 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrwfile.sty | 14 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../tex/latex/koma-script/standardsections.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 474 ++++++++++---------- .../texmf-dist/tex/latex/koma-script/typearea.sty | 88 ++-- .../texmf-dist/tex/latex/koma-script/visualize.lco | 26 +- 54 files changed, 1799 insertions(+), 1722 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/koma-script/komamarks.sty (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 33211a3451b..02a95330b91 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% DIN% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco index 8350053230c..875bdb9b585 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,7 +73,7 @@ \LoadLetterOption{% DINmtext% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@setplength{toaddrindent}{% 5mm} diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco index 9abd8cf9183..f8a60e8b039 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% 5008% @@ -73,7 +73,7 @@ \LoadLetterOption{% DIN% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@setplength{toaddrindent}{% 5mm} diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index a7eeeefbf69..3412a53fdfa 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% DINmtext% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index b49b0ff2096..2225d0f1230 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% KOMAold% @@ -80,7 +80,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% @@ -172,14 +172,25 @@ \def\fromlocation{\usekomavar{location}} \def\backaddress{\setkomavar{backaddress}} \def\@tempa{% - \ifkomavarempty{fromname}{}{% + \Ifkomavarempty{fromname}{}{% \strut\ignorespaces\usekomavar{fromname}% - \ifkomavarempty{fromaddress}{}{\\}}% - \ifkomavarempty{fromaddress}{}{% + \Ifkomavarempty{fromaddress}{}{\\}}% + \Ifkomavarempty{fromaddress}{}{% \strut\ignorespaces\usekomavar{fromaddress}}% - } +} \ifx\@tempa\scr@backaddress@var% \setkomavar{backaddress}{} +\else + \def\@tempa{% + \ifkomavarempty{fromname}{}{% + \strut\ignorespaces\usekomavar{fromname}% + \ifkomavarempty{fromaddress}{}{\\}}% + \ifkomavarempty{fromaddress}{}{% + \strut\ignorespaces\usekomavar{fromaddress}}% + } + \ifx\@tempa\scr@backaddress@var% + \setkomavar{backaddress}{} + \fi \fi \def\frombackaddress{\usekomavar{backaddress}} \def\telephone{\setkomavar{fromphone}} @@ -207,7 +218,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \def\setpresigskip{\@setplength{sigbeforevskip}} \endinput diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 6f2c2360c19..3611d6ba987 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Kaku,LATE,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index c12b96e83ca..35bd7e0525c 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% NF% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 6e48688e699..3158ee06461 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,EARLY,HIGH,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index 1a3fc77d432..4b7beb7339f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,EARLY,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index a0cbf699c1c..f15b403c3fc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,LATE,HIGH,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index e15670798a0..6a757ccd960 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,LATE,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index bccb24869f9..2f235fc4431 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $ %%% (run: Ni,RIGHT,LOW,head) diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 9d243dd9ccf..28e03ff93fe 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% SN% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 2ff8f119929..75ecd04af93 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% SNleft% @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 2b6050e8230..a3967aa7503 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9 @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index 43a3cf3de30..97ecd5335ee 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% UScommercial9DW @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index b0bcb969aa1..d45c68a7bae 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{float.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \scr@ifexpected{\newfloat}{% \long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3} \let\float@do=\relax @@ -102,7 +102,7 @@ \RequirePackage{tocbasic}% \PackageInfo{scrhack}{redefining \string\newfloat}% \renewcommand\newfloat[3]{% - \ifattoclist{#3}{% + \Ifattoclist{#3}{% \PackageError{scrhack}{extension `#3' already in use}{% Each extension may be used only once.\MessageBreak You, the class, or another package already uses extension diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index 47a1c1cc8ed..7c7d0229ce2 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{floatrow.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z 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 b6b52ff7813..8aade199192 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{hyperref.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \scr@ifexpected\@schapter{% \def\@schapter#1{% \H@old@schapter{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/komamarks.sty b/Master/texmf-dist/tex/latex/koma-script/komamarks.sty deleted file mode 100644 index 0ad6ee3f2c7..00000000000 --- a/Master/texmf-dist/tex/latex/koma-script/komamarks.sty +++ /dev/null @@ -1,276 +0,0 @@ -%% -%% This is file `komamarks.sty', -%% generated with the docstrip utility, extended by scrdocstrip. -%% -%% The original source files were: -%% -%% komamarks.dtx (with options: `package,trace,identify') -%% komamarks.dtx (with options: `package,trace,init') -%% komamarks.dtx (with options: `package,trace,options') -%% komamarks.dtx (with options: `package,trace,processoptions') -%% komamarks.dtx (with options: `package,trace,body') -%% komamarks.dtx (with options: `package,trace,final') -%% scrlogo.dtx (with options: `logo') -%% -%% Copyright (c) 2012-2019 Markus Kohm [komascript at gmx info] -%% -%% This file was generated from file(s) of the KOMA-Script bundle. -%% --------------------------------------------------------------- -%% -%% It may be distributed under the conditions of the -%% LaTeX Project Public License in the version distributed together -%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. -%% -%% This file may only be distributed together with a copy of the -%% KOMA-Script bundle. You may however distribute the -%% KOMA-Script bundle without all such generated files. See also -%% `lppl.txt' or `lppl-de.txt' for additional information. -%% -%% The list of files belonging to KOMA-Script distribution is given in -%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for -%% additional information. -%% -%% If this file is a beta version, you may not be allowed to distribute -%% it. Look at the comments below to see if this is the case. -%% -%% English and German manuals are part of KOMA-Script bundle. -%% ---------------------------------------------------------- -%% -%% See `README'. -%% -%% The KOMA-Script bundle (but maybe not this file) was based upon the -%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. You can -%% find a complete unmodified copy of LaTeX2e at -%% . -%% -%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $ -%%% (run: identify) -\NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{komamarks}[% - 2018/05/03 v0.3199 KOMA-Script - package - (providing extra marks)] -%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $ -%%% (run: init) -\RequirePackage{scrbase} -\RequirePackage{scrlfile} -%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $ -%%% (run: options) -%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $ -%%% (run: processoptions) -\ProcessOptions\relax -%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $ -%%% (run: body) -\newcommand*{\marksboth}[3]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \ExecuteDoHook{marks/relax}% - \unrestored@protected@edef\@themark{{#2}{#3}}% - \global\expandafter\let\csname @themarks\the#1\endcsname\@themark - \@temptokena \expandafter{\@themark}% - \marks#1{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\def\unrestored@protected@edef{% - \let\protect\@unexpandable@protect - \edef -} -\newcommand*{\marksright}[2]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \ExecuteDoHook{marks/relax}% - \@ifundefined{@themarks\the#1}{% - \def\@themark{{}{}}% - }{% - \expandafter\let\expandafter\@themark\csname @themarks\the#1\endcsname - }% - \expandafter\@marksright\@themark {#2}% - \global\expandafter\let\csname @themarks\the#1\endcsname\@themark - \@temptokena \expandafter{\@themark}% - \marks#1{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\newcommand*{\@marksright}[3]{% - \@temptokena {#1}% - \unrestored@protected@edef\@themark{{\the\@temptokena}{#3}}% -} -\newcommand*{\leftfirstmarks}[1]{% - \expandafter\@leftmark\firstmarks#1\@empty\@empty -} -\newcommand*{\lefttopmarks}[1]{% - \expandafter\@leftmark\topmarks#1\@empty\@empty -} -\newcommand*{\leftbotmarks}[1]{% - \expandafter\@leftmark\botmarks#1\@empty\@empty -} -\newcommand*{\leftmarks}{\leftbotmarks} -\newcommand*{\rightfirstmarks}[1]{% - \expandafter\@rightmark\firstmarks#1\@empty\@empty -} -\newcommand*{\righttopmarks}[1]{% - \expandafter\@rightmark\topmarks#1\@empty\@empty -} -\newcommand*{\rightbotmarks}[1]{% - \expandafter\@rightmark\botmarks#1\@empty\@empty -} -\newcommand*{\rightmarks}{\rightfirstmarks} -\AfterPackage*{multicol}{% - \PackageWarning{komamarks}{% - komamarks does not yet support multicols - }% -} -\newcommand*{\marksall}[2]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \ExecuteDoHook{marks/relax}% - \unrestored@protected@edef\@themark{#2}% - \global\expandafter\let\csname @themarks\the#1\endcsname\@themark - \@temptokena \expandafter{\@themark}% - \marks#1{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\newcommand*{\marksnth}[3]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \ExecuteDoHook{marks/relax}% - \@tempcnta=\z@ - \let\@themark\@empty - \@ifundefined{@themarks\the#1}{}{% - \expandafter\expandafter\expandafter\@tfor - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter:% - \expandafter\expandafter\expandafter=% - \csname @themarks\the#1\endcsname\do {% - \advance\@tempcnta \@ne - \ifnum \number #2=\@tempcnta - \unrestored@protected@edef\@themark{\@themark{#3}}% - \else - \unrestored@protected@edef\@themark{\@themark{\reserved@a}}% - \fi - }% - }% - \@whilenum \number #2>\@tempcnta\do {% - \advance\@tempcnta \@ne - \ifnum \number #2=\@tempcnta - \unrestored@protected@edef\@themark{\@themark{#3}}% - \else - \unrestored@protected@edef\@themark{\@themark{}}% - \fi - }% - \global\expandafter\let\csname @themarks\the#1\endcsname\@themark - \@temptokena \expandafter{\@themark}% - \marks#1{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\newcommand*{\marksnthplus}[4]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \ExecuteDoHook{marks/relax}% - \@tempcnta=\z@ - \let\@themark\@empty - \@ifundefined{@themarks\the#1}{}{% - \expandafter\expandafter\expandafter\@tfor - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter:% - \expandafter\expandafter\expandafter=% - \csname @themarks\the#1\endcsname\do {% - \advance\@tempcnta \@ne - \ifnum \number #2=\@tempcnta - \unrestored@protected@edef\@themark{\@themark{#3}}% - \else - \ifnum \number #2>\@tempcnta - \unrestored@protected@edef\@themark{\@themark{\reserved@a}}% - \else - \unrestored@protected@edef\@themark{\@themark{#4}}% - \fi - \fi - }% - }% - \@whilenum \number #2>\@tempcnta\do {% - \advance\@tempcnta \@ne - \ifnum \number #2=\@tempcnta - \unrestored@protected@edef\@themark{\@themark{#3}}% - \else - \unrestored@protected@edef\@themark{\@themark{}}% - \fi - }% - \global\expandafter\let\csname @themarks\the#1\endcsname\@themark - \@temptokena \expandafter{\@themark}% - \marks#1{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\newcommand*{\marksnthcleartail}[3]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \ExecuteDoHook{marks/relax}% - \@tempcnta=\z@ - \let\@themark\@empty - \@ifundefined{@themarks\the#1}{}{% - \expandafter\expandafter\expandafter\@tfor - \expandafter\expandafter\expandafter\reserved@a - \expandafter\expandafter\expandafter:% - \expandafter\expandafter\expandafter=% - \csname @themarks\the#1\endcsname\do {% - \advance\@tempcnta \@ne - \ifnum \number #2=\@tempcnta - \unrestored@protected@edef\@themark{\@themark{#3}}% - \else - \ifnum \number #2>\@tempcnta - \unrestored@protected@edef\@themark{\@themark{\reserved@a}}% - \fi - \fi - }% - }% - \@whilenum \number #2>\@tempcnta\do {% - \advance\@tempcnta \@ne - \ifnum \number #2=\@tempcnta - \unrestored@protected@edef\@themark{\@themark{#3}}% - \else - \unrestored@protected@edef\@themark{\@themark{}}% - \fi - }% - \global\expandafter\let\csname @themarks\the#1\endcsname\@themark - \@temptokena \expandafter{\@themark}% - \marks#1{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\newcommand*{\nthmarknotdefined}{} -\newcommand*{\nthtopmarks}[2]{% - \expandafter\@nthofm\expandafter{\topmarks#1}{#2}% -} -\newcommand*{\nthfirstmarks}[2]{% - \expandafter\@nthofm\expandafter{\firstmarks#1}{#2}% -} -\newcommand*{\nthbotmarks}[2]{% - \expandafter\@nthofm\expandafter{\botmarks#1}{#2}% -} -\newcommand{\@nthofm}[2]{% - \begingroup - \@tempcnta=\z@ - \let\reserved@a\nthmarknotdefined - \@tfor\reserved@b:=#1\do{% - \advance\@tempcnta\@ne - \ifnum \number #2=\@tempcnta - \let\reserved@a\reserved@b - \fi - }% - \expandafter\def\expandafter\reserved@a\expandafter{\expandafter\endgroup - \reserved@a}% - \reserved@a -} -%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $ -%%% (run: final) -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ -\@ifundefined{KOMAScript}{% - \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% - M\kern.05em A\kern.1em-\kern.1em Script}}}{} -\endinput -%% -%% End of file `komamarks.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index b2df79d0096..12216949138 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{listings.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z 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 a5fb1fceb1d..749ac22908d 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{lscape.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z 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 5f36fc92c62..d53676d4a4e 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{nomencl.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package nomencl)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \RequirePackage{tocbasic} \@ifpackagelater{nomencl}{2019/01/01}{% \PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index a4af59af4c6..913d7315288 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -5,7 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `class,article') -%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `class,load') %% scrkernel-listsof.dtx (with options: `class,book,prepare') %% scrkernel-tocstyle.dtx (with options: `class,article,prepare') %% scrkernel-sections.dtx (with options: `class,article,prepare') @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,29 +121,29 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist[ToC]{toc} -\ifstr{\ext@toc}{toc}{}{% +\Ifstr{\ext@toc}{toc}{}{% \expandafter\addtotoclist \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -195,7 +195,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -269,10 +269,12 @@ \@namedef{scr@v@3.26a}{17} \@namedef{scr@v@3.26b}{17} \@namedef{scr@v@3.27}{17} +\@namedef{scr@v@3.27a}{17} +\@namedef{scr@v@3.28}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -347,7 +349,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -403,9 +405,9 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -415,17 +417,17 @@ } \newcommand*{\@pt@@scan}{} \def\@pt@@scan #1pt#2\@pt@@scan{% - \ifstr{#2}{pt}{% - \ifnumber{#1}{% - \ifstr{#1}{10}{% + \Ifstr{#2}{pt}{% + \Ifnumber{#1}{% + \Ifstr{#1}{10}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{11}{% + \Ifstr{#1}{11}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{12}{% + \Ifstr{#1}{12}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% @@ -491,11 +493,11 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% - \ifstr{#1}{semi}{% + \Ifstr{#1}{semi}{% \@twosidetrue \FamilyKeyStateProcessed }{% @@ -552,8 +554,8 @@ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% - \ifstr{#1}{}{% - \ifstr{#3}{BCOR}{% + \Ifstr{#1}{}{% + \Ifstr{#3}{BCOR}{% \PassOptionsToPackage{BCOR#2}{typearea}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% @@ -581,18 +583,18 @@ } \newcommand*{\x@@paper}{} \def\x@@paper #1#2paper#3\x@@paper{% - \ifstr{#3}{paper}{% - \ifnumber{#2}{% - \ifstr{#1}{a}{% + \Ifstr{#3}{paper}{% + \Ifnumber{#2}{% + \Ifstr{#1}{a}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{b}{% + \Ifstr{#1}{b}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{c}{% + \Ifstr{#1}{c}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{d}{% + \Ifstr{#1}{d}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% @@ -774,13 +776,13 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagefalse \newif\if@titlepageiscoverpage \KOMA@key{titlepage}[true]{% - \ifstr{#1}{firstiscover}{% + \Ifstr{#1}{firstiscover}{% \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed @@ -809,9 +811,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -854,16 +856,16 @@ Maybe `hyperref' not loaded or unknown version?% }% }{% - \ifstr{\Hy@driver}{hdvips}{% + \Ifstr{\Hy@driver}{hdvips}{% \providecommand*{\BookmarkDriverDefault}{dvips}% }{% - \ifstr{\Hy@driver}{hdvipdfm}{% + \Ifstr{\Hy@driver}{hdvipdfm}{% \providecommand*{\BookmarkDriverDefault}{dvipdfm}% }{% - \ifstr{\Hy@driver}{hdvipson}{% + \Ifstr{\Hy@driver}{hdvipson}{% \providecommand*{\BookmarkDriverDefault}{dvipsone}% }{% - \ifstr{\Hy@driver}{htexture}{% + \Ifstr{\Hy@driver}{htexture}{% \providecommand*{\BookmarkDriverDefault}{textures}% }{% }% @@ -1009,7 +1011,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -1024,7 +1026,7 @@ \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}% }% - \ifstr{#1}{current}{% + \Ifstr{#1}{current}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% @@ -1035,7 +1037,7 @@ }{cleardoublepage}{current}% }% }{% - \ifnotundefined{ps@#1}{% + \Ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -1048,7 +1050,7 @@ }{% \ifx\@currname\KOMAClassName \ifx\@currext\@clsextension - \ifstr{#1}{headings}{% + \Ifstr{#1}{headings}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -1114,7 +1116,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1249,7 +1251,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1264,7 +1266,7 @@ option `footnotes=#1'}% \fi \fi - \ifstr{#1}{multiple}{% + \Ifstr{#1}{multiple}{% \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% @@ -1273,7 +1275,7 @@ \KOMAClassFileName }{footnotes}{multiple}% }{% - \ifstr{#1}{nomultiple}{% + \Ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty @@ -1320,17 +1322,18 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% {noindex}{0},{noidx}{0},% {index}{1},{idx}{1},% - {indexnumbered}{2},% - {nolistof}{3},% - {listof}{4},% + {indexnumbered}{2},{idxnumbered}{2},{numberedindex}{2},{numberedidx}{2},% + {nolistof}{3},{nolistsof}{3},% + {listof}{4},{listsof}{4},% {listofnumbered}{5},{numberedlistof}{5},% + {listsofnumbered}{5},{numberedlistsof}{5},% {nobibliography}{6},{nobib}{6},% {bibliography}{7},{bib}{7},% {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},% @@ -1549,7 +1552,7 @@ \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} \KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} -%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1570,7 +1573,7 @@ \let\bib@beginhook\@empty \let\bib@endhook\@empty \@ifundefined{scr@current@bibstyle}{}{% - \ifstr{\scr@current@bibstyle}{}{}{% + \Ifstr{\scr@current@bibstyle}{}{}{% \edef\reserved@a{% \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% @@ -1802,21 +1805,21 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2291,13 +2294,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2484,7 +2487,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -2901,10 +2904,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2918,19 +2921,18 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{% \if@sectionentrywithdots - \TOCLineLeaderFill\relax + {\usekomafont{sectionentrydots}{\TOCLineLeaderFill}}\relax \else \hfill \fi }% - % F^^c3^^bcr die Eintr^^c3^^a4ge die Schrift von Element sectionentry verwenden. \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname{\usekomafont{sectionentry}}% \expandafter\providecommand% @@ -2938,20 +2940,29 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} -\newcommand*{\ifnumbered}[1]{% +\providecommand*{\ifnumbered}{% + \ClassWarning{\KOMAClassName}{Usage of deprecated command + `\string\ifnumbered'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnumbered' by `\string\Ifnumbered'% + }% + \Ifnumbered +} +\newcommand*{\Ifnumbered}[1]{% \if@currentusenumber \scr@ifundefinedorrelax{#1numdepth}{% \expandafter\@secondoftwo @@ -2966,8 +2977,17 @@ \expandafter\@secondoftwo \fi } -\newcommand*{\ifunnumbered}[1]{% - \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% +\providecommand*{\ifunnumbered}{% + \ClassWarning{\KOMAClassName}{Usage of deprecated command + `\string\ifunnumbered'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifunnumbered' by `\string\Ifunnumbered'% + }% + \Ifunnumbered +} +\newcommand*{\Ifunnumbered}[1]{% + \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% } \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3102,8 +3122,8 @@ \KOMAClassName\space needs it's own definition of `\string\@startsection'\MessageBreak to provide extended features for the optional argument\MessageBreak - of `\string\section` etc.\MessageBreak - Generally it defines `\string\@startsection` completely new\MessageBreak + of `\string\section' etc.\MessageBreak + Generally it defines `\string\@startsection' completely new\MessageBreak to achieve this. Because of the unexpected definition\MessageBreak an alternative approach will be used.\MessageBreak If this fails and if there isn't a new release of\MessageBreak @@ -3111,9 +3131,9 @@ send a report to the KOMA-Script author.\MessageBreak Note, that this alternative approach does not\MessageBreak execute the elements of do-hooks:\MessageBreak - \space\space- `heading/postinit`,\MessageBreak - \space\space- `heading/branch/star`,\MessageBreak - \space\space- `heading/branch/nostar`,\MessageBreak + \space\space- `heading/postinit',\MessageBreak + \space\space- `heading/branch/star',\MessageBreak + \space\space- `heading/branch/nostar',\MessageBreak and does always use `runin=bysign' and\MessageBreak `afterindent=bysign'% }% @@ -3638,7 +3658,7 @@ ####1####2####3{####2}% \fi \else - \ifstr{##1}{#5}{% + \Ifstr{##1}{#5}{% \expandafter\def\csname #3\scr@dsc@current#4\endcsname ####1####2####3{####3}% \FamilyKeyStateProcessed @@ -3733,7 +3753,7 @@ } \newcommand*{\scr@dsc@style@part@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {before part skip}{beforeskip}% }{% @@ -3744,7 +3764,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {after part skip}{afterskip}% }{% @@ -3755,7 +3775,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{% \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}% @@ -3764,7 +3784,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current prefix}{}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {number font}{prefixfont}% }{% @@ -4158,14 +4178,14 @@ \DeclareSectionCommand[{#1}]{#2}% \else \ClassError{\KOMAClassName}{% - command `\reserved@b` already defined% + command `\reserved@b' already defined% }{% You've tried to define the section command `\expandafter\string\csname - #2\endcsname` newly.\MessageBreak + #2\endcsname' newly.\MessageBreak Such a section command needs an additional new command - `\reserved@b`,\MessageBreak + `\reserved@b',\MessageBreak but this already exists. So you cannot define - `\expandafter\string\csname #2\endcsname` newly.\MessageBreak + `\expandafter\string\csname #2\endcsname' newly.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\RedeclareSectionCommand,\MessageBreak or \string\ProvideSectionCommand.\MessageBreak @@ -4174,10 +4194,10 @@ \fi }{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname #2\endcsname` already defined% + command `\expandafter\string\csname #2\endcsname' already defined% }{% You've tried to define the section command `\expandafter\string\csname - #2\endcsname` newly,\MessageBreak + #2\endcsname' newly,\MessageBreak but a command or something else with this name already exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, @@ -4190,10 +4210,10 @@ \newcommand*{\RedeclareSectionCommand}[2][]{% \@ifundefined{#2}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname #2\endcsname` not defined% + command `\expandafter\string\csname #2\endcsname' not defined% }{% You've tried to re-define the section command `\expandafter\string\csname - #2\endcsname`,\MessageBreak + #2\endcsname',\MessageBreak but a command with this name does not exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\DeclareNewSectionCommand,\MessageBreak @@ -4238,11 +4258,11 @@ \scr@trim@spaces\reserved@a \@ifundefined{\reserved@a}{}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname\reserved@a\endcsname` already + command `\expandafter\string\csname\reserved@a\endcsname' already defined% }{% You've tried to define the section command - `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak + `\expandafter\string\csname\reserved@a\endcsname' newly,\MessageBreak but a command, token, box or length with this name already exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, @@ -4269,10 +4289,10 @@ \scr@trim@spaces\reserved@a \@ifundefined{\reserved@a}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname\reserved@a\endcsname` not defined% + command `\expandafter\string\csname\reserved@a\endcsname' not defined% }{% You've tried to re-define the section command - `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak + `\expandafter\string\csname\reserved@a\endcsname',\MessageBreak but a command with this name does not exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\DeclareNewSectionCommand,\MessageBreak @@ -4350,7 +4370,7 @@ unknown section command style `#2'% }{}% }% - \ifstr{\@nameuse{scr@#1@style}}{#2}% + \Ifstr{\@nameuse{scr@#1@style}}{#2}% } \newcommand*{\bprot@dottedtocline}[5]{% \expandafter\ifnum\scr@v@is@gt{2.96}\relax @@ -4381,7 +4401,7 @@ \fi } \newcommand*\appendix{% - \ifstr{\@currenvir}{appendix}{% + \Ifstr{\@currenvir}{appendix}{% \ClassWarning{\KOMAClassName}{% You are using `\string\begin{appendix}...\string\end{appendix}'.\MessageBreak @@ -4445,7 +4465,7 @@ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi - \ifnumbered{#1}{% + \Ifnumbered{#1}{% \refstepcounter{#1}% \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname @@ -4475,7 +4495,7 @@ \fi }% \begingroup - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\Ifnumbered{#1}}% \ExecuteDoHook{heading/begingroup/#1}% \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \raggedpart @@ -4689,7 +4709,7 @@ \newcommand*{\scr@fnt@subparagraph}{\size@subparagraph} \newkomafont{sectionentry}{\usekomafont{disposition}} \newkomafont{sectionentrypagenumber}{} -\newkomafont{sectionentrydots}{\normalfont} +\newkomafont{sectionentrydots}{} \DeclareSectionCommand[% style=section,% level=1,% @@ -4755,7 +4775,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -4829,7 +4849,16 @@ } \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd -\newcommand{\ifthispageodd}{% +\providecommand*{\ifthispageodd}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifthispageodd'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'% + }% + \Ifthispageodd +} +\newcommand{\Ifthispageodd}{% \is@thispageodd \ifthispagewasodd \expandafter\@firstoftwo @@ -5077,7 +5106,7 @@ after loading `titlesec'% }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -5138,11 +5167,11 @@ \if@twoside\else\hfil\fi}}}}\hss}% \renewcommand*{\sectionmark}[1]{% \if@twoside\expandafter\markboth\else\expandafter\markright\fi - {\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}##1}}{}}% + {\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}##1}}{}}% \renewcommand*{\subsectionmark}[1]{% \if@twoside \markright{% - \MakeMarkcase{\ifnumbered{subsection}{\subsectionmarkformat}{}##1}% + \MakeMarkcase{\Ifnumbered{subsection}{\subsectionmarkformat}{}##1}% }% \fi }% @@ -5173,7 +5202,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -5181,10 +5210,10 @@ \providecommand*{\@mkright}{% \IfActiveMkBoth{\markright}{\@gobble}% }% -\providecommand*{\@mkdouble}[1]{% +\providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% @@ -5274,7 +5303,7 @@ \if i\scap@pos\def\@tempa{l}\fi \if o\scap@pos\def\@tempa{r}\fi \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \if o\scap@pos\def\@tempa{l}\fi \if i\scap@pos\def\@tempa{r}\fi \ifscap@alt @@ -5401,7 +5430,7 @@ \let\cap@left=\relax \let\cap@right=\hfill \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\hfill \let\cap@right=\relax }% @@ -5414,7 +5443,7 @@ \let\cap@left=\hfill \let\cap@right=\relax \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\relax \let\cap@right=\hfill }% @@ -5500,7 +5529,7 @@ \let\cap@left=\relax \let\cap@right=\hfill \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\hfill \let\cap@right=\relax }% @@ -5520,7 +5549,7 @@ \let\cap@left=\hfill \let\cap@right=\relax \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\relax \let\cap@right=\hfill }% @@ -5556,7 +5585,7 @@ \edef\@tempa{\endgroup \def\noexpand\cap@width{\the\@tempdima}% \noexpand\if@twoside - \noexpand\ifthispageodd{% + \noexpand\Ifthispageodd{% \def\noexpand\cap@left{\noexpand\hspace*{\the\@tempdimc}}% \def\noexpand\cap@right{\noexpand\hspace*{\the\@tempdimb}}% }{% @@ -5720,7 +5749,10 @@ {% \hspace{-\cap@indent}% \scr@smashdp{% - #1{\usekomafont{captionlabel}{#2\captionformat}}% + #1{\usekomafont{caption}{% + \usekomafont{captionlabel}{#2\captionformat}% + }% + }% }% {\usekomafont{caption}{#3\scr@endstrut}\par}% }% @@ -5754,31 +5786,31 @@ \fi }% \def\reserved@a{#2}% - \ifstr{\reserved@a}{j}{% + \Ifstr{\reserved@a}{j}{% \expandafter\let\csname ragged#1caption\endcsname\@empty }{% - \ifstr{\reserved@a}{l}{% + \Ifstr{\reserved@a}{l}{% \scr@ifundefinedorrelax{LaTeXraggedright}{% \expandafter\let\csname ragged#1caption\endcsname\raggedright }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright }% }{% - \ifstr{\reserved@a}{r}{% + \Ifstr{\reserved@a}{r}{% \scr@ifundefinedorrelax{LaTeXraggedleft}{% \expandafter\let\csname ragged#1caption\endcsname\raggedleft }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft }% }{% - \ifstr{\reserved@a}{c}{% + \Ifstr{\reserved@a}{c}{% \scr@ifundefinedorrelax{LaTeXcentering}{% \expandafter\let\csname ragged#1caption\endcsname\centering }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering }% }{% - \ifstr{\reserved@a}{J}{% + \Ifstr{\reserved@a}{J}{% \scr@ifundefinedorrelax{justifying}{% \scr@caption@raggede@warning{J}{\justifying}% \expandafter\let\csname ragged#1caption\endcsname\@empty @@ -5786,7 +5818,7 @@ \expandafter\let\csname ragged#1caption\endcsname\justifying }% }{% - \ifstr{\reserved@a}{L}{% + \Ifstr{\reserved@a}{L}{% \scr@ifundefinedorrelax{RaggedRight}{% \scr@caption@raggede@warning{L}{\RaggedRight}% \expandafter\let\csname ragged#1caption\endcsname\raggedright @@ -5794,7 +5826,7 @@ \expandafter\let\csname ragged#1caption\endcsname\RaggedRight }% }{% - \ifstr{\reserved@a}{R}{% + \Ifstr{\reserved@a}{R}{% \scr@ifundefinedorrelax{RaggedLeft}{% \scr@caption@raggede@warning{R}{\RaggedLeft}% \expandafter\let\csname ragged#1caption\endcsname\raggedleft @@ -5802,7 +5834,7 @@ \expandafter\let\csname ragged#1caption\endcsname\RaggedLeft }% }{% - \ifstr{\reserved@a}{C}{% + \Ifstr{\reserved@a}{C}{% \scr@ifundefinedorrelax{Centering}{% \scr@caption@raggede@warning{C}{\Centering}% \expandafter\let\csname ragged#1caption\endcsname\centering @@ -5810,7 +5842,7 @@ \expandafter\let\csname ragged#1caption\endcsname\Centering }% }{% - \ifstr{\reserved@a}{}{% + \Ifstr{\reserved@a}{}{% \expandafter\let\csname ragged#1caption\endcsname\relax }{% \ClassError{\KOMAClassName}{unknown alignment char `#2'}{% @@ -5979,7 +6011,7 @@ \else\expandafter\captionbelow\fi } ]{lot} -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -6024,10 +6056,10 @@ \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% - \ifstr{#1}{}{}{% + \IfArgIsEmpty{#1}{}{% \renewcommand*{\ftn@rule@height}{#1}% }% - \ifstr{#2}{}{}{% + \IfArgIsEmpty{#2}{}{% \renewcommand*{\ftn@rule@width}{#2}% }% \ftn@rule@test@values @@ -6137,7 +6169,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -6281,7 +6313,7 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\refname{References} \newcommand*{\bibpreamble}{\relax} @@ -6409,7 +6441,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -6519,7 +6551,7 @@ \@addmargin }{% \if@twoside - \unskip\nobreak\ifthispageodd{}{}% + \unskip\nobreak\Ifthispageodd{}{}% \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else \ClassWarning{\KOMAClassName}{% page break inside `addmargin*' environment.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index a4056babb12..d65e9e83ca8 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 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 51a91eae932..8ac43e23e43 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (% KOMA-Script-independent @@ -121,9 +121,6 @@ \expandafter\@firstoftwo \fi } -\newcommand*\PackageErrorNoLine[2]{% - \PackageError{#1}{#2\@gobble}% -} \newcommand*{\DefineFamily}[1]{% \scr@ifundefinedorrelax{#1@key@familylist}{% \@namedef{#1@key@familylist}{}% @@ -457,31 +454,25 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: option) -\newcommand*{\dont@let@as@internal@defined}{/} -\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse \DefineFamily{KOMA} \DefineFamilyMember{KOMA} \DefineFamilyKey{KOMA}{internalonly}[\relax]{% - \ifx\relax#1\relax - \@let@as@internalonly@definedtrue - \else - \@let@as@internalonly@definedfalse - \begingroup - \@expandtwoargs\in@{#1}\dont@let@as@internal@defined - \expandafter\endgroup - \ifin@\else\g@addto@macro\dont@let@as@internal@defined{#1/}\fi - \fi + \PackageInfo{scrbase}{Ignoring deprecated option `internalonly'}% + \FamilyKeyStateProcessed +} +\AtEndOfPackage{% + \RelaxFamilyKey[.scrbase.sty]{KOMA}{internalonly}% } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) -%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $ +%%% From File: $Id: scrlfile.dtx 3399 2019-11-21 09:01:49Z kohm $ \RequirePackage{scrlfile}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -510,73 +501,33 @@ \AtBeginDocument{\@atdocumenttrue} \@onlypreamble\@atdocumentrue \@onlypreamble\@atdocumentfalse -\newcommand*{\let@as@internal@defined}[1]{% - \begingroup - \if@let@as@internalonly@defined - \in@true - \else - \@expandtwoargs\in@{/#1/}\dont@let@as@internal@defined - \fi - \expandafter\endgroup - \ifin@ - \PackageInfo{% - scrbase% - }{% - \expandafter\string\csname #1\endcsname\space excluded from being - defined% - }% - \else - \@ifundefined{#1}{% - \begingroup - \expandafter\def\expandafter\reserved@a - \expandafter{\csname scr@#1\endcsname}% - \expandafter\def\expandafter\reserved@b - \expandafter{\csname #1\endcsname}% - \expandafter\expandafter\expandafter\endgroup - \expandafter\expandafter\expandafter\let\expandafter\reserved@b\reserved@a - \if@atdocument\else - \g@addto@macro\document{% - \expandafter\ifx\csname #1\expandafter\endcsname - \csname scr@#1\endcsname - \else - \PackageWarning{scrbase}{% - \expandafter\string\csname #1\endcsname\space was - redefined\MessageBreak - at the document preamble.\MessageBreak - If you did not redefine it by yourself, have a\MessageBreak - a look at the description of this command at\MessageBreak - the manual of every package you are using\@gobble - }% - \fi - \ignorespaces - }% - \fi - }{% - \PackageInfo{% - scrbase% - }{% - \expandafter\string\csname #1\endcsname\space already - defined.\MessageBreak - If \expandafter\string\csname #1\endcsname\space does not behave - like\MessageBreak - it was described at the KOMA-Script manual, try to\MessageBreak - load `scrbase.\scr@pkgextension' earlier or find out at - which\MessageBreak - package or class \expandafter\string\csname #1\endcsname\space - was defined before\@gobble - }% - }% - \fi +\newcommand*{\Ifundefinedorrelax}{scr@ifundefinedorrelax}% +\providecommand*{\ifnotundefined}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifnotundefined'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnotundefined' by `\string\Ifnotundefined'% + }% + \Ifnotundefined } -\let@as@internal@defined{ifundefinedorrelax} -\newcommand{\ifnotundefined}[1]{% +\newcommand{\Ifnotundefined}[1]{% \ifcsname #1\endcsname \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi } -\newcommand\ifstr[2]{% +\providecommand*{\ifstr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifstr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifstr' by `\string\Ifstr'% + }% + \Ifstr +} +\newcommand\Ifstr[2]{% \begingroup\protected@edef\reserved@a{#1}\protected@edef\reserved@b{#2}% \ifx\reserved@a\reserved@b \endgroup\expandafter\@firstoftwo @@ -584,7 +535,16 @@ \endgroup\expandafter\@secondoftwo \fi } -\newcommand*{\ifstrstart}[2]{% +\providecommand*{\ifstrstart}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifstrstart'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifstrstart' by `\string\Ifstrstart'% + }% + \Ifstrstart +} +\newcommand*{\Ifstrstart}[2]{% \begingroup \edef\reserved@a{\noexpand\@ifstrstart{#1}{#2}}% \reserved@a{\aftergroup\@firstoftwo}{\aftergroup\@secondoftwo}% @@ -605,14 +565,14 @@ } \newcommand*{\scr@ifislengthprimitive}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifislengthprimitive }{% \def\reserved@c{\aftergroup\scr@secondoftwoAfterNil}% \@for\reserved@a:=\baselineskip,\dp,\hsize,\ht,\lineskip,% \parindent,\parskip,\pdfpageheight,\pdfpagewidth,% \wd,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestDimenAssignTillNil}% @@ -623,15 +583,24 @@ \endgroup #1% } -\newcommand*{\ifisdimen}[1]{% +\providecommand*{\ifisdimen}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdimen'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdimen' by `\string\Ifisdimen'% + }% + \Ifisdimen +} +\newcommand*{\Ifisdimen}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimen#1\@nil}% } \newcommand*{\scr@ifisdimen}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdimen }{% - \ifstrstart{\meaning #1}{\string\dimen}{% + \Ifstrstart{\meaning #1}{\string\dimen}{% \aftergroup\scr@TestDimenAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -649,16 +618,16 @@ \newcommand*\scr@AfterEndGroupIfArgIsRelaxTillNnil{} \def\scr@AfterEndGroupIfArgIsRelaxTillNnil#1\@nnil{% \endgroup - \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil }{\@secondoftwo}% }% } \newcommand*\scr@IfArgIsRelaxAfterRelaxTillNnil{} \def\scr@IfArgIsRelaxAfterRelaxTillNnil \relax#1\@nnil{% - \ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{\relax}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillNnil #1\@nnil }{\@secondoftwo}% }% @@ -666,15 +635,24 @@ \newcommand*{\scr@secondoftwoAfterNil}{\scr@@secondoftwoAfterNil\@empty} \newcommand*{\scr@@secondoftwoAfterNil}{} \def\scr@@secondoftwoAfterNil#1\@nil{\@secondoftwo} -\newcommand*{\ifisskip}[1]{% +\providecommand*{\ifisskip}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisskip'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisskip' by `\string\Ifisskip'% + }% + \Ifisskip +} +\newcommand*{\Ifisskip}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisskip#1\@nil}% } \newcommand*{\scr@ifisskip}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisskip }{% - \ifstrstart{\meaning #1}{\string\skip}{% + \Ifstrstart{\meaning #1}{\string\skip}{% \aftergroup\scr@TestSkipAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -689,15 +667,24 @@ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil \@tempskipa=#1\relax\@nnil } -\newcommand*{\ifiscount}[1]{% +\providecommand*{\ifiscount}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifiscount'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifiscount' by `\string\Ifiscount'% + }% + \Ifiscount +} +\newcommand*{\Ifiscount}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifiscount#1\@nil}% } \newcommand*{\scr@ifiscount}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifiscount }{% - \ifstrstart{\meaning #1}{\string\count}{% + \Ifstrstart{\meaning #1}{\string\count}{% \aftergroup\scr@TestCountAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -712,15 +699,24 @@ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillNnil \@tempcnta=#1\relax\@nnil } -\newcommand*{\ifisdimexpr}[1]{% +\providecommand*{\ifisdimexpr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdimexpr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdimexpr' by `\string\Ifisdimexpr'% + }% + \Ifisdimexpr +} +\newcommand*{\Ifisdimexpr}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimexpr#1\relax\@nil}% } \newcommand*{\scr@ifisdimexpr}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdimexpr }{% - \ifstrstart{\meaning #1}{\string\dimexpr}{% + \Ifstrstart{\meaning #1}{\string\dimexpr}{% \aftergroup\scr@TestDimenAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -729,15 +725,24 @@ \endgroup #1% } -\newcommand*{\ifisglueexpr}[1]{% +\providecommand*{\ifisglueexpr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisglueexpr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisglueexpr' by `\string\Ifisglueexpr'% + }% + \Ifisglueexpr +} +\newcommand*{\Ifisglueexpr}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglueexpr#1\relax\@nil}% } \newcommand*{\scr@ifisglueexpr}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisglueexpr }{% - \ifstrstart{\meaning #1}{\string\glueexpr}{% + \Ifstrstart{\meaning #1}{\string\glueexpr}{% \aftergroup\scr@TestSkipAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -746,15 +751,24 @@ \endgroup #1% } -\newcommand*{\ifisnumexpr}[1]{% +\providecommand*{\ifisnumexpr}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisnumexpr'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisnumexpr' by `\string\Ifisnumexpr'% + }% + \Ifisnumexpr +} +\newcommand*{\Ifisnumexpr}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisnumexpr#1\relax\@nil}% } \newcommand*{\scr@ifisnumexpr}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisnumexpr }{% - \ifstrstart{\meaning #1}{\string\numexpr}{% + \Ifstrstart{\meaning #1}{\string\numexpr}{% \aftergroup\scr@TestCountAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -768,10 +782,10 @@ } \newcommand*{\scr@ifisdefchar}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdefchar }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestCountAssignTillNil }{% \aftergroup\scr@secondoftwoAfterNil @@ -780,7 +794,16 @@ \endgroup #1% } -\newcommand*{\ifiscounter}[1]{% +\providecommand*{\ifiscounter}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifiscounter'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifiscounter' by `\string\Ifiscounter'% + }% + \Ifiscounter +} +\newcommand*{\Ifiscounter}[1]{% \begingroup \scr@ifundefinedorrelax{c@#1}{% \aftergroup\@secondoftwo @@ -789,15 +812,24 @@ }% \endgroup } -\newcommand*{\ifisinteger}[1]{% +\providecommand*{\ifisinteger}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisinteger'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisinteger' by `\string\Ifisinteger'% + }% + \Ifisinteger +} +\newcommand*{\Ifisinteger}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisinteger#1\@nil}% } \def\scr@ifisinteger#1{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisinteger\aftergroup#1% }{% - \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \Ifstrstart{\meaning #1}{\detokenize{the character}}{% \if #1-\aftergroup\scr@ifisinteger \else \if #1+\aftergroup\scr@ifisinteger @@ -815,7 +847,7 @@ \fi \fi }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestCountAssignTillNil }{% \def\reserved@c{% @@ -844,7 +876,7 @@ \tolerance,\topskip,% \wd,\vbadness,\vfuzz,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestCountAssignTillNil}% @@ -868,18 +900,27 @@ \fi \endgroup } -\newcommand*{\ifisdimension}[1]{% +\providecommand*{\ifisdimension}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisdimension'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisdimension' by `\string\Ifisdimension'% + }% + \Ifisdimension +} +\newcommand*{\Ifisdimension}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisdimension#1\@nil}% } \newcommand*{\scr@ifisdimension}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisdimension\aftergroup#1% }{% - \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \Ifstrstart{\meaning #1}{\detokenize{the character}}{% \if #1-\aftergroup\scr@ifisdimension \else - \if #1-\aftergroup\scr@ifisdimension + \if #1+\aftergroup\scr@ifisdimension \else \if #1.% \aftergroup\scr@TestDimensionAssignTillNil @@ -906,7 +947,7 @@ \fi \fi }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestDimensionAssignTillNil }{% \def\reserved@c{% @@ -936,7 +977,7 @@ \tolerance,\topskip,% \wd,\vbadness,\vfuzz,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestDimensionAssignTillNil}% @@ -958,32 +999,41 @@ \newcommand*\scr@AfterEndGroupIfArgIsRelaxTillptNnil{} \def\scr@AfterEndGroupIfArgIsRelaxTillptNnil#1\@nnil{% \endgroup - \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil }{\@secondoftwo}% }% } \newcommand*\scr@IfArgIsRelaxAfterRelaxTillptNnil{} \def\scr@IfArgIsRelaxAfterRelaxTillptNnil \relax#1pt\@nnil{% - \ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% - \ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% + \Ifstr{\detokenize{#1}}{\detokenize{pt}}{\@firstoftwo}{% + \Ifstrstart{\detokenize{#1}}{\detokenize{\relax}}{% \scr@IfArgIsRelaxAfterRelaxTillptNnil #1\@nnil }{\@secondoftwo}% }% } -\newcommand*{\ifisglue}[1]{% +\providecommand*{\ifisglue}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifisglue'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifisglue' by `\string\Ifisglue'% + }% + \Ifisglue +} +\newcommand*{\Ifisglue}[1]{% \IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifisglue#1\@nil}% } \newcommand*{\scr@ifisglue}[1]{% \begingroup - \ifstrstart{\meaning #1}{\detokenize{macro:}}{% + \Ifstrstart{\meaning #1}{\detokenize{macro:}}{% \aftergroup\expandafter\aftergroup\scr@ifisglue\aftergroup#1% }{% - \ifstrstart{\meaning #1}{\detokenize{the character}}{% + \Ifstrstart{\meaning #1}{\detokenize{the character}}{% \if #1-\aftergroup\scr@ifisglue \else - \if #1-\aftergroup\scr@ifisdimension + \if #1+\aftergroup\scr@ifisglue \else \if #1.% \aftergroup\scr@TestGlueAssignTillNil @@ -1010,7 +1060,7 @@ \fi \fi }{% - \ifstrstart{\meaning #1}{\string\char\string"}{% + \Ifstrstart{\meaning #1}{\string\char\string"}{% \aftergroup\scr@TestGlueAssignTillNil }{% \def\reserved@c{% @@ -1040,7 +1090,7 @@ \tolerance,\topskip,% \wd,\vbadness,\vfuzz,\vsize \do {% - \expandafter\ifstr\expandafter{\expandafter\string\reserved@a}{% + \expandafter\Ifstr\expandafter{\expandafter\string\reserved@a}{% \meaning #1% }{% \def\reserved@c{\aftergroup\scr@TestGlueAssignTillNil}% @@ -1059,7 +1109,18 @@ \afterassignment\scr@AfterEndGroupIfArgIsRelaxTillptNnil \@tempskipa=#1pt\@nnil } -\newcommand\ifnumber[1]{% +\providecommand*{\ifnumber}{% + \scr@ifundefinedorrelax{ver@babelbib.sty}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifnumber'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnumber' by `\string\Ifnumber'% + }% + }{}% + \Ifnumber +} +\newcommand\Ifnumber[1]{% \begingroup\@tempswafalse\let\scr@next\test@number \IfArgIsEmpty{#1}{}{\expandafter\scr@next#1\scr@next}% \if@tempswa @@ -1086,7 +1147,16 @@ } \newcommand*{\gobble@till@scr@next}{} \def\gobble@till@scr@next#1\scr@next{} -\newcommand\ifintnumber[1]{% +\providecommand*{\ifintnumber}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifintnumber'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifintnumber' by `\string\Ifintnumber'% + }% + \Ifintnumber +} +\newcommand\Ifintnumber[1]{% \begingroup\@tempswafalse\let\scr@next\scr@test@sign \expandafter\scr@next#1\scr@next \if@tempswa @@ -1110,7 +1180,16 @@ \fi \scr@next } -\newcommand{\ifdimen}[1]{% +\providecommand*{\ifdimen}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifdimen'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifdimen' by `\string\Ifdimen'% + }% + \Ifdimen +} +\newcommand{\Ifdimen}[1]{% \begingroup\@tempswatrue\let\scr@next\test@posdimen \expandafter\test@dimen#1\scr@next \if@tempswa @@ -1150,19 +1229,19 @@ } \newcommand*\test@@ifdimunt[1]{% \@tempswafalse - \ifstr{#1}{pt}{\@tempswatrue}{% - \ifstr{#1}{pc}{\@tempswatrue}{% - \ifstr{#1}{in}{\@tempswatrue}{% - \ifstr{#1}{bp}{\@tempswatrue}{% - \ifstr{#1}{cm}{\@tempswatrue}{% - \ifstr{#1}{mm}{\@tempswatrue}{% - \ifstr{#1}{dd}{\@tempswatrue}{% - \ifstr{#1}{cc}{\@tempswatrue}{% - \ifstr{#1}{sp}{\@tempswatrue}{% - \ifstr{#1}{ex}{\@tempswatrue}{% - \ifstr{#1}{em}{\@tempswatrue}{% + \Ifstr{#1}{pt}{\@tempswatrue}{% + \Ifstr{#1}{pc}{\@tempswatrue}{% + \Ifstr{#1}{in}{\@tempswatrue}{% + \Ifstr{#1}{bp}{\@tempswatrue}{% + \Ifstr{#1}{cm}{\@tempswatrue}{% + \Ifstr{#1}{mm}{\@tempswatrue}{% + \Ifstr{#1}{dd}{\@tempswatrue}{% + \Ifstr{#1}{cc}{\@tempswatrue}{% + \Ifstr{#1}{sp}{\@tempswatrue}{% + \Ifstr{#1}{ex}{\@tempswatrue}{% + \Ifstr{#1}{em}{\@tempswatrue}{% \scr@ifpdfoutput{% - \ifstr{#1}{px}{\@tempswatrue}{}% + \Ifstr{#1}{px}{\@tempswatrue}{}% }{}% }% }% @@ -1177,15 +1256,11 @@ }% } \newcommand{\scr@ifpdftex}{\ifnotundefined{pdftexversion}} -\let@as@internal@defined{ifpdftex} -\BeforePackage{pdfcprot}{\let\ifpdftex\relax} -\AfterPackage{pdfcprot}{\let@as@internal@defined{ifpdftex}} \newcommand{\scr@ifluatex}{\ifnotundefined{luatexversion}} \newcommand*{\scr@ifpdforluatex}{% \scr@ifpdftex{\@firstoftwo}{\scr@ifluatex{\@firstoftwo}{\@secondoftwo}}% } \newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}} -\let@as@internal@defined{ifVTeX} \newcommand{\scr@ifpdfoutput}{% \scr@ifundefinedorrelax{pdfoutput}{% \scr@ifundefinedorrelax{outputmode}{% @@ -1213,7 +1288,16 @@ \fi }% }% -\let@as@internal@defined{ifpdfoutput} +\providecommand*{\ifpdfoutput}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifpdfoutput'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifpdfoutput' by `\string\Ifpdfoutput'% + }% + \Ifpdfoutput +} +\newcommand*{\Ifpdfoutput}{\scr@ifpdfoutput} \newcommand*{\scr@ifpsoutput}{% \ifnotundefined{if@dvips}{% \if@dvips @@ -1233,7 +1317,16 @@ }% }% } -\let@as@internal@defined{ifpsoutput} +\providecommand*{\ifpsoutput}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifpsoutput'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifpsoutput' by `\string\Ifpsoutput'% + }% + \Ifpsoutput +} +\newcommand*{\Ifpsoutput}{\scr@ifpsoutput} \newcommand*{\scr@ifdvioutput}{% \scr@ifundefinedorrelax{pdfoutput}{% \scr@ifundefinedorrelax{outputmode}{% @@ -1261,7 +1354,16 @@ \fi }% } -\let@as@internal@defined{ifdvioutput} +\providecommand*{\ifdvioutput}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifdvioutput'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifdvioutput' by `\string\Ifdvioutput'% + }% + \Ifdvioutput +} +\newcommand*{\Ifdvioutput}{\scr@ifdvioutput} \newcommand*{\scr@smashdp}[1]{% \begingroup \def\finsm@sh{\dp\z@\z@\box\z@}% @@ -1390,7 +1492,7 @@ }% }{% \scr@execute@option{#2}% - \ifstr{#1}{}{}{% + \Ifstr{#1}{}{}{% \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{% \scr@ifundefinedorrelax{KV@#2#1@@else@}{}{% \scr@execute@elseoption{#2#1}% @@ -1477,7 +1579,7 @@ \edef\reserved@a{#1,\csname #1@key@familylist\endcsname}% \@for\reserved@a:=\reserved@a\do{% \scr@ifundefinedorrelax{KV@\reserved@a @\scr@key@name}{% - \ifstr{\reserved@a}{#1}{}{% + \Ifstr{\reserved@a}{#1}{}{% \scr@ifundefinedorrelax{KV@\reserved@a @@else@}{}{% \expandafter\scr@execute@elseoption\expandafter{\reserved@a}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -1535,8 +1637,7 @@ `\expandafter\detokenize\expandafter{\scr@key@value}'% \fi.\MessageBreak Here's what each member says: - \scr@key@run@errors\MessageBreak - o\expandafter\@gobble + \scr@key@run@errors }% }{% \scr@execute@elseoption{#1}% @@ -1567,8 +1668,7 @@ `\expandafter\detokenize\expandafter{\scr@key@value}'% \fi.\MessageBreak Here's what each member says: - \scr@key@run@errors\MessageBreak - o\expandafter\@gobble + \scr@key@run@errors }% \fi }% @@ -1845,13 +1945,13 @@ \DefineFamilyKey[{#1}]{#2}{#3}[true]{\FamilySetBool{#2}{#3}{#4}{##1}}% } \newcommand*{\FamilySetBool}[4]{% - \ifstr{#4}{}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% - \ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% - \ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% - \ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% + \Ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{% \FamilyUnknownKeyValue{#1}{#2}{#4}{% `true', `on', `yes', `false', `off', `no'% }% @@ -1899,13 +1999,13 @@ \begingroup \protected@edef\reserved@a{#4}% \def\reserved@b{\endgroup\value{#3}=#4\relax\FamilyKeyStateProcessed}% - \expandafter\ifiscount\expandafter{\reserved@a}{}{% - \expandafter\ifisdimen\expandafter{\reserved@a}{}{% - \expandafter\ifisskip\expandafter{\reserved@a}{}{% - \expandafter\ifisnumexpr\expandafter{\reserved@a}{}{% - \expandafter\ifisdimexpr\expandafter{\reserved@a}{}{% - \expandafter\ifisinteger\expandafter{\reserved@a}{}{% - \expandafter\ifiscounter\expandafter{\reserved@a}{% + \expandafter\Ifiscount\expandafter{\reserved@a}{}{% + \expandafter\Ifisdimen\expandafter{\reserved@a}{}{% + \expandafter\Ifisskip\expandafter{\reserved@a}{}{% + \expandafter\Ifisnumexpr\expandafter{\reserved@a}{}{% + \expandafter\Ifisdimexpr\expandafter{\reserved@a}{}{% + \expandafter\Ifisinteger\expandafter{\reserved@a}{}{% + \expandafter\Ifiscounter\expandafter{\reserved@a}{% \def\reserved@b{% \endgroup\value{#3}=\value{#4}\FamilyKeyStateProcessed }% @@ -1974,41 +2074,34 @@ } \newcommand*{\FamilySetLength}[4]{% \begingroup - \protected@edef\reserved@a{#4}% - \expandafter\ifiscount\expandafter{\reserved@a}{% - \aftergroup\@firstoftwo - }{% - \expandafter\ifisdimen\expandafter{\reserved@a}{% + \protected@edef\reserved@a{#4}% + \expandafter\Ifisdimen\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisskip\expandafter{\reserved@a}{% + \expandafter\Ifisskip\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisnumexpr\expandafter{\reserved@a}{% - \aftergroup\@firstoftwo - }{% - \expandafter\ifisdimexpr\expandafter{\reserved@a}{% + \expandafter\Ifisdimexpr\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisglueexpr\expandafter{\reserved@a}{% + \expandafter\Ifisglueexpr\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% - \expandafter\ifisglue\expandafter{\reserved@a}{% + \expandafter\Ifisglue\expandafter{\reserved@a}{% \aftergroup\@firstoftwo }{% \aftergroup\@secondoftwo }% }% }% - }% }% }% - }% \endgroup {#3=#4\FamilyKeyStateProcessed}% {% \FamilyUnknownKeyValue{#1}{#2}{#4}{% - length values, counters, lengths, skips, dimens + length values, + lengths, skips, dimens }% }% } @@ -2148,7 +2241,7 @@ \DefineFamilyKey[{#1}]{#2}{#3}{\@namedef{#4}{##1}\FamilyKeyStateProcessed}% } \newcommand*{\ForDoHook}[2]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageError{scrbase}{empty do-hook specificator}{% You've tried to use an empty do-hook specificator,\MessageBreak but do-hook specificators must not be empty.% @@ -2169,7 +2262,7 @@ }% } \newcommand*{\SplitDoHook}[3]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageWarning{scrbase}{empty do-hook specificator}% \let#2\@empty\let#3\@empty }{% @@ -2213,7 +2306,7 @@ }% } \newcommand*{\AddtoDoHook}[2]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageError{scrbase}{empty hook specificator}{% As hook specificators can never be empty, the first argument\MessageBreak of \string\AddtoDoHook\space must expand to an not empty string.% @@ -2226,7 +2319,7 @@ }% } \newcommand*{\AddtoOneTimeDoHook}[2]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \PackageError{scrbase}{empty hook specificator}{% As hook specificators can never be empty, the first argument\MessageBreak of \string\AddtoDoHook\space must expand to an not empty string.% @@ -2238,7 +2331,7 @@ }% }% } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname @@ -2624,7 +2717,7 @@ \if@atdocument \expandafter\@firstofone \else - \scr@ifactivelanguageisoneof{#1}{\renewcommand*{#2}{#3}}{}% + \scr@ifactivelanguageisoneof{#1}{\ifdefined#2\renewcommand*{#2}{#3}\fi}{}% \expandafter\AtBeginDocument \fi {% @@ -2673,7 +2766,7 @@ \if@atdocument \expandafter\@firstofone \else - \scr@ifactivelanguageisoneof{#1}{\renewcommand*{#2}{#3}}{}% + \scr@ifactivelanguageisoneof{#1}{\ifdefined#2\renewcommand*{#2}{#3}\fi}{}% \expandafter\AtBeginDocument \fi {% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index b2e0f4a9a11..0aeefa5545b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -5,7 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `class,book') -%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `class,load') %% scrkernel-listsof.dtx (with options: `class,book,prepare') %% scrkernel-tocstyle.dtx (with options: `class,book,prepare') %% scrkernel-sections.dtx (with options: `class,book,prepare') @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,29 +121,29 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist[ToC]{toc} -\ifstr{\ext@toc}{toc}{}{% +\Ifstr{\ext@toc}{toc}{}{% \expandafter\addtotoclist \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -219,7 +219,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -293,10 +293,12 @@ \@namedef{scr@v@3.26a}{17} \@namedef{scr@v@3.26b}{17} \@namedef{scr@v@3.27}{17} +\@namedef{scr@v@3.27a}{17} +\@namedef{scr@v@3.28}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -370,7 +372,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -426,9 +428,9 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -438,17 +440,17 @@ } \newcommand*{\@pt@@scan}{} \def\@pt@@scan #1pt#2\@pt@@scan{% - \ifstr{#2}{pt}{% - \ifnumber{#1}{% - \ifstr{#1}{10}{% + \Ifstr{#2}{pt}{% + \Ifnumber{#1}{% + \Ifstr{#1}{10}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{11}{% + \Ifstr{#1}{11}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{12}{% + \Ifstr{#1}{12}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% @@ -514,11 +516,11 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% - \ifstr{#1}{semi}{% + \Ifstr{#1}{semi}{% \@twosidetrue \FamilyKeyStateProcessed }{% @@ -575,8 +577,8 @@ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% - \ifstr{#1}{}{% - \ifstr{#3}{BCOR}{% + \Ifstr{#1}{}{% + \Ifstr{#3}{BCOR}{% \PassOptionsToPackage{BCOR#2}{typearea}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% @@ -604,18 +606,18 @@ } \newcommand*{\x@@paper}{} \def\x@@paper #1#2paper#3\x@@paper{% - \ifstr{#3}{paper}{% - \ifnumber{#2}{% - \ifstr{#1}{a}{% + \Ifstr{#3}{paper}{% + \Ifnumber{#2}{% + \Ifstr{#1}{a}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{b}{% + \Ifstr{#1}{b}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{c}{% + \Ifstr{#1}{c}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{d}{% + \Ifstr{#1}{d}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% @@ -797,13 +799,13 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage \KOMA@key{titlepage}[true]{% - \ifstr{#1}{firstiscover}{% + \Ifstr{#1}{firstiscover}{% \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed @@ -829,9 +831,9 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -902,16 +904,16 @@ Maybe `hyperref' not loaded or unknown version?% }% }{% - \ifstr{\Hy@driver}{hdvips}{% + \Ifstr{\Hy@driver}{hdvips}{% \providecommand*{\BookmarkDriverDefault}{dvips}% }{% - \ifstr{\Hy@driver}{hdvipdfm}{% + \Ifstr{\Hy@driver}{hdvipdfm}{% \providecommand*{\BookmarkDriverDefault}{dvipdfm}% }{% - \ifstr{\Hy@driver}{hdvipson}{% + \Ifstr{\Hy@driver}{hdvipson}{% \providecommand*{\BookmarkDriverDefault}{dvipsone}% }{% - \ifstr{\Hy@driver}{htexture}{% + \Ifstr{\Hy@driver}{htexture}{% \providecommand*{\BookmarkDriverDefault}{textures}% }{% }% @@ -1165,7 +1167,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -1180,7 +1182,7 @@ \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}% }% - \ifstr{#1}{current}{% + \Ifstr{#1}{current}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% @@ -1191,7 +1193,7 @@ }{cleardoublepage}{current}% }% }{% - \ifnotundefined{ps@#1}{% + \Ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -1204,7 +1206,7 @@ }{% \ifx\@currname\KOMAClassName \ifx\@currext\@clsextension - \ifstr{#1}{headings}{% + \Ifstr{#1}{headings}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -1270,7 +1272,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1405,7 +1407,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1420,7 +1422,7 @@ option `footnotes=#1'}% \fi \fi - \ifstr{#1}{multiple}{% + \Ifstr{#1}{multiple}{% \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% @@ -1429,7 +1431,7 @@ \KOMAClassFileName }{footnotes}{multiple}% }{% - \ifstr{#1}{nomultiple}{% + \Ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty @@ -1476,17 +1478,18 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% {noindex}{0},{noidx}{0},% {index}{1},{idx}{1},% - {indexnumbered}{2},% - {nolistof}{3},% - {listof}{4},% + {indexnumbered}{2},{idxnumbered}{2},{numberedindex}{2},{numberedidx}{2},% + {nolistof}{3},{nolistsof}{3},% + {listof}{4},{listsof}{4},% {listofnumbered}{5},{numberedlistof}{5},% + {listsofnumbered}{5},{numberedlistsof}{5},% {nobibliography}{6},{nobib}{6},% {bibliography}{7},{bib}{7},% {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},% @@ -1725,7 +1728,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergap}% \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}% \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}% - \ifstr{#1}{entry}{% + \Ifstr{#1}{entry}{% \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chapterentry}% @@ -1752,7 +1755,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1773,7 +1776,7 @@ \let\bib@beginhook\@empty \let\bib@endhook\@empty \@ifundefined{scr@current@bibstyle}{}{% - \ifstr{\scr@current@bibstyle}{}{}{% + \Ifstr{\scr@current@bibstyle}{}{}{% \edef\reserved@a{% \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% @@ -2006,22 +2009,22 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2503,13 +2506,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2696,7 +2699,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -3080,10 +3083,10 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3097,14 +3100,14 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{% \if@chapterentrywithdots - \TOCLineLeaderFill\relax + {\usekomafont{chapterentrydots}{\TOCLineLeaderFill}}\relax \else \hfill \fi @@ -3117,20 +3120,29 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} -\newcommand*{\ifnumbered}[1]{% +\providecommand*{\ifnumbered}{% + \ClassWarning{\KOMAClassName}{Usage of deprecated command + `\string\ifnumbered'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnumbered' by `\string\Ifnumbered'% + }% + \Ifnumbered +} +\newcommand*{\Ifnumbered}[1]{% \if@currentusenumber \scr@ifundefinedorrelax{#1numdepth}{% \expandafter\@secondoftwo @@ -3145,8 +3157,17 @@ \expandafter\@secondoftwo \fi } -\newcommand*{\ifunnumbered}[1]{% - \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% +\providecommand*{\ifunnumbered}{% + \ClassWarning{\KOMAClassName}{Usage of deprecated command + `\string\ifunnumbered'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifunnumbered' by `\string\Ifunnumbered'% + }% + \Ifunnumbered +} +\newcommand*{\Ifunnumbered}[1]{% + \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% } \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3281,8 +3302,8 @@ \KOMAClassName\space needs it's own definition of `\string\@startsection'\MessageBreak to provide extended features for the optional argument\MessageBreak - of `\string\section` etc.\MessageBreak - Generally it defines `\string\@startsection` completely new\MessageBreak + of `\string\section' etc.\MessageBreak + Generally it defines `\string\@startsection' completely new\MessageBreak to achieve this. Because of the unexpected definition\MessageBreak an alternative approach will be used.\MessageBreak If this fails and if there isn't a new release of\MessageBreak @@ -3290,9 +3311,9 @@ send a report to the KOMA-Script author.\MessageBreak Note, that this alternative approach does not\MessageBreak execute the elements of do-hooks:\MessageBreak - \space\space- `heading/postinit`,\MessageBreak - \space\space- `heading/branch/star`,\MessageBreak - \space\space- `heading/branch/nostar`,\MessageBreak + \space\space- `heading/postinit',\MessageBreak + \space\space- `heading/branch/star',\MessageBreak + \space\space- `heading/branch/nostar',\MessageBreak and does always use `runin=bysign' and\MessageBreak `afterindent=bysign'% }% @@ -3817,7 +3838,7 @@ ####1####2####3{####2}% \fi \else - \ifstr{##1}{#5}{% + \Ifstr{##1}{#5}{% \expandafter\def\csname #3\scr@dsc@current#4\endcsname ####1####2####3{####3}% \FamilyKeyStateProcessed @@ -3946,7 +3967,7 @@ } \newcommand*{\scr@dsc@style@chapter@neededoptionstest}{% \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {initial page style}{pagestyle}% }{% @@ -3957,7 +3978,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {inner chapter skip}{innerskip}% }{% @@ -3968,7 +3989,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {before chapter skip}{beforeskip}% }{% @@ -3979,7 +4000,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {after chaper skip}{afterskip}% }{% @@ -3990,7 +4011,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{% \scr@declaresectioncommandwarning{\scr@dsc@current}% @@ -4000,7 +4021,7 @@ }% }% \IfExistskomafont{\scr@dsc@current prefix}{}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {prefix line font}{prefixfont}% }{% @@ -4022,7 +4043,7 @@ } \newcommand*{\scr@dsc@style@part@neededoptionstest}{% \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {initial page style}{pagestyle}% }{% @@ -4033,7 +4054,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {inner part skip}{innerskip}% }{% @@ -4044,7 +4065,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {before part skip}{beforeskip}% }{% @@ -4055,7 +4076,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {after part skip}{afterskip}% }{% @@ -4066,7 +4087,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{% \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}% @@ -4075,7 +4096,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current prefix}{}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {number font}{prefixfont}% }{% @@ -4469,14 +4490,14 @@ \DeclareSectionCommand[{#1}]{#2}% \else \ClassError{\KOMAClassName}{% - command `\reserved@b` already defined% + command `\reserved@b' already defined% }{% You've tried to define the section command `\expandafter\string\csname - #2\endcsname` newly.\MessageBreak + #2\endcsname' newly.\MessageBreak Such a section command needs an additional new command - `\reserved@b`,\MessageBreak + `\reserved@b',\MessageBreak but this already exists. So you cannot define - `\expandafter\string\csname #2\endcsname` newly.\MessageBreak + `\expandafter\string\csname #2\endcsname' newly.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\RedeclareSectionCommand,\MessageBreak or \string\ProvideSectionCommand.\MessageBreak @@ -4485,10 +4506,10 @@ \fi }{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname #2\endcsname` already defined% + command `\expandafter\string\csname #2\endcsname' already defined% }{% You've tried to define the section command `\expandafter\string\csname - #2\endcsname` newly,\MessageBreak + #2\endcsname' newly,\MessageBreak but a command or something else with this name already exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, @@ -4501,10 +4522,10 @@ \newcommand*{\RedeclareSectionCommand}[2][]{% \@ifundefined{#2}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname #2\endcsname` not defined% + command `\expandafter\string\csname #2\endcsname' not defined% }{% You've tried to re-define the section command `\expandafter\string\csname - #2\endcsname`,\MessageBreak + #2\endcsname',\MessageBreak but a command with this name does not exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\DeclareNewSectionCommand,\MessageBreak @@ -4549,11 +4570,11 @@ \scr@trim@spaces\reserved@a \@ifundefined{\reserved@a}{}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname\reserved@a\endcsname` already + command `\expandafter\string\csname\reserved@a\endcsname' already defined% }{% You've tried to define the section command - `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak + `\expandafter\string\csname\reserved@a\endcsname' newly,\MessageBreak but a command, token, box or length with this name already exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, @@ -4580,10 +4601,10 @@ \scr@trim@spaces\reserved@a \@ifundefined{\reserved@a}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname\reserved@a\endcsname` not defined% + command `\expandafter\string\csname\reserved@a\endcsname' not defined% }{% You've tried to re-define the section command - `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak + `\expandafter\string\csname\reserved@a\endcsname',\MessageBreak but a command with this name does not exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\DeclareNewSectionCommand,\MessageBreak @@ -4661,7 +4682,7 @@ unknown section command style `#2'% }{}% }% - \ifstr{\@nameuse{scr@#1@style}}{#2}% + \Ifstr{\@nameuse{scr@#1@style}}{#2}% } \newcommand*{\use@preamble}[1]{% \@ifundefined{#1@preamble}{}{% @@ -4812,7 +4833,7 @@ \if@openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse } \newcommand*\appendix{% - \ifstr{\@currenvir}{appendix}{% + \Ifstr{\@currenvir}{appendix}{% \ClassWarning{\KOMAClassName}{% You are using `\string\begin{appendix}...\string\end{appendix}'.\MessageBreak @@ -4841,7 +4862,7 @@ \ExecuteDoHook{heading/preinit/#1}% \if@openright\cleardoublepage\else\clearpage\fi \scr@ifundefinedorrelax{#1pagestyle}{}{% - \ifstr{#1pagestyle}{}{}{% + \Ifstr{#1pagestyle}{}{}{% \thispagestyle{\@nameuse{#1pagestyle}}% }% }% @@ -4890,7 +4911,7 @@ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi - \ifnumbered{#1}{% + \Ifnumbered{#1}{% \refstepcounter{#1}% \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname @@ -4920,7 +4941,7 @@ \fi }% \begingroup - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\Ifnumbered{#1}}% \ExecuteDoHook{heading/begingroup/#1}% \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \raggedpart @@ -5051,7 +5072,7 @@ \ExecuteDoHook{heading/preinit/#1}% \if@openright\cleardoublepage\else\clearpage\fi \scr@ifundefinedorrelax{#1pagestyle}{}{% - \ifstr{#1pagestyle}{}{}{% + \Ifstr{#1pagestyle}{}{}{% \thispagestyle{\@nameuse{#1pagestyle}}% }% }% @@ -5092,7 +5113,7 @@ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi - \ifnumbered{#1}{% + \Ifnumbered{#1}{% \if@mainmatter \@tempswatrue \else\@tempswafalse\fi @@ -5128,7 +5149,7 @@ \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifdim \@chapterlistsgap>\z@ \doforeachtocfile{% - \iftocfeature{\@currext}{chapteratlist}{% + \Iftocfeature{\@currext}{chapteratlist}{% \addtocontents{\@currext}{\protect\addvspace{\@chapterlistsgap}}% }{}% }% @@ -5192,7 +5213,7 @@ }% \chapterheadstartvskip {% - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\Ifnumbered{#1}}% \if@mainmatter\else\let\IfUseNumber\@secondoftwo\fi \ExecuteDoHook{heading/begingroup/#1}% \if@chapterprefix @@ -5338,7 +5359,7 @@ \addtocentrydefault{chapter}{#1}{#2}% \if@chaptertolists \doforeachtocfile{% - \iftocfeature{\@currext}{chapteratlist}{% + \Iftocfeature{\@currext}{chapteratlist}{% \addxcontentsline{\@currext}{chapteratlist}[{#1}]{#2}% }{}% }% @@ -5366,11 +5387,13 @@ \AfterPackage{hyperref}{% \@ifpackagelater{hyperref}{2001/02/19}{}{% \ClassWarningNoLine{\KOMAClassName}{% - You are using an old version of hyperref package!\MessageBreak% - This version has a buggy hack at many drivers\MessageBreak% - causing \string\addchap\space to behave strange.\MessageBreak% - Please update hyperref to at least version - 6.71b}}} + You are using an old version of the hyperref package!\MessageBreak% + This version has a buggy hack in many drivers,\MessageBreak% + causing \string\addchap\space to behave strangely.\MessageBreak% + Please update hyperref to at least version 6.71b% + }% + }% +} \newcommand*{\raggedchapterentry}{} \newcommand*{\l@chapteratlist}{\l@chapter} \newcounter{chapter} @@ -5416,7 +5439,7 @@ \newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newkomafont{chapterentry}{\usekomafont{disposition}} \newkomafont{chapterentrypagenumber}{} -\newkomafont{chapterentrydots}{\normalfont} +\newkomafont{chapterentrydots}{} \newcommand\addsec{\SecDef\@addsec\@saddsec} \newcommand*{\@addsec}{} \def\@addsec[#1]#2{% @@ -5585,7 +5608,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5665,7 +5688,16 @@ } \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd -\newcommand{\ifthispageodd}{% +\providecommand*{\ifthispageodd}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifthispageodd'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'% + }% + \Ifthispageodd +} +\newcommand{\Ifthispageodd}{% \is@thispageodd \ifthispagewasodd \expandafter\@firstoftwo @@ -5912,7 +5944,7 @@ after loading `titlesec'% }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -5973,7 +6005,7 @@ \if@twoside\else\hfil\fi}}}}\hss}% \renewcommand*{\chaptermark}[1]{% \if@twoside\expandafter\markboth\else\expandafter\markright\fi - {\MakeMarkcase{\ifnumbered{chapter}{% + {\MakeMarkcase{\Ifnumbered{chapter}{% \if@mainmatter \chaptermarkformat \fi @@ -5982,7 +6014,7 @@ }% \renewcommand*{\sectionmark}[1]{% \if@twoside - \markright{\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}% + \markright{\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}% ##1}}% \fi }% @@ -6013,7 +6045,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6021,10 +6053,10 @@ \providecommand*{\@mkright}{% \IfActiveMkBoth{\markright}{\@gobble}% }% -\providecommand*{\@mkdouble}[1]{% +\providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% @@ -6114,7 +6146,7 @@ \if i\scap@pos\def\@tempa{l}\fi \if o\scap@pos\def\@tempa{r}\fi \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \if o\scap@pos\def\@tempa{l}\fi \if i\scap@pos\def\@tempa{r}\fi \ifscap@alt @@ -6241,7 +6273,7 @@ \let\cap@left=\relax \let\cap@right=\hfill \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\hfill \let\cap@right=\relax }% @@ -6254,7 +6286,7 @@ \let\cap@left=\hfill \let\cap@right=\relax \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\relax \let\cap@right=\hfill }% @@ -6340,7 +6372,7 @@ \let\cap@left=\relax \let\cap@right=\hfill \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\hfill \let\cap@right=\relax }% @@ -6360,7 +6392,7 @@ \let\cap@left=\hfill \let\cap@right=\relax \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\relax \let\cap@right=\hfill }% @@ -6396,7 +6428,7 @@ \edef\@tempa{\endgroup \def\noexpand\cap@width{\the\@tempdima}% \noexpand\if@twoside - \noexpand\ifthispageodd{% + \noexpand\Ifthispageodd{% \def\noexpand\cap@left{\noexpand\hspace*{\the\@tempdimc}}% \def\noexpand\cap@right{\noexpand\hspace*{\the\@tempdimb}}% }{% @@ -6560,7 +6592,10 @@ {% \hspace{-\cap@indent}% \scr@smashdp{% - #1{\usekomafont{captionlabel}{#2\captionformat}}% + #1{\usekomafont{caption}{% + \usekomafont{captionlabel}{#2\captionformat}% + }% + }% }% {\usekomafont{caption}{#3\scr@endstrut}\par}% }% @@ -6594,31 +6629,31 @@ \fi }% \def\reserved@a{#2}% - \ifstr{\reserved@a}{j}{% + \Ifstr{\reserved@a}{j}{% \expandafter\let\csname ragged#1caption\endcsname\@empty }{% - \ifstr{\reserved@a}{l}{% + \Ifstr{\reserved@a}{l}{% \scr@ifundefinedorrelax{LaTeXraggedright}{% \expandafter\let\csname ragged#1caption\endcsname\raggedright }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright }% }{% - \ifstr{\reserved@a}{r}{% + \Ifstr{\reserved@a}{r}{% \scr@ifundefinedorrelax{LaTeXraggedleft}{% \expandafter\let\csname ragged#1caption\endcsname\raggedleft }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft }% }{% - \ifstr{\reserved@a}{c}{% + \Ifstr{\reserved@a}{c}{% \scr@ifundefinedorrelax{LaTeXcentering}{% \expandafter\let\csname ragged#1caption\endcsname\centering }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering }% }{% - \ifstr{\reserved@a}{J}{% + \Ifstr{\reserved@a}{J}{% \scr@ifundefinedorrelax{justifying}{% \scr@caption@raggede@warning{J}{\justifying}% \expandafter\let\csname ragged#1caption\endcsname\@empty @@ -6626,7 +6661,7 @@ \expandafter\let\csname ragged#1caption\endcsname\justifying }% }{% - \ifstr{\reserved@a}{L}{% + \Ifstr{\reserved@a}{L}{% \scr@ifundefinedorrelax{RaggedRight}{% \scr@caption@raggede@warning{L}{\RaggedRight}% \expandafter\let\csname ragged#1caption\endcsname\raggedright @@ -6634,7 +6669,7 @@ \expandafter\let\csname ragged#1caption\endcsname\RaggedRight }% }{% - \ifstr{\reserved@a}{R}{% + \Ifstr{\reserved@a}{R}{% \scr@ifundefinedorrelax{RaggedLeft}{% \scr@caption@raggede@warning{R}{\RaggedLeft}% \expandafter\let\csname ragged#1caption\endcsname\raggedleft @@ -6642,7 +6677,7 @@ \expandafter\let\csname ragged#1caption\endcsname\RaggedLeft }% }{% - \ifstr{\reserved@a}{C}{% + \Ifstr{\reserved@a}{C}{% \scr@ifundefinedorrelax{Centering}{% \scr@caption@raggede@warning{C}{\Centering}% \expandafter\let\csname ragged#1caption\endcsname\centering @@ -6650,7 +6685,7 @@ \expandafter\let\csname ragged#1caption\endcsname\Centering }% }{% - \ifstr{\reserved@a}{}{% + \Ifstr{\reserved@a}{}{% \expandafter\let\csname ragged#1caption\endcsname\relax }{% \ClassError{\KOMAClassName}{unknown alignment char `#2'}{% @@ -6837,7 +6872,7 @@ \fi \@arabic\c@table } -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -6882,10 +6917,10 @@ \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% - \ifstr{#1}{}{}{% + \IfArgIsEmpty{#1}{}{% \renewcommand*{\ftn@rule@height}{#1}% }% - \ifstr{#2}{}{}{% + \IfArgIsEmpty{#2}{}{% \renewcommand*{\ftn@rule@width}{#2}% }% \ftn@rule@test@values @@ -6996,7 +7031,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7146,7 +7181,7 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} @@ -7273,7 +7308,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7383,7 +7418,7 @@ \@addmargin }{% \if@twoside - \unskip\nobreak\ifthispageodd{}{}% + \unskip\nobreak\Ifthispageodd{}{}% \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else \ClassWarning{\KOMAClassName}{% page break inside `addmargin*' environment.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 7477954de23..db7046113c3 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 590ffb1478b..df40f27c257 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -7,7 +7,7 @@ %% scrextend.dtx (with options: `package,extend,preidentify') %% scrkernel-version.dtx (with options: `package,extend') %% scrextend.dtx (with options: `package,extend,identify,prepare') -%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `package,load') %% scrkernel-sections.dtx (with options: `package,extend,prepare') %% scrkernel-compatibility.dtx (with options: `package,extend,init') %% scrextend.dtx (with options: `package,extend,option') @@ -78,7 +78,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,7 +100,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -109,7 +109,7 @@ %%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: prepare) \ProvidesPackage{scrextend}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -213,6 +213,8 @@ \@namedef{scr@v@3.26a}{17} \@namedef{scr@v@3.26b}{17} \@namedef{scr@v@3.27}{17} +\@namedef{scr@v@3.27a}{17} +\@namedef{scr@v@3.28}{17} \@namedef{scr@v@last}{17} %%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) @@ -238,7 +240,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -293,7 +295,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -352,7 +354,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% @@ -389,7 +391,7 @@ scrextend.\scr@pkgextension }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% @@ -401,7 +403,7 @@ \@titlepageiscoverpagefalse }{}% \KOMA@key{titlepage}[true]{% - \ifstr{##1}{firstiscover}{% + \Ifstr{##1}{firstiscover}{% \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed @@ -433,9 +435,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) \KOMA@key{cleardoublepage}{% \begingroup% @@ -444,7 +446,7 @@ \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}% }% - \ifstr{#1}{current}{% + \Ifstr{#1}{current}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% @@ -455,7 +457,7 @@ }{cleardoublepage}{current}% }% }{% - \ifnotundefined{ps@#1}{% + \Ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -517,9 +519,9 @@ {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -534,7 +536,7 @@ option `footnotes=#1'}% \fi \fi - \ifstr{#1}{multiple}{% + \Ifstr{#1}{multiple}{% \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% @@ -543,7 +545,7 @@ scrextend.\scr@pkgextension }{footnotes}{multiple}% }{% - \ifstr{#1}{nomultiple}{% + \Ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty @@ -590,16 +592,16 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -956,7 +958,7 @@ because I do not change it% }% } -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% @@ -1344,11 +1346,11 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname @@ -1419,7 +1421,16 @@ } \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd -\newcommand{\ifthispageodd}{% +\providecommand*{\ifthispageodd}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifthispageodd'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'% + }% + \Ifthispageodd +} +\newcommand{\Ifthispageodd}{% \is@thispageodd \ifthispagewasodd \expandafter\@firstoftwo @@ -1442,14 +1453,14 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax @@ -1581,7 +1592,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% @@ -1612,7 +1623,7 @@ \@addmargin }{% \if@twoside - \unskip\nobreak\ifthispageodd{}{}% + \unskip\nobreak\Ifthispageodd{}{}% \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else \PackageWarning{scrextend}{% page break inside `addmargin*' environment.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 11c4187004a..a8f83659c80 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,25 +64,25 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \ProvidesPackage{scrfontsizes}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% - \ifstr{#1}{scrsize}{% + \Ifstr{#1}{scrsize}{% \ClassError{\KOMAClassName}{% Font file name `scrsize' not allowed% }{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 5af28ed7199..5447cf37a53 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,22 +65,22 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index d1ee78fd7c9..321c18699ac 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -44,15 +44,15 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (for jurists) ] -%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) \@ifpackageloaded{hyperref}{% \PackageError{scrjura}{Package hyperref already loaded}{% @@ -70,7 +70,7 @@ numwidth=2em, level=\maxdimen ]{default}{cpar} -%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \DeclareOption{contract}{% \g@addto@macro\document\contract% @@ -104,14 +104,14 @@ \KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak} \newif\ifparnumber \KOMA@key{parnumber}[true]{% - \ifstr{#1}{auto}{% + \Ifstr{#1}{auto}{% \AutoPar \FamilyKeyStateProcessed \KOMA@kav@remove{.scrjura.sty}{parnumber}{manual}% \KOMA@kav@remove{.scrjura.sty}{parnumber}{auto}% \KOMA@kav@add{.scrjura.sty}{parnumber}{auto}% }{% - \ifstr{#1}{manual}{% + \Ifstr{#1}{manual}{% \ManualPar \FamilyKeyStateProcessed \KOMA@kav@remove{.scrjura.sty}{parnumber}{manual}% @@ -268,10 +268,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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: postoptions) \KOMAProcessOptions\relax -%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \providecommand*{\DeprecatedParagraph}{% \PackageError{scrjura}{modification of old document needed}{% @@ -681,7 +681,7 @@ \newcommand*{\scrjura@everypar}{} \providecommand*{\IncludeInRelease}[3]{% \PackageInfo{scrjura}{temporary definition of \string\IncludeInRelease}% - \ifstr{#1}{0000/00/00}{% + \Ifstr{#1}{0000/00/00}{% \let\IncludeInRelease\@undefined \def\EndIncludeInRelease{\let\EndIncludeInRelease\@undefined}% }{% @@ -1106,7 +1106,7 @@ }% \fi } -%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrjura.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: final) %%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ \@ifundefined{KOMAScript}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 4606f77cadc..49b503e0d8a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -8,7 +8,7 @@ %% scrkernel-basics.dtx (with options: `package,prepare,koma') %% scrkernel-basics.dtx (with options: `package,option,koma') %% scrkernel-fonts.dtx (with options: `package,option,scrkbase') -%% scrlfile.dtx (with options: `load') +%% scrlfile.dtx (with options: `package,load') %% scrkernel-basics.dtx (with options: `package,body,koma') %% scrkernel-fonts.dtx (with options: `package,body,scrkbase') %% scrlogo.dtx (with options: `logo') @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (% KOMA-Script-dependent @@ -213,7 +213,7 @@ \begingroup \let\reserved@a\@empty \def\reserved@b##1##2{% - \ifstr{##1}{#3}{\l@addto@macro\reserved@a{,{##2}}}{}% + \Ifstr{##1}{#3}{\l@addto@macro\reserved@a{,{##2}}}{}% }% \def\do##1{\reserved@b##1}% \@nameuse{scr@kav@KOMA#2}% @@ -243,16 +243,16 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: option) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) -%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $ +%%% From File: $Id: scrlfile.dtx 3399 2019-11-21 09:01:49Z kohm $ \RequirePackage{scrlfile}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% @@ -420,7 +420,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*{\IfExistskomafont}[1]{% \scr@ifundefinedorrelax{scr@fnt@#1}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty index 9a5a5b66be8..63d006d1b3b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty @@ -58,7 +58,7 @@ YOU SHOULD NOT USE THIS PACKAGE FOR\MessageBreak ANYTHING ELSE BUT TESTING% } -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -72,7 +72,7 @@ \scrlayerInitInterface %%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ %%% (run: init) -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -217,7 +217,7 @@ } %%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ %%% (run: options) -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let 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 8e0cfd129c7..1dca8bd43c4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -46,14 +46,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2019/06/27 v0.3.3161 KOMA-Script + 2019/12/02 v0.3.3426 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -65,7 +65,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ %%% (run: init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% @@ -98,7 +98,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -241,12 +241,12 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ %%% (run: options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns} \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -318,7 +318,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ %%% (run: body) \scrlayerAddToInterface\DeclareNoteColumn{% \newcommand*{\DeclareNoteColumn}[2][]{% @@ -706,7 +706,6 @@ \fi }% \long\def\slnc@note##1##2##3##4{% - \let\PackageInfo\PackageWarning \typeout{TRACE (slnc): ##2<=\theslncpage?}% \ifnum ##2>\value{slncpage}\relax \typeout{TRACE (slnc): no: unprocess note}% @@ -1414,7 +1413,7 @@ \@esphack }% } -%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ %%% (run: final) \DeclareNoteColumn{marginpar} \let\reserved@a\clearpage diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index e2b8b7f225f..f02c7143810 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -45,14 +45,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -64,7 +64,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% @@ -81,7 +81,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% @@ -226,7 +226,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -262,9 +262,9 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth@default} \scrlayerAddToInterface\sls@split@at@iicolons{% \def\sls@split@at@iicolons#1:#2:#3:#4\@nil{% - \ifstr{#4}{}{}{% - \ifstr{#4}{:}{}{% - \ifstr{#4}{::}{}{% + \Ifstr{#4}{}{}{% + \Ifstr{#4}{:}{}{% + \Ifstr{#4}{::}{}{% \PackageWarning{scrlayer}{extra `:' found!\MessageBreak You've used more than two colons at the argument\MessageBreak of a two value option.\MessageBreak @@ -300,7 +300,7 @@ \expandafter\edef\csname sls@#1width\endcsname{\the\@tempdima}% \setlength{\@tempdima}{\textwidth}% \addtolength{\@tempdima}{-\csname sls@#1width\endcsname}% - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \ifdim \csname sls@#1width\endcsname = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax \setlength{\@tempdimb}{\z@} @@ -314,7 +314,7 @@ }{% \sls@settowidthof{\@tempdimb}{#2}% }% - \ifstr{#3}{}{% + \Ifstr{#3}{}{% \addtolength{\@tempdima}{-\@tempdimb}% }{% \sls@settowidthof{\@tempdima}{#3}% @@ -358,39 +358,39 @@ \scrlayerAddToInterface\sls@evenfootshift{\newcommand*{\sls@evenfootshift}{0pt}} \scrlayerAddToInterface\sls@settotwidthof{% \newcommand*{\sls@settowidthof}[2]{% - \ifstr{#2}{paper}{% + \Ifstr{#2}{paper}{% \setlength{#1}{\paperwidth}% }{% - \ifstr{#2}{text}{% + \Ifstr{#2}{text}{% \setlength{#1}{\textwidth}% }{% - \ifstr{#2}{marginpar}{% + \Ifstr{#2}{marginpar}{% \setlength{#1}{\dimexpr \marginparwidth+\marginparsep\relax}% }{% - \ifstr{#2}{textwithmarginpar}{% + \Ifstr{#2}{textwithmarginpar}{% \setlength{#1}{\dimexpr\textwidth +\marginparwidth +\marginparsep\relax}% }{% - \ifstr{#2}{head}{% + \Ifstr{#2}{head}{% \setlength{#1}{\sls@headwidth}% }{% - \ifstr{#2}{foot}{% + \Ifstr{#2}{foot}{% \setlength{#1}{\sls@footwidth}% }{% - \ifstr{#2}{headtopline}{% + \Ifstr{#2}{headtopline}{% \setlength{#1}{\sls@headabove@linelength}% }{% - \ifstr{#2}{headsepline}{% + \Ifstr{#2}{headsepline}{% \setlength{#1}{\sls@headbelow@linelength}% }{% - \ifstr{#2}{footsepline}{% + \Ifstr{#2}{footsepline}{% \setlength{#1}{\sls@footabove@linelength}% }{% - \ifstr{#2}{footbotline}{% + \Ifstr{#2}{footbotline}{% \setlength{#1}{\sls@footbelow@linelength}% }{% - \ifstr{#2}{page}{% + \Ifstr{#2}{page}{% \setlength{#1}{\paperwidth}% \begingroup \expandafter\expandafter\expandafter\endgroup @@ -414,10 +414,10 @@ } \scrlayerAddToInterface\sls@deftowidthof{% \newcommand*{\sls@deftowidthof}[2]{% - \ifstr{#2}{autohead}{% + \Ifstr{#2}{autohead}{% \expandafter\def\csname #1\endcsname{\sls@headwidth}% }{% - \ifstr{#2}{autofoot}{% + \Ifstr{#2}{autofoot}{% \expandafter\def\csname #1\endcsname{\sls@footwidth}% }{% \sls@settowidthof{\@tempdima}{#2}% @@ -449,7 +449,7 @@ \scrlayerAddToInterface\sls@set@values{% \newcommand*{\sls@set@values}[4][]{% \begingroup - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \FamilyKeyStateUnknown }{% \KOMA@set@ifkey{#1}{@tempswa}{#4}% @@ -497,7 +497,7 @@ \fi \reserved@b \FamilyKeyStateProcessed - \ifstr{#1}{}{}{% + \Ifstr{#1}{}{}{% \KOMA@kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{% \csname sls@#2#3@linethickness\endcsname :\csname sls@#2#3@linelength\endcsname @@ -507,8 +507,8 @@ } \scrlayerAddToInterface\sls@split@at@colon{% \def\sls@split@at@colon#1:#2:#3\@nil{% - \ifstr{#3}{}{}{% - \ifstr{#3}{:}{}{% + \Ifstr{#3}{}{}{% + \Ifstr{#3}{:}{}{% \PackageWarning{scrlayer}{extra `:' found!\MessageBreak You've used more than one colon at the argument\MessageBreak of a two value option.\MessageBreak @@ -669,7 +669,7 @@ \ofoot[\if@twoside\pagemark\fi]{\if@twoside\pagemark\fi}% \cfoot[\if@twoside\else\pagemark\fi]{\if@twoside\else\pagemark\fi}% \scr@ifundefinedorrelax{KOMAClassName}{}{% - \ifstr{\KOMAClassName}{scrlttr2}{% + \Ifstr{\KOMAClassName}{scrlttr2}{% \clearpairofpagestyles \lehead[\ifnum\@pageat=\z@\pagemark\fi] {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}% @@ -719,7 +719,7 @@ KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default} \scrlayer@AddCsToInterface{sls@autoenlargetrue} \scrlayer@AddCsToInterface{sls@autoenlargefalse} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -791,7 +791,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \scrlayerAddToInterface\setheadwidth{% \newcommand*{\setheadwidth}[2][]{% @@ -823,7 +823,7 @@ } \scrlayerAddToInterface\sls@@setline{% \def\sls@@setline#1#2[#3]{% - \ifstr{#3}{auto}{% + \Ifstr{#3}{auto}{% \sls@deftowidthof{sls@#1#2@linelength}{#3#1}% }{% \sls@deftowidthof{sls@#1#2@linelength}{#3}% @@ -834,17 +834,17 @@ \scrlayerAddToInterface\sls@@@setline{% \def\sls@@@setline#1#2{% \edef\@tempa{#2}\edef\@tempb{current}% - \ifstr{#2}{}{}{% - \ifstr{#2}{current}{}{% + \Ifstr{#2}{}{}{% + \Ifstr{#2}{current}{}{% \setlength{\@tempdima}{#2}% - \ifstr{#1}{headabove}{% + \Ifstr{#1}{headabove}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% {headtopline=\@tempdima:\csname sls@#1@linelength\endcsname}% - }{\ifstr{#1}{headbelow}{% + }{\Ifstr{#1}{headbelow}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% {headsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% - \ifstr{#1}{footabove}{% + \Ifstr{#1}{footabove}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% {footsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% @@ -878,9 +878,9 @@ } \scrlayerAddToInterface\sls@@@@setline{% \def\sls@@@@setline#1[#2]{% - \ifstr{#1}{headabove}{\setkomafont{headtopline}{#2}}{% - \ifstr{#1}{headbelow}{\setkomafont{headsepline}{#2}}{% - \ifstr{#1}{footabove}{\setkomafont{footsepline}{#2}}{% + \Ifstr{#1}{headabove}{\setkomafont{headtopline}{#2}}{% + \Ifstr{#1}{headbelow}{\setkomafont{headsepline}{#2}}{% + \Ifstr{#1}{footabove}{\setkomafont{footsepline}{#2}}{% \setkomafont{footbotline}{#2}% }% }% @@ -999,7 +999,7 @@ \noexpand\DestroyLayer{#1.foot.oneside}% \noexpand\DestroyLayer{#1.foot.above.line}% \noexpand\DestroyLayer{#1.foot.below.line}% - \noexpand\ifstr{\noexpand\currentpagestyle}{#1}{% + \noexpand\Ifstr{\noexpand\currentpagestyle}{#1}{% \noexpand\PackageWarning{scrlayer-scrpage}{% page style `#1' not longer valid.\noexpand\MessageBreak The page style has been defined using\noexpand\MessageBreak @@ -1445,7 +1445,7 @@ \newcommand*{\defpairofpagestyles}[3][]{% \def\reserved@a##1##2##3##4##5##6##7\@nil{##1##2##3##4##5##6}% \edef\reserved@a{\expandafter\reserved@a #2xxxxxx\@nil}% - \ifstr\reserved@a{plain.}{% + \Ifstr\reserved@a{plain.}{% \PackageError{scrlayer-scrpage}{plain page style `#2' not allowed}{% You may not define a plain page style using \string\defpairofpagestyles, \string\newpairofpagestyles, diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index f49b2b25d7b..ea4ba7e04da 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,14 +43,14 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -115,7 +115,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -281,7 +281,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} @@ -331,22 +331,25 @@ \providecommand*{\@mkright}{% \IfActiveMkBoth{\markright}{\@gobble}% }% -\providecommand*{\@mkdouble}[1]{% +\providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -\providecommand*{\markleft}[1]{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markleft\@themark {#1}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -\providecommand{\@markleft}[3]{% - \@temptokena {#2}% - \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}% -} +\@ifundefined{markleft}{% + \DeclareRobustCommand{\markleft}[1]{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markleft\@themark {#1}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi + }% + \providecommand{\@markleft}[3]{% + \@temptokena {#2}% + \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}% + }% +}{} +\providecommand{\markdouble}[1]{\markboth{#1}{#1}} \newcommand*{\manualmark}{% \begingroup \def\@elt##1{% @@ -364,15 +367,15 @@ \kernel@ifstar{\@automark}{\manualmark\@automark}% } \newcommand*{\@automark}[2][]{% - \ifstr{#2}{}{% - \ifstr{#1}{}{% + \Ifstr{#2}{}{% + \Ifstr{#1}{}{% \automark@basics }{% \automark@basics \automark@righthigh{#1}% }% }{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \automark@basics \automark@leftlow{#2}% }{% @@ -505,7 +508,7 @@ }{}% \begingroup \@tempswatrue - \def\@elt##1{\ifstr{#1}{##1}{\@tempswafalse}{}}% + \def\@elt##1{\Ifstr{#1}{##1}{\@tempswafalse}{}}% \scrlayer@level@list \if@tempswa \aftergroup\@firstofone @@ -1058,7 +1061,7 @@ \edef\reserved@a{% \unexpanded{% \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% - \ifstr{\csname scr@l@#2@mode\endcsname}% + \Ifstr{\csname scr@l@#2@mode\endcsname}% }{\csname scr@l@#2@mode\endcsname}% }\reserved@a{}{% \PackageWarning{scrlayer}{% @@ -1218,60 +1221,70 @@ \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @initialhook\endcsname {#1}% + \let\scr@opt@marker@initialhook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{oninit}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @hook\endcsname {#1}% + \let\scr@opt@marker@hook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ononeside}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @onesidehook\endcsname {#1}% + \let\scr@opt@marker@onesidehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ontwoside}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @twosidehook\endcsname {#1}% + \let\scr@opt@marker@twosidehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onoddpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @oddpagehook\endcsname {#1}% + \let\scr@opt@marker@oddpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onevenpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @evenpagehook\endcsname {#1}% + \let\scr@opt@marker@evenpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onfloatpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @floatpagehook\endcsname {#1}% + \let\scr@opt@marker@floatpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onnonfloatpage}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @nonfloatpagehook\endcsname {#1}% + \let\scr@opt@marker@nonfloatpagehook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onbackground}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @backgroundhook\endcsname {#1}% + \let\scr@opt@marker@backgroundhook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onforeground}{% \expandafter\l@addto@macro \csname @ps@\scrlayer@current@pagestyle @foregroundhook\endcsname {#1}% + \let\scr@opt@marker@foregroundhook\FamilyKeyStateProcssed \FamilyKeyStateProcessed } \newcommand*{\DeclarePageStyleByLayers}[3][]{% @@ -1433,7 +1446,7 @@ \@namedef{@ps@#1@layers}{}% \@for \reserved@a:=#3\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@#1@layers\endcsname{{\reserved@a}}% }% }% @@ -1673,7 +1686,7 @@ \IfLayerPageStyleExists{\reserved@b}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname {{\reserved@a}}% }% @@ -1699,7 +1712,7 @@ \IfLayerPageStyleExists{#1}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\remove@layer@from@page@style\expandafter{\reserved@a}% {\reserved@b}% }% @@ -1713,7 +1726,7 @@ \expandafter\let\expandafter\reserved@a\csname @ps@#2@layers\endcsname \expandafter\global\expandafter\let\csname @ps@#2@layers\endcsname\@empty \def\@elt##1{% - \ifstr{#1}{##1}{}{% + \Ifstr{#1}{##1}{}{% \expandafter\@cons\csname @ps@#2@layers\endcsname{{##1}}% }% }\reserved@a @@ -1742,12 +1755,12 @@ \csname @ps@\reserved@b @layers\endcsname \@namedef{@ps@\reserved@b @layers}{}% \def\@elt##1{% - \ifstr{##1}\@empty{}{% + \Ifstr{##1}\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname{{##1}}% - \ifstr{##1}{#3}{% + \Ifstr{##1}{#3}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname {{\reserved@a}}% }% @@ -1769,11 +1782,11 @@ \csname @ps@\reserved@b @layers\endcsname \@namedef{@ps@\reserved@b @layers}{}% \def\@elt##1{% - \ifstr{##1}\@empty{}{% - \ifstr{##1}{#3}{% + \Ifstr{##1}\@empty{}{% + \Ifstr{##1}{#3}{% \@for \reserved@a:=#2\do {% \scr@trim@spaces\reserved@a - \ifstr\reserved@a\@empty{}{% + \Ifstr\reserved@a\@empty{}{% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname {{\reserved@a}}% }% @@ -1796,7 +1809,7 @@ \@namedef{@ps@\reserved@b @layers}{}% \begingroup \def\@elt##1{% - \ifstr{##1}\@empty{}{% + \Ifstr{##1}\@empty{}{% \remove@layer@from@page@style{##1}{\reserved@b}% \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname{{##1}}% }% @@ -1830,11 +1843,21 @@ \@namedef{@ps@#1@twosidehook}{}% \@namedef{@ps@#1@floatpagehook}{}% \@namedef{@ps@#1@nonfloatpagehook}{}% + \let\scr@opt@marker@initialhook\@empty + \let\scr@opt@marker@hook\@empty + \let\scr@opt@marker@backgroundhook\@empty + \let\scr@opt@marker@foregroundhook\@empty + \let\scr@opt@marker@oddpagehook\@empty + \let\scr@opt@marker@evenpagehook\@empty + \let\scr@opt@marker@onesidehook\@empty + \let\scr@opt@marker@twosidehook\@empty + \let\scr@opt@marker@floatpagehook\@empty + \let\scr@opt@marker@nonfloatpagehook\@empty \FamilyExecuteOptions[.definelayerpagestyle]{KOMAarg}{#2}% \def\reserved@a{\endgroup}% \def\@sls@##1{% - \expandafter\let\expandafter\reserved@b\csname @ps@#1@##1hook\endcsname - \ifx\reserved@b\@empty\else + \expandafter\ifx \csname scr@opt@marker@##1hook\endcsname\@empty\else + \expandafter\let\expandafter\reserved@b\csname @ps@#1@##1hook\endcsname \l@addto@macro\reserved@a{\@namedef{@ps@#1@##1hook}}% \expandafter\l@addto@macro\expandafter\reserved@a\expandafter{% \expandafter{% @@ -1870,7 +1893,7 @@ } \AfterPackage*{tagpdf}{% \providecommand*{\scrlayer@beginartifact}[1]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \tagmcbegin{artifact}% }{% \tagmcbegin{artifact=#1}% @@ -1992,13 +2015,13 @@ \begingroup \edef\reserved@a{\GetRealPageStyle{#1}}% \@tempswafalse - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \expandafter\ifx\csname @ps@\reserved@a @layers\endcsname\@empty \@tempswatrue \fi }{% \expandafter\ForEachLayerOfPageStyle\expandafter{% - \reserved@a}{\ifstr{##1}{#2}{\aftergroup\@tempswatrue}{}}% + \reserved@a}{\Ifstr{##1}{#2}{\aftergroup\@tempswatrue}{}}% }% \if@tempswa \aftergroup\@firstoftwo \else \aftergroup\@secondoftwo \fi \expandafter\endgroup @@ -2027,7 +2050,7 @@ \IfLayerPageStyleExists{#1}{% \begingroup \@tempswatrue - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \edef\reserved@a{\GetRealPageStyle{#1}}% \expandafter\ifx\csname @scr@\reserved@a @layers\endcsname\@empty \else \@tempswafalse @@ -2060,13 +2083,13 @@ \expandafter\let\csname @ps@#1@nonfloatpagehook\endcsname\relax \expandafter\let\csname @ps@#1@layers\endcsname\relax \expandafter\let\csname ps@#1\endcsname\relax - \ifstr{\currentpagestyle}{#1}{% + \Ifstr{\currentpagestyle}{#1}{% \def\currentpagestyle{scrlayer@empty}% \let\@oddhead\@empty\let\@evenhead\@empty \let\@oddfoot\@empty\let\@evenfoot\@empty }{}% \if@specialpage - \ifstr{\@specialstyle}{#1}{% + \Ifstr{\@specialstyle}{#1}{% \global\let\@specialstyle\relax \global\@specialpagefalse }{}% @@ -2105,7 +2128,7 @@ \let\scrlayer@exec@after@pagestyle@hook\@gobble \def\ps@test{}% \pagestyle{test}% - \ifstr{\currentpagestyle}{test}{}{% + \Ifstr{\currentpagestyle}{test}{}{% \PackageError{scrlayer}{package incompatibility detected}{% Another package redefines \string\pagestyle\space incompatible with scrlayer.\MessageBreak @@ -2258,7 +2281,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index 91f6684278a..7b80d6cb3e0 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 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 86b25a5dc81..04932f6225a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -5,7 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `package,letter') -%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `package,load') %% scrkernel-miscellaneous.dtx (with options: `package,letter,init') %% scrkernel-typearea.dtx (with options: `package,letter,init') %% scrkernel-miscellaneous.dtx (with options: `package,letter,option') @@ -61,7 +61,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,20 +83,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -120,11 +120,11 @@ } \providecommand*{\par@updaterelative}{} }{} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -142,7 +142,7 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -158,15 +158,15 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -668,7 +668,7 @@ scrletter.\scr@pkgextension }{symbolicnames}{#1}% \if@scrsymbols - \ifstr{\scr@symbols@font}{marvosym}{% + \Ifstr{\scr@symbols@font}{marvosym}{% \def\scr@symbol@phone{\Telefon}% \def\scr@symbol@fax{\FAX}% \def\scr@symbol@email{\Email}% @@ -707,10 +707,10 @@ \endgroup \else \ifx\@fileswith@pti@ns\@badrequireerror - \ifstr{\@currext}{\@clsextension}{% + \Ifstr{\@currext}{\@clsextension}{% \expandafter\AtEndOfClass }{% - \ifstr{\@currext}{\@pkgextension}{% + \Ifstr{\@currext}{\@pkgextension}{% \expandafter\AtEndOfPackage }{% \expandafter\AtBeginDocument @@ -735,15 +735,15 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -795,7 +795,7 @@ \ifx\usepackage\@notprerr \unexpanded{\let\usepackage\@notprerr}% \else - \noexpand\def\noexpand\Rusepackage{% + \noexpand\def\noexpand\usepackage{% \unexpanded\expandafter{\usepackage}% }% \fi @@ -915,7 +915,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -1486,7 +1486,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} @@ -1576,20 +1576,38 @@ #1{\@nameuse{scr@#2@name}}% }% } -\DeclareRobustCommand*{\ifkomavar}[1]{% +\newcommand*{\ifkomavar}{% + \PackageWarning{scrletter}{% + Usage of deprecated command `\string\ifkomavar'.\MessageBreak + The command has been renamed to because of a\MessageBreak + recommendation of LaTeX3 team members.\MessageBreak + Please replace `\string\ifkomavar' by `\string\Ifkomavar'% + }% + \Ifkomavar +} +\DeclareRobustCommand*{\Ifkomavar}[1]{% \scr@ifundefinedorrelax{scr@#1@var}{% \expandafter\@secondoftwo }{% \expandafter\@firstoftwo }% } -\DeclareRobustCommand*{\ifkomavarempty}{% +\newcommand*{\ifkomavarempty}{% + \PackageWarning{scrletter}{% + Usage of deprecated command `\string\ifkomavarempty'.\MessageBreak + The command has been renamed to because of a\MessageBreak + recommendation of LaTeX3 team members.\MessageBreak + Please replace `\string\ifkomavarempty' by `\string\Ifkomavarempty'% + }% + \Ifkomavarempty +} +\DeclareRobustCommand*{\Ifkomavarempty}{% \begingroup \kernel@ifstar {\@tempswatrue\@ifkomavarempty}% {\@tempswafalse\@ifkomavarempty}% } \newcommand{\@ifkomavarempty}[1]{% - \ifkomavar{#1}{% + \Ifkomavar{#1}{% \if@tempswa \@ifundefined{scr@#1@name}{% \aftergroup\@firstoftwo @@ -1626,7 +1644,7 @@ \scr@trim@spaces\reserved@a \ifx\reserved@a\@empty\else \edef\reserved@a{% - \noexpand\ifkomavarempty{\reserved@a}% + \noexpand\Ifkomavarempty{\reserved@a}% {\unexpanded{#2}{\reserved@a}}% {\unexpanded{#3}{\reserved@a}}% }\expandafter\reserved@a @@ -1638,7 +1656,7 @@ \scr@trim@spaces\reserved@a \ifx\reserved@a\@empty\else \edef\reserved@a{% - \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}% + \noexpand\Ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}% }\expandafter\reserved@a \fi }% @@ -1648,7 +1666,7 @@ \scr@trim@spaces\reserved@a \ifx\reserved@a\@empty\else \edef\reserved@a{% - \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}% + \noexpand\Ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}% }\expandafter\reserved@a \fi }% @@ -1752,7 +1770,7 @@ \@tempa% } \newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{% \letterpagemark @@ -1784,18 +1802,18 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% {\centering\usekomafont{fromaddress}{% - \ifkomavarempty{fromname}{}{% + \Ifkomavarempty{fromname}{}{% {\usekomafont{fromname}% {\ignorespaces\usekomavar{fromname}}\\[-8pt]} {\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\ }% - \ifkomavarempty{fromaddress}{}{% + \Ifkomavarempty{fromaddress}{}{% \ignorespaces\usekomavar{fromaddress}% }% }% @@ -2239,7 +2257,7 @@ \or \begingroup% \if@baddr - \ifkomavarempty{backaddress}{% + \Ifkomavarempty{backaddress}{% \let\@tempa\@empty\let\@tempb\@empty }{% \def\@tempa{backaddress}\def\@tempb{,\space}% @@ -2248,7 +2266,7 @@ \let\@tempa\@empty\let\@tempb\@empty \fi \ifcase \ltr@priority - \ifkomavarempty{specialmail}{}{% + \Ifkomavarempty{specialmail}{}{% \edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}% }% \or @@ -2271,7 +2289,7 @@ \@savevbox[\vss]{\useplength{backaddrheight}}{% \hsize\useplength{toaddrwidth}% \if@baddr - \ifkomavarempty{backaddress}{}{{% + \Ifkomavarempty{backaddress}{}{{% \noindent% \def\\{\usekomavar{backaddressseparator}\@ogobble}% \backaddr@format{\scriptsize\usekomafont{backaddress}% @@ -2292,7 +2310,7 @@ -PRIORITY}}% }% \fi - \ifkomavarempty{specialmail}{}{% + \Ifkomavarempty{specialmail}{}{% \vbox{\hsize\useplength{toaddrwidth}% \noindent\hspace*{\useplength{specialmailindent}}% \specialmail@format{% @@ -2325,14 +2343,14 @@ \or \def\@tempa{image-mode}\def\@tempb{,\space}% \fi - \ifkomavarempty{backaddress}{}{% + \Ifkomavarempty{backaddress}{}{% \edef\@tempa{\@tempa\@tempb backaddress ignored}\def\@tempb{,\space}% }% \else \let\@tempa\@empty\let\@tempb\@empty \fi \ifcase \ltr@priority - \ifkomavarempty{specialmail}{}{% + \Ifkomavarempty{specialmail}{}{% \edef\@tempa{\@tempa\@tempb specialmail ignored}\def\@tempb{,\space}% }% \or @@ -2447,7 +2465,7 @@ \setlength{\@tempdima}{\useplength{toaddrwidth}}% \addtolengthplength[-2]{\@tempdima}{toaddrindent}% \vbox{\hsize\@tempdima - \ifkomavarempty{PPdatamatrix}{}{% + \Ifkomavarempty{PPdatamatrix}{}{% \addtolength{\hsize}{-2mm}% \settowidth\@tempdima{\usekomavar{PPdatamatrix}}% \addtolength{\hsize}{-\@tempdima}% @@ -2485,15 +2503,15 @@ \ifcase\@alignfrom \or \if@logo - \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \fi \or \or - \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \or - \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \fi - \ifkomavarempty{location}{% + \Ifkomavarempty{location}{% \typeout{Location field: empty}% }{% \typeout{Location field: yes}% @@ -2522,14 +2540,14 @@ \ifcase\@alignfrom \or \if@logo - \ifkomavarempty{fromlogo}{\null}{% + \Ifkomavarempty{fromlogo}{\null}{% {\raggedleft\noindent\usekomavar{fromlogo}\\ \vskip\parskip}\noindent}% \fi \or \or \if@logo - \ifkomavarempty{fromlogo}{}{% + \Ifkomavarempty{fromlogo}{}{% \raggedleft\usekomavar{fromlogo}\par}% \fi \raggedright @@ -2572,7 +2590,7 @@ \or \raggedleft \if@logo - \ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}% + \Ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}% \fi {\usekomafont{fromname}\strut\ignorespaces \usekomavar{fromname}% @@ -2621,7 +2639,7 @@ } \newcommand*{\do@set@reffield}{} \newcommand*{\@set@reffield}[1]{% - \ifkomavarempty{#1}{}{% + \Ifkomavarempty{#1}{}{% \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}% \sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}% \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi @@ -2632,7 +2650,7 @@ }% } \newcommand*{\@test@reffield}[1]{% - \ifkomavarempty{#1}{}{% + \Ifkomavarempty{#1}{}{% \@tempswatrue }% } @@ -2725,7 +2743,7 @@ \else \ifcase \@datepos\else \ifnum \@datepos=1 \enskip\hfill\fi - {\usekomafont{placeanddate}{\ifkomavarempty{place}{}{% + {\usekomafont{placeanddate}{\Ifkomavarempty{place}{}{% \usekomavar{place}\usekomavar{placeseparator}}% \usekomavar{date}}}% \fi @@ -2737,7 +2755,7 @@ }% } \newcommand*{\@makelettertitle}{% - \ifkomavarempty{title}{% + \Ifkomavarempty{title}{% \typeout{Title: no}% }{% \typeout{Title: yes}% @@ -2748,7 +2766,7 @@ } \newcommand*{\@subjfield}{{% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative - \ifkomavarempty{subject}{% + \Ifkomavarempty{subject}{% \typeout{Subject: no}% }{% \ifx\raggedsubject\@empty @@ -2870,9 +2888,9 @@ }{% \expandafter\@xproc#1\\\@nil \ifx\reserved@b\@empty\else\expandafter\@xproc#1\@nil\fi - \protected@edef\reserved@a{% - \noexpand\setkomavar{toname}{\reserved@a}% - \noexpand\setkomavar{toaddress}{\reserved@b}% + \edef\reserved@a{% + \noexpand\setkomavar{toname}{\unexpanded\expandafter{\reserved@a}}% + \noexpand\setkomavar{toaddress}{\unexpanded\expandafter{\reserved@b}}% }\reserved@a }% } @@ -2952,7 +2970,7 @@ \fi\noindent% \begingroup \parbox[t]{\textwidth}{% - \ifkomavarempty*{ccseparator}{}{% + \Ifkomavarempty*{ccseparator}{}{% \@hangfrom{% \strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}% }% @@ -2966,7 +2984,7 @@ \fi\noindent% \begingroup \parbox[t]{\textwidth}{% - \ifkomavarempty*{enclseparator}{}{% + \Ifkomavarempty*{enclseparator}{}{% \@hangfrom{% \strut\usekomavar*{enclseparator}\usekomavar{enclseparator}}% }% @@ -2980,10 +2998,10 @@ \newkomavar{location} \newkomavar{backaddress} \setkomavar{backaddress}{% - \ifkomavarempty{fromname}{}{% + \Ifkomavarempty{fromname}{}{% \strut\ignorespaces\usekomavar{fromname}% - \ifkomavarempty{fromaddress}{}{\\}}% - \ifkomavarempty{fromaddress}{}{% + \Ifkomavarempty{fromaddress}{}{\\}}% + \Ifkomavarempty{fromaddress}{}{% \strut\ignorespaces\usekomavar{fromaddress}}% } \newkomavar{specialmail} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 8f21ce83202..e6d221f3fcb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -39,28 +39,37 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $ +%%% From File: $Id: scrlfile.dtx 3399 2019-11-21 09:01:49Z kohm $ \ProvidesPackage{scrlfile}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (loading files)] \ExecuteOptions{} \ProcessOptions\relax -\long\def\reserved@a#1#2{% - \IfFileExists{#1}% - {#2\@addtofilelist{#1}\@@input \@filef@und}}% -\ifx\reserved@a\InputIfFileExists\else - \expandafter\CheckCommand\expandafter*\expandafter\InputIfFileExists - \expandafter{% - \expandafter\protect\csname InputIfFileExists \endcsname +\@ifclassloaded{memoir}{% + \PackageInfo{scrlfile}{class `memoir' detected.\MessageBreak + Using a compatible redefinition of \string\InputIfFileExists,\MessageBreak + but always robust and with the fix of the\MessageBreak + argument order bug even for old versions of the\MessageBreak + LaTeX kernel% }% - \expandafter\CheckCommand \csname InputIfFileExists \endcsname[2]{% - \IfFileExists {#1}{% - \expandafter \@swaptwoargs \expandafter {\@filef@und }% - {#2\@addtofilelist {#1}\@@input }% +}{% + \long\def\reserved@a#1#2{% + \IfFileExists{#1}% + {#2\@addtofilelist{#1}\@@input \@filef@und}}% + \ifx\reserved@a\InputIfFileExists\else + \expandafter\CheckCommand\expandafter*\expandafter\InputIfFileExists + \expandafter{% + \expandafter\protect\csname InputIfFileExists \endcsname }% - }% -\fi + \expandafter\CheckCommand \csname InputIfFileExists \endcsname[2]{% + \IfFileExists {#1}{% + \expandafter \@swaptwoargs \expandafter {\@filef@und }% + {#2\@addtofilelist {#1}\@@input }% + }% + }% + \fi +} \expandafter\renewcommand\expandafter*\expandafter\InputIfFileExists \expandafter{\expandafter \protect\csname InputIfFileExists \endcsname}% @@ -80,12 +89,24 @@ \expandafter\scr@input@withhook\expandafter{\@filef@und}{#1}{#2}% }}% } -\newcommand{\scr@input@withhook}[3]{% - \scr@load@hook{before}{#2}% - #3\@addtofilelist{#2}% - \@@input #1% - \scr@load@hook{after}{#2}% -}% +\@ifclassloaded{memoir}{% + \newcommand{\scr@input@withhook}[3]{% + \scr@load@hook{before}{#2}% + #3\@addtofilelist{#2}% + \@ifundefined{m@matbeginf}{}{\m@matbeginf{#2}}% + \@@input #1% + \@ifundefined{m@matendf}{}{\m@matendf{#2}}% + \@ifundefined{killm@matf}{}{\killm@matf{#2}}% + \scr@load@hook{after}{#2}% + }% +}{% + \newcommand{\scr@input@withhook}[3]{% + \scr@load@hook{before}{#2}% + #3\@addtofilelist{#2}% + \@@input #1% + \scr@load@hook{after}{#2}% + }% +} \newcommand*{\scr@@loadwithoptions}{} \newcommand*{\scr@loadwithoptions}{} \let\scr@loadwithoptions\@loadwithoptions @@ -160,9 +181,24 @@ \PackageInfo{scrlfile}{inputing `#1' instead of `#2'}% } \newcommand*{\scr@load@hook}[2]{% + \edef\scrlfile@hookname{#1}% + \def\scrlfile@cmp@hook{before}% + \ifx\scrlfile@hookname\scrlfile@cmp@hook + \expandafter\def\csname #2-l@ading\endcsname{#2}% + \fi + \let\scrlfile@cmp@hook\@undefined \@ifundefined{#2-@#1}{}{% \@nameuse{#2-@#1}% - \expandafter\let\csname #2-@#1\endcsname=\relax}} + \expandafter\let\csname #2-@#1\endcsname\relax + }% + \edef\scrlfile@hookname{#1}% + \def\scrlfile@cmp@hook{after}% + \ifx\scrlfile@hookname\scrlfile@cmp@hook + \expandafter\let\csname #2-l@ading\endcsname\@undefined + \fi + \let\scrlfile@cmp@hook\@undefined + \let\scrlfile@hookname\@undefined +} \newcommand*{\scr@set@load@hook}[2]{% \@ifundefined{#2-@#1}{\@namedef{#2-@#1}{}}{}% \expandafter\g@addto@macro\csname #2-@#1\endcsname} @@ -172,84 +208,97 @@ \scr@set@load@hook{before}{#1.\@clsextension}} \newcommand*{\AfterClass}{% \kernel@ifstar {\@sAfterClass}{% - \kernel@ifnextchar +\@@AfterClass{% - \kernel@ifnextchar !\@@@AfterClass\@AfterClass + \kernel@ifnextchar +\@pAfterClass{% + \kernel@ifnextchar !\@xAfterClass\@AfterClass }% }% } -\newcommand*{\@@@AfterClass}[2]{% - \begingroup - \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax - \aftergroup\@sAfterClass - \else - \aftergroup\AfterAtEndOfClass - \fi - \endgroup{#2}% -} -\newcommand*{\AfterAtEndOfClass}[1]{% - \scr@set@load@hook{lateafter}{#1.\@clsextension}} -\newcommand*{\@@AfterClass}[2]{% - \begingroup - \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax - \aftergroup\@sAfterClass - \else - \aftergroup\@AfterClass - \fi - \endgroup{#2}% -} \newcommand*{\@AfterClass}[1]{% \scr@set@load@hook{after}{#1.\@clsextension}} \newcommand*{\@sAfterClass}[1]{% - \begingroup - \@ifclassloaded{#1}{% - \aftergroup\@secondoftwo + \@ifclassloaded{#1}{% + \@secondoftwo + }{% + \@AfterClass + }% + {#1}% +} +\newcommand*{\@pAfterClass}[2]{% + \@ifundefined{#2.\@clsextension-l@ading}{% + \@sAfterClass + }{% + \@AfterClass + }% + {#2}% +} +\newcommand*{\@xAfterClass}[2]{% + \@ifundefined{#2.\@clsextension-l@ading}{% + \@ifclassloaded{#2}{% + \@sAfterClass }{% - \aftergroup\@AfterClass + \AfterAtEndOfClass }% - \endgroup - {#1}% + }{% + \AfterAtEndOfClass + }% + {#2}% } +\newcommand*{\AfterAtEndOfClass}[1]{% + \scr@set@load@hook{lateafter}{#1.\@clsextension}} \newcommand*{\BeforePackage}[1]{% \scr@set@load@hook{before}{#1.\@pkgextension}} \newcommand*{\AfterPackage}{% \kernel@ifstar {\@sAfterPackage}{% - \kernel@ifnextchar +\@@AfterPackage{% - \kernel@ifnextchar !\@@@AfterPackage\@AfterPackage + \kernel@ifnextchar +\@pAfterPackage{% + \kernel@ifnextchar !\@xAfterPackage\@AfterPackage }% }% } -\newcommand*{\@@@AfterPackage}[2]{% - \begingroup - \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax - \aftergroup\@sAfterPackage - \else - \aftergroup\AfterAtEndOfPackage - \fi - \endgroup{#2}% -} -\newcommand*{\AfterAtEndOfPackage}[1]{% - \scr@set@load@hook{lateafter}{#1.\@pkgextension}} -\newcommand*{\@@AfterPackage}[2]{% - \begingroup - \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax - \aftergroup\@sAfterPackage - \else - \aftergroup\@AfterPackage - \fi - \endgroup{#2}% -} \newcommand*{\@AfterPackage}[1]{% \scr@set@load@hook{after}{#1.\@pkgextension}} \newcommand*{\@sAfterPackage}[1]{% - \begingroup - \@ifpackageloaded{#1}{% - \aftergroup\@secondoftwo + \@ifpackageloaded{#1}{% + \@secondoftwo + }{% + \@AfterPackage + }% + {#1}% +} +\newcommand*{\@pAfterPackage}[2]{% + \@ifundefined{#2.\@pkgextension-l@ading}{% + \@sAfterPackage + }{% + \@AfterPackage + }% + {#2}% +} +\newcommand*{\@xAfterPackage}[2]{% + \@ifundefined{#2.\@pkgextension-l@ading}{% + \@ifpackageloaded{#2}{% + \@sAfterPackage }{% - \aftergroup\@AfterPackage + \@AfterAtEndOfPackage }% - \endgroup + }{% + \@AfterAtEndOfPackage + }% + {#2}% +} +\newcommand*{\AfterAtEndOfPackage}[1]{% + \@ifpackageloaded{#1}{% + \@ifundefined{#1.\@pkgextension-l@ading}{% + \@gobbletwo + }{% + \@AfterAtEndOfPackage + }% + }{% + \@AfterAtEndOfPackage + }% {#1}% } +\newcommand*{\@AfterAtEndOfPackage}[1]{% + \scr@set@load@hook{lateafter}{#1.\@pkgextension}% +} \newcommand*{\scrlfile@excludedpackages}{} \let\scrlfile@excludedpackages\@empty \newcommand*{\scrlfile@saved@RequirePackage}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 9bda6855229..ab1ecd1a4e4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -5,7 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `class,letter') -%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `class,load') %% scrkernel-compatibility.dtx (with options: `class,letter,init') %% scrkernel-typearea.dtx (with options: `class,scrlttr2,init') %% scrkernel-compatibility.dtx (with options: `class,letter,option') @@ -73,7 +73,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -190,10 +190,12 @@ \@namedef{scr@v@3.26a}{17} \@namedef{scr@v@3.26b}{17} \@namedef{scr@v@3.27}{17} +\@namedef{scr@v@3.27a}{17} +\@namedef{scr@v@3.28}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -243,7 +245,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -297,7 +299,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: option) \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% @@ -315,7 +317,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% @@ -331,7 +333,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 12% @@ -341,17 +343,17 @@ } \newcommand*{\@pt@@scan}{} \def\@pt@@scan #1pt#2\@pt@@scan{% - \ifstr{#2}{pt}{% - \ifnumber{#1}{% - \ifstr{#1}{10}{% + \Ifstr{#2}{pt}{% + \Ifnumber{#1}{% + \Ifstr{#1}{10}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{11}{% + \Ifstr{#1}{11}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{12}{% + \Ifstr{#1}{12}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% @@ -417,15 +419,15 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% - \ifstr{#1}{semi}{% + \Ifstr{#1}{semi}{% \@twosidetrue \FamilyKeyStateProcessed }{% @@ -481,8 +483,8 @@ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% - \ifstr{#1}{}{% - \ifstr{#3}{BCOR}{% + \Ifstr{#1}{}{% + \Ifstr{#3}{BCOR}{% \PassOptionsToPackage{BCOR#2}{typearea}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% @@ -510,18 +512,18 @@ } \newcommand*{\x@@paper}{} \def\x@@paper #1#2paper#3\x@@paper{% - \ifstr{#3}{paper}{% - \ifnumber{#2}{% - \ifstr{#1}{a}{% + \Ifstr{#3}{paper}{% + \Ifnumber{#2}{% + \Ifstr{#1}{a}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{b}{% + \Ifstr{#1}{b}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{c}{% + \Ifstr{#1}{c}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{d}{% + \Ifstr{#1}{d}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% @@ -704,7 +706,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -719,7 +721,7 @@ \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}% }% - \ifstr{#1}{current}{% + \Ifstr{#1}{current}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% @@ -730,7 +732,7 @@ }{cleardoublepage}{current}% }% }{% - \ifnotundefined{ps@#1}{% + \Ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -743,7 +745,7 @@ }{% \ifx\@currname\KOMAClassName \ifx\@currext\@clsextension - \ifstr{#1}{headings}{% + \Ifstr{#1}{headings}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -809,9 +811,9 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -826,7 +828,7 @@ option `footnotes=#1'}% \fi \fi - \ifstr{#1}{multiple}{% + \Ifstr{#1}{multiple}{% \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% @@ -835,7 +837,7 @@ \KOMAClassFileName }{footnotes}{multiple}% }{% - \ifstr{#1}{nomultiple}{% + \Ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty @@ -882,9 +884,9 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} @@ -1404,7 +1406,7 @@ \KOMAClassFileName }{symbolicnames}{#1}% \if@scrsymbols - \ifstr{\scr@symbols@font}{marvosym}{% + \Ifstr{\scr@symbols@font}{marvosym}{% \def\scr@symbol@phone{\Telefon}% \def\scr@symbol@fax{\FAX}% \def\scr@symbol@email{\Email}% @@ -1443,10 +1445,10 @@ \endgroup \else \ifx\@fileswith@pti@ns\@badrequireerror - \ifstr{\@currext}{\@clsextension}{% + \Ifstr{\@currext}{\@clsextension}{% \expandafter\AtEndOfClass }{% - \ifstr{\@currext}{\@pkgextension}{% + \Ifstr{\@currext}{\@pkgextension}{% \expandafter\AtEndOfPackage }{% \expandafter\AtBeginDocument @@ -1471,13 +1473,13 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1490,7 +1492,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -1965,7 +1967,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2013,7 +2015,16 @@ } \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd -\newcommand{\ifthispageodd}{% +\providecommand*{\ifthispageodd}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifthispageodd'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'% + }% + \Ifthispageodd +} +\newcommand{\Ifthispageodd}{% \is@thispageodd \ifthispagewasodd \expandafter\@firstoftwo @@ -2077,7 +2088,7 @@ `parskip' with one of it's several values} \scr@package@not@recommended{titleps}{% package `scrlayer-scrpage'} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% @@ -2129,7 +2140,7 @@ \ifx\usepackage\@notprerr \unexpanded{\let\usepackage\@notprerr}% \else - \noexpand\def\noexpand\Rusepackage{% + \noexpand\def\noexpand\usepackage{% \unexpanded\expandafter{\usepackage}% }% \fi @@ -2251,7 +2262,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: body) \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% @@ -2822,7 +2833,7 @@ \fi \fi } -%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-variables.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{\newkomavar}{% \kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}} @@ -2912,20 +2923,38 @@ #1{\@nameuse{scr@#2@name}}% }% } -\DeclareRobustCommand*{\ifkomavar}[1]{% +\newcommand*{\ifkomavar}{% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated command `\string\ifkomavar'.\MessageBreak + The command has been renamed to because of a\MessageBreak + recommendation of LaTeX3 team members.\MessageBreak + Please replace `\string\ifkomavar' by `\string\Ifkomavar'% + }% + \Ifkomavar +} +\DeclareRobustCommand*{\Ifkomavar}[1]{% \scr@ifundefinedorrelax{scr@#1@var}{% \expandafter\@secondoftwo }{% \expandafter\@firstoftwo }% } -\DeclareRobustCommand*{\ifkomavarempty}{% +\newcommand*{\ifkomavarempty}{% + \ClassWarning{\KOMAClassName}{% + Usage of deprecated command `\string\ifkomavarempty'.\MessageBreak + The command has been renamed to because of a\MessageBreak + recommendation of LaTeX3 team members.\MessageBreak + Please replace `\string\ifkomavarempty' by `\string\Ifkomavarempty'% + }% + \Ifkomavarempty +} +\DeclareRobustCommand*{\Ifkomavarempty}{% \begingroup \kernel@ifstar {\@tempswatrue\@ifkomavarempty}% {\@tempswafalse\@ifkomavarempty}% } \newcommand{\@ifkomavarempty}[1]{% - \ifkomavar{#1}{% + \Ifkomavar{#1}{% \if@tempswa \@ifundefined{scr@#1@name}{% \aftergroup\@firstoftwo @@ -2962,7 +2991,7 @@ \scr@trim@spaces\reserved@a \ifx\reserved@a\@empty\else \edef\reserved@a{% - \noexpand\ifkomavarempty{\reserved@a}% + \noexpand\Ifkomavarempty{\reserved@a}% {\unexpanded{#2}{\reserved@a}}% {\unexpanded{#3}{\reserved@a}}% }\expandafter\reserved@a @@ -2974,7 +3003,7 @@ \scr@trim@spaces\reserved@a \ifx\reserved@a\@empty\else \edef\reserved@a{% - \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}% + \noexpand\Ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}% }\expandafter\reserved@a \fi }% @@ -2984,7 +3013,7 @@ \scr@trim@spaces\reserved@a \ifx\reserved@a\@empty\else \edef\reserved@a{% - \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}% + \noexpand\Ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}% }\expandafter\reserved@a \fi }% @@ -3088,7 +3117,7 @@ \@tempa% } \newcommand*{\addtoplength}{\@addtoplength} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -3240,7 +3269,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -3337,12 +3366,12 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -3387,10 +3416,10 @@ \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% - \ifstr{#1}{}{}{% + \IfArgIsEmpty{#1}{}{% \renewcommand*{\ftn@rule@height}{#1}% }% - \ifstr{#2}{}{}{% + \IfArgIsEmpty{#2}{}{% \renewcommand*{\ftn@rule@width}{#2}% }% \ftn@rule@test@values @@ -3500,7 +3529,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} @@ -3601,7 +3630,7 @@ \@addmargin }{% \if@twoside - \unskip\nobreak\ifthispageodd{}{}% + \unskip\nobreak\Ifthispageodd{}{}% \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else \ClassWarning{\KOMAClassName}{% page break inside `addmargin*' environment.\MessageBreak @@ -3651,7 +3680,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% @@ -3665,12 +3694,12 @@ \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% {\centering\usekomafont{fromaddress}{% - \ifkomavarempty{fromname}{}{% + \Ifkomavarempty{fromname}{}{% {\usekomafont{fromname}% {\ignorespaces\usekomavar{fromname}}\\[-8pt]} {\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\ }% - \ifkomavarempty{fromaddress}{}{% + \Ifkomavarempty{fromaddress}{}{% \ignorespaces\usekomavar{fromaddress}% }% }% @@ -4155,7 +4184,7 @@ \or \begingroup% \if@baddr - \ifkomavarempty{backaddress}{% + \Ifkomavarempty{backaddress}{% \let\@tempa\@empty\let\@tempb\@empty }{% \def\@tempa{backaddress}\def\@tempb{,\space}% @@ -4164,7 +4193,7 @@ \let\@tempa\@empty\let\@tempb\@empty \fi \ifcase \ltr@priority - \ifkomavarempty{specialmail}{}{% + \Ifkomavarempty{specialmail}{}{% \edef\@tempa{\@tempa\@tempb specialmail}\def\@tempb{,\space}% }% \or @@ -4187,7 +4216,7 @@ \@savevbox[\vss]{\useplength{backaddrheight}}{% \hsize\useplength{toaddrwidth}% \if@baddr - \ifkomavarempty{backaddress}{}{{% + \Ifkomavarempty{backaddress}{}{{% \noindent% \def\\{\usekomavar{backaddressseparator}\@ogobble}% \backaddr@format{\scriptsize\usekomafont{backaddress}% @@ -4208,7 +4237,7 @@ -PRIORITY}}% }% \fi - \ifkomavarempty{specialmail}{}{% + \Ifkomavarempty{specialmail}{}{% \vbox{\hsize\useplength{toaddrwidth}% \noindent\hspace*{\useplength{specialmailindent}}% \specialmail@format{% @@ -4241,14 +4270,14 @@ \or \def\@tempa{image-mode}\def\@tempb{,\space}% \fi - \ifkomavarempty{backaddress}{}{% + \Ifkomavarempty{backaddress}{}{% \edef\@tempa{\@tempa\@tempb backaddress ignored}\def\@tempb{,\space}% }% \else \let\@tempa\@empty\let\@tempb\@empty \fi \ifcase \ltr@priority - \ifkomavarempty{specialmail}{}{% + \Ifkomavarempty{specialmail}{}{% \edef\@tempa{\@tempa\@tempb specialmail ignored}\def\@tempb{,\space}% }% \or @@ -4363,7 +4392,7 @@ \setlength{\@tempdima}{\useplength{toaddrwidth}}% \addtolengthplength[-2]{\@tempdima}{toaddrindent}% \vbox{\hsize\@tempdima - \ifkomavarempty{PPdatamatrix}{}{% + \Ifkomavarempty{PPdatamatrix}{}{% \addtolength{\hsize}{-2mm}% \settowidth\@tempdima{\usekomavar{PPdatamatrix}}% \addtolength{\hsize}{-\@tempdima}% @@ -4401,15 +4430,15 @@ \ifcase\@alignfrom \or \if@logo - \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \fi \or \or - \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \or - \ifkomavarempty{location}{\setkomavar{location}{\null}}{}% + \Ifkomavarempty{location}{\setkomavar{location}{\null}}{}% \fi - \ifkomavarempty{location}{% + \Ifkomavarempty{location}{% \typeout{Location field: empty}% }{% \typeout{Location field: yes}% @@ -4438,14 +4467,14 @@ \ifcase\@alignfrom \or \if@logo - \ifkomavarempty{fromlogo}{\null}{% + \Ifkomavarempty{fromlogo}{\null}{% {\raggedleft\noindent\usekomavar{fromlogo}\\ \vskip\parskip}\noindent}% \fi \or \or \if@logo - \ifkomavarempty{fromlogo}{}{% + \Ifkomavarempty{fromlogo}{}{% \raggedleft\usekomavar{fromlogo}\par}% \fi \raggedright @@ -4488,7 +4517,7 @@ \or \raggedleft \if@logo - \ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}% + \Ifkomavarempty{fromlogo}{}{\usekomavar{fromlogo}\par}% \fi {\usekomafont{fromname}\strut\ignorespaces \usekomavar{fromname}% @@ -4537,7 +4566,7 @@ } \newcommand*{\do@set@reffield}{} \newcommand*{\@set@reffield}[1]{% - \ifkomavarempty{#1}{}{% + \Ifkomavarempty{#1}{}{% \settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}% \sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}% \ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi @@ -4548,7 +4577,7 @@ }% } \newcommand*{\@test@reffield}[1]{% - \ifkomavarempty{#1}{}{% + \Ifkomavarempty{#1}{}{% \@tempswatrue }% } @@ -4641,7 +4670,7 @@ \else \ifcase \@datepos\else \ifnum \@datepos=1 \enskip\hfill\fi - {\usekomafont{placeanddate}{\ifkomavarempty{place}{}{% + {\usekomafont{placeanddate}{\Ifkomavarempty{place}{}{% \usekomavar{place}\usekomavar{placeseparator}}% \usekomavar{date}}}% \fi @@ -4653,7 +4682,7 @@ }% } \newcommand*{\@makelettertitle}{% - \ifkomavarempty{title}{% + \Ifkomavarempty{title}{% \typeout{Title: no}% }{% \typeout{Title: yes}% @@ -4664,7 +4693,7 @@ } \newcommand*{\@subjfield}{{% \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative - \ifkomavarempty{subject}{% + \Ifkomavarempty{subject}{% \typeout{Subject: no}% }{% \ifx\raggedsubject\@empty @@ -4817,9 +4846,9 @@ }{% \expandafter\@xproc#1\\\@nil \ifx\reserved@b\@empty\else\expandafter\@xproc#1\@nil\fi - \protected@edef\reserved@a{% - \noexpand\setkomavar{toname}{\reserved@a}% - \noexpand\setkomavar{toaddress}{\reserved@b}% + \edef\reserved@a{% + \noexpand\setkomavar{toname}{\unexpanded\expandafter{\reserved@a}}% + \noexpand\setkomavar{toaddress}{\unexpanded\expandafter{\reserved@b}}% }\reserved@a }% } @@ -4898,7 +4927,7 @@ \fi\noindent% \begingroup \parbox[t]{\textwidth}{% - \ifkomavarempty*{ccseparator}{}{% + \Ifkomavarempty*{ccseparator}{}{% \@hangfrom{% \strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}% }% @@ -4912,7 +4941,7 @@ \fi\noindent% \begingroup \parbox[t]{\textwidth}{% - \ifkomavarempty*{enclseparator}{}{% + \Ifkomavarempty*{enclseparator}{}{% \@hangfrom{% \strut\usekomavar*{enclseparator}\usekomavar{enclseparator}}% }% @@ -4926,10 +4955,10 @@ \newkomavar{location} \newkomavar{backaddress} \setkomavar{backaddress}{% - \ifkomavarempty{fromname}{}{% + \Ifkomavarempty{fromname}{}{% \strut\ignorespaces\usekomavar{fromname}% - \ifkomavarempty{fromaddress}{}{\\}}% - \ifkomavarempty{fromaddress}{}{% + \Ifkomavarempty{fromaddress}{}{\\}}% + \Ifkomavarempty{fromaddress}{}{% \strut\ignorespaces\usekomavar{fromaddress}}% } \newkomavar{specialmail} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index c4c0cfa9350..c8e9f5e7065 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -39,10 +39,10 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrpage.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: scrpage.dtx 3403 2019-11-23 15:38:36Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (page head and foot)] \PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak @@ -1020,14 +1020,14 @@ \ihead{\headmark} \ohead{\pagemark} \cfoot[\pagemark]{} - \else\PackageErrorNoLine{scrpage2}{unknown scrheadings style}% - {Somehow \string\scrheadings@style was - defined\MessageBreak - as ``\scrheadings@style''.\MessageBreak - scrpage2 doesn't know what to do. - If you'll continue, pagestyle - ``scrheadings''\MessageBreak - will be predefined empty} + \else\PackageError{scrpage2}{unknown scrheadings style}% + {Somehow \string\scrheadings@style was + defined\MessageBreak + as ``\scrheadings@style''.\MessageBreak + scrpage2 doesn't know what to do. + If you'll continue, pagestyle + ``scrheadings''\MessageBreak + will be predefined empty.} \fi\fi \begingroup\expandafter\expandafter\expandafter\endgroup\expandafter \ifx\csname chaptermark\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index d06c8c28132..74218b3ea8b 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 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 f5a50fd17a4..63c2547b51e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -5,7 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `class,report') -%% scrkernel-basics.dtx (with options: `load') +%% scrkernel-basics.dtx (with options: `class,load') %% scrkernel-listsof.dtx (with options: `class,book,prepare') %% scrkernel-tocstyle.dtx (with options: `class,report,prepare') %% scrkernel-sections.dtx (with options: `class,report,prepare') @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,29 +121,29 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist[ToC]{toc} -\ifstr{\ext@toc}{toc}{}{% +\Ifstr{\ext@toc}{toc}{}{% \expandafter\addtotoclist \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]% \expandafter{\ext@toc}% } \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -219,7 +219,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -293,10 +293,12 @@ \@namedef{scr@v@3.26a}{17} \@namedef{scr@v@3.26b}{17} \@namedef{scr@v@3.27}{17} +\@namedef{scr@v@3.27a}{17} +\@namedef{scr@v@3.28}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -371,7 +373,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -427,9 +429,9 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \providecommand*\@ptsize{% 11% @@ -439,17 +441,17 @@ } \newcommand*{\@pt@@scan}{} \def\@pt@@scan #1pt#2\@pt@@scan{% - \ifstr{#2}{pt}{% - \ifnumber{#1}{% - \ifstr{#1}{10}{% + \Ifstr{#2}{pt}{% + \Ifnumber{#1}{% + \Ifstr{#1}{10}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{11}{% + \Ifstr{#1}{11}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% - \ifstr{#1}{12}{% + \Ifstr{#1}{12}{% \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}% {#1#2}{fontsize=#1#2}% }{% @@ -515,11 +517,11 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \KOMA@key{twoside}[true]{% \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% - \ifstr{#1}{semi}{% + \Ifstr{#1}{semi}{% \@twosidetrue \FamilyKeyStateProcessed }{% @@ -576,8 +578,8 @@ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% - \ifstr{#1}{}{% - \ifstr{#3}{BCOR}{% + \Ifstr{#1}{}{% + \Ifstr{#3}{BCOR}{% \PassOptionsToPackage{BCOR#2}{typearea}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% @@ -605,18 +607,18 @@ } \newcommand*{\x@@paper}{} \def\x@@paper #1#2paper#3\x@@paper{% - \ifstr{#3}{paper}{% - \ifnumber{#2}{% - \ifstr{#1}{a}{% + \Ifstr{#3}{paper}{% + \Ifnumber{#2}{% + \Ifstr{#1}{a}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{b}{% + \Ifstr{#1}{b}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{c}{% + \Ifstr{#1}{c}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{% - \ifstr{#1}{d}{% + \Ifstr{#1}{d}{% \PassOptionsToPackage{#3=#1#2}{typearea}% }{\scr@pti@nerr@r}% }% @@ -798,13 +800,13 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage \KOMA@key{titlepage}[true]{% - \ifstr{#1}{firstiscover}{% + \Ifstr{#1}{firstiscover}{% \@titlepagetrue \@titlepageiscoverpagetrue \FamilyKeyStateProcessed @@ -833,9 +835,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareDeprecatedOption{abstracton}{abstract=true} \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -906,16 +908,16 @@ Maybe `hyperref' not loaded or unknown version?% }% }{% - \ifstr{\Hy@driver}{hdvips}{% + \Ifstr{\Hy@driver}{hdvips}{% \providecommand*{\BookmarkDriverDefault}{dvips}% }{% - \ifstr{\Hy@driver}{hdvipdfm}{% + \Ifstr{\Hy@driver}{hdvipdfm}{% \providecommand*{\BookmarkDriverDefault}{dvipdfm}% }{% - \ifstr{\Hy@driver}{hdvipson}{% + \Ifstr{\Hy@driver}{hdvipson}{% \providecommand*{\BookmarkDriverDefault}{dvipsone}% }{% - \ifstr{\Hy@driver}{htexture}{% + \Ifstr{\Hy@driver}{htexture}{% \providecommand*{\BookmarkDriverDefault}{textures}% }{% }% @@ -1169,7 +1171,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} @@ -1184,7 +1186,7 @@ \KOMA@unknown@keyval{cleardoublepage}{#1}{% 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}% }% - \ifstr{#1}{current}{% + \Ifstr{#1}{current}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublestandardpage}% \def\cleardoubleoddpage{\cleardoubleoddstandardpage}% @@ -1195,7 +1197,7 @@ }{cleardoublepage}{current}% }% }{% - \ifnotundefined{ps@#1}{% + \Ifnotundefined{ps@#1}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -1208,7 +1210,7 @@ }{% \ifx\@currname\KOMAClassName \ifx\@currext\@clsextension - \ifstr{#1}{headings}{% + \Ifstr{#1}{headings}{% \def\@tempc{\endgroup% \def\cleardoublepage{\cleardoublepageusingstyle{#1}}% \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}% @@ -1274,7 +1276,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse @@ -1409,7 +1411,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark @@ -1424,7 +1426,7 @@ option `footnotes=#1'}% \fi \fi - \ifstr{#1}{multiple}{% + \Ifstr{#1}{multiple}{% \let\@footnotemark\scr@footnotemark \def\FN@mf@prepare{\scr@mf@prepare}% \def\scr@footmisc@options{multiple}% @@ -1433,7 +1435,7 @@ \KOMAClassFileName }{footnotes}{multiple}% }{% - \ifstr{#1}{nomultiple}{% + \Ifstr{#1}{nomultiple}{% \let\@footnotemark\scr@saved@footnotemark \let\FN@mf@prepare\relax \let\scr@footmisc@options\@empty @@ -1480,17 +1482,18 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% {noindex}{0},{noidx}{0},% {index}{1},{idx}{1},% - {indexnumbered}{2},% - {nolistof}{3},% - {listof}{4},% + {indexnumbered}{2},{idxnumbered}{2},{numberedindex}{2},{numberedidx}{2},% + {nolistof}{3},{nolistsof}{3},% + {listof}{4},{listsof}{4},% {listofnumbered}{5},{numberedlistof}{5},% + {listsofnumbered}{5},{numberedlistsof}{5},% {nobibliography}{6},{nobib}{6},% {bibliography}{7},{bib}{7},% {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},% @@ -1729,7 +1732,7 @@ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergap}% \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}% \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}% - \ifstr{#1}{entry}{% + \Ifstr{#1}{entry}{% \@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}% \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chapterentry}% @@ -1756,7 +1759,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% @@ -1777,7 +1780,7 @@ \let\bib@beginhook\@empty \let\bib@endhook\@empty \@ifundefined{scr@current@bibstyle}{}{% - \ifstr{\scr@current@bibstyle}{}{}{% + \Ifstr{\scr@current@bibstyle}{}{}{% \edef\reserved@a{% \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}% {\scr@current@bibstyle}% @@ -2010,22 +2013,22 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax @@ -2500,13 +2503,13 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax @@ -2693,7 +2696,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -3111,10 +3114,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -3128,14 +3131,14 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{% \if@chapterentrywithdots - \TOCLineLeaderFill\relax + {\usekomafont{chapterentrydots}{\TOCLineLeaderFill}}\relax \else \hfill \fi @@ -3148,20 +3151,29 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z 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 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} -\newcommand*{\ifnumbered}[1]{% +\providecommand*{\ifnumbered}{% + \ClassWarning{\KOMAClassName}{Usage of deprecated command + `\string\ifnumbered'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifnumbered' by `\string\Ifnumbered'% + }% + \Ifnumbered +} +\newcommand*{\Ifnumbered}[1]{% \if@currentusenumber \scr@ifundefinedorrelax{#1numdepth}{% \expandafter\@secondoftwo @@ -3176,8 +3188,17 @@ \expandafter\@secondoftwo \fi } -\newcommand*{\ifunnumbered}[1]{% - \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% +\providecommand*{\ifunnumbered}{% + \ClassWarning{\KOMAClassName}{Usage of deprecated command + `\string\ifunnumbered'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifunnumbered' by `\string\Ifunnumbered'% + }% + \Ifunnumbered +} +\newcommand*{\Ifunnumbered}[1]{% + \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}% } \BeforeClosingMainAux{% \if@autodot\if@filesw\immediate\write\@mainaux{% @@ -3312,8 +3333,8 @@ \KOMAClassName\space needs it's own definition of `\string\@startsection'\MessageBreak to provide extended features for the optional argument\MessageBreak - of `\string\section` etc.\MessageBreak - Generally it defines `\string\@startsection` completely new\MessageBreak + of `\string\section' etc.\MessageBreak + Generally it defines `\string\@startsection' completely new\MessageBreak to achieve this. Because of the unexpected definition\MessageBreak an alternative approach will be used.\MessageBreak If this fails and if there isn't a new release of\MessageBreak @@ -3321,9 +3342,9 @@ send a report to the KOMA-Script author.\MessageBreak Note, that this alternative approach does not\MessageBreak execute the elements of do-hooks:\MessageBreak - \space\space- `heading/postinit`,\MessageBreak - \space\space- `heading/branch/star`,\MessageBreak - \space\space- `heading/branch/nostar`,\MessageBreak + \space\space- `heading/postinit',\MessageBreak + \space\space- `heading/branch/star',\MessageBreak + \space\space- `heading/branch/nostar',\MessageBreak and does always use `runin=bysign' and\MessageBreak `afterindent=bysign'% }% @@ -3848,7 +3869,7 @@ ####1####2####3{####2}% \fi \else - \ifstr{##1}{#5}{% + \Ifstr{##1}{#5}{% \expandafter\def\csname #3\scr@dsc@current#4\endcsname ####1####2####3{####3}% \FamilyKeyStateProcessed @@ -3977,7 +3998,7 @@ } \newcommand*{\scr@dsc@style@chapter@neededoptionstest}{% \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {initial page style}{pagestyle}% }{% @@ -3988,7 +4009,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {inner chapter skip}{innerskip}% }{% @@ -3999,7 +4020,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {before chapter skip}{beforeskip}% }{% @@ -4010,7 +4031,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {after chaper skip}{afterskip}% }{% @@ -4021,7 +4042,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{% \scr@declaresectioncommandwarning{\scr@dsc@current}% @@ -4031,7 +4052,7 @@ }% }% \IfExistskomafont{\scr@dsc@current prefix}{}{% - \ifstr{\scr@dsc@current}{chapter}{% + \Ifstr{\scr@dsc@current}{chapter}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {prefix line font}{prefixfont}% }{% @@ -4053,7 +4074,7 @@ } \newcommand*{\scr@dsc@style@part@neededoptionstest}{% \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {initial page style}{pagestyle}% }{% @@ -4064,7 +4085,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {inner part skip}{innerskip}% }{% @@ -4075,7 +4096,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {before part skip}{beforeskip}% }{% @@ -4086,7 +4107,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {after part skip}{afterskip}% }{% @@ -4097,7 +4118,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% }{% \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}% @@ -4106,7 +4127,7 @@ }% }{}% \IfExistskomafont{\scr@dsc@current prefix}{}{% - \ifstr{\scr@dsc@current}{part}{% + \Ifstr{\scr@dsc@current}{part}{% \scr@declaresectioncommanderror{\scr@dsc@current}% {number font}{prefixfont}% }{% @@ -4500,14 +4521,14 @@ \DeclareSectionCommand[{#1}]{#2}% \else \ClassError{\KOMAClassName}{% - command `\reserved@b` already defined% + command `\reserved@b' already defined% }{% You've tried to define the section command `\expandafter\string\csname - #2\endcsname` newly.\MessageBreak + #2\endcsname' newly.\MessageBreak Such a section command needs an additional new command - `\reserved@b`,\MessageBreak + `\reserved@b',\MessageBreak but this already exists. So you cannot define - `\expandafter\string\csname #2\endcsname` newly.\MessageBreak + `\expandafter\string\csname #2\endcsname' newly.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\RedeclareSectionCommand,\MessageBreak or \string\ProvideSectionCommand.\MessageBreak @@ -4516,10 +4537,10 @@ \fi }{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname #2\endcsname` already defined% + command `\expandafter\string\csname #2\endcsname' already defined% }{% You've tried to define the section command `\expandafter\string\csname - #2\endcsname` newly,\MessageBreak + #2\endcsname' newly,\MessageBreak but a command or something else with this name already exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, @@ -4532,10 +4553,10 @@ \newcommand*{\RedeclareSectionCommand}[2][]{% \@ifundefined{#2}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname #2\endcsname` not defined% + command `\expandafter\string\csname #2\endcsname' not defined% }{% You've tried to re-define the section command `\expandafter\string\csname - #2\endcsname`,\MessageBreak + #2\endcsname',\MessageBreak but a command with this name does not exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\DeclareNewSectionCommand,\MessageBreak @@ -4580,11 +4601,11 @@ \scr@trim@spaces\reserved@a \@ifundefined{\reserved@a}{}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname\reserved@a\endcsname` already + command `\expandafter\string\csname\reserved@a\endcsname' already defined% }{% You've tried to define the section command - `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak + `\expandafter\string\csname\reserved@a\endcsname' newly,\MessageBreak but a command, token, box or length with this name already exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, @@ -4611,10 +4632,10 @@ \scr@trim@spaces\reserved@a \@ifundefined{\reserved@a}{% \ClassError{\KOMAClassName}{% - command `\expandafter\string\csname\reserved@a\endcsname` not defined% + command `\expandafter\string\csname\reserved@a\endcsname' not defined% }{% You've tried to re-define the section command - `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak + `\expandafter\string\csname\reserved@a\endcsname',\MessageBreak but a command with this name does not exists.\MessageBreak Maybe you should use one of \string\DeclareSectionCommand, \string\DeclareNewSectionCommand,\MessageBreak @@ -4692,7 +4713,7 @@ unknown section command style `#2'% }{}% }% - \ifstr{\@nameuse{scr@#1@style}}{#2}% + \Ifstr{\@nameuse{scr@#1@style}}{#2}% } \newcommand*{\use@preamble}[1]{% \@ifundefined{#1@preamble}{}{% @@ -4831,7 +4852,7 @@ \fi } \newcommand*\appendix{% - \ifstr{\@currenvir}{appendix}{% + \Ifstr{\@currenvir}{appendix}{% \ClassWarning{\KOMAClassName}{% You are using `\string\begin{appendix}...\string\end{appendix}'.\MessageBreak @@ -4860,7 +4881,7 @@ \ExecuteDoHook{heading/preinit/#1}% \if@openright\cleardoublepage\else\clearpage\fi \scr@ifundefinedorrelax{#1pagestyle}{}{% - \ifstr{#1pagestyle}{}{}{% + \Ifstr{#1pagestyle}{}{}{% \thispagestyle{\@nameuse{#1pagestyle}}% }% }% @@ -4909,7 +4930,7 @@ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi - \ifnumbered{#1}{% + \Ifnumbered{#1}{% \refstepcounter{#1}% \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname @@ -4939,7 +4960,7 @@ \fi }% \begingroup - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\Ifnumbered{#1}}% \ExecuteDoHook{heading/begingroup/#1}% \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \raggedpart @@ -5070,7 +5091,7 @@ \ExecuteDoHook{heading/preinit/#1}% \if@openright\cleardoublepage\else\clearpage\fi \scr@ifundefinedorrelax{#1pagestyle}{}{% - \ifstr{#1pagestyle}{}{}{% + \Ifstr{#1pagestyle}{}{}{% \thispagestyle{\@nameuse{#1pagestyle}}% }% }% @@ -5111,7 +5132,7 @@ \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi - \ifnumbered{#1}{% + \Ifnumbered{#1}{% \@tempswatrue }{\@tempswafalse}% \if@tempswa @@ -5145,7 +5166,7 @@ \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifdim \@chapterlistsgap>\z@ \doforeachtocfile{% - \iftocfeature{\@currext}{chapteratlist}{% + \Iftocfeature{\@currext}{chapteratlist}{% \addtocontents{\@currext}{\protect\addvspace{\@chapterlistsgap}}% }{}% }% @@ -5209,7 +5230,7 @@ }% \chapterheadstartvskip {% - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\Ifnumbered{#1}}% \ExecuteDoHook{heading/begingroup/#1}% \if@chapterprefix \let\IfUsePrefixLine\@firstoftwo @@ -5354,7 +5375,7 @@ \addtocentrydefault{chapter}{#1}{#2}% \if@chaptertolists \doforeachtocfile{% - \iftocfeature{\@currext}{chapteratlist}{% + \Iftocfeature{\@currext}{chapteratlist}{% \addxcontentsline{\@currext}{chapteratlist}[{#1}]{#2}% }{}% }% @@ -5424,7 +5445,7 @@ \newcommand*{\scr@fnt@chapterprefix}{\size@chapterprefix} \newkomafont{chapterentry}{\usekomafont{disposition}} \newkomafont{chapterentrypagenumber}{} -\newkomafont{chapterentrydots}{\normalfont} +\newkomafont{chapterentrydots}{} \newcommand\addsec{\SecDef\@addsec\@saddsec} \newcommand*{\@addsec}{} \def\@addsec[#1]#2{% @@ -5589,7 +5610,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5665,7 +5686,16 @@ } \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd -\newcommand{\ifthispageodd}{% +\providecommand*{\ifthispageodd}{% + \PackageWarning{scrbase}{Usage of deprecated command + `\string\ifthispageodd'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'% + }% + \Ifthispageodd +} +\newcommand{\Ifthispageodd}{% \is@thispageodd \ifthispagewasodd \expandafter\@firstoftwo @@ -5912,7 +5942,7 @@ after loading `titlesec'% }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% @@ -5973,14 +6003,14 @@ \if@twoside\else\hfil\fi}}}}\hss}% \renewcommand*{\chaptermark}[1]{% \if@twoside\expandafter\markboth\else\expandafter\markright\fi - {\MakeMarkcase{\ifnumbered{chapter}{% + {\MakeMarkcase{\Ifnumbered{chapter}{% \chaptermarkformat }{}##1}% }{}% }% \renewcommand*{\sectionmark}[1]{% \if@twoside - \markright{\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}% + \markright{\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}% ##1}}% \fi }% @@ -6011,7 +6041,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $ +%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6019,10 +6049,10 @@ \providecommand*{\@mkright}{% \IfActiveMkBoth{\markright}{\@gobble}% }% -\providecommand*{\@mkdouble}[1]{% +\providecommand{\@mkdouble}[1]{% \@mkboth{#1}{#1}% } -%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% @@ -6112,7 +6142,7 @@ \if i\scap@pos\def\@tempa{l}\fi \if o\scap@pos\def\@tempa{r}\fi \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \if o\scap@pos\def\@tempa{l}\fi \if i\scap@pos\def\@tempa{r}\fi \ifscap@alt @@ -6239,7 +6269,7 @@ \let\cap@left=\relax \let\cap@right=\hfill \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\hfill \let\cap@right=\relax }% @@ -6252,7 +6282,7 @@ \let\cap@left=\hfill \let\cap@right=\relax \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\relax \let\cap@right=\hfill }% @@ -6338,7 +6368,7 @@ \let\cap@left=\relax \let\cap@right=\hfill \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\hfill \let\cap@right=\relax }% @@ -6358,7 +6388,7 @@ \let\cap@left=\hfill \let\cap@right=\relax \if@twoside - \ifthispageodd{}{% + \Ifthispageodd{}{% \let\cap@left=\relax \let\cap@right=\hfill }% @@ -6394,7 +6424,7 @@ \edef\@tempa{\endgroup \def\noexpand\cap@width{\the\@tempdima}% \noexpand\if@twoside - \noexpand\ifthispageodd{% + \noexpand\Ifthispageodd{% \def\noexpand\cap@left{\noexpand\hspace*{\the\@tempdimc}}% \def\noexpand\cap@right{\noexpand\hspace*{\the\@tempdimb}}% }{% @@ -6558,7 +6588,10 @@ {% \hspace{-\cap@indent}% \scr@smashdp{% - #1{\usekomafont{captionlabel}{#2\captionformat}}% + #1{\usekomafont{caption}{% + \usekomafont{captionlabel}{#2\captionformat}% + }% + }% }% {\usekomafont{caption}{#3\scr@endstrut}\par}% }% @@ -6592,31 +6625,31 @@ \fi }% \def\reserved@a{#2}% - \ifstr{\reserved@a}{j}{% + \Ifstr{\reserved@a}{j}{% \expandafter\let\csname ragged#1caption\endcsname\@empty }{% - \ifstr{\reserved@a}{l}{% + \Ifstr{\reserved@a}{l}{% \scr@ifundefinedorrelax{LaTeXraggedright}{% \expandafter\let\csname ragged#1caption\endcsname\raggedright }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright }% }{% - \ifstr{\reserved@a}{r}{% + \Ifstr{\reserved@a}{r}{% \scr@ifundefinedorrelax{LaTeXraggedleft}{% \expandafter\let\csname ragged#1caption\endcsname\raggedleft }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft }% }{% - \ifstr{\reserved@a}{c}{% + \Ifstr{\reserved@a}{c}{% \scr@ifundefinedorrelax{LaTeXcentering}{% \expandafter\let\csname ragged#1caption\endcsname\centering }{% \expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering }% }{% - \ifstr{\reserved@a}{J}{% + \Ifstr{\reserved@a}{J}{% \scr@ifundefinedorrelax{justifying}{% \scr@caption@raggede@warning{J}{\justifying}% \expandafter\let\csname ragged#1caption\endcsname\@empty @@ -6624,7 +6657,7 @@ \expandafter\let\csname ragged#1caption\endcsname\justifying }% }{% - \ifstr{\reserved@a}{L}{% + \Ifstr{\reserved@a}{L}{% \scr@ifundefinedorrelax{RaggedRight}{% \scr@caption@raggede@warning{L}{\RaggedRight}% \expandafter\let\csname ragged#1caption\endcsname\raggedright @@ -6632,7 +6665,7 @@ \expandafter\let\csname ragged#1caption\endcsname\RaggedRight }% }{% - \ifstr{\reserved@a}{R}{% + \Ifstr{\reserved@a}{R}{% \scr@ifundefinedorrelax{RaggedLeft}{% \scr@caption@raggede@warning{R}{\RaggedLeft}% \expandafter\let\csname ragged#1caption\endcsname\raggedleft @@ -6640,7 +6673,7 @@ \expandafter\let\csname ragged#1caption\endcsname\RaggedLeft }% }{% - \ifstr{\reserved@a}{C}{% + \Ifstr{\reserved@a}{C}{% \scr@ifundefinedorrelax{Centering}{% \scr@caption@raggede@warning{C}{\Centering}% \expandafter\let\csname ragged#1caption\endcsname\centering @@ -6648,7 +6681,7 @@ \expandafter\let\csname ragged#1caption\endcsname\Centering }% }{% - \ifstr{\reserved@a}{}{% + \Ifstr{\reserved@a}{}{% \expandafter\let\csname ragged#1caption\endcsname\relax }{% \ClassError{\KOMAClassName}{unknown alignment char `#2'}{% @@ -6827,7 +6860,7 @@ \thechapter.% \@arabic\c@table } -%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values @@ -6872,10 +6905,10 @@ \newcommand*{\ftn@rule@width}{.4\columnwidth} \newcommand*{\ftn@rule@height}{.4\p@} \newcommand*{\setfootnoterule}[2][]{% - \ifstr{#1}{}{}{% + \IfArgIsEmpty{#1}{}{% \renewcommand*{\ftn@rule@height}{#1}% }% - \ifstr{#2}{}{}{% + \IfArgIsEmpty{#2}{}{% \renewcommand*{\ftn@rule@width}{#2}% }% \ftn@rule@test@values @@ -6986,7 +7019,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% @@ -7136,7 +7169,7 @@ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables} \renewcommand*\listoflotname{\listtablename} \renewcommand*\listoflotentryname{\tablename} -%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} @@ -7263,7 +7296,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} @@ -7373,7 +7406,7 @@ \@addmargin }{% \if@twoside - \unskip\nobreak\ifthispageodd{}{}% + \unskip\nobreak\Ifthispageodd{}{}% \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else \ClassWarning{\KOMAClassName}{% page break inside `addmargin*' environment.\MessageBreak diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 9612448e887..26141e77c4a 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 10pt) \ProvidesFile{% scrsize10pt.clo% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 482ef2874c1..17ee8607489 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 11pt) %%% (run: 12pt) \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 1ba7562786f..11104557add 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index fc07a194b8c..95ca430a031 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index 2dd871b278b..9e8023682e8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -39,7 +39,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrwfile.dtx 3137 2019-04-04 06:07:07Z kohm $ +%%% From File: $Id: scrwfile.dtx 3392 2019-11-19 09:37:46Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrwfile} [2013/08/05 v0.1f-alpha KOMA-Script package (write and clone files)] @@ -214,7 +214,7 @@ \scr@ifundefinedorrelax{scrwfile@clone@#3}{% \expandafter\let\csname scrwfile@clone@#3\endcsname\@empty }{}% - \ifattoclist{#3}{% + \Ifattoclist{#3}{% \PackageWarning{scrwfile}{`#3' already under control of tocbasic.\MessageBreak Nevertheless features will be set @@ -223,14 +223,14 @@ \addtotoclist[TOCclone]{#3}% }% \setuptoc{#3}{nobabel}% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% }{% \@namedef{listof#3name}{#1}% \@namedef{listof#3}{\listoftoc{#3}}% - \iftocfeature{#2}{leveldown}{\setuptoc{#3}{leveldown}}{}% - \iftocfeature{#2}{numbered}{\setuptoc{#3}{numbered}}{}% - \iftocfeature{#2}{onecolumn}{\setuptoc{#3}{leveldownonecolumn}}{}% - \iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}% + \Iftocfeature{#2}{leveldown}{\setuptoc{#3}{leveldown}}{}% + \Iftocfeature{#2}{numbered}{\setuptoc{#3}{numbered}}{}% + \Iftocfeature{#2}{onecolumn}{\setuptoc{#3}{leveldownonecolumn}}{}% + \Iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}% }% } %%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index c7ac5b48e98..84a85a20139 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{setspace.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z 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 5397901869b..b42bfc9f906 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,15 +62,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z kohm $ \ProvidesFile{standardsections.hak}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] -%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrhack.dtx 3392 2019-11-19 09:37:46Z 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 a081d5e3f6c..546f7e6b693 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -53,24 +53,24 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: body) \RequirePackage{scrbase} \AfterPackage*{multitoc}{% @@ -97,7 +97,16 @@ }% } \newcommand*{\tb@listoftocs}{} -\newcommand{\ifattoclist}[1]{% +\providecommand*{\ifattoclist}{% + \PackageWarning{tocbasic}{Usage of deprecated command + `\string\ifattoclist'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifattoclist' by `\string\Ifattoclist'% + }% + \Ifattoclist +} +\newcommand{\Ifattoclist}[1]{% \begingroup \def\do##1##2{% \edef\reserved@a{##1}% @@ -120,7 +129,7 @@ \reserved@a } \newcommand*{\scr@@addtotoclist}[2][]{% - \ifattoclist{#2}{% + \Ifattoclist{#2}{% \PackageError{tocbasic}{% file extension `#2' cannot be used twice }{% @@ -156,7 +165,7 @@ \newcommand*{\owneroftoc}[2][\@firstofone]{% \begingroup \let\reserved@a\endgroup - \def\do##1##2{\ifstr{#2}{##1}{\def\reserved@a{\endgroup#1{##2}}}{}}% + \def\do##1##2{\Ifstr{#2}{##1}{\def\reserved@a{\endgroup#1{##2}}}{}}% \tb@listoftocs \reserved@a } @@ -182,7 +191,7 @@ \PackageInfo{tocbasic}{babel extension for `#1' omitted\MessageBreak because of missing \string\bbl@set@language}% }{% - \iftocfeature{#1}{nobabel}{% + \Iftocfeature{#1}{nobabel}{% \PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak because of feature `nobabel' available\MessageBreak for `#1'}% @@ -212,9 +221,9 @@ \AtAddToTocList[]{\expandafter\tocbasic@extend@babel\expandafter{\@currext}} \newcommand*{\removefromtoclist}{% \kernel@ifnextchar [%] - \@removefromtoclist\@@removefromtoclist + \scr@removefromtoclist\scr@@removefromtoclist } -\newcommand*{\@removefromtoclist}[2][]{% +\newcommand*{\scr@removefromtoclist}[2][]{% \begingroup \let\tb@oldlist\tb@listoftocs \def\do##1##2{% @@ -236,7 +245,7 @@ \tb@oldlist \endgroup } -\newcommand*{\@@removefromtoclist}[1]{% +\newcommand*{\scr@@removefromtoclist}[1]{% \begingroup \let\tb@oldlist\tb@listoftocs \def\do##1##2{% @@ -342,7 +351,7 @@ \newcommand*{\tocbasic@starttoc}[1]{% \begingroup \edef\@currext{#1}% - \iftocfeature{\@currext}{noparskipfake}{}{% + \Iftocfeature{\@currext}{noparskipfake}{}{% \ifvmode \@tempskipa\lastskip \vskip-\lastskip @@ -408,17 +417,17 @@ \expandafter\let\expandafter\list@fname\csname listof#2name\endcsname }% \edef\@currext{#2}% - \iftocfeature{\@currext}{onecolumn}{% - \iftocfeature{\@currext}{leveldown}{}{% + \Iftocfeature{\@currext}{onecolumn}{% + \Iftocfeature{\@currext}{leveldown}{}{% \if@twocolumn \aftergroup\twocolumn\onecolumn \fi }% }{}% - \iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}% + \Iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}% \tocbasic@listhead{#1}% \scr@ifundefinedorrelax{microtypesetup}{}{% - \iftocfeature{\@currext}{noprotrusion}{}{% + \Iftocfeature{\@currext}{noprotrusion}{}{% \microtypesetup{protrusion=false}% \PackageInfo{tocbasic}{% character protrusion at \@currext\space deactivated}% @@ -469,14 +478,14 @@ \@ifundefined{tocbasic@listhead@\@currext}{% \scr@ifundefinedorrelax{chapter}{% \expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{% - \iftocfeature{\@currext}{leveldown}{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{leveldown}{% + \Iftocfeature{\@currext}{numbered}{% \subsection[##1]{##1}% }{% \subsection*{##1}% \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi \begingroup - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \expandafter\addxcontentsline\expandafter{\ext@toc}% {subsection}{##1}% }{}% @@ -486,13 +495,13 @@ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi }% }{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{numbered}{% \section[##1]{##1}% }{% \section*{##1}% \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi \begingroup - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \expandafter\addxcontentsline\expandafter{\ext@toc}% {section}{##1}% }{}% @@ -508,11 +517,11 @@ }% }{% \expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{% - \iftocfeature{\@currext}{leveldown}{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{leveldown}{% + \Iftocfeature{\@currext}{numbered}{% \section{##1}% }{% - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \@ifundefined{addsec}{% \section*{##1}% \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi @@ -544,7 +553,7 @@ }% }% }{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{numbered}{% \chapter[##1]{##1}% }{% \chapter*{##1}% @@ -555,7 +564,7 @@ }{% \@mkdouble{\MakeMarkcase{##1}}% }% - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \expandafter\addxcontentsline\expandafter{\ext@toc}% {chapter}{##1}% }{}% @@ -603,7 +612,16 @@ \setuptoc{toc}{nobabel} \setuptoc{lof}{nobabel} \setuptoc{lot}{nobabel} -\newcommand*{\iftocfeature}[2]{% +\providecommand*{\iftocfeature}{% + \PackageWarning{tocbasic}{Usage of deprecated command + `\string\iftocfeature'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\iftocfeature' by `\string\Iftocfeature'% + }% + \Iftocfeature +} +\newcommand*{\Iftocfeature}[2]{% \scr@ifundefinedorrelax{tocbasic@#1@feature@#2}{% \expandafter\@secondoftwo }{% @@ -615,7 +633,7 @@ \let\@starttoc\tocbasic@starttoc \BeforeStartingTOC{% \let\@starttoc\tb@saved@starttoc - \expandafter\ifattoclist\expandafter{\@currext}{}{% + \expandafter\Ifattoclist\expandafter{\@currext}{}{% \addtotoclist[tocbasicautomode]{\@currext}% }% }% @@ -645,12 +663,12 @@ \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}% \def\do@endgroup{\endgroup}% \def\do##1{% - \ifstr{##1}{numwidth}{% + \Ifstr{##1}{numwidth}{% \l@addto@macro\do@endgroup{% \l@addto@macro{\tb@nt@tocstyle@options}{,numwidth=1.5em}% }% }{% - \ifstr{##1}{indent}{% + \Ifstr{##1}{indent}{% \l@addto@macro\do@endgroup{% \l@addto@macro{\tb@nt@tocstyle@options}{,indent=1em}% }% @@ -702,7 +720,7 @@ \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}% \DefineFamilyKey[.toc]{KOMAarg}{extension}{\FamilyKeyStateProcessed}% \DefineFamilyKey[.toc]{KOMAarg}{category}{\FamilyKeyStateProcessed}% - \ifstr{\tb@nt@tocentrystyle}{}{}{% + \Ifstr{\tb@nt@tocentrystyle}{}{}{% \begingroup \let\scr@dte@current\tb@nt@type \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}% @@ -897,14 +915,14 @@ \expandafter\noexpand\csname ext@\tb@nt@type\endcsname}% }% }\@tempa - \ifstr{\tb@nt@tocentrystyle}{}{% + \Ifstr{\tb@nt@tocentrystyle}{}{% \@ifundefined{l@\tb@nt@type}{% \PackageWarning{tocbasic}{% \expandafter\string\csname l@\tb@nt@type\endcsname\space undefined!\MessageBreak I hope you know, what you are doing, but\MessageBreak maybe it would be better to use proper\MessageBreak - `tocentrystyle` settings% + `tocentrystyle' settings% }% }{}% }{% @@ -1024,7 +1042,7 @@ \csname #2@atbegin\endcsname } \newcommand*{\tb@ifvalueisnotempty}[1]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \FamilyKeyStateUnknownValue \expandafter\@gobble }{% @@ -1033,12 +1051,12 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% \numberline@prefix - \ifstr{#1}{}{#1}{% + \Ifstr{#1}{}{#1}{% \numberline@numberformat{#1}% }% \numberline@postfix @@ -1058,7 +1076,7 @@ \newcommand*{\numberline@prefix}{} \newcommand*{\numberline@postfix}{\hfil} \newcommand*{\numberline@numberformat}[1]{% - \ifstr{#1}{}{}{\numberline@numberprefix#1\numberline@numberpostfix}% + \Ifstr{#1}{}{}{\numberline@numberprefix#1\numberline@numberpostfix}% } \newcommand*{\numberline@numberprefix}{} \newcommand*{\numberline@numberpostfix}{} @@ -1634,10 +1652,10 @@ \providecommand*\@pnumwidth{1.55em} \providecommand*\@tocrmarg {2.55em} \providecommand*\@dotsep {4.5} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1645,15 +1663,15 @@ \DefineTOCEntryLengthOption{numwidth}% {scr@tso@}{@numwidth}{entry number width}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -1668,20 +1686,20 @@ }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -1690,15 +1708,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -1717,19 +1735,19 @@ }{}% \@ifundefined{scr@tso@#1@numwidth}{% \@ifundefined{scr@#1@tocnumwidth}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% \scr@ifundefinedorrelax{chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{5m}% }{% }% @@ -1738,15 +1756,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{5em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{6em}% }{% }% @@ -1763,7 +1781,7 @@ }% }{}% }]{% - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \@dottedtocline{\@nameuse{#1tocdepth}}{\z@}% {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }{% @@ -1771,7 +1789,7 @@ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1779,15 +1797,15 @@ \DefineTOCEntryLengthOption{numwidth}% {scr@tso@}{@numwidth}{entry number width}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -1802,20 +1820,20 @@ }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -1824,15 +1842,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -1851,19 +1869,19 @@ }{}% \@ifundefined{scr@tso@#1@numwidth}{% \@ifundefined{scr@#1@tocnumwidth}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% \scr@ifundefinedorrelax{chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{5m}% }{% }% @@ -1872,15 +1890,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{5em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{6em}% }{% }% @@ -1917,7 +1935,7 @@ \leavevmode \bfseries \advance\leftskip\@tempdima - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \hskip -\leftskip }{% \advance\leftskip\@nameuse{scr@tso@#1@indent}% @@ -1931,21 +1949,21 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% {scr@tso@}{@indent}{entry indent}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -1960,20 +1978,20 @@ }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -1982,15 +2000,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -2028,7 +2046,7 @@ \leavevmode \large \bfseries - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% }{% \advance\leftskip\@nameuse{scr@tso@#1@indent}% }% @@ -2044,7 +2062,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2094,7 +2112,7 @@ \DefineTOCEntryLengthOption{numwidth}% {scr@tso@}{@numwidth}{entry number width}% \scr@ifundefinedorrelax{#1tocdepth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{% \expandafter\edef\csname #1tocdepth\endcsname{% \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax @@ -2103,15 +2121,15 @@ }{}% }{}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -2126,7 +2144,7 @@ }{}% \scr@ifundefinedorrelax{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% \expandafter\edef\csname scr@tso@#1@indent\endcsname{% @@ -2154,7 +2172,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@tso@#1@pagenumberwidth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@pagenumberwidth}{% \@namedef{scr@tso@#1@pagenumberwidth}{\@pnumwidth}% }{% @@ -2167,7 +2185,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@tso@#1@rightindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@rightindent}{% \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}% }{% @@ -2180,20 +2198,20 @@ }% }{}% \@ifundefined{scr@tso@#1@indent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -2202,15 +2220,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -2226,7 +2244,7 @@ }{}% \scr@ifundefinedorrelax{scr@tso@#1@numwidth}{% \scr@ifundefinedorrelax{scr@#1@tocnumwidth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% \expandafter\edef\csname scr@tso@#1@numwidth\endcsname{% \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}% @@ -2240,19 +2258,19 @@ }% }{}% \@ifundefined{scr@tso@#1@numwidth}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% \scr@ifundefinedorrelax{chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{5m}% }{% }% @@ -2261,15 +2279,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{5em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{6em}% }{% }% @@ -2289,13 +2307,13 @@ \expandafter\providecommand% \csname scr@tso@#1@LastTOCLevelWasHigher\endcsname{\LastTOCLevelWasHigher}% \@ifundefined{scr@tso@#1@beforeskip}{% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \@namedef{scr@tso@#1@beforeskip}{\glueexpr 2.25em \@plus\p@\relax}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}% }{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \scr@ifundefinedorrelax{l@chapter}{% \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}% }{}% @@ -2315,16 +2333,16 @@ \csname scr@tso@#1@numsep\endcsname{.4em}% \expandafter\providecommand% \csname scr@tso@#1@numberformat\endcsname[1]{##1}% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname[1]{\large\bfseries ##1}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}% }{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}% }{}% @@ -2336,14 +2354,14 @@ \expandafter\providecommand \csname Ifscr@tso@#1@breakafternumber\endcsname[2]{##2}% \@ifundefined{scr@tso@#1@linefill}{% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \@namedef{scr@tso@#1@linefill}{\hfill}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \@namedef{scr@tso@#1@linefill}{\hfill}% }{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \@namedef{scr@tso@#1@linefill}{\hfill}% }{}% }{}% @@ -2353,16 +2371,16 @@ }% }{}% \expandafter\providecommand\csname Ifscr@tso@#1@raggedpage\endcsname[2]{##2}% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}% }{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}% }{}% @@ -2410,7 +2428,7 @@ \tocbasic@DependOnPenaltyAndTOCLevel{#1}% \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax {% - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \leftskip \z@ }{% \leftskip \@nameuse{scr@tso@#1@indent}\relax @@ -2420,7 +2438,7 @@ \@nameuse{Ifscr@tso@#1@raggedpage}{% \addtolength{\parfillskip}{\z@ \@plus 1fil}% }{}% - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \parindent \z@ }{% \parindent \@nameuse{scr@tso@#1@indent}\relax @@ -2527,7 +2545,7 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,toctext) \DeclareTOCEntryStyle{toctext}[{% \DefineTOCEntryCommandOption{entryformat}% @@ -2557,7 +2575,7 @@ \DefineTOCEntryLengthOption{indent}% {scr@tso@}{@indent}{entry indent}% \scr@ifundefinedorrelax{#1tocdepth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{% \expandafter\edef\csname #1tocdepth\endcsname{% \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax @@ -2566,15 +2584,15 @@ }{}% }{}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -2589,7 +2607,7 @@ }{}% \scr@ifundefinedorrelax{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% \expandafter\edef\csname scr@tso@#1@indent\endcsname{% @@ -2617,7 +2635,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@tso@#1@rightindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@rightindent}{% \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}% }{% @@ -2630,20 +2648,20 @@ }% }{}% \@ifundefined{scr@tso@#1@indent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -2652,15 +2670,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -2715,7 +2733,7 @@ \global\let\scr@dte@toctext@raggedright\relax }% \global\let\scr@dte@toctext@afterpar\@empty - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \leftskip \z@ }{% \leftskip \@nameuse{scr@tso@#1@indent}\relax @@ -2757,10 +2775,10 @@ \newcommand*{\scr@dte@toctext@raggedright}{} \newcommand*{\scr@dte@toctext@parend}{} \newcommand*{\scr@dte@toctext@lastend}{} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 1c7d8c64e75..29e871442db 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,23 +70,23 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -161,12 +161,14 @@ \@namedef{scr@v@3.26a}{17} \@namedef{scr@v@3.26b}{17} \@namedef{scr@v@3.27}{17} +\@namedef{scr@v@3.27a}{17} +\@namedef{scr@v@3.28}{17} \@namedef{scr@v@last}{17} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: init) \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -221,22 +223,22 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: options) \providecommand*{\PaperNameToSize}[2][warning]{% - \ifstr{#2}{letter}{% + \Ifstr{#2}{letter}{% \setlength\paperheight{11in}% \setlength\paperwidth {8.5in}% }{% - \ifstr{#2}{legal}{% + \Ifstr{#2}{legal}{% \setlength\paperheight{14in}% \setlength\paperwidth {8.5in}% }{% - \ifstr{#2}{executive}{% + \Ifstr{#2}{executive}{% \setlength\paperheight{10.5in}% \setlength\paperwidth {7.25in}% }{% - \ifstr{#2}{}{% + \Ifstr{#2}{}{% \ISO@PaperNameToSize[#1]{}{}\@nil }{% \edef\reserved@a{\noexpand\ISO@PaperNameToSize[#1]#2 \noexpand\@nil}% @@ -251,28 +253,28 @@ \lowercase{\edef\reserved@a{#2}}% \@tempswafalse \if \reserved@a a% - \ifnumber{#3}{% + \Ifnumber{#3}{% \setlength{\paperwidth}{841sp}% \setlength{\paperheight}{1189sp}% \@tempswatrue }{}% \else \if \reserved@a b% - \ifnumber{#3}{% + \Ifnumber{#3}{% \setlength{\paperwidth}{1000sp}% \setlength{\paperheight}{1414sp}% \@tempswatrue }{}% \else \if \reserved@a c% - \ifnumber{#3}{% + \Ifnumber{#3}{% \setlength{\paperwidth}{917sp}% \setlength{\paperheight}{1297sp}% \@tempswatrue }{}% \else \if \reserved@a d% - \ifnumber{#3}{% + \Ifnumber{#3}{% \setlength{\paperwidth}{771sp}% \setlength{\paperheight}{1090sp}% \@tempswatrue @@ -340,7 +342,7 @@ \KOMA@DeclareStandardOption[typearea]{landscape}{paper=landscape} \KOMA@DeclareStandardOption[typearea]{portrait}{paper=portrait} \KOMA@key{paper}{% - \ifstr{#1}{seascape}{% + \Ifstr{#1}{seascape}{% \@seascapetrue \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \@landscapetrue @@ -354,7 +356,7 @@ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}% }{% - \ifstr{#1}{landscape}{% + \Ifstr{#1}{landscape}{% \@seascapefalse \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \@landscapetrue @@ -368,7 +370,7 @@ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}% }{% - \ifstr{#1}{portrait}{% + \Ifstr{#1}{portrait}{% \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \@landscapefalse \scr@setpaperorientation @@ -381,7 +383,7 @@ \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}% }{% - \ifstr{#1}{letter}{% + \Ifstr{#1}{letter}{% \if@landscape \setlength\paperheight{8.5in}% \setlength\paperwidth {11in}% @@ -397,7 +399,7 @@ \if@landscape landscape\else portrait\fi\fi }% }{% - \ifstr{#1}{legal}{% + \Ifstr{#1}{legal}{% \if@landscape \setlength\paperheight{8.5in}% \setlength\paperwidth {14in}% @@ -413,7 +415,7 @@ \if@landscape landscape\else portrait\fi\fi }% }{% - \ifstr{#1}{executive}{% + \Ifstr{#1}{executive}{% \if@landscape \setlength\paperheight{7.25in}% \setlength\paperwidth {10.5in}% @@ -546,7 +548,7 @@ \begingroup \@tempswafalse \scr@ifdvioutput{\@tempswatrue}{% - \ifnotundefined{if@dvips}{% + \Ifnotundefined{if@dvips}{% \expandafter\let\csname if@tempswa\expandafter\endcsname \csname if@dvips\endcsname }{}% @@ -611,7 +613,7 @@ \begingroup \@tempswafalse \scr@ifdvioutput{\@tempswatrue}{% - \ifnotundefined{if@dvips}{% + \Ifnotundefined{if@dvips}{% \expandafter\let\csname if@tempswa\expandafter\endcsname \csname if@dvips\endcsname }{}% @@ -661,8 +663,8 @@ }{}% } \newcommand*{\set@vtexpagesize}{% - \ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}% - \ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}% + \Ifnotundefined{mediawith}{\mediawidth=\paperwidth}{}% + \Ifnotundefined{mediaheight}{\mediaheight=\paperheight}{}% } \newcommand*{\scr@updatedvipspagesize}{% \scr@ifundefinedorrelax{XeTeXversion}{% @@ -694,7 +696,7 @@ \cleardoubleoddpage }% \else\clearpage\fi\fi - \ifstr{#1}{semi}{% + \Ifstr{#1}{semi}{% \@twosidetrue \@semitwosidetrue \FamilyKeyStateProcessed @@ -801,7 +803,7 @@ \newlength{\ta@bcor} \newcount\ta@div \KOMA@key{BCOR}{% - \ifstr{#1}{current}{}{% + \Ifstr{#1}{current}{}{% \setlength{\ta@bcor}{#1}% }% \FamilyKeyStateProcessed @@ -883,15 +885,15 @@ \else\if #1D\@tempswatrue \fi\fi\fi\fi\fi\fi\fi\fi \if@tempswa - \ifnumber{#2}{\isopaper[#1]{#2}}{\@tempswafalse}% + \Ifnumber{#2}{\isopaper[#1]{#2}}{\@tempswafalse}% \fi } \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% - \ifstr{#1}{}{% - \ifstr{#3}{BCOR}{% - \ifdimen{#2}{% + \Ifstr{#1}{}{% + \Ifstr{#3}{BCOR}{% + \Ifdimen{#2}{% \KOMA@UseDeprecatedOption{% \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}% }{\scr@pti@nerr@r}% @@ -903,7 +905,7 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \ifnumber{#2}{% + \Ifnumber{#2}{% \KOMA@UseDeprecatedOption{% \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}% }{\scr@pti@nerr@r}% @@ -925,18 +927,18 @@ } \newcommand*{\x@@paper}{} \def\x@@paper #1#2paper#3\x@@paper{% - \ifstr{#3}{paper}{% - \ifnumber{#2}{% - \ifstr{#1}{a}{% + \Ifstr{#3}{paper}{% + \Ifnumber{#2}{% + \Ifstr{#1}{a}{% \isopaper[a]{#2}% }{% - \ifstr{#1}{b}{% + \Ifstr{#1}{b}{% \isopaper[b]{#2}% }{% - \ifstr{#1}{c}{% + \Ifstr{#1}{c}{% \isopaper[c]{#2}% }{% - \ifstr{#1}{d}{% + \Ifstr{#1}{d}{% \isopaper[d]{#2}% }{\scr@pti@nerr@r}% }% @@ -971,9 +973,9 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \newcommand*{\ta@divfor}[1]{% \ta@div=\z@ @@ -1711,7 +1713,7 @@ \kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end } \newcommand*{\@areaset@end}{} -%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: final) \typearea[current]{current} %%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 0d6e105476b..5a1b35e1fcb 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 3263 2019-10-12 14:50:03Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}% + \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: head) \ProvidesFile{% visualize% @@ -80,7 +80,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 3404 2019-11-24 21:50:05Z kohm $ %%% (run: body) \RequirePackage{eso-pic} \newcommand*{\showfields}[1]{% @@ -537,22 +537,22 @@ } \newkomafont{measure}{\normalcolor} \newcommand*{\showISOenvelope}[1]{% - \ifstr{#1}{C4}{% + \Ifstr{#1}{C4}{% \showenvelope(324mm,229mm)% }{% - \ifstr{#1}{C5}{% + \Ifstr{#1}{C5}{% \showenvelope(229mm,162mm)% }{% - \ifstr{#1}{C5/6}{% + \Ifstr{#1}{C5/6}{% \showenvelope(220mm,110mm)% }{% - \ifstr{#1}{DL}{% + \Ifstr{#1}{DL}{% \showenvelope(220mm,110mm)% }{% - \ifstr{#1}{C6/5}{% + \Ifstr{#1}{C6/5}{% \showenvelope(229mm,114mm)% }{% - \ifstr{#1}{C6}{% + \Ifstr{#1}{C6}{% \showenvelope(162mm,114mm)% }{% \LCOWarning{visualize}{envelope size `ISO #1' unsupported}% @@ -564,10 +564,10 @@ }% } \newcommand*{\showUScommercial}[1]{% - \ifstr{#1}{9}{% + \Ifstr{#1}{9}{% \showenvelope(8.875in,3.875in)% }{% - \ifstr{#1}{10}{% + \Ifstr{#1}{10}{% \showenvelope(9.5in,4.125in)% }{% \LCOWarning{visualize}{envelope size `US commercial #1' unsupported}% @@ -577,7 +577,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) \endinput %% -- cgit v1.2.3