diff options
| author | Karl Berry <karl@freefriends.org> | 2020-09-27 21:27:46 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-09-27 21:27:46 +0000 |
| commit | 88f3fea0e61c7d9183c2d9de8d59af21db852d82 (patch) | |
| tree | 64ee0af542867c76e3f686efedbfddbea8d9b3bf /Master/texmf-dist/tex | |
| parent | f7a5fce4f1f54626e099adbbfc80dcf92745b4de (diff) | |
koma-script (27sep20)
git-svn-id: svn://tug.org/texlive/trunk@56454 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
56 files changed, 3001 insertions, 2930 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index b5f4bdb1990..bc11da30614 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco index a1faaf053b3..30b23b51b70 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco index dd6274ad875..4b90e9aed0b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 0f3d44d1fcf..3a26615bc55 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 36dc3fda79c..2f90b6a2af8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index 375c752ee8c..53d2f5649b9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 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 7a6ba03b2cf..167d41acfd9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 4225c444962..5114c833b5e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 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 8183c8b84b6..63a9e97987b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 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 1e6a8b6f985..7ae08e2f012 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 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 f94d9ddb069..a885322a211 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 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 ecdbaf23270..19527e6d47e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 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 cc2091b686e..c6b333e4eea 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 65f0043440e..429e69755a4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 930562400c0..029cc8c1aa9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index f4ed3ed9010..65a26a855f4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index 40d060921d0..0dade3f5a97 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{float.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package float)% diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index 085ce205eaa..1b941db8e06 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{floatrow.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package floatrow)% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 43b34a42aac..b13d7eb556b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{hyperref.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package hyperref)% diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 91a55e0d470..0455e99330b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{listings.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package listings)% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak index 7514655fe68..cc635d0a15d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{lscape.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package lscape)% diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak index 0deb0dcdbc1..5dbead76ebb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak +++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{nomencl.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package nomencl)% diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty index ac9a5094386..82c97ee5b2a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty @@ -105,7 +105,7 @@ \newcommand*{\FreeIII}[1]{\csname #1.FIII\endcsname} \let\Comment\FreeIII \newcommand*{\FreeIV}[1]{\csname #1.FIV\endcsname} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 4cf513824ec..6f74a1787e6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ article% } \ProvidesClass{\KOMAClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script ] \addtotoclist[ToC]{toc} \Ifstr{\ext@toc}{toc}{}{% @@ -140,7 +140,7 @@ } %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -192,7 +192,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -271,10 +271,11 @@ \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} +\@namedef{scr@v@3.32}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -349,7 +350,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -823,7 +824,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -1817,17 +1818,17 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -2962,7 +2963,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \providecommand*{\ifnumbered}{% @@ -4648,7 +4649,7 @@ }% \fi } -\AfterPackage!{hyperref}{\scr@chapter@after@hyperref@patch} +\AfterAtEndOfPackage{hyperref}{\scr@chapter@after@hyperref@patch} \newcommand*{\addparttocentry}[2]{% \addtocentrydefault{part}{#1}{#2}% } @@ -4848,7 +4849,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -4923,7 +4924,7 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \ClassWarning{\KOMAClasSName}{% + \ClassWarning{\KOMAClassName}{% Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak @@ -5276,7 +5277,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -6675,7 +6676,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls index 1ef6b7c029f..961f98df543 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 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 b8ec62ff218..022b2bc6f75 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -8,7 +8,6 @@ %% scrkernel-basics.dtx (with options: `package,prepare,base') %% scrkernel-basics.dtx (with options: `package,option,base') %% scrkernel-language.dtx (with options: `package,option,base') -%% scrlfile.dtx (with options: `load') %% scrkernel-basics.dtx (with options: `package,body,base') %% scrkernel-language.dtx (with options: `package,body,base') %% scrlogo.dtx (with options: `logo') @@ -45,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (% KOMA-Script-independent @@ -108,6 +107,7 @@ \fi \fi \expandafter\reserved@a\expandafter{\reserved@b} +\RequirePackage{scrlfile} \RequirePackage{keyval} \providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} \newcommand{\rloop}[1]{} @@ -464,7 +464,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: option) \DefineFamily{KOMA} \DefineFamilyMember{KOMA} @@ -478,11 +478,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ -\RequirePackage{scrlfile}[% - 2020/07/22 v3.31 KOMA-Script -] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -2837,7 +2833,7 @@ \reserved@b }% } -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 38513d41388..c42b4bdeb84 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ book% } \ProvidesClass{\KOMAClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -143,7 +143,7 @@ \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z 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 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -298,10 +298,11 @@ \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} +\@namedef{scr@v@3.32}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -375,7 +376,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -846,7 +847,7 @@ {notitlepage}{titlepage=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -2024,18 +2025,18 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -3145,7 +3146,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -5101,7 +5102,7 @@ }% \fi } -\AfterPackage!{hyperref}{\scr@chapter@after@hyperref@patch} +\AfterAtEndOfPackage{hyperref}{\scr@chapter@after@hyperref@patch} \newcommand*{\addparttocentry}[2]{% \addtocentrydefault{part}{#1}{#2}% } @@ -5690,7 +5691,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5771,7 +5772,7 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \ClassWarning{\KOMAClasSName}{% + \ClassWarning{\KOMAClassName}{% Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak @@ -6128,7 +6129,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -7551,7 +7552,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 64686c0be2b..62c37a0a303 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ @@ -248,7 +248,7 @@ * Local config file scrdate.cfg used^^J% *************************************}} {} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index b3f5f9ac366..0bf021ee7b9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -78,7 +78,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -100,7 +100,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -109,7 +109,7 @@ %%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: prepare) \ProvidesPackage{scrextend}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 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 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -218,6 +218,7 @@ \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} +\@namedef{scr@v@3.32}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrextend.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) @@ -243,7 +244,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -298,7 +299,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -438,7 +439,7 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $ %%% (run: option) @@ -597,12 +598,12 @@ \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -1349,11 +1350,11 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: body) \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname @@ -1675,7 +1676,7 @@ } \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index a5737641e14..aa62aad0c5e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,7 +64,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -73,7 +73,7 @@ %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: identify) \ProvidesPackage{scrfontsizes}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (font size file generator)] %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) @@ -366,7 +366,7 @@ \immediate\closeout\@fontfile } \@onlypreamble\generatefontfile -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index a6b1c4e46ad..6d533b39e93 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,10 +74,10 @@ %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (hacking other packages)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ @@ -209,7 +209,7 @@ \input{standardsections.hak}% \fi } -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 5c2093c1fd4..a81cbdceaa7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -48,7 +48,7 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (for jurists) ] @@ -1108,7 +1108,7 @@ } %%% 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 $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 11ccda289ad..a72a7b52b07 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -8,7 +8,6 @@ %% 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: `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 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +66,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (% KOMA-Script-dependent @@ -243,16 +242,12 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: option) \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: option) -%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ -\RequirePackage{scrlfile}[% - 2020/07/22 v3.31 KOMA-Script -] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% @@ -643,7 +638,7 @@ #2% }% } -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} 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 63d006d1b3b..605f5ffa24c 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 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -69,10 +69,9 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -\scrlayerInitInterface %%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ %%% (run: init) -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -211,13 +210,14 @@ \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% } \KOMA@key{autoremoveinterfaces}[true]{% + \scrlayer@report@deprecated{#1}{autoremoveinterface}% \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } %%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $ %%% (run: options) -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -321,7 +321,7 @@ ]{@fancy}{% fancy.head.odd,fancy.head.even,fancy.foot.odd,fancy.foot.even } -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} 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 1dca8bd43c4..8aa7397c570 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2019/12/02 v0.3.3426 KOMA-Script + 2020/09/11 v0.3.3533 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -64,8 +64,7 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -\scrlayerInitInterface -%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% @@ -98,7 +97,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -237,16 +236,16 @@ \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% } \KOMA@key{autoremoveinterfaces}[true]{% + \scrlayer@report@deprecated{#1}{autoremoveinterface}% \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z 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 3411 2019-11-28 09:11:27Z kohm $ +\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns} +\slnc@autoclearnotecolumnstrue +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -318,153 +317,120 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) -\scrlayerAddToInterface\DeclareNoteColumn{% - \newcommand*{\DeclareNoteColumn}[2][]{% - \@ifundefined{slnc@#2@box}{% - \expandafter\newsavebox\csname slnc@#2@box\endcsname - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname slnc@#2@box\endcsname\relax - }% - }{}% - \@ifundefined{slnc@#2@unprocessed}{% - \@namedef{slnc@#2@unprocessed}{}% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname slnc@#2@unprocessed\endcsname\relax - }% - }{}% - \@ifundefined{slnc@#2@pos}{% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname slnc@#2@pos\endcsname\relax - }% - }{}% - \@ifundefined{slnc@#2@width}{% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname slnc@#2@width\endcsname\relax - }% - }{}% - \@ifundefined{slnc@#2@colorstack}{% - \scr@ifundefinedorrelax{pdfcolorstackinit}{% - \scr@ifundefinedorrelax{pdffeedback}{}{% - \expandafter\chardef\csname slnc@#2@colorstack\endcsname= - \pdffeedback colorstackinit direct {\slnc@initial@black}% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname slnc@#2@colorstack\endcsname\relax - }% - }% - }{% +\newcommand*{\DeclareNoteColumn}[2][]{% + \@ifundefined{slnc@#2@box}{% + \expandafter\newsavebox\csname slnc@#2@box\endcsname + }{}% + \@ifundefined{slnc@#2@unprocessed}{% + \@namedef{slnc@#2@unprocessed}{}% + }{}% + \@ifundefined{slnc@#2@colorstack}{% + \scr@ifundefinedorrelax{pdfcolorstackinit}{% + \scr@ifundefinedorrelax{pdffeedback}{}{% \expandafter\chardef\csname slnc@#2@colorstack\endcsname= - \pdfcolorstackinit direct {\slnc@initial@black}% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname slnc@#2@colorstack\endcsname\relax - }% - }% - }{}% - \@ifundefined{scr@fnt@notecolumn.#2}{% - \@ifundefined{@notecolumn.#2font}{% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname @notecolumn.#2font\endcsname\relax - }% - }{% - \PackageInfo{scrlayer-notecolumn}{using already defined - macro\MessageBreak - `\expandafter\string\csname @notecolumn.#2font\endcsname' for font - element\MessageBreak - `notecolumn.#2'% - }% - }% - \newkomafont{notecolumn.#2}{}% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \expandafter\let\csname scr@fnt@notecolumn.#2\endcsname\relax + \pdffeedback colorstackinit direct {\slnc@initial@black}% }% }{% - \PackageInfo{scrlayer-notecolumn}{using already defined font + \expandafter\chardef\csname slnc@#2@colorstack\endcsname= + \pdfcolorstackinit direct {\slnc@initial@black}% + }% + }{}% + \@ifundefined{scr@fnt@notecolumn.#2}{% + \@ifundefined{@notecolumn.#2font}{}{% + \PackageInfo{scrlayer-notecolumn}{using already defined + macro\MessageBreak + `\expandafter\string\csname @notecolumn.#2font\endcsname' for font element\MessageBreak `notecolumn.#2'% }% }% - \newcommand*{\slnc@name}{}% - \edef\slnc@name{#2}% - \FamilyExecuteOptions[.definenotecolumn]{KOMAarg}{marginpar,#1}% - \let\slnc@name\relax - \DeclareLayer[% - foreground,% - align=tl,% - voffset=1in+\topmargin+\headheight+\headsep,% - height=\dimexpr\textheight+\topskip\relax,% - hoffset=\csname slnc@#2@pos\endcsname,% - width=\csname slnc@#2@width\endcsname,% - contents=\slnc@processnotes{#2}% - ]{notecolumn.#2} - \IfLayerAtPageStyle{@everystyle@}{notecolumn.#2}{}{% - \AddLayersToPageStyle{@everystyle@}{notecolumn.#2}% - }% - \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{% - \RemoveLayersFromPageStyle{@everystyle@}{notecolumn.#2}% - \DestroyLayer{notecolumn.#2}% + \newkomafont{notecolumn.#2}{}% + }{% + \PackageInfo{scrlayer-notecolumn}{using already defined font + element\MessageBreak + `notecolumn.#2'% }% - \@cons\slnc@processnotecolumns{{#2}}% - }% -} -\scrlayerAddToInterface\slnc@initial@black{% - \newcommand*{\slnc@initial@black}{0 g 0 G}% - \AfterPackage*{color}{% - \let\slnc@initial@black\current@color - \AtBeginDocument{\let\slnc@initial@black\default@color}% }% - \AfterPackage*{xcolor}{% - \let\slnc@initial@black\current@color - \AtBeginDocument{\let\slnc@initial@black\default@color}% + \newcommand*{\slnc@name}{}% + \edef\slnc@name{#2}% + \FamilyExecuteOptions[.definenotecolumn]{KOMAarg}{marginpar,#1}% + \let\slnc@name\relax + \DeclareLayer[% + foreground,% + align=tl,% + voffset=1in+\topmargin+\headheight+\headsep,% + height=\dimexpr\textheight+\topskip\relax,% + hoffset=\csname slnc@#2@pos\endcsname,% + width=\csname slnc@#2@width\endcsname,% + contents=\slnc@processnotes{#2}% + ]{notecolumn.#2} + \IfLayerAtPageStyle{@everystyle@}{notecolumn.#2}{}{% + \AddLayersToPageStyle{@everystyle@}{notecolumn.#2}% }% + \@cons\slnc@processnotecolumns{{#2}}% } -\scrlayerAddToInterface\slnc@processnotecolumns{% - \newcommand*{\slnc@processnotecolumns}{}% -} -\scrlayerAddToInterface\slnc@testforpagestylewarning{% - \newcommand*{\slnc@testforpagestylewarning}{% - \IfLayerPageStyleExists{\currentpagestyle}{}{% - \PackageWarning{scrlayer-notecolumn}{% - output of note columns delayed,\MessageBreak - because with `\currentpagestyle'\MessageBreak - a page style has been selected, that\MessageBreak - isn't a layer page style,% - }% +\newcommand*{\slnc@initial@black}{0 g 0 G}% +\AfterPackage*{color}{% + \let\slnc@initial@black\current@color + \AtBeginDocument{\let\slnc@initial@black\default@color}% +}% +\AfterPackage*{xcolor}{% + \let\slnc@initial@black\current@color + \AtBeginDocument{\let\slnc@initial@black\default@color}% +}% +\newcommand*{\slnc@processnotecolumns}{}% +\newcommand*{\slnc@testforpagestylewarning}{% + \IfLayerPageStyleExists{\currentpagestyle}{}{% + \PackageWarning{scrlayer-notecolumn}{% + output of note columns delayed,\MessageBreak + because with `\currentpagestyle'\MessageBreak + a page style has been selected, that\MessageBreak + isn't a layer page style,% }% }% -} +}% \AfterSelectAnyPageStyle{\slnc@testforpagestylewarning} \DefineFamilyMember[.definenotecolumn]{KOMAarg} \DefineFamilyKey[.definenotecolumn]{KOMAarg}{position}{% \@namedef{slnc@\slnc@name @pos}{\dimexpr #1\relax}% \FamilyKeyStateProcessed } -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@position} -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@position@default} \DefineFamilyKey[.definenotecolumn]{KOMAarg}{width}{% \@namedef{slnc@\slnc@name @width}{\dimexpr #1\relax}% \FamilyKeyStateProcessed } -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@width} -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@width@default} \DefineFamilyKey[.definenotecolumn]{KOMAarg}{font}{% \setkomafont{notecolumn.\slnc@name}{#1}% \FamilyKeyStateProcessed } -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@font} -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@font@default} \DefineFamilyKey[.definenotecolumn]{KOMAarg}{marginpar}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{marginpar}{#1}% \edef\reserved@a{\noexpand\slnc@defpos{\slnc@name}}\reserved@a \@namedef{slnc@\slnc@name @width}{\marginparwidth}% } -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@marginpar} -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@marginpar@default} -\scrlayerAddToInterface\slnc@defpos{% - \newcommand*\slnc@defpos[1]{% - \@namedef{slnc@#1@pos}{% - \ifodd\value{page} +\newcommand*\slnc@defpos[1]{% + \@namedef{slnc@#1@pos}{% + \ifodd\value{page} + \if@reversemargin + \dimexpr \oddsidemargin+1in + -\marginparsep-\csname slnc@#1@width\endcsname\relax + \else + \dimexpr \oddsidemargin+1in + +\textwidth+\marginparsep\relax + \fi + \else + \if@twoside + \if@reversemargin + \dimexpr \evensidemargin+1in + +\textwidth+\marginparsep\relax + \else + \dimexpr \evensidemargin+1in + -\marginparsep-\csname slnc@#1@width\endcsname\relax + \fi + \else \if@reversemargin \dimexpr \oddsidemargin+1in -\marginparsep-\csname slnc@#1@width\endcsname\relax @@ -472,26 +438,8 @@ \dimexpr \oddsidemargin+1in +\textwidth+\marginparsep\relax \fi - \else - \if@twoside - \if@reversemargin - \dimexpr \evensidemargin+1in - +\textwidth+\marginparsep\relax - \else - \dimexpr \evensidemargin+1in - -\marginparsep-\csname slnc@#1@width\endcsname\relax - \fi - \else - \if@reversemargin - \dimexpr \oddsidemargin+1in - -\marginparsep-\csname slnc@#1@width\endcsname\relax - \else - \dimexpr \oddsidemargin+1in - +\textwidth+\marginparsep\relax - \fi - \fi \fi - }% + \fi }% }% \DefineFamilyKey[.definenotecolumn]{KOMAarg}{normalmarginpar}[\relax]{% @@ -500,24 +448,20 @@ \edef\reserved@a{\noexpand\slnc@defnormalpos{\slnc@name}}\reserved@a \@namedef{slnc@\slnc@name @width}{\marginparwidth}% } -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@normalmarginpar} -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@normalmarginpar@default} -\scrlayerAddToInterface\slnc@defnormalpos{% - \newcommand*\slnc@defnormalpos[1]{% - \@namedef{slnc@#1@pos}{% - \ifodd\value{page} +\newcommand*\slnc@defnormalpos[1]{% + \@namedef{slnc@#1@pos}{% + \ifodd\value{page} + \dimexpr \oddsidemargin+1in + +\textwidth+\marginparsep\relax + \else + \if@twoside + \dimexpr \evensidemargin+1in + -\marginparsep-\csname slnc@#1@width\endcsname\relax + \else \dimexpr \oddsidemargin+1in +\textwidth+\marginparsep\relax - \else - \if@twoside - \dimexpr \evensidemargin+1in - -\marginparsep-\csname slnc@#1@width\endcsname\relax - \else - \dimexpr \oddsidemargin+1in - +\textwidth+\marginparsep\relax - \fi \fi - }% + \fi }% }% \DefineFamilyKey[.definenotecolumn]{KOMAarg}{reversemarginpar}[\relax]{% @@ -526,88 +470,74 @@ \edef\reserved@a{\noexpand\slnc@defreversepos{\slnc@name}}\reserved@a \@namedef{slnc@\slnc@name @width}{\marginparwidth}% } -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@reversemarginpar} -\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@reversemarginpar@default} -\scrlayerAddToInterface\slnc@defreversepos{% - \newcommand*\slnc@defreversepos[1]{% - \@namedef{slnc@#1@pos}{% - \ifodd\value{page} +\newcommand*\slnc@defreversepos[1]{% + \@namedef{slnc@#1@pos}{% + \ifodd\value{page} + \dimexpr \oddsidemargin+1in + -\marginparsep-\csname slnc@#1@width\endcsname\relax + \else + \if@twoside + \dimexpr \evensidemargin+1in + +\textwidth+\marginparsep\relax + \else \dimexpr \oddsidemargin+1in -\marginparsep-\csname slnc@#1@width\endcsname\relax - \else - \if@twoside - \dimexpr \evensidemargin+1in - +\textwidth+\marginparsep\relax - \else - \dimexpr \oddsidemargin+1in - -\marginparsep-\csname slnc@#1@width\endcsname\relax - \fi \fi - }% + \fi }% }% -\scrlayerAddToInterface\DeclareNewNoteColumn{% - \newcommand*{\DeclareNewNoteColumn}[2][]{% - \scr@ifundefinedorrelax{slnc@#2@box}{}{% - \PackageError{scrlayer-notecolumn}{note column `#2' already defined}{% - You may declare only note columns, that haven't been declared - previously using\MessageBreak - \string\DeclareNewNoteColumn. See also the alternatives - \string\RedeclareNoteColumn,\MessageBreak - \string\ProvideNoteColumn, and \string\DeclareNoteColumn.\MessageBreak - Nevertheless, if you'll continue, declaration will be done.% - }% - }% - \DeclareNoteColumn[{#1}]{#2}% - }% -} -\scrlayerAddToInterface\ProvideNoteColumn{% - \newcommand*{\ProvideNoteColumn}[2][]{% - \scr@ifundefinedorrelax{slnc@#2@box}{}{% - \PackageInfo{scrlayer-notecolumn}{\string\ProvideNoteColumn{#2} - ignored,\MessageBreak - because of already defined\MessageBreak - not column}% - }{% - \DeclareNoteColumn[{#1}]{#2}% +\newcommand*{\DeclareNewNoteColumn}[2][]{% + \scr@ifundefinedorrelax{slnc@#2@box}{}{% + \PackageError{scrlayer-notecolumn}{note column `#2' already defined}{% + You may declare only note columns, that haven't been declared + previously using\MessageBreak + \string\DeclareNewNoteColumn. See also the alternatives + \string\RedeclareNoteColumn,\MessageBreak + \string\ProvideNoteColumn, and \string\DeclareNoteColumn.\MessageBreak + Nevertheless, if you'll continue, declaration will be done.% }% }% -} -\scrlayerAddToInterface\RedeclareNoteColumn{% - \newcommand*{\RedeclareNoteColumn}[2][]{% - \scr@ifundefinedorrelax{slnc@#2@box}{% - \PackageError{scrlayer-notecolumn}{note column `#2' undefined}{% - You may declare only note columns, that have been declared - previously using\MessageBreak - \string\RedeclareNoteColumn. See also the alternatives - \string\DeclareNewNoteColumn,\MessageBreak - \string\ProvideNoteColumn, and \string\DeclareNoteColumn.\MessageBreak - Nevertheless, if you'll continue, declaration will be done.% - }% - }{}% + \DeclareNoteColumn[{#1}]{#2}% +}% +\newcommand*{\ProvideNoteColumn}[2][]{% + \scr@ifundefinedorrelax{slnc@#2@box}{}{% + \PackageInfo{scrlayer-notecolumn}{\string\ProvideNoteColumn{#2} + ignored,\MessageBreak + because of already defined\MessageBreak + not column}% + }{% \DeclareNoteColumn[{#1}]{#2}% }% -} -\scrlayerAddToInterface\tf@slnc{% - \newwrite\tf@slnc - \AtBeginDocument{% - \if@filesw - \immediate\write\@auxout{% - \noexpand\csname slnc@initwrite\noexpand\endcsname - }% - \fi - }% - \AtEndDocument{\let\slnc@initwrite\slnc@openwrite}% -} -\scrlayerAddToInterface\slnc@initwrite{}% -\scrlayerAddToInterface\slnc@openwrite{% - \newcommand*{\slnc@openwrite}{% - \immediate\closein\slnc@file - \PackageInfo{scrlayer-notecolumn}{% - Opening `\jobname.slnc'\MessageBreak - for writing}% - \immediate\openout\tf@slnc\jobname.slnc - }% +}% +\newcommand*{\RedeclareNoteColumn}[2][]{% + \scr@ifundefinedorrelax{slnc@#2@box}{% + \PackageError{scrlayer-notecolumn}{note column `#2' undefined}{% + You may declare only note columns, that have been declared + previously using\MessageBreak + \string\RedeclareNoteColumn. See also the alternatives + \string\DeclareNewNoteColumn,\MessageBreak + \string\ProvideNoteColumn, and \string\DeclareNoteColumn.\MessageBreak + Nevertheless, if you'll continue, declaration will be done.% + }% + }{}% + \DeclareNoteColumn[{#1}]{#2}% +}% +\newwrite\tf@slnc +\AtBeginDocument{% + \if@filesw + \immediate\write\@auxout{% + \noexpand\csname slnc@initwrite\noexpand\endcsname + }% + \fi +}% +\AtEndDocument{\let\slnc@initwrite\slnc@openwrite}% +\newcommand*{\slnc@initwrite}{}% +\newcommand*{\slnc@openwrite}{% + \immediate\closein\slnc@file + \PackageInfo{scrlayer-notecolumn}{% + Opening `\jobname.slnc'\MessageBreak + for writing}% + \immediate\openout\tf@slnc\jobname.slnc } \AfterReadingMainAux{% \immediate\closeout\tf@slnc @@ -653,258 +583,243 @@ \fi \endgroup } -\scrlayerAddToInterface\slnc@unexpanded{% - \let\slnc@unexpanded\detokenize -} -\scrlayerAddToInterface\makenote{% - \newcommand*{\makenote}{% - \kernel@ifstar{\let\slnc@unexpanded\detokenize\slnc@makenote}% - {\let\slnc@unexpanded\@firstofone\slnc@makenote}% - }% -} -\scrlayerAddToInterface\slnc@makenote{% - \newcommand{\slnc@makenote}[2][marginpar]{% - \@bsphack - \scr@savepos - \addtocontents{slnc}{% - \string\slnc@note{#1}% - {\noexpand\number\value{slncpage}}% - {\noexpand\number\scr@lastypos}% - {\slnc@unexpanded{#2}}% - }% - \@esphack +\newcommand*{\slnc@unexpanded}{} +\let\slnc@unexpanded\detokenize +\newcommand*{\makenote}{% + \kernel@ifstar{\let\slnc@unexpanded\detokenize\slnc@makenote}% + {\let\slnc@unexpanded\@firstofone\slnc@makenote}% +}% +\newcommand{\slnc@makenote}[2][marginpar]{% + \@bsphack + \scr@savepos + \addtocontents{slnc}{% + \string\slnc@note{#1}% + {\noexpand\number\value{slncpage}}% + {\noexpand\number\scr@lastypos}% + {\slnc@unexpanded{#2}}% }% -} + \@esphack +}% \@ifundefined{c@slncpage}{% \newcounter{slncpage}% \AddToLayerPageStyleOptions{@everystyle@}{% onbackground=\stepcounter{slncpage}% }% }{} -\scrlayerAddToInterface\slnc@processnotes{% - \newcommand*{\slnc@processnotes}[1]{% - \begingroup - \slnc@readnotes{\value{slncpage}}% - \expandafter\let\expandafter\reserved@a - \csname slnc@#1@unprocessed\endcsname - \expandafter\global - \expandafter\let\csname slnc@#1@unprocessed\endcsname\@empty - \def\slnc@notesyncfonttest##1{% - \ifhmode - \PackageError{scrlayer-notecolumn}{% - illegal font setting for `notecolumn.##1'% - }{% - Current setting of font for `notecolumn.##1' switches - from\MessageBreak - vertical mode to horizontal mode. This is - illegal!\MessageBreak - You have to change the font setting to fix - this.\MessageBreak - If you'll continue vertical alignment of notes may fail% - }% - \par\vskip-\dimexpr \baselineskip+\parskip\relax - \fi - }% - \long\def\slnc@note##1##2##3##4{% +\newcommand*{\slnc@processnotes}[1]{% + \begingroup + \slnc@readnotes{\value{slncpage}}% + \expandafter\let\expandafter\reserved@a + \csname slnc@#1@unprocessed\endcsname + \expandafter\global + \expandafter\let\csname slnc@#1@unprocessed\endcsname\@empty + \def\slnc@notesyncfonttest##1{% + \ifhmode + \PackageError{scrlayer-notecolumn}{% + illegal font setting for `notecolumn.##1'% + }{% + Current setting of font for `notecolumn.##1' switches + from\MessageBreak + vertical mode to horizontal mode. This is + illegal!\MessageBreak + You have to change the font setting to fix + this.\MessageBreak + If you'll continue vertical alignment of notes may fail% + }% + \par\vskip-\dimexpr \baselineskip+\parskip\relax + \fi + }% + \long\def\slnc@note##1##2##3##4{% \typeout{TRACE (slnc): ##2<=\theslncpage?}% - \ifnum ##2>\value{slncpage}\relax + \ifnum ##2>\value{slncpage}\relax \typeout{TRACE (slnc): no: unprocess note}% - \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{% - \slnc@note{##1}{##2}{##3}{##4}% - }% - \else - \ifnum ##2<\value{slncpage}\relax - \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed}% - \fi - \boxmaxdepth\maxdepth - \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% - \expandafter\hsize\csname slnc@#1@width\endcsname - \normalfont\normalsize - \slnc@switchcolorstack{#1}% - {% - \usekomafont{notecolumn.#1}{% - \slnc@notesyncfonttest{#1}% - \expandafter\ifvoid\csname slnc@#1@box\endcsname - \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% - \kern\dimexpr\topskip-\baselineskip\relax - }% - \fi - \scr@ifundefinedorrelax{pdfpageheight}{% - \scr@ifundefinedorrelax{pageheight}{% - \@tempdima=\paperheight - }{% - \@tempdima=\pageheight - }% + \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{% + \slnc@note{##1}{##2}{##3}{##4}% + }% + \else + \ifnum ##2<\value{slncpage}\relax + \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed}% + \fi + \boxmaxdepth\maxdepth + \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% + \expandafter\hsize\csname slnc@#1@width\endcsname + \normalfont\normalsize + \slnc@switchcolorstack{#1}% + {% + \usekomafont{notecolumn.#1}{% + \slnc@notesyncfonttest{#1}% + \expandafter\ifvoid\csname slnc@#1@box\endcsname + \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% + \kern\dimexpr\topskip-\baselineskip\relax + }% + \fi + \scr@ifundefinedorrelax{pdfpageheight}{% + \scr@ifundefinedorrelax{pageheight}{% + \@tempdima=\paperheight }{% - \@tempdima=\pdfpageheight + \@tempdima=\pageheight }% - \@tempdima=\dimexpr \@tempdima-##3sp - -1in-\topmargin - -\headheight-\headsep - -\baselineskip - \relax - \@tempdimb=\dimexpr \expandafter\ht\csname slnc@#1@box\endcsname - +\expandafter\dp\csname slnc@#1@box\endcsname - \relax - \typeout{Soll: \the\@tempdima^^JIst: \space\the\@tempdimb}% - \ifdim\@tempdima<\@tempdimb + }{% + \@tempdima=\pdfpageheight + }% + \@tempdima=\dimexpr \@tempdima-##3sp + -1in-\topmargin + -\headheight-\headsep + -\baselineskip + \relax + \@tempdimb=\dimexpr \expandafter\ht\csname slnc@#1@box\endcsname + +\expandafter\dp\csname slnc@#1@box\endcsname + \relax + \typeout{Soll: \the\@tempdima^^JIst: \space\the\@tempdimb}% + \ifdim\@tempdima<\@tempdimb + \PackageInfo{scrlayer-notecolumn}{% + Note moved down from\MessageBreak + \the\@tempdima\space to \the\@tempdimb\MessageBreak + at note box `#1' + }% + \else + \ifdim\@tempdima>\@tempdimb \PackageInfo{scrlayer-notecolumn}{% - Note moved down from\MessageBreak - \the\@tempdima\space to \the\@tempdimb\MessageBreak - at note box `#1' + Adding vertical white space from\MessageBreak + \the\@tempdimb\space to \the\@tempdima\MessageBreak + into note box `#1' + }% + \expandafter\setbox\csname slnc@#1@box\endcsname + \vbox {% + \expandafter\unvbox\csname slnc@#1@box\endcsname + \kern\dimexpr\@tempdima-\@tempdimb\relax }% - \else - \ifdim\@tempdima>\@tempdimb - \PackageInfo{scrlayer-notecolumn}{% - Adding vertical white space from\MessageBreak - \the\@tempdimb\space to \the\@tempdima\MessageBreak - into note box `#1' - }% - \expandafter\setbox\csname slnc@#1@box\endcsname - \vbox {% - \expandafter\unvbox\csname slnc@#1@box\endcsname - \kern\dimexpr\@tempdima-\@tempdimb\relax - }% - \fi - \fi - \expandafter\ifvoid\expandafter\csname slnc@#1@box\endcsname - \else - \@tempdima\dimexpr - \dp\strutbox - -\dp\csname slnc@#1@box\endcsname - \relax - \expandafter\unvbox\csname slnc@#1@box\endcsname - \ifdim\@tempdima>\z@ \kern\@tempdima\fi \fi - \slnc@restoreinnote - \strut\ignorespaces ##4\par - }% + \fi + \expandafter\ifvoid\expandafter\csname slnc@#1@box\endcsname + \else + \@tempdima\dimexpr + \dp\strutbox + -\dp\csname slnc@#1@box\endcsname + \relax + \expandafter\unvbox\csname slnc@#1@box\endcsname + \ifdim\@tempdima>\z@ \kern\@tempdima\fi + \fi + \slnc@restoreinnote + \strut\ignorespaces ##4\par }% }% - \fi - }% - \def\slnc@sync##1##2##3##4{% - \ifnum ##2>\value{slncpage}\relax - \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{% - \slnc@sync{##1}{##2}{##3}{}% - }% - \else - \if@filesw - \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% - \expandafter\unvbox\csname slnc@#1@box\endcsname - \scr@savepos - \protected@write\@auxout{}{% - \string\newlabel{notecolumn.##1.##3.syncnote.label}{% - {% - \noexpand\number\scr@lastypos - }{\thepage}% - }% + }% + \fi + }% + \def\slnc@sync##1##2##3##4{% + \ifnum ##2>\value{slncpage}\relax + \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{% + \slnc@sync{##1}{##2}{##3}{}% + }% + \else + \if@filesw + \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% + \expandafter\unvbox\csname slnc@#1@box\endcsname + \scr@savepos + \protected@write\@auxout{}{% + \string\newlabel{notecolumn.##1.##3.syncnote.label}{% + {% + \noexpand\number\scr@lastypos + }{\thepage}% }% }% - \fi - \fi - }% - \reserved@a - \expandafter\ifvoid\csname slnc@#1@box\endcsname - \PackageInfo{scrlayer-notecolumn}{Note box `#1' empty}% - \else - \ifdim \dimexpr \expandafter\ht\csname slnc@#1@box\endcsname - +\expandafter\dp\csname slnc@#1@box\endcsname - \relax >\textheight\relax - \PackageInfo{scrlayer-notecolumn}{Split note box `#1'}% - \splittopskip\topskip - \splitmaxdepth\baselineskip - \usekomafont{notecolumn.#1}{% - \expandafter\vsplit\csname slnc@#1@box\endcsname to - \textheight\relax }% - \expandafter\ifvoid\csname slnc@#1@box\endcsname - \else - \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% - \slnc@switchcolorstack{#1}% - \expandafter\unvbox\csname slnc@#1@box\endcsname - }% - \fi + \fi + \fi + }% + \reserved@a + \expandafter\ifvoid\csname slnc@#1@box\endcsname + \PackageInfo{scrlayer-notecolumn}{Note box `#1' empty}% + \else + \ifdim \dimexpr \expandafter\ht\csname slnc@#1@box\endcsname + +\expandafter\dp\csname slnc@#1@box\endcsname + \relax >\textheight\relax + \PackageInfo{scrlayer-notecolumn}{Split note box `#1'}% + \splittopskip\topskip + \splitmaxdepth\baselineskip + \usekomafont{notecolumn.#1}{% + \expandafter\vsplit\csname slnc@#1@box\endcsname to + \textheight\relax + }% + \expandafter\ifvoid\csname slnc@#1@box\endcsname \else - \PackageInfo{scrlayer-notecolumn}{Flush note box `#1'}% - \usekomafont{notecolumn.#1}{% + \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{% \slnc@switchcolorstack{#1}% - \expandafter\box\csname slnc@#1@box\endcsname% + \expandafter\unvbox\csname slnc@#1@box\endcsname }% \fi + \else + \PackageInfo{scrlayer-notecolumn}{Flush note box `#1'}% + \usekomafont{notecolumn.#1}{% + \slnc@switchcolorstack{#1}% + \expandafter\box\csname slnc@#1@box\endcsname% + }% \fi - \expandafter\global - \expandafter\setbox\csname slnc@#1@box\expandafter\endcsname - \expandafter\box\csname slnc@#1@box\endcsname - \endgroup - } + \fi + \expandafter\global + \expandafter\setbox\csname slnc@#1@box\expandafter\endcsname + \expandafter\box\csname slnc@#1@box\endcsname + \endgroup } -\scrlayerAddToInterface{\slnc@switchcolorstack}{% - \newcommand*{\slnc@switchcolorstack}[1]{% - \scr@ifundefinedorrelax{slnc@#1@colorstack}{% - \def\set@color{% - \PackageWarningNoLine{scrlayer-notecolumn}{% - unsupported change of colour!\MessageBreak - It seems you are using a TeX engine,\MessageBreak - that does not support switching the\MessageBreak - colour stack like pdfTeX or luaTeX do.\MessageBreak - Because of this, usage of \string\color,\MessageBreak - \string\textcolor\space etc. inside a note - column\MessageBreak - is not supported% - }% +\newcommand*{\slnc@switchcolorstack}[1]{% + \scr@ifundefinedorrelax{slnc@#1@colorstack}{% + \def\set@color{% + \PackageWarningNoLine{scrlayer-notecolumn}{% + unsupported change of colour!\MessageBreak + It seems you are using a TeX engine,\MessageBreak + that does not support switching the\MessageBreak + colour stack like pdfTeX or luaTeX do.\MessageBreak + Because of this, usage of \string\color,\MessageBreak + \string\textcolor\space etc. inside a note + column\MessageBreak + is not supported% }% + }% + }{% + \scr@ifundefinedorrelax{@pdfcolorstack}{% }{% - \scr@ifundefinedorrelax{@pdfcolorstack}{% - }{% - \expandafter\let\expandafter\@pdfcolorstack - \csname slnc@#1@colorstack\endcsname - }% - \scr@ifundefinedorrelax{pdfcolorstack}{% - \scr@ifundefinedorrelax{pdfextension}{% - \PackageError{scrlayer-notecolumm}{% - colour stack defined but not usable% - }{% - \expandafter\string - \csname slnc@#1@colorstack\endcsname\space defined - \MessageBreak - but neither \string\pdfcolorstack\space nor - \string\pdfextension.\MessageBreak - This should never happen!% - }% + \expandafter\let\expandafter\@pdfcolorstack + \csname slnc@#1@colorstack\endcsname + }% + \scr@ifundefinedorrelax{pdfcolorstack}{% + \scr@ifundefinedorrelax{pdfextension}{% + \PackageError{scrlayer-notecolumm}{% + colour stack defined but not usable% }{% - \pdfextension colorstack - \csname slnc@#1@colorstack\endcsname current\relax + \expandafter\string + \csname slnc@#1@colorstack\endcsname\space defined + \MessageBreak + but neither \string\pdfcolorstack\space nor + \string\pdfextension.\MessageBreak + This should never happen!% }% }{% - \pdfcolorstack + \pdfextension colorstack \csname slnc@#1@colorstack\endcsname current\relax }% + }{% + \pdfcolorstack + \csname slnc@#1@colorstack\endcsname current\relax }% }% -} -\scrlayerAddToInterface\slnc@restoreinnote{% - \let\slnc@restoreinnote\@empty -} -\scrlayerAddToInterface\restoreinnote{% - \newcommand*\restoreinnote[1]{% - \AtBeginDocument{% - \expandafter\scrlayerAddCsToInterface[scrlayer-notecolumn.sty]{slnc\string#1}{% - \expandafter\let\csname slnc\string#1\endcsname#1% - \g@addto@macro\slnc@restoreinnote{% - \expandafter\let\expandafter#1\csname slnc\string#1\endcsname - }% - }% +}% +\newcommand*{\slnc@restoreinnote}{} +\let\slnc@restoreinnote\@empty +\newcommand*\restoreinnote[1]{% + \AtBeginDocument{% + \expandafter\newcommand\expandafter*\csname slnc\string#1\endcsname{}% + \expandafter\let\csname slnc\string#1\endcsname#1% + \g@addto@macro\slnc@restoreinnote{% + \expandafter\let\expandafter#1\csname slnc\string#1\endcsname }% }% - \@onlypreamble\restoreinnote - \restoreinnote\label - \restoreinnote\index - \restoreinnote\glossary -} -\scrlayerAddToInterface\slnc@catcodes{% - \newcommand*{\slnc@catcodes}{}% } +\@onlypreamble\restoreinnote +\restoreinnote\label +\restoreinnote\index +\restoreinnote\glossary +\newcommand*{\slnc@catcodes}{}% \AtBeginDocument{% \begingroup \def\do#1{% @@ -917,170 +832,183 @@ \xdef\slnc@catcodes{\slnc@catcodes\catcode`\protect\@=11\relax}% \endgroup } -\scrlayerAddToInterface\slnc@readnotes{% - \newcommand*\slnc@readnotes[1]{% - \ifeof\slnc@file\else - \ifnum \number #1<\slnc@unprocessed\relax - \@tempswafalse - \else - \@tempswatrue - \fi - \@whilesw\if@tempswa\fi{% - \begingroup - \slnc@catcodes - \endlinechar\m@ne - \read\slnc@file to\reserved@a - \edef\reserved@a{% - \endgroup - \noexpand\def\noexpand\reserved@a{% - \unexpanded\expandafter{\reserved@a}% - }% +\newcommand*\slnc@readnotes[1]{% + \ifeof\slnc@file\else + \ifnum \number #1<\slnc@unprocessed\relax + \@tempswafalse + \else + \@tempswatrue + \fi + \@whilesw\if@tempswa\fi{% + \begingroup + \slnc@catcodes + \endlinechar\m@ne + \read\slnc@file to\reserved@a + \edef\reserved@a{% + \endgroup + \noexpand\def\noexpand\reserved@a{% + \unexpanded\expandafter{\reserved@a}% }% - \reserved@a - \expandafter\slnc@iofv\expandafter\reserved@b\reserved@a - \@empty\@empty\@empty\@empty\@empty - \@tempswafalse - \@for\reserved@c :={\slnc@note },{\slnc@sync }\do{% - \ifx\reserved@b\reserved@c \@tempswatrue\fi }% - \if@tempswa - \@tempswafalse - \expandafter\slnc@iiiofv\expandafter\reserved@b\reserved@a + \reserved@a + \expandafter\slnc@iofv\expandafter\reserved@b\reserved@a + \@empty\@empty\@empty\@empty\@empty + \@tempswafalse + \@for\reserved@c :={\slnc@note },{\slnc@sync }\do{% + \ifx\reserved@b\reserved@c \@tempswatrue\fi + }% + \if@tempswa + \@tempswafalse + \expandafter\slnc@iiiofv\expandafter\reserved@b\reserved@a + \@empty\@empty\@empty\@empty\@empty + \ifx\reserved@b\@empty + \PackageError{scrlayer-notecolumn}{internal syntax error}{% + Unexpected syntax of file `\jobname.slnc'.\MessageBreak + Second argument should be a number.\MessageBreak + I don't know what to do with\MessageBreak + \expandafter\detokenize\expandafter{\reserved@a}% + }% + \@tempswatrue + \else + \global\let\slnc@unprocessed\reserved@b + \expandafter\slnc@iiofv\expandafter\reserved@b\reserved@a \@empty\@empty\@empty\@empty\@empty - \ifx\reserved@b\@empty - \PackageError{scrlayer-notecolumn}{internal syntax error}{% - Unexpected syntax of file `\jobname.slnc'.\MessageBreak - Second argument should be a number.\MessageBreak - I don't know what to do with\MessageBreak - \expandafter\detokenize\expandafter{\reserved@a}% + \@ifundefined{slnc@\reserved@b @unprocessed}{% + \PackageWarning{scrlayer-notecolumn}{% + column `\reserved@b' undefined.\MessageBreak + You should declare the column before the usage.\MessageBreak + Notes will be lost% }% - \@tempswatrue - \else - \global\let\slnc@unprocessed\reserved@b - \expandafter\slnc@iiofv\expandafter\reserved@b\reserved@a - \@empty\@empty\@empty\@empty\@empty - \@ifundefined{slnc@\reserved@b @unprocessed}{% - \PackageWarning{scrlayer-notecolumn}{% - column `\reserved@b' undefined.\MessageBreak - You should declare the column before the usage.\MessageBreak - Notes will be lost% - }% - }{% - \expandafter\g@addto@macro - \csname slnc@\reserved@b @unprocessed\expandafter\endcsname - \expandafter{% - \reserved@a - }% + }{% + \expandafter\g@addto@macro + \csname slnc@\reserved@b @unprocessed\expandafter\endcsname + \expandafter{% + \reserved@a }% - \ifnum \number #1<\slnc@unprocessed\relax - \@tempswafalse - \else - \@tempswatrue - \fi + }% + \ifnum \number #1<\slnc@unprocessed\relax + \@tempswafalse + \else + \@tempswatrue \fi - \else - \PackageInfo{scrlayer-notecolumn}{% - Ignoring `\expandafter\detokenize\expandafter{\reserved@a}'}% - \@tempswatrue \fi - \ifeof\slnc@file\@tempswafalse\fi - }% - \fi - }% -} -\scrlayerAddToInterface\slnc@iofv{% - \newcommand\slnc@iofv[6]{\def#1{#2}}% -} -\scrlayerAddToInterface\slnc@iiofiv{% - \newcommand\slnc@iiofv[6]{\def#1{#3}}% -} -\scrlayerAddToInterface\slnc@iiiofiv{% - \newcommand\slnc@iiiofv[6]{\def#1{#4}}% -} -\scrlayerAddToInterface\slnc@unprocessed{% - \newcommand*{\slnc@unprocessed}{0}% -} -\scrlayerAddToInterface\slnc@mdfivesum{% - \let\slnc@mdfivesum\@empty -} -\scrlayerAddToInterface\slnc@file{% - \scr@ifundefinedorrelax{pdfmdfivesum}{% - \scr@ifundefinedorrelax{mdfivesum}{% - \ifdefined\directlua - \directlua{% - function slncmdfivesum(filename) - local fh = io.open(filename,"rb") - if fh then - local sum=md5.sumhexa(fh:read("*a")) - tex.sprint(sum) - fh:close() - end - end - }% - \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}% + \else + \PackageInfo{scrlayer-notecolumn}{% + Ignoring `\expandafter\detokenize\expandafter{\reserved@a}'}% + \@tempswatrue \fi - }{% - \xdef\slnc@mdfivesum{\mdfivesum file {\jobname.slnc}}% + \ifeof\slnc@file\@tempswafalse\fi }% + \fi +}% +\newcommand\slnc@iofv[6]{\def#1{#2}}% +\newcommand\slnc@iiofv[6]{\def#1{#3}}% +\newcommand\slnc@iiiofv[6]{\def#1{#4}}% +\newcommand*{\slnc@unprocessed}{0}% +\newcommand*{\slnc@mdfivesum}{} +\let\slnc@mdfivesum\@empty +\scr@ifundefinedorrelax{pdfmdfivesum}{% + \scr@ifundefinedorrelax{mdfivesum}{% + \ifdefined\directlua + \directlua{% + function slncmdfivesum(filename) + local fh = io.open(filename,"rb") + if fh then + local sum=md5.sumhexa(fh:read("*a")) + tex.sprint(sum) + fh:close() + end + end + }% + \xdef\slnc@mdfivesum{\directlua{slncmdfivesum("\jobname.slnc")}}% + \fi }{% - \xdef\slnc@mdfivesum{\pdfmdfivesum file {\jobname.slnc}}% - }% - \scr@ifundefinedorrelax{slnc@mdfivesum}{}{% - \PackageInfo{scrlayer-notecolumn}{% - MD5 of last `\jobname.slnc':\MessageBreak - \slnc@mdfivesum}% + \xdef\slnc@mdfivesum{\mdfivesum file {\jobname.slnc}}% }% - \newread\slnc@file - \immediate\openin\slnc@file \jobname.slnc - \scrlayerOnAutoRemoveInterface{\immediate\closein\slnc@file}% -} -\scrlayerAddToInterface\c@slnc@clearnote@label{% - \newcounter{slnc@clearnote@label}% -} -\scrlayerAddToInterface\clearnotecolumn{% - \newcommand*\clearnotecolumn[1][marginpar]{% - \begingroup - \slnc@autoclearnotecolumnsfalse - \stepcounter{slnc@clearnote@label}% - \if@filesw - \protected@write\@auxout{% - \let\theslncpage\relax - \let\slnc@voidtest\relax - }{% - \string\newlabel{notecolumn.\theslnc@clearnote@label}% - {{\theslncpage}{\slnc@voidtest{#1}}}% - }% - \fi - \scr@ifundefinedorrelax{r@notecolumn.\theslnc@clearnote@label}{% - \PackageInfo{scrlayer-notecolumn}{% - Using estimated to low value for clearing\MessageBreak - note colum `#1'% - } - \edef\slnc@cmp@value{\the\value{slncpage}}% - \let\reserved@a\z@ +}{% + \xdef\slnc@mdfivesum{\pdfmdfivesum file {\jobname.slnc}}% +}% +\scr@ifundefinedorrelax{slnc@mdfivesum}{}{% + \PackageInfo{scrlayer-notecolumn}{% + MD5 of last `\jobname.slnc':\MessageBreak + \slnc@mdfivesum}% +}% +\newread\slnc@file +\immediate\openin\slnc@file \jobname.slnc +\newcounter{slnc@clearnote@label}% +\newcommand*\clearnotecolumn[1][marginpar]{% + \begingroup + \slnc@autoclearnotecolumnsfalse + \stepcounter{slnc@clearnote@label}% + \if@filesw + \protected@write\@auxout{% + \let\theslncpage\relax + \let\slnc@voidtest\relax }{% - \edef\reserved@a{% - \@nameuse{r@notecolumn.\theslnc@clearnote@label}\@empty\@empty - }% - \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}% - \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}% + \string\newlabel{notecolumn.\theslnc@clearnote@label}% + {{\theslncpage}{\slnc@voidtest{#1}}}% }% - \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, - abspage=\the\value{slncpage}, until page=\slnc@cmp@value, - process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}% - \ifvmode\ifdim \pagetotal<\topskip - \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}% + \fi + \scr@ifundefinedorrelax{r@notecolumn.\theslnc@clearnote@label}{% + \PackageInfo{scrlayer-notecolumn}{% + Using estimated to low value for clearing\MessageBreak + note colum `#1'% + } + \edef\slnc@cmp@value{\the\value{slncpage}}% + \let\reserved@a\z@ + }{% + \edef\reserved@a{% + \@nameuse{r@notecolumn.\theslnc@clearnote@label}\@empty\@empty + }% + \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}% + \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}% + }% + \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, + abspage=\the\value{slncpage}, until page=\slnc@cmp@value, + process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}% + \ifvmode\ifdim \pagetotal<\topskip + \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}% \typeout{TRACE (slnc): until page=\slnc@cmp@value}% - \fi\fi - \ifnum \reserved@a=\z@ - \ifvmode - \ifdim \pagetotal<\topskip - \else - \slnc@readnotes{\slnc@cmp@value}% - \fi + \fi\fi + \ifnum \reserved@a=\z@ + \ifvmode + \ifdim \pagetotal<\topskip \else \slnc@readnotes{\slnc@cmp@value}% \fi + \else + \slnc@readnotes{\slnc@cmp@value}% + \fi + \begingroup + \aftergroup\@tempswafalse + \long\def\slnc@note##1##2##3##4{% + \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi + }% + \let\slnc@sync\slnc@note + \csname slnc@#1@unprocessed\endcsname + \endgroup + \else + \PackageInfo{scrlayer-notecolumn}{% + box of note column `#1'\MessageBreak + not empty after page of \string\clearnotecolumn}% + \@tempswatrue + \fi + \if@tempswa + \IfLayerPageStyleExists{\currentpagestyle}{}{% + \PackageWarning{scrlayer-notecolumn}{% + \string\clearnotecolumn\space while active non-layer page + style.\MessageBreak + Activate empty page style until note column\MessageBreak + has been cleared% + }% + \pagestyle{empty}% + }% + \@tempswatrue + \fi + \@whilesw\if@tempswa\fi{% + \typeout{TRACE (slnc): add \string\clearpage}% + \clearpage + \expandafter\ifcase \slnc@voidtest{#1}% \begingroup \aftergroup\@tempswafalse \long\def\slnc@note##1##2##3##4{% @@ -1090,119 +1018,115 @@ \csname slnc@#1@unprocessed\endcsname \endgroup \else - \PackageInfo{scrlayer-notecolumn}{% - box of note column `#1'\MessageBreak - not empty after page of \string\clearnotecolumn}% \@tempswatrue \fi \if@tempswa - \IfLayerPageStyleExists{\currentpagestyle}{}{% - \PackageWarning{scrlayer-notecolumn}{% - \string\clearnotecolumn\space while active non-layer page - style.\MessageBreak - Activate empty page style until note column\MessageBreak - has been cleared% - }% - \pagestyle{empty}% - }% - \@tempswatrue + \null \fi - \@whilesw\if@tempswa\fi{% - \typeout{TRACE (slnc): add \string\clearpage}% - \clearpage - \expandafter\ifcase \slnc@voidtest{#1}% - \begingroup - \aftergroup\@tempswafalse - \long\def\slnc@note##1##2##3##4{% - \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi - }% - \let\slnc@sync\slnc@note - \csname slnc@#1@unprocessed\endcsname - \endgroup - \else - \@tempswatrue - \fi - \if@tempswa - \null - \fi - }% - \endgroup - }% -} -\scrlayerAddToInterface{\slnc@firstof}{% - \def\slnc@firstof#1#2\@nil{#1}% -} -\scrlayerAddToInterface{slnc@secondof}{% - \def\slnc@secondof#1#2#3\@nil{#2}% + }% + \endgroup } -\scrlayerAddToInterface\slnc@voidtest{% - \newcommand*{\slnc@voidtest}[1]{% - \expandafter\ifvoid \csname slnc@#1@box\endcsname \z@\else \@ne\fi - }% +\newcommand*{\slnc@firstof}{} +\def\slnc@firstof#1#2\@nil{#1}% +\newcommand*{\slnc@secondof}{} +\def\slnc@secondof#1#2#3\@nil{#2}% +\newcommand*{\slnc@voidtest}[1]{% + \expandafter\ifvoid \csname slnc@#1@box\endcsname \z@\else \@ne\fi } -\scrlayerAddToInterface\clearnotecolumns{% - \newcommand*\clearnotecolumns[1][\relax]{% - \begingroup - \slnc@autoclearnotecolumnsfalse - \ifx\relax#1\relax\else - \let\slnc@processnotecolumns\@empty - \edef\reserved@a{#1}% - \@for\reserved@a:=\reserved@a\do {% - \scr@trim@spaces\reserved@a - \ifx\reserved@a\@empty\else - \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns - \expandafter{\expandafter\@elt\expandafter{\reserved@a}}% - \fi +\newcommand*\clearnotecolumns[1][\relax]{% + \begingroup + \slnc@autoclearnotecolumnsfalse + \ifx\relax#1\relax\else + \let\slnc@processnotecolumns\@empty + \edef\reserved@a{#1}% + \@for\reserved@a:=\reserved@a\do {% + \scr@trim@spaces\reserved@a + \ifx\reserved@a\@empty\else + \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns + \expandafter{\expandafter\@elt\expandafter{\reserved@a}}% + \fi + }% + \fi + \stepcounter{slnc@clearnote@label}% + \if@filesw + \begingroup + \def\@elt##1{+\slnc@voidtest{##1}}% + \protected@write\@auxout{% + \let\theslncpage\relax + \let\slnc@voidtest\relax + }{% + \string\newlabel{notecolumn.\theslnc@clearnote@label}% + {{\theslncpage}{\numexpr \slnc@processnotecolumns\relax}}% }% - \fi - \stepcounter{slnc@clearnote@label}% - \if@filesw - \begingroup - \def\@elt##1{+\slnc@voidtest{##1}}% - \protected@write\@auxout{% - \let\theslncpage\relax - \let\slnc@voidtest\relax - }{% - \string\newlabel{notecolumn.\theslnc@clearnote@label}% - {{\theslncpage}{\numexpr \slnc@processnotecolumns\relax}}% - }% - \endgroup - \fi - \scr@ifundefinedorrelax{r@notecolumn.\theslnc@clearnote@label}{% - \begingroup - \def\@elt##1{, `##1'}% - \PackageInfo{scrlayer-notecolumn}{% - Using estimated to low value for\MessageBreak - clearing note colums\MessageBreak - \expandafter\@gobble\slnc@processnotecolumns - }% - \endgroup - \edef\slnc@cmp@value{\the\value{slncpage}}% - \let\reserved@a\z@ - }{% - \edef\reserved@a{% - \@nameuse{r@notecolumn.\theslnc@clearnote@label}\@empty\@empty + \endgroup + \fi + \scr@ifundefinedorrelax{r@notecolumn.\theslnc@clearnote@label}{% + \begingroup + \def\@elt##1{, `##1'}% + \PackageInfo{scrlayer-notecolumn}{% + Using estimated to low value for\MessageBreak + clearing note colums\MessageBreak + \expandafter\@gobble\slnc@processnotecolumns }% - \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}% - \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}% + \endgroup + \edef\slnc@cmp@value{\the\value{slncpage}}% + \let\reserved@a\z@ + }{% + \edef\reserved@a{% + \@nameuse{r@notecolumn.\theslnc@clearnote@label}\@empty\@empty }% - \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, - abspage=\theslncpage, until page=\slnc@cmp@value, - process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}% - \ifvmode\ifdim \pagetotal<\topskip - \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}% + \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}% + \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}% + }% + \typeout{TRACE (slnc): clearnote=\@nameuse{theslnc@clearnote@label}, + abspage=\theslncpage, until page=\slnc@cmp@value, + process=\reserved@a, pagetotal=\the\pagetotal, topskip=\the\topskip}% + \ifvmode\ifdim \pagetotal<\topskip + \edef\slnc@cmp@value{\the\numexpr\slnc@cmp@value-1}% \typeout{TRACE (slnc): until page=\slnc@cmp@value}% - \fi\fi - \ifnum \reserved@a=\z@ - \ifvmode - \ifdim \pagetotal<\topskip - \else - \slnc@readnotes{\slnc@cmp@value}% - \fi + \fi\fi + \ifnum \reserved@a=\z@ + \ifvmode + \ifdim \pagetotal<\topskip \else \slnc@readnotes{\slnc@cmp@value}% \fi - \begingroup + \else + \slnc@readnotes{\slnc@cmp@value}% + \fi + \begingroup + \aftergroup\@tempswafalse + \long\def\slnc@note##1##2##3##4{% + \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi + }% + \let\slnc@sync\slnc@note + \def\@elt##1{\csname slnc@##1@unprocessed\endcsname}% + \slnc@processnotecolumns + \endgroup + \else + \PackageInfo{scrlayer-notecolumn}{% + box of at least one note column\MessageBreak + not empty after page of \string\clearnotecolumns}% + \@tempswatrue + \fi + \if@tempswa + \IfLayerPageStyleExists{\currentpagestyle}{}{% + \PackageWarning{scrlayer-notecolumn}{% + \string\clearnotecolumns\space while active non-layer page + style.\MessageBreak + Activate empty page style until note column\MessageBreak + has been cleared% + }% + \pagestyle{empty}% + }% + \@tempswatrue + \fi + \@whilesw\if@tempswa\fi{% + \typeout{TRACE (slnc): add \string\clearpage}% + \clearpage + \begingroup + \def\@elt##1{+\slnc@voidtest{##1}}% + \ifcase \numexpr \slnc@processnotecolumns\relax \aftergroup\@tempswafalse \long\def\slnc@note##1##2##3##4{% \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi @@ -1210,210 +1134,169 @@ \let\slnc@sync\slnc@note \def\@elt##1{\csname slnc@##1@unprocessed\endcsname}% \slnc@processnotecolumns - \endgroup - \else - \PackageInfo{scrlayer-notecolumn}{% - box of at least one note column\MessageBreak - not empty after page of \string\clearnotecolumns}% - \@tempswatrue - \fi + \else + \aftergroup\@tempswatrue + \fi + \endgroup \if@tempswa - \IfLayerPageStyleExists{\currentpagestyle}{}{% - \PackageWarning{scrlayer-notecolumn}{% - \string\clearnotecolumns\space while active non-layer page - style.\MessageBreak - Activate empty page style until note column\MessageBreak - has been cleared% - }% - \pagestyle{empty}% - }% - \@tempswatrue + \null \fi - \@whilesw\if@tempswa\fi{% - \typeout{TRACE (slnc): add \string\clearpage}% - \clearpage - \begingroup - \def\@elt##1{+\slnc@voidtest{##1}}% - \ifcase \numexpr \slnc@processnotecolumns\relax - \aftergroup\@tempswafalse - \long\def\slnc@note##1##2##3##4{% - \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi - }% - \let\slnc@sync\slnc@note - \def\@elt##1{\csname slnc@##1@unprocessed\endcsname}% - \slnc@processnotecolumns - \else - \aftergroup\@tempswatrue - \fi - \endgroup - \if@tempswa - \null - \fi - }% - \endgroup - }% -} -\scrlayerAddToInterface{\c@slnc@syncpoint}{% - \newcounter{slnc@syncpoint}% + }% + \endgroup } -\scrlayerAddToInterface{\syncwithnotecolumn}{% - \newcommand*{\syncwithnotecolumn}[1][marginpar]{% - \begingroup - \edef\reserved@a{\endgroup\noexpand\syncwithnotecolumns[{#1}]}% - \reserved@a - }% +\newcounter{slnc@syncpoint}% +\newcommand*{\syncwithnotecolumn}[1][marginpar]{% + \begingroup + \edef\reserved@a{\endgroup\noexpand\syncwithnotecolumns[{#1}]}% + \reserved@a } -\scrlayerAddToInterface{\syncwithnotecolumns}{% - \newcommand*{\syncwithnotecolumns}[1][\relax]{% - \begingroup - \ifx\relax#1\relax\else - \let\slnc@processnotecolumns\@empty - \edef\reserved@a{#1}% - \@for\reserved@a:=\reserved@a\do {% - \scr@trim@spaces\reserved@a - \ifx\reserved@a\@empty\else - \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns - \expandafter{\expandafter\@elt\expandafter{\reserved@a}}% - \fi - }% - \fi - \stepcounter{slnc@syncpoint}% - \def\@elt##1{% - \addtocontents{slnc}{% - \string\slnc@sync{##1}% - {\noexpand\number\value{slncpage}}% - {\theslnc@syncpoint}% - {}% - }% +\newcommand*{\syncwithnotecolumns}[1][\relax]{% + \begingroup + \ifx\relax#1\relax\else + \let\slnc@processnotecolumns\@empty + \edef\reserved@a{#1}% + \@for\reserved@a:=\reserved@a\do {% + \scr@trim@spaces\reserved@a + \ifx\reserved@a\@empty\else + \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns + \expandafter{\expandafter\@elt\expandafter{\reserved@a}}% + \fi }% - \slnc@processnotecolumns - \ifvmode - \let\slnc@voffset\@empty% - \expandafter\@firstofone - \else - \PackageWarning{scrlayer-notecolumn}{% - \string\syncwithnotecolumn\space in hmode.\MessageBreak - Using \string\syncwithnotecolumn\space in horizontal\MessageBreak - mode may result in unwanted vertical\MessageBreak - space inside paragraphs and may lost\MessageBreak - colours of text of notes. \space So perhaps you\MessageBreak - should move \string\syncwithnotecolumn\space before\MessageBreak - or after the paragraph% + \fi + \stepcounter{slnc@syncpoint}% + \def\@elt##1{% + \addtocontents{slnc}{% + \string\slnc@sync{##1}% + {\noexpand\number\value{slncpage}}% + {\theslnc@syncpoint}% + {}% + }% + }% + \slnc@processnotecolumns + \ifvmode + \let\slnc@voffset\@empty% + \expandafter\@firstofone + \else + \PackageWarning{scrlayer-notecolumn}{% + \string\syncwithnotecolumn\space in hmode.\MessageBreak + Using \string\syncwithnotecolumn\space in horizontal\MessageBreak + mode may result in unwanted vertical\MessageBreak + space inside paragraphs and may lost\MessageBreak + colours of text of notes. \space So perhaps you\MessageBreak + should move \string\syncwithnotecolumn\space before\MessageBreak + or after the paragraph% + }% + \let\slnc@voffset\@empty%\def\slnc@voffset{-\number\baselineskip}% + \expandafter\slnc@vadjust + \fi + {% + \if@filesw + \scr@savepos + \protected@write\@auxout{}{% + \string\newlabel{notecolumn.\theslnc@syncpoint.synctext.label}{% + {% + \noexpand\number + \numexpr \scr@lastypos\slnc@voffset\relax + }{\thepage}% + }% }% - \let\slnc@voffset\@empty%\def\slnc@voffset{-\number\baselineskip}% - \expandafter\slnc@vadjust \fi - {% - \if@filesw - \scr@savepos - \protected@write\@auxout{}{% - \string\newlabel{notecolumn.\theslnc@syncpoint.synctext.label}{% - {% - \noexpand\number - \numexpr \scr@lastypos\slnc@voffset\relax - }{\thepage}% + \@ifundefined{r@notecolumn.\theslnc@syncpoint.synctext.label}{% + \PackageInfo{scrlayer-notecolumn}{% + No text label for \string\syncwithnotecolumn.\MessageBreak + Need rerun to sync position}% + }{% + \edef\reserved@a{% + \@nameuse{r@notecolumn.\theslnc@syncpoint.synctext.label}% + \@empty\@empty + }% + \edef\slnc@textpos{\expandafter\slnc@firstof\reserved@a\@nil}% + \edef\slnc@textpage{\expandafter\slnc@secondof\reserved@a\@nil}% + \let\slnc@notepos\slnc@textpos + \let\slnc@notepage\slnc@textpage + \def\@elt##1{% + \@ifundefined{r@notecolumn.##1.\theslnc@syncpoint.syncnote.label}{% + \PackageInfo{scrlayer-notecolumn}{% + No note label for sync with note column\MessageBreak + `##1'.\MessageBreak + Need rerun to sync position}% + \G@refundefinedtrue + }{% + \edef\reserved@a{% + \@nameuse{r@notecolumn.##1.\theslnc@syncpoint.syncnote.label}% + \@empty\@empty }% + \edef\reserved@b{\expandafter\slnc@firstof\reserved@a\@nil}% + \edef\reserved@c{\expandafter\slnc@secondof\reserved@a\@nil}% + \ifnum \slnc@notepage<\reserved@c\relax + \let\slnc@notepos=\reserved@b + \let\slnc@notepage=\reserved@c + \else + \ifnum \slnc@notepage=\reserved@c\relax + \ifnum \slnc@notepos>\reserved@b + \let\slnc@notepos=\reserved@b + \let\slnc@notepage=\reserved@c + \fi + \fi + \fi }% - \fi - \@ifundefined{r@notecolumn.\theslnc@syncpoint.synctext.label}{% + }% + \slnc@processnotecolumns + \ifnum\slnc@textpage>\slnc@notepage\relax \PackageInfo{scrlayer-notecolumn}{% - No text label for \string\syncwithnotecolumn.\MessageBreak + Last note page before last text page.\MessageBreak Need rerun to sync position}% - }{% - \edef\reserved@a{% - \@nameuse{r@notecolumn.\theslnc@syncpoint.synctext.label}% - \@empty\@empty - }% - \edef\slnc@textpos{\expandafter\slnc@firstof\reserved@a\@nil}% - \edef\slnc@textpage{\expandafter\slnc@secondof\reserved@a\@nil}% - \let\slnc@notepos\slnc@textpos - \let\slnc@notepage\slnc@textpage - \def\@elt##1{% - \@ifundefined{r@notecolumn.##1.\theslnc@syncpoint.syncnote.label}{% - \PackageInfo{scrlayer-notecolumn}{% - No note label for sync with note column\MessageBreak - `##1'.\MessageBreak - Need rerun to sync position}% - \G@refundefinedtrue - }{% - \edef\reserved@a{% - \@nameuse{r@notecolumn.##1.\theslnc@syncpoint.syncnote.label}% - \@empty\@empty + \else + \ifnum\slnc@textpage<\slnc@notepage\relax + \@whilenum \slnc@textpage<\slnc@notepage\do {% + \newpage\null\vskip-\dimexpr \baselineskip+\parskip\relax + \edef\slnc@textpage{\the\numexpr\slnc@textpage+1\relax}% + }% + \scr@ifundefinedorrelax{pdfpageheight}{% + \scr@ifundefinedorrelax{pageheight}{% + \@tempdima=\paperheight + }{% + \@tempdima=\pageheight }% - \edef\reserved@b{\expandafter\slnc@firstof\reserved@a\@nil}% - \edef\reserved@c{\expandafter\slnc@secondof\reserved@a\@nil}% - \ifnum \slnc@notepage<\reserved@c\relax - \let\slnc@notepos=\reserved@b - \let\slnc@notepage=\reserved@c - \else - \ifnum \slnc@notepage=\reserved@c\relax - \ifnum \slnc@notepos>\reserved@b - \let\slnc@notepos=\reserved@b - \let\slnc@notepage=\reserved@c - \fi - \fi - \fi + }{% + \@tempdima=\pdfpageheight }% - }% - \slnc@processnotecolumns - \ifnum\slnc@textpage>\slnc@notepage\relax + \@tempdima=\dimexpr \@tempdima + -\topmargin-1in + -\headheight-\headsep + -\topskip+\baselineskip + \relax + \edef\slnc@textpos{\number\@tempdima}% \PackageInfo{scrlayer-notecolumn}{% - Last note page before last text page.\MessageBreak - Need rerun to sync position}% + Top position is \slnc@textpos% + }% + \fi + \ifnum\slnc@notepos>\slnc@textpos\relax + \PackageInfo{scrlayer-notecolumn}{% + Last note position before last text\MessageBreak + position.\MessageBreak + Need rerun to sync position% + }% \else - \ifnum\slnc@textpage<\slnc@notepage\relax - \@whilenum \slnc@textpage<\slnc@notepage\do {% - \newpage\null\vskip-\dimexpr \baselineskip+\parskip\relax - \edef\slnc@textpage{\the\numexpr\slnc@textpage+1\relax}% - }% - \scr@ifundefinedorrelax{pdfpageheight}{% - \scr@ifundefinedorrelax{pageheight}{% - \@tempdima=\paperheight - }{% - \@tempdima=\pageheight - }% - }{% - \@tempdima=\pdfpageheight - }% - \@tempdima=\dimexpr \@tempdima - -\topmargin-1in - -\headheight-\headsep - -\topskip+\baselineskip - \relax - \edef\slnc@textpos{\number\@tempdima}% + \ifnum\slnc@notepos<\slnc@textpos\relax + \@tempdima=\numexpr \slnc@textpos-\slnc@notepos\relax sp \PackageInfo{scrlayer-notecolumn}{% - Top position is \slnc@textpos% + skipping \the\@tempdima\space to sync% }% - \fi - \ifnum\slnc@notepos>\slnc@textpos\relax - \PackageInfo{scrlayer-notecolumn}{% - Last note position before last text\MessageBreak - position.\MessageBreak - Need rerun to sync position% - }% - \else - \ifnum\slnc@notepos<\slnc@textpos\relax - \@tempdima=\numexpr \slnc@textpos-\slnc@notepos\relax sp - \PackageInfo{scrlayer-notecolumn}{% - skipping \the\@tempdima\space to sync% - }% - \vskip\@tempdima - \fi + \vskip\@tempdima \fi \fi - }% + \fi }% - \endgroup - }% + }% + \endgroup } -\scrlayerAddToInterface\slnc@vadjust{% - \newcommand{\slnc@vadjust}[1]{% - \@bsphack - \vadjust{#1}% - \@esphack - }% +\newcommand{\slnc@vadjust}[1]{% + \@bsphack + \vadjust{#1}% + \@esphack } -%%% From File: $Id: scrlayer-notecolumn.dtx 3426 2019-12-02 09:15:20Z kohm $ +%%% From File: $Id: scrlayer-notecolumn.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: final) \DeclareNoteColumn{marginpar} \let\reserved@a\clearpage @@ -1421,7 +1304,7 @@ \ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi }% \expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} 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 f6c156c4bb8..31d7a7c1862 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -45,14 +45,14 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -63,8 +63,7 @@ \fi } \let\scrlayer@AtEndOfPackage\AtEndOfPackage -\scrlayerInitInterface -%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ %%% (run: init) \AtEndOfPackage{% \sls@auto@pagestyleset% @@ -81,7 +80,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% @@ -222,11 +221,12 @@ \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}% } \KOMA@key{autoremoveinterfaces}[true]{% + \scrlayer@report@deprecated{#1}{autoremoveinterface}% \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}% \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ %%% (run: options) \KOMA@key{headwidth}{% \begingroup @@ -242,8 +242,6 @@ }% \reserved@a } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth@default} \KOMA@key{footwidth}{% \begingroup \sls@split@at@iicolons#1:::\@nil @@ -258,148 +256,137 @@ }% \reserved@a } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth} -\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}{::}{}{% - \PackageWarning{scrlayer}{extra `:' found!\MessageBreak - You've used more than two colons at the argument\MessageBreak - of a two value option.\MessageBreak - The extra value(s) will be ignored% - }% +\newcommand\sls@split@at@iicolons{} +\def\sls@split@at@iicolons#1:#2:#3:#4\@nil{% + \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 + The extra value(s) will be ignored% }% }% }% - \def\reserved@a{#1}% - \def\reserved@b{#2}% - \def\reserved@c{#3}% }% -} -\scrlayerAddToInterface\sls@set@hf@width{% - \newcommand*{\sls@set@hf@width}[4]{% - \sls@settowidthof{\@tempdima}{#4}% - \ifdim\@tempdima>\paperwidth - \PackageWarning - {scrlayer-scrpage}% - {You've set width of #1 to a value\MessageBreak - greater than width of page!\MessageBreak% - I'll reduce width of #1 to width of page}% - \setlength{\@tempdima}{\paperwidth}% + \def\reserved@a{#1}% + \def\reserved@b{#2}% + \def\reserved@c{#3}% +}% +\newcommand*{\sls@set@hf@width}[4]{% + \sls@settowidthof{\@tempdima}{#4}% + \ifdim\@tempdima>\paperwidth + \PackageWarning + {scrlayer-scrpage}% + {You've set width of #1 to a value\MessageBreak + greater than width of page!\MessageBreak% + I'll reduce width of #1 to width of page}% + \setlength{\@tempdima}{\paperwidth}% + \else + \ifdim\@tempdima<\z@ + \PackageWarning + {scrlayer-scrpage}% + {You've set width of #1 to negative value!\MessageBreak% + I'll set it to 0pt}% + \setlength{\@tempdima}{\z@}% + \fi + \fi + \expandafter\edef\csname sls@#1width\endcsname{\the\@tempdima}% + \setlength{\@tempdima}{\textwidth}% + \addtolength{\@tempdima}{-\csname sls@#1width\endcsname}% + \Ifstr{#2}{}{% + \ifdim \csname sls@#1width\endcsname + = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax + \setlength{\@tempdimb}{\z@} \else - \ifdim\@tempdima<\z@ - \PackageWarning - {scrlayer-scrpage}% - {You've set width of #1 to negative value!\MessageBreak% - I'll set it to 0pt}% - \setlength{\@tempdima}{\z@}% - \fi - \fi - \expandafter\edef\csname sls@#1width\endcsname{\the\@tempdima}% - \setlength{\@tempdima}{\textwidth}% - \addtolength{\@tempdima}{-\csname sls@#1width\endcsname}% - \Ifstr{#2}{}{% - \ifdim \csname sls@#1width\endcsname - = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax - \setlength{\@tempdimb}{\z@} + \if@twoside + \setlength{\@tempdimb}{.3333333333\@tempdima}% \else - \if@twoside - \setlength{\@tempdimb}{.3333333333\@tempdima}% - \else - \setlength{\@tempdimb}{.5\@tempdima}% - \fi + \setlength{\@tempdimb}{.5\@tempdima}% \fi - }{% - \sls@settowidthof{\@tempdimb}{#2}% - }% - \Ifstr{#3}{}{% - \addtolength{\@tempdima}{-\@tempdimb}% - }{% - \sls@settowidthof{\@tempdima}{#3}% - \setlength{\@tempdima}{-\@tempdima}% - }% - \ifdim\@tempdimb<\z@ - \setlength{\@tempdimb}{-\@tempdimb}% - \expandafter\edef\csname sls@odd#1shift\endcsname{-\the\@tempdimb}% - \else - \expandafter\edef\csname sls@odd#1shift\endcsname{\the\@tempdimb}% - \fi - \ifdim\@tempdima<\z@ - \setlength{\@tempdima}{-\@tempdima}% - \expandafter\edef\csname sls@even#1shift\endcsname{-\the\@tempdima}% - \else - \expandafter\edef\csname sls@even#1shift\endcsname{\the\@tempdima}% \fi - }% -} -\scrlayerAddToInterface\sls@headwidth{% - \scr@ifundefinedorrelax{@headwidth}{% - \newcommand*{\sls@headwidth}{\textwidth}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}% }{% - \newcommand*{\sls@headwidth}{\@headwidth}% - \KOMA@kav@xadd{.scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}% + \sls@settowidthof{\@tempdimb}{#2}% }% -} -\scrlayerAddToInterface\sls@oddheadshift{\newcommand*{\sls@oddheadshift}{0pt}} -\scrlayerAddToInterface\sls@evenheadshift{\newcommand*{\sls@evenheadshift}{0pt}} -\scrlayerAddToInterface\sls@footwidth{% - \scr@ifundefinedorrelax{@footwidth}{% - \newcommand*{\sls@footwidth}{\textwidth}% - \KOMA@kav@add{.scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt} + \Ifstr{#3}{}{% + \addtolength{\@tempdima}{-\@tempdimb}% }{% - \newcommand*{\sls@footwidth}{\@footwidth}% - \KOMA@kav@xadd{.scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt} + \sls@settowidthof{\@tempdima}{#3}% + \setlength{\@tempdima}{-\@tempdima}% }% -} -\scrlayerAddToInterface\sls@oddfootshift{\newcommand*{\sls@oddfootshift}{0pt}} -\scrlayerAddToInterface\sls@evenfootshift{\newcommand*{\sls@evenfootshift}{0pt}} -\scrlayerAddToInterface\sls@settotwidthof{% - \newcommand*{\sls@settowidthof}[2]{% - \Ifstr{#2}{paper}{% - \setlength{#1}{\paperwidth}% + \ifdim\@tempdimb<\z@ + \setlength{\@tempdimb}{-\@tempdimb}% + \expandafter\edef\csname sls@odd#1shift\endcsname{-\the\@tempdimb}% + \else + \expandafter\edef\csname sls@odd#1shift\endcsname{\the\@tempdimb}% + \fi + \ifdim\@tempdima<\z@ + \setlength{\@tempdima}{-\@tempdima}% + \expandafter\edef\csname sls@even#1shift\endcsname{-\the\@tempdima}% + \else + \expandafter\edef\csname sls@even#1shift\endcsname{\the\@tempdima}% + \fi +}% +\scr@ifundefinedorrelax{@headwidth}{% + \newcommand*{\sls@headwidth}{\textwidth}% + \KOMA@kav@add{.scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}% +}{% + \newcommand*{\sls@headwidth}{\@headwidth}% + \KOMA@kav@xadd{.scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}% +}% +\newcommand*{\sls@oddheadshift}{0pt} +\newcommand*{\sls@evenheadshift}{0pt} +\scr@ifundefinedorrelax{@footwidth}{% + \newcommand*{\sls@footwidth}{\textwidth}% + \KOMA@kav@add{.scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt} +}{% + \newcommand*{\sls@footwidth}{\@footwidth}% + \KOMA@kav@xadd{.scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt} +}% +\newcommand*{\sls@oddfootshift}{0pt} +\newcommand*{\sls@evenfootshift}{0pt} +\newcommand*{\sls@settowidthof}[2]{% + \Ifstr{#2}{paper}{% + \setlength{#1}{\paperwidth}% + }{% + \Ifstr{#2}{text}{% + \setlength{#1}{\textwidth}% }{% - \Ifstr{#2}{text}{% - \setlength{#1}{\textwidth}% + \Ifstr{#2}{marginpar}{% + \setlength{#1}{\dimexpr \marginparwidth+\marginparsep\relax}% }{% - \Ifstr{#2}{marginpar}{% - \setlength{#1}{\dimexpr \marginparwidth+\marginparsep\relax}% + \Ifstr{#2}{textwithmarginpar}{% + \setlength{#1}{\dimexpr\textwidth + +\marginparwidth + +\marginparsep\relax}% }{% - \Ifstr{#2}{textwithmarginpar}{% - \setlength{#1}{\dimexpr\textwidth - +\marginparwidth - +\marginparsep\relax}% + \Ifstr{#2}{head}{% + \setlength{#1}{\sls@headwidth}% }{% - \Ifstr{#2}{head}{% - \setlength{#1}{\sls@headwidth}% + \Ifstr{#2}{foot}{% + \setlength{#1}{\sls@footwidth}% }{% - \Ifstr{#2}{foot}{% - \setlength{#1}{\sls@footwidth}% + \Ifstr{#2}{headtopline}{% + \setlength{#1}{\sls@headabove@linelength}% }{% - \Ifstr{#2}{headtopline}{% - \setlength{#1}{\sls@headabove@linelength}% + \Ifstr{#2}{headsepline}{% + \setlength{#1}{\sls@headbelow@linelength}% }{% - \Ifstr{#2}{headsepline}{% - \setlength{#1}{\sls@headbelow@linelength}% + \Ifstr{#2}{footsepline}{% + \setlength{#1}{\sls@footabove@linelength}% }{% - \Ifstr{#2}{footsepline}{% - \setlength{#1}{\sls@footabove@linelength}% + \Ifstr{#2}{footbotline}{% + \setlength{#1}{\sls@footbelow@linelength}% }{% - \Ifstr{#2}{footbotline}{% - \setlength{#1}{\sls@footbelow@linelength}% + \Ifstr{#2}{page}{% + \setlength{#1}{\paperwidth}% + \begingroup + \expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ta@bcor\endcsname\relax\else + \addtolength{#1}{-\ta@bcor}% + \fi }{% - \Ifstr{#2}{page}{% - \setlength{#1}{\paperwidth}% - \begingroup - \expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname ta@bcor\endcsname\relax\else - \addtolength{#1}{-\ta@bcor}% - \fi - }{% - \setlength{#1}{\dimexpr #2\relax}% - }% + \setlength{#1}{\dimexpr #2\relax}% }% }% }% @@ -411,186 +398,131 @@ }% }% }% -} -\scrlayerAddToInterface\sls@deftowidthof{% - \newcommand*{\sls@deftowidthof}[2]{% - \Ifstr{#2}{autohead}{% - \expandafter\def\csname #1\endcsname{\sls@headwidth}% +}% +\newcommand*{\sls@deftowidthof}[2]{% + \Ifstr{#2}{autohead}{% + \expandafter\def\csname #1\endcsname{\sls@headwidth}% + }{% + \Ifstr{#2}{autofoot}{% + \expandafter\def\csname #1\endcsname{\sls@footwidth}% }{% - \Ifstr{#2}{autofoot}{% - \expandafter\def\csname #1\endcsname{\sls@footwidth}% - }{% - \sls@settowidthof{\@tempdima}{#2}% - \expandafter\edef\csname #1\endcsname{\the\@tempdima}% - }% + \sls@settowidthof{\@tempdima}{#2}% + \expandafter\edef\csname #1\endcsname{\the\@tempdima}% }% }% -} +}% \KOMA@key{headtopline}[:]{% \sls@set@values[headtopline]{head}{above}{#1}% } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headtopline} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headtopline@default} \KOMA@key{headsepline}[:]{% \sls@set@values[headsepline]{head}{below}{#1}% } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headsepline} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headsepline@default} \KOMA@key{footsepline}[:]{% \sls@set@values[footsepline]{foot}{above}{#1}% } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footsepline} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footsepline@default} \KOMA@key{footbotline}[:]{% \sls@set@values[footbotline]{foot}{below}{#1}% } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline@default} -\scrlayerAddToInterface\sls@set@values{% - \newcommand*{\sls@set@values}[4][]{% - \begingroup - \Ifstr{#1}{}{% - \FamilyKeyStateUnknown - }{% - \KOMA@set@ifkey{#1}{@tempswa}{#4}% - }% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \if@tempswa - \edef\reserved@b{% - \noexpand\endgroup - \noexpand\@namedef{sls@#2#3@linethickness}{.4pt}% - \noexpand\@namedef{sls@#2#3@linelength}{% - \expandafter\noexpand\csname sls@#2width\endcsname - }% - }% - \else - \def\reserved@b{% - \endgroup - \@namedef{sls@#2#3@linethickness}{0pt}% - \@namedef{sls@#2#3@linelength}{0pt}% +\newcommand*{\sls@set@values}[4][]{% + \begingroup + \Ifstr{#1}{}{% + \FamilyKeyStateUnknown + }{% + \KOMA@set@ifkey{#1}{@tempswa}{#4}% + }% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \if@tempswa + \edef\reserved@b{% + \noexpand\endgroup + \noexpand\@namedef{sls@#2#3@linethickness}{.4pt}% + \noexpand\@namedef{sls@#2#3@linelength}{% + \expandafter\noexpand\csname sls@#2width\endcsname }% - \fi + }% \else - \let\reserved@a\@empty - \let\reserved@b\@empty - \sls@split@at@colon#4::\@nil - \ifx\reserved@a\@empty - \def\reserved@a{\endgroup\@namedef{sls@#2#3@linethickness}{.4pt}}% - \else - \setlength{\@tempdima}{\dimexpr\reserved@a\relax}% - \edef\reserved@a{% - \noexpand\endgroup - \noexpand\@namedef{sls@#2#3@linethickness}{\the\@tempdima}% - }% - \fi - \ifx\reserved@b\@empty - \def\reserved@b{% - \reserved@a - \@namedef{sls@#2#3@linelength}{\@nameuse{sls@#2width}}% - }% - \else - \edef\reserved@b{% - \noexpand\reserved@a - \noexpand\sls@deftowidthof{sls@#2#3@linelength}{\reserved@b}% - }% - \fi + \def\reserved@b{% + \endgroup + \@namedef{sls@#2#3@linethickness}{0pt}% + \@namedef{sls@#2#3@linelength}{0pt}% + }% \fi - \reserved@b - \FamilyKeyStateProcessed - \Ifstr{#1}{}{}{% - \KOMA@kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{% - \csname sls@#2#3@linethickness\endcsname - :\csname sls@#2#3@linelength\endcsname - }% + \else + \let\reserved@a\@empty + \let\reserved@b\@empty + \sls@split@at@colon#4::\@nil + \ifx\reserved@a\@empty + \def\reserved@a{\endgroup\@namedef{sls@#2#3@linethickness}{.4pt}}% + \else + \setlength{\@tempdima}{\dimexpr\reserved@a\relax}% + \edef\reserved@a{% + \noexpand\endgroup + \noexpand\@namedef{sls@#2#3@linethickness}{\the\@tempdima}% + }% + \fi + \ifx\reserved@b\@empty + \def\reserved@b{% + \reserved@a + \@namedef{sls@#2#3@linelength}{\@nameuse{sls@#2width}}% + }% + \else + \edef\reserved@b{% + \noexpand\reserved@a + \noexpand\sls@deftowidthof{sls@#2#3@linelength}{\reserved@b}% + }% + \fi + \fi + \reserved@b + \FamilyKeyStateProcessed + \Ifstr{#1}{}{}{% + \KOMA@kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{% + \csname sls@#2#3@linethickness\endcsname + :\csname sls@#2#3@linelength\endcsname }% }% -} -\scrlayerAddToInterface\sls@split@at@colon{% - \def\sls@split@at@colon#1:#2:#3\@nil{% - \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 - The extra value(s) will be ignored% - }% +}% +\newcommand*{\sls@split@at@colon}{} +\def\sls@split@at@colon#1:#2:#3\@nil{% + \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 + The extra value(s) will be ignored% }% }% - \def\reserved@a{#1}% - \def\reserved@b{#2}% }% -} -\scrlayerAddToInterface\sls@headabove@linelength{% - \newcommand*{\sls@headabove@linelength}{\sls@headwidth}% -} -\scrlayerAddToInterface\sls@headabove{% - \newcommand*{\sls@headabove@linethickness}{0pt}% -} + \def\reserved@a{#1}% + \def\reserved@b{#2}% +}% +\newcommand*{\sls@headabove@linelength}{\sls@headwidth}% +\newcommand*{\sls@headabove@linethickness}{0pt}% \KOMA@kav@xadd{.scrlayer-scrpage.sty}{headtopline}{% \expandafter\noexpand\sls@headabove@linethickness:% - \expandafter\noexpand\sls@headabove@linelength} -\scrlayerAddToInterface\sls@headbelow@linelength{% - \newcommand*{\sls@headbelow@linelength}{\sls@headwidth}% -} -\scrlayerAddToInterface\sls@headbelow@linethickness{% - \newcommand*{\sls@headbelow@linethickness}{0pt}% + \expandafter\noexpand\sls@headabove@linelength } +\newcommand*{\sls@headbelow@linelength}{\sls@headwidth}% +\newcommand*{\sls@headbelow@linethickness}{0pt}% \KOMA@kav@xadd{.scrlayer-scrpage.sty}{headsepline}{% \expandafter\noexpand\sls@headbelow@linethickness:% - \expandafter\noexpand\sls@headbelow@linelength} -\scrlayerAddToInterface\sls@footabove@linelength{% - \newcommand*{\sls@footabove@linelength}{\sls@footwidth}% -} -\scrlayerAddToInterface\sls@footabove@linethickness{% - \newcommand*{\sls@footabove@linethickness}{0pt}% + \expandafter\noexpand\sls@headbelow@linelength } +\newcommand*{\sls@footabove@linelength}{\sls@footwidth}% +\newcommand*{\sls@footabove@linethickness}{0pt}% \KOMA@kav@xadd{.scrlayer-scrpage.sty}{footsepline}{% \expandafter\noexpand\sls@footabove@linethickness:% - \expandafter\noexpand\sls@footabove@linelength} -\scrlayerAddToInterface\sls@footbelow@linelength{% - \newcommand*{\sls@footbelow@linelength}{\sls@footwidth}% -} -\scrlayerAddToInterface\sls@footbelow@linethickness{% - \newcommand*{\sls@footbelow@linethickness}{0pt}% + \expandafter\noexpand\sls@footabove@linelength } +\newcommand*{\sls@footbelow@linelength}{\sls@footwidth}% +\newcommand*{\sls@footbelow@linethickness}{0pt}% \KOMA@kav@xadd{.scrlayer-scrpage.sty}{footbotline}{% \expandafter\noexpand\sls@footbelow@linethickness:% - \expandafter\noexpand\sls@footbelow@linelength} -\scrlayerAddCsToInterface{ifsls@plain@head@above@line}{% - \KOMA@ifkey{plainheadtopline}{sls@plain@head@above@line}% - \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainheadtopline}% - \scrlayer@AddCsToInterface{% - KV@KOMA.scrlayer-scrpage.sty@plainheadtopline@default}% - \scrlayer@AddCsToInterface{sls@plain@head@above@linetrue} - \scrlayer@AddCsToInterface{sls@plain@head@above@linefalse} -} -\scrlayerAddCsToInterface{ifsls@plain@head@sbelow@line}{% - \KOMA@ifkey{plainheadsepline}{sls@plain@head@below@line}% - \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainheadsepline}% - \scrlayer@AddCsToInterface{% - KV@KOMA.scrlayer-scrpage.sty@plainheadsepline@default}% - \scrlayer@AddCsToInterface{sls@plain@head@below@linetrue}% - \scrlayer@AddCsToInterface{sls@plain@head@below@linefalse}% -} -\scrlayerAddCsToInterface{ifsls@plain@foot@above@line}{% - \KOMA@ifkey{plainfootsepline}{sls@plain@foot@above@line}% - \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainfootsepline}% - \scrlayer@AddCsToInterface{% - KV@KOMA.scrlayer-scrpage.sty@plainfootsepline@default}% - \scrlayer@AddCsToInterface{sls@plain@foot@above@linetrue}% - \scrlayer@AddCsToInterface{sls@plain@foot@above@linefalse}% -} -\scrlayerAddCsToInterface{ifsls@plain@foot@below@line}{% - \KOMA@ifkey{plainfootbotline}{sls@plain@foot@below@line}% - \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainfootbotline}% - \scrlayer@AddCsToInterface{% - KV@KOMA.scrlayer-scrpage.sty@plainfootbotline@default}% - \scrlayer@AddCsToInterface{sls@plain@foot@below@linetrue}% - \scrlayer@AddCsToInterface{sls@plain@foot@below@linefalse}% -} -\scrlayerAddToInterface\sls@hfline@adjust{% - \newcommand*{\sls@hfline@adjust}{0}% + \expandafter\noexpand\sls@footbelow@linelength } +\KOMA@ifkey{plainheadtopline}{sls@plain@head@above@line}% +\KOMA@ifkey{plainheadsepline}{sls@plain@head@below@line}% +\KOMA@ifkey{plainfootsepline}{sls@plain@foot@above@line}% +\KOMA@ifkey{plainfootbotline}{sls@plain@foot@below@line}% +\newcommand*{\sls@hfline@adjust}{0}% \KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{} \KOMA@key{ilines}[]{% \ifx\relax#1\relax @@ -604,8 +536,6 @@ \def\FamilyKeyStateProcessed{unexpected value}% \fi } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@ilines} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@ilines@default} \KOMA@key{clines}[]{% \ifx\relax#1\relax \renewcommand*{\sls@hfline@adjust}{1}% @@ -618,8 +548,6 @@ \def\FamilyKeyStateProcessed{unexpected value}% \fi } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@clines} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@clines@default} \KOMA@key{olines}[]{% \ifx\relax#1\relax \renewcommand*{\sls@hfline@adjust}{2}% @@ -632,8 +560,6 @@ \def\FamilyKeyStateProcessed{unexpected value}% \fi } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@olines} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@olines@default} \KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{} \KOMA@key{pagestyleset}{% \scr@ifundefinedorrelax{sls@ps@style@#1}{% @@ -645,59 +571,54 @@ \KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{pagestyleset}{#1}% }% } -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@pagestyleset} -\scrlayerAddToInterface\sls@ps@style@standard{% - \newcommand*{\sls@ps@style@standard}{% - \let\MakeMarkcase\MakeUppercase - \scrlayer@AtEndOfPackage{% - \pagestyle{scrheadings}% - \clearpairofpagestyles - \ihead{\headmark}% - \ohead{\pagemark}% - \cfoot[\if@twoside\else\pagemark\fi]{}% - }% +\newcommand*{\sls@ps@style@standard}{% + \let\MakeMarkcase\MakeUppercase + \scrlayer@AtEndOfPackage{% + \pagestyle{scrheadings}% + \clearpairofpagestyles + \ihead{\headmark}% + \ohead{\pagemark}% + \cfoot[\if@twoside\else\pagemark\fi]{}% }% -} -\scrlayerAddCsToInterface{sls@ps@style@KOMA-Script}{% - \@namedef{sls@ps@style@KOMA-Script}{% - \let\MakeMarkcase\@firstofone - \scrlayer@AtEndOfPackage{% - \pagestyle{scrheadings}% - \clearpairofpagestyles - \ohead{\if@twoside\headmark\fi}% - \chead{\if@twoside\else\headmark\fi}% - \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}{% - \clearpairofpagestyles - \lehead[\ifnum\@pageat=\z@\pagemark\fi] - {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}% - \lohead[\ifnum\@pageat=\z@\pagemark\fi] - {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}% - \chead[\ifnum\@pageat=\@ne\pagemark\fi] - {\ifcase\@pageat \rightmark\or \pagemark\or \rightmark\fi}% - \rehead[\ifnum\@pageat=\tw@\pagemark\fi] - {\ifcase\@pageat \leftmark\or \rightmark\or \pagemark - \else \rightmark\fi}% - \rohead[\ifnum\@pageat=\tw@\pagemark\fi] - {\ifcase\@pageat \leftmark\or \rightmark\or \pagemark - \else \rightmark\fi}% - \lefoot[\ifnum\@pageat=\thr@@\pagemark\fi] - {\ifnum\@pageat=\thr@@\pagemark\fi}% - \lofoot[\ifnum\@pageat=\thr@@\pagemark\fi] - {\ifnum\@pageat=\thr@@\pagemark\fi}% - \cfoot[\ifnum\@pageat=4 \pagemark\fi] - {\ifnum\@pageat=4 \pagemark\fi}% - \refoot[\ifnum\@pageat=5 \pagemark\fi] - {\ifnum\@pageat=5 \pagemark\fi}% - \rofoot[\ifnum\@pageat=5 \pagemark\fi] - {\ifnum\@pageat=5 \pagemark\fi}% - }{}% - }% +}% +\expandafter\newcommand\expandafter*\csname sls@ps@style@KOMA-Script\endcsname{% + \let\MakeMarkcase\@firstofone + \scrlayer@AtEndOfPackage{% + \pagestyle{scrheadings}% + \clearpairofpagestyles + \ohead{\if@twoside\headmark\fi}% + \chead{\if@twoside\else\headmark\fi}% + \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}{% + \clearpairofpagestyles + \lehead[\ifnum\@pageat=\z@\pagemark\fi] + {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}% + \lohead[\ifnum\@pageat=\z@\pagemark\fi] + {\ifnum\@pageat=\z@\pagemark\else\leftmark\fi}% + \chead[\ifnum\@pageat=\@ne\pagemark\fi] + {\ifcase\@pageat \rightmark\or \pagemark\or \rightmark\fi}% + \rehead[\ifnum\@pageat=\tw@\pagemark\fi] + {\ifcase\@pageat \leftmark\or \rightmark\or \pagemark + \else \rightmark\fi}% + \rohead[\ifnum\@pageat=\tw@\pagemark\fi] + {\ifcase\@pageat \leftmark\or \rightmark\or \pagemark + \else \rightmark\fi}% + \lefoot[\ifnum\@pageat=\thr@@\pagemark\fi] + {\ifnum\@pageat=\thr@@\pagemark\fi}% + \lofoot[\ifnum\@pageat=\thr@@\pagemark\fi] + {\ifnum\@pageat=\thr@@\pagemark\fi}% + \cfoot[\ifnum\@pageat=4 \pagemark\fi] + {\ifnum\@pageat=4 \pagemark\fi}% + \refoot[\ifnum\@pageat=5 \pagemark\fi] + {\ifnum\@pageat=5 \pagemark\fi}% + \rofoot[\ifnum\@pageat=5 \pagemark\fi] + {\ifnum\@pageat=5 \pagemark\fi}% + }{}% }% }% -} +}% \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{% pagestyleset=KOMA-Script} \KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{% @@ -708,18 +629,9 @@ markcase=ignoreuppercase% } \KOMA@ifkey{hmode}{sls@leavevmode} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default} -\scrlayer@AddCsToInterface{sls@leavevmode@linetrue} -\scrlayer@AddCsToInterface{sls@leavevmode@linefalse} \KOMA@ifkey{autoenlargeheadfoot}{sls@autoenlarge} \KOMAExecuteOptions{autoenlargeheadfoot=true} -\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot} -\scrlayer@AddCsToInterface{% - KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default} -\scrlayer@AddCsToInterface{sls@autoenlargetrue} -\scrlayer@AddCsToInterface{sls@autoenlargefalse} -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \expandafter\let @@ -791,129 +703,95 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-scrpage.dtx 3390 2019-11-18 17:09:35Z kohm $ +%%% From File: $Id: scrlayer-scrpage.dtx 3531 2020-09-11 12:28:41Z kohm $ %%% (run: body) -\scrlayerAddToInterface\setheadwidth{% - \newcommand*{\setheadwidth}[2][]{% - \KOMAoptions{headwidth=#2:#1}% - }% -} -\scrlayerAddToInterface\setfootwidth{% - \newcommand*{\setfootwidth}[2][]{% - \KOMAoptions{footwidth=#2:#1}% - }% -} -\scrlayerAddToInterface\setheadtopline{% - \newcommand*{\setheadtopline}{\sls@setline{head}{above}}% -} -\scrlayerAddToInterface\setheadsepline{% - \newcommand*{\setheadsepline}{\sls@setline{head}{below}}% -} -\scrlayerAddToInterface\setfootsepline{% - \newcommand*{\setfootsepline}{\sls@setline{foot}{above}}% -} -\scrlayerAddToInterface\setfootbotline{% - \newcommand*{\setfootbotline}{\sls@setline{foot}{below}}% -} -\scrlayerAddToInterface\sls@setline{% - \newcommand*\sls@setline[2]{% - \kernel@ifnextchar[%] - {\sls@@setline{#1}{#2}}{\sls@@@setline{#1#2}}% - }% -} -\scrlayerAddToInterface\sls@@setline{% - \def\sls@@setline#1#2[#3]{% - \Ifstr{#3}{auto}{% - \sls@deftowidthof{sls@#1#2@linelength}{#3#1}% - }{% - \sls@deftowidthof{sls@#1#2@linelength}{#3}% - }% - \sls@@@setline{#1#2}% +\newcommand*{\setheadwidth}[2][]{% + \KOMAoptions{headwidth=#2:#1}% +}% +\newcommand*{\setfootwidth}[2][]{% + \KOMAoptions{footwidth=#2:#1}% +}% +\newcommand*{\setheadtopline}{\sls@setline{head}{above}}% +\newcommand*{\setheadsepline}{\sls@setline{head}{below}}% +\newcommand*{\setfootsepline}{\sls@setline{foot}{above}}% +\newcommand*{\setfootbotline}{\sls@setline{foot}{below}}% +\newcommand*\sls@setline[2]{% + \kernel@ifnextchar[%] + {\sls@@setline{#1}{#2}}{\sls@@@setline{#1#2}}% +}% +\newcommand*{\sls@@setline}{} +\def\sls@@setline#1#2[#3]{% + \Ifstr{#3}{auto}{% + \sls@deftowidthof{sls@#1#2@linelength}{#3#1}% + }{% + \sls@deftowidthof{sls@#1#2@linelength}{#3}% }% -} -\scrlayerAddToInterface\sls@@@setline{% - \def\sls@@@setline#1#2{% - \edef\@tempa{#2}\edef\@tempb{current}% - \Ifstr{#2}{}{}{% - \Ifstr{#2}{current}{}{% - \setlength{\@tempdima}{#2}% - \Ifstr{#1}{headabove}{% + \sls@@@setline{#1#2}% +}% +\newcommand*{\sls@@@setline}[2]{% + \edef\@tempa{#2}\edef\@tempb{current}% + \Ifstr{#2}{}{}{% + \Ifstr{#2}{current}{}{% + \setlength{\@tempdima}{#2}% + \Ifstr{#1}{headabove}{% + \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + {headtopline=\@tempdima:\csname sls@#1@linelength\endcsname}% + }{\Ifstr{#1}{headbelow}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% - {headtopline=\@tempdima:\csname sls@#1@linelength\endcsname}% - }{\Ifstr{#1}{headbelow}{% + {headsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% + }{% + \Ifstr{#1}{footabove}{% \KOMAExecuteOptions[.scrlayer-scrpage.sty]% - {headsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% + {footsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% }{% - \Ifstr{#1}{footabove}{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]% - {footsepline=\@tempdima:\csname sls@#1@linelength\endcsname}% - }{% - \KOMAExecuteOptions[.scrlayer-scrpage.sty]% - {footbotline=\@tempdima:\csname sls@#1@linelength\endcsname}% - }% + \KOMAExecuteOptions[.scrlayer-scrpage.sty]% + {footbotline=\@tempdima:\csname sls@#1@linelength\endcsname}% }% }% }% }% - \PackageWarning{scrlayer-scrpage}{% - Command deprecated!\MessageBreak - Usage of `\string\setheadtopline', - `\string\setheadsepline',\MessageBreak - `\string\setfootsepline', and `\string\setfootbotline'\MessageBreak - became deprecated with scrlayer-scrpage.\MessageBreak - You should use KOMA-Script options\MessageBreak - `headsepline', `headtopline', `footsepline',\MessageBreak - or `footbotline' with values\MessageBreak - `<line thickness>:<line length>' to setup\MessageBreak - the line length and thickness, and\MessageBreak - `\string\setkomafont' or `\string\addtokomafont' to\MessageBreak - setup the colour% - }% - \kernel@ifnextchar[%] - {% - \sls@@@@setline{#1}% - }{% - }% }% -} -\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}}{% - \setkomafont{footbotline}{#2}% - }% + \PackageWarning{scrlayer-scrpage}{% + Command deprecated!\MessageBreak + Usage of `\string\setheadtopline', + `\string\setheadsepline',\MessageBreak + `\string\setfootsepline', and `\string\setfootbotline'\MessageBreak + became deprecated with scrlayer-scrpage.\MessageBreak + You should use KOMA-Script options\MessageBreak + `headsepline', `headtopline', `footsepline',\MessageBreak + or `footbotline' with values\MessageBreak + `<line thickness>:<line length>' to setup\MessageBreak + the line length and thickness, and\MessageBreak + `\string\setkomafont' or `\string\addtokomafont' to\MessageBreak + setup the colour% + }% + \kernel@ifnextchar[%] + {% + \sls@@@@setline{#1}% + }{% + }% +}% +\newcommand*{\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}}{% + \setkomafont{footbotline}{#2}% }% }% }% -} +}% \@ifundefined{scr@fnt@headtopline}{% - \@ifundefined{@headtoplinefont}{% - \scrlayer@AddCsToInterface{@headtoplinefont}% - }{}% \newkomafont{headtopline}{}% - \scrlayer@AddCsToInterface{scr@fnt@headtopline}% }{} \@ifundefined{scr@fnt@headsepline}{% - \@ifundefined{@headseplinefont}{% - \scrlayer@AddCsToInterface{@headseplinefont}% - }{}% \newkomafont{headsepline}{}% - \scrlayer@AddCsToInterface{scr@fnt@headsepline}% }{} \@ifundefined{scr@fnt@footsepline}{% - \@ifundefined{@footseplinefont}{% - \scrlayer@AddCsToInterface{@footseplinefont}% - }{}% \newkomafont{footsepline}{}% - \scrlayer@AddCsToInterface{scr@fnt@footsepline}% }{} \@ifundefined{scr@fnt@footbotline}{% - \@ifundefined{@footbotlinefont}{% - \scrlayer@AddCsToInterface{@footbotlinefont}% - }{}% \newkomafont{footbotline}{}% - \scrlayer@AddCsToInterface{scr@fnt@footbotline}% }{} \AtBeginDocument{% \ifdim \headheight @@ -977,256 +855,221 @@ \@ifundefined{LaTeXcentering}{\let\LaTeXcentering\centering}{} \@ifundefined{LaTeXraggedleft}{\let\LaTeXraggedleft\raggedleft}{} \@ifundefined{LaTeXraggedright}{\let\LaTeXraggedright\raggedright}{} -\scrlayerAddToInterface\defpagestyle{% - \newcommand*{\defpagestyle}[3]{% - \sls@defhead{#1}#2\@empty\@empty\@empty - \sls@deffoot{#1}#3\@empty\@empty\@empty - \DeclarePageStyleByLayers{#1}{% - #1.head.odd,#1.head.even,#1.head.oneside,% - #1.head.above.line,#1.head.below.line,% - #1.foot.odd,#1.foot.even,#1.foot.oneside,% - #1.foot.above.line,#1.foot.below.line% - }% - \edef\reserved@a{% - \noexpand\scrlayerOnAutoRemoveInterface[scrlayer-scrpage.sty]{% - \noexpand\DestroyLayer{#1.head.odd}% - \noexpand\DestroyLayer{#1.head.even}% - \noexpand\DestroyLayer{#1.head.oneside}% - \noexpand\DestroyLayer{#1.head.above.line}% - \noexpand\DestroyLayer{#1.head.below.line}% - \noexpand\DestroyLayer{#1.foot.odd}% - \noexpand\DestroyLayer{#1.foot.even}% - \noexpand\DestroyLayer{#1.foot.oneside}% - \noexpand\DestroyLayer{#1.foot.above.line}% - \noexpand\DestroyLayer{#1.foot.below.line}% - \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 - interface `scrlayer-scrpage.sty', that\noexpand\MessageBreak - has been removed% - }% - }{}% - \noexpand\DestroyRealLayerPageStyle{#1}% - }% - }\reserved@a - }% -} -\scrlayerAddToInterface\sls@defhead{% - \newcommand*\sls@defhead[1]{% - \kernel@ifnextchar(%) - {\sls@@defhead{#1}}% - {\sls@@defhead{#1}(\sls@headabove@linelength,\sls@headabove@linethickness)}% - }% -} -\scrlayerAddToInterface\sls@@defhead{% - \def\sls@@defhead#1(#2,#3)#4#5#6{% - \kernel@ifnextchar(%) - {\sls@@@defhead{#1}({#2},{#3}){#4}{#5}{#6}}% - {\sls@@@defhead{#1}% - ({#2},{#3})% - {#4}{#5}{#6}% - (\sls@headbelow@linelength,\sls@headbelow@linethickness)}% - }% -} -\scrlayerAddToInterface\sls@@@defhead{% - \def\sls@@@defhead#1(#2,#3)#4#5#6(#7,#8){% - \DeclareLayer[% - background,% - hoffset=\sls@leftmargin{head},% - voffset=\sls@topmargin+\dp\strutbox,% - width=\sls@headwidth,% - height=0pt,% - align=bl,% - contents={% - {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{% - \sls@hf@rule{headtop}{#2}{#3}}}}% - }% - ]{#1.head.above.line}% - \DeclareLayer[% - background,% - hoffset=\sls@leftmargin{head},% - voffset=\sls@topmargin+\headheight-\ht\strutbox+#8,% - width=\sls@headwidth,% - height=0pt,% - align=tl,% - contents={% - {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{% - \sls@hf@rule{headsep}{#7}{#8}}}}% - }% - ]{#1.head.below.line}% - \DeclareLayer[% - background,evenpage,twoside,% - head,% - hoffset=\sls@leftmargin{head},% - width=\sls@headwidth,% - contents={% - \sls@secure@box\headheight{% - \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#4}}}}}% - ]{#1.head.even}% - \DeclareLayer[% - background,oddpage,twoside,% - head,% - hoffset=\sls@leftmargin{head},% - width=\sls@headwidth,% - contents={% - \sls@secure@box\headheight{% - \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#5}}}}}% - ]{#1.head.odd}% - \DeclareLayer[% - background,oddpage,oneside,% - head,% - hoffset=\sls@leftmargin{head},% - width=\sls@headwidth,% - contents={% - \sls@secure@box\headheight{% - \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#6}}}}}% - ]{#1.head.oneside}% - }% -} -\scrlayerAddToInterface\sls@deffoot{% - \newcommand*\sls@deffoot[1]{% - \kernel@ifnextchar(%) - {\sls@@deffoot{#1}}% - {\sls@@deffoot{#1}(\sls@footabove@linelength,\sls@footabove@linethickness)}% - }% -} -\scrlayerAddToInterface\sls@@deffoot{% - \def\sls@@deffoot#1(#2,#3)#4#5#6{% - \kernel@ifnextchar(%) - {\sls@@@deffoot{#1}({#2},{#3}){#4}{#5}{#6}}% - {\sls@@@deffoot{#1}% - ({#2},{#3})% - {#4}{#5}{#6}% - (\sls@footbelow@linelength,\sls@footbelow@linethickness)}% - }% -} -\scrlayerAddToInterface\sls@@@deffoot{% - \def\sls@@@deffoot#1(#2,#3)#4#5#6(#7,#8){% - \DeclareLayer[% - foreground,% - hoffset=\sls@leftmargin{foot},% - voffset=\sls@topmargin - +\headheight+\headsep - +\textheight - +\footskip-\footheight - +2\dp\strutbox,% - width=\sls@footwidth,% - height=0pt,% - align=bl,% - contents={% - {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{% - \sls@hf@rule{footsep}{#2}{#3}}}}% - }% - ]{#1.foot.above.line}% - \DeclareLayer[% - foreground,% - hoffset=\sls@leftmargin{foot},% - voffset=\sls@topmargin - +\headheight+\headsep - +\textheight - +\footskip - +2\dp\strutbox - +#8,% - width=\sls@footwidth,% - height=0pt,% - align=bl,% - contents={% - {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{% - \sls@hf@rule{footbot}{#7}{#8}}}}% - }% - ]{#1.foot.below.line}% - \DeclareLayer[% - foreground,evenpage,twoside,% - foot,% - hoffset=\sls@leftmargin{foot},% - width=\sls@footwidth,% - contents={% - \sls@secure@box\footheight{% - \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#4}}}}% - ]{#1.foot.even}% - \DeclareLayer[% - foreground,oddpage,twoside,% - foot,% - hoffset=\sls@leftmargin{foot},% - width=\sls@footwidth,% - contents={% - \sls@secure@box\footheight{% - \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#5}}}}% - ]{#1.foot.odd}% - \DeclareLayer[% - foreground,oddpage,oneside,% - foot,% - hoffset=\sls@leftmargin{foot},% - width=\sls@footwidth,% - contents={% - \sls@secure@box\footheight{% - \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#6}}}}% - ]{#1.foot.oneside}% +\newcommand*{\defpagestyle}[3]{% + \sls@defhead{#1}#2\@empty\@empty\@empty + \sls@deffoot{#1}#3\@empty\@empty\@empty + \DeclarePageStyleByLayers{#1}{% + #1.head.odd,#1.head.even,#1.head.oneside,% + #1.head.above.line,#1.head.below.line,% + #1.foot.odd,#1.foot.even,#1.foot.oneside,% + #1.foot.above.line,#1.foot.below.line% }% -} -\scrlayerAddToInterface\sls@secure@box{% - \newcommand*{\sls@secure@box}[2]{% - \begingroup - \setbox\z@\vbox{% - \ifsls@leavevmode\leavevmode\expandafter\ignorespaces\fi - #2% - }% - \ifdim #1<\dimexpr \ht\z@+\dp\z@\relax - \PackageWarning{scrlayer-scrpage}{% - \string#1 to low.\MessageBreak - At least \the\dimexpr \ht\z@+\dp\z@\relax\space needed,\MessageBreak - but only \the#1 found.\MessageBreak - \ifsls@autoenlarge - I'll enlarge \string#1, for further\MessageBreak - processing, but you should do this yourself,\MessageBreak - \else - You should enlarge \string#1,\MessageBreak - \fi - e.g., - \scr@ifundefinedorrelax{geometry}{% - \scr@ifundefinedorrelax{typearea}{% - using\MessageBreak - \space\space\string\setlength{\string#1}{% - \the\dimexpr \ht\z@+\dp\z@\relax}\MessageBreak - in your preamble% - }{% - setting typearea's option\MessageBreak - `\expandafter\@gobble\string#1=\the\dimexpr \ht\z@+\dp\z@\relax'% - }% +}% +\newcommand*\sls@defhead[1]{% + \kernel@ifnextchar(%) + {\sls@@defhead{#1}}% + {\sls@@defhead{#1}(\sls@headabove@linelength,\sls@headabove@linethickness)}% +}% +\newcommand*{\sls@@defhead}{} +\def\sls@@defhead#1(#2,#3)#4#5#6{% + \kernel@ifnextchar(%) + {\sls@@@defhead{#1}({#2},{#3}){#4}{#5}{#6}}% + {\sls@@@defhead{#1}% + ({#2},{#3})% + {#4}{#5}{#6}% + (\sls@headbelow@linelength,\sls@headbelow@linethickness)}% +}% +\newcommand*{\sls@@@defhead}{} +\def\sls@@@defhead#1(#2,#3)#4#5#6(#7,#8){% + \DeclareLayer[% + background,% + hoffset=\sls@leftmargin{head},% + voffset=\sls@topmargin+\dp\strutbox,% + width=\sls@headwidth,% + height=0pt,% + align=bl,% + contents={% + {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{% + \sls@hf@rule{headtop}{#2}{#3}}}}% + }% + ]{#1.head.above.line}% + \DeclareLayer[% + background,% + hoffset=\sls@leftmargin{head},% + voffset=\sls@topmargin+\headheight-\ht\strutbox+#8,% + width=\sls@headwidth,% + height=0pt,% + align=tl,% + contents={% + {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{% + \sls@hf@rule{headsep}{#7}{#8}}}}% + }% + ]{#1.head.below.line}% + \DeclareLayer[% + background,evenpage,twoside,% + head,% + hoffset=\sls@leftmargin{head},% + width=\sls@headwidth,% + contents={% + \sls@secure@box\headheight{% + \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#4}}}}}% + ]{#1.head.even}% + \DeclareLayer[% + background,oddpage,twoside,% + head,% + hoffset=\sls@leftmargin{head},% + width=\sls@headwidth,% + contents={% + \sls@secure@box\headheight{% + \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#5}}}}}% + ]{#1.head.odd}% + \DeclareLayer[% + background,oddpage,oneside,% + head,% + hoffset=\sls@leftmargin{head},% + width=\sls@headwidth,% + contents={% + \sls@secure@box\headheight{% + \normalfont{\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#6}}}}}% + ]{#1.head.oneside}% +}% +\newcommand*\sls@deffoot[1]{% + \kernel@ifnextchar(%) + {\sls@@deffoot{#1}}% + {\sls@@deffoot{#1}(\sls@footabove@linelength,\sls@footabove@linethickness)}% +}% +\newcommand*{\sls@@deffoot}{} +\def\sls@@deffoot#1(#2,#3)#4#5#6{% + \kernel@ifnextchar(%) + {\sls@@@deffoot{#1}({#2},{#3}){#4}{#5}{#6}}% + {\sls@@@deffoot{#1}% + ({#2},{#3})% + {#4}{#5}{#6}% + (\sls@footbelow@linelength,\sls@footbelow@linethickness)}% +}% +\newcommand*{\sls@@@deffoot}{} +\def\sls@@@deffoot#1(#2,#3)#4#5#6(#7,#8){% + \DeclareLayer[% + foreground,% + hoffset=\sls@leftmargin{foot},% + voffset=\sls@topmargin + +\headheight+\headsep + +\textheight + +\footskip-\footheight + +2\dp\strutbox,% + width=\sls@footwidth,% + height=0pt,% + align=bl,% + contents={% + {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{% + \sls@hf@rule{footsep}{#2}{#3}}}}% + }% + ]{#1.foot.above.line}% + \DeclareLayer[% + foreground,% + hoffset=\sls@leftmargin{foot},% + voffset=\sls@topmargin + +\headheight+\headsep + +\textheight + +\footskip + +2\dp\strutbox + +#8,% + width=\sls@footwidth,% + height=0pt,% + align=bl,% + contents={% + {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{% + \sls@hf@rule{footbot}{#7}{#8}}}}% + }% + ]{#1.foot.below.line}% + \DeclareLayer[% + foreground,evenpage,twoside,% + foot,% + hoffset=\sls@leftmargin{foot},% + width=\sls@footwidth,% + contents={% + \sls@secure@box\footheight{% + \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#4}}}}% + ]{#1.foot.even}% + \DeclareLayer[% + foreground,oddpage,twoside,% + foot,% + hoffset=\sls@leftmargin{foot},% + width=\sls@footwidth,% + contents={% + \sls@secure@box\footheight{% + \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#5}}}}% + ]{#1.foot.odd}% + \DeclareLayer[% + foreground,oddpage,oneside,% + foot,% + hoffset=\sls@leftmargin{foot},% + width=\sls@footwidth,% + contents={% + \sls@secure@box\footheight{% + \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#6}}}}% + ]{#1.foot.oneside}% +}% +\newcommand*{\sls@secure@box}[2]{% + \begingroup + \setbox\z@\vbox{% + \ifsls@leavevmode\leavevmode\expandafter\ignorespaces\fi + #2% + }% + \ifdim #1<\dimexpr \ht\z@+\dp\z@\relax + \PackageWarning{scrlayer-scrpage}{% + \string#1 to low.\MessageBreak + At least \the\dimexpr \ht\z@+\dp\z@\relax\space needed,\MessageBreak + but only \the#1 found.\MessageBreak + \ifsls@autoenlarge + I'll enlarge \string#1, for further\MessageBreak + processing, but you should do this yourself,\MessageBreak + \else + You should enlarge \string#1,\MessageBreak + \fi + e.g., + \scr@ifundefinedorrelax{geometry}{% + \scr@ifundefinedorrelax{typearea}{% + using\MessageBreak + \space\space\string\setlength{\string#1}{% + \the\dimexpr \ht\z@+\dp\z@\relax}\MessageBreak + in your preamble% }{% - \ifx #1\headheight - setting geometry's option\MessageBreak - `head=\the\dimexpr \ht\z@+\dp\z@\relax'% - \else - using\MessageBreak - \space\space\string\setlength{\string#1}{% - \the\dimexpr \ht\z@+\dp\z@\relax}\MessageBreak - in your preamble% - \fi + setting typearea's option\MessageBreak + `\expandafter\@gobble\string#1=\the\dimexpr \ht\z@+\dp\z@\relax'% }% - \ifsls@autoenlarge - .\MessageBreak - I'll also - \ifx #1\headheight decrease \string\topmargin - \else increase \string\footskip\fi - \fi - }% - \ifsls@autoenlarge - \@tempdima\dimexpr \ht\z@+\dp\z@\relax + }{% \ifx #1\headheight - \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax - \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax + setting geometry's option\MessageBreak + `head=\the\dimexpr \ht\z@+\dp\z@\relax'% \else - \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax + using\MessageBreak + \space\space\string\setlength{\string#1}{% + \the\dimexpr \ht\z@+\dp\z@\relax}\MessageBreak + in your preamble% \fi - \global#1\@tempdima + }% + \ifsls@autoenlarge + .\MessageBreak + I'll also + \ifx #1\headheight decrease \string\topmargin + \else increase \string\footskip\fi + \fi + }% + \ifsls@autoenlarge + \@tempdima\dimexpr \ht\z@+\dp\z@\relax + \ifx #1\headheight + \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax + \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax + \else + \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax \fi + \global#1\@tempdima \fi - \usebox\z@ - \endgroup - }% -} + \fi + \usebox\z@ + \endgroup +}% \@ifundefined{scr@fnt@pagehead}{% \scr@ifundefinedorrelax{scr@fnt@instead@pagehead}{}{% \PackageInfo{scrlayer-scrpage}{% @@ -1235,16 +1078,13 @@ }% \let\scr@fnt@instead@pagehead\relax }% - \scrlayer@AddCsToInterface{scr@fnt@pagehead}% \@ifundefined{@pageheadfont}{% \newcommand*{\@pageheadfont}{}% - \scrlayer@AddCsToInterface{@pageheadfont}% }{}% \newcommand*{\scr@fnt@pagehead}{\@pageheadfont}% }{} \@ifundefined{scr@fnt@pageheadfoot}{% \newcommand*{\scr@fnt@pageheadfoot}{\headfont}% - \scrlayer@AddCsToInterface{scr@fnt@pageheadfoot}% \@ifundefined{headfont}{% \newcommand*{\headfont}{\normalcolor\slshape}% }{} @@ -1256,11 +1096,9 @@ \let\scr@fnt@wrn@pagehead\relax } \@ifundefined{scr@fnt@pagefoot}{% - \scrlayer@AddCsToInterface{scr@fnt@pagefoot}% \def\scr@fnt@pagefoot{\footfont}% \@ifundefined{footfont}{% \newcommand*{\footfont}{}% - \scrlayer@AddCsToInterface{footfont}% }{}% }{} \scr@ifundefinedorrelax{scr@fnt@wrn@pagefoot}{}{% @@ -1269,673 +1107,564 @@ `pagefoot'}% \let\scr@fnt@wrn@pagefoot\relax } -\scrlayerAddToInterface\sls@hf@rule{% - \newcommand*\sls@hf@rule[3]{% - \begingroup - \normalfont\usekomafont{#1line}{% - \vbox to \z@{% - \kern -\dimexpr #3\relax - \ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi - \if@twoside\ifodd\value{page}\else - \ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi - \fi\fi - \if@tempswa - \hskip \z@\@plus 1fill\@minus \paperwidth - \fi - \vrule \@width\dimexpr #2\relax \@height\dimexpr #3\relax \@depth\z@ +\newcommand*\sls@hf@rule[3]{% + \begingroup + \normalfont\usekomafont{#1line}{% + \vbox to \z@{% + \kern -\dimexpr #3\relax + \ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi + \if@twoside\ifodd\value{page}\else \ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi - \if@twoside\ifodd\value{page}\else - \ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi - \fi\fi - \if@tempswa - \hskip \z@\@plus 1fill\@minus \paperwidth\null - \fi - }% + \fi\fi + \if@tempswa + \hskip \z@\@plus 1fill\@minus \paperwidth + \fi + \vrule \@width\dimexpr #2\relax \@height\dimexpr #3\relax \@depth\z@ + \ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi + \if@twoside\ifodd\value{page}\else + \ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi + \fi\fi + \if@tempswa + \hskip \z@\@plus 1fill\@minus \paperwidth\null + \fi }% - \endgroup - }% -} -\scrlayerAddToInterface\sls@topmargin{% - \newcommand*{\sls@topmargin}{\dimexpr\topmargin+1in\relax}% -} -\scrlayerAddToInterface\sls@leftmargin{% - \newcommand*{\sls@leftmargin}[1]{% - \dimexpr - \if@twoside - \ifodd\value{page} - \oddsidemargin+\csname sls@odd#1shift\endcsname - \else - \evensidemargin+\csname sls@even#1shift\endcsname - \fi - \else + }% + \endgroup +}% +\newcommand*{\sls@topmargin}{\dimexpr\topmargin+1in\relax}% +\newcommand*{\sls@leftmargin}[1]{% + \dimexpr + \if@twoside + \ifodd\value{page} \oddsidemargin+\csname sls@odd#1shift\endcsname + \else + \evensidemargin+\csname sls@even#1shift\endcsname \fi - +1in\relax - }% -} -\scrlayerAddToInterface\newpagestyle{% - \newcommand*\newpagestyle[3]{% - \@ifundefined{ps@#1}{\defpagestyle{#1}{#2}{#3}}{% - \PackageError{scrlayer-scrpage}{Page style `#1' already defined}{% - Only not yet defined page style may be defined using - \string\newpagestyle.\MessageBreak - You may use either \string\renewpagestyle, \string\providepagestyle, - or \string\defpagestyle\MessageBreak - with already defined page styles.\MessageBreak - If you'll continue, your command will be ignored.% + \else + \oddsidemargin+\csname sls@odd#1shift\endcsname + \fi + +1in\relax +}% +\@ifpackageloaded{titlesec}{% + \@ifundefined{newpagestyle}{}{% + \@ifpackageloaded{titleps}{}{% + \PackageWarningNoLine{scrlayer-scrpage}{% + it seems that package `titlesec' is used\MessageBreak + and has already defined `\string\newpagestyle'.\MessageBreak + To avoid this warning message, you should\MessageBreak + load package `titlesec' not before package\MessageBreak + `scrlayer-scrpage'. If you need `titlesec'\MessageBreak + you could load it after `scrlayer-scrpage',\MessageBreak + but you still would not be able to use\MessageBreak + the `titlesec' implemenation of\MessageBreak + `\string\newpagestyle'% }% + \let\newpagestyle\relax }% }% -} -\scrlayerAddToInterface\renewpagestyle{% - \newcommand*\renewpagestyle[3]{% - \@ifundefined{ps@#1}{% - \PackageError{scrlayer-scrpage}{Undefined page style `#1'}{% - Only already defined page style may be re-defined using - \string\renewpagestyle.\MessageBreak - You may use either \string\newpagestyle, \string\providepagestyle, - or \string\defpagestyle\MessageBreak - with not yet defined page styles.\MessageBreak - If you'll continue, your command will be ignored.% - }% - }{% - \defpagestyle{#1}{#2}{#3}% +}{} +\newcommand*\newpagestyle[3]{% + \@ifundefined{ps@#1}{\defpagestyle{#1}{#2}{#3}}{% + \PackageError{scrlayer-scrpage}{Page style `#1' already defined}{% + Only not yet defined page style may be defined using + \string\newpagestyle.\MessageBreak + You may use either \string\renewpagestyle, \string\providepagestyle, + or \string\defpagestyle\MessageBreak + with already defined page styles.\MessageBreak + If you'll continue, your command will be ignored.% }% }% -} -\scrlayerAddToInterface\providepagestyle{% - \newcommand*\providepagestyle[3]{% - \@ifundefined{ps@#1}{% - \defpagestyle{#1}{#2}{#3}% - }{% - \PackageInfo{scrlayer-scrpage}{% - page style `#1' already defined.\MessageBreak - New definition ignored% +}% +\@ifpackageloaded{titlesec}{% + \@ifundefined{renewpagestyle}{}{% + \@ifpackageloaded{titleps}{}{% + \PackageWarningNoLine{scrlayer-scrpage}{% + It seems that package `titlesec' is used\MessageBreak + and has already defined `\string\renewpagestyle'.\MessageBreak + To avoid this warning message, you should\MessageBreak + load package `titlesec' not before package\MessageBreak + `scrlayer-scrpage'. If you need `titlesec'\MessageBreak + you could load it after `scrlayer-scrpage',\MessageBreak + but you still would not be able to use\MessageBreak + the `titlesec' implemenation of\MessageBreak + `\string\renewpagestyle'% }% + \let\renewpagestyle\relax }% }% -} -\scrlayerAddToInterface{\deftriplepagestyle}{% - \newcommand*{\deftriplepagestyle}[1]{% - \let\@tempa\defpagestyle - \scrlayer@triplestyle{#1}% - }% -} -\scrlayerAddToInterface{\newtriplepagestyle}{% - \newcommand*{\newtriplepagestyle}[1]{% - \let\@tempa\newpagestyle - \scrlayer@triplestyle{#1}% - }% -} -\scrlayerAddToInterface{\renewtriplepagestyle}{% - \newcommand*{\renewtriplepagestyle}[1]{% - \let\@tempa\renewpagestyle - \scrlayer@triplestyle{#1}% - }% -} -\scrlayerAddToInterface{\providetriplepagestyle}{% - \newcommand*{\providetriplepagestyle}[1]{% - \let\@tempa\providepagestyle - \scrlayer@triplestyle{#1}% +}{} +\newcommand*\renewpagestyle[3]{% + \@ifundefined{ps@#1}{% + \PackageError{scrlayer-scrpage}{Undefined page style `#1'}{% + Only already defined page style may be re-defined using + \string\renewpagestyle.\MessageBreak + You may use either \string\newpagestyle, \string\providepagestyle, + or \string\defpagestyle\MessageBreak + with not yet defined page styles.\MessageBreak + If you'll continue, your command will be ignored.% + }% + }{% + \defpagestyle{#1}{#2}{#3}% }% -} -\scrlayerAddToInterface\scrlayer@triplestyle{% - \def\scrlayer@triplestyle#1{% - \kernel@ifnextchar[%] - {\scrlayer@@triplestyle{#1}}% - {\scrlayer@@triplestyle{#1}[\z@]}% - } -} -\scrlayerAddToInterface\scrlayer@@triplestyle{% - \def\scrlayer@@triplestyle#1[#2]{% - \kernel@ifnextchar[%] - {\scrlayer@@@triplestyle{#1}[#2]}% - {\scrlayer@@@triplestyle{#1}[\z@][#2]}% +}% +\newcommand*\providepagestyle[3]{% + \@ifundefined{ps@#1}{% + \defpagestyle{#1}{#2}{#3}% + }{% + \PackageInfo{scrlayer-scrpage}{% + page style `#1' already defined.\MessageBreak + New definition ignored% + }% }% } -\scrlayerAddToInterface\scrlayer@@@triplestyle{% - \def\scrlayer@@@triplestyle#1[#2][#3]#4#5#6#7#8#9{% - \@tempa{#1}{% - (\sls@headwidth,#2)% - {% - \makebox[\z@][l]{#6}\hfill - \makebox[\z@][c]{#5}\hfill - \makebox[\z@][r]{#4}% - }{% - \makebox[\z@][l]{#4}\hfill - \makebox[\z@][c]{#5}\hfill - \makebox[\z@][r]{#6}% - }{% - \makebox[\z@][l]{#4}\hfill - \makebox[\z@][c]{#5}\hfill - \makebox[\z@][r]{#6}% - }% - (\sls@headwidth,#3)% +\newcommand*{\deftriplepagestyle}[1]{% + \let\@tempa\defpagestyle + \scrlayer@triplestyle{#1}% +}% +\newcommand*{\newtriplepagestyle}[1]{% + \let\@tempa\newpagestyle + \scrlayer@triplestyle{#1}% +}% +\newcommand*{\renewtriplepagestyle}[1]{% + \let\@tempa\renewpagestyle + \scrlayer@triplestyle{#1}% +}% +\newcommand*{\providetriplepagestyle}[1]{% + \let\@tempa\providepagestyle + \scrlayer@triplestyle{#1}% +}% +\newcommand*{\scrlayer@triplestyle}[1]{% + \kernel@ifnextchar[%] + {\scrlayer@@triplestyle{#1}}% + {\scrlayer@@triplestyle{#1}[\z@]}% +} +\newcommand*{\scrlayer@@triplestyle}{} +\def\scrlayer@@triplestyle#1[#2]{% + \kernel@ifnextchar[%] + {\scrlayer@@@triplestyle{#1}[#2]}% + {\scrlayer@@@triplestyle{#1}[\z@][#2]}% +}% +\newcommand*{\scrlayer@@@triplestyle}{} +\def\scrlayer@@@triplestyle#1[#2][#3]#4#5#6#7#8#9{% + \@tempa{#1}{% + (\sls@headwidth,#2)% + {% + \makebox[\z@][l]{#6}\hfill + \makebox[\z@][c]{#5}\hfill + \makebox[\z@][r]{#4}% }{% - (\sls@footwidth,#3)% - {% - \makebox[\z@][l]{#9}\hfill - \makebox[\z@][c]{#8}\hfill - \makebox[\z@][r]{#7}% - }{% - \makebox[\z@][l]{#7}\hfill - \makebox[\z@][c]{#8}\hfill - \makebox[\z@][r]{#9}% - }{% - \makebox[\z@][l]{#7}\hfill - \makebox[\z@][c]{#8}\hfill - \makebox[\z@][r]{#9}% - }% - (\sls@footwidth,#2)% + \makebox[\z@][l]{#4}\hfill + \makebox[\z@][c]{#5}\hfill + \makebox[\z@][r]{#6}% + }{% + \makebox[\z@][l]{#4}\hfill + \makebox[\z@][c]{#5}\hfill + \makebox[\z@][r]{#6}% }% - }% -} -\scrlayerAddToInterface{\deftripstyle}{% - \newcommand*{\deftripstyle}{% - \PackageWarning{scrlayer-scrpage}{% - Command \string\deftripstyle\space is deprecate.\MessageBreak - You should replace it by \string\deftriplepagestyle,\MessageBreak - e.g.,% + (\sls@headwidth,#3)% + }{% + (\sls@footwidth,#3)% + {% + \makebox[\z@][l]{#9}\hfill + \makebox[\z@][c]{#8}\hfill + \makebox[\z@][r]{#7}% + }{% + \makebox[\z@][l]{#7}\hfill + \makebox[\z@][c]{#8}\hfill + \makebox[\z@][r]{#9}% + }{% + \makebox[\z@][l]{#7}\hfill + \makebox[\z@][c]{#8}\hfill + \makebox[\z@][r]{#9}% }% - \let\deftripstyle\deftriplepagestyle - \deftripstyle + (\sls@footwidth,#2)% }% -} -\scrlayerAddToInterface\defpairofpagestyles{% - \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.}{% - \PackageError{scrlayer-scrpage}{plain page style `#2' not allowed}{% - You may not define a plain page style using - \string\defpairofpagestyles, \string\newpairofpagestyles, - \string\renewpairofpagestyles, or\MessageBreak - \string\providepairofpagestyles. I'd suggest to simply define the - corresponding\MessageBreak - non-plain page style to also define the plain one.\MessageBreak - If you'll continue, your command will be ignored.}% - }{% - \sls@init@pair@page@style*{#2}% - \sls@init@pair@page@style*{plain.#2}% - \ifx\relax #1\relax\else - \scr@ifundefinedorrelax{sls@ps@#1@even@left@head}{% - \PackageError{scrlayer-scrpage}{`#1' not a pair page style}{% - Only pair page styles may be used to initialise new pairs of page - styles. So\MessageBreak - optional argument of \string\defpairofpagestyles, - \string\newpairofpagestyles,\MessageBreak - \string\renewpairofpagestyles, or \string\providepairofpagestyle has - to be a pair\MessageBreak - page style or should be unused.\MessageBreak - If you'll continue, the initialisation will be ignored.}% +}% +\newcommand*{\deftripstyle}{% + \PackageWarning{scrlayer-scrpage}{% + Command \string\deftripstyle\space is deprecate.\MessageBreak + You should replace it by \string\deftriplepagestyle,\MessageBreak + e.g.,% + }% + \let\deftripstyle\deftriplepagestyle + \deftripstyle +}% +\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.}{% + \PackageError{scrlayer-scrpage}{plain page style `#2' not allowed}{% + You may not define a plain page style using + \string\defpairofpagestyles, \string\newpairofpagestyles, + \string\renewpairofpagestyles, or\MessageBreak + \string\providepairofpagestyles. I'd suggest to simply define the + corresponding\MessageBreak + non-plain page style to also define the plain one.\MessageBreak + If you'll continue, your command will be ignored.}% + }{% + \sls@init@pair@page@style*{#2}% + \sls@init@pair@page@style*{plain.#2}% + \ifx\relax #1\relax\else + \scr@ifundefinedorrelax{sls@ps@#1@even@left@head}{% + \PackageError{scrlayer-scrpage}{`#1' not a pair page style}{% + Only pair page styles may be used to initialise new pairs of page + styles. So\MessageBreak + optional argument of \string\defpairofpagestyles, + \string\newpairofpagestyles,\MessageBreak + \string\renewpairofpagestyles, or \string\providepairofpagestyle has + to be a pair\MessageBreak + page style or should be unused.\MessageBreak + If you'll continue, the initialisation will be ignored.}% + }{% + \sls@init@pair@page@style{#2}{#1}% + \scr@ifundefinedorrelax{sls@ps@plain.#1@even@left@head}{% + \sls@init@pair@page@style{plain.#2}{#1}% }{% - \sls@init@pair@page@style{#2}{#1}% - \scr@ifundefinedorrelax{sls@ps@plain.#1@even@left@head}{% - \sls@init@pair@page@style{plain.#2}{#1}% - }{% - \sls@init@pair@page@style{plain.#2}{plain.#1}% - }% - }% - \fi - \edef\reserved@a{% - \noexpand\scrlayerOnAutoRemoveInterface[scrlayer-scrpage.sty]{% - \noexpand\sls@init@pair@page@style**{#2}% - \noexpand\sls@init@pair@page@style**{plain.#2}% - \noexpand\expandafter\noexpand\ifx\noexpand - \csname ps@plain.#2\noexpand\endcsname\noexpand\ps@plain - \noexpand\PackageWarning{scrlayer-scrpage}{% - page style `#2' not longer valid.\noexpand\MessageBreak - This was the current plain page style.\noexpand\MessageBreak - Making current plain page style empty.\noexpand\MessageBreak - The page style has been defined using\noexpand\MessageBreak - interface `scrlayer-scrpage.sty', that\noexpand\MessageBreak - has been removed% - }% - \noexpand\def\noexpand\ps@plain{% - \noexpand\def\noexpand\@oddhead{}\noexpand\def\noexpand\@evenhead{}% - \noexpand\def\noexpand\@oddhead{}\noexpand\def\noexpand\@evenhead{}% - }% - \noexpand\fi - }% - }\reserved@a - \sls@def@pair@page@style@member{#2}% - \AddToLayerPageStyleOptions{#2}{% - onselect={% - \DeclarePageStyleAlias{plain}{plain.#2}% - \DeclarePageStyleAlias{headings}{#2}% - \def\sls@currentheadings{#2}% - \def\sls@currentplain{plain.#2}% - #3% + \sls@init@pair@page@style{plain.#2}{plain.#1}% }% }% - \sls@def@pair@page@style@member{plain.#2}% - \AddToLayerPageStyleOptions{plain.#2}{% - onselect={% - \DeclarePageStyleAlias{plain}{plain.#2}% - \DeclarePageStyleAlias{headings}{#2}% - \def\sls@currentheadings{#2}% - \def\sls@currentplain{plain.#2}% - #3% - },% - oninit={% - \expandafter - \ifx\csname ifsls@plain@head@above@line\expandafter\endcsname + \fi + \sls@def@pair@page@style@member{#2}% + \AddToLayerPageStyleOptions{#2}{% + onselect={% + \DeclarePageStyleAlias{plain}{plain.#2}% + \DeclarePageStyleAlias{headings}{#2}% + \def\sls@currentheadings{#2}% + \def\sls@currentplain{plain.#2}% + #3% + }% + }% + \sls@def@pair@page@style@member{plain.#2}% + \AddToLayerPageStyleOptions{plain.#2}{% + onselect={% + \DeclarePageStyleAlias{plain}{plain.#2}% + \DeclarePageStyleAlias{headings}{#2}% + \def\sls@currentheadings{#2}% + \def\sls@currentplain{plain.#2}% + #3% + },% + oninit={% + \expandafter + \ifx\csname ifsls@plain@head@above@line\expandafter\endcsname + \csname iftrue\endcsname\else + \let\sls@headabove@linelength\z@ + \let\sls@headabove@linethickness\z@ + \fi + \expandafter + \ifx\csname ifsls@plain@head@below@line\expandafter\endcsname \csname iftrue\endcsname\else - \let\sls@headabove@linelength\z@ - \let\sls@headabove@linethickness\z@ - \fi - \expandafter - \ifx\csname ifsls@plain@head@below@line\expandafter\endcsname - \csname iftrue\endcsname\else - \let\sls@headbelow@linelength\z@ - \let\sls@headbelow@linethickness\z@ - \fi - \expandafter - \ifx\csname ifsls@plain@foot@above@line\expandafter\endcsname - \csname iftrue\endcsname\else - \let\sls@footabove@linelength\z@ - \let\sls@footabove@linethickness\z@ - \fi - \expandafter - \ifx\csname ifsls@plain@foot@below@line\expandafter\endcsname - \csname iftrue\endcsname\else - \let\sls@footbelow@linelength\z@ - \let\sls@footbelow@linethickness\z@ - \fi - }% + \let\sls@headbelow@linelength\z@ + \let\sls@headbelow@linethickness\z@ + \fi + \expandafter + \ifx\csname ifsls@plain@foot@above@line\expandafter\endcsname + \csname iftrue\endcsname\else + \let\sls@footabove@linelength\z@ + \let\sls@footabove@linethickness\z@ + \fi + \expandafter + \ifx\csname ifsls@plain@foot@below@line\expandafter\endcsname + \csname iftrue\endcsname\else + \let\sls@footbelow@linelength\z@ + \let\sls@footbelow@linethickness\z@ + \fi }% }% }% -} -\scrlayerAddToInterface\sls@currentheadings{% - \newcommand*\sls@currentheadings{scrheadings}% -} -\scrlayerAddToInterface\sls@currentplain{% - \newcommand*\sls@currentplain{plain.scrheadings}% -} -\scrlayerAddToInterface\sls@init@pair@page@style{% - \newcommand*{\sls@init@pair@page@style}{% +}% +\newcommand*\sls@currentheadings{scrheadings}% +\newcommand*\sls@currentplain{plain.scrheadings}% +\newcommand*{\sls@init@pair@page@style}{% + \kernel@ifstar {% \kernel@ifstar {% - \kernel@ifstar {% - \sls@let@pair@page@style\relax - }{% - \sls@let@pair@page@style\@empty - } + \sls@let@pair@page@style\relax }{% - \sls@init@@pair@page@style - }% - }% -} -\scrlayerAddToInterface\sls@init@@pair@page@style{% - \newcommand*{\sls@init@@pair@page@style}[2]{% - \expandafter\let\csname sls@ps@#1@even@left@head\expandafter\endcsname - \csname sls@ps@#2@even@left@head\endcsname - \expandafter\let\csname sls@ps@#1@even@middle@head\expandafter\endcsname - \csname sls@ps@#2@even@middle@head\endcsname - \expandafter\let\csname sls@ps@#1@even@right@head\expandafter\endcsname - \csname sls@ps@#2@even@right@head\endcsname - \expandafter\let\csname sls@ps@#1@odd@left@head\expandafter\endcsname - \csname sls@ps@#2@odd@left@head\endcsname - \expandafter\let\csname sls@ps@#1@odd@middle@head\expandafter\endcsname - \csname sls@ps@#2@odd@middle@head\endcsname - \expandafter\let\csname sls@ps@#1@odd@right@head\expandafter\endcsname - \csname sls@ps@#2@odd@right@head\endcsname - \expandafter\let\csname sls@ps@#1@even@left@foot\expandafter\endcsname - \csname sls@ps@#2@even@left@foot\endcsname - \expandafter\let\csname sls@ps@#1@even@middle@foot\expandafter\endcsname - \csname sls@ps@#2@even@middle@foot\endcsname - \expandafter\let\csname sls@ps@#1@even@right@foot\expandafter\endcsname - \csname sls@ps@#2@even@right@foot\endcsname - \expandafter\let\csname sls@ps@#1@odd@left@foot\expandafter\endcsname - \csname sls@ps@#2@odd@left@foot\endcsname - \expandafter\let\csname sls@ps@#1@odd@middle@foot\expandafter\endcsname - \csname sls@ps@#2@odd@middle@foot\endcsname - \expandafter\let\csname sls@ps@#1@odd@right@foot\expandafter\endcsname - \csname sls@ps@#2@odd@right@foot\endcsname - }% -} -\scrlayerAddToInterface\sls@let@pair@page@style{% - \newcommand*{\sls@let@pair@page@style}[2]{% - \expandafter\let\csname sls@ps@#2@even@left@head\endcsname #1% - \expandafter\let\csname sls@ps@#2@even@middle@head\endcsname #1% - \expandafter\let\csname sls@ps@#2@even@right@head\endcsname #1% - \expandafter\let\csname sls@ps@#2@odd@left@head\endcsname #1% - \expandafter\let\csname sls@ps@#2@odd@middle@head\endcsname #1% - \expandafter\let\csname sls@ps@#2@odd@right@head\endcsname #1% - \expandafter\let\csname sls@ps@#2@even@left@foot\endcsname #1% - \expandafter\let\csname sls@ps@#2@even@middle@foot\endcsname #1% - \expandafter\let\csname sls@ps@#2@even@right@foot\endcsname #1% - \expandafter\let\csname sls@ps@#2@odd@left@foot\endcsname #1% - \expandafter\let\csname sls@ps@#2@odd@middle@foot\endcsname #1% - \expandafter\let\csname sls@ps@#2@odd@right@foot\endcsname #1% + \sls@let@pair@page@style\@empty + } + }{% + \sls@init@@pair@page@style }% -} -\scrlayerAddToInterface\sls@def@pair@page@style@member{% - \newcommand*{\sls@def@pair@page@style@member}[1]{% - \defpagestyle{#1}{% - {% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright - \strut\@nameuse{sls@ps@#1@even@left@head}\strut}}% - \parbox{\sls@headwidth}{\LaTeXcentering - \strut\@nameuse{sls@ps@#1@even@middle@head}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft - \strut\@nameuse{sls@ps@#1@even@right@head}\strut}}% - }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright - \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% - \parbox{\sls@headwidth}{\LaTeXcentering - \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft - \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% - }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright - \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% - \parbox{\sls@headwidth}{\LaTeXcentering - \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft - \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% - }% +}% +\newcommand*{\sls@init@@pair@page@style}[2]{% + \expandafter\let\csname sls@ps@#1@even@left@head\expandafter\endcsname + \csname sls@ps@#2@even@left@head\endcsname + \expandafter\let\csname sls@ps@#1@even@middle@head\expandafter\endcsname + \csname sls@ps@#2@even@middle@head\endcsname + \expandafter\let\csname sls@ps@#1@even@right@head\expandafter\endcsname + \csname sls@ps@#2@even@right@head\endcsname + \expandafter\let\csname sls@ps@#1@odd@left@head\expandafter\endcsname + \csname sls@ps@#2@odd@left@head\endcsname + \expandafter\let\csname sls@ps@#1@odd@middle@head\expandafter\endcsname + \csname sls@ps@#2@odd@middle@head\endcsname + \expandafter\let\csname sls@ps@#1@odd@right@head\expandafter\endcsname + \csname sls@ps@#2@odd@right@head\endcsname + \expandafter\let\csname sls@ps@#1@even@left@foot\expandafter\endcsname + \csname sls@ps@#2@even@left@foot\endcsname + \expandafter\let\csname sls@ps@#1@even@middle@foot\expandafter\endcsname + \csname sls@ps@#2@even@middle@foot\endcsname + \expandafter\let\csname sls@ps@#1@even@right@foot\expandafter\endcsname + \csname sls@ps@#2@even@right@foot\endcsname + \expandafter\let\csname sls@ps@#1@odd@left@foot\expandafter\endcsname + \csname sls@ps@#2@odd@left@foot\endcsname + \expandafter\let\csname sls@ps@#1@odd@middle@foot\expandafter\endcsname + \csname sls@ps@#2@odd@middle@foot\endcsname + \expandafter\let\csname sls@ps@#1@odd@right@foot\expandafter\endcsname + \csname sls@ps@#2@odd@right@foot\endcsname +}% +\newcommand*{\sls@let@pair@page@style}[2]{% + \expandafter\let\csname sls@ps@#2@even@left@head\endcsname #1% + \expandafter\let\csname sls@ps@#2@even@middle@head\endcsname #1% + \expandafter\let\csname sls@ps@#2@even@right@head\endcsname #1% + \expandafter\let\csname sls@ps@#2@odd@left@head\endcsname #1% + \expandafter\let\csname sls@ps@#2@odd@middle@head\endcsname #1% + \expandafter\let\csname sls@ps@#2@odd@right@head\endcsname #1% + \expandafter\let\csname sls@ps@#2@even@left@foot\endcsname #1% + \expandafter\let\csname sls@ps@#2@even@middle@foot\endcsname #1% + \expandafter\let\csname sls@ps@#2@even@right@foot\endcsname #1% + \expandafter\let\csname sls@ps@#2@odd@left@foot\endcsname #1% + \expandafter\let\csname sls@ps@#2@odd@middle@foot\endcsname #1% + \expandafter\let\csname sls@ps@#2@odd@right@foot\endcsname #1% +}% +\newcommand*{\sls@def@pair@page@style@member}[1]{% + \defpagestyle{#1}{% + {% + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright + \strut\@nameuse{sls@ps@#1@even@left@head}\strut}}% + \parbox{\sls@headwidth}{\LaTeXcentering + \strut\@nameuse{sls@ps@#1@even@middle@head}\strut}% + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft + \strut\@nameuse{sls@ps@#1@even@right@head}\strut}}% }{% - {% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright - \strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}% - \parbox{\sls@footwidth}{\LaTeXcentering - \strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft - \strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}% - }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright - \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% - \parbox{\sls@footwidth}{\LaTeXcentering - \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft - \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% - }{% - \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright - \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% - \parbox{\sls@footwidth}{\LaTeXcentering - \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% - \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft - \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% - }% + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright + \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% + \parbox{\sls@headwidth}{\LaTeXcentering + \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft + \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% + }{% + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright + \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}% + \parbox{\sls@headwidth}{\LaTeXcentering + \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}% + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft + \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}% }% - }% -} -\scrlayerAddToInterface\newpairofpagestyles{% - \newcommand*{\newpairofpagestyles}[3][]{% - \scr@ifundefinedorrelax{ps@#2}{% - \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{% - \PackageError{scrlayer-scrpage}{% - Plain page style of `#2' already defined}{% - You may only define a new pair of page styles, if neither the style - itself\MessageBreak - nor it's plain page style has already been defined.\MessageBreak - You may use only \string\defpairofpagestyles\space or - \string\providepairofpagestyles\space with partly\MessageBreak - already defined page styles.\MessageBreak - If you'll continue, your command will be ignored.% - }% - }% + }{% + {% + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright + \strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}% + \parbox{\sls@footwidth}{\LaTeXcentering + \strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}% + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft + \strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}% }{% + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright + \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% + \parbox{\sls@footwidth}{\LaTeXcentering + \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft + \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% + }{% + \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright + \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}% + \parbox{\sls@footwidth}{\LaTeXcentering + \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}% + \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft + \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}% + }% + }% +}% +\newcommand*{\newpairofpagestyles}[3][]{% + \scr@ifundefinedorrelax{ps@#2}{% + \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{% \PackageError{scrlayer-scrpage}{% - Page style `#2' already defined}{% + Plain page style of `#2' already defined}{% You may only define a new pair of page styles, if neither the style itself\MessageBreak nor it's plain page style has already been defined.\MessageBreak - You may use either \string\renewpairsofpagestyles, - \string\defpairofpagestyles, or\MessageBreak - \string\providepairofpagestyles\space with already defined page - styles.\MessageBreak + You may use only \string\defpairofpagestyles\space or + \string\providepairofpagestyles\space with partly\MessageBreak + already defined page styles.\MessageBreak If you'll continue, your command will be ignored.% }% }% + }{% + \PackageError{scrlayer-scrpage}{% + Page style `#2' already defined}{% + You may only define a new pair of page styles, if neither the style + itself\MessageBreak + nor it's plain page style has already been defined.\MessageBreak + You may use either \string\renewpairsofpagestyles, + \string\defpairofpagestyles, or\MessageBreak + \string\providepairofpagestyles\space with already defined page + styles.\MessageBreak + If you'll continue, your command will be ignored.% + }% }% -} -\scrlayerAddToInterface\renewpairofpagestyles{% - \newcommand*{\renewpairofpagestyles}[3][]{% - \scr@ifundefinedorrelax{ps@#2}{% +}% +\newcommand*{\renewpairofpagestyles}[3][]{% + \scr@ifundefinedorrelax{ps@#2}{% + \PackageError{scrlayer-scrpage}{% + Undefined page style `#2'}{% + You may only redefine existing pairs of page styles. You may use + either\MessageBreak + \string\newpairsofpagestyles, \string\defpairofpagestyles, or + \string\providepairofpagestyles\MessageBreak + with not yet defined page styles.\MessageBreak + If you'll continue, your command will be ignored.% + }% + }{% + \@ifundefined{ps@plain.#2}{% \PackageError{scrlayer-scrpage}{% - Undefined page style `#2'}{% + Undefined plain page style of `#2'}{% You may only redefine existing pairs of page styles. You may use either\MessageBreak - \string\newpairsofpagestyles, \string\defpairofpagestyles, or - \string\providepairofpagestyles\MessageBreak - with not yet defined page styles.\MessageBreak + \string\defpairofpagestyles\space or + \string\providepairofpagestyles\space with partly already + defined\MessageBreak + page styles.\MessageBreak If you'll continue, your command will be ignored.% }% - }{% - \@ifundefined{ps@plain.#2}{% - \PackageError{scrlayer-scrpage}{% - Undefined plain page style of `#2'}{% - You may only redefine existing pairs of page styles. You may use - either\MessageBreak - \string\defpairofpagestyles\space or - \string\providepairofpagestyles\space with partly already - defined\MessageBreak - page styles.\MessageBreak - If you'll continue, your command will be ignored.% - }% - }{\defpairofpagestyles[#1]{#2}{#3}}% - }% + }{\defpairofpagestyles[#1]{#2}{#3}}% }% -} -\scrlayerAddToInterface\providepairofpagestyles{% - \newcommand*{\providepairofpagestyles}[3][]{% - \scr@ifundefinedorrelax{ps@#2}{% - \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{% - \PackageInfo{scrlayer-scrpage}{% - Plain page style of `#2' already\MessageBreak - defined. Definition ignored}% - }% - }{% +}% +\newcommand*{\providepairofpagestyles}[3][]{% + \scr@ifundefinedorrelax{ps@#2}{% + \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{% \PackageInfo{scrlayer-scrpage}{% - Page style of `#2' already defined.\MessageBreak - Definition ignored}% + Plain page style of `#2' already\MessageBreak + defined. Definition ignored}% }% + }{% + \PackageInfo{scrlayer-scrpage}{% + Page style of `#2' already defined.\MessageBreak + Definition ignored}% }% -} +}% \newpairofpagestyles{scrheadings}{}% \DeclarePageStyleAlias{scrplain}{plain.scrheadings} -\scrlayerOnAutoRemoveInterface{\DestroyPageStyleAlias{scrplain}} -\scrlayerAddToInterface\ihead{% - \newcommand*{\ihead}{\kernel@ifstar {\@dblarg\@@@ihead}{\@ihead}}% -} -\scrlayerAddToInterface\@ihead{% - \newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}% -} -\scrlayerAddToInterface\@@ihead{% - \newcommand{\@@ihead}[1]{\rehead{#1}\lohead{#1}}% -} -\scrlayerAddToInterface\@@@ihead{% - \newcommand{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}% -} -\scrlayerAddToInterface\ohead{% - \newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}% -} -\scrlayerAddToInterface\@ohead{% - \newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}% -} -\scrlayerAddToInterface\@@ohead{% - \newcommand{\@@ohead}[1]{\lehead{#1}\rohead{#1}}% -} -\scrlayerAddToInterface\@@@ohead{% - \newcommand{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}% -} -\scrlayerAddToInterface\chead{% - \newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}% -} -\scrlayerAddToInterface\@chead{% - \newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}% -} -\scrlayerAddToInterface\@@chead{% - \newcommand{\@@chead}[1]{\cehead{#1}\cohead{#1}}% -} -\scrlayerAddToInterface\@@@chead{% - \newcommand{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}% -} -\scrlayerAddToInterface\lehead{% - \newcommand*{\lehead}{\sls@renewelement{even}{left}{head}}% -} -\scrlayerAddToInterface\lohead{% - \newcommand*{\lohead}{\sls@renewelement{odd}{left}{head}}% -} -\scrlayerAddToInterface\rehead{% - \newcommand*{\rehead}{\sls@renewelement{even}{right}{head}}% -} -\scrlayerAddToInterface\rohead{% - \newcommand*{\rohead}{\sls@renewelement{odd}{right}{head}}% -} -\scrlayerAddToInterface\cehead{% - \newcommand*{\cehead}{\sls@renewelement{even}{middle}{head}}% -} -\scrlayerAddToInterface\cohead{% - \newcommand*{\cohead}{\sls@renewelement{odd}{middle}{head}}% -} -\scrlayerAddToInterface\ifoot{% - \newcommand*{\ifoot}{\kernel@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}% -} -\scrlayerAddToInterface\@ifoot{% - \newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}% -} -\scrlayerAddToInterface\@@ifoot{% - \newcommand{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}% -} -\scrlayerAddToInterface\@@@ifoot{% - \newcommand{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}% -} -\scrlayerAddToInterface\ofoot{% - \newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% -} -\scrlayerAddToInterface\@ofoot{% - \newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}% -} -\scrlayerAddToInterface\@@ofoot{% - \newcommand{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}% -} -\scrlayerAddToInterface\@@@ofoot{% - \newcommand{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}% -} -\scrlayerAddToInterface\cfoot{% - \newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% -} -\scrlayerAddToInterface\@cfoot{% - \newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}% -} -\scrlayerAddToInterface\@@cfoot{% - \newcommand{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}% -} -\scrlayerAddToInterface\@@@cfoot{% - \newcommand{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}% -} -\scrlayerAddToInterface\lefoot{% - \newcommand*{\lefoot}{\sls@renewelement{even}{left}{foot}}% -} -\scrlayerAddToInterface\lofoot{% - \newcommand*{\lofoot}{\sls@renewelement{odd}{left}{foot}}% -} -\scrlayerAddToInterface\refoot{% - \newcommand*{\refoot}{\sls@renewelement{even}{right}{foot}}% -} -\scrlayerAddToInterface\rofoot{% - \newcommand*{\rofoot}{\sls@renewelement{odd}{right}{foot}}% -} -\scrlayerAddToInterface\cefoot{% - \newcommand*{\cefoot}{\sls@renewelement{even}{middle}{foot}}% -} -\scrlayerAddToInterface\cofoot{% - \newcommand*{\cofoot}{\sls@renewelement{odd}{middle}{foot}}% -} -\scrlayerAddToInterface\sls@renewelement{% - \newcommand*{\sls@renewelement}[3]{% - \kernel@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}% - {\sls@@renewelement{#1}{#2}{#3}}% - }% -} -\scrlayerAddToInterface\sls@@renewelement{% - \newcommand*{\sls@@renewelement}[3]{% - \kernel@ifnextchar[%] - {\sls@@@@renewelement{#1}{#2}{#3}}% - {\sls@@@renewelement{#1}{#2}{#3}}% - }% -} -\scrlayerAddToInterface\sls@@@renewelement{% - \newcommand{\sls@@@renewelement}[4]{% - \scr@ifundefinedorrelax{sls@ps@\sls@currentheadings @#1@#2@#3}{% - \@namedef{sls@ps@scrheadings@#1@#2@#3}{#4}% - }{% - \@namedef{sls@ps@\sls@currentheadings @#1@#2@#3}{#4}% - }% - }% -} -\scrlayerAddToInterface\sls@@@@renewelement{% - \long\def\sls@@@@renewelement#1#2#3[#4]#5{% - \sls@@renewplainelement{#1}{#2}{#3}{#4}% - \sls@@@renewelement{#1}{#2}{#3}{#5}% +\newcommand*{\ihead}{\kernel@ifstar {\@dblarg\@@@ihead}{\@ihead}}% +\newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}% +\newcommand{\@@ihead}[1]{\rehead{#1}\lohead{#1}}% +\newcommand{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}% +\newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}% +\newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}% +\newcommand{\@@ohead}[1]{\lehead{#1}\rohead{#1}}% +\newcommand{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}% +\newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}% +\newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}% +\newcommand{\@@chead}[1]{\cehead{#1}\cohead{#1}}% +\newcommand{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}% +\newcommand*{\lehead}{\sls@renewelement{even}{left}{head}}% +\newcommand*{\lohead}{\sls@renewelement{odd}{left}{head}}% +\newcommand*{\rehead}{\sls@renewelement{even}{right}{head}}% +\newcommand*{\rohead}{\sls@renewelement{odd}{right}{head}}% +\newcommand*{\cehead}{\sls@renewelement{even}{middle}{head}}% +\newcommand*{\cohead}{\sls@renewelement{odd}{middle}{head}}% +\newcommand*{\ifoot}{\kernel@ifstar {\@dblarg\@@@ifoot}{\@ifoot}}% +\newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}% +\newcommand{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}% +\newcommand{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}% +\newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}% +\newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}% +\newcommand{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}% +\newcommand{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}% +\newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}% +\newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}% +\newcommand{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}% +\newcommand{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}% +\newcommand*{\lefoot}{\sls@renewelement{even}{left}{foot}}% +\newcommand*{\lofoot}{\sls@renewelement{odd}{left}{foot}}% +\newcommand*{\refoot}{\sls@renewelement{even}{right}{foot}}% +\newcommand*{\rofoot}{\sls@renewelement{odd}{right}{foot}}% +\newcommand*{\cefoot}{\sls@renewelement{even}{middle}{foot}}% +\newcommand*{\cofoot}{\sls@renewelement{odd}{middle}{foot}}% +\newcommand*{\sls@renewelement}[3]{% + \kernel@ifstar{\@dblarg{\sls@@@@renewelement{#1}{#2}{#3}}}% + {\sls@@renewelement{#1}{#2}{#3}}% +}% +\newcommand*{\sls@@renewelement}[3]{% + \kernel@ifnextchar[%] + {\sls@@@@renewelement{#1}{#2}{#3}}% + {\sls@@@renewelement{#1}{#2}{#3}}% +}% +\newcommand{\sls@@@renewelement}[4]{% + \scr@ifundefinedorrelax{sls@ps@\sls@currentheadings @#1@#2@#3}{% + \@namedef{sls@ps@scrheadings@#1@#2@#3}{#4}% + }{% + \@namedef{sls@ps@\sls@currentheadings @#1@#2@#3}{#4}% }% -} -\scrlayerAddToInterface\sls@@renewplainelement{% - \newcommand{\sls@@renewplainelement}[4]{% - \scr@ifundefinedorrelax{sls@ps@\sls@currentplain @#1@#2@#3}{% - \@namedef{sls@ps@plain.scrheadings@#1@#2@#3}{#4}% - }{% - \@namedef{sls@ps@\sls@currentplain @#1@#2@#3}{#4}% - }% +}% +\newcommand*{\sls@@@@renewelement}{} +\long\def\sls@@@@renewelement#1#2#3[#4]#5{% + \sls@@renewplainelement{#1}{#2}{#3}{#4}% + \sls@@@renewelement{#1}{#2}{#3}{#5}% +}% +\newcommand{\sls@@renewplainelement}[4]{% + \scr@ifundefinedorrelax{sls@ps@\sls@currentplain @#1@#2@#3}{% + \@namedef{sls@ps@plain.scrheadings@#1@#2@#3}{#4}% + }{% + \@namedef{sls@ps@\sls@currentplain @#1@#2@#3}{#4}% }% -} -\scrlayerAddToInterface\clearmainofpairofpagestyles{% - \newcommand*{\clearmainofpairofpagestyles}{% - \ihead{}\chead{}\ohead{}\ifoot{}\cfoot{}\ofoot{}% +}% +\newcommand*{\clearmainofpairofpagestyles}{% + \ihead{}\chead{}\ohead{}\ifoot{}\cfoot{}\ofoot{}% +}% +\newcommand*{\clearscrheadings}{% + \PackageWarning{scrlayer-scrpage}{% + replacing deprecated \string\clearscrheading\space by\MessageBreak + \string\clearmainofpairofpagestyles }% -} -\scrlayerAddToInterface\clearscrheadings{% - \let\clearscrheadings\clearmainofpairofpagestyles -} -\scrlayerAddToInterface\clearplainofpairofpagestyles{% - \newcommand*{\clearplainofpairofpagestyles}{% - \sls@@renewplainelement{odd}{left}{head}{}% - \sls@@renewplainelement{odd}{right}{head}{}% - \sls@@renewplainelement{odd}{middle}{head}{}% - \sls@@renewplainelement{even}{left}{head}{}% - \sls@@renewplainelement{even}{right}{head}{}% - \sls@@renewplainelement{even}{middle}{head}{}% - \sls@@renewplainelement{odd}{left}{foot}{}% - \sls@@renewplainelement{odd}{right}{foot}{}% - \sls@@renewplainelement{odd}{middle}{foot}{}% - \sls@@renewplainelement{even}{left}{foot}{}% - \sls@@renewplainelement{even}{right}{foot}{}% - \sls@@renewplainelement{even}{middle}{foot}{}% + \clearmainofpairofpagestyles +} +\newcommand*{\clearplainofpairofpagestyles}{% + \sls@@renewplainelement{odd}{left}{head}{}% + \sls@@renewplainelement{odd}{right}{head}{}% + \sls@@renewplainelement{odd}{middle}{head}{}% + \sls@@renewplainelement{even}{left}{head}{}% + \sls@@renewplainelement{even}{right}{head}{}% + \sls@@renewplainelement{even}{middle}{head}{}% + \sls@@renewplainelement{odd}{left}{foot}{}% + \sls@@renewplainelement{odd}{right}{foot}{}% + \sls@@renewplainelement{odd}{middle}{foot}{}% + \sls@@renewplainelement{even}{left}{foot}{}% + \sls@@renewplainelement{even}{right}{foot}{}% + \sls@@renewplainelement{even}{middle}{foot}{}% +}% +\newcommand*{\clearscrplain}{% + \PackageWarning{scrlayer-scrpage}{% + replacing deprecated \string\clearscrplain\space by\MessageBreak + \string\clearplainofpairofpagestyles }% + \clearplainofpairofpagestyles } -\scrlayerAddToInterface\clearscrplain{% - \let\clearscrplain\clearplainofpairofpagestyles -} -\scrlayerAddToInterface\clearpairofpagestyles{% - \newcommand*{\clearpairofpagestyles}{% - \ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}% +\newcommand*{\clearpairofpagestyles}{% + \ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}% +}% +\newcommand*{\clearscrheadfoot}{% + \PackageWarning{scrlayer-scrpage}{% + replacing deprecated \string\clearscrheadfoot\space by\MessageBreak + \string\clearpairofpagestyles }% -} -\scrlayerAddToInterface\clearscrheadfoot{% - \let\clearscrheadfoot\clearpairofpagestyles -} -\scrlayerAddToInterface\ps@useheadings{% - \newcommand*\ps@useheadings{% - \PackageWarning{scrlayer-scrpage}{incompatible page style!\MessageBreak - Page styles like `headings' and `plain'\MessageBreak - are incompatible with the page styles\MessageBreak - of scrlayer-scrpage. You shouldn't mix\MessageBreak - them up. Therefore page style\MessageBreak - `useheadings' is not longer provided.\MessageBreak - Usage is deprecated and will be replaced\MessageBreak - by `scrheadings'% - }% - \let\ps@useheadings\ps@scrheadings - \ps@useheadings + \clearpairofpagestyles +} +\newcommand*\ps@useheadings{% + \PackageWarning{scrlayer-scrpage}{incompatible page style!\MessageBreak + Page styles like `headings' and `plain'\MessageBreak + are incompatible with the page styles\MessageBreak + of scrlayer-scrpage. You shouldn't mix\MessageBreak + them up. Therefore page style\MessageBreak + `useheadings' is not longer provided.\MessageBreak + Usage is deprecated and will be replaced\MessageBreak + by `scrheadings'% }% -} -\scrlayerAddCsToInterface{ps@plain.useheadings}{% - \@namedef{ps@plain.useheadings}{\@nameuse{ps@plain.scrheadings}}% -} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ + \let\ps@useheadings\ps@scrheadings + \ps@useheadings +}% +\expandafter\newcommand\expandafter*\csname ps@plain.useheadings\endcsname{% + \@nameuse{ps@plain.scrheadings}% +}% +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 1c5b392c628..ea1dc267f96 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,14 +43,14 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% @@ -115,7 +115,17 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +\newcommand*{\scrlayer@report@deprecated}[2]{% + \@ifundefined{scrlayer@deprecated@reported@for@#1}{% + \PackageWarning{scrlayer}{% + Deprecated interface detected for `#1'.\MessageBreak + There isn't any support for using, e.g.,\MessageBreak + `\string #2'% + }% + \@namedef{scrlayer@deprecated@reported@for@#1}{\string #2}% + }{}% +} +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: options) \KOMA@key{markcase}{% \begingroup @@ -281,7 +291,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} @@ -2158,6 +2168,7 @@ } \newcommand*{\scrlayer@exec@after@pagestyle@hook}[1]{} \newcommand*{\scrlayerAddToInterface}[2][\@currname.\@currext]{% + \scrlayer@report@deprecated{#1}{\scrlayerAddToInterface}% \begingroup \edef\reserve@a{% \noexpand\scrlayerAddCsToInterface[#1]{\expandafter\@gobble\string #2}% @@ -2165,6 +2176,7 @@ \expandafter\endgroup\reserve@a } \newcommand{\scrlayerAddCsToInterface}[3][\@currname.\@currext]{% + \scrlayer@report@deprecated{#1}{\scrlayerAddCsToInterface}% \@ifundefined{scrlayer@#1@commandlist}{% \PackageError{scrlayer}{unkown interface `#1'}{% I've been told to add a command sequence to an interface, that hasn't @@ -2251,6 +2263,7 @@ }% }% \newcommand*\scrlayer@AddCsToInterface[2][\@currname.\@currext]{% + \scrlayer@report@deprecated{#1}{\scrlayer@AddCsToInterface}% \expandafter\expandafter\expandafter\def\expandafter \csname scrlayer@#1@commandlist\expandafter\expandafter\expandafter\endcsname \expandafter\expandafter\expandafter{% @@ -2260,6 +2273,7 @@ \@namedef{scrlayer@command@#2}{#1}% } \newcommand*{\scrlayerInitInterface}[1][\@currname.\@currext]{% + \scrlayer@report@deprecated{#1}{\scrlayerInitInterface}% \@ifundefined{scrlayer@#1@commandlist}{% \@namedef{scrlayer@#1@commandlist}{}% }{% @@ -2278,14 +2292,15 @@ }% } \newcommand*{\scrlayerOnAutoRemoveInterface}[2][\@currname.\@currext]{% + \scrlayer@report@deprecated{#1}{\scrlayerOnAutoRemoveInterface}% \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls index aea5718e473..e61009c37ad 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 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 074e165252a..5d3ab9570e9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -61,7 +61,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -83,20 +83,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: init) \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% @@ -122,7 +122,7 @@ }{} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: option) @@ -735,12 +735,12 @@ \newcommand*{\scr@symbol@www}{\undefined} %%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: execoption) \KOMAProcessOptions\relax %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: body) \providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi} %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ @@ -3089,7 +3089,7 @@ \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty new file mode 100644 index 00000000000..ac3d109d5e1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty @@ -0,0 +1,302 @@ +%% +%% This is file `scrlfile-hook.sty', +%% generated with the docstrip utility, extended by scrdocstrip. +%% +%% The original source files were: +%% +%% scrlfile-hook.dtx (with options: `package') +%% +%% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info] +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you may not be allowed to distribute +%% it. Look at the comments below to see if this is the case. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. You can +%% find a complete unmodified copy of LaTeX2e at +%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. +%% +%%% From File: $Id: scrlfile-hook.dtx$ +\ProvidesPackage{scrlfile-hook}[% + 2020/09/21 v3.32 KOMA-Script + package + (using LaTeX hooks)] +\@ifundefined{AddToHook}{% + \PackageError{scrlfile-hook}{LaTeX too old for this package}{% + \string\AddToHook\space of LaTeX 2020-10-01 or newer is + needed.\MessageBreak + Please update LaTeX or use package scrlfile-patch instead of\MessageBreak + scrlfile-hook.\MessageBreak + If you would continue, I will try to load scrlfile-patch + }% + \RequirePackage{scrlfile-patch}% + \endinput +}{} +\ExplSyntaxOn +\NewDocumentCommand \BeforeFile { m } + { + \AddToHook { file / before / #1 } + } +\NewDocumentCommand \AfterFile { m } + { + \AddToHook { file / after / #1 } + } +\NewDocumentCommand \BeforeClass { m } + { + \BeforeFile { #1.\@clsextension } + } +\NewDocumentCommand \BeforePackage { m } + { + \BeforeFile { #1.\@pkgextension } + } +\NewDocumentCommand \AfterAtEndOfClass { s m o +m } + { + \IfBooleanTF { #1 } + { + \scrlfile_if_class_loaded:nTF { #2 } + { #4 } + { \hook_gput_code:nnn { class / after / #2 } { #3 } { #4 } } + } + { \hook_gput_code:nnn { class / after / #2 } { #3 } { #4 } } + } +\NewDocumentCommand \AfterAtEndOfPackage { s m o +m } + { + \IfBooleanTF { #1 } + { + \scrlfile_if_package_loaded:nTF { #2 } + { #4 } + { \hook_gput_code:nnn { package / after / #2 } { #3 } { #4 } } + } + { \hook_gput_code:nnn { package / after / #2} { #3 } { #4 } } + } +\seq_new:N \g__scrlfile_input_file_seq +\hook_gput_code:nnn { file / before } { . } + { \seq_gpush:Nx \g__scrlfile_input_file_seq { \CurrentFile } } +\hook_gput_code:nnn { file / after } { . } + { + \seq_gpop:NNF \g__scrlfile_input_file_seq \l_tmpa_seq + { + \msg_new:nnn { scrlfile-hook } { to-much-pops } + { + More~file~names~popped~from~stack~than~put~to.~ + This~should~never~happen.~ + However,~it~could~happen~if~scrlfile-hook~is~loaded~by~another~ + package~or~class.~In~this~case~some~packages~or~classes~are~not~ + recognised~correctly. + } + \msg_warning:nn { scrlfile-hook } { to-much-pops } + } + } +\cs_if_exist:NTF \g__filehook_input_file_seq + { + \seq_map_inline:Nn \g__filehook_input_file_seq + { + \seq_gput_right:Nx \g__scrlfile_input_file_seq + { \tl_item:nn { #1 } { 2 } } + } + } + { + \seq_gpush:Nx \g__scrlfile_input_file_seq { } + \cs_if_exist:NTF \CurrentFileUsed + { \seq_gpush:Nx \g__scrlfile_input_file_seq { \CurrentFileUsed } } + { \seq_gpush:Nx \g__scrlfile_input_file_seq { \CurrentFile } } + } +\prg_new_protected_conditional:Npnn \__scrlfile_if_loading:n #1 { T, F, TF } + { + \str_set:Nx \l_tmpa_str { #1 } + \seq_if_in:NxTF \g__scrlfile_input_file_seq { \str_use:N \l_tmpa_str } + { \prg_return_true: } + { \prg_return_false: } + } +\prg_new_protected_conditional:Npnn \scrlfile_if_class_loaded:n #1 { T, F, TF } + { + \@ifclassloaded { #1 } + { + \__scrlfile_if_loading:nTF { #1.\@clsextension } + { \prg_return_false: } + { \prg_return_true: } + } + { + \prg_return_false: + } + } +\prg_new_protected_conditional:Npnn \scrlfile_if_package_loaded:n #1 { T, F, TF } + { + \@ifpackageloaded { #1 } + { + \__scrlfile_if_loading:nTF { #1.\@pkgextension } + { \prg_return_false: } + { \prg_return_true: } + } + { + \prg_return_false: + } + } +\NewDocumentCommand \scrlfile@AfterClass { s m o +m } + { + \IfBooleanTF { #1 } + { + \@ifclassloaded{ #2 } + { #4 } + { + \hook_gput_code:nnn + { file / after / #2.\@clsextension } + { #3 } + { #4 } + } + } + { + \hook_gput_code:nnn { file / after / #2.\@clsextension } { #3 } { #4 } + } + } +\NewDocumentCommand \AfterClass { } { \scrlfile@AfterClass } +\NewDocumentCommand \scrlfile@AfterPackage { s m o +m } + { + \IfBooleanTF { #1 } + { + \@ifpackageloaded{ #2 } + { #4 } + { + \hook_gput_code:nnn + { file / after / #2.\@pkgextension } + { #3 } + { #4 } + } + } + { + \hook_gput_code:nnn { file / after / #2.\@pkgextension } { #3 } { #4 } + } + } +\NewDocumentCommand \AfterPackage { } { \scrlfile@AfterPackage } +\NewDocumentCommand{\ReplaceInput}{}{\declare@file@substitution} +\NewDocumentCommand\ReplaceClass{mm}{% + \declare@file@substitution{#1.\@clsextension}{#2.\@clsextension}% +} +\NewDocumentCommand\ReplacePackage{mm}{% + \declare@file@substitution{#1.\@pkgextension}{#2.\@pkgextension}% +} +\NewDocumentCommand{\UnReplaceInput}{}{\undeclare@file@substitution} +\NewDocumentCommand\UnReplaceClass{m}{% + \undeclare@file@substitution{#1.\@clsextension}% +} +\NewDocumentCommand\UnReplacePackage{mm}{% + \undeclare@file@substitution{#1.\@pkgextension}% +} +\clist_new:N \g__scrlfile_prevent_clist +\NewDocumentCommand \PreventPackageFromLoading { s +o m } + { + \clist_set:Nx \l__scrlfile_package_clist { #3 } + \clist_map_inline:Nn \l__scrlfile_package_clist + { + \@ifpackageloaded { ##1 } + { + \IfBooleanTF { #1 } { \msg_info:nnn } { \msg_warning:nnn } + { scrlfile } { no-prevent-for-already-loaded } { ##1 } + } + { + \clist_if_in:NnF \g__scrlfile_prevent_clist { ##1 } + { \clist_gput_right:Nn \g__scrlfile_prevent_clist { ##1 } } + \tl_if_exist:cF { g__scrlfile_exclude_package_##1_tl } + { + \tl_new:c { g__scrlfile_exclude_package_##1_tl } + } + \IfValueT { #2 } + { + \tl_gput_right:cn { g__scrlfile_exclude_package_##1_tl } { #2 } + } + \disable@package@load { ##1 } + { \tl_use:c { g__scrlfile_exclude_package_##1_tl } } + } + } + \clist_clear:N \l__scrlfile_package_clist + } +\clist_new:N \l__scrlfile_package_clist +\msg_new:nnn { scrlfile } { no-prevent-for-already-loaded } + { + Cannot~prevent~package~`#1'~from~being~loaded,~ + because~it~has~been~loaded~already~before~line~\msg_line_number: + } +\NewDocumentCommand \StorePreventPackageFromLoading { m } + { \edef #1 { \clist_use:Nn \g__scrlfile_prevent_clist { , } } } +\NewDocumentCommand \ResetPreventPackageFromLoading {} + { + \clist_map_function:NN \g__scrlfile_prevent_clist \reenable@package@load + \clist_gclear:N \g__scrlfile_prevent_clist + } +\NewDocumentCommand \UnPreventPackageFromLoading { s m } + { + \clist_set:Nx \l__scrlfile_package_clist { #2 } + \clist_map_inline:Nn \l__scrlfile_package_clist + { + \clist_if_in:NnT \g__scrlfile_prevent_clist { ##1 } + { + \clist_gremove_all:Nn \g__scrlfile_prevent_clist { ##1 } + \reenable@package@load { ##1 } + \IfBooleanT { #1 } + { \cs_undefine:c { g__scrlfile_exclude_package_##1_tl } } + } + } + } +\NewDocumentCommand \BeforeClosingMainAux { o m } + { + \hook_gput_code:nnn { enddocument / afterlastpage } { #1 } + { + \debug_suspend: + \RenewDocumentCommand \BeforeClosingMainAux { m } { ##1 } + \cs_set_eq:NN \__scrlfile_protected@write:Nnn \protected@write + \cs_set_eq:NN \protected@write \protected@immediate@write + #2 + \cs_set_eq:NN \protected@write \__scrlfile_protected@write:Nnn + \debug_resume: + } + } +\NewDocumentCommand \AfterReadingMainAux { o m } + { + \hook_gput_code:nnn { enddocument / afteraux } { #1 } + { + \debug_suspend: + \RenewDocumentCommand \AfterReadingMainAux { m } { ##1 } + \cs_set_eq:NN \__scrlfile_protected@write:Nnn \protected@write + \cs_set_eq:NN \protected@write \protected@immediate@write + #2 + \cs_set_eq:NN \protected@write \__scrlfile_protected@write:Nnn + \debug_resume: + } + } +\ExplSyntaxOff +\ProvideDocumentCommand\protected@immediate@write{m+m+m} + {% + \begingroup + #2% + \let\protect\@unexpandable@protect + \edef\reserved@a{\immediate\write#1{#3}}% + \reserved@a + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi + } +\RequirePackage{scrlogo} +\endinput +%% +%% End of file `scrlfile-hook.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty new file mode 100644 index 00000000000..7e053e405a2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty @@ -0,0 +1,555 @@ +%% +%% This is file `scrlfile-patcholdlatex.sty', +%% generated with the docstrip utility, extended by scrdocstrip. +%% +%% The original source files were: +%% +%% scrlfile-patcholdlatex.dtx (with options: `package') +%% +%% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info] +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you may not be allowed to distribute +%% it. Look at the comments below to see if this is the case. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. You can +%% find a complete unmodified copy of LaTeX2e at +%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. +%% +%%% From File: $Id: scrlfile-patcholdlatex.dtx 3527 2020-09-11 09:44:32Z kohm $ +\ProvidesPackage{scrlfile-patcholdlatex}[% + 2020/09/21 v3.32 KOMA-Script + package + (patching old LaTeX kernels)] +\@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% + }% +}{% + \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 + }% + \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}% +\expandafter\long\expandafter\def\csname InputIfFileExists \endcsname#1#2{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1-@alias\endcsname\relax + \expandafter\@secondoftwo + \else + \scr@replacefile@msg{\csname #1-@alias\endcsname}{#1}% + \expandafter\@firstoftwo + \fi + {% + \expandafter\InputIfFileExists\expandafter{\csname + #1-@alias\endcsname}{#2}% + }% + {\IfFileExists{#1}{% + \expandafter\scr@input@withhook\expandafter{\@filef@und}{#1}{#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 +\renewcommand*{\@loadwithoptions}[3]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #3.#1-@aliasname\endcsname\relax + \def\scr@@loadwithoptions{\scr@loadwithoptions{#1}{#2}{#3}}% + \else + \scr@replacefile@msg{\csname #3.#1-@aliasname\endcsname.#1}{#3.#1}% + \def\scr@@loadwithoptions{% + \@loadwithoptions{#1}{#2}{\csname #3.#1-@aliasname\endcsname}% + }% + \fi + \scr@@loadwithoptions +} +\newcommand*{\scr@onefilewithoptions}{} +\let\scr@onefilewithoptions\@onefilewithoptions +\def\@onefilewithoptions#1[#2][#3]#4{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1.#4-@aliasname\endcsname\relax + \def\scr@@onefilewithoptions{\scr@onefilewithoptions{#1}}% + \else + \scr@replacefile@msg{\csname #1.#4-@aliasname\endcsname.#4}{#1.#4}% + \edef\scr@@onefilewithoptions{% + \noexpand\@onefilewithoptions{\csname #1.#4-@aliasname\endcsname}}% + \fi + \scr@@onefilewithoptions[{#2}][{#3}]{#4}% + \scr@load@hook{lateafter}{#1.#4}% +} +\newcommand*{\scr@replacefile@msg}[2]{% + \PackageInfo{scrlfile}{inputing `#1' instead of `#2'}% +} +\newcommand*{\scr@load@hook}[2]{% + \ifx\@begindocumenthook\@undefined\else + \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 + \fi + \@ifundefined{#2-@#1}{}{% + \@nameuse{#2-@#1}% + \expandafter\let\csname #2-@#1\endcsname\relax + }% + \ifx\@begindocumenthook\@undefined\else + \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 + \fi +} +\newcommand*{\scr@set@load@hook}[2]{% + \@ifundefined{#2-@#1}{\@namedef{#2-@#1}{}}{}% + \expandafter\g@addto@macro\csname #2-@#1\endcsname +} +\newcommand*{\BeforeFile}{\scr@set@load@hook{before}} +\newcommand*{\AfterFile}{\scr@set@load@hook{after}} +\newcommand*{\BeforeClass}[1]{% + \scr@set@load@hook{before}{#1.\@clsextension}% +} +\newcommand*{\scrlfile@AfterClass}{% + \kernel@ifstar \@sAfterClass\@AfterClass +} +\newcommand*{\AfterClass}{\scrlfile@AfterClass} +\newcommand*{\@AfterClass}[1]{% + \scr@set@load@hook{after}{#1.\@clsextension}% +} +\newcommand*{\@sAfterClass}[1]{% + \@ifclassloaded{#1}{% + \@secondoftwo + }{% + \@AfterClass + }% + {#1}% +} +\newcommand*{\AfterAtEndOfClass}{% + \kernel@ifstar \@sAfterAtEndOfClass\@AfterAtEndOfClass +} +\newcommand*{\@AfterAtEndOfClass}[1]{% + \scr@set@load@hook{lateafter}{#1.\@clsextension}% +} +\newcommand*{\@sAfterAtEndOfClass}[1]{% + \@ifundefined{#1.\@clsextension-l@ading}{% + \@ifclassloaded{#1}{% + \@secondoftwo + }{% + \@AfterAtEndOfClass + }% + }{% + \@AfterAtEndOfClass + }% + {#1}% +} +\newcommand*{\BeforePackage}[1]{% + \scr@set@load@hook{before}{#1.\@pkgextension}% +} +\newcommand*{\scrlfile@AfterPackage}{% + \kernel@ifstar \@sAfterPackage\@AfterPackage +} +\newcommand*{\AfterPackage}{\scrlfile@AfterPackage} +\newcommand*{\@AfterPackage}[1]{% + \scr@set@load@hook{after}{#1.\@pkgextension}% +} +\newcommand*{\@sAfterPackage}[1]{% + \@ifpackageloaded{#1}{% + \@secondoftwo + }{% + \@AfterPackage + }% + {#1}% +} +\newcommand*{\AfterAtEndOfPackage}{% + \kernel@ifstar \@sAfterAtEndOfPackage\@AfterAtEndOfPackage +} +\newcommand*{\@sAfterAtEndOfPackage}[1]{% + \@ifundefined{#1.\@pkgextension-l@ading}{% + \@ifpackageloaded{#1}{% + \@secondoftwo + }{% + \@@AfterAtEndOfPackage + }% + }{% + \@@AfterAtEndOfPackage + }% + {#1}% +} +\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*{\ReplaceInput}[2]{% + \expandafter\edef\csname #1-@alias\endcsname{#2}% +} +\newcommand*{\ReplaceFile}{% + \PackageError{scrlfile}{% + usage of not documented command `\string\ReplaceFile'% + }{% + Command `\string\ReplaceFile' has been implemented accidentally in + KOMA-Script 2.96\MessageBreak + and replaced by `\string\ReplaceInput' in KOMA-Script 3.12.\MessageBreak + You should replace `\string\ReplaceFile' by `\string\ReplaceInput' to + avoid this error\MessageBreak + message% + }% + \ReplaceInput +} +\newcommand*{\UnReplaceInput}[1]{% + \ifcsname #1-@alias\endcsname + \expandafter\let\csname #1-@alias\endcsname\relax + \fi +} +\newcommand*{\@replacefilewithext}[3]{% + \expandafter\xdef\csname #1.#3-@aliasname\endcsname{#2}% +} +\newcommand*{\ReplacePackage}[2]{% + \@replacefilewithext{#1}{#2}\@pkgextension +} +\newcommand*{\ReplaceClass}[2]{% + \@replacefilewithext{#1}{#2}\@clsextension +} +\newcommand*{\@unreplacefilewithext}[2]{% + \ifcsname #1.#2-@aliasname\endcsname + \expandafter\global\expandafter\let\csname #1.#2-@aliasname\endcsname\relax + \fi +} +\newcommand*{\UnReplacePackage}[1]{% + \@unreplacefilewithext{#1}\@pkgextension +} +\newcommand*{\UnReplaceClass}[1]{% + \@unreplacefilewithext{#1}\@clsextension +} +\newcommand*{\scrlfile@excludedpackages}{} +\let\scrlfile@excludedpackages\@empty +\newcommand*{\scrlfile@saved@RequirePackage}{} +\newcommand*{\PreventPackageFromLoading}{% + \kernel@ifstar{\@PreventPackageFromLoading\PackageInfo}% + {\@PreventPackageFromLoading\PackageWarning}% +} +\newcommand*{\@PreventPackageFromLoading}[1]{% + \kernel@ifnextchar [%] + {\@@PreventPackageFromLoading#1}{\@@PreventPackageFromLoading#1[]}% +} +\newcommand*{\@@PreventPackageFromLoading}{} +\def\@@PreventPackageFromLoading#1[#2]#3{% + \edef\reserved@b{\zap@space#3 \@empty}% + \ifx \reserved@b\@empty + #1{scrlfile}{% + \string\PreventPackageFromLoading\space with empty packages\MessageBreak + argument ignored% + }% + \else + \ifx\scrlfile@excludedpackages\@empty + \global\let\scrlfile@saved@RequirePackage\RequirePackage + \global\let\RequirePackage\scrlfile@RequirePackage + \def\reserved@a##1##{% + \@latex@error + {\noexpand \usepackage before \string\documentclass}% + {\noexpand \usepackage may only appear in the document + preamble, i.e.,\MessageBreak + between \noexpand\documentclass and + \string\begin{document}.}% + \@gobble}% + \ifx\reserved@a\usepackage\else + \ifx\usepackage\scrlfile@saved@RequirePackage\else + \PackageWarning{scrlfile}{% + Maybe serious problem: unexpected definition of\MessageBreak + \string\usepackage + }% + \fi + \global\let\usepackage\RequirePackage + \fi + \fi + \@for\reserved@a:=\reserved@b\do {% + \ifx\reserved@a\@empty + #1{scrlfile}{% + empty package argument for + \string\PreventPackageFromLoading\MessageBreak + ignored% + }% + \else + \expandafter\@ifpackageloaded\expandafter{\reserved@a}{% + #1{scrlfile}{% + package `\reserved@a' already loaded.\MessageBreak + Cannot prevent it from beeing loaded% + }% + }{% + \ifx\scrlfile@excludedpackages\@empty + \global\let\scrlfile@excludedpackages\reserved@a + \else + \xdef\scrlfile@excludedpackages{\scrlfile@excludedpackages,% + \reserved@a}% + \fi + \if\relax\detokenize{#2}\relax\else + \@ifundefined{scrlfile@exclude@package@\reserved@a @do}{% + \@namedef{scrlfile@exclude@package@\reserved@a @do}{}% + }{}% + \expandafter\gdef + \csname scrlfile@exclude@package@\reserved@a + @do\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter{% + \csname scrlfile@exclude@package@\reserved@a @do\endcsname + #2% + }% + \fi + }% + \fi + }% + \ifx\scrlfile@excludedpackages\@empty + \ResetPreventPackageFromLoading + \fi + \fi +} +\@onlypreamble\PreventPackageFromLoading +\newcommand*{\ResetPreventPackageFromLoading}{% + \global\let\scrlfile@excludedpackages\@empty + \ifx\RequirePackage\scrlfile@RequirePackage + \ifx\usepackage\RequirePackage + \global\let\usepackage\scrlfile@saved@RequirePackage + \fi + \global\let\RequirePackage\scrlfile@saved@RequirePackage + \fi +} +\@onlypreamble\ResetPreventPackageFromLoading +\newcommand*{\StorePreventPackageFromLoading}[1]{% + \let#1\scrlfile@excludedpackages +} +\@onlypreamble\StorePreventPackageFromLoading +\newcommand*{\UnPreventPackageFromLoading}{% + \kernel@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}% + {\@tempswafalse\@UnPreventPackageFromLoading}% +} +\newcommand*{\@UnPreventPackageFromLoading}[1]{% + \edef\reserved@b{\zap@space#1 \@empty}% + \if@tempswa + \@for\reserved@a:=\reserved@b\do {% + \ifx\reserved@a\@empty \else + \ifcsname scrlfile@exclude@package@\reserved@a @do\endcsname + \expandafter\let + \csname scrlfile@exclude@package@\reserved@a @do\endcsname + \undefined + \fi + \fi + }% + \fi + \ifcsname scrlfile@excludedpackages\endcsname + \let\reserved@a\scrlfile@excludedpackages + \let\scrlfile@excludedpackages\@empty + \expandafter\@for\expandafter\reserved@c + \expandafter:\expandafter=\reserved@a + \do{% + \ifx\reserved@c\@empty\else + \@expandtwoargs\in@{,\reserved@c,}{,\reserved@b,}% + \ifin@ + \else + \ifx\scrlfile@excludepackages\@empty + \global\let\scrlfile@excludepackages\reserved@c + \else + \xdef\scrlfile@excludedpackages{% + \scrlfile@excludedpackages,\reserved@c + }% + \fi + \fi + \fi + }% + \ifx\scrlfile@excludedpackages\@empty\ResetPreventPackageFromLoading\fi + \fi +} +\newcommand*{\scrlfile@RequirePackage}[2][]{% + \let\reserved@c\@empty + \let\reserved@d\@empty + \edef\reserved@b{\zap@space#2 \@empty}% + \expandafter\@for\expandafter\reserved@b\expandafter:\expandafter=\reserved@b + \do {% + \begingroup + \@tempswatrue + \@for\reserved@a:=\scrlfile@excludedpackages\do {% + \ifx\reserved@a\reserved@b + \@tempswafalse + \fi + }% + \if@tempswa + \xdef\reserved@c{\reserved@c,\reserved@b}% + \else + \ifx\reserved@b\@empty\else + \PackageInfo{scrlfile}{Excluding package `\reserved@b'\MessageBreak + from loading}% + \@ifundefined{scrlfile@exclude@package@\reserved@b @do}{% + }{% + \expandafter\g@addto@macro\expandafter\reserved@d + \csname scrlfile@exclude@package@\reserved@b @do\endcsname + }% + \fi + \fi + \endgroup + }% + \ifx\reserved@c\@empty + \let\reserved@a\scr@gobbleopt + \else + \edef\reserved@a{\noexpand\scrlfile@saved@RequirePackage[#1]{% + \expandafter\@gobble\reserved@c\@empty}}% + \fi + \expandafter\reserved@d + \reserved@a +} +\providecommand{\scr@gobbleopt}[1][]{} +\providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} +\AtEndDocument{% + \let\scr@saved@checkend=\@checkend + \renewcommand*{\@checkend}[1]{% + \def\reserved@a{#1}\def\reserved@b{document}% + \scr@saved@checkend{#1}% + \ifx\reserved@a\reserved@b + \let\scr@saved@clearpage=\clearpage + \renewcommand*{\clearpage}{\scr@saved@clearpage + \scr@hook@bcma + \scr@restore@newpage + \let\clearpage=\scr@saved@clearpage}% + \fi% + \let\scr@saved@dofilelist\@dofilelist + \def\@dofilelist{% + \scr@hook@acma + \let\@dofilelist\scr@saved@dofilelist + \scr@saved@dofilelist + }% + }% +} +\newcommand*{\scr@saved@checkend}{} +\newcommand*{\scr@saved@dofilelist}{} +\newcommand*{\scr@redefine@newpage}{% + \let\scr@saved@newpage\newpage + \def\scr@restore@newpage{% + \renewcommand*{\newpage}{% + \PackageWarningNoLine{% + scrlfile% + }{% + \string\newpage\space at main aux file!\MessageBreak + You have output material at the main aux file.\MessageBreak + Note, that the \string\BeforeClosingMainAux\space commands\MessageBreak + are processed before the output from aux file% + }% + \let\newpage\scr@saved@newpage + \newpage + }% + }% + \renewcommand*{\newpage}{% + \PackageError{% + scrlfile% + }{% + \string\newpage\space at \string\BeforeClosingMainAux + }{% + You should never use \string\newpage\space or + \string\clear(double)page or other output material at the\MessageBreak + argument of \string\BeforeClosingMainAux!\MessageBreak + If you'll continue, the \string\newpage\space will be ignored to + avoid corruption of\MessageBreak + every prior use of \string\BeforeClosingMainAux. + }% + }% +} +\newcommand*{\scr@restore@newpage}{} +\newcommand*{\scr@hook@bcma}{} +\newcommand*{\scr@hook@acma}{} +\newcommand*{\BeforeClosingMainAux}{% + \ifx\scr@hook@bcma\@empty + \gdef\scr@hook@bcma{% + \renewcommand*{\BeforeClosingMainAux}[1]{####1}% + \let\protected@write\protected@immediate@write + \scr@redefine@newpage + }% + \fi + \g@addto@macro\scr@hook@bcma% +} +\newcommand*{\AfterReadingMainAux}{% + \ifx\scr@hook@acma\@empty + \gdef\scr@hook@acma{% + \renewcommand*{\AfterReadingMainAux}[1]{####1}% + \let\protected@write\protected@immediate@write + }% + \fi + \g@addto@macro\scr@hook@acma% +} +\long\def\protected@immediate@write#1#2#3{% + \begingroup + #2% + \let\protect\@unexpandable@protect + \edef\reserved@a{\immediate\write#1{#3}}% + \reserved@a + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi +} +\RequirePackage{scrlogo} +\endinput +%% +%% End of file `scrlfile-patcholdlatex.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index b2c0a9fe1cd..5849374f9e0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -4,8 +4,7 @@ %% %% The original source files were: %% -%% scrlfile.dtx (with options: `scrlfile') -%% scrlogo.dtx (with options: `logo') +%% scrlfile.dtx (with options: `package') %% %% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info] %% @@ -39,525 +38,50 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlfile.dtx 3447 2020-01-06 16:40:47Z kohm $ +%%% From File: $Id: scrlfile.dtx 3537 2020-09-14 07:30:10Z kohm $ \ProvidesPackage{scrlfile}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package - (loading files)] -\ExecuteOptions{} -\ProcessOptions\relax -\@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% - }% -}{% - \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 - }% - \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}% -\expandafter\long\expandafter\def\csname InputIfFileExists \endcsname#1#2{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1-@alias\endcsname\relax - \expandafter\@secondoftwo - \else - \scr@replacefile@msg{\csname #1-@alias\endcsname}{#1}% - \expandafter\@firstoftwo - \fi - {% - \expandafter\InputIfFileExists\expandafter{\csname - #1-@alias\endcsname}{#2}% - }% - {\IfFileExists{#1}{% - \expandafter\scr@input@withhook\expandafter{\@filef@und}{#1}{#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}% - }% + (file load hooks)] +\@ifundefined{AddToHook}{% + \RequirePackage{scrlfile-patcholdlatex}% + \RequirePackage{xparse}% }{% - \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 -\renewcommand*{\@loadwithoptions}[3]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #3.#1-@aliasname\endcsname\relax - \def\scr@@loadwithoptions{\scr@loadwithoptions{#1}{#2}{#3}}% - \else - \scr@replacefile@msg{\csname #3.#1-@aliasname\endcsname.#1}{#3.#1}% - \def\scr@@loadwithoptions{% - \@loadwithoptions{#1}{#2}{\csname #3.#1-@aliasname\endcsname}% - }% - \fi - \scr@@loadwithoptions -} -\newcommand*{\scr@onefilewithoptions}{} -\let\scr@onefilewithoptions\@onefilewithoptions -\def\@onefilewithoptions#1[#2][#3]#4{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1.#4-@aliasname\endcsname\relax - \def\scr@@onefilewithoptions{\scr@onefilewithoptions{#1}}% - \else - \scr@replacefile@msg{\csname #1.#4-@aliasname\endcsname.#4}{#1.#4}% - \edef\scr@@onefilewithoptions{% - \noexpand\@onefilewithoptions{\csname #1.#4-@aliasname\endcsname}}% - \fi - \scr@@onefilewithoptions[{#2}][{#3}]{#4}% - \scr@load@hook{lateafter}{#1.#4}% -} -\newcommand*{\ReplaceInput}[2]{% - \expandafter\edef\csname #1-@alias\endcsname{#2}% -} -\newcommand*{\ReplaceFile}{% - \PackageError{scrlfile}{% - usage of not documented command `\string\ReplaceFile'% - }{% - Command `\string\ReplaceFile' has been implemented accidentally in - KOMA-Script 2.96\MessageBreak - and replaced by `\string\ReplaceInput' in KOMA-Script 3.12.\MessageBreak - You should replace `\string\ReplaceFile' by `\string\ReplaceInput' to - avoid this error\MessageBreak - message% - }% - \ReplaceInput -} -\newcommand*{\UnReplaceInput}[1]{% - \ifcsname #1-@alias\endcsname - \expandafter\let\csname #1-@alias\endcsname\relax - \fi -} -\newcommand*{\@replacefilewithext}[3]{% - \expandafter\edef\csname #1.#3-@aliasname\endcsname{#2}% - } -\newcommand*{\ReplacePackage}[2]{% - \@replacefilewithext{#1}{#2}\@pkgextension -} -\newcommand*{\ReplaceClass}[2]{% - \@replacefilewithext{#1}{#2}\@clsextension -} -\newcommand*{\@unreplacefilewithext}[2]{% - \ifcsname #1.#2-@aliasname\endcsname - \expandafter\let\csname #1.#2-@aliasname\endcsname\relax - \fi -} -\newcommand*{\UnReplacePackage}[1]{% - \@unreplacefilewithext{#1}\@pkgextension -} -\newcommand*{\UnReplaceClass}[1]{% - \@unreplacefilewithext{#1}\@clsextension -} -\newcommand*{\scr@replacefile@msg}[2]{% - \PackageInfo{scrlfile}{inputing `#1' instead of `#2'}% -} -\newcommand*{\scr@load@hook}[2]{% - \ifx\@begindocumenthook\@undefined\else - \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 - \fi - \@ifundefined{#2-@#1}{}{% - \@nameuse{#2-@#1}% - \expandafter\let\csname #2-@#1\endcsname\relax - }% - \ifx\@begindocumenthook\@undefined\else - \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 - \fi -} -\newcommand*{\scr@set@load@hook}[2]{% - \@ifundefined{#2-@#1}{\@namedef{#2-@#1}{}}{}% - \expandafter\g@addto@macro\csname #2-@#1\endcsname} -\newcommand*{\BeforeFile}{\scr@set@load@hook{before}} -\newcommand*{\AfterFile}{\scr@set@load@hook{after}} -\newcommand*{\BeforeClass}[1]{% - \scr@set@load@hook{before}{#1.\@clsextension}} -\newcommand*{\AfterClass}{% - \kernel@ifstar {\@sAfterClass}{% - \kernel@ifnextchar +\@pAfterClass{% - \kernel@ifnextchar !\@xAfterClass\@AfterClass - }% - }% -} -\newcommand*{\@AfterClass}[1]{% - \scr@set@load@hook{after}{#1.\@clsextension}} -\newcommand*{\@sAfterClass}[1]{% - \@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 - }{% - \AfterAtEndOfClass - }% - }{% - \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 +\@pAfterPackage{% - \kernel@ifnextchar !\@xAfterPackage\@AfterPackage - }% - }% -} -\newcommand*{\@AfterPackage}[1]{% - \scr@set@load@hook{after}{#1.\@pkgextension}} -\newcommand*{\@sAfterPackage}[1]{% - \@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 - }{% - \@AfterAtEndOfPackage - }% - }{% - \@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}{} -\newcommand*{\PreventPackageFromLoading}{% - \kernel@ifstar{\@PreventPackageFromLoading\PackageInfo}% - {\@PreventPackageFromLoading\PackageWarning}% -} -\newcommand*{\@PreventPackageFromLoading}[1]{% - \kernel@ifnextchar [%] - {\@@PreventPackageFromLoading#1}{\@@PreventPackageFromLoading#1[]}% -} -\newcommand*{\@@PreventPackageFromLoading}{} -\def\@@PreventPackageFromLoading#1[#2]#3{% - \edef\reserved@b{\zap@space#3 \@empty}% - \ifx \reserved@b\@empty - #1{scrlfile}{% - \string\PreventPackageFromLoading\space with empty packages\MessageBreak - argument ignored% - }% - \else - \ifx\scrlfile@excludedpackages\@empty - \let\scrlfile@saved@RequirePackage\RequirePackage - \let\RequirePackage\scrlfile@RequirePackage - \def\reserved@a##1##{% - \@latex@error - {\noexpand \usepackage before \string\documentclass}% - {\noexpand \usepackage may only appear in the document - preamble, i.e.,\MessageBreak - between \noexpand\documentclass and - \string\begin{document}.}% - \@gobble}% - \ifx\reserved@a\usepackage\else - \ifx\usepackage\scrlfile@saved@RequirePackage\else - \PackageWarning{scrlfile}{% - Maybe serious problem: unexpected definition of\MessageBreak - \string\usepackage - }% - \fi - \let\usepackage\RequirePackage - \fi - \fi - \@for\reserved@a:=\reserved@b\do {% - \ifx\reserved@a\@empty - #1{scrlfile}{% - empty package argument for - \string\PreventPackageFromLoading\MessageBreak - ignored% - }% - \else - \expandafter\@ifpackageloaded\expandafter{\reserved@a}{% - #1{scrlfile}{% - package `\reserved@a' already loaded.\MessageBreak - Cannot prevent it from beeing loaded% - }% - }{% - \edef\scrlfile@excludedpackages{\scrlfile@excludedpackages,% - \reserved@a}% - \if\relax\detokenize{#2}\relax\else - \@ifundefined{scrlfile@exclude@package@\reserved@a @do}{% - \@namedef{scrlfile@exclude@package@\reserved@a @do}{}% - }{}% - \expandafter\def - \csname scrlfile@exclude@package@\reserved@a - @do\expandafter\expandafter\expandafter\endcsname - \expandafter\expandafter\expandafter{% - \csname scrlfile@exclude@package@\reserved@a @do\endcsname - #2% - }% - \fi - }% - \fi - }% - \ifx\scrlfile@excludedpackages\@empty - \ResetPreventPackageFromLoading - \fi - \fi -} -\@onlypreamble\PreventPackageFromLoading -\newcommand*{\ResetPreventPackageFromLoading}{% - \let\scrlfile@excludedpackages\@empty - \ifx\RequirePackage\scrlfile@RequirePackage - \ifx\usepackage\RequirePackage - \let\usepackage\scrlfile@saved@RequirePackage - \fi - \let\RequirePackage\scrlfile@saved@RequirePackage - \fi -} -\@onlypreamble\ResetPreventPackageFromLoading -\newcommand*{\StorePreventPackageFromLoading}[1]{% - \let#1\scrlfile@excludedpackages -} -\@onlypreamble\StorePreventPackageFromLoading -\newcommand*{\UnPreventPackageFromLoading}{% - \kernel@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}% - {\@tempswafalse\@UnPreventPackageFromLoading}% -} -\newcommand*{\@UnPreventPackageFromLoading}[1]{% - \edef\reserved@b{\zap@space#1 \@empty}% - \if@tempswa - \@for\reserved@a:=\reserved@b\do {% - \ifx\reserved@a\@empty \else - \ifcsname scrlfile@exclude@package@\reserved@a @do\endcsname - \expandafter\let - \csname scrlfile@exclude@package@\reserved@a @do\endcsname - \undefined - \fi - \fi - }% - \fi - \ifcsname scrlfile@excludedpackages\endcsname - \let\reserved@a\scrlfile@excludedpackages - \let\scrlfile@excludedpackages\@empty - \expandafter\@for\expandafter\reserved@c - \expandafter:\expandafter=\reserved@a - \do{% - \ifx\reserved@c\@empty\else - \@expandtwoargs\in@{,\reserved@c,}{,\reserved@b,}% - \ifin@ - \else - \edef\scrlfile@excludedpackages{% - \scrlfile@excludedpackages,\reserved@c - }% - \fi - \fi - }% - \ifx\scrlfile@excludedpackages\@empty\ResetPreventPackageFromLoading\fi - \fi -} -\newcommand*{\scrlfile@RequirePackage}[2][]{% - \let\reserved@c\@empty - \let\reserved@d\@empty - \edef\reserved@b{\zap@space#2 \@empty}% - \expandafter\@for\expandafter\reserved@b\expandafter:\expandafter=\reserved@b - \do {% - \begingroup - \@tempswatrue - \@for\reserved@a:=\scrlfile@excludedpackages\do {% - \ifx\reserved@a\reserved@b - \@tempswafalse - \fi + \RequirePackage{scrlfile-hook}% +} +\DeclareOption{withdeprecated}{% + \RenewDocumentCommand\AfterClass{}{% + \kernel@ifnextchar +% + {\scrlfile@emulatedeprecated{Class}}% + {% + \kernel@ifnextchar !% + {\scrlfile@emulatedeprecated{Class}}% + \scrlfile@AfterClass }% - \if@tempswa - \xdef\reserved@c{\reserved@c,\reserved@b}% - \else - \ifx\reserved@b\@empty\else - \PackageInfo{scrlfile}{Excluding package `\reserved@b'\MessageBreak - from loading}% - \@ifundefined{scrlfile@exclude@package@\reserved@b @do}{% - }{% - \expandafter\g@addto@macro\expandafter\reserved@d - \csname scrlfile@exclude@package@\reserved@b @do\endcsname - }% - \fi - \fi - \endgroup - }% - \ifx\reserved@c\@empty - \let\reserved@a\scr@gobbleopt - \else - \edef\reserved@a{\noexpand\scrlfile@saved@RequirePackage[#1]{% - \expandafter\@gobble\reserved@c\@empty}}% - \fi - \expandafter\reserved@d - \reserved@a -} -\newcommand{\scr@gobbleopt}[1][]{} -\providecommand*\kernel@ifstar[1]{\kernel@ifnextchar*{\@firstoftwo{#1}}} -\AtEndDocument{% - \let\scr@saved@checkend=\@checkend - \renewcommand*{\@checkend}[1]{% - \def\reserved@a{#1}\def\reserved@b{document}% - \scr@saved@checkend{#1}% - \ifx\reserved@a\reserved@b - \let\scr@saved@clearpage=\clearpage - \renewcommand*{\clearpage}{\scr@saved@clearpage - \scr@hook@bcma - \scr@restore@newpage - \let\clearpage=\scr@saved@clearpage}% - \fi% - \let\scr@saved@dofilelist\@dofilelist - \def\@dofilelist{% - \scr@hook@acma - \let\@dofilelist\scr@saved@dofilelist - \scr@saved@dofilelist - }% - }% -} -\newcommand*{\scr@saved@checkend}{} -\newcommand*{\scr@saved@dofilelist}{} -\newcommand*{\scr@redefine@newpage}{% - \let\scr@saved@newpage\newpage - \def\scr@restore@newpage{% - \renewcommand*{\newpage}{% - \PackageWarningNoLine{% - scrlfile% - }{% - \string\newpage\space at main aux file!\MessageBreak - You have output material at the main aux file.\MessageBreak - Note, that the \string\BeforeClosingMainAux\space commands\MessageBreak - are processed before the output from aux file% + } + \RenewDocumentCommand\AfterPackage{}{% + \kernel@ifnextchar +% + {\scrlfile@emulatedeprecated{Package}}% + {% + \kernel@ifnextchar !% + {\scrlfile@emulatedeprecated{Package}}% + \scrlfile@AfterPackage }% - \let\newpage\scr@saved@newpage - \newpage - }% - }% - \renewcommand*{\newpage}{% - \PackageError{% - scrlfile% - }{% - \string\newpage\space at \string\BeforeClosingMainAux - }{% - You should never use \string\newpage\space or - \string\clear(double)page or other output material at the\MessageBreak - argument of \string\BeforeClosingMainAux!\MessageBreak - If you'll continue, the \string\newpage\space will be ignored to - avoid corruption of\MessageBreak - every prior use of \string\BeforeClosingMainAux. - }% - }% + } + \newcommand*{\scrlfile@emulatedeprecated}[2]{% + \PackageWarning{scrlfile}{% + emulating deprecated \expandafter\string\csname After#1#2\endcsname + \space by\MessageBreak + \expandafter\string\csname AfterAtEndOf#1*\endcsname.\MessageBreak + Note, this may fail, so you should not use\MessageBreak + \expandafter\string\csname After#1#2\endcsname + }% + \csname AfterAtEndOf#1\endcsname*% + } } -\newcommand*{\scr@restore@newpage}{} -\newcommand*{\scr@hook@bcma}{} -\newcommand*{\scr@hook@acma}{} -\newcommand*{\BeforeClosingMainAux}{% - \ifx\scr@hook@bcma\@empty - \gdef\scr@hook@bcma{% - \renewcommand*{\BeforeClosingMainAux}[1]{####1}% - \let\protected@write\protected@immediate@write - \scr@redefine@newpage - }% - \fi - \g@addto@macro\scr@hook@bcma% -} -\newcommand*{\AfterReadingMainAux}{% - \ifx\scr@hook@acma\@empty - \gdef\scr@hook@acma{% - \renewcommand*{\AfterReadingMainAux}[1]{####1}% - \let\protected@write\protected@immediate@write - }% - \fi - \g@addto@macro\scr@hook@acma% -} -\long\def\protected@immediate@write#1#2#3{% - \begingroup - #2% - \let\protect\@unexpandable@protect - \edef\reserved@a{\immediate\write#1{#3}}% - \reserved@a - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi -} -%%% 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}}}{} +\ExecuteOptions{} +\ProcessOptions\relax +\RequirePackage{scrlogo} \endinput %% %% End of file `scrlfile.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty new file mode 100644 index 00000000000..0409b511829 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty @@ -0,0 +1,51 @@ +%% +%% This is file `scrlogo.sty', +%% generated with the docstrip utility, extended by scrdocstrip. +%% +%% The original source files were: +%% +%% scrlogo.dtx (with options: `package,logo') +%% +%% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info] +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you may not be allowed to distribute +%% it. Look at the comments below to see if this is the case. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. You can +%% find a complete unmodified copy of LaTeX2e at +%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. +%% +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ +\ProvidesPackage{scrlogo}[% + 2020/09/21 v3.32 KOMA-Script + package + (logo)] +\@ifundefined{KOMAScript}{% + \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% + M\kern.05em A\kern.1em-\kern.1em Script}}}{} +\endinput +%% +%% End of file `scrlogo.sty'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index 5f75c727961..633e662d302 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -73,7 +73,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -110,13 +110,13 @@ letter% } \ProvidesClass{\KOMAClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -195,10 +195,11 @@ \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} +\@namedef{scr@v@3.32}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -248,7 +249,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -1486,13 +1487,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 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% @@ -1980,7 +1981,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: body) \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} @@ -2029,7 +2030,7 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \ClassWarning{\KOMAClasSName}{% + \ClassWarning{\KOMAClassName}{% Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak @@ -5060,7 +5061,7 @@ \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls index a0269544fa0..8b4657e757e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls @@ -38,7 +38,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -60,7 +60,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -77,7 +77,7 @@ \newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension} \edef\KOMALongClassFileName{\KOMALongClassFileName} \ProvidesClass{\KOMALongClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 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 a0080242c19..c1458590550 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -84,7 +84,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -106,7 +106,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -121,16 +121,16 @@ report% } \ProvidesClass{\KOMAClassName}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $ %%% (run: prepare) \RequirePackage{tocbasic}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}% @@ -143,7 +143,7 @@ \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z 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 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} @@ -298,10 +298,11 @@ \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} +\@namedef{scr@v@3.32}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax @@ -376,7 +377,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% @@ -850,7 +851,7 @@ \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -2028,18 +2029,18 @@ \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: body) @@ -3176,7 +3177,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 3507 2020-06-11 14:57:03Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 3543 2020-09-14 16:21:00Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \providecommand*{\ifnumbered}{% @@ -5120,7 +5121,7 @@ }% \fi } -\AfterPackage!{hyperref}{\scr@chapter@after@hyperref@patch} +\AfterAtEndOfPackage{hyperref}{\scr@chapter@after@hyperref@patch} \newcommand*{\addparttocentry}[2]{% \addtocentrydefault{part}{#1}{#2}% } @@ -5692,7 +5693,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 3487 2020-04-27 07:19:23Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 3514 2020-08-06 16:14:53Z kohm $ %%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% @@ -5769,7 +5770,7 @@ \newcommand*{\is@thispageodd@setlabel}{} \newif\ifthispagewasodd \providecommand*{\ifthispageodd}{% - \ClassWarning{\KOMAClasSName}{% + \ClassWarning{\KOMAClassName}{% Usage of deprecated command `\string\ifthispageodd'.\MessageBreak The command has been renamed because of a\MessageBreak @@ -6124,7 +6125,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $ +%%% From File: $Id: scrlayer.dtx 3533 2020-09-11 13:32:10Z kohm $ %%% (run: body) \providecommand*{\@mkleft}{% \IfActiveMkBoth{\markleft}{\@gobble}% @@ -7539,7 +7540,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index f57ad709d2e..43fbd07200f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 10pt) diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 07f7f86294a..6e8c23361b1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ %%% (run: 11pt) diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index a05858ec207..d6dc017c0dc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index 297fafd9309..a679408083b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $ @@ -100,7 +100,7 @@ \the\@tempcnta{#1}\@tempif\ifnum\@tempcntb<10 0\fi\fi\the\@tempcntb% \endgroup} \newcommand*{\settime}[1]{\renewcommand*{\@thistime}[1][]{#1}} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index 79a805162d4..06a1f8308e8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -233,7 +233,7 @@ \Iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}% }% } -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 12962b1ddb8..86eea989af7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{setspace.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (hacking package setspace)% diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak index 05e941bf1b0..a4fe40e03f0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak +++ b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 3508 2020-07-08 08:45:20Z kohm $ \ProvidesFile{standardsections.hak}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script scrhack part (defining standard LaTeX class section headings)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 2bfaa0b9451..e3c63aaacce 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 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: tocbasic.dtx 3518 2020-08-25 08:26:01Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: tocbasic.dtx 3518 2020-08-25 08:26:01Z kohm $ %%% (run: prepare) %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: tocbasic.dtx 3518 2020-08-25 08:26:01Z kohm $ %%% (run: option) \ProcessOptions\relax %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: tocbasic.dtx 3518 2020-08-25 08:26:01Z kohm $ %%% (run: body) \RequirePackage{scrbase} \AfterPackage*{multitoc}{% @@ -350,6 +350,16 @@ } \newcommand*{\tocbasic@starttoc}[1]{% \begingroup + \tocbasic@reentrant@warning + \def\tocbasic@reentrant@warning{% + \PackageWarning{tocbasic}{% + Loading one auxiliary file inside the setup context\MessageBreak + of another auxiliary file is not recommended.\MessageBreak + In this case settings for `\@currext' could also influence\MessageBreak + settings of `#1' and local states of `#1' can also\MessageBreak + influence local states of `\@currext'% + }% + }% \edef\@currext{#1}% \Iftocfeature{\@currext}{noparskipfake}{}{% \ifvmode @@ -364,15 +374,20 @@ \setlength{\parfillskip}{\z@\@plus 1fil}% \csname tocbasic@@before@hook\endcsname \csname tb@#1@before@hook\endcsname - \let\tocbasic@saved@input\@input - \def\@input##1{% - \let\@input\tocbasic@saved@input\@input{##1}\par - }% \@starttoc{#1}% + \BeforeClosingMainAux{% + \addtocontents{#1}{% + \string\providecommand\string\tocbasic@end@toc@file{}% + \string\tocbasic@end@toc@file + }% + }% + \edef\@currext{#1}% \csname tb@#1@after@hook\endcsname \csname tocbasic@@after@hook\endcsname \endgroup } +\newcommand*{\tocbasic@end@toc@file}{\par} +\newcommand*{\tocbasic@reentrant@warning}{} \newcommand*{\tocbasic@@before@hook}{} \newcommand*{\tocbasic@@after@hook}{} \newcommand{\BeforeStartingTOC}[2][]{% @@ -2895,7 +2910,7 @@ %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 3508 2020-07-08 08:45:20Z kohm $ +%%% From File: $Id: tocbasic.dtx 3518 2020-08-25 08:26:01Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% @@ -2906,7 +2921,7 @@ }% }{}% } -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index f56c4b5f32c..2c8e8249256 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -48,7 +48,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -70,7 +70,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -80,13 +80,13 @@ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2020/07/22 v3.31 KOMA-Script + 2020/09/21 v3.32 KOMA-Script package (type area)] -%%% From File: $Id: scrkernel-basics.dtx 3465 2020-03-07 10:23:56Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3527 2020-09-11 09:44:32Z kohm $ %%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: init) \providecommand* {\scr@compatibility}{\scr@v@last} @@ -166,13 +166,14 @@ \@namedef{scr@v@3.29}{17} \@namedef{scr@v@3.30}{17} \@namedef{scr@v@3.31}{18} +\@namedef{scr@v@3.32}{18} \@namedef{scr@v@last}{18} %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: init) \providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}} \providecommand\ta@divlistelse{1} \newcommand*{\@lastdiv}{\z@}\let\@lastdiv\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% @@ -992,7 +993,7 @@ \KOMAExecuteOptions{twoside=false} \fi \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 3492 2020-06-02 09:02:18Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 3515 2020-08-06 16:16:31Z kohm $ %%% (run: body) %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: body) @@ -1737,7 +1738,7 @@ %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $ %%% (run: final) \typearea[current]{current} -%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlogo.dtx 3527 2020-09-11 09:44:32Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 88dfd947ac3..d157e323efc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 3510 2020-07-22 13:29:13Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3545 2020-09-21 07:45:07Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2020/07/22 v3.31 KOMA-Script}% + \@CheckKOMAScriptVersion{2020/09/21 v3.32 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 3453 2020-02-25 07:33:30Z kohm $ %%% (run: head) |