From e02235dda0e68d2131b9cf111af5448fa125ad58 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Jan 2017 22:32:58 +0000 Subject: koma-script (29jan17) git-svn-id: svn://tug.org/texlive/trunk@43084 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 4 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 6 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 4 +- .../tex/latex/koma-script/UScommercial9.lco | 4 +- .../tex/latex/koma-script/UScommercial9DW.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 6 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 6 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 6 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 6 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 6 +- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 290 ++++++++++++------- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 12 +- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 318 +++++++++++++-------- .../texmf-dist/tex/latex/koma-script/scrdate.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 135 +++++---- .../tex/latex/koma-script/scrfontsizes.sty | 12 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 28 +- .../tex/latex/koma-script/scrlayer-notecolumn.sty | 48 ++-- .../tex/latex/koma-script/scrlayer-scrpage.sty | 24 +- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 34 ++- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 28 +- .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 161 ++++++----- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 318 +++++++++++++-------- .../tex/latex/koma-script/scrsize10pt.clo | 6 +- .../tex/latex/koma-script/scrsize11pt.clo | 6 +- .../tex/latex/koma-script/scrsize12pt.clo | 6 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 8 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 6 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 53 ++-- .../texmf-dist/tex/latex/koma-script/typearea.sty | 154 ++++++---- .../texmf-dist/tex/latex/koma-script/visualize.lco | 6 +- 43 files changed, 1088 insertions(+), 673 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index e0e1a665683..b830bbc59a6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index b46ca186b39..f0014d80b59 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 6bb6c1797ea..aec3c4a5fe9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% @@ -204,7 +204,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ \def\setpresigskip{\@setplength{sigbeforevskip}} \endinput %% diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco index b916ff8c266..f76347423ac 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco index 8ee197f32ed..7f98808af92 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index b562bb5b42f..e2bb9fbc987 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco index d90c3e5b1f4..8667672d7d6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco index f81174a7af1..3ece5eb8327 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco index 3090d2cc3b0..f24869ad38d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco index 00d51945a79..4467a6f380e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco index 6e5d82daa64..94571f8a47e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index a4b7f3bcb97..d77516205fd 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index 22f7c729838..d42e7fa7d22 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index 3456d2d1c5b..c17086c4498 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index f7a3dfcdcc1..abeba026513 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ \ProvidesFile{float.hak}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (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 69f0dcb1b01..ef59bba293b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ \ProvidesFile{floatrow.hak}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (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 54adb9cfebc..00395eba973 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ \ProvidesFile{hyperref.hak}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (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 4ce2ee8f885..5fee6934ace 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ \ProvidesFile{listings.hak}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (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 9098ae150ff..48cacc72e83 100644 --- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ \ProvidesFile{lscape.hak}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (hacking package lscape)% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 6f85fa9d918..2c148569bf9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -81,7 +81,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -103,7 +103,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -118,21 +118,21 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ \RequirePackage{tocbasic}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script ] \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -184,7 +184,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -310,7 +310,8 @@ \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} -\@namedef{scr@v@last}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@last}{16} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -350,7 +351,7 @@ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } %%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\@ptsize{% 11% } @@ -435,7 +436,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -744,9 +745,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -976,7 +977,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1110,7 +1111,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1650,8 +1651,8 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ @@ -1660,8 +1661,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2068,15 +2069,15 @@ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{% You should note that since 1994 LaTeX2e provides a new font selection scheme\MessageBreak - called NFSS2 with several new, combinable font commands. New + called NFSS2 with several new, combinable font commands. KOMA-Script\MessageBreak - classes have defined the old font commands like `\string#1' + classes had defined the old font commands like `\string#1' only for compatibility\MessageBreak with old LaTeX 2.09 document styles of Script 2.0. Nevertheless, these\MessageBreak - commands are deprecated and undocumented at least since - 2003. Since 2013\MessageBreak - KOMA-Script classes warn abouts soon removement of these deprecated + commands are deprecated and undocumented at least since 2003. Since + 2013\MessageBreak + KOMA-Script classes warned about soon removement of these deprecated commands.\MessageBreak Now, after two decades of LaTeX2e and NFSS2, these commands will not work any\MessageBreak @@ -2106,11 +2107,11 @@ You should note, that since 1994 LaTeX2e provides a\MessageBreak new font selection scheme called NFSS2 with several\MessageBreak new, combinable font commands. New KOMA-Script classes\MessageBreak - have defined the old font commands like `\string#1' only for\MessageBreak + defined the old font commands like `\string#1' only for\MessageBreak compatibility with LaTeX 2.09 document styles of\MessageBreak Script 2.0. These commands are deprecated and\MessageBreak undocumented at least since 2003. Since 2013,\MessageBreak - KOMA-Script classes warn about soon removement of\MessageBreak + KOMA-Script classes warned about soon removement of\MessageBreak these deprecated commands. Now, after two decades of\MessageBreak LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak not work any longer. If loading a package results in\MessageBreak @@ -2140,7 +2141,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2653,10 +2654,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2670,7 +2671,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% @@ -2690,17 +2691,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,subsection) \CloneTOCEntryStyle{tocline}{subsection} \TOCEntryStyleStartInitCode{subsection}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \newcommand*{\ifnumbered}[1]{% @@ -2924,16 +2925,16 @@ \scr@istest#7=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#8},head={#8},#7}% + \setkeys{KOMAarg.section}{tocentry={#8},head={#8},reference={#8},#7}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \or - \setkeys{KOMAarg.section}{tocentry={#8},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#8},head={#7},reference={#8}}% \or - \setkeys{KOMAarg.section}{tocentry={#7},head={#8}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#8},reference={#7}}% \or - \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \fi \fi \let\IfUsePrefixLine\@secondoftwo @@ -2950,8 +2951,8 @@ #6{\nobreak\interlinepenalty \@M \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup - \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% - \ifx\scr@ds@tocentry\@empty\else + \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def \csname add#1tocentry\endcsname##1##2{% @@ -2959,18 +2960,18 @@ }% }{}% \ifnum \numexpr #2\relax>\c@secnumdepth - \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% + \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \scr@ds@tocentry}% + \@currenttocentry}% \fi \fi \else \def\@svsechd{% #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% - \expandafter\csname #1mark\expandafter\endcsname - \expandafter{\scr@ds@head}% - \ifx\scr@ds@tocentry\@empty\else + \expandafter\csname #1mark\expandafter\endcsname + \expandafter{\@currentheadentry}% + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def \csname add#1tocentry\endcsname####1####2{% @@ -2978,10 +2979,10 @@ }% }{}% \ifnum \numexpr #2\relax>\c@secnumdepth - \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% + \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \scr@ds@tocentry}% + \@currenttocentry}% \fi \fi }% @@ -2991,10 +2992,30 @@ } \DefineFamily{KOMAarg} \DefineFamilyMember[.section]{KOMAarg} -\DefineFamilyKey[.section]{KOMAarg}{tocentry}{\def\scr@ds@tocentry{#1}} -\DefineFamilyKey[.section]{KOMAarg}{head}{\def\scr@ds@head{#1}} -\newcommand*\scr@ds@tocentry{} -\newcommand*\scr@ds@head{} +\providecommand*\@currenttocentry{} +\providecommand*\@currentheadentry{} +\providecommand*\@currentlabelname{} +\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry} +\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry} +\DefineFamilyKey[.section]{KOMAarg}{reference}{% + \scr@ifundefinedorrelax{NR@gettitle}{% + \scr@ifundefinedorrelax{GetTitleString}{% + \def\@currentlabelname{#1}% + }{% + \GetTitleString{#1}% + \let\@currentlabelname\GetTitleStringResult + }% + }{% + \NR@gettitle{#1}% + }% + \scr@ifundefinedorrelax{TR@gettitle}{}{% + \expandafter\TR@gettitle\expandafter{\@currentlabelname}% + }% + \scr@ifundefinedorrelax{ztitlerefsetup}{}{% + \ztitlerefsetup{title=\@currentlabelname}% + }% + \FamilyKeyStateProcessed +} \newcommand*{\scr@istest}{} \def\scr@istest#1=#2\@nil{% \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi @@ -3633,7 +3654,26 @@ \@dottedtocline{#1}{#2}{#3}{#4}{#5}% \fi } -\newcommand*\appendix{\par% +\newcommand*\appendix{% + \ifstr{\@currenvir}{appendix}{% + \ClassWarning{\KOMAClassName}{% + You are using + `\string\begin{appendix}...\string\end{appendix}'.\MessageBreak + You should note, that `\string\appendix' is a mostly + globally\MessageBreak + working command not an enviroment with only local\MessageBreak + effects. Therefore `\string\end{appendix}' will neither\MessageBreak + switch back to normal section numbering nor finish\MessageBreak + every other effect of `\string\begin{appendix}'.\MessageBreak + Nevertheless, some effects may end with\MessageBreak + `\string\end{appendix}' and the document may become\MessageBreak + inconsistent.\MessageBreak + Because of this, you should remove `\string\end{appendix}'\MessageBreak + and replace `\string\begin{appendix}' by command\MessageBreak + `\string\appendix'% + }% + }{}% + \par% \setcounter{section}{0}% \setcounter{subsection}{0}% \gdef\thesection{\@Alph\c@section}% @@ -3655,16 +3695,16 @@ \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2},reference={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi \ifnumbered{#1}{% @@ -3672,12 +3712,12 @@ \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\scr@ds@tocentry}% + }{\csname the#1\endcsname}{\@currenttocentry}% \fi }{% \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else @@ -3687,13 +3727,13 @@ \endgroup \fi \typeout{#1 without number}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \hy@insteadofrefstepcounter{#1}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{}{\scr@ds@tocentry}% + }{}{\@currenttocentry}% \fi }% \begingroup @@ -3709,7 +3749,7 @@ \expandafter\ifx\csname #1mark\endcsname\@gobble \@mkboth{}{}% \else - \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% + \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \fi \par \endgroup @@ -4233,7 +4273,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -4657,11 +4697,29 @@ \cap@margin \begingroup \ifonelinecaptions - \let\stepcounter\@gobble - \let\refstepcounter\@gobble + \def\stepcounter##1{\advance\value{##1}\@ne}% + \let\refstepcounter\stepcounter \let\label\@gobble \let\@footnotetext=\@gobble \let\hypertarget\@gobbletwo + \edef\@xnewline{% + \unexpanded{\ClassInfo{\KOMAClassName}{% + Workaround for not recommended usage of \string\\ or\MessageBreak + \string\newline in caption text + }% + \hspace*{\linewidth}\hspace{1sp}% + }% + \unexpanded\expandafter{\@xnewline}% + }% + \edef\@xcentercr{% + \unexpanded{\ClassInfo{\KOMAClassName}{% + Workaround for not recommended usage of \string\\ or\MessageBreak + \string\newline in caption text + }% + \hspace*{\linewidth}\hspace{1sp}% + }% + \unexpanded\expandafter{\@xcentercr}% + }% \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}% \ifdim\@tempdima>\linewidth \aftergroup\scr@makemultilinecaption @@ -4905,7 +4963,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -4958,28 +5016,46 @@ \ftn@rule@test@values } \newcommand\deffootnote[4][]{% - \long\def\@makefntext##1{% - \setlength{\@tempdimc}{#3}% - \def\@tempa{#1}\ifx\@tempa\@empty - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#2}% - \parshape \@ne #2 \@tempdima}% - \else - \addtolength{\@tempdimc}{#2}% - \addtolength{\@tempdimc}{-#1}% - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#1}% - \@tempdimb = \hsize - \addtolength{\@tempdimb}{-#2}% - \parshape \tw@ #1 \@tempdima #2 \@tempdimb + \expandafter\ifnum\scr@v@is@ge{3.22}\relax + \long\def\@makefntext##1{% + \leftskip #2 + \l@addto@macro\@trivlist{% + \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi }% - \fi - \par - \parindent\@tempdimc\noindent - \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% - }% + \parindent #3\noindent + \IfArgIsEmpty{#1}{}{% + \hskip \dimexpr #1-#2\relax + }% + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \else + \ClassInfo{\KOMAClassName}{% + Using old \string\@makefntext\space due to compatibility + level\MessageBreak + less than 3.22}% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \parshape \@ne #2 \@tempdima}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \parshape \tw@ #1 \@tempdima #2 \@tempdimb + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \newcommand*{\ftn@font}{\normalfont} @@ -5316,7 +5392,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -5420,22 +5496,24 @@ } \newenvironment{addmargin*}{% \@tempswafalse - \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi - \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% + \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}\fi \@addmargin }{% - \unskip\nobreak\ifthispageodd{}{}% - \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else - \ClassWarning{\KOMAClassName}{% - page break inside `addmargin*' environment.\MessageBreak - A `addmargin*' environment starting on page - \scr@addmargin@startpage\MessageBreak - ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak - This will result in potential wrong margins on\MessageBreak - every other page.\MessageBreak - So maybe you should change the `addmargin*'\MessageBreak - environment, that ends% - }% + \if@twoside + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \ClassWarning{\KOMAClassName}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \fi \advance\@listdepth\@ne \endlist @@ -5454,13 +5532,19 @@ \setlength{\listparindent}{\parindent}% \setlength{\itemsep}{\parskip}% \setlength{\itemindent}{\z@}% + \setlength{\@tempskipa}{\topsep}% \setlength{\topsep}{\z@}% \setlength{\parsep}{\parskip}% + \setlength{\@tempskipb}{\partopsep}% \setlength{\partopsep}{\z@}% \let\makelabel\@gobble \setlength{\labelwidth}{\z@}% \advance\@listdepth\m@ne }% + \expandafter\ifnum\scr@v@is@ge{3.22}% + \setlength{\topsep}{\@tempskipa}% + \setlength{\partopsep}{\@tempskipb}% + \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } \newcommand*\descfont{\@gr@gsffamily\bfseries} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 7f6ce060e4f..fa551e44c7b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -393,9 +393,9 @@ %%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ %%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $ \RequirePackage{scrlfile}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index f5f665690fd..61b1cb08d69 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -81,7 +81,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -103,7 +103,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -118,23 +118,23 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ \RequirePackage{tocbasic}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -210,7 +210,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -335,7 +335,8 @@ \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} -\@namedef{scr@v@last}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@last}{16} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -375,7 +376,7 @@ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } %%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\@ptsize{% 11% } @@ -460,7 +461,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -766,9 +767,9 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1134,7 +1135,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1268,7 +1269,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1859,8 +1860,8 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} @@ -1870,8 +1871,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2285,15 +2286,15 @@ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{% You should note that since 1994 LaTeX2e provides a new font selection scheme\MessageBreak - called NFSS2 with several new, combinable font commands. New + called NFSS2 with several new, combinable font commands. KOMA-Script\MessageBreak - classes have defined the old font commands like `\string#1' + classes had defined the old font commands like `\string#1' only for compatibility\MessageBreak with old LaTeX 2.09 document styles of Script 2.0. Nevertheless, these\MessageBreak - commands are deprecated and undocumented at least since - 2003. Since 2013\MessageBreak - KOMA-Script classes warn abouts soon removement of these deprecated + commands are deprecated and undocumented at least since 2003. Since + 2013\MessageBreak + KOMA-Script classes warned about soon removement of these deprecated commands.\MessageBreak Now, after two decades of LaTeX2e and NFSS2, these commands will not work any\MessageBreak @@ -2323,11 +2324,11 @@ You should note, that since 1994 LaTeX2e provides a\MessageBreak new font selection scheme called NFSS2 with several\MessageBreak new, combinable font commands. New KOMA-Script classes\MessageBreak - have defined the old font commands like `\string#1' only for\MessageBreak + defined the old font commands like `\string#1' only for\MessageBreak compatibility with LaTeX 2.09 document styles of\MessageBreak Script 2.0. These commands are deprecated and\MessageBreak undocumented at least since 2003. Since 2013,\MessageBreak - KOMA-Script classes warn about soon removement of\MessageBreak + KOMA-Script classes warned about soon removement of\MessageBreak these deprecated commands. Now, after two decades of\MessageBreak LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak not work any longer. If loading a package results in\MessageBreak @@ -2357,7 +2358,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2837,10 +2838,10 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2854,7 +2855,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -2874,17 +2875,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -3108,16 +3109,16 @@ \scr@istest#7=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#8},head={#8},#7}% + \setkeys{KOMAarg.section}{tocentry={#8},head={#8},reference={#8},#7}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \or - \setkeys{KOMAarg.section}{tocentry={#8},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#8},head={#7},reference={#8}}% \or - \setkeys{KOMAarg.section}{tocentry={#7},head={#8}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#8},reference={#7}}% \or - \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \fi \fi \let\IfUsePrefixLine\@secondoftwo @@ -3134,8 +3135,8 @@ #6{\nobreak\interlinepenalty \@M \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup - \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% - \ifx\scr@ds@tocentry\@empty\else + \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def \csname add#1tocentry\endcsname##1##2{% @@ -3143,18 +3144,18 @@ }% }{}% \ifnum \numexpr #2\relax>\c@secnumdepth - \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% + \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \scr@ds@tocentry}% + \@currenttocentry}% \fi \fi \else \def\@svsechd{% #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% - \expandafter\csname #1mark\expandafter\endcsname - \expandafter{\scr@ds@head}% - \ifx\scr@ds@tocentry\@empty\else + \expandafter\csname #1mark\expandafter\endcsname + \expandafter{\@currentheadentry}% + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def \csname add#1tocentry\endcsname####1####2{% @@ -3162,10 +3163,10 @@ }% }{}% \ifnum \numexpr #2\relax>\c@secnumdepth - \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% + \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \scr@ds@tocentry}% + \@currenttocentry}% \fi \fi }% @@ -3175,10 +3176,30 @@ } \DefineFamily{KOMAarg} \DefineFamilyMember[.section]{KOMAarg} -\DefineFamilyKey[.section]{KOMAarg}{tocentry}{\def\scr@ds@tocentry{#1}} -\DefineFamilyKey[.section]{KOMAarg}{head}{\def\scr@ds@head{#1}} -\newcommand*\scr@ds@tocentry{} -\newcommand*\scr@ds@head{} +\providecommand*\@currenttocentry{} +\providecommand*\@currentheadentry{} +\providecommand*\@currentlabelname{} +\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry} +\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry} +\DefineFamilyKey[.section]{KOMAarg}{reference}{% + \scr@ifundefinedorrelax{NR@gettitle}{% + \scr@ifundefinedorrelax{GetTitleString}{% + \def\@currentlabelname{#1}% + }{% + \GetTitleString{#1}% + \let\@currentlabelname\GetTitleStringResult + }% + }{% + \NR@gettitle{#1}% + }% + \scr@ifundefinedorrelax{TR@gettitle}{}{% + \expandafter\TR@gettitle\expandafter{\@currentlabelname}% + }% + \scr@ifundefinedorrelax{ztitlerefsetup}{}{% + \ztitlerefsetup{title=\@currentlabelname}% + }% + \FamilyKeyStateProcessed +} \newcommand*{\scr@istest}{} \def\scr@istest#1=#2\@nil{% \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi @@ -4001,7 +4022,26 @@ \newcommand*\backmatter{% \if@openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse } -\newcommand*\appendix{\par% +\newcommand*\appendix{% + \ifstr{\@currenvir}{appendix}{% + \ClassWarning{\KOMAClassName}{% + You are using + `\string\begin{appendix}...\string\end{appendix}'.\MessageBreak + You should note, that `\string\appendix' is a mostly + globally\MessageBreak + working command not an enviroment with only local\MessageBreak + effects. Therefore `\string\end{appendix}' will neither\MessageBreak + switch back to normal section numbering nor finish\MessageBreak + every other effect of `\string\begin{appendix}'.\MessageBreak + Nevertheless, some effects may end with\MessageBreak + `\string\end{appendix}' and the document may become\MessageBreak + inconsistent.\MessageBreak + Because of this, you should remove `\string\end{appendix}'\MessageBreak + and replace `\string\begin{appendix}' by command\MessageBreak + `\string\appendix'% + }% + }{}% + \par% \setcounter{chapter}{0}% \setcounter{section}{0}% \gdef\@chapapp{\appendixname}% @@ -4036,16 +4076,16 @@ \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2},reference={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi \ifnumbered{#1}{% @@ -4053,12 +4093,12 @@ \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\scr@ds@tocentry}% + }{\csname the#1\endcsname}{\@currenttocentry}% \fi }{% \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else @@ -4068,13 +4108,13 @@ \endgroup \fi \typeout{#1 without number}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \hy@insteadofrefstepcounter{#1}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{}{\scr@ds@tocentry}% + }{}{\@currenttocentry}% \fi }% \begingroup @@ -4091,7 +4131,7 @@ \expandafter\ifx\csname #1mark\endcsname\@gobble \@mkboth{}{}% \else - \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% + \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \fi \par \endgroup @@ -4201,16 +4241,16 @@ \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2},reference={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi \ifnumbered{#1}{% @@ -4222,12 +4262,12 @@ \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\scr@ds@tocentry}% + }{\csname the#1\endcsname}{\@currenttocentry}% \fi \else \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else @@ -4237,16 +4277,16 @@ \endgroup \fi \typeout{#1 without number}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \hy@insteadofrefstepcounter{#1}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{}{\scr@ds@tocentry}% + }{}{\@currenttocentry}% \fi \fi - \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% + \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifdim \@chapterlistsgap>\z@ \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -4304,7 +4344,9 @@ } \newcommand*{\scr@@makechapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else + \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \fi \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}% @@ -4355,7 +4397,9 @@ } \newcommand*{\scr@@makeschapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else + \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \fi \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}% @@ -4984,7 +5028,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -5408,11 +5452,29 @@ \cap@margin \begingroup \ifonelinecaptions - \let\stepcounter\@gobble - \let\refstepcounter\@gobble + \def\stepcounter##1{\advance\value{##1}\@ne}% + \let\refstepcounter\stepcounter \let\label\@gobble \let\@footnotetext=\@gobble \let\hypertarget\@gobbletwo + \edef\@xnewline{% + \unexpanded{\ClassInfo{\KOMAClassName}{% + Workaround for not recommended usage of \string\\ or\MessageBreak + \string\newline in caption text + }% + \hspace*{\linewidth}\hspace{1sp}% + }% + \unexpanded\expandafter{\@xnewline}% + }% + \edef\@xcentercr{% + \unexpanded{\ClassInfo{\KOMAClassName}{% + Workaround for not recommended usage of \string\\ or\MessageBreak + \string\newline in caption text + }% + \hspace*{\linewidth}\hspace{1sp}% + }% + \unexpanded\expandafter{\@xcentercr}% + }% \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}% \ifdim\@tempdima>\linewidth \aftergroup\scr@makemultilinecaption @@ -5668,7 +5730,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5722,28 +5784,46 @@ } \@addtoreset{footnote}{chapter} \newcommand\deffootnote[4][]{% - \long\def\@makefntext##1{% - \setlength{\@tempdimc}{#3}% - \def\@tempa{#1}\ifx\@tempa\@empty - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#2}% - \parshape \@ne #2 \@tempdima}% - \else - \addtolength{\@tempdimc}{#2}% - \addtolength{\@tempdimc}{-#1}% - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#1}% - \@tempdimb = \hsize - \addtolength{\@tempdimb}{-#2}% - \parshape \tw@ #1 \@tempdima #2 \@tempdimb + \expandafter\ifnum\scr@v@is@ge{3.22}\relax + \long\def\@makefntext##1{% + \leftskip #2 + \l@addto@macro\@trivlist{% + \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi }% - \fi - \par - \parindent\@tempdimc\noindent - \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% - }% + \parindent #3\noindent + \IfArgIsEmpty{#1}{}{% + \hskip \dimexpr #1-#2\relax + }% + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \else + \ClassInfo{\KOMAClassName}{% + Using old \string\@makefntext\space due to compatibility + level\MessageBreak + less than 3.22}% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \parshape \@ne #2 \@tempdima}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \parshape \tw@ #1 \@tempdima #2 \@tempdimb + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \newcommand*{\ftn@font}{\normalfont} @@ -6088,7 +6168,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -6192,22 +6272,24 @@ } \newenvironment{addmargin*}{% \@tempswafalse - \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi - \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% + \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}\fi \@addmargin }{% - \unskip\nobreak\ifthispageodd{}{}% - \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else - \ClassWarning{\KOMAClassName}{% - page break inside `addmargin*' environment.\MessageBreak - A `addmargin*' environment starting on page - \scr@addmargin@startpage\MessageBreak - ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak - This will result in potential wrong margins on\MessageBreak - every other page.\MessageBreak - So maybe you should change the `addmargin*'\MessageBreak - environment, that ends% - }% + \if@twoside + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \ClassWarning{\KOMAClassName}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \fi \advance\@listdepth\@ne \endlist @@ -6226,13 +6308,19 @@ \setlength{\listparindent}{\parindent}% \setlength{\itemsep}{\parskip}% \setlength{\itemindent}{\z@}% + \setlength{\@tempskipa}{\topsep}% \setlength{\topsep}{\z@}% \setlength{\parsep}{\parskip}% + \setlength{\@tempskipb}{\partopsep}% \setlength{\partopsep}{\z@}% \let\makelabel\@gobble \setlength{\labelwidth}{\z@}% \advance\@listdepth\m@ne }% + \expandafter\ifnum\scr@v@is@ge{3.22}% + \setlength{\topsep}{\@tempskipa}% + \setlength{\partopsep}{\@tempskipb}% + \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } \newcommand*\descfont{\@gr@gsffamily\bfseries} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 3f495bddb41..5827f5b9579 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 9edeffc09b7..664bbc62983 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -76,7 +76,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -98,7 +98,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -106,7 +106,7 @@ } %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ \ProvidesPackage{scrextend}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -130,9 +130,9 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ @@ -158,7 +158,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -264,7 +264,8 @@ \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} -\@namedef{scr@v@last}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@last}{16} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -304,7 +305,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil @@ -383,7 +384,7 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: option) %%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ \KOMA@key{cleardoublepage}{% @@ -466,8 +467,8 @@ {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -537,13 +538,13 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: execoption) %%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -1210,7 +1211,7 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} @@ -1297,34 +1298,52 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } %%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \newcommand\deffootnote[4][]{% - \long\def\@makefntext##1{% - \setlength{\@tempdimc}{#3}% - \def\@tempa{#1}\ifx\@tempa\@empty - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#2}% - \parshape \@ne #2 \@tempdima}% - \else - \addtolength{\@tempdimc}{#2}% - \addtolength{\@tempdimc}{-#1}% - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#1}% - \@tempdimb = \hsize - \addtolength{\@tempdimb}{-#2}% - \parshape \tw@ #1 \@tempdima #2 \@tempdimb + \expandafter\ifnum\scr@v@is@ge{3.22}\relax + \long\def\@makefntext##1{% + \leftskip #2 + \l@addto@macro\@trivlist{% + \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi }% - \fi - \par - \parindent\@tempdimc\noindent - \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% - }% + \parindent #3\noindent + \IfArgIsEmpty{#1}{}{% + \hskip \dimexpr #1-#2\relax + }% + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \else + \PackageInfo{scrextend}{% + Using old \string\@makefntext\space due to compatibility + level\MessageBreak + less than 3.22}% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \parshape \@ne #2 \@tempdima}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \parshape \tw@ #1 \@tempdima #2 \@tempdimb + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \newcommand*{\ftn@font}{\normalfont} @@ -1412,7 +1431,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% \list{}{\settowidth{\labelwidth}{{% @@ -1437,22 +1456,24 @@ } \newenvironment{addmargin*}{% \@tempswafalse - \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi - \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% + \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}\fi \@addmargin }{% - \unskip\nobreak\ifthispageodd{}{}% - \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else - \PackageWarning{scrextend}{% - page break inside `addmargin*' environment.\MessageBreak - A `addmargin*' environment starting on page - \scr@addmargin@startpage\MessageBreak - ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak - This will result in potential wrong margins on\MessageBreak - every other page.\MessageBreak - So maybe you should change the `addmargin*'\MessageBreak - environment, that ends% - }% + \if@twoside + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \PackageWarning{scrextend}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \fi \advance\@listdepth\@ne \endlist @@ -1471,13 +1492,19 @@ \setlength{\listparindent}{\parindent}% \setlength{\itemsep}{\parskip}% \setlength{\itemindent}{\z@}% + \setlength{\@tempskipa}{\topsep}% \setlength{\topsep}{\z@}% \setlength{\parsep}{\parskip}% + \setlength{\@tempskipb}{\partopsep}% \setlength{\partopsep}{\z@}% \let\makelabel\@gobble \setlength{\labelwidth}{\z@}% \advance\@listdepth\m@ne }% + \expandafter\ifnum\scr@v@is@ge{3.22}% + \setlength{\topsep}{\@tempskipa}% + \setlength{\partopsep}{\@tempskipb}% + \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } \newkomafont{labelinglabel}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index baed4ff8abe..02fcae34fac 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,19 +64,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \ProvidesPackage{scrfontsizes}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% \ifstr{#1}{scrsize}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 4ea3f39a643..22842747299 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,10 +74,10 @@ %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ %%% using: package,option diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 9a56b1d0e22..2f3b7be277c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] @@ -241,12 +241,12 @@ \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ %%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $ \RequirePackage{scrlfile}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% } @@ -345,10 +345,10 @@ \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{% \edef\reserved@a{\noexpand\endgroup \noexpand#1{% - You've used obsolete option `#2'.\noexpand\MessageBreak + You've used obsolete option `\detokenize{#2}'.\noexpand\MessageBreak Usage of this option is deprecated.\noexpand\MessageBreak - You should simply replace `#2'\noexpand\MessageBreak - by `#3'% + You should simply replace `\detokenize{#2}'\noexpand\MessageBreak + by `\detokenize{#3}'% }% \noexpand\KOMAExecuteOptions{#3}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}% @@ -356,14 +356,14 @@ }{% \edef\reserved@a{\noexpand\endgroup \noexpand#1{% - You've used obsolete option `#2'.\noexpand\MessageBreak + You've used obsolete option `\detokenize{#2}'.\noexpand\MessageBreak Usage of this option indicates an old document\noexpand\MessageBreak and changes compatibility level using\noexpand\MessageBreak - `#3,version=first,\noexpand\MessageBreak + `\detokenize{#3},version=first,\noexpand\MessageBreak enabledeprecatedfontcommands' that may result\noexpand\MessageBreak in further warnings.\noexpand\MessageBreak If you don't want this, you should simply\noexpand\MessageBreak - replace option `#2' by `#3'% + replace option `\detokenize{#2}' by `\detokenize{#3}'% }% \noexpand\KOMAExecuteOptions{% #3,version=first}% @@ -414,7 +414,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*{\IfExistskomafont}[1]{% \@ifundefined{scr@fnt@#1}{% \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}% 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 4d1496aaf06..fd90da4263d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -46,13 +46,13 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (identify) +%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2016/03/25 v0.1.2398 KOMA-Script + 2016/06/28 v0.1.2483 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -63,7 +63,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (init) +%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% \scr@ifundefinedorrelax{savepos}{% @@ -73,16 +73,16 @@ }% }{% \let\scr@savepos\pdfsavepos - \scr@ifundefinedorrelax{pdflastypos}{% - \scr@ifundefinedorrelax{lastypos}{% - \expandafter\@tempswafalse - }{% - \let\scr@lastypos\lastypos - }% +} +\scr@ifundefinedorrelax{pdflastypos}{% + \scr@ifundefinedorrelax{lastypos}{% + \expandafter\@tempswafalse }{% - \let\scr@lastypos\pdflastypos + \let\scr@lastypos\lastypos }% -} +}{% + \let\scr@lastypos\pdflastypos +}% \if@tempswa\else \PackageError{scrlayer-notecolumn}{missing pdfTeX/luaTeX features}{% This package needs \string\pdfsavepos\space or \string\savepos\space @@ -95,7 +95,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -138,9 +138,21 @@ \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% \if@chapter - \automark[section]{chapter}% + \scr@ifundefinedorrelax{section}{% + \automark{chapter}% + }{% + \automark[section]{chapter}% + }% \else - \automark[subsection]{section}% + \scr@ifundefinedorrelax{section}{% + \automark{}% + }{% + \scr@ifundefinedorrelax{subsection}{% + \automark{section}% + }{% + \automark[subsection]{section}% + } + }% \fi }% \FamilyKeyStateProcessed @@ -224,11 +236,11 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (options) +%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (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 2429 2016-04-12 12:10:19Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax @@ -299,7 +311,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 2398 2016-03-25 10:22:23Z kohm $ (body) +%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (body) \scrlayerAddToInterface\DeclareNoteColumn{% \newcommand*{\DeclareNoteColumn}[2][]{% \@ifundefined{slnc@#2@box}{% 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 67a98cc3262..1c12010434b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -48,10 +48,10 @@ %%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -78,7 +78,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% \begingroup @@ -123,9 +123,21 @@ \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% \if@chapter - \automark[section]{chapter}% + \scr@ifundefinedorrelax{section}{% + \automark{chapter}% + }{% + \automark[section]{chapter}% + }% \else - \automark[subsection]{section}% + \scr@ifundefinedorrelax{section}{% + \automark{}% + }{% + \scr@ifundefinedorrelax{subsection}{% + \automark{section}% + }{% + \automark[subsection]{section}% + } + }% \fi }% \FamilyKeyStateProcessed @@ -694,7 +706,7 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}% \scrlayer@AddCsToInterface{sls@leavevmode@linetrue} \scrlayer@AddCsToInterface{sls@leavevmode@linefalse} -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 6584f9057a9..af8f7729828 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,13 +43,13 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -113,7 +113,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -173,9 +173,21 @@ \scrlayer@testunexpectedarg{automark}{#1}% \scrlayer@AtEndOfPackage{% \if@chapter - \automark[section]{chapter}% + \scr@ifundefinedorrelax{section}{% + \automark{chapter}% + }{% + \automark[section]{chapter}% + }% \else - \automark[subsection]{section}% + \scr@ifundefinedorrelax{section}{% + \automark{}% + }{% + \scr@ifundefinedorrelax{subsection}{% + \automark{section}% + }{% + \automark[subsection]{section}% + } + }% \fi }% \FamilyKeyStateProcessed @@ -265,7 +277,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} \newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty} @@ -703,8 +715,6 @@ \DefineFamilyKey[.definelayer]{KOMAarg}{everypage}[\relax]{% \FamilyKeyStateProcessed \scrlayer@testunexpectedarg{everypage}{#1}% - \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname - \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname \csname @scr@l@\scr@current@layer @oddtrue\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname @@ -733,7 +743,9 @@ \scrlayer@testunexpectedarg{unrestricted}{#1}% \csname @scr@l@\scr@current@layer @oddtrue\endcsname \csname @scr@l@\scr@current@layer @eventrue\endcsname - \csname @scr@l@\scr@current@layer @nonfloatpagefalse\endcsname + \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname + \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname + \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname \csname @scr@l@\scr@current@layer @twosidetrue\endcsname \csname @scr@l@\scr@current@layer @onesidetrue\endcsname @@ -2150,7 +2162,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 2429 2016-04-12 12:10:19Z kohm $ (final) +%%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 8a7e1b1e5e5..52ccd34d02b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -60,7 +60,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,17 +82,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% @@ -162,11 +162,11 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ %%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -688,7 +688,7 @@ %%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \newcommand*{\LoadLetterOption}[1]{% @@ -1605,14 +1605,14 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% {\centering\usekomafont{fromaddress}{% \ifkomavarempty{fromname}{}{% {\usekomafont{fromname}% - {\ignorespaces\usekomavar{fromname}}}\\[-8pt] + {\ignorespaces\usekomavar{fromname}}\\[-8pt]} {\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\ }% \ifkomavarempty{fromaddress}{}{% @@ -2143,8 +2143,8 @@ \addtolengthplength[-2]{\@tempdima}{toaddrindent}% \vbox{\hsize\@tempdima\raggedright \usekomafont{addressee}{% - \usekomafont{toname}{\usekomavar{toname}\\}% - \usekomafont{toaddress}{\usekomavar{toaddress}}}}% + {\usekomafont{toname}{\usekomavar{toname}\\}}% + {\usekomafont{toaddress}{\usekomavar{toaddress}\endgraf}}}}% \vfil\null\vskip-\baselineskip}% {address field}{toaddrheight}% {\begin{letter} or you\MessageBreak @@ -2292,8 +2292,8 @@ }% \raggedright \usekomafont{addressee}{% - \usekomafont{toname}{\usekomavar{toname}\\}% - \usekomafont{toaddress}{\usekomavar{toaddress}}}}% + {\usekomafont{toname}{\usekomavar{toname}\\}}% + {\usekomafont{toaddress}{\usekomavar{toaddress}\endgraf}}}}% \fi \vss\null}% {address field}{toaddrheight}% @@ -2765,7 +2765,7 @@ \fi\noindent% \begingroup \parbox[t]{\textwidth}{% - \ifkomavarempty{ccseparator}{}{% + \ifkomavarempty*{ccseparator}{}{% \@hangfrom{% \strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}% }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index b85916f62d8..6b165f5fb4c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $ \ProvidesPackage{scrlfile}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% ^^J\@spaces\@spaces\@spaces\@spaces\space\space diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index d2f8649e0d7..fc190203355 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -71,7 +71,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -93,7 +93,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -108,12 +108,12 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -214,7 +214,8 @@ \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} -\@namedef{scr@v@last}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@last}{16} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -283,7 +284,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\@ptsize{% 12% } @@ -370,7 +371,7 @@ } %%% From File: $Id: scrkernel-variables.dtx 2429 2016-04-12 12:10:19Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -748,8 +749,8 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -819,8 +820,8 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1375,7 +1376,7 @@ parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1387,7 +1388,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -1794,15 +1795,15 @@ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{% You should note that since 1994 LaTeX2e provides a new font selection scheme\MessageBreak - called NFSS2 with several new, combinable font commands. New + called NFSS2 with several new, combinable font commands. KOMA-Script\MessageBreak - classes have defined the old font commands like `\string#1' + classes had defined the old font commands like `\string#1' only for compatibility\MessageBreak with old LaTeX 2.09 document styles of Script 2.0. Nevertheless, these\MessageBreak - commands are deprecated and undocumented at least since - 2003. Since 2013\MessageBreak - KOMA-Script classes warn abouts soon removement of these deprecated + commands are deprecated and undocumented at least since 2003. Since + 2013\MessageBreak + KOMA-Script classes warned about soon removement of these deprecated commands.\MessageBreak Now, after two decades of LaTeX2e and NFSS2, these commands will not work any\MessageBreak @@ -1832,11 +1833,11 @@ You should note, that since 1994 LaTeX2e provides a\MessageBreak new font selection scheme called NFSS2 with several\MessageBreak new, combinable font commands. New KOMA-Script classes\MessageBreak - have defined the old font commands like `\string#1' only for\MessageBreak + defined the old font commands like `\string#1' only for\MessageBreak compatibility with LaTeX 2.09 document styles of\MessageBreak Script 2.0. These commands are deprecated and\MessageBreak undocumented at least since 2003. Since 2013,\MessageBreak - KOMA-Script classes warn about soon removement of\MessageBreak + KOMA-Script classes warned about soon removement of\MessageBreak these deprecated commands. Now, after two decades of\MessageBreak LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak not work any longer. If loading a package results in\MessageBreak @@ -2835,7 +2836,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -3069,11 +3070,11 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -3126,28 +3127,46 @@ \ftn@rule@test@values } \newcommand\deffootnote[4][]{% - \long\def\@makefntext##1{% - \setlength{\@tempdimc}{#3}% - \def\@tempa{#1}\ifx\@tempa\@empty - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#2}% - \parshape \@ne #2 \@tempdima}% - \else - \addtolength{\@tempdimc}{#2}% - \addtolength{\@tempdimc}{-#1}% - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#1}% - \@tempdimb = \hsize - \addtolength{\@tempdimb}{-#2}% - \parshape \tw@ #1 \@tempdima #2 \@tempdimb + \expandafter\ifnum\scr@v@is@ge{3.22}\relax + \long\def\@makefntext##1{% + \leftskip #2 + \l@addto@macro\@trivlist{% + \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi }% - \fi - \par - \parindent\@tempdimc\noindent - \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% - }% + \parindent #3\noindent + \IfArgIsEmpty{#1}{}{% + \hskip \dimexpr #1-#2\relax + }% + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \else + \ClassInfo{\KOMAClassName}{% + Using old \string\@makefntext\space due to compatibility + level\MessageBreak + less than 3.22}% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \parshape \@ne #2 \@tempdima}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \parshape \tw@ #1 \@tempdima #2 \@tempdimb + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \newcommand*{\ftn@font}{\normalfont} @@ -3210,7 +3229,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} \setlength{\leftmarginiii}{1.87em} @@ -3305,22 +3324,24 @@ } \newenvironment{addmargin*}{% \@tempswafalse - \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi - \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% + \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}\fi \@addmargin }{% - \unskip\nobreak\ifthispageodd{}{}% - \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else - \ClassWarning{\KOMAClassName}{% - page break inside `addmargin*' environment.\MessageBreak - A `addmargin*' environment starting on page - \scr@addmargin@startpage\MessageBreak - ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak - This will result in potential wrong margins on\MessageBreak - every other page.\MessageBreak - So maybe you should change the `addmargin*'\MessageBreak - environment, that ends% - }% + \if@twoside + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \ClassWarning{\KOMAClassName}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \fi \advance\@listdepth\@ne \endlist @@ -3339,20 +3360,26 @@ \setlength{\listparindent}{\parindent}% \setlength{\itemsep}{\parskip}% \setlength{\itemindent}{\z@}% + \setlength{\@tempskipa}{\topsep}% \setlength{\topsep}{\z@}% \setlength{\parsep}{\parskip}% + \setlength{\@tempskipb}{\partopsep}% \setlength{\partopsep}{\z@}% \let\makelabel\@gobble \setlength{\labelwidth}{\z@}% \advance\@listdepth\m@ne }% + \expandafter\ifnum\scr@v@is@ge{3.22}% + \setlength{\topsep}{\@tempskipa}% + \setlength{\partopsep}{\@tempskipb}% + \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } \newcommand*\descfont{\@gr@gsffamily\bfseries} \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -3367,7 +3394,7 @@ {\centering\usekomafont{fromaddress}{% \ifkomavarempty{fromname}{}{% {\usekomafont{fromname}% - {\ignorespaces\usekomavar{fromname}}}\\[-8pt] + {\ignorespaces\usekomavar{fromname}}\\[-8pt]} {\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\ }% \ifkomavarempty{fromaddress}{}{% @@ -3922,8 +3949,8 @@ \addtolengthplength[-2]{\@tempdima}{toaddrindent}% \vbox{\hsize\@tempdima\raggedright \usekomafont{addressee}{% - \usekomafont{toname}{\usekomavar{toname}\\}% - \usekomafont{toaddress}{\usekomavar{toaddress}}}}% + {\usekomafont{toname}{\usekomavar{toname}\\}}% + {\usekomafont{toaddress}{\usekomavar{toaddress}\endgraf}}}}% \vfil\null\vskip-\baselineskip}% {address field}{toaddrheight}% {\begin{letter} or you\MessageBreak @@ -4071,8 +4098,8 @@ }% \raggedright \usekomafont{addressee}{% - \usekomafont{toname}{\usekomavar{toname}\\}% - \usekomafont{toaddress}{\usekomavar{toaddress}}}}% + {\usekomafont{toname}{\usekomavar{toname}\\}}% + {\usekomafont{toaddress}{\usekomavar{toaddress}\endgraf}}}}% \fi \vss\null}% {address field}{toaddrheight}% @@ -4574,7 +4601,7 @@ \fi\noindent% \begingroup \parbox[t]{\textwidth}{% - \ifkomavarempty{ccseparator}{}{% + \ifkomavarempty*{ccseparator}{}{% \@hangfrom{% \strut\usekomavar*{ccseparator}\usekomavar{ccseparator}}% }% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index 919946d9f73..6bd73a0b2ef 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty @@ -42,7 +42,7 @@ %%% From File: $Id: scrpage.dtx 2428 2016-04-12 10:31:07Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (page head and foot)] \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 1c1d0b789c4..ce361cb443c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -81,7 +81,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -103,7 +103,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -118,23 +118,23 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ \RequirePackage{tocbasic}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -210,7 +210,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -336,7 +336,8 @@ \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} -\@namedef{scr@v@last}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@last}{16} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -376,7 +377,7 @@ \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } %%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\@ptsize{% 11% } @@ -461,7 +462,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -770,9 +771,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1138,7 +1139,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1272,7 +1273,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1863,8 +1864,8 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} @@ -1874,8 +1875,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2282,15 +2283,15 @@ \ClassError{\KOMAClassName}{undefined old font command `\string#1'}{% You should note that since 1994 LaTeX2e provides a new font selection scheme\MessageBreak - called NFSS2 with several new, combinable font commands. New + called NFSS2 with several new, combinable font commands. KOMA-Script\MessageBreak - classes have defined the old font commands like `\string#1' + classes had defined the old font commands like `\string#1' only for compatibility\MessageBreak with old LaTeX 2.09 document styles of Script 2.0. Nevertheless, these\MessageBreak - commands are deprecated and undocumented at least since - 2003. Since 2013\MessageBreak - KOMA-Script classes warn abouts soon removement of these deprecated + commands are deprecated and undocumented at least since 2003. Since + 2013\MessageBreak + KOMA-Script classes warned about soon removement of these deprecated commands.\MessageBreak Now, after two decades of LaTeX2e and NFSS2, these commands will not work any\MessageBreak @@ -2320,11 +2321,11 @@ You should note, that since 1994 LaTeX2e provides a\MessageBreak new font selection scheme called NFSS2 with several\MessageBreak new, combinable font commands. New KOMA-Script classes\MessageBreak - have defined the old font commands like `\string#1' only for\MessageBreak + defined the old font commands like `\string#1' only for\MessageBreak compatibility with LaTeX 2.09 document styles of\MessageBreak Script 2.0. These commands are deprecated and\MessageBreak undocumented at least since 2003. Since 2013,\MessageBreak - KOMA-Script classes warn about soon removement of\MessageBreak + KOMA-Script classes warned about soon removement of\MessageBreak these deprecated commands. Now, after two decades of\MessageBreak LaTeX2e, NFSS2, and KOMA-Script these commands will\MessageBreak not work any longer. If loading a package results in\MessageBreak @@ -2354,7 +2355,7 @@ January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2868,10 +2869,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2885,7 +2886,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,chapter) \CloneTOCEntryStyle{tocline}{chapter} \TOCEntryStyleStartInitCode{chapter}{% @@ -2905,17 +2906,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{section}{default} -%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -3139,16 +3140,16 @@ \scr@istest#7=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#8},head={#8},#7}% + \setkeys{KOMAarg.section}{tocentry={#8},head={#8},reference={#8},#7}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \or - \setkeys{KOMAarg.section}{tocentry={#8},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#8},head={#7},reference={#8}}% \or - \setkeys{KOMAarg.section}{tocentry={#7},head={#8}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#8},reference={#7}}% \or - \setkeys{KOMAarg.section}{tocentry={#7},head={#7}}% + \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \fi \fi \let\IfUsePrefixLine\@secondoftwo @@ -3165,8 +3166,8 @@ #6{\nobreak\interlinepenalty \@M \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup - \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% - \ifx\scr@ds@tocentry\@empty\else + \expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def \csname add#1tocentry\endcsname##1##2{% @@ -3174,18 +3175,18 @@ }% }{}% \ifnum \numexpr #2\relax>\c@secnumdepth - \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% + \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \scr@ds@tocentry}% + \@currenttocentry}% \fi \fi \else \def\@svsechd{% #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% - \expandafter\csname #1mark\expandafter\endcsname - \expandafter{\scr@ds@head}% - \ifx\scr@ds@tocentry\@empty\else + \expandafter\csname #1mark\expandafter\endcsname + \expandafter{\@currentheadentry}% + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \expandafter\global\expandafter\def \csname add#1tocentry\endcsname####1####2{% @@ -3193,10 +3194,10 @@ }% }{}% \ifnum \numexpr #2\relax>\c@secnumdepth - \csname add#1tocentry\endcsname{}{\scr@ds@tocentry}% + \csname add#1tocentry\endcsname{}{\@currenttocentry}% \else \csname add#1tocentry\endcsname{\csname the#1\endcsname}{% - \scr@ds@tocentry}% + \@currenttocentry}% \fi \fi }% @@ -3206,10 +3207,30 @@ } \DefineFamily{KOMAarg} \DefineFamilyMember[.section]{KOMAarg} -\DefineFamilyKey[.section]{KOMAarg}{tocentry}{\def\scr@ds@tocentry{#1}} -\DefineFamilyKey[.section]{KOMAarg}{head}{\def\scr@ds@head{#1}} -\newcommand*\scr@ds@tocentry{} -\newcommand*\scr@ds@head{} +\providecommand*\@currenttocentry{} +\providecommand*\@currentheadentry{} +\providecommand*\@currentlabelname{} +\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry} +\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry} +\DefineFamilyKey[.section]{KOMAarg}{reference}{% + \scr@ifundefinedorrelax{NR@gettitle}{% + \scr@ifundefinedorrelax{GetTitleString}{% + \def\@currentlabelname{#1}% + }{% + \GetTitleString{#1}% + \let\@currentlabelname\GetTitleStringResult + }% + }{% + \NR@gettitle{#1}% + }% + \scr@ifundefinedorrelax{TR@gettitle}{}{% + \expandafter\TR@gettitle\expandafter{\@currentlabelname}% + }% + \scr@ifundefinedorrelax{ztitlerefsetup}{}{% + \ztitlerefsetup{title=\@currentlabelname}% + }% + \FamilyKeyStateProcessed +} \newcommand*{\scr@istest}{} \def\scr@istest#1=#2\@nil{% \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi @@ -4020,7 +4041,26 @@ \@dottedtocline{#1}{#2}{#3}{#4}{#5}% \fi } -\newcommand*\appendix{\par% +\newcommand*\appendix{% + \ifstr{\@currenvir}{appendix}{% + \ClassWarning{\KOMAClassName}{% + You are using + `\string\begin{appendix}...\string\end{appendix}'.\MessageBreak + You should note, that `\string\appendix' is a mostly + globally\MessageBreak + working command not an enviroment with only local\MessageBreak + effects. Therefore `\string\end{appendix}' will neither\MessageBreak + switch back to normal section numbering nor finish\MessageBreak + every other effect of `\string\begin{appendix}'.\MessageBreak + Nevertheless, some effects may end with\MessageBreak + `\string\end{appendix}' and the document may become\MessageBreak + inconsistent.\MessageBreak + Because of this, you should remove `\string\end{appendix}'\MessageBreak + and replace `\string\begin{appendix}' by command\MessageBreak + `\string\appendix'% + }% + }{}% + \par% \setcounter{chapter}{0}% \setcounter{section}{0}% \gdef\@chapapp{\appendixname}% @@ -4055,16 +4095,16 @@ \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2},reference={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi \ifnumbered{#1}{% @@ -4072,12 +4112,12 @@ \@maybeautodot\thepart% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\scr@ds@tocentry}% + }{\csname the#1\endcsname}{\@currenttocentry}% \fi }{% \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else @@ -4087,13 +4127,13 @@ \endgroup \fi \typeout{#1 without number}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \hy@insteadofrefstepcounter{#1}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{}{\scr@ds@tocentry}% + }{}{\@currenttocentry}% \fi }% \begingroup @@ -4110,7 +4150,7 @@ \expandafter\ifx\csname #1mark\endcsname\@gobble \@mkboth{}{}% \else - \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% + \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \fi \par \endgroup @@ -4220,16 +4260,16 @@ \scr@istest#2=\@nil \fi \if@scr@tempswa - \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}% \else \ifcase \scr@osectarg\relax - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#3},head={#2},reference={#3}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#3},reference={#2}}% \or - \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}% + \setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}% \fi \fi \ifnumbered{#1}{% @@ -4239,12 +4279,12 @@ \refstepcounter{#1}% \expandafter\@maybeautodot\csname the#1\endcsname \typeout{#1 \csname the#1\endcsname.}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{\csname the#1\endcsname}{\scr@ds@tocentry}% + }{\csname the#1\endcsname}{\@currenttocentry}% \fi \else \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else @@ -4254,16 +4294,16 @@ \endgroup \fi \typeout{#1 without number}% - \ifx\scr@ds@tocentry\@empty\else + \ifx\@currenttocentry\@empty\else \hy@insteadofrefstepcounter{#1}% \scr@ifundefinedorrelax{add#1tocentry}{% \addtocentrydefault{#1}% }{% \@nameuse{add#1tocentry}% - }{}{\scr@ds@tocentry}% + }{}{\@currenttocentry}% \fi \fi - \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% + \csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}% \ifdim \@chapterlistsgap>\z@ \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -4321,7 +4361,9 @@ } \newcommand*{\scr@@makechapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else + \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \fi \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}% @@ -4371,7 +4413,9 @@ } \newcommand*{\scr@@makeschapterhead}[2]{% \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax - \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi + \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\else + \expandafter\ifnum\scr@v@is@ge{3.22}\@afterindenttrue\fi + \fi \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}% @@ -4980,7 +5024,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -5404,11 +5448,29 @@ \cap@margin \begingroup \ifonelinecaptions - \let\stepcounter\@gobble - \let\refstepcounter\@gobble + \def\stepcounter##1{\advance\value{##1}\@ne}% + \let\refstepcounter\stepcounter \let\label\@gobble \let\@footnotetext=\@gobble \let\hypertarget\@gobbletwo + \edef\@xnewline{% + \unexpanded{\ClassInfo{\KOMAClassName}{% + Workaround for not recommended usage of \string\\ or\MessageBreak + \string\newline in caption text + }% + \hspace*{\linewidth}\hspace{1sp}% + }% + \unexpanded\expandafter{\@xnewline}% + }% + \edef\@xcentercr{% + \unexpanded{\ClassInfo{\KOMAClassName}{% + Workaround for not recommended usage of \string\\ or\MessageBreak + \string\newline in caption text + }% + \hspace*{\linewidth}\hspace{1sp}% + }% + \unexpanded\expandafter{\@xcentercr}% + }% \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}% \ifdim\@tempdima>\linewidth \aftergroup\scr@makemultilinecaption @@ -5656,7 +5718,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5710,28 +5772,46 @@ } \@addtoreset{footnote}{chapter} \newcommand\deffootnote[4][]{% - \long\def\@makefntext##1{% - \setlength{\@tempdimc}{#3}% - \def\@tempa{#1}\ifx\@tempa\@empty - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#2}% - \parshape \@ne #2 \@tempdima}% - \else - \addtolength{\@tempdimc}{#2}% - \addtolength{\@tempdimc}{-#1}% - \@setpar{\@@par - \@tempdima = \hsize - \addtolength{\@tempdima}{-#1}% - \@tempdimb = \hsize - \addtolength{\@tempdimb}{-#2}% - \parshape \tw@ #1 \@tempdima #2 \@tempdimb + \expandafter\ifnum\scr@v@is@ge{3.22}\relax + \long\def\@makefntext##1{% + \leftskip #2 + \l@addto@macro\@trivlist{% + \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi }% - \fi - \par - \parindent\@tempdimc\noindent - \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% - }% + \parindent #3\noindent + \IfArgIsEmpty{#1}{}{% + \hskip \dimexpr #1-#2\relax + }% + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \else + \ClassInfo{\KOMAClassName}{% + Using old \string\@makefntext\space due to compatibility + level\MessageBreak + less than 3.22}% + \long\def\@makefntext##1{% + \setlength{\@tempdimc}{#3}% + \def\@tempa{#1}\ifx\@tempa\@empty + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#2}% + \parshape \@ne #2 \@tempdima}% + \else + \addtolength{\@tempdimc}{#2}% + \addtolength{\@tempdimc}{-#1}% + \@setpar{\@@par + \@tempdima = \hsize + \addtolength{\@tempdima}{-#1}% + \@tempdimb = \hsize + \addtolength{\@tempdimb}{-#2}% + \parshape \tw@ #1 \@tempdima #2 \@tempdimb + }% + \fi + \par + \parindent\@tempdimc\noindent + \ftn@font\hbox to \z@{\hss\@@makefnmark}##1% + }% + \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } \newcommand*{\ftn@font}{\normalfont} @@ -6076,7 +6156,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -6180,22 +6260,24 @@ } \newenvironment{addmargin*}{% \@tempswafalse - \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi - \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}% + \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi + \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}\fi \@addmargin }{% - \unskip\nobreak\ifthispageodd{}{}% - \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else - \ClassWarning{\KOMAClassName}{% - page break inside `addmargin*' environment.\MessageBreak - A `addmargin*' environment starting on page - \scr@addmargin@startpage\MessageBreak - ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak - This will result in potential wrong margins on\MessageBreak - every other page.\MessageBreak - So maybe you should change the `addmargin*'\MessageBreak - environment, that ends% - }% + \if@twoside + \unskip\nobreak\ifthispageodd{}{}% + \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else + \ClassWarning{\KOMAClassName}{% + page break inside `addmargin*' environment.\MessageBreak + A `addmargin*' environment starting on page + \scr@addmargin@startpage\MessageBreak + ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak + This will result in potential wrong margins on\MessageBreak + every other page.\MessageBreak + So maybe you should change the `addmargin*'\MessageBreak + environment, that ends% + }% + \fi \fi \advance\@listdepth\@ne \endlist @@ -6214,13 +6296,19 @@ \setlength{\listparindent}{\parindent}% \setlength{\itemsep}{\parskip}% \setlength{\itemindent}{\z@}% + \setlength{\@tempskipa}{\topsep}% \setlength{\topsep}{\z@}% \setlength{\parsep}{\parskip}% + \setlength{\@tempskipb}{\partopsep}% \setlength{\partopsep}{\z@}% \let\makelabel\@gobble \setlength{\labelwidth}{\z@}% \advance\@listdepth\m@ne }% + \expandafter\ifnum\scr@v@is@ge{3.22}% + \setlength{\topsep}{\@tempskipa}% + \setlength{\partopsep}{\@tempskipb}% + \fi \item\is@thispageodd@setlabel\nobreak\ignorespaces } \newcommand*\descfont{\@gr@gsffamily\bfseries} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index f4a27fcf1ce..39647d0e866 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \ProvidesFile{% scrsize10pt.clo% }[\KOMAScriptVersion\space font size class option % diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index 5de94b80233..a65cdbe620b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \ProvidesFile{% scrsize11pt.clo% }[\KOMAScriptVersion\space font size class option % diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 362a971a66e..411025ce160 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index 942a6d76b07..b8e174e6559 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ \newif\if@Hxii diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 6ca55ed666e..d43901bb64b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,11 +62,11 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ \ProvidesFile{setspace.hak}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (hacking package setspace)% diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 0012ad1269a..e1414a045f3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -52,24 +52,24 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: body) \RequirePackage{scrbase} \newcommand*{\tb@listoftocs}{} @@ -129,6 +129,13 @@ }\reserved@a }% } +\newcommand*{\owneroftoc}[2][\@firstofone]{% + \begingroup + \let\reserved@a\endgroup + \def\do##1##2{\ifstr{#2}{##1}{\def\reserved@a{\endgroup#1{##2}}}{}}% + \tb@listoftocs + \reserved@a +} \newcommand*{\AtAddToTocList}{% \kernel@ifnextchar [%] \@@AtAddToTocList\@AtAddToTocList @@ -176,9 +183,10 @@ \edef\reserved@a{##1}% \ifx\reserved@a\reserved@b \begingroup - \edef\reserved@a{##2}% + \edef\@currext{##2}% \edef\reserved@b{#1}% - \ifx\reserved@a\reserved@b\else + \ifx\@currext\reserved@b + \else \g@addto@macro\tb@listoftocs{\do{##1}{##2}}% \fi \endgroup @@ -186,7 +194,7 @@ \g@addto@macro\tb@listoftocs{\do{##1}{##2}}% \fi }% - \edef\reserved@b{#2}\let\tb@listoftocs\@empty + \edef\reserved@b{#2}\global\let\tb@listoftocs\@empty \tb@oldlist \endgroup } @@ -195,11 +203,12 @@ \let\tb@oldlist\tb@listoftocs \def\do##1##2{% \edef\reserved@a{##1}% - \ifx\reserved@a\reserved@b\else + \ifx\reserved@a\reserved@b + \else \g@addto@macro\tb@listoftocs{\do{##1}{##2}}% \fi }% - \edef\reserved@b{#1}\let\tb@listoftocs\@empty + \edef\reserved@b{#1}\global\let\tb@listoftocs\@empty \tb@oldlist \endgroup } @@ -785,6 +794,7 @@ \expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}% \expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext \addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}% + \expandafter\let\csname tb@nt@type@\tb@nt@ext\endcsname\tb@nt@type \scr@ifundefinedorrelax{tb@nt@types}{% \edef\tb@nt@types{\tb@nt@type s}% }{}% @@ -949,7 +959,7 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% @@ -1334,10 +1344,10 @@ \expandafter\let\csname scr@dte@#2@init\expandafter\endcsname \csname scr@dte@#1@init\endcsname } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1466,7 +1476,7 @@ \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}% {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1622,7 +1632,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1732,7 +1742,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2097,6 +2107,7 @@ \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}% \global\scr@dte@tocline@numberwidth \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax + \relax \ifdim \scr@dte@tocline@numberwidth >\@nameuse{scr@dte@#1@maxnumwidth}\relax \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth @@ -2104,7 +2115,7 @@ \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{% \ifdim \scr@dte@tocline@numberwidth >\dimexpr \@nameuse{scr@tso@#1@numwidth}% - +\@nameuse{scr@tso@#1@numsep}\relax + +\@nameuse{scr@tso@#1@numsep}\relax\relax \PackageWarning{tocbasic% }{% number width of #1 toc entries should be @@ -2163,10 +2174,10 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 1fc15a0feb4..1453f16575d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,16 +67,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (type area)] \typeout{% Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J% @@ -85,9 +85,9 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Markus Kohm, 1994-^^J% } -%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -97,7 +97,10 @@ \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% \ifstr{#1}{}{% \ifstr{#3}{BCOR}{% - \ifdimen{#2}{\setlength{\ta@bcor}{#2}}{\scr@pti@nerr@r}% + \ifdimen{#2}{% + \KOMA@UseDeprecatedOption{% + \PackageWarningNoLine{typearea}}{BCOR#2}{BCOR=#2}% + }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% }{\scr@pti@nerr@r}% } @@ -106,7 +109,10 @@ \def\@@DIV #1DIV#2DIV#3\@@DIV{% \edef\@tempa{#1}\ifx\@tempa\@empty \edef\@tempa{#3}\def\@tempb{DIV}\ifx\@tempa\@tempb - \ifnumber{#2}{\ta@div=#2\relax}{\scr@pti@nerr@r}% + \ifnumber{#2}{% + \KOMA@UseDeprecatedOption{% + \PackageWarningNoLine{typearea}}{DIV#2}{DIV=#2}% + }{\scr@pti@nerr@r}% \else\scr@pti@nerr@r\fi \else\@BCOR\fi } @@ -173,12 +179,22 @@ } \multiply\paperwidth by186468 \multiply\paperheight by186468 - \if@landscape - \setlength{\@tempdima}{\paperwidth}% - \setlength{\paperwidth}{\paperheight}% - \setlength{\paperheight}{\@tempdima}% + \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax + \scr@setpaperorientation + \else + \if@landscape\scr@switchpapersizes\fi + \fi +} +\newcommand*\scr@setpaperorientation{% + \ifdim\paperheight>\paperwidth + \if@landscape\scr@switchpapersizes\fi + \else + \if@landscape\else\scr@switchpapersizes\fi \fi } +\newcommand*\scr@switchpapersizes{% + \@tempdima\paperwidth\paperwidth\paperheight\paperheight\@tempdima +} \newcommand*{\iso@paper}[1]{\expandafter\iso@@paper#1\@nil} \newcommand*{\iso@@paper}{} \def\iso@@paper#1#2\@nil{% @@ -490,6 +506,16 @@ \expandafter\let\csname if@tempswa\expandafter\endcsname \csname if@dvips\endcsname }{}% + }{}% + \scr@ifundefinedorrelax{pr@nextbb}{}{% + \expandafter\ifx\csname ifPreview\expandafter\endcsname + \csname iftrue\endcsname + \PackageInfo{typearea}{% + package `preview' with option `tightpage' detected.\MessageBreak + initial page size special deactivated% + }% + \@tempswafalse + \fi }% \if@tempswa \endgroup @@ -559,32 +585,44 @@ \KOMA@key{paper}{% \ifstr{#1}{seascape}{% \@seascapetrue - \if@landscape\else - \setlength{\@tempdima}{\paperwidth}% - \setlength{\paperwidth}{\paperheight}% - \setlength{\paperheight}{\@tempdima}% + \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \@landscapetrue + \scr@setpaperorientation + \else + \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi \fi \FamilyKeyStateProcessed + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}% }{% \ifstr{#1}{landscape}{% \@seascapefalse - \if@landscape\else - \setlength{\@tempdima}{\paperwidth}% - \setlength{\paperwidth}{\paperheight}% - \setlength{\paperheight}{\@tempdima}% + \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \@landscapetrue + \scr@setpaperorientation + \else + \if@landscape\else\scr@switchpapersizes\@landscapetrue\fi \fi \FamilyKeyStateProcessed + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}% }{% \ifstr{#1}{portrait}{% - \if@landscape - \setlength{\@tempdima}{\paperwidth}% - \setlength{\paperwidth}{\paperheight}% - \setlength{\paperheight}{\@tempdima}% + \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \@landscapefalse + \scr@setpaperorientation + \else + \if@landscape\scr@switchpapersizes\@landscapefalse\fi \fi \FamilyKeyStateProcessed + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{landscape}% + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{portrait}% + \KOMA@kav@remove{.typearea.\scr@pkgextension}{paper}{seascape}% + \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}% }{% \ifstr{#1}{letter}{% \if@landscape @@ -597,6 +635,10 @@ \FamilyKeyStateProcessed \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}% + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \if@seascape seascape\else + \if@landscape landscape\else portrait\fi\fi + }% }{% \ifstr{#1}{legal}{% \if@landscape @@ -609,6 +651,10 @@ \FamilyKeyStateProcessed \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}% + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \if@seascape seascape\else + \if@landscape landscape\else portrait\fi\fi + }% }{% \ifstr{#1}{executive}{% \if@landscape @@ -617,19 +663,29 @@ \else \setlength\paperheight{10.5in}% \setlength\paperwidth {7.25in}% - \fi - \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}% + \fi + \FamilyKeyStateProcessed + \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% + \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}% + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \if@seascape seascape\else + \if@landscape landscape\else portrait\fi\fi + }% }{% \iso@paper{#1}% \if@tempswa \FamilyKeyStateProcessed \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}% + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \if@seascape seascape\else + \if@landscape landscape\else portrait\fi\fi + }% \else \expandafter\maybe@pair#1::\@nil \if@tempswa + \FamilyKeyStateProcessed + \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% \expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax \PackageWarningNoLine{typearea}{% You may have to exchange height and width!\MessageBreak @@ -638,20 +694,28 @@ instead of `paper=width:height'.\MessageBreak I've switched back to that old interpretation\MessageBreak because of the given compatiblity settings}% - \setlength\paperheight{\@tempa}% \setlength\paperwidth{\@tempb}% + \setlength\paperheight{\@tempa}% \else \setlength\paperwidth{\@tempa}% \setlength\paperheight{\@tempb}% \fi - \FamilyKeyStateProcessed - \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}% - \if@landscape - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}% + \expandafter\ifnum \scr@ta@v@is@lt{3.22}\relax + \if@landscape + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}% + \else + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}% + \fi \else - \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}% + \scr@setpaperorientation + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \the\paperwidth:\the\paperheight}% \fi - \else + \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{% + \if@seascape seascape\else + \if@landscape landscape\else portrait\fi\fi + }% + \else \KOMA@unknown@keyval{paper}{#1}{% `letter', `legal', `executive', `a', `b', `c', `d',\MessageBreak @@ -662,17 +726,6 @@ }% }% }% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \if@landscape - \if@seascape - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}% - \else - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}% - \fi - \else - \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}% - \fi - \fi }% }% }% @@ -689,7 +742,7 @@ \KOMA@ifkey{usegeometry}{@ta@usegeometry} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \newcommand*{\scr@ta@compatibility}{\scr@compatibility} @@ -796,7 +849,8 @@ \@namedef{scr@v@3.19a}{15} \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} -\@namedef{scr@v@last}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@last}{16} \newcommand*{\scr@ta@v@is@lt}[1]{% \scr@ta@compatibility<\@nameuse{scr@v@#1} } @@ -809,7 +863,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1527,7 +1581,7 @@ \fi } \typearea[current]{current} -%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 0a80f88406b..47e4e13c9ae 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ \ProvidesFile{% @@ -574,7 +574,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 2462 2016-05-19 07:18:47Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ \endinput %% %% End of file `visualize.lco'. -- cgit v1.2.3