From 21923df0aa733309adbfcc3169c7ffc0e0ab8b1c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Sep 2015 21:16:51 +0000 Subject: koma-script (30sep15) git-svn-id: svn://tug.org/texlive/trunk@38504 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/koma-script/DIN.lco | 4 +- .../texmf-dist/tex/latex/koma-script/DINmtext.lco | 4 +- .../texmf-dist/tex/latex/koma-script/KOMAold.lco | 6 +- Master/texmf-dist/tex/latex/koma-script/KakuLL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/NF.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponEL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLH.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponLL.lco | 4 +- .../texmf-dist/tex/latex/koma-script/NipponRL.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SN.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/SNleft.lco | 4 +- .../tex/latex/koma-script/UScommercial9.lco | 4 +- .../tex/latex/koma-script/UScommercial9DW.lco | 4 +- Master/texmf-dist/tex/latex/koma-script/float.hak | 10 +- .../texmf-dist/tex/latex/koma-script/floatrow.hak | 10 +- .../texmf-dist/tex/latex/koma-script/hyperref.hak | 10 +- .../texmf-dist/tex/latex/koma-script/listings.hak | 10 +- Master/texmf-dist/tex/latex/koma-script/lscape.hak | 95 ++++++++ .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 162 +++++++++---- .../texmf-dist/tex/latex/koma-script/scrbase.sty | 47 ++-- .../texmf-dist/tex/latex/koma-script/scrbook.cls | 261 +++++++++++++++------ .../texmf-dist/tex/latex/koma-script/scrdate.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrextend.sty | 87 ++----- .../tex/latex/koma-script/scrfontsizes.sty | 12 +- .../texmf-dist/tex/latex/koma-script/scrhack.sty | 24 +- .../texmf-dist/tex/latex/koma-script/scrkbase.sty | 25 +- .../tex/latex/koma-script/scrlayer-notecolumn.sty | 6 +- .../tex/latex/koma-script/scrlayer-scrpage.sty | 8 +- .../texmf-dist/tex/latex/koma-script/scrlayer.sty | 163 ++++++++----- .../texmf-dist/tex/latex/koma-script/scrletter.sty | 180 ++++++++------ .../texmf-dist/tex/latex/koma-script/scrlfile.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrlttr2.cls | 216 ++++++++++------- .../texmf-dist/tex/latex/koma-script/scrpage2.sty | 2 +- .../texmf-dist/tex/latex/koma-script/scrreprt.cls | 258 ++++++++++++++------ .../tex/latex/koma-script/scrsize10pt.clo | 8 +- .../tex/latex/koma-script/scrsize11pt.clo | 8 +- .../tex/latex/koma-script/scrsize12pt.clo | 8 +- .../texmf-dist/tex/latex/koma-script/scrtime.sty | 8 +- .../texmf-dist/tex/latex/koma-script/setspace.hak | 10 +- .../texmf-dist/tex/latex/koma-script/tocbasic.sty | 2 +- .../texmf-dist/tex/latex/koma-script/typearea.sty | 22 +- .../texmf-dist/tex/latex/koma-script/visualize.lco | 6 +- 43 files changed, 1117 insertions(+), 609 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/koma-script/lscape.hak (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco index 7798e4d789a..af0e864a459 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco index 83f7b0929cd..3b147bfde95 100644 --- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco +++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco index 58c083339d9..235a4ad32df 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% @@ -204,7 +204,7 @@ \@ObsoleteCommand{\subjectafteron}{subject=afteropening}} \def\subjectafteroff{% \@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}} -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z 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 2c784fe6b58..095f420c195 100644 --- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 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 f7178698b65..203a92de218 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NF.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco index 7b6e128d3a3..3edf981e545 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 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 85a091832c9..664f9ac36f6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 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 b83e7b34860..cfe906cb6c0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 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 2e15919da41..9fcddeba23d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 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 2fe7017e7f1..f0e650e94a8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco +++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 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 e24dd9b3339..6eeb1ac704b 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SN.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco index 4b5a667c9ca..2d32f1177df 100644 --- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco +++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco index f36ebbbc423..eba1c6c55c1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco index af67a6d7cca..83f9f14d614 100644 --- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco +++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,7 +62,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak index a5907770954..f4d52d30089 100644 --- a/Master/texmf-dist/tex/latex/koma-script/float.hak +++ b/Master/texmf-dist/tex/latex/koma-script/float.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{float.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package float)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z 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 e5ea0b83de9..325065580a0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak +++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{floatrow.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package floatrow)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \scr@ifexpected{\DeclareNewFloatType}{% \long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}% \expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}% diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak index 2c95e198e78..ac586e39def 100644 --- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak +++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{hyperref.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package hyperref)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z 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 57dfc7ecb42..54b47c08b58 100644 --- a/Master/texmf-dist/tex/latex/koma-script/listings.hak +++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{listings.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package listings)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \newcommand*{\scr@do@hack@listings}{% \RequirePackage{tocbasic}% \addtotoclist[float]{lol}% diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak new file mode 100644 index 00000000000..ae6807f45a6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak @@ -0,0 +1,95 @@ +%% +%% This is file `lscape.hak', +%% generated with the docstrip utility, extended by scrdocstrip. +%% +%% The original source files were: +%% +%% scrkernel-version.dtx (with options: `file,lscape.hak') +%% scrhack.dtx (with options: `hack,lscape,identify') +%% scrhack.dtx (with options: `hack,lscape,body') +%% +%% Copyright (c) 2008-2014 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 +%% . +%% +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z 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{2015/09/29 v3.19 KOMA-Script}% +\endgroup +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ +\ProvidesFile{lscape.hak}[% + 2015/09/29 v3.19 KOMA-Script + package + (hacking package + lscape)% +] +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ +\RequirePackage{xpatch} +\xpatchcmd{\landscape}{\textheight=\vsize}{% + \if@scrhack@lscape + \scrh@LT@textheight=\vsize + \let\scrh@LT@outputpage\@outputpage + \def\@outputpage{\scrh@LT@outputpage\global\@colht\scrh@LT@textheight}% + \else + \textheight=\vsize + \fi +}{% + \PackageInfo{scrhack}{\string\landscape\space patched to make + \string\textheight\space change optional}% +}{% + \PackageWarning{scrhack}{Cannot patch \string\landscape!\MessageBreak + Maybe you are using a unsupported lscape version}% + \@scrhack@lscapefalse +} +\newlength{\scrh@LT@textheight} +\endinput +%% +%% End of file `lscape.hak'. diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index befb01b633b..3874e878d2c 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -74,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -96,7 +96,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -111,19 +111,19 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -175,7 +175,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -295,6 +295,8 @@ \@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@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -330,8 +332,8 @@ {final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 11% } @@ -398,7 +400,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -504,7 +506,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -512,7 +514,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -665,7 +670,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newif\if@titlepage \@titlepagefalse \newif\if@titlepageiscoverpage @@ -699,7 +704,7 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -825,14 +830,14 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -846,7 +851,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -1085,7 +1090,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1155,7 +1160,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1542,7 +1547,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection @@ -1626,7 +1631,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ @@ -1635,8 +1640,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2074,12 +2079,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z 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 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2123,7 +2128,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2208,7 +2213,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2223,16 +2228,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2251,7 +2256,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2445,7 +2450,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -2589,7 +2595,7 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \newcommand*{\ifnumbered}[1]{% @@ -2671,6 +2677,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -2778,7 +2785,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -2813,9 +2820,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -2834,8 +2840,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -2868,6 +2873,61 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \string\scr@s@ct@@nn@m@\space locally.\MessageBreak + This could result in several error messages}% + \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} \newcommand*{\scr@IfUsePrefixLineWarning}[2]{% \ClassWarning{\KOMAClassName}{% usage of \string\IfUsePrefixLine\space outside @@ -3072,6 +3132,8 @@ }% }\reserved@a }% + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% @@ -3138,6 +3200,13 @@ \endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -3938,7 +4007,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4577,7 +4646,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -4714,7 +4783,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \renewcommand*{\numberline}[1]{% \numberline@box{% \numberline@prefix @@ -4778,7 +4847,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% \section*{\contentsname}% @@ -4931,7 +5000,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -4962,7 +5031,8 @@ \columnsep 35\p@ \idx@heading% \index@preamble\par\nobreak - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 64f173801d6..50d512bc3b2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -194,7 +194,7 @@ \define@key{#2#1}{#3}{% \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}% \FamilyKeyStateUnknown - #4 + #4% \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}% }% \@namedef{KV@#2#1@#3@default}{% @@ -329,7 +329,7 @@ \let\FamilyKeyState\OptionNotUsed }% }{% - \proteced@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}% + \protected@edef\reserved@b{\noexpand\setkeys{#2}{{\CurrentOption}}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}}% \reserved@b \ifx\FamilyKeyState\FamilyKeyStateUnknown @@ -387,12 +387,12 @@ \fi } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } @@ -493,6 +493,13 @@ }% \reserved@a#1#2\@nil } +\newcommand*{\IfArgIsEmpty}[1]{% + \if\relax\detokenize{#1}\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \newcommand*{\ifisdimen}[1]{% \begingroup \edef\reserved@a{#1}% @@ -567,7 +574,17 @@ }{% \aftergroup\@secondoftwo }% - }{\aftergroup\@secondoftwo}% + }{% + \ifstr{\reserved@a}{\string\baselineskip}{% + \aftergroup\@firstoftwo + }{% + \ifstr{\reserved@a}{\string\parskip}{% + \aftergroup\@firstoftwo + }{% + \aftergroup\@secondoftwo + }% + }% + }% \endgroup } \newcommand*{\ifisglueexpr}[1]{% @@ -1221,7 +1238,7 @@ \newcommand*{\FamilySetCounter}[4]{% \ifiscount{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\value{#3}=#4\FamilyKeyState\Processed}{% + \ifisskip{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% \ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{% @@ -1255,7 +1272,7 @@ \begingroup \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisinteger{#4}{% @@ -1293,7 +1310,7 @@ \newcommand*{\FamilySetLength}[4]{% \ifiscount{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimen{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{% + \ifisskip{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% @@ -1327,7 +1344,7 @@ \begingroup \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{% \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed @@ -1406,7 +1423,7 @@ \newcommand{\Family@String@Key}[4]{% \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\defcaptionname}{% \@ifstar\scr@def@scaptionname\scr@def@captionname } diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls index a3bc316743b..31b36c78368 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls @@ -74,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -96,7 +96,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -111,21 +111,21 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newif\if@openright \@openrighttrue @@ -190,7 +190,7 @@ \newcommand*{\scr@chapter@afterskip}{\z@} \let\scr@chapter@afterskip\z@ \newcommand*{\scr@chapter@innerskip}{\z@} -\let\scr@chapter@sectionindent\z@ +\let\scr@chapter@innerskip\z@ \newcommand*{\scr@chapter@style}{chapter} \newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}} \newcommand*{\chapterheadendvskip}{\vskip\@tempskipa} @@ -201,7 +201,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -321,6 +321,8 @@ \@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@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -356,8 +358,8 @@ {final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 11% } @@ -424,7 +426,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -530,7 +532,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -538,7 +540,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -691,7 +696,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage @@ -722,7 +727,7 @@ }{titlepage}{\if@titlepage true\else false\fi} \KOMA@DeclareStandardOption% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -984,14 +989,14 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -1005,7 +1010,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -1244,7 +1249,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1314,7 +1319,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1752,7 +1757,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -1836,7 +1841,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openright} \KOMAExecuteOptions{numbers=autoendperiod} @@ -1846,8 +1851,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2292,12 +2297,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z 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 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2341,7 +2346,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2426,7 +2431,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2441,16 +2446,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2469,7 +2474,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2663,7 +2668,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -2774,7 +2780,7 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -2856,6 +2862,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -2963,7 +2970,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -2998,9 +3005,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3019,8 +3025,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3053,6 +3058,61 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \string\scr@s@ct@@nn@m@\space locally.\MessageBreak + This could result in several error messages}% + \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} \newcommand*{\scr@IfUsePrefixLineWarning}[2]{% \ClassWarning{\KOMAClassName}{% usage of \string\IfUsePrefixLine\space outside @@ -3321,6 +3381,8 @@ }% }\reserved@a }% + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% @@ -3387,6 +3449,13 @@ \endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -3757,7 +3826,11 @@ } \newcommand*{\scr@startpart}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \if@twocolumn \onecolumn \@tempswatrue @@ -3955,7 +4028,11 @@ \newkomafont{partentrypagenumber}{} \newcommand*{\scr@startchapter}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \global\@topnum\z@ \@afterindentfalse \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname @@ -4075,40 +4152,45 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak - \usefontofkomafont{#1}% - \if@mainmatter - \def\IfUseNumber{\ifnumbered{#1}}% - \else\let\IfUseNumber\@secondoftwo\fi + \def\IfUseNumber{\ifnumbered{#1}}% + \if@mainmatter\else\let\IfUseNumber\@secondoftwo\fi + \def\IfUseNumber{\ifnumbered{#1}}% \if@chapterprefix - \raggedchapter \let\IfUsePrefixLine\@firstoftwo - \let\@tempa\@firstofone \else \let\IfUsePrefixLine\@secondoftwo - \let\@tempa\@hangfrom \fi - \@tempa{% - \IfUseNumber{% - \usekomafont{#1}{% + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \settoheight{\@tempskipa}{% + {\usekomafont{#1prefix}{% + \vrule \@width\z@ \@height\csname scr@#1@innerskip\endcsname}}% + }% + \raggedchapter + \IfUseNumber{% \IfUsePrefixLine{% - {\usekomafont{#1prefix}{% - \csname #1format\endcsname - \setlength{\@tempskipa}{% - \csname scr@#1@innerskip\endcsname - }% - \chapterheadmidvskip - }}% + \chapterlineswithprefixformat{#1}% + {{\usekomafont{#1prefix}{\csname #1format\endcsname% + \setlength{\@tempskipa}{\csname scr@#1@innerskip\endcsname}% + \chapterheadmidvskip}}}% + {\interlinepenalty \@M#2\@@par}% }{% - \csname #1format\endcsname + \chapterlinesformat{#1}% + {\csname #1format\endcsname}% + {\interlinepenalty \@M#2\@@par}% + }% + }{% + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% }% }% - }{}% - }% - {% - \IfUsePrefixLine{}{\raggedchapter}% - \interlinepenalty \@M - \usekomafont{#1}{#2}\par + }% }% }% \nobreak\par\nobreak @@ -4122,14 +4204,38 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + \let\IfUseNumber\secondoftwo + \if@chapterprefix + \let\IfUsePrefixLine\@firstoftwo + \else + \let\IfUsePrefixLine\@secondoftwo + \fi + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \raggedchapter + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }% + }% + }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } +\newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% +} +\newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% +} \newcommand*{\use@chapter@o@preamble}[1]{% {% \settoheight{\@tempdima}{% @@ -4650,7 +4756,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -5306,7 +5412,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5444,7 +5550,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \doforeachtocfile[float]{% \setuptoc{\@currext}{chapteratlist}% } @@ -5514,7 +5620,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% \chapter*{\contentsname}% @@ -5667,7 +5773,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5700,7 +5806,8 @@ \columnsep 35\p@ \setchapterpreamble{\index@preamble}% \idx@heading% - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty index adf367e8bc1..af67cf88e60 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrdate}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (day of the week)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty index 465ea46b5f7..87c1b0892f0 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty @@ -76,7 +76,7 @@ }% \expandafter\endinput \fi -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -98,7 +98,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -106,7 +106,7 @@ } %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ \ProvidesPackage{scrextend}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (extend other classes with features of KOMA-Script classes)% ] \newcommand*{\scr@ext@activate}[1]{% @@ -130,9 +130,9 @@ \expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname }% } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} %%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $ @@ -158,7 +158,7 @@ \def\FamilyKeyState{Option `extendedfeature' too late}% }% } -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -259,6 +259,8 @@ \@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@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -295,7 +297,7 @@ \KOMA@DeclareStandardOption [scrextend] {final}{draft=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \providecommand*{\@fontsizefilebase}{scrsize} \KOMA@key{fontsize}{% \expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil @@ -331,7 +333,7 @@ scrextend.\scr@pkgextension }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \scr@ext@activateable{title}{% \scr@ifundefinedorrelax{if@titlepage}{% \expandafter\newif\csname if@titlepage\endcsname @@ -374,9 +376,9 @@ \KOMA@DeclareStandardOption% [scrextend]% {notitlepage}{titlepage=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@key{cleardoublepage}{% \begingroup% \def\@tempc{% @@ -458,7 +460,7 @@ \newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}} \newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}} %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -529,12 +531,12 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -890,7 +892,7 @@ because I do not change it% }% } -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \scr@ext@addto@activateable{title}{% \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% @@ -1086,7 +1088,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -1199,7 +1202,7 @@ \newkomafont{dedication}{\Large} \newcommand*{\scr@fnt@title}{\titlefont}% \newcommand*{\scr@fnt@subject}{\subject@font}% -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} @@ -1276,56 +1279,12 @@ \providecommand*{\@textsubscript}[1]{% {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ -\newcommand*{\ftn@rule@test@values}{% - \ifdim\ftn@rule@height <\z@ - \PackageWarning{scrextend}{% - You might get into trouble, because the\MessageBreak - height of the footnote rule has a value\MessageBreak - less than 0% - }% - \else - \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax - \PackageWarning{scrextend}{% - You might get into trouble, because the\MessageBreak - height of the footnote rule has a value\MessageBreak - greater than \the\dimexpr\skip\footins -2.6\p@\relax - }% - \fi - \fi - \ifdim\ftn@rule@width <\z@ - \PackageWarning{scrextend}{% - You might get into trouble, because the width\MessageBreak - or length of the footnote rule has a value\MessageBreak - less than 0pt% - }% - \else - \ifdim\ftn@rule@width >\columnwidth - \PackageWarning{scrextend}{% - You might get into trouble, because the width\MessageBreak - or length of the footnote rule has a value\MessageBreak - greater than \string\columnwidth - }% - \fi - \fi -} -\newkomafont{footnoterule}{} -\newcommand*{\ftn@rule@width}{.4\columnwidth} -\newcommand*{\ftn@rule@height}{.4\p@} -\newcommand*{\setfootnoterule}[2][]{% - \ifstr{#1}{}{}{% - \renewcommand*{\ftn@rule@height}{#1}% - }% - \ifstr{#2}{}{}{% - \renewcommand*{\ftn@rule@width}{#2}% - }% - \ftn@rule@test@values -} +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \newcommand\deffootnote[4][]{% \long\def\@makefntext##1{% \setlength{\@tempdimc}{#3}% @@ -1401,7 +1360,7 @@ \begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup } \providecommand*{\multfootsep}{,} -\newcommand*{\multiplefootnotemarker}{3sp} +\providecommand*{\multiplefootnotemarker}{3sp} \providecommand*{\thefootnotemark}{\@thefnmark} \def\reserved@a{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} \ifx\reserved@a\@makefnmark diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty index df975033151..d0126995249 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty @@ -42,7 +42,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -64,19 +64,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProvidesPackage{scrfontsizes}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (font size file generator)] -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \ProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{} \newcommand*{\generatefontfile}[1]{% \ifstr{#1}{scrsize}{% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty index bcff62f8862..6aff9ba38ef 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,21 +65,21 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%% using: package,identify \ProvidesPackage{scrhack}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%% using: package,option \KOMA@ifkey{hyperref}{@scrhack@hyperref}% \KOMAExecuteOptions{hyperref=true}% @@ -91,8 +91,10 @@ \KOMAExecuteOptions{listings=true} \KOMA@ifkey{setspace}{@scrhack@setspace} \KOMAExecuteOptions{setspace=true} +\KOMA@ifkey{lscape}{@scrhack@lscape}% +\KOMAExecuteOptions{lscape=true}% \KOMAProcessOptions\relax -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ %%% using: package,body \newcommand{\scr@ifexpected}[2]{% \begingroup @@ -175,6 +177,14 @@ }% \if@scrhack@setspace\scr@hack@load\@pkgextension{setspace}\fi } +\AfterPackage*{lscape}{% + \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else + \KOMA@key[.scrhack.sty]{lscape}{% + \PackageWarning{scrhack}{option `lscape' ignored}% + \FamilyKeyStateProcessed + }% + \fi +} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty index f9a9a083acd..052ef6b8b2e 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrkbase% }[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (% KOMA-Script-dependent basics and keyval usage)] @@ -241,12 +241,12 @@ \newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}} \@onlypreamble\KOMAProcessOptions \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{% \FamilyExecuteOptions[#1]{KOMA}% } @@ -410,7 +410,7 @@ }% \KOMAoptions{#3}% } -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*{\IfExistskomafont}[1]{% \@ifundefined{scr@fnt@#1}{% \@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}% @@ -563,15 +563,22 @@ }% } \newcommand*{\scr@komafontrelaxlist}{% - \do\color \do\normalcolor + \do\normalcolor \do\uppercase \do\lowercase \do\MakeUppercase \do\MakeLowercase } +\newcommand*{\scr@komafontgobblelist}{% + \do\color +} \newcommand*{\scr@prepareforkomafont}{% \long\def\do##1{\let##1\relax}\scr@komafontrelaxlist + \long\def\do##1{\let##1\@gobble}\scr@komafontgobblelist } \newcommand*{\addtokomafontrelaxlist}[1]{% \l@addto@macro\scr@komafontrelaxlist{\do#1}% } +\newcommand*{\addtokomafontgobblelist}[1]{% + \l@addto@macro\scr@komafontgobblelist{\do#1}% +} \newcommand*{\newkomafont}[3][\relax]{% \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}% \expandafter\expandafter\expandafter\newcommand 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 fe6cb8c9d4d..f0221481210 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty @@ -52,7 +52,7 @@ 2014/06/03 v0.1.1760 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -83,7 +83,7 @@ }% \batchmode\csname @@end\endcsname\end \fi -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -216,7 +216,7 @@ \KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns} \scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default} -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty index 07cfaedda44..def6a4fa9e9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty @@ -48,10 +48,10 @@ %%% From File: $Id: scrlayer-scrpage.dtx 2147 2015-06-24 06:16:16Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer-scrpage}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (end user interface for scrlayer)] -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) \RequirePackage{scrlayer} \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -78,7 +78,7 @@ {pagestyleset=KOMA-Script}% }% } -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) \KOMA@key{markcase}{% \scrlayer@AtEndOfPackage{% \begingroup @@ -694,7 +694,7 @@ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}% \scrlayer@AddCsToInterface{sls@leavevmode@linetrue} \scrlayer@AddCsToInterface{sls@leavevmode@linefalse} -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) \KOMAProcessOptions\relax \expandafter\let \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty index 9cfcb3e9abd..67954d739d2 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty @@ -43,13 +43,13 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (identify) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{scrlayer}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (defining layers and page styles)] -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (init) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (init) \RequirePackage{scrkbase}[2013/03/05] \scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{% \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}% @@ -113,7 +113,7 @@ \setlength{\footheight}{\baselineskip} \fi } -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (options) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (options) \KOMA@key{markcase}{% \begingroup \KOMA@set@ncmdkey{markcase}{reserved@a}{% @@ -265,7 +265,7 @@ \KOMA@ifkey{draft}{scrlayer@draft} \KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite} \KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces} -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (body) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (body) \KOMAProcessOptions\relax \newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty} \newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty} @@ -586,6 +586,12 @@ \@namedef{scr@l@\scr@current@layer @w}{#3}% \@namedef{scr@l@\scr@current@layer @h}{#4}% } +\DefineFamilyKey[.definelayer]{KOMAarg}{mode}{% + \scr@ifundefinedorrelax{layer#1mode}{\FamilyKeyStateUnknownValue}{% + \@namedef{scr@l@\scr@current@layer @mode}{#1}% + \FamilyKeyStateProcessed + }% +} \DefineFamilyKey[.definelayer]{KOMAarg}{hoffset}{% \@namedef{scr@l@\scr@current@layer @x}{\dimexpr #1\relax}% \FamilyKeyStateProcessed @@ -932,6 +938,7 @@ }% }{% \FamilyKeyStateProcessed + \scrlayer@clone@attribute{\scr@current@layer}{#1}{mode}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{x}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{y}% \scrlayer@clone@attribute{\scr@current@layer}{#1}{w}% @@ -958,6 +965,7 @@ } \newcommand{\DeclareLayer}[2][]{% \def\scr@current@layer{#2}% + \@namedef{scr@l@#2@mode}{text}% \@namedef{scr@l@#2@x}{\z@}% \@namedef{scr@l@#2@y}{\z@}% \@namedef{scr@l@#2@w}{\paperwidth}% @@ -985,7 +993,7 @@ } \newcommand*{\scr@current@layer}{} \newcommand*{\IfLayerExists}[1]{% - \scr@ifundefinedorrelax{scr@l@#1@x}{% + \scr@ifundefinedorrelax{scr@l@#1@mode}{% \expandafter\@secondoftwo }{% \expandafter\@firstoftwo @@ -1022,7 +1030,17 @@ \newcommand{\ModifyLayer}[2][]{% \IfLayerExists{#2}{% \def\scr@current@layer{#2}% - \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \edef\reserved@a{% + \unexpanded{% + \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}% + \ifstr{\csname scr@l@#2@mode\endcsname}% + }{\csname scr@l@#2@mode\endcsname}% + }\reserved@a{}{% + \PackageWarning{scrlayer}{% + change of layer mode could result in unexpected\MessageBreak + output and errors% + }% + }% \let\scr@current@layer\@empty }{% \PackageError{scrlayer}{layer `#2' not yet defined}{% @@ -1042,6 +1060,7 @@ } \newcommand*{\DestroyLayer}[1]{% \IfLayerExists{#1}{% + \expandafter\let\csname scr@l@#1@mode\endcsname\relax \expandafter\let\csname scr@l@#1@x\endcsname\relax \expandafter\let\csname scr@l@#1@y\endcsname\relax \expandafter\let\csname scr@l@#1@w\endcsname\relax @@ -1081,74 +1100,77 @@ } \newcommand*{\layercontentsmeasure}{% \smash{\begin{picture}(0,0) - (0,\if t\scr@l@valign -\ht\strutbox - \else - \if b\scr@l@valign -\dimexpr\layerheight-\dp\strutbox\relax - \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax - \fi - \fi\@gobble) - \put(0,0){\line(1,0){\layerwidth\@gobble}}% + (0,\LenToUnit{% + \if t\layervalign -\ht\strutbox + \else + \if b\layervalign -\dimexpr\layerheight-\dp\strutbox\relax + \else -.5\dimexpr \layerheight+\ht\strutbox-\dp\strutbox\relax + \fi + \fi}) + \setlength{\unitlength}{1mm}% + \put(0,0){\line(1,0){\LenToUnit{\layerwidth}}}% \@tempcnta=\numexpr \dimexpr\layerwidth + .5mm\relax/\dimexpr 1mm\relax\relax - \multiput(0,0)(1mm\@gobble,0){\@tempcnta}{% - \line(0,-1){1mm\@gobble}% + \multiput(0,0)(1,0){\@tempcnta}{% + \line(0,-1){1}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + 2.5mm\relax/\dimexpr 5mm\relax\relax - \multiput(0,0)(5mm\@gobble,0){\@tempcnta}{% - \line(0,-1){2mm\@gobble}% + \multiput(0,0)(5,0){\@tempcnta}{% + \line(0,-1){2}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .5cm\relax/\dimexpr 1cm\relax\relax - \multiput(0,0)(10mm\@gobble,0){\@tempcnta}{% - \put(0,0){\line(0,-1){3mm\@gobble}}% - \put(0,-3.5mm\@gobble){% + \multiput(0,0)(10,0){\@tempcnta}{% + \put(0,0){\line(0,-1){3}}% + \put(0,-3.5){% \makebox(0,0)[ct]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% - \put(0,-\layerheight\@gobble){\line(1,0){\layerwidth\@gobble}}% + \put(0,\LenToUnit{-\layerheight}){\line(1,0){\LenToUnit{\layerwidth}}}% \@tempcnta=\numexpr \dimexpr\layerwidth + .05in\relax/\dimexpr .1in\relax\relax - \multiput(0,-\layerheight\@gobble)(.1in\@gobble,0){\@tempcnta}{% - \line(0,1){1mm\@gobble}% + \multiput(0,\LenToUnit{-\layerheight})(2.54,0){\@tempcnta}{% + \line(0,1){1}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .25in\relax/\dimexpr .5in\relax\relax - \multiput(0,-\layerheight\@gobble)(.5in\@gobble,0){\@tempcnta}{% - \line(0,1){2mm\@gobble}% + \multiput(0,\LenToUnit{-\layerheight})(12.7,0){\@tempcnta}{% + \line(0,1){2}% }% \@tempcnta=\numexpr \dimexpr\layerwidth + .5in\relax/\dimexpr 1in\relax\relax - \multiput(0,-\layerheight\@gobble)(1in\@gobble,0){\@tempcnta}{% - \put(0,0){\line(0,1){3mm\@gobble}}% - \put(0,3.5mm\@gobble){% + \multiput(0,\LenToUnit{-\layerheight})(25.4,0){\@tempcnta}{% + \put(0,0){\line(0,1){3}}% + \put(0,3.5){% \makebox(0,0)[cb]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% - \put(0,0){\line(0,-1){\layerheight\@gobble}}% + \put(0,0){\line(0,-1){\LenToUnit{\layerheight}}}% \@tempcnta\numexpr \dimexpr\layerheight + .5mm\relax/\dimexpr 1mm\relax\relax - \multiput(0,0)(0,-1mm\@gobble){\@tempcnta}{% - \line(1,0){1mm\@gobble}% + \multiput(0,0)(0,-1){\@tempcnta}{% + \line(1,0){1}% }% \@tempcnta\numexpr \dimexpr\layerheight + 2.5mm\relax/\dimexpr 5mm\relax\relax - \multiput(0,0)(0,-5mm\@gobble){\@tempcnta}{% - \line(1,0){2mm\@gobble}% + \multiput(0,0)(0,-5){\@tempcnta}{% + \line(1,0){2}% }% \@tempcnta\numexpr \dimexpr\layerheight + .5cm\relax/\dimexpr 1cm\relax\relax - \multiput(0,0)(0,-1cm\@gobble){\@tempcnta}{% - \put(0,0){\line(1,0){3mm\@gobble}}% - \put(3.5mm\@gobble,0){% + \multiput(0,0)(0,-10){\@tempcnta}{% + \put(0,0){\line(1,0){3}}% + \put(3.5,0){% \makebox(0,0)[cl]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% - \put(\layerwidth\@gobble,0){\line(0,-1){\layerheight\@gobble}}% + \put(\LenToUnit{\layerwidth},0){\line(0,-1){\LenToUnit{\layerheight}}}% \@tempcnta\numexpr \dimexpr\layerheight + .05in\relax/\dimexpr .1in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-.1in\@gobble){\@tempcnta}{% - \line(-1,0){1mm\@gobble}% + \multiput(\LenToUnit{\layerwidth},0)(0,-2.54){\@tempcnta}{% + \line(-1,0){1}% }% \@tempcnta\numexpr \dimexpr\layerheight + .25in\relax/\dimexpr .5in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-.5in\@gobble){\@tempcnta}{% - \line(-1,0){2mm\@gobble}% + \multiput(\LenToUnit{\layerwidth},0)(0,-12.7){\@tempcnta}{% + \line(-1,0){2}% }% \@tempcnta\numexpr \dimexpr\layerheight + .5in\relax/\dimexpr 1in\relax\relax - \multiput(\layerwidth\@gobble,0)(0,-1in\@gobble){\@tempcnta}{% - \put(0,0){\line(-1,0){3mm\@gobble}}% - \put(-3.5mm\@gobble,0){% + \multiput(\LenToUnit{\layerwidth},0)(0,-25.4){\@tempcnta}{% + \put(0,0){\line(-1,0){3}}% + \put(-3.5,0){% \makebox(0,0)[cr]{\the\numexpr\@tempcnta-\@multicnt\relax}}% }% \end{picture}}% } +\providecommand*{\LenToUnit}[1]{\strip@pt\dimexpr#1*\p@/\unitlength} \DefineFamily{KOMAarg} \DefineFamilyMember[.definelayerpagestyle]{KOMAarg} \DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onselect}{% @@ -1417,7 +1439,9 @@ (\csname scr@l@#3@w\endcsname,% \csname scr@l@#3@h\endcsname)% [\csname scr@l@#3@align\endcsname]% - {\csname scr@l@#3@contents\endcsname}% + {\csname layer\csname scr@l@#3@mode\endcsname + mode\expandafter\endcsname + \csname scr@l@#3@contents\endcsname}% \fi \fi \fi @@ -1434,26 +1458,26 @@ \edef\layeryoffset{#2}% \edef\layerwidth{#3}% \edef\layerheight{#4}% - \def\scr@l@valign{t}% - \def\scr@l@halign{l}% + \def\layervalign{t}% + \def\layerhalign{l}% \edef\reserved@b{#5}% \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=% \reserved@b\do{% \if t\reserved@a - \def\scr@l@valign{t}% + \def\layervalign{t}% \else \if c\reserved@a - \def\scr@l@valign{c}% - \def\scr@l@halign{c}% + \def\layervalign{c}% + \def\layerhalign{c}% \else \if b\reserved@a - \def\scr@l@valign{b}% + \def\layervalign{b}% \else \if l\reserved@a - \def\scr@l@halign{l}% + \def\layerhalign{l}% \else \if r\reserved@a - \def\scr@l@halign{r}% + \def\layerhalign{r}% \else \PackageWarning{scrlayer}{% Unknown alignment `\reserved@a' ignored}% @@ -1465,12 +1489,12 @@ }% \parbox[t][\z@][t]{\z@}{% \vskip\layeryoffset - \if b\scr@l@valign\vskip-\layerheight\fi - \if c\scr@l@valign\vskip-.5\dimexpr\layerheight\relax\fi + \if b\layervalign\vskip-\layerheight\fi + \if c\layervalign\vskip-.5\dimexpr\layerheight\relax\fi \makebox[\z@][l]{% \hskip\layerxoffset - \makebox[\z@][\scr@l@halign]{% - \parbox[\scr@l@valign][\layerheight][\scr@l@valign]{\layerwidth}{% + \makebox[\z@][\layerhalign]{% + \parbox[\layervalign][\layerheight][\layervalign]{\layerwidth}{% \vskip\z@\strut{% \ifscrlayer@forceignoreuppercase \expandafter\let\csname MakeUppercase \endcsname\@firstofone @@ -1485,6 +1509,27 @@ }% \endgroup } +\newcommand{\layerrawmode}[1]{#1} +\newcommand{\layertextmode}[1]{#1} +\newcommand{\layerpicturemode}[1]{% + \begin{picture}(0,0) + (0,\LenToUnit{% + \if t\layervalign \dimexpr\layerheight-\ht\strutbox\relax + \else + \if b\layervalign \dp\strutbox + \else .5\dimexpr\layerheight-\ht\strutbox+\dp\strutbox\relax + \fi + \fi}) + \long\def\putLL##1{\put(0,0){##1}}% + \long\def\putUL##1{\put(0,\LenToUnit{\layerheight}){##1}}% + \long\def\putLR##1{\put(\LenToUnit{\layerwidth},0){##1}}% + \long\def\putUR##1{\put(\LenToUnit{\layerwidth},% + \LenToUnit{\layerheight}){##1}}% + \long\def\putC##1{\put(\LenToUnit{.5\dimexpr\layerwidth\relax},% + \LenToUnit{.5\dimexpr\layerheight\relax}){##1}}% + #1% + \end{picture}% +} \newcommand*{\DeclareNewPageStyleByLayers}[2][]{% \@ifundefined{ps@#2}{}{% \PackageError{scrlayer}{% @@ -2105,7 +2150,7 @@ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}% \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}% } -%%% From File: $Id: scrlayer.dtx 2125 2015-06-09 07:58:46Z kohm $ (final) +%%% From File: $Id: scrlayer.dtx 2172 2015-07-30 09:39:05Z kohm $ (final) \DeclareNewPageStyleByLayers{@everystyle@}{} \RedeclarePageStyleByLayers{empty}{} %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty index 67cca69968b..b22c16927b8 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty @@ -60,7 +60,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -82,17 +82,17 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } \ProvidesPackage{scrletter}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script letter package extending any KOMA-Script class% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \scr@ifundefinedorrelax{KOMAClassName}{% @@ -147,7 +147,7 @@ } \AtEndOfPackage {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -162,11 +162,11 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -680,7 +680,7 @@ %%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $ %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \newcommand*{\LoadLetterOption}[1]{% @@ -845,7 +845,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \PackageInfo{scrletter% @@ -1214,112 +1214,139 @@ package\MessageBreak (e.g. `Babel', `german', `ngerman', ...)}% \ifx\l@american\undefined\else\ifnum\language=\l@american - \captionsamerican - \dateamerican + \@nameuse{captionsamerican}% + \@nameuse{extrasamerican}% + \@nameuse{dateamerican}% \fi\fi \ifx\l@australian\undefined\else\ifnum\language=\l@australian - \captionsaustralian - \dateaustralian + \@nameuse{captionsaustralian}% + \@nameuse{extrasaustralian}% + \@nameuse{dateaustralian}% \fi\fi \ifx\l@british\undefined\else\ifnum\language=\l@british - \captionsbritish - \datebritish + \@nameuse{captionsbritish}% + \@nameuse{extrasbritish}% + \@nameuse{datebritish}% \fi\fi \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian - \captionscanadian - \datecanadian + \@nameuse{captionscanadian}% + \@nameuse{extrascanadian}% + \@nameuse{datecanadian}% \fi\fi \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand - \captionsnewzealand - \datenewzealand + \@nameuse{captionsnewzealand}% + \@nameuse{extrasnewzealand}% + \@nameuse{datenewzealand}% \fi\fi \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish - \captionsUKenglish - \dateUKenglish + \@nameuse{captionsUKenglish}% + \@nameuse{extrasUKenglish}% + \@nameuse{dateUKenglish}% \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish - \captionsUSenglish - \dateUSenglish + \@nameuse{captionsUSenglish}% + \@nameuse{extrasUSenglish}% + \@nameuse{dateUSenglish}% \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian - \captionsaustrian - \dateaustrian + \@nameuse{captionsaustrian}% + \@nameuse{extrasaustrian}% + \@nameuse{dateaustrian}% \fi\fi \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian - \captionsnaustrian - \datenaustrian + \@nameuse{captionsnaustrian}% + \@nameuse{extrasnaustrian}% + \@nameuse{datenaustrian}% \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german - \captionsgerman - \dategerman + \@nameuse{captionsgerman}% + \@nameuse{extrasgerman}% + \@nameuse{dategerman}% \fi\fi \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman - \captionsngerman - \datengerman + \@nameuse{captionsngerman}% + \@nameuse{extrasngerman}% + \@nameuse{datengerman}% \fi\fi \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman - \captionsswissgerman - \dateswissgerman + \@nameuse{captionsswissgerman}% + \@nameuse{extrasswissgerman}% + \@nameuse{dateswissgerman}% \fi\fi \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman - \captionsnswissgerman - \datenswissgerman + \@nameuse{captionsnswissgerman}% + \@nameuse{extrasnswissgerman}% + \@nameuse{datenswissgerman}% \fi\fi \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian - \captionsacadian - \dateacadian + \@nameuse{captionsacadian}% + \@nameuse{extrasacadian}% + \@nameuse{dateacadian}% \fi\fi \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien - \captionscanadien - \datecanadien + \@nameuse{captionscanadien}% + \@nameuse{extrascanadien}% + \@nameuse{datecanadien}% \fi\fi \ifx\l@francais\undefined\else\ifnum\language=\l@francais - \captionsfrancais - \datefrancais + \@nameuse{captionsfrancais}% + \@nameuse{extrasfrancais}% + \@nameuse{datefrancais}% \fi\fi \ifx\l@french\undefined\else\ifnum\language=\l@french - \captionsfrench - \datefrench + \@nameuse{captionsfrench}% + \@nameuse{extrasfrench}% + \@nameuse{datefrench}% \fi\fi \ifx\l@italian\undefined\else\ifnum\language=\l@italian - \captionsitalian - \dateitalian + \@nameuse{captionsitalian}% + \@nameuse{extrasitalian}% + \@nameuse{dateitalian}% \fi\fi \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish - \captionsspanish - \datespanish + \@nameuse{captionsspanish}% + \@nameuse{extrasspanish}% + \@nameuse{datespanish}% \fi\fi \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian - \captionscroatian - \datecroatian + \@nameuse{captionscroatian}% + \@nameuse{extrascroatian}% + \@nameuse{datecroatian}% \fi\fi \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch - \captionsdutch - \datedutch + \@nameuse{captionsdutch}% + \@nameuse{extrasdutch}% + \@nameuse{datedutch}% \fi\fi \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish - \captionsfinnish - \datefinnish + \@nameuse{captionsfinnish}% + \@nameuse{extrasfinnish}% + \@nameuse{datefinnish}% \fi\fi \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk - \captionsnorsk - \datenorsk + \@nameuse{captionsnorsk}% + \@nameuse{extrasnorsk}% + \@nameuse{datenorsk}% \fi\fi \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish - \captionsswedish - \dateswedish + \@nameuse{captionsswedish}% + \@nameuse{extrasswedish}% + \@nameuse{dateswedish}% \fi\fi \ifx\l@polish\undefined\else\ifnum\language=\l@polish - \captionspolish - \datepolish + \@nameuse{captionspolish}% + \@nameuse{extraspolish}% + \@nameuse{datepolish}% \fi\fi \ifx\l@czech\undefined\else\ifnum\language=\l@czech - \captionsczech - \dateczech + \@nameuse{captionsczech}% + \@nameuse{extrasczech}% + \@nameuse{dateczech}% \fi\fi \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak - \captionsslovak - \dateslovak + \@nameuse{captionsslovak}% + \@nameuse{extrasslovak}% + \@nameuse{dateslovak}% \fi\fi \else \edef\@tempa{nohyphenation}% @@ -1539,7 +1566,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{% \letterpagemark }{% @@ -1570,7 +1597,7 @@ \rofoot[\ifnum\@pageat=5 \pagemark\fi]% {}% } -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \newkomavar{firsthead} \setkomavar{firsthead}{% \parbox[b]{\useplength{firstheadwidth}}% @@ -2628,17 +2655,28 @@ \fi } \newenvironment{letter}[2][]{% - \newpage - \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi + \cleardoubleoddemptypage + \scr@ifundefinedorrelax{letterpagestyle}{}{% + \ifx\letterpagestyle\@empty\else + \pagestyle{\letterpagestyle}% + \fi + }% \let\pagemark\letterpagemark + \refstepcounter{letter}% + \let\thisletter\@currentlabel \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% \KOMAoptions{#1}% \@beginletterhook }{% - \stopletter\@@par\pagebreak\@@par% + \stopletter + \let\@currentlabel\thisletter + \label{\thisletter.lastpage}% + \@@par\pagebreak\@@par% } +\newcommand*{\thisletter}{outside.letter.undefined} +\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}} \newcommand*{\stopletter}{} \newcommand{\@processto}[1]{% \ifx\relax#1\relax\else @@ -2652,6 +2690,10 @@ \g@addto@macro\flushbottom{% \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } +\newcounter{letter} +\newcommand*{\letterpagestyle}{% + plain.letter% +} \newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook} \newcommand{\@beginletterhook}{} \newcommand{\AtEndLetter}{\g@addto@macro\stopletter} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty index 5b336d88f95..bd3437ea9ff 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty @@ -41,7 +41,7 @@ %% %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \ProvidesPackage{scrlfile}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (loading files)] \typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname% ^^J\@spaces\@spaces\@spaces\@spaces\space\space diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls index e72cb65fac8..542dddaa311 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls @@ -71,7 +71,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -93,7 +93,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -108,12 +108,12 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newcommand* {\scr@compatibility}{\scr@v@last} \KOMA@key{version}[last]{% @@ -209,6 +209,8 @@ \@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@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -259,7 +261,7 @@ } \AtEndOfClass {\LoadLetterOption{DIN}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newif\if@orgdate\@orgdatetrue \KOMA@key{numericaldate}[true]{% \if@orgdate\@orgdatefalse\else\@orgdatetrue\fi @@ -274,7 +276,7 @@ }{orgdate}{true} \KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true} \KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false} -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 12% } @@ -343,7 +345,7 @@ } %%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $ %%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $ -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -448,7 +450,7 @@ \DeclareOption*{% \lco@test \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -456,7 +458,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -609,14 +614,14 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -630,7 +635,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -736,7 +741,7 @@ \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} %%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $ -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -807,7 +812,7 @@ \ifhmode\spacefactor\@x@sf\fi \relax} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \KOMA@ifkey{firsthead}{@firsthead} \KOMAExecuteOptions{firsthead=true} \newcommand*{\@alignfrom}{0} @@ -1354,7 +1359,7 @@ parskip=false,% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax \newcommand*{\@setif}[2][]{% \begingroup @@ -1366,7 +1371,7 @@ \expandafter\endgroup\@tempa }% \fi -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2048,7 +2053,7 @@ \newcommand*{\LetterOptionNeedsPapersize}[2]{% \edef\LOPNP@size{#2}\edef\LOPNP@option{#1}% } -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ \newcommand*{\g@addnumerical@date}[2]{% \@ifundefined{date#1}{% \ClassInfo{scrlttr2% @@ -2417,112 +2422,139 @@ package\MessageBreak (e.g. `Babel', `german', `ngerman', ...)}% \ifx\l@american\undefined\else\ifnum\language=\l@american - \captionsamerican - \dateamerican + \@nameuse{captionsamerican}% + \@nameuse{extrasamerican}% + \@nameuse{dateamerican}% \fi\fi \ifx\l@australian\undefined\else\ifnum\language=\l@australian - \captionsaustralian - \dateaustralian + \@nameuse{captionsaustralian}% + \@nameuse{extrasaustralian}% + \@nameuse{dateaustralian}% \fi\fi \ifx\l@british\undefined\else\ifnum\language=\l@british - \captionsbritish - \datebritish + \@nameuse{captionsbritish}% + \@nameuse{extrasbritish}% + \@nameuse{datebritish}% \fi\fi \ifx\l@canadian\undefined\else\ifnum\language=\l@canadian - \captionscanadian - \datecanadian + \@nameuse{captionscanadian}% + \@nameuse{extrascanadian}% + \@nameuse{datecanadian}% \fi\fi \ifx\l@newzealand\undefined\else\ifnum\language=\l@newzealand - \captionsnewzealand - \datenewzealand + \@nameuse{captionsnewzealand}% + \@nameuse{extrasnewzealand}% + \@nameuse{datenewzealand}% \fi\fi \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish - \captionsUKenglish - \dateUKenglish + \@nameuse{captionsUKenglish}% + \@nameuse{extrasUKenglish}% + \@nameuse{dateUKenglish}% \fi\fi \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish - \captionsUSenglish - \dateUSenglish + \@nameuse{captionsUSenglish}% + \@nameuse{extrasUSenglish}% + \@nameuse{dateUSenglish}% \fi\fi \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian - \captionsaustrian - \dateaustrian + \@nameuse{captionsaustrian}% + \@nameuse{extrasaustrian}% + \@nameuse{dateaustrian}% \fi\fi \ifx\l@naustrian\undefined\else\ifnum\language=\l@naustrian - \captionsnaustrian - \datenaustrian + \@nameuse{captionsnaustrian}% + \@nameuse{extrasnaustrian}% + \@nameuse{datenaustrian}% \fi\fi \ifx\l@german\undefined\else\ifnum\language=\l@german - \captionsgerman - \dategerman + \@nameuse{captionsgerman}% + \@nameuse{extrasgerman}% + \@nameuse{dategerman}% \fi\fi \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman - \captionsngerman - \datengerman + \@nameuse{captionsngerman}% + \@nameuse{extrasngerman}% + \@nameuse{datengerman}% \fi\fi \ifx\l@swissgerman\undefined\else\ifnum\language=\l@swissgerman - \captionsswissgerman - \dateswissgerman + \@nameuse{captionsswissgerman}% + \@nameuse{extrasswissgerman}% + \@nameuse{dateswissgerman}% \fi\fi \ifx\l@nswissgerman\undefined\else\ifnum\language=\l@nswissgerman - \captionsnswissgerman - \datenswissgerman + \@nameuse{captionsnswissgerman}% + \@nameuse{extrasnswissgerman}% + \@nameuse{datenswissgerman}% \fi\fi \ifx\l@acadian\undefined\else\ifnum\language=\l@acadian - \captionsacadian - \dateacadian + \@nameuse{captionsacadian}% + \@nameuse{extrasacadian}% + \@nameuse{dateacadian}% \fi\fi \ifx\l@canadien\undefined\else\ifnum\language=\l@canadien - \captionscanadien - \datecanadien + \@nameuse{captionscanadien}% + \@nameuse{extrascanadien}% + \@nameuse{datecanadien}% \fi\fi \ifx\l@francais\undefined\else\ifnum\language=\l@francais - \captionsfrancais - \datefrancais + \@nameuse{captionsfrancais}% + \@nameuse{extrasfrancais}% + \@nameuse{datefrancais}% \fi\fi \ifx\l@french\undefined\else\ifnum\language=\l@french - \captionsfrench - \datefrench + \@nameuse{captionsfrench}% + \@nameuse{extrasfrench}% + \@nameuse{datefrench}% \fi\fi \ifx\l@italian\undefined\else\ifnum\language=\l@italian - \captionsitalian - \dateitalian + \@nameuse{captionsitalian}% + \@nameuse{extrasitalian}% + \@nameuse{dateitalian}% \fi\fi \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish - \captionsspanish - \datespanish + \@nameuse{captionsspanish}% + \@nameuse{extrasspanish}% + \@nameuse{datespanish}% \fi\fi \ifx\l@croatian\undefined\else\ifnum\language=\l@croatian - \captionscroatian - \datecroatian + \@nameuse{captionscroatian}% + \@nameuse{extrascroatian}% + \@nameuse{datecroatian}% \fi\fi \ifx\l@dutch\undefined\else\ifnum\language=\l@dutch - \captionsdutch - \datedutch + \@nameuse{captionsdutch}% + \@nameuse{extrasdutch}% + \@nameuse{datedutch}% \fi\fi \ifx\l@finnish\undefined\else\ifnum\language=\l@finnish - \captionsfinnish - \datefinnish + \@nameuse{captionsfinnish}% + \@nameuse{extrasfinnish}% + \@nameuse{datefinnish}% \fi\fi \ifx\l@norsk\undefined\else\ifnum\language=\l@norsk - \captionsnorsk - \datenorsk + \@nameuse{captionsnorsk}% + \@nameuse{extrasnorsk}% + \@nameuse{datenorsk}% \fi\fi \ifx\l@swedish\undefined\else\ifnum\language=\l@swedish - \captionsswedish - \dateswedish + \@nameuse{captionsswedish}% + \@nameuse{extrasswedish}% + \@nameuse{dateswedish}% \fi\fi \ifx\l@polish\undefined\else\ifnum\language=\l@polish - \captionspolish - \datepolish + \@nameuse{captionspolish}% + \@nameuse{extraspolish}% + \@nameuse{datepolish}% \fi\fi \ifx\l@czech\undefined\else\ifnum\language=\l@czech - \captionsczech - \dateczech + \@nameuse{captionsczech}% + \@nameuse{extrasczech}% + \@nameuse{dateczech}% \fi\fi \ifx\l@slovak\undefined\else\ifnum\language=\l@slovak - \captionsslovak - \dateslovak + \@nameuse{captionsslovak}% + \@nameuse{extrasslovak}% + \@nameuse{dateslovak}% \fi\fi \else \edef\@tempa{nohyphenation}% @@ -2742,7 +2774,7 @@ }% \@tempa% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2753,7 +2785,7 @@ \let\x@@paper =\relax \let\scr@pti@nerr@r =\relax \RequirePackage{typearea}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \newcommand*{\scr@selectfont}{} @@ -2836,7 +2868,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2851,16 +2883,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2879,7 +2911,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -2979,7 +3011,7 @@ \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -3258,7 +3290,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\@firsthead}{% \ClassWarning{scrlttr2}{% Deprecated usage of \string\@firsthead.\MessageBreak @@ -4380,16 +4412,27 @@ \setkomavar{nextfoot}% } \newenvironment{letter}[2][]{% - \newpage - \if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi + \cleardoubleoddemptypage + \scr@ifundefinedorrelax{letterpagestyle}{}{% + \ifx\letterpagestyle\@empty\else + \pagestyle{\letterpagestyle}% + \fi + }% + \refstepcounter{letter}% + \let\thisletter\@currentlabel \setcounter{page}{\@ne}% \setcounter{footnote}{0}% \interlinepenalty=200\@processto{#2}% \KOMAoptions{#1}% \@beginletterhook }{% - \stopletter\@@par\pagebreak\@@par% + \stopletter + \let\@currentlabel\thisletter + \label{\thisletter.lastpage}% + \@@par\pagebreak\@@par% } +\newcommand*{\thisletter}{outside.letter.undefined} +\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}} \newcommand*{\stopletter}{} \newcommand{\@processto}[1]{% \ifx\relax#1\relax\else @@ -4403,6 +4446,9 @@ \g@addto@macro\flushbottom{% \g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}% } +\newcounter{letter} +\newcommand*{\letterpagestyle}{% +} \newcommand{\AtBeginLetter}{\g@addto@macro\@beginletterhook} \newcommand{\@beginletterhook}{} \newcommand{\AtEndLetter}{\g@addto@macro\stopletter} diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty index a11d3358c31..f708b393cf6 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 1547 2013-12-14 17:23:38Z mjk $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrpage2}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (page head and foot)] \newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{% \@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}% diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index b83c40c3456..ab0e0c646ca 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -74,7 +74,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -96,7 +96,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -111,21 +111,21 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script document class (\ClassName)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \RequirePackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script ] \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}% \addtotoclist{toc} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: prepare) \newif\if@openright \@openrightfalse @@ -190,7 +190,7 @@ \newcommand*{\scr@chapter@afterskip}{\z@} \let\scr@chapter@afterskip\z@ \newcommand*{\scr@chapter@innerskip}{\z@} -\let\scr@chapter@sectionindent\z@ +\let\scr@chapter@innerskip\z@ \newcommand*{\scr@chapter@style}{chapter} \newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}} \newcommand*{\chapterheadendvskip}{\vskip\@tempskipa} @@ -201,7 +201,7 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -322,6 +322,8 @@ \@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@last}{15} \newcommand*{\scr@v@is@lt}[1]{% \scr@compatibility<\@nameuse{scr@v@#1} @@ -357,8 +359,8 @@ {final}{draft=false} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\@ptsize{% 11% } @@ -425,7 +427,7 @@ \KOMAClassFileName }{fontsize}{#1}% } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -531,7 +533,7 @@ {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -539,7 +541,10 @@ \def\scr@parindent{#1}% \def\scr@parskip{#2}% \def\scr@parfillskip{#3}% - \def\par@update{\let\par@update\default@par@update\par@updaterelative}% + \def\par@update{% + \if@atdocument\let\par@update\default@par@update\fi + \par@updaterelative + }% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}% \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}% @@ -692,7 +697,7 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newif\if@titlepage \@titlepagetrue \newif\if@titlepageiscoverpage @@ -726,7 +731,7 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: option) \KOMA@key{open}{% \KOMA@set@ncmdkey{open}{@tempa}{% @@ -988,14 +993,14 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newif\if@hsl \KOMA@key{headsepline}[true]{% \KOMA@set@ifkey{headsepline}{@hsl}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{headinclude=#1}% + \PassOptionsToPackage{headinclude=#1}{typearea}% }{% \KOMAoptions{headinclude=#1}{}% }% @@ -1009,7 +1014,7 @@ \ifx\FamilyKeyState\FamilyKeyStateProcessed \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}% \@ifundefined{typearea}{% - \PassOptionsToPackage{typearea}{footinclude=#1}% + \PassOptionsToPackage{footinclude=#1}{typearea}% }{% \KOMAoptions{footinclude=#1}% }% @@ -1248,7 +1253,7 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1318,7 +1323,7 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1756,7 +1761,7 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\section @@ -1840,7 +1845,7 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{headings=openany} \KOMAExecuteOptions{numbers=autoendperiod} @@ -1850,8 +1855,8 @@ headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $ \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2289,12 +2294,12 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z 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 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2338,7 +2343,7 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $ \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2423,7 +2428,7 @@ \begingroup \edef\@tempa{#2}% \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil - \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}% + \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}% \@tempa } \newcommand*{\scr@@defaultunits}{} @@ -2438,16 +2443,16 @@ \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{% \ifx\relax#2\relax \@defaultunits\@tempskipa#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \else \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil - \setlength{#1}{\@tempskipa}% + #1\@tempskipa \@defaultunits\@tempskipa#2pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi \ifx\relax#4\relax\else \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil - \addtolength{#1}{\@tempskipa}% + \advance#1\@tempskipa \fi } \newcommand*{\@list@extra}{% @@ -2466,7 +2471,7 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2660,7 +2665,8 @@ \fi \@maketitle \fi - \thispagestyle{\titlepagestyle}\@thanks + \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi + \@thanks \endgroup \fi \setcounter{footnote}{0}% @@ -2805,7 +2811,7 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $ %%% (run: body) \setcounter{secnumdepth}{2} \newcommand*{\ifnumbered}[1]{% @@ -2887,6 +2893,7 @@ \fi \@ifstar {% \csname scr@preto@ssect@hook\endcsname + \def\scr@s@ct@@nn@m@{#1}% \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}% }{% \csname scr@preto@sect@hook\endcsname @@ -2994,7 +3001,7 @@ \ifx\@sect\@tempa\else \ClassWarning{\KOMAClassName}{% Unexpected definition of \string\@sect!\MessageBreak - Please send an information about this to\MessageBreak + Please send information about this to\MessageBreak the KOMA-Script maintainer!\MessageBreak Maybe LaTeX will be broken by the redefinition\MessageBreak of \string\@sect\space}% @@ -3029,9 +3036,8 @@ \@tempskipa \glueexpr #5\relax\relax \ifdim \@tempskipa>\z@ \begingroup - #6{% - \@hangfrom{\hskip \glueexpr #3\relax\@svsec}% - \interlinepenalty \@M #8\@@par}% + #6{\interlinepenalty \@M + \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}% \endgroup \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3050,8 +3056,7 @@ \fi \else \def\@svsechd{% - #6{\hskip \glueexpr #3\relax - \@svsec #8}% + #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}% \expandafter\csname #1mark\expandafter\endcsname \expandafter{\scr@ds@head}% \ifx\scr@ds@tocentry\@empty\else @@ -3084,6 +3089,61 @@ \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi } \newif\if@scr@tempswa +\newcommand{\sectionlinesformat}[4]{% + \@hangfrom{\hskip #2#3}{#4}% +} +\newcommand{\sectioncatchphraseformat}[4]{% + \hskip #2#3#4% +} +\def\@tempa#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \else + \def\@svsechd{#4{\hskip #1\relax #5}}% + \fi + \@xsect{#3}} +\ifx\@ssect\@tempa\else + \ClassWarning{\KOMAClassName}{% + Unexpected definition of \string\@ssect!\MessageBreak + Please send information about this to\MessageBreak + the KOMA-Script maintainer!\MessageBreak + Maybe LaTeX will be broken by the redefinition\MessageBreak + of \string\@ssect\space}% +\fi +\def\@ssect#1#2#3#4#5{% + \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{% + \ClassWarning{\KOMAClassName}{incompatible usage of + \string\@ssect\space detected.\MessageBreak + You've used the KOMA-Script implementation of + \string\@ssect\MessageBreak + from within a non compatible caller, that does not\MessageBreak + \string\scr@s@ct@@nn@m@\space locally.\MessageBreak + This could result in several error messages}% + \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}% + }{}% + \@tempskipa #3\relax + \ifdim \@tempskipa>\z@ + \begingroup + #4{\interlinepenalty \@M + \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}% + {\glueexpr #1\relax}\@empty{#5}\@@par}% + \endgroup + \else + \edef\@svsechd{% + \unexpanded{#4}{% + \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}% + \unexpanded{{\glueexpr #1\relax}\@empty{#5}}% + }% + }% + \fi + \let\scr@s@ct@@nn@m@\relax + \@xsect{\glueexpr #3\relax}% +} \newcommand*{\scr@IfUsePrefixLineWarning}[2]{% \ClassWarning{\KOMAClassName}{% usage of \string\IfUsePrefixLine\space outside @@ -3352,6 +3412,8 @@ }% }\reserved@a }% + \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}% + \let\scr@local@counterwithout\relax \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}% \let\scr@local@counterwithin\relax \scr@ifundefinedorrelax{scr@local@tocleveloffset}{% @@ -3418,6 +3480,13 @@ \endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% + \ifx\scr@local@counterwithout\relax + \else\ifx\scr@local@counterwithout\@empty + \else + \@removefromreset{#2}{\scr@local@counterwithout}% + \fi + \@namedef{the#2}{\arabic{#2}}% + \fi \ifx\scr@local@counterwithin\relax \else\ifx\scr@local@counterwithin\@empty \@namedef{the#2}{\arabic{#2}}% @@ -3776,7 +3845,11 @@ } \newcommand*{\scr@startpart}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \if@twocolumn \onecolumn \@tempswatrue @@ -3974,7 +4047,11 @@ \newkomafont{partentrypagenumber}{} \newcommand*{\scr@startchapter}[1]{% \if@openright\cleardoublepage\else\clearpage\fi - \thispagestyle{\@nameuse{#1pagestyle}}% + \scr@ifundefinedorrelax{#1pagestyle}{}{% + \ifstr{#1pagestyle}{}{}{% + \thispagestyle{\@nameuse{#1pagestyle}}% + }% + }% \global\@topnum\z@ \@afterindentfalse \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname @@ -4092,38 +4169,44 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak - \usefontofkomafont{#1}% - \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\ifnumbered{#1}}% + \def\IfUseNumber{\ifnumbered{#1}}% \if@chapterprefix - \raggedchapter \let\IfUsePrefixLine\@firstoftwo - \let\@tempa\@firstofone \else \let\IfUsePrefixLine\@secondoftwo - \let\@tempa\@hangfrom \fi - \@tempa{% - \IfUseNumber{% - \usekomafont{#1}{% + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \settoheight{\@tempskipa}{% + {\usekomafont{#1prefix}{% + \vrule \@width\z@ \@height\csname scr@#1@innerskip\endcsname}}% + }% + \raggedchapter + \IfUseNumber{% \IfUsePrefixLine{% - {\usekomafont{#1prefix}{% - \csname #1format\endcsname - \setlength{\@tempskipa}{% - \csname scr@#1@innerskip\endcsname - }% - \chapterheadmidvskip - }}% + \chapterlineswithprefixformat{#1}% + {{\usekomafont{#1prefix}{\csname #1format\endcsname% + \setlength{\@tempskipa}{\csname scr@#1@innerskip\endcsname}% + \chapterheadmidvskip}}}% + {\interlinepenalty \@M#2\@@par}% }{% - \csname #1format\endcsname + \chapterlinesformat{#1}% + {\csname #1format\endcsname}% + {\interlinepenalty \@M#2\@@par}% + }% + }{% + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% }% }% - }{}% - }% - {% - \IfUsePrefixLine{}{\raggedchapter}% - \interlinepenalty \@M - \usekomafont{#1}{#2}\par + }% }% }% \nobreak\par\nobreak @@ -4137,14 +4220,38 @@ \chapterheadstartvskip {% \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}% - \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}% - \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par + \let\IfUseNumber\secondoftwo + \if@chapterprefix + \let\IfUsePrefixLine\@firstoftwo + \else + \let\IfUsePrefixLine\@secondoftwo + \fi + \normalfont\usekomafont{disposition}{% + \usekomafont{#1}{% + \raggedchapter + \IfUsePrefixLine{% + \chapterlineswithprefixformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }{% + \chapterlinesformat{#1}% + {}% + {\interlinepenalty \@M#2\@@par}% + }% + }% + }% }% \nobreak\par\nobreak - \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax + \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi \chapterheadendvskip } +\newcommand{\chapterlinesformat}[3]{% + \@hangfrom{#2}{#3}% +} +\newcommand{\chapterlineswithprefixformat}[3]{% + #2#3% +} \newcommand*{\use@chapter@o@preamble}[1]{% {% \settoheight{\@tempdima}{% @@ -4647,7 +4754,7 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $ \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -5293,7 +5400,7 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $ \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5431,7 +5538,7 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $ \doforeachtocfile[float]{% \setuptoc{\@currext}{chapteratlist}% } @@ -5501,7 +5608,7 @@ usage of deprecated \string\toc@heading!\MessageBreak You should use the features of package `tocbasic'\MessageBreak instead of \string\toc@heading.\MessageBreak - Definition of \string\toc@heading\space my be removed from\MessageBreak + Definition of \string\toc@heading\space may be removed from\MessageBreak KOMA-Script soon, so it should not be used }% \chapter*{\contentsname}% @@ -5654,7 +5761,7 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $ \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5687,7 +5794,8 @@ \columnsep 35\p@ \setchapterpreamble{\index@preamble}% \idx@heading% - \thispagestyle{\indexpagestyle}\parindent\z@ + \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi + \parindent\z@ \setlength{\parskip}{\z@ \@plus .3\p@}% \setlength{\parfillskip}{\z@ \@plus 1fil}% \let\item\@idxitem diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo index 805331f88f3..4c9147e6ea9 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z 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 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z 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 c43550fe868..1edfd540ecc 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z 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 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z 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 82dd886bf60..cc895196fbe 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo +++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,9 +62,9 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $ +%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z 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 2045 2015-03-25 09:47:54Z kohm $ +%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z 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 81b6d291eea..37b89b00b6d 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty @@ -43,7 +43,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -65,7 +65,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% @@ -74,11 +74,11 @@ %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{scrtime}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (time of LaTeX run)% ] -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $ \newif\if@Hxii diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak index 90bbc5678ed..5262fee95d1 100644 --- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak +++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak @@ -40,7 +40,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -62,16 +62,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z kohm $ \ProvidesFile{setspace.hak}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (hacking package setspace)% ] -%%% From File: $Id: scrhack.dtx 2118 2015-05-22 15:34:34Z kohm $ +%%% From File: $Id: scrhack.dtx 2175 2015-08-11 15:51:46Z 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 522e9af8727..591d154d80f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -42,7 +42,7 @@ %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (handling toc-files)% ] diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty index 9f3d0233d9e..0a1ee19c768 100644 --- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty +++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,16 +67,16 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{typearea}[% - 2015/07/02 v3.18 KOMA-Script + 2015/09/29 v3.19 KOMA-Script package (type area)] \typeout{% Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J% @@ -85,9 +85,9 @@ \@spaces\@spaces\@spaces\@spaces\space\space Copyright (C) Markus Kohm, 1994-^^J% } -%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $ \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}} \newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}} \newlength{\ta@bcor} @@ -375,7 +375,7 @@ \or \edef\@pagesizelast{automedia}% \if@atdocument - \set@pdftextpagesize + \set@pdftexpagesize \set@vtexpagesize \set@dvipspagesize \fi @@ -673,7 +673,7 @@ \KOMA@ifkey{usegeometry}{@ta@usegeometry} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ \providecommand* {\scr@compatibility}{\scr@v@last} \newcommand*{\scr@ta@compatibility}{\scr@compatibility} @@ -775,6 +775,8 @@ \@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@last}{15} \newcommand*{\scr@ta@v@is@lt}[1]{% \scr@ta@compatibility<\@nameuse{scr@v@#1} @@ -788,7 +790,7 @@ \newcommand*{\scr@ta@v@is@ge}[1]{% \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $ +%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $ \InputIfFileExists{typearea.cfg}{% \typeout{% ***************************************^^J% @@ -1504,7 +1506,7 @@ \fi } \typearea[current]{current} -%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $ %%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco index 864f3297486..c0f6dc36d08 100644 --- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco +++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco @@ -41,7 +41,7 @@ %% find a complete unmodified copy of LaTeX2e at %% . %% -%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -63,7 +63,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}% \endgroup %%% From File: $Id: scrkernel-letterclassoptions.dtx 2122 2015-06-03 08:05:35Z kohm $ \ProvidesFile{% @@ -574,7 +574,7 @@ \newcommand*{\showUScheck}{% \showenvelope(8.625in,3.625in)% } -%%% From File: $Id: scrkernel-notepaper.dtx 2084 2015-04-26 12:49:41Z kohm $ +%%% From File: $Id: scrkernel-notepaper.dtx 2162 2015-07-15 07:30:52Z kohm $ \endinput %% %% End of file `visualize.lco'. -- cgit v1.2.3