diff options
| author | Karl Berry <karl@freefriends.org> | 2017-05-06 21:41:21 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-05-06 21:41:21 +0000 |
| commit | 734c91dfac1697d69bdd509c8bc7a97750c78f96 (patch) | |
| tree | 95919a908b9926e3a313d7b307b125a89fe9d18f /Master/texmf-dist/tex/latex/koma-script | |
| parent | c2e79031dc84ba98da9a7e985b4cd94eff21d8cf (diff) | |
koma-script (6may17)
git-svn-id: svn://tug.org/texlive/trunk@44226 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
48 files changed, 1767 insertions, 953 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index b830bbc59a6..e9a6025b246 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% DIN% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% DIN% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index f0014d80b59..fd7e127d28e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% DINmtext% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% DINmtext% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index aec3c4a5fe9..609c8b48d49 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% KOMAold% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% KOMAold% @@ -204,7 +204,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z 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 f76347423ac..3ded106409a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 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 7f98808af92..1606d7e7208 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% NF% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% NF% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index e2bb9fbc987..028ad2865c1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 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 8667672d7d6..14c54ecc0b7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 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 3ece5eb8327..6e866f2ffd6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 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 f24869ad38d..4ba77516e60 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 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 4467a6f380e..0f1f3121eca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 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 94571f8a47e..4d206671fb4 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% SN% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% SN% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index d77516205fd..d7b77708da5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% SNleft% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% SNleft% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index d42e7fa7d22..38bec64dd48 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% UScommercial9 .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% UScommercial9% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index c17086c4498..34d5ce3f01d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% UScommercial9DW .lco}[\KOMAScriptVersion\space letter-class-option] @@ -78,7 +78,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \@ifundefined{scr@fromname@var}{% \LCOWarningNoLine{% UScommercial9DW% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index abeba026513..c36e26d0079 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \ProvidesFile{float.hak}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \scr@ifexpected{\newfloat}{% \long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3} \let\float@do=\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak index ef59bba293b..e3078bd1cf9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \ProvidesFile{floatrow.hak}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \scr@ifexpected{\DeclareNewFloatType}{% \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}% \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 00395eba973..7a9561409fb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \ProvidesFile{hyperref.hak}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \scr@ifexpected\@schapter{% \def\@schapter#1{% \H@old@schapter{#1}% diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak index 5fee6934ace..e5de54947a5 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \ProvidesFile{listings.hak}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak index 48cacc72e83..f57893b3adf 100644 --- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \ProvidesFile{lscape.hak}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (hacking package lscape)% ] -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \xpatchcmd{\landscape}{\textheight=\vsize}{% \if@scrhack@lscape \scrh@LT@textheight=\vsize diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak new file mode 100644 index 00000000000..7b59d4f8e4b --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak @@ -0,0 +1,109 @@ +%% +%% This is file `nomencl.hak', +%% generated with the docstrip utility, extended by scrdocstrip. +%% +%% The original source files were: +%% +%% scrkernel-version.dtx (with options: `file,nomencl.hak') +%% scrhack.dtx (with options: `hack,nomencl,identify') +%% scrhack.dtx (with options: `hack,nomencl,body') +%% +%% Copyright (c) 2008-2016 Markus Kohm [komascript at gmx info] +%% +%% This file was generated from file(s) of the KOMA-Script bundle. +%% --------------------------------------------------------------- +%% +%% It may be distributed under the conditions of the +%% LaTeX Project Public License in the version distributed together +%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'. +%% +%% This file may only be distributed together with a copy of the +%% KOMA-Script bundle. You may however distribute the +%% KOMA-Script bundle without all such generated files. See also +%% `lppl.txt' or `lppl-de.txt' for additional information. +%% +%% The list of files belonging to KOMA-Script distribution is given in +%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for +%% additional information. +%% +%% If this file is a beta version, you may not be allowed to distribute +%% it. Look at the comments below to see if this is the case. +%% +%% English and German manuals are part of KOMA-Script bundle. +%% ---------------------------------------------------------- +%% +%% See `README'. +%% +%% The KOMA-Script bundle (but maybe not this file) was based upon the +%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. You may +%% find a complete unmodified copy of LaTeX2e at +%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. +%% +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ +\begingroup + \catcode`\@11\relax + \ifx\KOMAScriptVersion\undefined + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \gdef\KOMAScriptVersion{#1}% + }% + \else + \newcommand*{\@CheckKOMAScriptVersion}[1]{% + \def\@tempa{#1}% + \ifx\KOMAScriptVersion\@tempa\else + \@latex@warning@no@line{% + \noexpand\KOMAScriptVersion\space is + `\KOMAScriptVersion',\MessageBreak + but `#1' was expected!\MessageBreak + You should not use classes, packages or files + from\MessageBreak + different KOMA-Script versions% + }% + \fi + } + \fi + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% +\endgroup +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ +\ProvidesFile{nomencl.hak}[% + 2017/04/13 v3.23 KOMA-Script + package + (hacking package + nomencl)% +] +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ +\RequirePackage{tocbasic} +\addtotoclist[nomencl]{nlo} +\addtotoclist[nomencl]{nls} +\xpatchcmd{\thenomenclature}{% + \@ifundefined{chapter}% + { + \section*{\nomname} + \if@intoc\addcontentsline{toc}{section}{\nomname}\fi% + }% + { + \chapter*{\nomname} + \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi% + }% +}{% + \scr@hack@nomencl@head +}{% + \PackageInfo{scrhack}{\string\thenomenclature\space successfully patched}% +}{% + \PackageWarning{scrhack}{cannot patch \string\thenomenclature.\MessageBreak + This could happen if you are using an unknown\MessageBreak + release of package `nomencl'% + }% +} +\newcommand*{\scr@hack@nomencl@head}{% + \providecommand*{\listofnlsname}{\nomname}% + \let\list@fname\listofnlsname + \def\@currext{nls}% + \tocbasic@listhead{\list@fname}% +} +\if@intoc + \setuptoc{nls}{totoc} +\fi +\endinput +%% +%% End of file `nomencl.hak'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty index 8997bf6040b..0a0740567c3 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty @@ -105,7 +105,7 @@ \newcommand*{\FreeIII}[1]{\csname #1.FIII\endcsname} \let\Comment\FreeIII \newcommand*{\FreeIV}[1]{\csname #1.FIV\endcsname} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 2c148569bf9..94eadae4f6b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -9,6 +9,8 @@ %% tocbasic.dtx (with options: `class,load') %% scrkernel-tocstyle.dtx (with options: `class,article,prepare') %% scrkernel-sections.dtx (with options: `class,article,prepare') +%% scrkernel-compatibility.dtx (with options: `class,article,init') +%% scrkernel-typearea.dtx (with options: `class,article,init') %% scrkernel-compatibility.dtx (with options: `class,article,option') %% scrkernel-miscellaneous.dtx (with options: `class,article,option') %% scrkernel-language.dtx (with options: `class,article,option') @@ -81,7 +83,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -103,7 +105,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -118,21 +120,21 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ \RequirePackage{tocbasic}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script ] \addtotoclist{toc} +\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}} \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -184,70 +186,9 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% 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 -\DeclareOption{emulatestandardclasses}{% - \let\if@scr@emulatestandardclasses\iftrue - \KOMAExecuteOptions{% - fontsize=10pt,% - headings=standardclasses,% - cleardoublepage=current - }% - \newcommand*{\defaultpapersize}{letter}% - \AtEndOfClass{% - \setkomafont{descriptionlabel}{\bfseries}% - \setkomafont{dictum}{\normalfont\small}% - \setkomafont{caption}{}% - \setkomafont{captionlabel}{}% - \setcapindent{0pt}% - \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}% - \PreventPackageFromLoading{scrpage2}% - \setkomafont{pagenumber}{\normalfont}% - \setkomafont{pageheadfoot}{\normalfont}% - \cfoot[\pagemark]{}% - \pagestyle{plain}% - }% -} +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) \newcommand* {\scr@compatibility}{\scr@v@last} -\KOMA@key{version}[last]{% - \scr@ifundefinedorrelax{scr@v@#1}{% - \def\scr@compatibility{0}% - \ClassWarningNoLine{\KOMAClassName}{% - You have set option `version' to value `#1', but\MessageBreak - this value of version is not supported.\MessageBreak - Because of this, version was set to `first'% - }% - \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% - \KOMAClassFileName - }{version}{first}% - }{% - \ClassInfoNoLine{\KOMAClassName}{% - Switching compatibility level to `#1'% - }% - \edef\scr@compatibility{\@nameuse{scr@v@#1}}% - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{version}{#1}% - }% -} -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} -\AtEndOfClass{% - \KOMA@key{version}[]{% - \ClassError{\KOMAClassName}{% - Option `version' too late% - }{% - Option `version' may be set only while loading the - class.\MessageBreak - But you've tried to set it up later.% - }% - \FamilyKeyStateProcessed - }% -} \@namedef{scr@v@first}{0} \@namedef{scr@v@2.9}{0} \@namedef{scr@v@2.9t}{0} @@ -311,7 +252,71 @@ \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} \@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} \@namedef{scr@v@last}{16} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +\newif\if@scr@emulatestandardclasses +\let\scr@emulatestandardclassestrue\relax +\let\scr@emulatestandardclassesfalse\relax +\DeclareOption{emulatestandardclasses}{% + \let\if@scr@emulatestandardclasses\iftrue + \KOMAExecuteOptions{% + fontsize=10pt,% + headings=standardclasses,% + cleardoublepage=current + }% + \newcommand*{\defaultpapersize}{letter}% + \AtEndOfClass{% + \setkomafont{descriptionlabel}{\bfseries}% + \setkomafont{dictum}{\normalfont\small}% + \setkomafont{caption}{}% + \setkomafont{captionlabel}{}% + \setcapindent{0pt}% + \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}% + \PreventPackageFromLoading{scrpage2}% + \setkomafont{pagenumber}{\normalfont}% + \setkomafont{pageheadfoot}{\normalfont}% + \cfoot[\pagemark]{}% + \pagestyle{plain}% + }% +} +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + \FamilyKeyStateProcessed + \KOMA@kav@replacevalue{.% + \KOMAClassFileName + }{version}{first}% + }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + \KOMAClassFileName + }{version}{#1}% + }% +} +\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + class.\MessageBreak + But you've tried to set it up later.% + }% + \FamilyKeyStateProcessed + }% +} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -324,7 +329,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -350,8 +355,8 @@ \newcommand*{\@gr@gsffamily}{% \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 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\@ptsize{% 11% } @@ -436,7 +441,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option) \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -545,7 +550,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: option \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -711,7 +716,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@titlepage \@titlepagefalse \newif\if@titlepageiscoverpage @@ -747,7 +752,7 @@ \KOMA@DeclareStandardOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -873,7 +878,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} @@ -977,7 +982,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1111,7 +1116,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1181,7 +1186,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1235,12 +1240,12 @@ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}% - \setuptoc{toc}{numberline}% + \expandafter\setuptoc\expandafter{\ext@toc}{numberline}% \or % leftaligntextentries \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \unsettoc{toc}{numberline}% + \expandafter\unsettoc\expandafter{\ext@toc}{numberline}% \or % chapterentrywithdots/sectionentrywithdots \KOMAoptions{sectionentrydots=true}% \or % chapterentrywithoutdots/sectionentrywithoutdots @@ -1398,7 +1403,7 @@ \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} \KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} -%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1518,7 +1523,8 @@ \renewcommand*\bib@heading{% \ifbib@leveldown \subsection*{% - \addxcontentsline{toc}{subsection}{\refname}% + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {subsection}{\refname}% \refname }% \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi @@ -1568,7 +1574,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection @@ -1651,18 +1657,18 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% 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 $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% 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 $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2136,12 +2142,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2185,7 +2191,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: body \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} @@ -2314,7 +2320,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2701,7 +2707,7 @@ %%% 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 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \newcommand*{\ifnumbered}[1]{% @@ -2937,6 +2943,16 @@ \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \fi \fi + \scr@ifundefinedorrelax{scr@mt@saved@sect}{}{% + \expandafter\ifx\csname #1\endcsname\section + \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}% + \addcontentsline{\ext@table}{xsect}{\@currenttocentry}% + \fi + \expandafter\ifx\csname #1\endcsname\starsection\relax + \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}% + \addcontentsline{\ext@table}{xsect}{\@currenttocentry}% + \fi + }% \let\IfUsePrefixLine\@secondoftwo \ifnum \numexpr #2\relax>\c@secnumdepth \let\@svsec\@empty @@ -3994,7 +4010,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \newif\if@restonecol \newcommand{\dictum}[2][]{\par% \begingroup @@ -4059,6 +4075,8 @@ \noexpand\string \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% \fi + \noexpand\def\noexpand\is@thispageodd@setlabel + {\unexpanded\expandafter{\is@thispageodd@setlabel}}% }% #1% \@esphack @@ -4109,7 +4127,95 @@ the extended optional argument of the section\MessageBreak commands} \scr@package@not@recommended{titleps}{% - package `scrlayer-scrpage`} + package `scrlayer-scrpage'} +\scr@package@not@recommended{minitoc}{} +\BeforePackage{minitoc}{% + \let\scr@mt@saved@sect\@sect +} +\AfterPackage{minitoc}{% + \def\@tempa#1#2#3#4#5#6[#7]#8{% + \ifnum #2<1 \relax + \addtocontents{toc}{\protect\sectbegin} + \fi + \stc@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% + }% + \ifx\@sect\@tempa + \def\@tempa#1#2#3#4#5#6[#7]#8{ + \expandafter + \ifx\csname #1\endcsname\section\relax + \addcontentsline{lof}{xsect}{#7}% + \addcontentsline{lot}{xsect}{#7}% + \fi + \ifx\csname #1\endcsname\starsection\relax + \addcontentsline{lof}{xsect}{#7}% + \addcontentsline{lot}{xsect}{#7}% + \fi + \ifnum #2>\c@secnumdepth\relax + \let\@svsec\@empty + \else + \refstepcounter{#1}% + \edef\@svsec{\csname the#1\endcsname\hskip 1em}% + \fi + \@tempskipa #5\relax + \ifdim \@tempskipa>\z@ + \begingroup #6\relax + \@hangfrom{\hskip #3\relax\@svsec}% + {\interlinepenalty \@M #8\par}% + \endgroup + \csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth\relax + \else + \protect\numberline{\csname the#1\endcsname}% + \fi + #7% + }% + \else + \def\@svsechd{#6\hskip #3\relax + \@svsec #8\csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth\relax + \else + \protect\numberline{\csname the#1\endcsname} + \fi + #7}% + }% + \fi + \@xsect{#5}% + }% + \ifx\stc@sect\@tempa + \ClassWarning{\KOMAClassName}{% + Redefining minitoc's internal command + `\string\stc@sect'\MessageBreak + to prevent minitoc to destroy several features\MessageBreak + of KOMA-Script% + }% + \let\stc@sect\scr@mt@saved@sect + \else + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround,\MessageBreak + because of unexpected definition of\MessageBreak + `\string\stc@sect'% + }% + \let\scr@mt@saved@sect\relax + \fi + \else + \ifx\@sect\scr@mt@saved@sect + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround for + `\string\@sect',\MessageBreak + because it is not needed% + }% + \else + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround,\MessageBreak + because of unexpected definition of\MessageBreak + `\string\@sect'% + }% + \fi + \let\scr@mt@saved@sect\relax + \fi +} \BeforePackage{titlesec}{% \let\scr@ttl@saved@section\section \let\scr@ttl@saved@subsection\subsection @@ -4120,11 +4226,11 @@ \AfterPackage{titlesec}{% \@ifpackagelater{titlesec}{2016/03/22}{% \ClassInfo{\KOMAClassName}{% - Deactivating the `titlesec` workaround,\MessageBreak + Deactivating the `titlesec' workaround,\MessageBreak because package is newer than expected% }% }{% - \PackageWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% Activating an ugly workaround for a missing\MessageBreak feature of package `titlesec`% }% @@ -4178,7 +4284,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4273,7 +4379,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -4963,7 +5069,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5018,6 +5124,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi @@ -5058,6 +5165,7 @@ \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } +\newcommand*{\raggedfootnote}{} \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} @@ -5118,7 +5226,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}% @@ -5201,10 +5309,13 @@ } \newcommand*{\toc@l@number}{} \newcommand*{\tableofcontents}{% - \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup + \begingroup + \let\if@dynlist\if@tocleft + \expandafter\listoftoc\expandafter{\ext@toc}% + \endgroup } \newcommand{\addtocentrydefault}[3]{% - \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}% + \expandafter\tocbasic@addxcontentsline\expandafter{\ext@toc}{#1}{#2}{#3}% } \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning @@ -5257,11 +5368,11 @@ \newcommand*\listtablename{List of Tables} \newcommand*\listoflotname{\listtablename} \newcommand*\listoflotentryname{\tablename} -\newcommand*\listoffigures{\listoftoc{lof}} +\newcommand*\listoffigures{\listoftoc{\ext@figure}} \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} -\newcommand*\listoftables{\listoftoc{lot}} +\newcommand*\listoftables{\listoftoc{\ext@table}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ \newcommand*\refname{References} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -5346,7 +5457,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5392,7 +5503,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -5551,7 +5662,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index fa551e44c7b..652c166e450 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -5,6 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `package,scrbase') +%% scrkernel-basics.dtx (with options: `package,prepare,base') %% scrkernel-basics.dtx (with options: `package,option,base') %% scrkernel-language.dtx (with options: `package,option,base') %% scrlfile.dtx (with options: `load') @@ -44,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +67,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -249,8 +250,28 @@ \expandafter\let\csname scr@before@process@options@#2#1@hook\endcsname \relax }% - \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions - \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}% + \scr@ifundefinedorrelax{scr@after@options@#2@hook}{% + \@namedef{scr@after@options@#2@hook}{% + \@namedef{scr@after@options@#2@hook}{}% + }% + }{% + \expandafter\edef\csname scr@after@options@#2@hook\endcsname{% + \noexpand\@namedef{scr@after@options@#2@hook}{% + \unexpanded\expandafter\expandafter\expandafter + {\csname scr@after@options@#2@hook\endcsname}% + }% + }% + }% + \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate + \@namedef{scr@after@options@#2@hook@topmost}{% + \@namedef{scr@after@options@#2@hook@topmost}{}% + }% + \expandafter\l@addto@macro\csname scr@after@options@#2@hook\endcsname{% + \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate + \@nameuse{scr@after@options@#2@hook@topmost}% + }% + \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions + \fi \let\ds@\@empty \edef\@curroptions{\@ptionlist{\@currname.\@currext}}% \ifx\@currext\@clsextension\else @@ -290,8 +311,7 @@ \let\CurrentOption\@empty \let\@fileswith@pti@ns\@@fileswith@pti@ns \AtEndOfPackage{\let\@unprocessedoptions\relax}% - \let\AtEndOfFamilyOptions\@firstofone - \@nameuse{scr@after@options@#1@hook}% + \@nameuse{scr@after@options@#2@hook}% } \@onlypreamble\FamilyProcessOptions \newcommand*{\BeforeFamilyProcessOptions}[3][.\@currname.\@currext]{% @@ -303,11 +323,18 @@ }% } \newcommand*{\scr@AtEndOfFamilyOptions}{% + \kernel@ifstar {\scr@@AtEndOfFamilyOptions{@topmost}}% + {\scr@@AtEndOfFamilyOptions\@empty}% +} +\newcommand*{\scr@@AtEndOfFamilyOptions}[1]{% \expandafter - \l@addto@macro\csname scr@after@options@\FamilyOfKey @hook\endcsname + \l@addto@macro\csname scr@after@options@\FamilyOfKey @hook#1\endcsname +} +\newcommand*{\scr@AtEndOfFamilyOptions@immediate}{% + \kernel@ifstar {\@firstofone}{\@firstofone}% } \newcommand*{\AtEndOfFamilyOptions}{} -\let\AtEndOfFamilyOptions\@firstofone +\let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate \newcommand*\scr@ifprocess@curroption[2]{% \def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}% \expandafter\reserved@a\CurrentOption=\@nil @@ -374,6 +401,35 @@ \expandafter\@secondoftwo \fi } +\@ifundefined{l@addto@macro}{}{% + \begingroup + \long\def\reserved@a#1#2{% + \edef#1{\unexpanded\expandafter{#1#2}}% + }% + \ifx\reserved@a\l@addto@macro\else + \PackageWarning{scrbase}{% + Someone also uses macro name \string\l@addto@macro.\MessageBreak + When KOMA-Script author decided to use macro name\MessageBreak + \string\l@addto@macro\space first, there was no other + free\MessageBreak + LaTeX package using this macro name.\MessageBreak + In the meantime other package authers decided to use\MessageBreak + same macro name, but unfortunatly not all of those\MessageBreak + are compatible with KOMA-Script's definition, e.g.,\MessageBreak + while adding definitions with arguments to macros.\MessageBreak + Because of such potentially incompatible definitions,\MessageBreak + KOMA-Script will redefine the command now.\MessageBreak + Please ask the author of the other package to\MessageBreak + rename his macro, if a problem results in the\MessageBreak + redefinition% + }% + \fi + \endgroup +} +\long\def\l@addto@macro#1#2{% + \edef#1{\unexpanded\expandafter{#1#2}}% +}% +%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (option) \newcommand*{\dont@let@as@internal@defined}{/} \newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse \DefineFamily{KOMA} @@ -390,12 +446,12 @@ \fi } \FamilyProcessOptions{KOMA}\relax -%%% 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 $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $ \RequirePackage{scrlfile}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } @@ -1139,13 +1195,21 @@ \let@as@internal@defined{ifpsoutput} \newcommand*{\scr@ifdvioutput}{% \scr@ifundefinedorrelax{pdfoutput}{% - \scr@ifundefinedorrelax{OpMode}{% - \expandafter\@firstoftwo - }{% - \ifnum\OpMode=0 + \scr@ifundefinedorrelax{outputmode}{% + \scr@ifundefinedorrelax{OpMode}{% \expandafter\@firstoftwo - \else + }{% + \ifnum\OpMode=0 + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + }% + }{% + \ifnum\outputmode>0 \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo \fi }% }{% @@ -1188,7 +1252,18 @@ \@FamilyExecuteOptions[{#1}]{#2}% } \newcommand{\@FamilyExecuteOptions}[3][.\@currname.\@currext]{% - \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}% + \scr@ifundefinedorrelax{scr@after@options@#2@hook}{% + \@namedef{scr@after@options@#2@hook}{% + \@namedef{scr@after@options@#2@hook}{}% + }% + }{% + \expandafter\edef\csname scr@after@options@#2@hook\endcsname{% + \noexpand\@namedef{scr@after@options@#2@hook}{% + \unexpanded\expandafter\expandafter\expandafter + {\csname scr@after@options@#2@hook\endcsname}% + }% + }% + }% \@for\scr@key@atlist:=#3\do{% \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil \ifx\scr@key@name\@empty\else @@ -1249,7 +1324,7 @@ \fi \fi }% - \@nameuse{scr@after@options@#1@hook}% + \@nameuse{scr@after@options@#2@hook}% } \newcommand*{\scr@show@key@state@error}{% \ifx\FamilyKeyState\FamilyKeyStateProcessed\else @@ -1282,7 +1357,29 @@ } \newcommand{\FamilyOptions}[1]{\@FamilyOptions{#1}} \newcommand{\@FamilyOptions}[2]{% - \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}% + \scr@ifundefinedorrelax{scr@after@options@#1@hook}{% + \@namedef{scr@after@options@#1@hook}{% + \@namedef{scr@after@options@#1@hook}{}% + }% + }{% + \expandafter\edef\csname scr@after@options@#1@hook\endcsname{% + \noexpand\@namedef{scr@after@options@#1@hook}{% + \unexpanded\expandafter\expandafter\expandafter + {\csname scr@after@options@#1@hook\endcsname}% + }% + }% + }% + \scr@ifundefinedorrelax{scr@after@options@#1@hook@topmost}{% + \@namedef{scr@after@options@#1@hook@topmost}{}% + }{}% + \expandafter\ifx\csname scr@after@options@#1@hook@topmost\endcsname\@empty + \expandafter\l@addto@macro\csname scr@after@options@#1@hook\endcsname{% + \@nameuse{scr@after@options@#1@hook@topmost}% + }% + \@namedef{scr@after@options@#1@hook@topmost}{% + \@namedef{scr@after@options@#1@hook@topmost}{}% + }% + \fi \@for\scr@key@atlist:=#2\do{% \ifx\scr@key@atlist\@empty\else \ifx\scr@key@atlist\space\else @@ -1379,20 +1476,13 @@ \noexpand\def\noexpand\scr@key@run@errors{% \unexpanded\expandafter{\scr@key@run@errors}}% \fi - \expandafter\ifx\csname scr@after@options@#1@hook\endcsname\relax - \noexpand\expandafter\noexpand\let\noexpand\csname - scr@after@options@#1@hook\endcsname\relax - \else - \noexpand\def\expandafter\noexpand - \csname scr@after@options@#1@hook\endcsname{% - \expandafter\unexpanded\expandafter\expandafter\expandafter{% - \csname scr@after@options@#1@hook\endcsname - }}% + \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate + \noexpand\let\noexpand\AtEndOfFamilyOptions + \noexpand\scr@AtEndOfFamilyOptions@immediate \fi }% \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions \reserved@a - \let\AtEndOfFamilyOptions\@firstofone \ifx\FamilyKeyState\FamilyKeyStateUnknown \PackageInfo{scrbase}{Unknown processing state.\MessageBreak Processing option @@ -1452,34 +1542,6 @@ \def\reserved@b{\FamilyOptions{#1}}% \expandafter\reserved@b\expandafter{\reserved@a}% } -\@ifundefined{l@addto@macro}{}{% - \begingroup - \long\def\reserved@a#1#2{% - \edef#1{\unexpanded\expandafter{#1#2}}% - }% - \ifx\reserved@a\l@addto@macro\else - \PackageWarning{scrbase}{% - Someone also uses macro name \string\l@addto@macro.\MessageBreak - When KOMA-Script author decided to use macro name\MessageBreak - \string\l@addto@macro\space first, there was no other - free\MessageBreak - LaTeX package using this macro name.\MessageBreak - In the meantime other package authers decided to use\MessageBreak - same macro name, but unfortunatly not all of those\MessageBreak - are compatible with KOMA-Script's definition, e.g.,\MessageBreak - while adding definitions with arguments to macros.\MessageBreak - Because of such potentially incompatible definitions,\MessageBreak - KOMA-Script will redefine the command now.\MessageBreak - Please ask the author of the other package to\MessageBreak - rename his macro, if a problem results in the\MessageBreak - redefinition% - }% - \fi - \endgroup -} -\long\def\l@addto@macro#1#2{% - \edef#1{\unexpanded\expandafter{#1#2}}% -}% \begingroup \catcode`\^^A=\catcode`\# \@makeother\# @@ -1597,7 +1659,7 @@ \newcommand*{\FamilySetCounter}[4]{% \begingroup \protected@edef\reserved@a{#4}% - \def\reserved@b{\endgroup\value{#3}=#4 \FamilyKeyStateProcessed}% + \def\reserved@b{\endgroup\value{#3}=#4\relax\FamilyKeyStateProcessed}% \expandafter\ifiscount\expandafter{\reserved@a}{}{% \expandafter\ifisdimen\expandafter{\reserved@a}{}{% \expandafter\ifisskip\expandafter{\reserved@a}{}{% @@ -1833,7 +1895,7 @@ \newcommand{\Family@String@Key}[4]{% \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}% } -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname } @@ -2253,7 +2315,7 @@ \reserved@b }% } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index 61b1cb08d69..a691522d931 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -9,6 +9,8 @@ %% tocbasic.dtx (with options: `class,load,chapter') %% scrkernel-tocstyle.dtx (with options: `class,book,prepare') %% scrkernel-sections.dtx (with options: `class,book,prepare') +%% scrkernel-compatibility.dtx (with options: `class,book,init') +%% scrkernel-typearea.dtx (with options: `class,book,init') %% scrkernel-compatibility.dtx (with options: `class,book,option') %% scrkernel-miscellaneous.dtx (with options: `class,book,option') %% scrkernel-language.dtx (with options: `class,book,option') @@ -81,7 +83,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -103,7 +105,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -118,23 +120,23 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ \RequirePackage{tocbasic}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} +\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}} \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -210,69 +212,9 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% 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 -\DeclareOption{emulatestandardclasses}{% - \let\if@scr@emulatestandardclasses\iftrue - \KOMAExecuteOptions{% - fontsize=10pt,% - headings=standardclasses,% - cleardoublepage=current - }% - \newcommand*{\defaultpapersize}{letter}% - \AtEndOfClass{% - \setkomafont{descriptionlabel}{\bfseries}% - \setkomafont{dictum}{\normalfont\small}% - \setkomafont{caption}{}% - \setkomafont{captionlabel}{}% - \setcapindent{0pt}% - \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}% - \PreventPackageFromLoading{scrpage2}% - \setkomafont{pagenumber}{\normalfont}% - \setkomafont{pageheadfoot}{\normalfont}% - \cfoot[\pagemark]{}% - }% -} +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) \newcommand* {\scr@compatibility}{\scr@v@last} -\KOMA@key{version}[last]{% - \scr@ifundefinedorrelax{scr@v@#1}{% - \def\scr@compatibility{0}% - \ClassWarningNoLine{\KOMAClassName}{% - You have set option `version' to value `#1', but\MessageBreak - this value of version is not supported.\MessageBreak - Because of this, version was set to `first'% - }% - \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% - \KOMAClassFileName - }{version}{first}% - }{% - \ClassInfoNoLine{\KOMAClassName}{% - Switching compatibility level to `#1'% - }% - \edef\scr@compatibility{\@nameuse{scr@v@#1}}% - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{version}{#1}% - }% -} -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} -\AtEndOfClass{% - \KOMA@key{version}[]{% - \ClassError{\KOMAClassName}{% - Option `version' too late% - }{% - Option `version' may be set only while loading the - class.\MessageBreak - But you've tried to set it up later.% - }% - \FamilyKeyStateProcessed - }% -} \@namedef{scr@v@first}{0} \@namedef{scr@v@2.9}{0} \@namedef{scr@v@2.9t}{0} @@ -336,7 +278,70 @@ \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} \@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} \@namedef{scr@v@last}{16} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +\newif\if@scr@emulatestandardclasses +\let\scr@emulatestandardclassestrue\relax +\let\scr@emulatestandardclassesfalse\relax +\DeclareOption{emulatestandardclasses}{% + \let\if@scr@emulatestandardclasses\iftrue + \KOMAExecuteOptions{% + fontsize=10pt,% + headings=standardclasses,% + cleardoublepage=current + }% + \newcommand*{\defaultpapersize}{letter}% + \AtEndOfClass{% + \setkomafont{descriptionlabel}{\bfseries}% + \setkomafont{dictum}{\normalfont\small}% + \setkomafont{caption}{}% + \setkomafont{captionlabel}{}% + \setcapindent{0pt}% + \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}% + \PreventPackageFromLoading{scrpage2}% + \setkomafont{pagenumber}{\normalfont}% + \setkomafont{pageheadfoot}{\normalfont}% + \cfoot[\pagemark]{}% + }% +} +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + \FamilyKeyStateProcessed + \KOMA@kav@replacevalue{.% + \KOMAClassFileName + }{version}{first}% + }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + \KOMAClassFileName + }{version}{#1}% + }% +} +\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + class.\MessageBreak + But you've tried to set it up later.% + }% + \FamilyKeyStateProcessed + }% +} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -349,7 +354,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -375,8 +380,8 @@ \newcommand*{\@gr@gsffamily}{% \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 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\@ptsize{% 11% } @@ -461,7 +466,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option) \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -570,7 +575,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: option \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -736,7 +741,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage @@ -769,7 +774,7 @@ {notitlepage}{titlepage=false} %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1031,7 +1036,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} @@ -1135,7 +1140,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1269,7 +1274,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1339,7 +1344,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1393,12 +1398,12 @@ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}% - \setuptoc{toc}{numberline}% + \expandafter\setuptoc\expandafter{\ext@toc}{numberline}% \or % leftaligntextentries \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \unsettoc{toc}{numberline}% + \expandafter\unsettoc\expandafter{\ext@toc}{numberline}% \or % chapterentrywithdots/sectionentrywithdots \KOMAoptions{chapterentrydots=true}% \or % chapterentrywithoutdots/sectionentrywithoutdots @@ -1603,7 +1608,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1777,7 +1782,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -1860,19 +1865,19 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% 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 $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% 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 $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2353,12 +2358,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2402,7 +2407,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: body \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} @@ -2531,7 +2536,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2885,7 +2890,7 @@ %%% 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 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -3121,6 +3126,16 @@ \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \fi \fi + \scr@ifundefinedorrelax{scr@mt@saved@sect}{}{% + \expandafter\ifx\csname #1\endcsname\section + \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}% + \addcontentsline{\ext@table}{xsect}{\@currenttocentry}% + \fi + \expandafter\ifx\csname #1\endcsname\starsection\relax + \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}% + \addcontentsline{\ext@table}{xsect}{\@currenttocentry}% + \fi + }% \let\IfUsePrefixLine\@secondoftwo \ifnum \numexpr #2\relax>\c@secnumdepth \let\@svsec\@empty @@ -4738,7 +4753,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \newif\if@restonecol \newcommand{\dictum}[2][]{\par% \begingroup @@ -4809,6 +4824,8 @@ \noexpand\string \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% \fi + \noexpand\def\noexpand\is@thispageodd@setlabel + {\unexpanded\expandafter{\is@thispageodd@setlabel}}% }% #1% \@esphack @@ -4859,7 +4876,95 @@ the extended optional argument of the section\MessageBreak commands} \scr@package@not@recommended{titleps}{% - package `scrlayer-scrpage`} + package `scrlayer-scrpage'} +\scr@package@not@recommended{minitoc}{} +\BeforePackage{minitoc}{% + \let\scr@mt@saved@sect\@sect +} +\AfterPackage{minitoc}{% + \def\@tempa#1#2#3#4#5#6[#7]#8{% + \ifnum #2<1 \relax + \addtocontents{toc}{\protect\sectbegin} + \fi + \stc@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% + }% + \ifx\@sect\@tempa + \def\@tempa#1#2#3#4#5#6[#7]#8{ + \expandafter + \ifx\csname #1\endcsname\section\relax + \addcontentsline{lof}{xsect}{#7}% + \addcontentsline{lot}{xsect}{#7}% + \fi + \ifx\csname #1\endcsname\starsection\relax + \addcontentsline{lof}{xsect}{#7}% + \addcontentsline{lot}{xsect}{#7}% + \fi + \ifnum #2>\c@secnumdepth\relax + \let\@svsec\@empty + \else + \refstepcounter{#1}% + \edef\@svsec{\csname the#1\endcsname\hskip 1em}% + \fi + \@tempskipa #5\relax + \ifdim \@tempskipa>\z@ + \begingroup #6\relax + \@hangfrom{\hskip #3\relax\@svsec}% + {\interlinepenalty \@M #8\par}% + \endgroup + \csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth\relax + \else + \protect\numberline{\csname the#1\endcsname}% + \fi + #7% + }% + \else + \def\@svsechd{#6\hskip #3\relax + \@svsec #8\csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth\relax + \else + \protect\numberline{\csname the#1\endcsname} + \fi + #7}% + }% + \fi + \@xsect{#5}% + }% + \ifx\stc@sect\@tempa + \ClassWarning{\KOMAClassName}{% + Redefining minitoc's internal command + `\string\stc@sect'\MessageBreak + to prevent minitoc to destroy several features\MessageBreak + of KOMA-Script% + }% + \let\stc@sect\scr@mt@saved@sect + \else + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround,\MessageBreak + because of unexpected definition of\MessageBreak + `\string\stc@sect'% + }% + \let\scr@mt@saved@sect\relax + \fi + \else + \ifx\@sect\scr@mt@saved@sect + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround for + `\string\@sect',\MessageBreak + because it is not needed% + }% + \else + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround,\MessageBreak + because of unexpected definition of\MessageBreak + `\string\@sect'% + }% + \fi + \let\scr@mt@saved@sect\relax + \fi +} \BeforePackage{titlesec}{% \let\scr@ttl@saved@section\section \let\scr@ttl@saved@subsection\subsection @@ -4870,11 +4975,11 @@ \AfterPackage{titlesec}{% \@ifpackagelater{titlesec}{2016/03/22}{% \ClassInfo{\KOMAClassName}{% - Deactivating the `titlesec` workaround,\MessageBreak + Deactivating the `titlesec' workaround,\MessageBreak because package is newer than expected% }% }{% - \PackageWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% Activating an ugly workaround for a missing\MessageBreak feature of package `titlesec`% }% @@ -4928,7 +5033,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -5028,7 +5133,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{headings} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -5730,7 +5835,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5786,6 +5891,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi @@ -5826,6 +5932,7 @@ \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } +\newcommand*{\raggedfootnote}{} \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} @@ -5886,7 +5993,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}% @@ -5975,10 +6082,13 @@ } \newcommand*{\toc@l@number}{} \newcommand*{\tableofcontents}{% - \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup + \begingroup + \let\if@dynlist\if@tocleft + \expandafter\listoftoc\expandafter{\ext@toc}% + \endgroup } \newcommand{\addtocentrydefault}[3]{% - \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}% + \expandafter\tocbasic@addxcontentsline\expandafter{\ext@toc}{#1}{#2}{#3}% } \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning @@ -6031,11 +6141,11 @@ \newcommand*\listtablename{List of Tables} \newcommand*\listoflotname{\listtablename} \newcommand*\listoflotentryname{\tablename} -\newcommand*\listoffigures{\listoftoc{lof}} +\newcommand*\listoffigures{\listoftoc{\ext@figure}} \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} -\newcommand*\listoftables{\listoftoc{lot}} +\newcommand*\listoftables{\listoftoc{\ext@table}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ \newcommand*\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -6120,7 +6230,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -6168,7 +6278,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -6327,7 +6437,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index 5827f5b9579..642bfc020bf 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,10 @@ %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (day of the week)% ] -%%% 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 $ @@ -243,7 +242,7 @@ * Local config file scrdate.cfg used^^J% *************************************}} {} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 664bbc62983..721e5e0024e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -9,6 +9,7 @@ %% scrextend.dtx (with options: `package,extend,identify,prepare') %% scrkernel-basics.dtx (with options: `load') %% scrkernel-sections.dtx (with options: `package,extend,prepare') +%% scrkernel-compatibility.dtx (with options: `package,extend,init') %% scrextend.dtx (with options: `package,extend,option') %% scrkernel-compatibility.dtx (with options: `package,extend,option') %% scrkernel-miscellaneous.dtx (with options: `package,extend,option') @@ -64,7 +65,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ +%%% From File: $Id: scrextend.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname KOMAClassName\endcsname\relax\else \PackageWarning{scrextend}{% @@ -76,7 +77,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -98,15 +99,15 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ +%%% From File: $Id: scrextend.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProvidesPackage{scrextend}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -130,78 +131,13 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ -\KOMA@key{extendedfeature}{% - \scr@ext@activate{#1}% - \AtEndOfPackage{% - \scr@ifundefinedorrelax{scr@ext@immediate@#1}{}{% - \PackageWarningNoLine{unkown extended feature `#1'\MessageBreak - You have used option `extendedfeature' to\MessageBreak - activate an extended feature `#1',\MessageBreak - but there is no such extended feature.\MessageBreak - See the KOMA-Script manual for more\MessageBreak - information about known activatable\MessageBreak - extended features% - }% - }% - }% - \FamilyKeyStateProcessed - \KOMA@kav@xadd{.scrextend.sty}{extendedfeature}{#1}% -} -\AtEndOfPackage{% - \KOMA@key{extendedfeature}{% - \def\FamilyKeyState{Option `extendedfeature' too late}% - }% -} -%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) \providecommand* {\scr@compatibility}{\scr@v@last} -\KOMA@key{version}[last]{% - \scr@ifundefinedorrelax{scr@v@#1}{% - \def\scr@compatibility{0}% - \PackageWarningNoLine{% - scrextend% - }{% - You have set option `version' to value `#1', but\MessageBreak - this value of version is not supported.\MessageBreak - Because of this, version was set to `first'% - }% - \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% - scrextend.\scr@pkgextension - }{version}{first}% - }{% - \PackageInfoNoLine{% - scrextend% - }{% - Switching compatibility level to `#1'% - }% - \edef\scr@compatibility{\@nameuse{scr@v@#1}}% - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - scrextend.\scr@pkgextension - }{version}{#1}% - }% -} -\AtEndOfPackage{% - \KOMA@key{version}[]{% - \PackageError{% - scrextend% - }{% - Option `version' too late% - }{% - Option `version' may be set only while loading the - package.\MessageBreak - But you've tried to set it up later.% - }% - \FamilyKeyStateProcessed - }% -} \@namedef{scr@v@first}{0} \@namedef{scr@v@2.9}{0} \@namedef{scr@v@2.9t}{0} @@ -265,7 +201,73 @@ \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} \@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} \@namedef{scr@v@last}{16} +%%% From File: $Id: scrextend.dtx 2592 2017-02-16 16:56:10Z kohm $ +\KOMA@key{extendedfeature}{% + \scr@ext@activate{#1}% + \AtEndOfPackage{% + \scr@ifundefinedorrelax{scr@ext@immediate@#1}{}{% + \PackageWarningNoLine{unkown extended feature `#1'\MessageBreak + You have used option `extendedfeature' to\MessageBreak + activate an extended feature `#1',\MessageBreak + but there is no such extended feature.\MessageBreak + See the KOMA-Script manual for more\MessageBreak + information about known activatable\MessageBreak + extended features% + }% + }% + }% + \FamilyKeyStateProcessed + \KOMA@kav@xadd{.scrextend.sty}{extendedfeature}{#1}% +} +\AtEndOfPackage{% + \KOMA@key{extendedfeature}{% + \def\FamilyKeyState{Option `extendedfeature' too late}% + }% +} +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \PackageWarningNoLine{% + scrextend% + }{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + \FamilyKeyStateProcessed + \KOMA@kav@replacevalue{.% + scrextend.\scr@pkgextension + }{version}{first}% + }{% + \PackageInfoNoLine{% + scrextend% + }{% + Switching compatibility level to `#1'% + }% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + scrextend.\scr@pkgextension + }{version}{#1}% + }% +} +\AtEndOfPackage{% + \KOMA@key{version}[]{% + \PackageError{% + scrextend% + }{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + package.\MessageBreak + But you've tried to set it up later.% + }% + \FamilyKeyStateProcessed + }% +} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -278,7 +280,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -305,7 +307,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil @@ -341,7 +343,7 @@ scrextend.\scr@pkgextension }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% \expandafter\newif\csname if@titlepage\endcsname @@ -384,9 +386,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \KOMA@key{cleardoublepage}{% \begingroup% \def\@tempc{% @@ -467,8 +469,8 @@ {\pagestyle{#1}\cleardoublestandardpage}} \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} -%%% 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 $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -538,13 +540,13 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% 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 $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: execoption) -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMAProcessOptions\relax -%%% 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 $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -900,7 +902,7 @@ because I do not change it% }% } -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -1211,11 +1213,11 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \scr@ifundefinedorrelax{if@restonecol}{% \expandafter\newif\csname if@restonecol\endcsname \@restonecolfalse @@ -1277,6 +1279,8 @@ \noexpand\string \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% \fi + \noexpand\def\noexpand\is@thispageodd@setlabel + {\unexpanded\expandafter{\is@thispageodd@setlabel}}% }% #1% \@esphack @@ -1297,15 +1301,16 @@ \providecommand*{\@textsubscript}[1]{% {\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 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi @@ -1346,6 +1351,7 @@ \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } +\newcommand*{\raggedfootnote}{} \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} @@ -1431,7 +1437,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ \newenvironment{labeling}[2][]{% \def\sc@septext{#1}% \list{}{\settowidth{\labelwidth}{{% @@ -1509,7 +1515,7 @@ } \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index 02fcae34fac..ad3ddf4786f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,19 +64,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProvidesPackage{scrfontsizes}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% \ifstr{#1}{scrsize}{% @@ -363,7 +363,7 @@ \immediate\closeout\@fontfile } \@onlypreamble\generatefontfile -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index 22842747299..7664ae025c0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,21 +65,20 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package ] -%%% 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 $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% @@ -89,13 +88,16 @@ \KOMAExecuteOptions{floatrow=true} \KOMA@ifkey{listings}{@scrhack@listings} \KOMAExecuteOptions{listings=true} +\RequirePackage{xpatch}% +\KOMA@ifkey{nomencl}{@scrhack@nomencl} +\KOMAExecuteOptions{nomencl=true} \KOMA@ifkey{setspace}{@scrhack@setspace} \KOMAExecuteOptions{setspace=true} \RequirePackage{xpatch}% \KOMA@ifkey{lscape}{@scrhack@lscape}% \KOMAExecuteOptions{lscape=true}% \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -175,6 +177,13 @@ }% \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi } +\AfterPackage*{nomencl}{% + \KOMA@key[.scrhack.sty]{nomencl}{% + \PackageWarning{scrhack}{option `nomencl' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@nomencl\scr@hack@load\@pkgextension{nomencl}\fi +} \AfterPackage*{setspace}{% \KOMA@key[.scrhack.sty]{setspace}{% \PackageWarning{scrhack}{option `setspace' ignored}% @@ -190,7 +199,7 @@ }% \fi } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty index 04221cbc8c3..c89fe14cac9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty @@ -39,10 +39,10 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrjura.dtx 2448 2016-05-06 09:06:19Z kohm $ +%%% From File: $Id: scrjura.dtx 2600 2017-02-23 12:07:58Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrjura}[% - 2016/05/06 v0.9h KOMA-Script + 2017/02/23 v0.9i KOMA-Script for jurists (package)% ] @@ -551,7 +551,8 @@ \ifx\contract@title\relax\else\enskip\fi}% \contract@title \ifx\contract@entry\relax\else - \addxcontentsline{toc}{cpar}[\theClause]\contract@entry + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {cpar}[\theClause]\contract@entry \addxcontentsline{cpa}{cpar}[\theClause]\contract@entry \fi \ifx\contract@head\relax\else @@ -607,7 +608,8 @@ \ifx\contract@title\relax\else\enskip\fi}% \contract@title \ifx\contract@entry\relax\else - \addxcontentsline{toc}{cpar}[\theSubClause]\contract@entry + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {cpar}[\theSubClause]\contract@entry \addxcontentsline{cpa}{cpar}[\theSubClause]\contract@entry \fi \ifx\contract@head\relax\else @@ -1068,7 +1070,7 @@ }% \fi } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index 2f3b7be277c..6662cc5a994 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -5,6 +5,7 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `package,scrkbase') +%% scrkernel-basics.dtx (with options: `package,prepare,koma') %% scrkernel-basics.dtx (with options: `package,option,koma') %% scrkernel-fonts.dtx (with options: `package,option,scrkbase') %% scrlfile.dtx (with options: `load') @@ -44,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +67,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] @@ -240,13 +241,14 @@ } \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions +%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (option) \KOMAProcessOptions\relax -%%% 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 $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $ \RequirePackage{scrlfile}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2601 2017-02-23 16:26:09Z kohm $ (body) \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% } @@ -282,8 +284,7 @@ \fi }% } -\newcommand*{\AfterKOMAoptions}{} -\let\AfterKOMAoptions\AtEndOfFamilyOptions +\newcommand*{\AfterKOMAoptions}{\AtEndOfFamilyOptions} \newcommand*{\KOMAoption}{\FamilyOption{KOMA}} \newcommand*{\KOMA@unknown@keyval}{\FamilyUnknownKeyValue{KOMA}} \newcommand*{\KOMA@ifkey}[2][.\@currname.\@currext]{% @@ -414,7 +415,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\IfExistskomafont}[1]{% \@ifundefined{scr@fnt@#1}{% \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}% @@ -599,7 +600,7 @@ #2% }% } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty index fd90da4263d..341c33f9d38 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -46,10 +46,10 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (identify) +%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-notecolumn}[% - 2016/06/28 v0.1.2483 KOMA-Script + 2017/02/08 v0.1.2583 KOMA-Script package (end user interface for scrlayer)] %%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) @@ -63,7 +63,7 @@ } \let\scrlayer@AtEndOfPackage\AtEndOfPackage \scrlayerInitInterface -%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (init) +%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (init) \@tempswatrue \scr@ifundefinedorrelax{pdfsavepos}{% \scr@ifundefinedorrelax{savepos}{% @@ -236,7 +236,7 @@ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces} {scrlayer@autoremoveinterfaces}% } -%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (options) +%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (options) \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns} \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default} @@ -311,7 +311,7 @@ \expandafter\let \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname \relax -%%% From File: $Id: scrlayer-notecolumn.dtx 2483 2016-06-28 07:36:58Z kohm $ (body) +%%% From File: $Id: scrlayer-notecolumn.dtx 2583 2017-02-08 19:39:06Z kohm $ (body) \scrlayerAddToInterface\DeclareNoteColumn{% \newcommand*{\DeclareNoteColumn}[2][]{% \@ifundefined{slnc@#2@box}{% @@ -605,15 +605,24 @@ \endgroup }% } +\scrlayerAddToInterface\slnc@unexpanded{% + \let\slnc@unexpanded\detokenize +} \scrlayerAddToInterface\makenote{% - \newcommand{\makenote}[2][marginpar]{% + \newcommand*{\makenote}{% + \kernel@ifstar{\let\slnc@unexpanded\detokenize\slnc@makenote}% + {\let\slnc@unexpanded\@firstofone\slnc@makenote}% + }% +} +\scrlayerAddToInterface\slnc@makenote{% + \newcommand{\slnc@makenote}[2][marginpar]{% \@bsphack \scr@savepos \addtocontents{slnc}{% \string\slnc@note{#1}% {\noexpand\number\value{slncpage}}% {\noexpand\number\scr@lastypos}% - {#2}% + {\slnc@unexpanded{#2}}% }% \@esphack }% @@ -718,6 +727,7 @@ \expandafter\unvbox\csname slnc@#1@box\endcsname \ifdim\@tempdima>\z@ \kern\@tempdima\fi \fi + \slnc@restoreinnote \strut\ignorespaces ##4\par }% }% @@ -778,6 +788,25 @@ \endgroup } } +\scrlayerAddToInterface\slnc@restoreinnote{% + \let\slnc@restoreinnote\@empty +} +\scrlayerAddToInterface\restoreinnote{% + \newcommand*\restoreinnote[1]{% + \AtBeginDocument{% + \expandafter\scrlayerAddCsToInterface[scrlayer-notecolumn.sty]{slnc\string#1}{% + \expandafter\let\csname slnc\string#1\endcsname#1% + \g@addto@macro\slnc@restoreinnote{% + \expandafter\let\expandafter#1\csname slnc\string#1\endcsname + }% + }% + }% + }% + \@onlypreamble\restoreinnote + \restoreinnote\label + \restoreinnote\index + \restoreinnote\glossary +} \scrlayerAddToInterface\slnc@readnotes{% \newcommand*\slnc@readnotes[1]{% \ifeof\slnc@file\else @@ -1241,7 +1270,7 @@ \ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi }% \expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index 1c12010434b..a8fc3f2fae7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -48,7 +48,7 @@ %%% From File: $Id: scrlayer-scrpage.dtx 2429 2016-04-12 12:10:19Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (end user interface for scrlayer)] %%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) @@ -1867,7 +1867,7 @@ \scrlayerAddCsToInterface{ps@plain.useheadings}{% \@namedef{ps@plain.useheadings}{\@nameuse{ps@plain.scrheadings}}% } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index af8f7729828..9ad1eee2b26 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -46,7 +46,7 @@ %%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (defining layers and page styles)] %%% From File: $Id: scrlayer.dtx 2562 2016-12-07 09:15:31Z kohm $ (init) @@ -2165,7 +2165,7 @@ %%% 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 $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 52ccd34d02b..f70162b37ca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -7,6 +7,8 @@ %% scrkernel-version.dtx (with options: `package,letter') %% scrkernel-basics.dtx (with options: `load') %% scrkernel-miscellaneous.dtx (with options: `package,letter,init') +%% scrkernel-compatibility.dtx (with options: `package,letter,init') +%% scrkernel-typearea.dtx (with options: `package,letter,init') %% scrkernel-miscellaneous.dtx (with options: `package,letter,option') %% scrkernel-letterclassoptions.dtx (with options: `package,letter,option') %% scrkernel-language.dtx (with options: `package,letter,option') @@ -60,7 +62,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,30 +84,40 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script letter package extending any KOMA-Script class% ] -%%% 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 $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% \PackageWarningNoLine{scrletter}{% Cannot detect any KOMA-Script class.\MessageBreak Package `scrletter' is an extension to\MessageBreak KOMA-Script classes.\MessageBreak - Usage with another class is not supported.\MessageBreak - Expect several errors while using it with\MessageBreak - another class.% + Usage with another class is not recommended% + \@ifclassloaded{article}{}{% + \@ifclassloaded{report}{}{% + \@ifclassloaded{book}{}{% + \MessageBreak and can result in several errors% + }% + }% + }% }% + \RequirePackage{scrextend}% + \providecommand*{\setparsizes}[3]{% + \setlength{\parindent}{#1}% + \setlength{\parskip}{#2}% + \setlength{\parfillskip}{#3}% + } + \providecommand*{\par@updaterelative}{} }{} - \newcommand*{\scr@renewforletter}{% \kernel@ifstar {\@renewforletter*}% {\@renewforletter{}}% @@ -129,8 +141,166 @@ \endgroup \let\do@renewforletter@list\@empty } -%%% 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 $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) +\providecommand* + {\scr@compatibility}{\scr@v@last} +\@namedef{scr@v@first}{0} +\@namedef{scr@v@2.9}{0} +\@namedef{scr@v@2.9t}{0} +\@namedef{scr@v@2.9u}{1} +\@namedef{scr@v@2.95}{2} +\@namedef{scr@v@2.95a}{2} +\@namedef{scr@v@2.95b}{2} +\@namedef{scr@v@2.96}{2} +\@namedef{scr@v@2.96a}{3} +\@namedef{scr@v@2.97}{3} +\@namedef{scr@v@2.97a}{3} +\@namedef{scr@v@2.97b}{3} +\@namedef{scr@v@2.97c}{4} +\@namedef{scr@v@2.97d}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@2.98a}{6} +\@namedef{scr@v@2.98b}{6} +\@namedef{scr@v@2.98c}{7} +\@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} +\@namedef{scr@v@3.02c}{10} +\@namedef{scr@v@3.03}{10} +\@namedef{scr@v@3.03a}{10} +\@namedef{scr@v@3.03b}{10} +\@namedef{scr@v@3.04}{10} +\@namedef{scr@v@3.04a}{10} +\@namedef{scr@v@3.05}{10} +\@namedef{scr@v@3.05a}{10} +\@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} +\@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} +\@namedef{scr@v@3.09a}{10} +\@namedef{scr@v@3.10}{10} +\@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} +\@namedef{scr@v@3.11a}{10} +\@namedef{scr@v@3.11b}{10} +\@namedef{scr@v@3.12}{11} +\@namedef{scr@v@3.13}{12} +\@namedef{scr@v@3.13a}{13} +\@namedef{scr@v@3.14}{13} +\@namedef{scr@v@3.15}{14} +\@namedef{scr@v@3.16}{14} +\@namedef{scr@v@3.17}{15} +\@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} +\@namedef{scr@v@3.19a}{15} +\@namedef{scr@v@3.20}{15} +\@namedef{scr@v@3.21}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} +\@namedef{scr@v@last}{16} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) +\providecommand*{\PaperNameToSize}[2][warning]{% + \ifstr{#2}{letter}{% + \setlength\paperheight{11in}% + \setlength\paperwidth {8.5in}% + }{% + \ifstr{#2}{legal}{% + \setlength\paperheight{14in}% + \setlength\paperwidth {8.5in}% + }{% + \ifstr{#2}{executive}{% + \setlength\paperheight{10.5in}% + \setlength\paperwidth {7.25in}% + }{% + \ifstr{#2}{}{% + \ISO@PaperNameToSize[#1]{}{}\@nil + }{% + \edef\reserved@a{\noexpand\ISO@PaperNameToSize[#1]#2 \noexpand\@nil}% + \reserved@a + }% + }% + }% + }% +} +\scr@ifundefinedorrelax{ISO@PaperNameToSize}{% + \def\ISO@PaperNameToSize[#1]#2#3\@nil{% + \lowercase{\edef\reserved@a{#2}}% + \@tempswafalse + \if \reserved@a a% + \ifnumber{#3}{% + \setlength{\paperwidth}{841sp}% + \setlength{\paperheight}{1189sp}% + \@tempswatrue + }{}% + \else + \if \reserved@a b% + \ifnumber{#3}{% + \setlength{\paperwidth}{1000sp}% + \setlength{\paperheight}{1414sp}% + \@tempswatrue + }{}% + \else + \if \reserved@a c% + \ifnumber{#3}{% + \setlength{\paperwidth}{917sp}% + \setlength{\paperheight}{1297sp}% + \@tempswatrue + }{}% + \else + \if \reserved@a d% + \ifnumber{#3}{% + \setlength{\paperwidth}{771sp}% + \setlength{\paperheight}{1090sp}% + \@tempswatrue + }{}% + \fi + \fi + \fi + \fi + \if@tempswa + \@tempcnta=#3\relax + \@whilenum\@tempcnta>\z@ + \do{\setlength{\@tempdima}{\paperwidth}% + \setlength{\paperwidth}{.5\paperheight}% + \setlength{\paperheight}{\@tempdima}% + \advance\@tempcnta by\m@ne + }% + \multiply\paperwidth by186468 + \multiply\paperheight by186468 + \else + \scr@ifundefinedorrelax{scr@UnknownPaperSize@#1}{% + \scr@UnknownPaperSize@error{#2#3}% + }{% + \@nameuse{scr@UnknownPaperSize@#1}{#2#3}% + }% + \fi + }% +}{} +\providecommand*{\ProvideUnknownPaperSizeError}[1]{% + \expandafter\providecommand\expandafter*% + \csname scr@UnknownPaperSize@#1\endcsname[1]% +} +\ProvideUnknownPaperSizeError{error}{% + \PackageError{% + scrletter% + }{Unknown paper size #1}{% + \string\paperwidth\space and \string\paperheight\space stay unchanged, + because of unknown paper size.% + }% +} +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -147,7 +317,7 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -162,11 +332,11 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z 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 2564 2016-12-21 10:43:41Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -686,11 +856,11 @@ scrletter.\scr@pkgextension }{symbolicnames}{false}% %%% 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 $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMAProcessOptions\relax -%%% 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 $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -817,26 +987,27 @@ \def\@tempb{letter}\ifx\LOPNP@size\@tempb% \setlength{\paperheight}{11in}\setlength{\paperwidth}{8.5in}% \else\def\@tempb{legal}\ifx\LOPNP@size\@tempb% - \setlength{\paperheight}{14in}\setlength{\paperwidth}{8.5in}% - \else\def\@tempb{executive}\ifx\LOPNP@size\@tempb% - \setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}% - \else% - \def\ta@opt@err{% - \PackageError{scrletter% - }{papersize `\LOPNP@size' undefined}{% - You've told me to check for paper size - `\LOPNP@size'\MessageBreak - at letter option file `\LOPNP@option.lco',\MessageBreak - but this paper size is not supported.\MessageBreak - See the KOMA-Script manual for informations about known - paper sizes.}% - }% - \let\@headlines\ta@opt@err% - \expandafter\x@@paper\LOPNP@size paperpaper\x@@paper% - \fi\fi\fi + \setlength{\paperheight}{14in}\setlength{\paperwidth}{8.5in}% + \else\def\@tempb{executive}\ifx\LOPNP@size\@tempb% + \setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}% + \else% + \PaperNameToSize[letter]{\LOPNP@size}% + \fi + \fi + \fi \@tempc \endgroup% } +\ProvideUnknownPaperSizeError{letter}{% + \PackageError{scrletter}{% + papersize `\LOPNP@size' undefined}{% + You've told me to check for paper size + `\LOPNP@size'\MessageBreak + at letter option file `\LOPNP@option.lco',\MessageBreak + but this paper size is not supported.\MessageBreak + See the KOMA-Script manual for informations about known + paper sizes.}% +} \newcommand*{\@@PapersizeWarning}{% \if@tempswa\else% \PackageWarningNoLine{scrletter% @@ -844,8 +1015,16 @@ Letter option file `\LOPNP@option.lco'\MessageBreak needs paper size `\LOPNP@size'.\MessageBreak Current paper size is not `\LOPNP@size'!\MessageBreak - You should add `paper=\LOPNP@size' at the\MessageBreak - option list of \string\documentclass!\MessageBreak + \scr@ifundefinedorrelax{KOMAClassName}{% + You should load package `typearea' either\MessageBreak + with option `paper=\LOPNP@size,paper=portrait' or + additionally\MessageBreak + }{% + You should add `paper=\LOPNP@size,paper=portrait' at the\MessageBreak + option list of `\string\documentclass' or\MessageBreak + }% + add `\string\KOMAoptions{paper=\LOPNP@size,paper=portrait}'\MessageBreak + before starting this letter!\MessageBreak Maybe you know what you are doing,\MessageBreak so I do not change this myself}% \fi @@ -853,7 +1032,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \PackageInfo{scrletter% @@ -1574,7 +1753,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{% \letterpagemark }{% @@ -1605,7 +1784,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -2880,7 +3059,7 @@ \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 6b165f5fb4c..b9bcd9ada39 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -39,9 +39,9 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrlfile.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProvidesPackage{scrlfile}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% ^^J\@spaces\@spaces\@spaces\@spaces\space\space @@ -484,7 +484,7 @@ \endgroup \if@nobreak\ifvmode\nobreak\fi\fi } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index fc190203355..791aeab5d25 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -6,6 +6,8 @@ %% %% scrkernel-version.dtx (with options: `class,letter') %% scrkernel-basics.dtx (with options: `load') +%% scrkernel-compatibility.dtx (with options: `class,letter,init') +%% scrkernel-typearea.dtx (with options: `class,scrlttr2,init') %% scrkernel-compatibility.dtx (with options: `class,letter,option') %% scrkernel-miscellaneous.dtx (with options: `class,letter,option') %% scrkernel-letterclassoptions.dtx (with options: `class,letter,option') @@ -71,7 +73,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -93,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -108,50 +110,13 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) \newcommand* {\scr@compatibility}{\scr@v@last} -\KOMA@key{version}[last]{% - \scr@ifundefinedorrelax{scr@v@#1}{% - \def\scr@compatibility{0}% - \ClassWarningNoLine{\KOMAClassName}{% - You have set option `version' to value `#1', but\MessageBreak - this value of version is not supported.\MessageBreak - Because of this, version was set to `first'% - }% - \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% - \KOMAClassFileName - }{version}{first}% - }{% - \ClassInfoNoLine{\KOMAClassName}{% - Switching compatibility level to `#1'% - }% - \edef\scr@compatibility{\@nameuse{scr@v@#1}}% - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{version}{#1}% - }% -} -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} -\AtEndOfClass{% - \KOMA@key{version}[]{% - \ClassError{\KOMAClassName}{% - Option `version' too late% - }{% - Option `version' may be set only while loading the - class.\MessageBreak - But you've tried to set it up later.% - }% - \FamilyKeyStateProcessed - }% -} \@namedef{scr@v@first}{0} \@namedef{scr@v@2.9}{0} \@namedef{scr@v@2.9t}{0} @@ -215,7 +180,46 @@ \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} \@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} \@namedef{scr@v@last}{16} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + \FamilyKeyStateProcessed + \KOMA@kav@replacevalue{.% + \KOMAClassFileName + }{version}{first}% + }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + \KOMAClassFileName + }{version}{#1}% + }% +} +\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + class.\MessageBreak + But you've tried to set it up later.% + }% + \FamilyKeyStateProcessed + }% +} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -228,7 +232,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -252,7 +256,7 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \newcommand*{\lco@test}{% \IfFileExists{\CurrentOption.lco}{% \expandafter @@ -269,7 +273,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -284,7 +288,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\@ptsize{% 12% } @@ -371,7 +375,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 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option) \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -479,7 +483,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: option \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -645,7 +649,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} @@ -749,8 +753,8 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% 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 $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -820,8 +824,8 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% 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 $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1371,12 +1375,12 @@ \KOMAClassFileName }{symbolicnames}{false}% %%% 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 $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMAExecuteOptions{% parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1388,7 +1392,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -1862,7 +1866,7 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \setlength{\skip\@mpfootins}{\skip\footins} \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} @@ -1901,6 +1905,8 @@ \noexpand\string \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% \fi + \noexpand\def\noexpand\is@thispageodd@setlabel + {\unexpanded\expandafter{\is@thispageodd@setlabel}}% }% #1% \@esphack @@ -1951,8 +1957,9 @@ the extended optional argument of the section\MessageBreak commands} \scr@package@not@recommended{titleps}{% - package `scrlayer-scrpage`} -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ + package `scrlayer-scrpage'} +\scr@package@not@recommended{minitoc}{} +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \newcommand*{\LoadLetterOption}[1]{% \@ifundefined{@restore@catcode@level}% {\let\@restore@catcode@level=\z@}{}% @@ -2079,26 +2086,29 @@ \def\@tempb{letter}\ifx\LOPNP@size\@tempb% \setlength{\paperheight}{11in}\setlength{\paperwidth}{8.5in}% \else\def\@tempb{legal}\ifx\LOPNP@size\@tempb% - \setlength{\paperheight}{14in}\setlength{\paperwidth}{8.5in}% - \else\def\@tempb{executive}\ifx\LOPNP@size\@tempb% - \setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}% - \else% - \def\ta@opt@err{% - \ClassError{scrlttr2% - }{papersize `\LOPNP@size' undefined}{% - You've told me to check for paper size - `\LOPNP@size'\MessageBreak - at letter option file `\LOPNP@option.lco',\MessageBreak - but this paper size is not supported.\MessageBreak - See the KOMA-Script manual for informations about known - paper sizes.}% - }% - \let\@headlines\ta@opt@err% - \expandafter\x@@paper\LOPNP@size paperpaper\x@@paper% - \fi\fi\fi + \setlength{\paperheight}{14in}\setlength{\paperwidth}{8.5in}% + \else\def\@tempb{executive}\ifx\LOPNP@size\@tempb% + \setlength{\paperheight}{10.5in}\setlength{\paperwidth}{7.25in}% + \else% + \PaperNameToSize[letter]{\LOPNP@size}% + \fi + \fi + \fi \@tempc \endgroup% } +\AfterPackage*{typearea}{% +\ProvideUnknownPaperSizeError{letter}{% + \ClassError{scrlttr2}{% + papersize `\LOPNP@size' undefined}{% + You've told me to check for paper size + `\LOPNP@size'\MessageBreak + at letter option file `\LOPNP@option.lco',\MessageBreak + but this paper size is not supported.\MessageBreak + See the KOMA-Script manual for informations about known + paper sizes.}% +} +} \newcommand*{\@@PapersizeWarning}{% \if@tempswa\else% \ClassWarningNoLine{scrlttr2% @@ -2106,8 +2116,16 @@ Letter option file `\LOPNP@option.lco'\MessageBreak needs paper size `\LOPNP@size'.\MessageBreak Current paper size is not `\LOPNP@size'!\MessageBreak - You should add `paper=\LOPNP@size' at the\MessageBreak - option list of \string\documentclass!\MessageBreak + \scr@ifundefinedorrelax{KOMAClassName}{% + You should load package `typearea' either\MessageBreak + with option `paper=\LOPNP@size,paper=portrait' or + additionally\MessageBreak + }{% + You should add `paper=\LOPNP@size,paper=portrait' at the\MessageBreak + option list of `\string\documentclass' or\MessageBreak + }% + add `\string\KOMAoptions{paper=\LOPNP@size,paper=portrait}'\MessageBreak + before starting this letter!\MessageBreak Maybe you know what you are doing,\MessageBreak so I do not change this myself}% \fi @@ -2115,7 +2133,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \ClassInfo{scrlttr2% @@ -2836,7 +2854,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2847,7 +2865,7 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: body \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} @@ -2974,7 +2992,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -3070,11 +3088,11 @@ } \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -3129,6 +3147,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi @@ -3169,6 +3188,7 @@ \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } +\newcommand*{\raggedfootnote}{} \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} @@ -3229,7 +3249,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ \setlength{\leftmargini}{2.5em} \setlength{\leftmarginii}{2.2em} \setlength{\leftmarginiii}{1.87em} @@ -3379,7 +3399,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -4716,7 +4736,7 @@ \expandafter\def\csname #9\endcsname{#2 #1\\#3}% \fi \fi} \newcommand*{\addrchar}[1]{} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index 6bd73a0b2ef..07b4a16359e 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}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (page head and foot)] \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% @@ -1073,7 +1073,7 @@ into the preamble of your document.\MessageBreak A better solution would be to use typearea package}% \fi\fi} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index ce361cb443c..efa6016aded 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -9,6 +9,8 @@ %% tocbasic.dtx (with options: `class,load,chapter') %% scrkernel-tocstyle.dtx (with options: `class,report,prepare') %% scrkernel-sections.dtx (with options: `class,report,prepare') +%% scrkernel-compatibility.dtx (with options: `class,report,init') +%% scrkernel-typearea.dtx (with options: `class,report,init') %% scrkernel-compatibility.dtx (with options: `class,report,option') %% scrkernel-miscellaneous.dtx (with options: `class,report,option') %% scrkernel-language.dtx (with options: `class,report,option') @@ -81,7 +83,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -103,7 +105,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -118,23 +120,23 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ \RequirePackage{tocbasic}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} +\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}} \addtotoclist[float]{lof} \addtotoclist[float]{lot} %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -210,70 +212,9 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% 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 -\DeclareOption{emulatestandardclasses}{% - \let\if@scr@emulatestandardclasses\iftrue - \KOMAExecuteOptions{% - fontsize=10pt,% - headings=standardclasses,% - cleardoublepage=current - }% - \newcommand*{\defaultpapersize}{letter}% - \AtEndOfClass{% - \setkomafont{descriptionlabel}{\bfseries}% - \setkomafont{dictum}{\normalfont\small}% - \setkomafont{caption}{}% - \setkomafont{captionlabel}{}% - \setcapindent{0pt}% - \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}% - \PreventPackageFromLoading{scrpage2}% - \setkomafont{pagenumber}{\normalfont}% - \setkomafont{pageheadfoot}{\normalfont}% - \cfoot[\pagemark]{}% - \pagestyle{plain}% - }% -} +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) \newcommand* {\scr@compatibility}{\scr@v@last} -\KOMA@key{version}[last]{% - \scr@ifundefinedorrelax{scr@v@#1}{% - \def\scr@compatibility{0}% - \ClassWarningNoLine{\KOMAClassName}{% - You have set option `version' to value `#1', but\MessageBreak - this value of version is not supported.\MessageBreak - Because of this, version was set to `first'% - }% - \FamilyKeyStateProcessed - \KOMA@kav@replacevalue{.% - \KOMAClassFileName - }{version}{first}% - }{% - \ClassInfoNoLine{\KOMAClassName}{% - Switching compatibility level to `#1'% - }% - \edef\scr@compatibility{\@nameuse{scr@v@#1}}% - \FamilyKeyStateProcessed - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{version}{#1}% - }% -} -\KOMA@kav@add{.\KOMAClassFileName}{version}{last} -\AtEndOfClass{% - \KOMA@key{version}[]{% - \ClassError{\KOMAClassName}{% - Option `version' too late% - }{% - Option `version' may be set only while loading the - class.\MessageBreak - But you've tried to set it up later.% - }% - \FamilyKeyStateProcessed - }% -} \@namedef{scr@v@first}{0} \@namedef{scr@v@2.9}{0} \@namedef{scr@v@2.9t}{0} @@ -337,7 +278,71 @@ \@namedef{scr@v@3.20}{15} \@namedef{scr@v@3.21}{15} \@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} \@namedef{scr@v@last}{16} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +\newif\if@scr@emulatestandardclasses +\let\scr@emulatestandardclassestrue\relax +\let\scr@emulatestandardclassesfalse\relax +\DeclareOption{emulatestandardclasses}{% + \let\if@scr@emulatestandardclasses\iftrue + \KOMAExecuteOptions{% + fontsize=10pt,% + headings=standardclasses,% + cleardoublepage=current + }% + \newcommand*{\defaultpapersize}{letter}% + \AtEndOfClass{% + \setkomafont{descriptionlabel}{\bfseries}% + \setkomafont{dictum}{\normalfont\small}% + \setkomafont{caption}{}% + \setkomafont{captionlabel}{}% + \setcapindent{0pt}% + \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}% + \PreventPackageFromLoading{scrpage2}% + \setkomafont{pagenumber}{\normalfont}% + \setkomafont{pageheadfoot}{\normalfont}% + \cfoot[\pagemark]{}% + \pagestyle{plain}% + }% +} +\KOMA@key{version}[last]{% + \scr@ifundefinedorrelax{scr@v@#1}{% + \def\scr@compatibility{0}% + \ClassWarningNoLine{\KOMAClassName}{% + You have set option `version' to value `#1', but\MessageBreak + this value of version is not supported.\MessageBreak + Because of this, version was set to `first'% + }% + \FamilyKeyStateProcessed + \KOMA@kav@replacevalue{.% + \KOMAClassFileName + }{version}{first}% + }{% + \ClassInfoNoLine{\KOMAClassName}{% + Switching compatibility level to `#1'% + }% + \edef\scr@compatibility{\@nameuse{scr@v@#1}}% + \FamilyKeyStateProcessed + \KOMA@kav@xreplacevalue{.% + \KOMAClassFileName + }{version}{#1}% + }% +} +\KOMA@kav@add{.\KOMAClassFileName}{version}{last} +\AtEndOfClass{% + \KOMA@key{version}[]{% + \ClassError{\KOMAClassName}{% + Option `version' too late% + }{% + Option `version' may be set only while loading the + class.\MessageBreak + But you've tried to set it up later.% + }% + \FamilyKeyStateProcessed + }% +} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} } @@ -350,7 +355,7 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -376,8 +381,8 @@ \newcommand*{\@gr@gsffamily}{% \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 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\@ptsize{% 11% } @@ -462,7 +467,7 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option) \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -571,7 +576,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: option \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% @@ -737,7 +742,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage @@ -773,7 +778,7 @@ \KOMA@DeclareStandardOption{abstractoff}{abstract=false} %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -1035,7 +1040,7 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} @@ -1139,7 +1144,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1273,7 +1278,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1343,7 +1348,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1397,12 +1402,12 @@ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}% - \setuptoc{toc}{numberline}% + \expandafter\setuptoc\expandafter{\ext@toc}{numberline}% \or % leftaligntextentries \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}% \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}% \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}% - \unsettoc{toc}{numberline}% + \expandafter\unsettoc\expandafter{\ext@toc}{numberline}% \or % chapterentrywithdots/sectionentrywithdots \KOMAoptions{chapterentrydots=true}% \or % chapterentrywithoutdots/sectionentrywithoutdots @@ -1607,7 +1612,7 @@ \BeforeTOCHead{\@chaptertolistsfalse} \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}% \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}% -%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1781,7 +1786,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -1864,19 +1869,19 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% 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 $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% 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 $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2350,12 +2355,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2399,7 +2404,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ %%% run: body \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} @@ -2528,7 +2533,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2916,7 +2921,7 @@ %%% 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 2565 2016-12-21 17:25:47Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -3152,6 +3157,16 @@ \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}% \fi \fi + \scr@ifundefinedorrelax{scr@mt@saved@sect}{}{% + \expandafter\ifx\csname #1\endcsname\section + \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}% + \addcontentsline{\ext@table}{xsect}{\@currenttocentry}% + \fi + \expandafter\ifx\csname #1\endcsname\starsection\relax + \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}% + \addcontentsline{\ext@table}{xsect}{\@currenttocentry}% + \fi + }% \let\IfUsePrefixLine\@secondoftwo \ifnum \numexpr #2\relax>\c@secnumdepth \let\@svsec\@empty @@ -4740,7 +4755,7 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ \newif\if@restonecol \newcommand{\dictum}[2][]{\par% \begingroup @@ -4807,6 +4822,8 @@ \noexpand\string \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}% \fi + \noexpand\def\noexpand\is@thispageodd@setlabel + {\unexpanded\expandafter{\is@thispageodd@setlabel}}% }% #1% \@esphack @@ -4857,7 +4874,95 @@ the extended optional argument of the section\MessageBreak commands} \scr@package@not@recommended{titleps}{% - package `scrlayer-scrpage`} + package `scrlayer-scrpage'} +\scr@package@not@recommended{minitoc}{} +\BeforePackage{minitoc}{% + \let\scr@mt@saved@sect\@sect +} +\AfterPackage{minitoc}{% + \def\@tempa#1#2#3#4#5#6[#7]#8{% + \ifnum #2<1 \relax + \addtocontents{toc}{\protect\sectbegin} + \fi + \stc@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}% + }% + \ifx\@sect\@tempa + \def\@tempa#1#2#3#4#5#6[#7]#8{ + \expandafter + \ifx\csname #1\endcsname\section\relax + \addcontentsline{lof}{xsect}{#7}% + \addcontentsline{lot}{xsect}{#7}% + \fi + \ifx\csname #1\endcsname\starsection\relax + \addcontentsline{lof}{xsect}{#7}% + \addcontentsline{lot}{xsect}{#7}% + \fi + \ifnum #2>\c@secnumdepth\relax + \let\@svsec\@empty + \else + \refstepcounter{#1}% + \edef\@svsec{\csname the#1\endcsname\hskip 1em}% + \fi + \@tempskipa #5\relax + \ifdim \@tempskipa>\z@ + \begingroup #6\relax + \@hangfrom{\hskip #3\relax\@svsec}% + {\interlinepenalty \@M #8\par}% + \endgroup + \csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth\relax + \else + \protect\numberline{\csname the#1\endcsname}% + \fi + #7% + }% + \else + \def\@svsechd{#6\hskip #3\relax + \@svsec #8\csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth\relax + \else + \protect\numberline{\csname the#1\endcsname} + \fi + #7}% + }% + \fi + \@xsect{#5}% + }% + \ifx\stc@sect\@tempa + \ClassWarning{\KOMAClassName}{% + Redefining minitoc's internal command + `\string\stc@sect'\MessageBreak + to prevent minitoc to destroy several features\MessageBreak + of KOMA-Script% + }% + \let\stc@sect\scr@mt@saved@sect + \else + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround,\MessageBreak + because of unexpected definition of\MessageBreak + `\string\stc@sect'% + }% + \let\scr@mt@saved@sect\relax + \fi + \else + \ifx\@sect\scr@mt@saved@sect + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround for + `\string\@sect',\MessageBreak + because it is not needed% + }% + \else + \ClassInfo{\KOMAClassName}{% + Deactivating the `minitoc' workaround,\MessageBreak + because of unexpected definition of\MessageBreak + `\string\@sect'% + }% + \fi + \let\scr@mt@saved@sect\relax + \fi +} \BeforePackage{titlesec}{% \let\scr@ttl@saved@section\section \let\scr@ttl@saved@subsection\subsection @@ -4868,11 +4973,11 @@ \AfterPackage{titlesec}{% \@ifpackagelater{titlesec}{2016/03/22}{% \ClassInfo{\KOMAClassName}{% - Deactivating the `titlesec` workaround,\MessageBreak + Deactivating the `titlesec' workaround,\MessageBreak because package is newer than expected% }% }{% - \PackageWarning{\KOMAClassName}{% + \ClassWarning{\KOMAClassName}{% Activating an ugly workaround for a missing\MessageBreak feature of package `titlesec`% }% @@ -4926,7 +5031,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -5024,7 +5129,7 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -5718,7 +5823,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5774,6 +5879,7 @@ \newcommand\deffootnote[4][]{% \expandafter\ifnum\scr@v@is@ge{3.22}\relax \long\def\@makefntext##1{% + \raggedfootnote \leftskip #2 \l@addto@macro\@trivlist{% \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi @@ -5814,6 +5920,7 @@ \fi \def\@@makefnmark{\hbox{\ftnm@font{#4}}}% } +\newcommand*{\raggedfootnote}{} \newcommand*{\ftn@font}{\normalfont} \newcommand*{\scr@fnt@footnote}{\ftn@font} \newcommand*{\ftnm@font}{} @@ -5874,7 +5981,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}% @@ -5963,10 +6070,13 @@ } \newcommand*{\toc@l@number}{} \newcommand*{\tableofcontents}{% - \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup + \begingroup + \let\if@dynlist\if@tocleft + \expandafter\listoftoc\expandafter{\ext@toc}% + \endgroup } \newcommand{\addtocentrydefault}[3]{% - \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}% + \expandafter\tocbasic@addxcontentsline\expandafter{\ext@toc}{#1}{#2}{#3}% } \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning @@ -6019,11 +6129,11 @@ \newcommand*\listtablename{List of Tables} \newcommand*\listoflotname{\listtablename} \newcommand*\listoflotentryname{\tablename} -\newcommand*\listoffigures{\listoftoc{lof}} +\newcommand*\listoffigures{\listoftoc{\ext@figure}} \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} -\newcommand*\listoftables{\listoftoc{lot}} +\newcommand*\listoftables{\listoftoc{\ext@table}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ \newcommand*\bibname{Bibliography} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -6108,7 +6218,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -6156,7 +6266,7 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -6315,7 +6425,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 39647d0e866..39bde5bb12b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProvidesFile{% scrsize10pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo index a65cdbe620b..4115099f784 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProvidesFile{% scrsize11pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo index 411025ce160..2df24119358 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ \ProvidesFile{% scrsize12pt.clo% }[\KOMAScriptVersion\space font size class option % @@ -149,7 +149,7 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} -%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{@list@extra}{}{% \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi \l@addto@macro{\@listi}{\@list@extra}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty index b8e174e6559..a26b65d2dae 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,10 @@ %%% From File: $Id: scrtime.dtx 2429 2016-04-12 12:10:19Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (time of LaTeX run)% ] -%%% 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 @@ -99,7 +98,7 @@ \the\@tempcnta{#1}\@tempif\ifnum\@tempcntb<10 0\fi\fi\the\@tempcntb% \endgroup} \newcommand*{\settime}[1]{\renewcommand*{\@thistime}[1][]{#1}} -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty index 9076c8a5037..7a6ea041b53 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty @@ -233,7 +233,7 @@ \iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}% }% } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index d43901bb64b..233af5170ff 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \ProvidesFile{setspace.hak}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 2451 2016-05-07 18:11:55Z kohm $ +%%% From File: $Id: scrhack.dtx 2615 2017-03-31 10:00:24Z kohm $ \scr@ifexpected{\onehalfspacing}{% \long\def\onehalfspacing{% \setstretch{1.25}% default diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index e1414a045f3..5830a69d488 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 %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ %%% (run: prepare) %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ %%% (run: option) \ProcessOptions\relax %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ %%% (run: body) \RequirePackage{scrbase} \newcommand*{\tb@listoftocs}{} @@ -162,11 +162,24 @@ because of feature `nobabel' available\MessageBreak for `#1'}% }{% - \PackageInfo{tocbasic}{setting babel extension for `#1'}% - \expandafter\gdef\expandafter\bbl@set@language\expandafter##\expandafter1% - \expandafter{% - \bbl@set@language{##1}% - \addtocontents{#1}{\xstring\select@language{\languagename}}% + \scr@ifundefinedorrelax{BabelContentsFiles}{% + \PackageInfo{tocbasic}{setting babel extension for `#1'}% + \expandafter\gdef\expandafter\bbl@set@language + \expandafter##\expandafter1% + \expandafter{% + \bbl@set@language{##1}% + \addtocontents{#1}{\xstring\select@language{\languagename}}% + }% + }{% + \@expandtwoargs\in@{,#1,}{,\BabelContentsFiles,}% + \ifin@ + \PackageInfo{tocbasic}{omitting babel extension for + `#1'\MessageBreak + because it is already in \string\BabelContentsFiles}% + \else + \PackageInfo{tocbasic}{setting babel extension for `#1'}% + \xdef\BabelContentsFiles{\BabelContentsFiles,#1}% + \fi }% }% }% @@ -398,6 +411,7 @@ \newcommand{\@@listofeachtoc}[1]{% \doforeachtocfile{\listoftoc{\@currext}}% } +\providecommand*{\ext@toc}{toc} \newcommand*{\tocbasic@listhead}[1]{% \@ifundefined{tocbasic@listhead@\@currext}{% \scr@ifundefinedorrelax{chapter}{% @@ -410,7 +424,8 @@ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi \begingroup \iftocfeature{\@currext}{totoc}{% - \addxcontentsline{toc}{subsection}{##1}% + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {subsection}{##1}% }{}% \@ifundefined{@mkright}{% \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi @@ -428,7 +443,8 @@ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi \begingroup \iftocfeature{\@currext}{totoc}{% - \addxcontentsline{toc}{section}{##1}% + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {section}{##1}% }{}% \@ifundefined{@mkdouble}{% \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}% @@ -458,7 +474,8 @@ }{% \@mkright{\MakeMarkcase{##1}}% }% - \addxcontentsline{toc}{section}{##1}% + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {section}{##1}% \endgroup \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi }{% @@ -492,7 +509,8 @@ \@mkdouble{\MakeMarkcase{##1}}% }% \iftocfeature{\@currext}{totoc}{% - \addxcontentsline{toc}{chapter}{##1}% + \expandafter\addxcontentsline\expandafter{\ext@toc}% + {chapter}{##1}% }{}% \endgroup \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi @@ -2177,7 +2195,7 @@ %%% 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 2499 2016-09-06 07:00:45Z kohm $ +%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% @@ -2188,7 +2206,7 @@ }% }{}% } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty index a5cb17da24e..807a7a86eb6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty @@ -7,7 +7,7 @@ %% tocstyle.dtx (with options: `package,trace,tocstyle') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 2007-2016 by Markus Kohm <komascript(at)gmx.info> +%% Copyright (c) 2007-2017 by Markus Kohm <komascript(at)gmx.info> %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -44,10 +44,10 @@ %% EVERYTHING MAY CHANGE IN FUTURE! %% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE! %% -%%% From File: $Id: tocstyle.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: tocstyle.dtx 2600 2017-02-23 12:07:58Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{tocstyle} - [2016/04/12 v0.2h-alpha KOMA-Script package (versatile toc styles)] + [2017/02/23 v0.2i-alpha KOMA-Script package (versatile toc styles)] \PackageWarningNoLine{tocstyle}{% THIS IS AN ALPHA VERSION!\MessageBreak USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak @@ -841,6 +841,7 @@ \fi \endgroup } +\providecommand*{\ext@toc}{toc} \newtocstyle{standard}{% \settocfeature{dothook}{\normalfont}% \settocfeature[-1]{entryhook}{\bfseries}% @@ -853,10 +854,7 @@ \settocfeature[1]{entryvskip}{1em\@plus\p@}% \settocfeature[1]{leaders}{\hfill}% \settocfeature[1]{entryhook}{% - \begingroup - \edef\@tempa{toc}% - \ifx\tocstyleAliasTOC\@tempa\aftergroup\bfseries\fi - \endgroup + \ifx\tocstyleAliasTOC\ext@toc\bfseries\fi }% \fi } @@ -876,20 +874,10 @@ \settocfeature[1]{entryvskip}{1em\@plus\p@}% \settocfeature[1]{leaders}{\hfill}% \settocfeature[1]{entryhook}{% - \begingroup - \edef\@tempa{toc}% - \ifx\tocstyleAliasTOC\@tempa - \aftergroup\sffamily\aftergroup\bfseries - \fi - \endgroup + \ifx\tocstyleAliasTOC\ext@toc\sffamily\bfseries\fi }% \settocfeature[1]{pagenumberhook}{% - \begingroup - \edef\@tempa{toc}% - \ifx\tocstyleAliasTOC\@tempa - \aftergroup\sffamily\aftergroup\bfseries - \fi - \endgroup + \ifx\tocstyleAliasTOC\ext@toc\sffamily\bfseries\fi }% \fi } @@ -909,8 +897,7 @@ \settocfeature[1]{leaders}{\hfill}% \settocfeature[1]{entryhook}{% \begingroup - \edef\@tempa{toc}% - \ifx\tocstyleAliasTOC\@tempa + \ifx\tocstyleAliasTOC\ext@toc \def\@tempa{\endgroup\usekomafont{sectionentry}}% \else \let\@tempa\endgroup @@ -919,8 +906,7 @@ }% \settocfeature[1]{pagenumberhook}{% \begingroup - \edef\@tempa{toc}% - \ifx\tocstyleAliasTOC\@tempa + \ifx\tocstyleAliasTOC\ext@toc \def\@tempa{\endgroup\usekomafont{sectionentrypagenumber}}% \else \let\@tempa\endgroup @@ -954,7 +940,7 @@ }{% \PackageInfo{tocstyle}{no tocstyle.cfg found}% } -%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 1453f16575d..05e7d17c530 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -5,11 +5,13 @@ %% The original source files were: %% %% scrkernel-version.dtx (with options: `package,typearea') -%% scrkernel-typearea.dtx (with options: `package,identify') +%% scrkernel-typearea.dtx (with options: `package,typearea,identify') %% scrkernel-basics.dtx (with options: `load') -%% scrkernel-typearea.dtx (with options: `package,option') +%% scrkernel-compatibility.dtx (with options: `package,typearea,init') +%% scrkernel-typearea.dtx (with options: `package,typearea,init') +%% scrkernel-typearea.dtx (with options: `package,typearea,option') %% scrkernel-compatibility.dtx (with options: `package,typearea,option') -%% scrkernel-typearea.dtx (with options: `package,body') +%% scrkernel-typearea.dtx (with options: `package,typearea,body') %% scrkernel-compatibility.dtx (with options: `package,typearea,body') %% scrlogo.dtx (with options: `logo') %% @@ -45,7 +47,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,27 +69,197 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2017/01/03 v3.22 KOMA-Script + 2017/04/13 v3.23 KOMA-Script package (type area)] -\typeout{% - Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J% - \@spaces\@spaces\@spaces\@spaces\space\space - Copyright (C) Frank Neukam, 1992-1994^^J% - \@spaces\@spaces\@spaces\@spaces\space\space - Copyright (C) Markus Kohm, 1994-^^J% -} -%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) +\providecommand* + {\scr@compatibility}{\scr@v@last} +\newcommand*{\scr@ta@compatibility}{\scr@compatibility} +\@namedef{scr@v@first}{0} +\@namedef{scr@v@2.9}{0} +\@namedef{scr@v@2.9t}{0} +\@namedef{scr@v@2.9u}{1} +\@namedef{scr@v@2.95}{2} +\@namedef{scr@v@2.95a}{2} +\@namedef{scr@v@2.95b}{2} +\@namedef{scr@v@2.96}{2} +\@namedef{scr@v@2.96a}{3} +\@namedef{scr@v@2.97}{3} +\@namedef{scr@v@2.97a}{3} +\@namedef{scr@v@2.97b}{3} +\@namedef{scr@v@2.97c}{4} +\@namedef{scr@v@2.97d}{5} +\@namedef{scr@v@2.97e}{6} +\@namedef{scr@v@2.98}{6} +\@namedef{scr@v@2.98a}{6} +\@namedef{scr@v@2.98b}{6} +\@namedef{scr@v@2.98c}{7} +\@namedef{scr@v@3.00}{8} +\@namedef{scr@v@3.01}{8} +\@namedef{scr@v@3.01a}{8} +\@namedef{scr@v@3.01b}{9} +\@namedef{scr@v@3.01c}{9} +\@namedef{scr@v@3.02}{9} +\@namedef{scr@v@3.02b}{9} +\@namedef{scr@v@3.02c}{10} +\@namedef{scr@v@3.03}{10} +\@namedef{scr@v@3.03a}{10} +\@namedef{scr@v@3.03b}{10} +\@namedef{scr@v@3.04}{10} +\@namedef{scr@v@3.04a}{10} +\@namedef{scr@v@3.05}{10} +\@namedef{scr@v@3.05a}{10} +\@namedef{scr@v@3.06}{10} +\@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} +\@namedef{scr@v@3.08a}{10} +\@namedef{scr@v@3.08b}{10} +\@namedef{scr@v@3.09}{10} +\@namedef{scr@v@3.09a}{10} +\@namedef{scr@v@3.10}{10} +\@namedef{scr@v@3.10a}{10} +\@namedef{scr@v@3.10b}{10} +\@namedef{scr@v@3.11}{10} +\@namedef{scr@v@3.11a}{10} +\@namedef{scr@v@3.11b}{10} +\@namedef{scr@v@3.12}{11} +\@namedef{scr@v@3.13}{12} +\@namedef{scr@v@3.13a}{13} +\@namedef{scr@v@3.14}{13} +\@namedef{scr@v@3.15}{14} +\@namedef{scr@v@3.16}{14} +\@namedef{scr@v@3.17}{15} +\@namedef{scr@v@3.17a}{15} +\@namedef{scr@v@3.17c}{15} +\@namedef{scr@v@3.18}{15} +\@namedef{scr@v@3.18a}{15} +\@namedef{scr@v@3.19}{15} +\@namedef{scr@v@3.19a}{15} +\@namedef{scr@v@3.20}{15} +\@namedef{scr@v@3.21}{15} +\@namedef{scr@v@3.22}{16} +\@namedef{scr@v@3.23}{16} +\@namedef{scr@v@last}{16} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) +\providecommand*{\PaperNameToSize}[2][warning]{% + \ifstr{#2}{letter}{% + \setlength\paperheight{11in}% + \setlength\paperwidth {8.5in}% + }{% + \ifstr{#2}{legal}{% + \setlength\paperheight{14in}% + \setlength\paperwidth {8.5in}% + }{% + \ifstr{#2}{executive}{% + \setlength\paperheight{10.5in}% + \setlength\paperwidth {7.25in}% + }{% + \ifstr{#2}{}{% + \ISO@PaperNameToSize[#1]{}{}\@nil + }{% + \edef\reserved@a{\noexpand\ISO@PaperNameToSize[#1]#2 \noexpand\@nil}% + \reserved@a + }% + }% + }% + }% +} +\scr@ifundefinedorrelax{ISO@PaperNameToSize}{% + \def\ISO@PaperNameToSize[#1]#2#3\@nil{% + \lowercase{\edef\reserved@a{#2}}% + \@tempswafalse + \if \reserved@a a% + \ifnumber{#3}{% + \setlength{\paperwidth}{841sp}% + \setlength{\paperheight}{1189sp}% + \@tempswatrue + }{}% + \else + \if \reserved@a b% + \ifnumber{#3}{% + \setlength{\paperwidth}{1000sp}% + \setlength{\paperheight}{1414sp}% + \@tempswatrue + }{}% + \else + \if \reserved@a c% + \ifnumber{#3}{% + \setlength{\paperwidth}{917sp}% + \setlength{\paperheight}{1297sp}% + \@tempswatrue + }{}% + \else + \if \reserved@a d% + \ifnumber{#3}{% + \setlength{\paperwidth}{771sp}% + \setlength{\paperheight}{1090sp}% + \@tempswatrue + }{}% + \fi + \fi + \fi + \fi + \if@tempswa + \@tempcnta=#3\relax + \@whilenum\@tempcnta>\z@ + \do{\setlength{\@tempdima}{\paperwidth}% + \setlength{\paperwidth}{.5\paperheight}% + \setlength{\paperheight}{\@tempdima}% + \advance\@tempcnta by\m@ne + }% + \multiply\paperwidth by186468 + \multiply\paperheight by186468 + \else + \scr@ifundefinedorrelax{scr@UnknownPaperSize@#1}{% + \scr@UnknownPaperSize@error{#2#3}% + }{% + \@nameuse{scr@UnknownPaperSize@#1}{#2#3}% + }% + \fi + }% +}{} +\providecommand*{\ProvideUnknownPaperSizeError}[1]{% + \expandafter\providecommand\expandafter*% + \csname scr@UnknownPaperSize@#1\endcsname[1]% +} +\ProvideUnknownPaperSizeError{error}{% + \PackageError{% + typearea% + }{Unknown paper size #1}{% + \string\paperwidth\space and \string\paperheight\space stay unchanged, + because of unknown paper size.% + }% +} +\ProvideUnknownPaperSizeError{warning}{% + \PackageWarning{% + typearea% + }{% + \string\paperwidth\space and \string\paperheight\space stay + unchanged, because\MessageBreak + of unknown paper size #1% + }% +} +\ProvideUnknownPaperSizeError{info}{% + \PackageInfo{% + typearea + }{% + \string\paperwidth\space and \string\paperheight\space stay + unchanged, because\MessageBreak + of unknown paper size #1% + }% +} +\ProvideUnknownPaperSizeError{ignore}{} +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option) \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -127,64 +299,25 @@ \else\@DIV\fi } \newcommand\isopaper[2][a]{% - \ifx a#1 - \setlength{\paperwidth}{841sp}% - \setlength{\paperheight}{1189sp}% - \else\ifx A#1 - \setlength{\paperwidth}{841sp}% - \setlength{\paperheight}{1189sp}% - \else\ifx b#1 - \setlength{\paperwidth}{1000sp}% - \setlength{\paperheight}{1414sp}% - \else\ifx B#1 - \setlength{\paperwidth}{1000sp}% - \setlength{\paperheight}{1414sp}% - \else\ifx c#1 - \setlength{\paperwidth}{917sp}% - \setlength{\paperheight}{1297sp}% - \else\ifx C#1 - \setlength{\paperwidth}{917sp}% - \setlength{\paperheight}{1297sp}% - \else\ifx d#1 - \setlength{\paperwidth}{771sp}% - \setlength{\paperheight}{1090sp}% - \else\ifx D#1 - \setlength{\paperwidth}{771sp}% - \setlength{\paperheight}{1090sp}% - \else - \PackageError{typearea}{% - Unknown ISO/DIN-papersize-letter #1% - }{% - There are only four defined paper scalings:\MessageBreak - a = ISO/DIN-A, b = ISO/DIN-B, c = ISO/DIN-C, - d = ISO/DIN-D\MessageBreak - Read KOMA-Script-documentation for further information.% - }% - \setlength{\paperwidth}{841sp}% - \setlength{\paperheight}{1189sp}% - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \fi - \@tempcnta=#2\relax - \@whilenum\@tempcnta>0 - \do{\setlength{\@tempdima}{\paperwidth} - \setlength{\paperwidth}{.5\paperheight} - \setlength{\paperheight}{\@tempdima} - \advance\@tempcnta by\m@ne - } - \multiply\paperwidth by186468 - \multiply\paperheight by186468 + \ISO@PaperNameToSize[typearea]#1#2\@nil \expandafter\ifnum\scr@ta@v@is@ge{3.22}\relax \scr@setpaperorientation \else \if@landscape\scr@switchpapersizes\fi \fi } +\ProvideUnknownPaperSizeError{typearea}{% + \PackageError{typearea}{% + Unknown ISO/DIN-papersize-letter #1% + }{% + There are only four defined paper scalings:\MessageBreak + a = ISO/DIN-A, b = ISO/DIN-B, c = ISO/DIN-C, + d = ISO/DIN-D\MessageBreak + Read KOMA-Script-documentation for further information.% + }% + \setlength{\paperwidth}{841sp}% + \setlength{\paperheight}{1189sp}% +} \newcommand*\scr@setpaperorientation{% \ifdim\paperheight>\paperwidth \if@landscape\scr@switchpapersizes\fi @@ -291,9 +424,9 @@ \KOMA@ifkey{footinclude}{@fincl} \KOMA@DeclareDeprecatedOption[typearea]{footexclude}{footinclude=false} \KOMA@key{footsepline}[true]{% - \KOMA@set@ifkey{footinclude}{@hincl}{#1}% + \KOMA@set@ifkey{footinclude}{@fincl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@hincl}% + \KOMA@kav@replacebool{.typearea.\scr@pkgextension}{footinclude}{@fincl}% \fi } \KOMA@ifkey{mpinclude}{@mincl} @@ -742,10 +875,7 @@ \KOMA@ifkey{usegeometry}{@ta@usegeometry} \DeclareOption*{% \x@paper} -%%% 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} +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) \KOMA@key{version}[last]{% \scr@ifundefinedorrelax{scr@v@#1}{% \def\scr@compatibility{0}% @@ -787,70 +917,6 @@ \FamilyKeyStateProcessed }% } -\@namedef{scr@v@first}{0} -\@namedef{scr@v@2.9}{0} -\@namedef{scr@v@2.9t}{0} -\@namedef{scr@v@2.9u}{1} -\@namedef{scr@v@2.95}{2} -\@namedef{scr@v@2.95a}{2} -\@namedef{scr@v@2.95b}{2} -\@namedef{scr@v@2.96}{2} -\@namedef{scr@v@2.96a}{3} -\@namedef{scr@v@2.97}{3} -\@namedef{scr@v@2.97a}{3} -\@namedef{scr@v@2.97b}{3} -\@namedef{scr@v@2.97c}{4} -\@namedef{scr@v@2.97d}{5} -\@namedef{scr@v@2.97e}{6} -\@namedef{scr@v@2.98}{6} -\@namedef{scr@v@2.98a}{6} -\@namedef{scr@v@2.98b}{6} -\@namedef{scr@v@2.98c}{7} -\@namedef{scr@v@3.00}{8} -\@namedef{scr@v@3.01}{8} -\@namedef{scr@v@3.01a}{8} -\@namedef{scr@v@3.01b}{9} -\@namedef{scr@v@3.01c}{9} -\@namedef{scr@v@3.02}{9} -\@namedef{scr@v@3.02b}{9} -\@namedef{scr@v@3.02c}{10} -\@namedef{scr@v@3.03}{10} -\@namedef{scr@v@3.03a}{10} -\@namedef{scr@v@3.03b}{10} -\@namedef{scr@v@3.04}{10} -\@namedef{scr@v@3.04a}{10} -\@namedef{scr@v@3.05}{10} -\@namedef{scr@v@3.05a}{10} -\@namedef{scr@v@3.06}{10} -\@namedef{scr@v@3.07}{10} -\@namedef{scr@v@3.08}{10} -\@namedef{scr@v@3.08a}{10} -\@namedef{scr@v@3.08b}{10} -\@namedef{scr@v@3.09}{10} -\@namedef{scr@v@3.09a}{10} -\@namedef{scr@v@3.10}{10} -\@namedef{scr@v@3.10a}{10} -\@namedef{scr@v@3.10b}{10} -\@namedef{scr@v@3.11}{10} -\@namedef{scr@v@3.11a}{10} -\@namedef{scr@v@3.11b}{10} -\@namedef{scr@v@3.12}{11} -\@namedef{scr@v@3.13}{12} -\@namedef{scr@v@3.13a}{13} -\@namedef{scr@v@3.14}{13} -\@namedef{scr@v@3.15}{14} -\@namedef{scr@v@3.16}{14} -\@namedef{scr@v@3.17}{15} -\@namedef{scr@v@3.17a}{15} -\@namedef{scr@v@3.17c}{15} -\@namedef{scr@v@3.18}{15} -\@namedef{scr@v@3.18a}{15} -\@namedef{scr@v@3.19}{15} -\@namedef{scr@v@3.19a}{15} -\@namedef{scr@v@3.20}{15} -\@namedef{scr@v@3.21}{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} } @@ -863,7 +929,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1026,12 +1092,10 @@ \newcommand*{\@areaset@end}{} \newcommand*{\activateareas}{% \if@atdocument - \PackageWarning{typearea}{% - Typearea changed!\MessageBreak - You should do this only at preamble, because only\MessageBreak - \protect\begin{document} calculates output dimensions!\MessageBreak - Trying to calculate new output dimensions, but\MessageBreak - this is only a dirty hack}% + \PackageInfo{typearea}{% + Using dirty hack to recalculate internal output\MessageBreak + dimensions of LaTeX% + }% \@colht=\textheight \@colroom=\textheight \vsize=\textheight @@ -1581,8 +1645,8 @@ \fi } \typearea[current]{current} -%%% 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 $ +%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) +%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 47e4e13c9ae..ae01cabc216 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,9 +63,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \ProvidesFile{% visualize% .lco}[\KOMAScriptVersion\space letter-class-option] @@ -79,7 +79,7 @@ Letter class option #1 Warning: #2% }% } -%%% From File: $Id: scrkernel-letterclassoptions.dtx 2428 2016-04-12 10:31:07Z kohm $ +%%% From File: $Id: scrkernel-letterclassoptions.dtx 2604 2017-02-23 19:25:14Z kohm $ \RequirePackage{eso-pic} \newcommand*{\showfields}[1]{% \AtBeginLetter{% @@ -574,7 +574,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 2564 2016-12-21 10:43:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2599 2017-02-22 11:09:23Z kohm $ \endinput %% %% End of file `visualize.lco'. |