summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-26 23:18:36 +0000
committerKarl Berry <karl@freefriends.org>2013-12-26 23:18:36 +0000
commit9b219d1b664067729034647a4b37626cf2bf5e26 (patch)
tree00708467b44f90736dc32ed1bebb95e9c4710139 /Master/texmf-dist/tex/latex/koma-script
parentc00c8298eb6913b74270a36c1f1018f1e9946f7b (diff)
koma-script (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32489 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco25
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco17
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco36
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco36
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak27
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty11
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls1529
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty1490
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls1798
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty32
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty620
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty31
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty36
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty294
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty237
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty1148
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty1665
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty1931
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlettr.cls715
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty169
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls1067
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage.sty445
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty47
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls1777
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo21
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty32
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrwfile.sty48
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty135
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty72
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty305
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco27
46 files changed, 11467 insertions, 4669 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 0d9f3459735..3216db72798 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -1,15 +1,14 @@
%%
%% This is file `DIN.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,DIN,head')
-%% scrklco.dtx (with options: `lco,DIN,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
DIN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DIN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index e54354e155d..64479025bc2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -1,15 +1,14 @@
%%
%% This is file `DINmtext.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,DINmoretext,head')
-%% scrklco.dtx (with options: `lco,DINmoretext,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
DINmtext%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DINmtext%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index e6102dfd0ba..6d00cc1cfcc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -1,16 +1,15 @@
%%
%% This is file `KOMAold.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,KOMAold,head')
-%% scrklco.dtx (with options: `lco,KOMAold,body')
-%% scrknpap.dtx (with options: `lco,KOMAold,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,KOMAold,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,KOMAold,body')
+%% scrkernel-notepaper.dtx (with options: `lco,KOMAold,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,9 +41,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -64,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
KOMAold%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -80,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
KOMAold%
@@ -205,7 +204,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: scrknpap.dtx
+%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
\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 09b2213e3fb..795903d6b2f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -1,15 +1,14 @@
%%
%% This is file `KakuLL.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
+%% scrkernel-version.dtx (with options: `trace')
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
Kaku%
L%
@@ -81,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Kaku%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 9ae2a60ef08..6ec1eeead31 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -1,15 +1,14 @@
%%
%% This is file `NF.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,NF,head')
-%% scrklco.dtx (with options: `lco,NF,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
NF%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
NF%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index fa887a73763..e807d164226 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -1,15 +1,14 @@
%%
%% This is file `NipponEH.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
+%% scrkernel-version.dtx (with options: `trace')
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
Nippon%
E%
@@ -81,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index e6fefa0465e..33118546d19 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -1,15 +1,14 @@
%%
%% This is file `NipponEL.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
+%% scrkernel-version.dtx (with options: `trace')
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
Nippon%
E%
@@ -81,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 5fbb2eaf333..8c7f9d48b3e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -1,15 +1,14 @@
%%
%% This is file `NipponLH.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
+%% scrkernel-version.dtx (with options: `trace')
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
Nippon%
L%
@@ -81,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index a01c09eef27..3faf11f0e3e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -1,15 +1,14 @@
%%
%% This is file `NipponLL.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
+%% scrkernel-version.dtx (with options: `trace')
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
Nippon%
L%
@@ -81,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 3e28833778c..375f67a0cb1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -1,15 +1,14 @@
%%
%% This is file `NipponRL.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
+%% scrkernel-version.dtx (with options: `trace')
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
Nippon%
R%
@@ -81,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: japanlco.dtx
+%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
Nippon%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 8b366790323..2909d28439d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -1,15 +1,14 @@
%%
%% This is file `SN.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,SN,head')
-%% scrklco.dtx (with options: `lco,SN,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
SN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index d69b4158710..a8111207c1a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -1,15 +1,14 @@
%%
%% This is file `SNleft.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,SwissLeft,head')
-%% scrklco.dtx (with options: `lco,SwissLeft,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
SNleft%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SNleft%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index db57f51d9cf..c8d82ccd879 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -1,16 +1,14 @@
%%
%% This is file `UScommercial9.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,UScommercial9,head')
-%% scrbeta.dtx (with options: `UScommercial9,betarelease,lco')
-%% scrklco.dtx (with options: `lco,UScommercial9,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -64,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
UScommercial9
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -80,21 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrbeta.dtx
-%% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-%% THIS IS A BETA VERSION!
-%% YOU SHOULD NOT USE THIS VERSION!
-%% YOU SHOULD ONLY TEST THIS VERSION AND SEND FEEDBACK TO THE AUTHOR!
-%% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-\LCOWarningNoLine{%
- UScommercial9%
-}{%
- THIS IS A BETA VERSION!\MessageBreak
- YOU SHOULD NOT USE THIS VERSION!\MessageBreak
- YOU SHOULD ONLY TEST THIS VERSION AND\MessageBreak
- SEND FEEDBACK TO THE AUTHOR!
-}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index fb44c1aefe5..9f8d1f8ad49 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -1,16 +1,14 @@
%%
%% This is file `UScommercial9DW.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,UScommercial9DW,head')
-%% scrbeta.dtx (with options: `UScommercial9DW,betarelease,lco')
-%% scrklco.dtx (with options: `lco,UScommercial9DW,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -64,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
UScommercial9DW
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -80,21 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrbeta.dtx
-%% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-%% THIS IS A BETA VERSION!
-%% YOU SHOULD NOT USE THIS VERSION!
-%% YOU SHOULD ONLY TEST THIS VERSION AND SEND FEEDBACK TO THE AUTHOR!
-%% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-\LCOWarningNoLine{%
- UScommercial9DW%
-}{%
- THIS IS A BETA VERSION!\MessageBreak
- YOU SHOULD NOT USE THIS VERSION!\MessageBreak
- YOU SHOULD ONLY TEST THIS VERSION AND\MessageBreak
- SEND FEEDBACK TO THE AUTHOR!
-}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9DW%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index d0112f4f3ef..0d6bad158e9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -1,15 +1,14 @@
%%
%% This is file `float.hak',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `file,float.hak')
+%% scrkernel-version.dtx (with options: `file,float.hak')
%% scrhack.dtx (with options: `hack,float,identify')
%% scrhack.dtx (with options: `hack,float,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,14 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrhack.dtx
-\ProvidesFile{float.hak}
- [\KOMAScriptVersion\space
- hacking package
- float]
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+\ProvidesFile{float.hak}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package
+ (hacking package
+ float)%
+]
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\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 f4fbb215020..563b62e7e9d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -1,15 +1,14 @@
%%
%% This is file `floatrow.hak',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `file,floatrow.hak')
+%% scrkernel-version.dtx (with options: `file,floatrow.hak')
%% scrhack.dtx (with options: `hack,floatrow,identify')
%% scrhack.dtx (with options: `hack,floatrow,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,14 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrhack.dtx
-\ProvidesFile{floatrow.hak}
- [\KOMAScriptVersion\space
- hacking package
- floatrow]
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+\ProvidesFile{floatrow.hak}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package
+ (hacking package
+ floatrow)%
+]
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\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 92eca32dd5e..138c9929fbb 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -1,15 +1,14 @@
%%
%% This is file `hyperref.hak',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `file,hyperref.hak')
+%% scrkernel-version.dtx (with options: `file,hyperref.hak')
%% scrhack.dtx (with options: `hack,hyperref,identify')
%% scrhack.dtx (with options: `hack,hyperref,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,14 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrhack.dtx
-\ProvidesFile{hyperref.hak}
- [\KOMAScriptVersion\space
- hacking package
- hyperref]
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+\ProvidesFile{hyperref.hak}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package
+ (hacking package
+ hyperref)%
+]
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\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 d75d1cf82fb..de9a0d3735a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -1,15 +1,14 @@
%%
%% This is file `listings.hak',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `file,listings.hak')
+%% scrkernel-version.dtx (with options: `file,listings.hak')
%% scrhack.dtx (with options: `hack,listings,identify')
%% scrhack.dtx (with options: `hack,listings,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,14 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrhack.dtx
-\ProvidesFile{listings.hak}
- [\KOMAScriptVersion\space
- hacking package
- listings]
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+\ProvidesFile{listings.hak}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package
+ (hacking package
+ listings)%
+]
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
\newcommand*{\scr@do@hack@listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index aa34e3e384a..d9fc6499204 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -1,14 +1,13 @@
%%
%% This is file `scraddr.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% scraddr.dtx (with options: `scraddr')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2006-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scraddr.dtx
+%%% From File: $Id: scraddr.dtx 1380 2013-10-01 15:31:55Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scraddr}
- [2006/03/28 v1.1c KOMA-Script
+ [2013/09/30 v1.1c KOMA-Script
package]
\newcommand*{\@adrFIVerror}{}
\DeclareOption{adrFreeIVempty}{\renewcommand*{\@adrFIVerror}{0}}
@@ -106,7 +105,7 @@
\newcommand*{\FreeIII}[1]{\csname #1.FIII\endcsname}
\let\Comment\FreeIII
\newcommand*{\FreeIV}[1]{\csname #1.FIV\endcsname}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 370b685c24f..988204abdd9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -1,47 +1,46 @@
%%
%% This is file `scrartcl.cls',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `class,article')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-version.dtx (with options: `class,article')
+%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load')
-%% scrkcomp.dtx (with options: `class,article,option')
-%% scrkmisc.dtx (with options: `class,article,option')
-%% scrklang.dtx (with options: `class,article,option')
-%% scrkfont.dtx (with options: `class,article,option')
-%% scrktare.dtx (with options: `class,article,option')
-%% scrkpar.dtx (with options: `class,article,option')
-%% scrktitl.dtx (with options: `class,article,option')
-%% scrksect.dtx (with options: `class,article,option')
-%% scrkpage.dtx (with options: `class,article,option')
-%% scrkfloa.dtx (with options: `class,article,option')
-%% scrkftn.dtx (with options: `class,article,option')
-%% scrkliof.dtx (with options: `class,article,option')
-%% scrkbib.dtx (with options: `class,article,option')
-%% scrkidx.dtx (with options: `class,article,option')
-%% scrklist.dtx (with options: `class,article,option')
-%% scrkmisc.dtx (with options: `class,article,execoption')
-%% scrkcomp.dtx (with options: `class,article,body')
-%% scrkfont.dtx (with options: `class,article,body')
-%% scrklang.dtx (with options: `class,article,body')
-%% scrktare.dtx (with options: `class,article,body')
-%% scrkpar.dtx (with options: `class,article,body')
-%% scrktitl.dtx (with options: `class,article,body')
-%% scrksect.dtx (with options: `class,article,body')
-%% scrkmisc.dtx (with options: `class,article,body')
-%% scrkpage.dtx (with options: `class,article,body')
-%% scrkfloa.dtx (with options: `class,article,body')
-%% scrkftn.dtx (with options: `class,article,body')
-%% scrkliof.dtx (with options: `class,article,body')
-%% scrkbib.dtx (with options: `class,article,body')
-%% scrkidx.dtx (with options: `class,article,body')
-%% scrklist.dtx (with options: `class,article,body')
+%% scrkernel-compatibility.dtx (with options: `class,article,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,article,option')
+%% scrkernel-language.dtx (with options: `class,article,option')
+%% scrkernel-fonts.dtx (with options: `class,article,option')
+%% scrkernel-typearea.dtx (with options: `class,article,option')
+%% scrkernel-paragraphs.dtx (with options: `class,article,option')
+%% scrkernel-title.dtx (with options: `class,article,option')
+%% scrkernel-sections.dtx (with options: `class,article,option')
+%% scrkernel-pagestyles.dtx (with options: `class,article,option')
+%% scrkernel-floats.dtx (with options: `class,article,option')
+%% scrkernel-footnotes.dtx (with options: `class,article,option')
+%% scrkernel-listsof.dtx (with options: `class,article,option')
+%% scrkernel-bibliography.dtx (with options: `class,article,option')
+%% scrkernel-index.dtx (with options: `class,article,option')
+%% scrkernel-listsandtabulars.dtx (with options: `class,article,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,article,execoption')
+%% scrkernel-compatibility.dtx (with options: `class,article,body')
+%% scrkernel-fonts.dtx (with options: `class,article,body')
+%% scrkernel-language.dtx (with options: `class,article,body')
+%% scrkernel-typearea.dtx (with options: `class,article,body')
+%% scrkernel-paragraphs.dtx (with options: `class,article,body')
+%% scrkernel-title.dtx (with options: `class,article,body')
+%% scrkernel-sections.dtx (with options: `class,article,body')
+%% scrkernel-miscellaneous.dtx (with options: `class,article,body')
+%% scrkernel-pagestyles.dtx (with options: `class,article,body')
+%% scrkernel-floats.dtx (with options: `class,article,body')
+%% scrkernel-footnotes.dtx (with options: `class,article,body')
+%% scrkernel-listsof.dtx (with options: `class,article,body')
+%% scrkernel-bibliography.dtx (with options: `class,article,body')
+%% scrkernel-index.dtx (with options: `class,article,body')
+%% scrkernel-listsandtabulars.dtx (with options: `class,article,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -73,9 +72,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -95,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrartcl%
@@ -104,18 +103,43 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- \KOMAScriptVersion\space document class (\ClassName)%
+ 2013/12/19 v3.12 KOMA-Script
+ document class (\ClassName)%
]
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: tocbasic.dtx
-\def\tocbasicversion{2012/04/04 v3.10b}
-\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
-\@tempa
+%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+\RequirePackage{tocbasic}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+\newif\if@scr@emulatestandardclasses
+\let\scr@emulatestandardclassestrue\relax
+\let\scr@emulatestandardclassesfalse\relax
+\DeclareOption{emulatestandardclasses}{%
+ \let\if@scr@emulatestandardclasses\iftrue
+ \KOMAExecuteOptions{%
+ fontsize=10pt,%
+ cleardoublepage=current
+ }%
+ \newcommand*{\defaultpapersize}{letter}%
+ \AtEndOfClass{%
+ \setkomafont{descriptionlabel}{\bfseries}%
+ \setkomafont{dictum}{\normalfont\small}%
+ \setkomafont{caption}{}%
+ \setkomafont{captionlabel}{}%
+ \setcapindent{0pt}%
+ \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}%
+ \PreventPackageFromLoading{scrpage2}%
+ \setkomafont{pagenumber}{\normalfont}%
+ \setkomafont{pageheadfoot}{\normalfont}%
+ \cfoot[\pagemark]{}%
+ \pagestyle{plain}%
+ }%
+}
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -131,6 +155,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfClass{%
@@ -142,6 +167,7 @@
class.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -191,22 +217,25 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrkmisc.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
- \if@tempswa
- \setlength{\overfullrule}{5pt}%
- \else
- \setlength{\overfullrule}{\z@}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \setlength{\overfullrule}{\z@}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: scrklang.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
}
@@ -217,8 +246,23 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsoleteOption{\PackageInfoNoLine{\KOMAClassName}}%
- {#1#2}{fontsize=#1#2}%
+ \ifstr{#1}{10}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{11}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{12}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \KOMA@UseDeprecatedOption{\PackageWarningNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }%
+ }%
+ }
}{\@headlines}%
}{\@headlines}%
}
@@ -253,8 +297,9 @@
}%
\@tempa
}%
+ \FamilyKeyStateProcessed
}
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -324,7 +369,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -365,82 +410,88 @@
{relative}{10},%
{absolute}{11}%
}{#1}%
- \ifcase\number\@tempa% 0
- \endgroup
- \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 1
- \endgroup
- \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 2
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 3
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 4
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 5
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 6
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .3333\linewidth\@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 7
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .3333\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 8
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 9
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 10
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\par@updaterelative
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\number\@tempa% 0
+ \endgroup
+ \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 1
+ \endgroup
+ \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 2
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 3
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 4
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 5
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 6
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .3333\linewidth\@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 7
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .3333\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 8
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 9
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 10
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\par@updaterelative
- }%
- \or%11
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\relax
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\par@updaterelative
+ \fi
+ \let\default@par@update=\par@updaterelative
+ }%
+ \or%11
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\relax
- }%
- \else% sonst
- \endgroup
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\relax
+ \fi
+ \let\default@par@update=\relax
+ }%
+ \else% should never be
+ \endgroup
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnkownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -451,17 +502,30 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newif\if@titlepage
\@titlepagefalse
-\KOMA@ifkey{titlepage}{@titlepage}%
+\newif\if@titlepageiscoverpage
+\KOMA@key{titlepage}[true]{%
+ \ifstr{#1}{firstiscover}{%
+ \@titlepagetrue
+ \@titlepageiscoverpagetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `firstiscover'}%
+ \KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@titlepageiscoverpagefalse
+ \fi
+ }%
+}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
\newif\if@abstrt\@abstrtfalse
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
%% \fi
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -480,17 +544,19 @@
{noendperiod}{2},{noperiodatend}{2},%
{noenddot}{2},{nodotatend}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\@empty
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhooktrue
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\@empty
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhooktrue
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \fi
\fi
\fi
}
@@ -504,6 +570,7 @@
}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@section}{}
@@ -511,8 +578,6 @@
\newcommand*{\size@subsubsection}{}
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
-\newcommand*{\chapterheadstartvskip}{}
-\newcommand*{\chapterheadendvskip}{}
\KOMA@key{headings}{%
\KOMA@set@ncmdkey{headings}{@tempa}{%
{big}{0},%
@@ -520,45 +585,57 @@
{small}{2},%
{optiontotocandhead}{10},{optiontoheadandtoc}{10},%
{optiontotoc}{11},%
- {optiontohead}{12}%
+ {optiontohead}{12},%
+ {standardclasses}{13}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\size@part}{\Huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\size@part}{\huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@section}{\large}%
- \renewcommand*{\size@subsection}{\normalsize}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\size@part}{\LARGE}%
- \renewcommand*{\size@partnumber}{\LARGE}%
- \renewcommand*{\size@section}{\normalsize}%
- \renewcommand*{\size@subsection}{\normalsize}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \or
- \or
- \or
- \or
- \or
- \or
- \or
- \scr@activate@xsection{3}%
- \or
- \scr@activate@xsection{2}%
- \or
- \scr@activate@xsection{1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\size@part}{\huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@section}{\large}%
+ \renewcommand*{\size@subsection}{\normalsize}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\size@part}{\LARGE}%
+ \renewcommand*{\size@partnumber}{\LARGE}%
+ \renewcommand*{\size@section}{\normalsize}%
+ \renewcommand*{\size@subsection}{\normalsize}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \or
+ \or
+ \or
+ \or
+ \or
+ \or
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
+ \or
+ \renewcommand*{\size@part}{\huge}%
+ \renewcommand*{\size@partnumber}{\Large}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \renewcommand*{\sectfont}{\bfseries}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
@@ -568,17 +645,29 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \KOMA@options{headinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{headinclude=#1}{}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \KOMA@options{footinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{footinclude=#1,DIV=current}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\@twosidefalse
@@ -594,6 +683,7 @@
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
+ \FamilyKeyStateProcessed
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -601,6 +691,7 @@
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
}%
}{}%
}%
@@ -639,7 +730,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -709,7 +800,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -727,11 +818,13 @@
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
+ \FamilyKeyStateProcessed
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
@@ -754,7 +847,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -768,28 +861,36 @@
{bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},%
{numberedbib}{7},%
{flat}{8},{left}{8},%
- {graduated}{9},{indent}{9},{indented}{9}%
+ {graduated}{9},{indent}{9},{indented}{9},%
+ {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
}{#1}%
- \ifcase \@tempa\relax
- \KOMA@options{index=notoc}{}%
- \or
- \KOMA@options{index=totoc}{}%
- \or
- \KOMA@options{listof=notoc}{}%
- \or
- \KOMA@options{listof=totoc}{}%
- \or
- \KOMA@options{listof=numbered}{}%
- \or
- \KOMA@options{bibliography=nottotoc}{}%
- \or
- \KOMA@options{bibliography=totoc}{}%
- \or
- \KOMA@options{bibliography=totocnumbered}{}%
- \or
- \@toclefttrue
- \or
- \@tocleftfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \KOMAExecuteOptions{index=notoc}%
+ \or
+ \KOMAExecuteOptions{index=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=notoc}%
+ \or
+ \KOMAExecuteOptions{listof=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=numbered}%
+ \or
+ \KOMAExecuteOptions{bibliography=nottotoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \or
+ \@toclefttrue
+ \or
+ \@tocleftfalse
+ \or
+ \setuptoc{toc}{numberline}%
+ \or
+ \unsettoc{toc}{numberline}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat}
@@ -808,81 +909,99 @@
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
{entryprefix}{6},
+ {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
+ {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\float@@listhead}{%
- \section*
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \or% totoc
- \renewcommand*{\float@@listhead}{%
- \addsec
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% numbered
- \renewcommand*{\float@@listhead}{%
- \section
- }%
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% flat
- \@dynlisttrue
- \or% graduated
- \@dynlistfalse
- \or% leveldown
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \or% entryprefix
- \@dynlisttrue
- \doforeachtocfile[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\float@@listhead}{%
+ \section*
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \or% totoc
+ \renewcommand*{\float@@listhead}{%
+ \addsec
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% numbered
+ \renewcommand*{\float@@listhead}{%
+ \section
+ }%
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% flat
+ \@dynlisttrue
+ \or% graduated
+ \@dynlistfalse
+ \or% leveldown
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \AtAddToTocList[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
+ \or% numberline
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }
+ \or% nonumberline
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: scrkbib.dtx
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -935,43 +1054,72 @@
}
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
- \section*{\refname}%
- \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
-}
+ \ifbib@leveldown
+ \subsection*{\refname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi
+ \else
+ \section*{\refname}%
+ \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \fi
+}%
+\newif\ifbib@leveldown
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
- \let\FamilyElseValues\scr@bibstylelist
\KOMA@set@ncmdkey{bibliography}{@tempa}{%
{notoc}{0},{nottotoc}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
{numbered}{2},{totocnumbered}{2},{tocnumbered}{2},{numberedtotoc}{2},%
- {numberedtoc}{2}%
+ {numberedtoc}{2},%
+ {leveldown}{3},%
+ {standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
- \section*{\refname}%
- \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \ifbib@leveldown
+ \subsection*{\refname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi
+ \else
+ \section*{\refname}%
+ \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \fi
}%
\or% totoc
\renewcommand*\bib@heading{%
- \addsec{\refname}%
- \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \ifbib@leveldown
+ \subsection*{%
+ \addxcontentsline{toc}{subsection}{\refname}%
+ \refname
+ }%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\refname}}\fi
+ \else
+ \addsec{\refname}
+ \@mkboth{\MakeMarkcase{\refname}}{\MakeMarkcase{\refname}}%
+ \fi
}%
\or% numbered
\renewcommand*\bib@heading{%
- \section{\refname}%
- \@mkboth{\MakeMarkcase{\sectionmarkformat \refname}}%
- {\MakeMarkcase{\sectionmarkformat \refname}}%
+ \ifbib@leveldown
+ \subsection{\refname}%
+ \else
+ \section{\refname}%
+ \@mkboth{\MakeMarkcase{\sectionmarkformat \refname}}%
+ {\MakeMarkcase{\sectionmarkformat \refname}}%
+ \fi
}
+ \or% leveldown
+ \bib@leveldowntrue
+ \or% standardlevel
+ \bib@leveldownfalse
\fi
}{%
\csname scr@bibstyle@#1\endcsname
+ \FamilyKeyStateProcessed
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\idx@@heading}{%
\section*
}
@@ -980,26 +1128,63 @@
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\idx@@heading}{%
- \section*
- }%
- \or
- \renewcommand*{\idx@@heading}{%
- \addsec
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\idx@@heading}{%
+ \section*
+ }%
+ \or
+ \renewcommand*{\idx@@heading}{%
+ \addsec
+ }%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: scrklist.dtx
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: scrkcomp.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+\newcommand*\scr@setlength[4]{%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \else
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
@@ -1023,12 +1208,20 @@
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\normalsize{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1040,12 +1233,20 @@
}%
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\small{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
@@ -1057,12 +1258,20 @@
}%
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\footnotesize{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1115,29 +1324,37 @@
{\the\@tempdima}{\the\@tempdimb}%
}%
\normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \fi
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1150,9 +1367,16 @@
\if@tempswa\noexpand\@list@extra\fi
}%
\let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1164,9 +1388,16 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1178,8 +1409,15 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1192,8 +1430,13 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1203,7 +1446,7 @@
\labelwidth=\dimexpr \leftmargin-\labelsep
\topsep \the\topsep
\parsep \z@
- \partopsep \the\parsep
+ \partopsep \the\partopsep
\itemsep \topsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1213,7 +1456,7 @@
\csname @listiv\endcsname
\endgroup
\edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1222,7 +1465,7 @@
\csname @listv\endcsname
\endgroup
\edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1231,15 +1474,36 @@
\csname @listvi\endcsname
\endgroup
\edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@listi
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1265,23 +1529,61 @@
}%
}%
}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
-\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
+\newcommand*{\scr@DeclareOldFontCommand}[3]{%
+ \DeclareRobustCommand #1{\@fontswitch {%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#2}'%
+ }%
+ #2%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#3}'%
+ }%
+ #3%
+ }%
+ }%
+}
+\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\scr@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\scr@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\scr@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\scr@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\scr@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\scr@DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: scrklang.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
\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: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1292,7 +1594,40 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: scrkpar.dtx
+\if@scr@emulatestandardclasses
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f@size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f@size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if@twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
+ \else
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
+ \fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved@a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved@a
+ \fi
+\fi
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1420,7 +1755,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -1453,13 +1788,60 @@
\newcommand{\dedication}[1]{\gdef\@dedication{%
#1%
}}%
-\newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}%
+\newcommand*{\next@tpage}{%
+ \@thanks\global\let\@thanks\@empty
+ \clearpage
+ \csname titlepage@restore\endcsname
+ \thispagestyle{empty}%
+ \let\footnote\thanks
+ \setcounter{footnote}{0}%
+}
+\newcommand*{\next@tdpage}{%
+ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi
+}
\newcommand*\maketitle[1][1]{%
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \else
+ \def\and{%
+ \end{tabular}%
+ \hskip 1em \@plus.17fil%
+ \begin{tabular}[t]{c}%
+ }%
+ \fi
\if@titlepage
\begin{titlepage}
\setcounter{page}{%
#1%
}%
+ \if@titlepageiscoverpage
+ \edef\titlepage@restore{%
+ \noexpand\endgroup
+ \noexpand\global\noexpand\@colht\the\@colht
+ \noexpand\global\noexpand\@colroom\the\@colroom
+ \noexpand\global\vsize\the\vsize
+ \noexpand\global\noexpand\@titlepageiscoverpagefalse
+ \noexpand\let\noexpand\titlepage@restore\noexpand\relax
+ }%
+ \begingroup
+ \topmargin=\dimexpr \coverpagetopmargin-1in\relax
+ \oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \textwidth=\dimexpr
+ \paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
+ \textheight=\dimexpr
+ \paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
+ \headheight=0pt
+ \headsep=0pt
+ \footskip=\baselineskip
+ \@colht=\textheight
+ \@colroom=\textheight
+ \vsize=\textheight
+ \columnwidth=\textwidth
+ \hsize=\columnwidth
+ \linewidth=\hsize
+ \else
+ \let\titlepage@restore\relax
+ \fi
\let\footnotesize\small
\let\footnoterule\relax
\let\footnote\thanks
@@ -1467,53 +1849,69 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoubleemptypage
- \thispagestyle{empty}%
+ \noindent\@extratitle\next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}%
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null\vfill
\begin{center}
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}%
+ {\usekomafont{subject}{\@subject\par}}%
\vskip 3em
\fi
- {\titlefont\huge \@title\par}%
+ {\usekomafont{title}{\huge \@title\par}}%
\vskip 1em
- {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
\vskip 2em
- {\Large \lineskip 0.75em
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip 0.75em
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1.5em
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus3fill
- {\Large \@publishers \par}%
+ {\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks
+ \@thanks\let\@thanks\@empty
\vfill\null
- \if@twoside\next@tpage
- \begin{minipage}[t]{\textwidth}
- \@uppertitleback
- \end{minipage}\par
- \vfill
- \begin{minipage}[b]{\textwidth}
- \@lowertitleback
- \end{minipage}
+ \if@twoside
+ \@tempswatrue
+ \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
+ \else
+ \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
+ \@tempswafalse
+ \fi\fi
+ \fi
+ \if@tempswa
+ \next@tpage
+ \begin{minipage}[t]{\textwidth}
+ \@uppertitleback
+ \end{minipage}\par
+ \vfill
+ \begin{minipage}[b]{\textwidth}
+ \@lowertitleback
+ \end{minipage}\par
+ \@thanks\let\@thanks\@empty
+ \fi
\fi
- \ifx\@dedication\@empty \else
- \next@tpage\null\vfill
- {\centering \Large \@dedication \par}%
+ \ifx\@dedication\@empty
+ \else
+ \next@tdpage\null\vfill
+ {\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoubleemptypage \fi
+ \@thanks\let\@thanks\@empty
+ \cleardoubleemptypage
\fi
+ \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
\end{titlepage}
\else
\par
@@ -1527,92 +1925,115 @@
}%
\fi
\begingroup
+ \let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
+ \@makeextratitle
+ \next@tdpage
\@maketitle
\else
+ \ifx\@extratitle\@empty\else
+ \twocolumn[\@makeextratitle]\next@tdpage
+ \fi
\twocolumn[\@maketitle]%
\fi
\else
- \newpage
- \global\@topnum\z@
+ \@makeextratitle
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
\endgroup
\fi
\setcounter{footnote}{0}%
- \let\thanks\relax
- \let\maketitle\relax
- \let\@maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@author\@empty
- \global\let\@date\@empty
- \global\let\@title\@empty
- \global\let\@subtitle\@empty
- \global\let\@extratitle\@empty
- \global\let\@titlehead\@empty
- \global\let\@subject\@empty
- \global\let\@publishers\@empty
- \global\let\@uppertitleback\@empty
- \global\let\@lowertitleback\@empty
- \global\let\@dedication\@empty
- \global\let\author\relax
- \global\let\title\relax
- \global\let\extratitle\relax
- \global\let\titlehead\relax
- \global\let\subject\relax
- \global\let\publishers\relax
- \global\let\uppertitleback\relax
- \global\let\lowertitleback\relax
- \global\let\dedication\relax
- \global\let\date\relax
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \let\thanks\relax
+ \let\maketitle\relax
+ \let\@maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@date\@empty
+ \global\let\@title\@empty
+ \global\let\@subtitle\@empty
+ \global\let\@extratitle\@empty
+ \global\let\@titlehead\@empty
+ \global\let\@subject\@empty
+ \global\let\@publishers\@empty
+ \global\let\@uppertitleback\@empty
+ \global\let\@lowertitleback\@empty
+ \global\let\@dedication\@empty
+ \global\let\author\relax
+ \global\let\title\relax
+ \global\let\extratitle\relax
+ \global\let\titlehead\relax
+ \global\let\subject\relax
+ \global\let\publishers\relax
+ \global\let\uppertitleback\relax
+ \global\let\lowertitleback\relax
+ \global\let\dedication\relax
+ \global\let\date\relax
+ \fi
\global\let\and\relax
}%
-\newcommand*{\@maketitle}{%
- \clearpage
- \let\footnote\thanks
+\newcommand*{\@makeextratitle}{%
+ \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+ \noindent\@extratitle \next@tdpage
\fi
+}
+\newcommand*{\@maketitle}{%
+ \next@tdpage
+ \global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null
\vskip 2em%
\begin{center}%
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}
+ {\usekomafont{subject}{\@subject \par}}%
\vskip 1.5em
\fi
- {\titlefont\huge \@title \par}%
+ {\usekomafont{title}{\huge \@title \par}}%
\vskip .5em
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
\vskip 1em
- {\Large
- \lineskip .5em%
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip .5em%
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1em%
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus 1em
- {\Large \@publishers \par}
+ {\usekomafont{publishers}{\@publishers \par}}%
\ifx\@dedication\@empty \else
\vskip 2em
- {\Large \@dedication \par}
+ {\usekomafont{dedication}{\@dedication \par}}%
\fi
\end{center}%
\par
\vskip 2em
}%
+\newcommand*{\coverpagetopmargin}{%
+ \dimexpr \topmargin+1in\relax
+}
+\newcommand*{\coverpagebottommargin}{%
+ 2\dimexpr\coverpagetopmargin\relax
+}
+\newcommand*{\coverpageleftmargin}{%
+ \dimexpr \evensidemargin+1in\relax
+}
+\newcommand*{\coverpagerightmargin}{\coverpageleftmargin}
\newenvironment{titlepage}{%
\if@twocolumn
\@restonecoltrue\onecolumn
@@ -1629,6 +2050,11 @@
\newcommand*\titlefont{\sectfont}%
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}%
\newkomafont{subtitle}{\usekomafont{title}\large}%
+\newkomafont{titlehead}{}%
+\newkomafont{author}{\Large}
+\newkomafont{date}{\Large}
+\newkomafont{publishers}{\Large}
+\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
\newenvironment{abstract}{%
@@ -1664,13 +2090,19 @@
\if@twocolumn\else\endquotation\fi
\fi
}
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newcommand*\appendix{\par%
\setcounter{section}{0}%
\setcounter{subsection}{0}%
\gdef\thesection{\@Alph\c@section}%
\csname appendixmore\endcsname
}
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
+}
\newif\if@altsecnumformat\@altsecnumformatfalse
\newif\if@autodot
\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
@@ -1823,6 +2255,36 @@
\fi\fi}
\newcommand*\autodot{\if@altsecnumformat.\fi}
\setcounter{secnumdepth}{3}
+\newcommand*{\partnumdepth}{%
+ \z@
+}
+\newcommand*{\sectionnumdepth}{\@ne}
+\newcommand*{\subsectionnumdepth}{\tw@}
+\newcommand*{\subsubsectionnumdepth}{\thr@@}
+\newcommand*{\paragraphnumdepth}{4}
+\newcommand*{\subparagraphnumdepth}{5}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
+}
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
+}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -1884,26 +2346,26 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >\m@ne
+ \ifnumbered{part}{%
\refstepcounter{part}%
\@maybeautodot\thepart%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{\thepart}{\scr@ds@tocentry}%
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{}{\scr@ds@tocentry}%
\fi
- \fi
+ }%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\interlinepenalty \@M
\normalfont\sectfont\nobreak
- \ifnum \c@secnumdepth >\m@ne
+ \ifnumbered{part}{%
\size@partnumber{\partformat}%
\partheadmidvskip
- \fi
+ }{}%
\size@part{#2}\strut
\ifx\partmark\@gobble
\@mkboth{}{}\par
@@ -1996,15 +2458,9 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \if@twoside
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \else
- \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
- \fi
+ \addsecmark{\scr@ds@head}%
}
-\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newcommand*{\addsectiontocentry}[2]{%
\addtocentrydefault{section}{#1}{#2}%
}
@@ -2017,14 +2473,16 @@
\newcommand*{\addsubparagraphtocentry}[2]{%
\addtocentrydefault{subparagraph}{#1}{#2}%
}
-\newcommand\section{\@startsection{section}{1}{\z@}%
+\newcommand\section{%
+ \@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
-\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\newcommand\subsection{%
+ \@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2032,7 +2490,8 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
-\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\newcommand\subsubsection{%
+ \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2040,12 +2499,14 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
-\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\paragraph{%
+ \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
-\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+\newcommand\subparagraph{%
+ \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
@@ -2063,7 +2524,6 @@
\let\raggedsection\raggedright
\newcommand*{\raggedpart}{}
\let\raggedpart\raggedsection
-\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
\newkomafont{sectionentry}{\usekomafont{disposition}}
@@ -2165,7 +2625,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -2236,7 +2696,37 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: scrkpage.dtx
+\newcommand*{\scr@package@not@recommended}[2]{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
+ }%
+}
+\scr@package@not@recommended{emptypage}{%
+ option\MessageBreak
+ `cleardoublepage' with one of it's\MessageBreak
+ several values}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{fancyhdr}{%
+ \MessageBreak
+ package `scrpage2' or `scrlayer-scrpage'}
+\scr@package@not@recommended{titlesec}{%
+ the package only\MessageBreak
+ if you really need it, because it breaks several\MessageBreak
+ KOMA-Script features, i.e., option `headings' and\MessageBreak
+ the extended optional argument of the section\MessageBreak
+ commands
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2293,12 +2783,12 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ##1}}{}}%
+ {\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat\fi}{}##1}}{}}%
\renewcommand*{\subsectionmark}[1]{%
\if@twoside
- \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\@ne%
- \subsectionmarkformat\fi ##1}}%
+ \markright{%
+ \MakeMarkcase{\ifnumbered{subsection}{\subsectionmarkformat}{}##1}%
+ }%
\fi
}%
}%
@@ -2340,7 +2830,7 @@
\else
\onecolumn
\fi
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -2673,8 +3163,8 @@
\let\scr@tmp@footnotetext=\@footnotetext
\let\@footnotetext=\@gobble
\sbox\@tempboxa{%
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
#3\unskip\strut}}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
@@ -2690,23 +3180,25 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}}%
+ {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
{#3\unskip\strut\par}}}%
\else%
\ifdim\cap@indent<\z@
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
\else%
\if@capbreak
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
\else
- {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ {{\usekomafont{captionlabel}{%
+ #2\captionformat}}}}#3\unskip\strut\par}}}%
\fi
\fi
\fi
@@ -2723,11 +3215,12 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}%
+ {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
#3}}%
}%
- {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
+ {\usesizeofkomafont{caption}{%
+ \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
\fi
\endgroup
}
@@ -2845,14 +3338,14 @@
\newenvironment{figure}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@float{figure}%
+ \@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@dblfloat{figure}%
+ \@dblfloat{figure}%
}{%
\end@dblfloat
}
@@ -2881,7 +3374,7 @@
}{%
\end@dblfloat
}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -3018,15 +3511,17 @@
\endgroup
\@footnotemark
}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\renewcommand*{\numberline}[1]{%
\numberline@box{%
- \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ \numberline@prefix
+ \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
+ \numberline@postfix
}%
}
\newcommand*{\numberline@prefix}{}
\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
@@ -3091,11 +3586,7 @@
\begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup
}
\newcommand{\addtocentrydefault}[3]{%
- \ifstr{#2}{}{%
- \addcontentsline{toc}{#1}{#3}%
- }{%
- \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}%
- }%
+ \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}%
}
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
@@ -3111,21 +3602,34 @@
}
\newcommand*{\scr@float@listhead@warning}{%
\ClassWarning{\KOMAClassName}{%
- Usage of deprecated \string\float@listhead!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@listhead.\MessageBreak
- Definition of \string\float@listhead\space my be removed from\MessageBreak
- `\KOMAClassName' soon, so it should not be used
+ \string\float@listhead\space detected!\MessageBreak
+ Implementation of \string\float@listhead\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Maybe implementation of \string\float@listhead\space will\MessageBreak
+ be removed from KOMA-Script soon.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@listhead\space interface
}%
}
\newcommand*{\scr@float@addtolists@warning}{%
\ClassWarningNoLine{\KOMAClassName}{%
\string\float@addtolists\space detected!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@addtolists.\MessageBreak
- Support for \string\float@addtolists\space may be removed
- from\MessageBreak
- `\KOMAClassName' soon
+ Implementation of \string\float@addtolist\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Since Version 3.12 support for deprecated\MessageBreak
+ \string\float@addtolist\space interface has been\MessageBreak
+ restricted to only some of the KOMA-Script\MessageBreak
+ features and been removed from others.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@addtolist\space interface
}%
\global\let\scr@float@addtolists@warning\relax
}
@@ -3139,7 +3643,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: scrkbib.dtx
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -3224,12 +3728,13 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
\newcommand*{\idx@heading}{%
- \twocolumn[\idx@@heading{\indexname}]%
+ \twocolumn[%
+ \idx@@heading{\indexname}]%
\@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
}
\newenvironment{theindex}{%
@@ -3256,7 +3761,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: scrklist.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -3361,8 +3866,22 @@
\newenvironment{addmargin*}{%
\@tempswafalse
\if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \ClassWarning{\KOMAClassName}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\advance\@listdepth\@ne
\endlist
}
@@ -3393,7 +3912,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 8bb79e32e5a..9755a4c3bc2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -1,19 +1,18 @@
%%
%% This is file `scrbase.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,scrbase')
-%% scrkbase.dtx (with options: `package,option,base')
-%% scrklang.dtx (with options: `package,option,base')
+%% scrkernel-version.dtx (with options: `package,scrbase')
+%% scrkernel-basics.dtx (with options: `package,option,base')
+%% scrkernel-language.dtx (with options: `package,option,base')
%% scrlfile.dtx (with options: `load')
-%% scrkbase.dtx (with options: `package,body,base')
-%% scrklang.dtx (with options: `package,body,base')
+%% scrkernel-basics.dtx (with options: `package,body,base')
+%% scrkernel-language.dtx (with options: `package,body,base')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2002-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,9 +44,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -67,25 +66,28 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- \KOMAScriptVersion\space package
- (KOMA-Script-independent basics and keyval usage)]
+ 2013/12/19 v3.12 KOMA-Script
+ package (%
+ KOMA-Script-independent
+ basics and keyval usage)]
\begingroup
- \def\@tempb{}%
- \def\@tempa{%
- \PackageError{scrbase}{seems you are not running e-TeX\@tempb}{%
+ \def\reserved@b{}%
+ \def\reserved@a#1{%
+ \PackageError{scrbase}{seems you are not running e-TeX#1}{%
Since 2004 the LaTeX team recommends to use e-TeX.\MessageBreak
KOMA-Script since version 2.95 uses several e-TeX features.\MessageBreak
At actual systems `latex' should already use e-TeX.\MessageBreak
At deprecated systems it may be called `elatex'.\MessageBreak
Use either unsupported KOMA-Script up to version 2.9u or\MessageBreak
- ask you administrator for LaTeX using e-TeX\@tempb.\MessageBreak
- Not using e-TeX\@tempb\space is a fatal error!\MessageBreak
+ ask you administrator for LaTeX using e-TeX#1.\MessageBreak
+ Not using e-TeX#1 is a fatal error!\MessageBreak
Processing cannot be continued!}%
\endgroup
\batchmode \errmessage{}\csname @@end\endcsname\end\relax
@@ -93,12 +95,12 @@
}%
\expandafter\ifx\csname eTeXversion\endcsname\relax\else
\ifnum\eTeXversion <2
- \def\@tempb{ V 2}%
+ \def\reserved@b{ V 2}%
\else
- \let\@tempa\endgroup
+ \let\reserved@a\endgroup
\fi
\fi
-\@tempa
+\expandafter\reserved@a\expandafter{\reserved@b}
\RequirePackage{keyval}
\newcommand{\scr@ifundefinedorrelax}[1]{%
\ifcsname #1\endcsname
@@ -111,6 +113,9 @@
\expandafter\@firstoftwo
\fi
}
+\newcommand*\PackageErrorNoLine[2]{%
+ \PackageError{#1}{#2\@gobble}%
+}
\newcommand*{\DefineFamily}[1]{%
\scr@ifundefinedorrelax{#1@key@familylist}{%
\@namedef{#1@key@familylist}{}%
@@ -157,11 +162,59 @@
\fi
}%
}
-\newcommand*{\DefineFamilyKey}[2][.\@currname.\@currext]{%
+\newcommand*{\DefineFamilyKey}[3][.\@currname.\@currext]{%
+ \@ifnextchar[%]
+ {%
+ \edef\reserved@a{#1}%
+ \expandafter\scr@define@family@key
+ \expandafter{\reserved@a}{#2}{#3}%
+ }{%
+ \edef\reserved@a{#1}%
+ \expandafter\scr@define@family@key@nodefault
+ \expandafter{\reserved@a}{#2}{#3}%
+ }%
+}
+\newcommand*{\scr@define@family@key}{}
+\def\scr@define@family@key#1#2#3[#4]#5{%
+ \scr@if@familymember{#1}{#2}{define a key}{%
+ \define@key{#2#1}{#3}[{#4}]{%
+ \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
+ \FamilyKeyStateUnknown
+ #5%
+ \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
+ }%
+ }%
+}
+\newcommand*{\scr@define@family@key@nodefault}[4]{%
\scr@if@familymember{#1}{#2}{define a key}{%
- \define@key{#2#1}%
+ \define@key{#2#1}{#3}{%
+ \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
+ \FamilyKeyStateUnknown
+ #4
+ \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
+ }%
+ \@namedef{KV@#2#1@#3@default}{%
+ \def\FamilyOfKey{#2}\def\FamilyMemberOfKey{#1}%
+ \FamilyKeyStateNeedValue
+ }%
}%
}
+\newcommand*{\FamilyKeyState}{}
+\newcommand*{\FamilyKeyStateUnknown}{%
+ \let\FamilyKeyState\FamilyKeyStateUnknown
+}
+\newcommand*{\FamilyKeyStateUnknownValue}{%
+ \let\FamilyKeyState\FamilyKeyStateUnknownValue
+}
+\newcommand*{\FamilyKeyStateNeedValue}{%
+ \let\FamilyKeyState\FamilyKeyStateNeedValue
+}
+\newcommand*{\FamilyKeyStateProcessed}{%
+ \let\FamilyKeyState\FamilyKeyStateProcessed
+}
+\let\FamilyKeyState\FamilyKeyStateUnknown
+\newcommand*{\FamilyOfKey}{}
+\newcommand*{\FamilyMemberOfKey}{}
\newcommand*{\@globaloptionslist}{}
\let\@globaloptionslist\@classoptionslist
\scr@ifundefinedorrelax{XKV@classoptionslist}{}{%
@@ -169,8 +222,20 @@
\let\@globaloptionslist\XKV@classoptionslist
\fi
}
-\newcommand*{\scr@removeunused}{}
\newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{%
+ \ifx\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions
+ \PackageError{scrbase}{nested \string\FamilyProcessOptions\space
+ detected\MessageBreak}{%
+ \string\FamilyProcessOptions\space has been used while processing or
+ setting options.\MessageBreak
+ This is currently not allowed. You should contact the author of the
+ causing\MessageBreak
+ code.\MessageBreak
+ This error is fatal. You should not continue.%
+ }%
+ \fi
+ \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions
+ \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
\let\ds@\@empty
\edef\@curroptions{\@ptionlist{\@currname.\@currext}}%
\ifx\@currext\@clsextension\else
@@ -181,68 +246,101 @@
\@use@ption
\expandafter\let\csname ds@\CurrentOption\endcsname\@empty
\else
- \expandafter\def\expandafter\scr@removeunused\expandafter{%
- \expandafter\def\expandafter\CurrentOption\expandafter{%
- \CurrentOption}\@use@ption}%
- \scr@optiontest{#2}\CurrentOption{}{%
- \@expandtwoargs\setkeys{#2}%
- \CurrentOption
- \scr@removeunused
- }%
- \scr@optiontest{#2#1}\CurrentOption{}{%
- \@expandtwoargs\setkeys{#2#1}%
- \CurrentOption
- \scr@removeunused
- }%
- \let\scr@removeunused\@empty
+ \scr@ifprocess@curroption{#1}{#2}{%
+ \@expandtwoargs\@removeelement\CurrentOption
+ \@unusedoptionlist\@unusedoptionlist
+ }{}%
\fi
\fi
}%
\fi
\@for\CurrentOption:=\@curroptions\do{%
- \@use@ption
\scr@ifundefinedorrelax{ds@\CurrentOption}{%
- \scr@optiontest{#2}\CurrentOption{%
- \scr@optiontest{#2#1}\CurrentOption{%
- \default@ds
- }{%
- \let\scr@removeunused\relax
- \edef\reserved@a{%
- \noexpand\setkeys{#2#1}{\CurrentOption}%
- \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
- }\reserved@a
- \ifx\scr@removeunused\relax\else\default@ds\fi
- }%
- }{%
- \let\scr@removeunused\relax
- \edef\reserved@a{%
- \noexpand\setkeys{#2}{\CurrentOption}%
- \noexpand\def\noexpand\CurrentOption{\CurrentOption}%
- }\reserved@a
- \if\scr@removeunused\relax\else\default@ds\fi
- \scr@optiontest{#2#1}\CurrentOption{}{%
- \let\scr@removeunused\relax
- \@expandtwoargs\setkeys{#2#1}%
- \CurrentOption
- \ifx\scr@removeunused\relax\else\default@ds\fi
- }%
- }%
- }{%
- }%
+ \@use@ption
+ \scr@ifprocess@curroption{#1}{#2}{}\default@ds
+ }\@use@ption
}%
\@for\CurrentOption:=\@declaredoptions\do{%
\expandafter\let\csname ds@\CurrentOption\endcsname\relax}%
\let\CurrentOption\@empty
\let\@fileswith@pti@ns\@@fileswith@pti@ns
\AtEndOfPackage{\let\@unprocessedoptions\relax}%
+ \let\AtEndOfFamilyOptions\@firstofone
+ \@nameuse{scr@after@options@#1@hook}%
}
\@onlypreamble\FamilyProcessOptions
-\newcommand*{\scr@optiontest}[2]{%
- \edef\reserved@a{\noexpand\scr@pti@ntest{#1}#2=\noexpand\@nil}%
- \reserved@a
+\newcommand*{\scr@AtEndOfFamilyOptions}{%
+ \expandafter
+ \l@addto@macro\csname scr@after@options@\FamilyOfKey @hook\endcsname
+}
+\newcommand*{\AtEndOfFamilyOptions}{}
+\let\AtEndOfFamilyOptions\@firstofone
+\newcommand*\scr@ifprocess@curroption[2]{%
+ \def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}%
+ \expandafter\reserved@a\CurrentOption=\@nil
+ \scr@ifundefinedorrelax{KV@#2@\reserved@a}{%
+ \scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{%
+ \let\FamilyKeyState\OptionNotUsed
+ }{%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{\CurrentOption}%
+ \noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
+ \reserved@b
+ \ifx\FamilyKeyState\FamilyKeyStateUnknown
+ \PackageInfo{scrbase}{Unknown processing state.\MessageBreak
+ Processing option `\CurrentOption'\MessageBreak
+ of member `#1' of family\MessageBreak
+ `#2' doesn't set\MessageBreak
+ a valid state. This will be interpreted\MessageBreak
+ as \string\FamilyKeyStateProcessed
+ }%
+ \FamilyKeyStateProcessed
+ \fi
+ }{%
+ \let\FamilyKeyState\OptionNotUsed
+ }%
+ }{%
+ \proteced@edef\reserved@b{\noexpand\setkeys{#2}{\CurrentOption}%
+ \noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
+ \reserved@b
+ \ifx\FamilyKeyState\FamilyKeyStateUnknown
+ \PackageInfo{scrbase}{Unknown processing state.\MessageBreak
+ Processing option `\CurrentOption'\MessageBreak
+ of family `#2'\MessageBreak
+ doesn't set a valid state.\MessageBreak
+ This will be interpreted\MessageBreak
+ as \string\FamilyKeyStateProcessed
+ }%
+ \FamilyKeyStateProcessed
+ \fi
+ \def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}%
+ \expandafter\reserved@a\CurrentOption=\@nil
+ \scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{}{%
+ \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{\CurrentOption}%
+ \noexpand\def\noexpand\CurrentOption{\CurrentOption}}%
+ \ifx\FamilyKeyState\FamiliyKeyStateProcessed
+ \reserved@b
+ \FamilyKeyStateProcessed
+ \else
+ \reserved@b
+ \ifx\FamilyKeyState\FamilyKeyStateUnknown
+ \PackageInfo{scrbase}{Unknown processing state.\MessageBreak
+ Processing option `\CurrentOption'\MessageBreak
+ of member `#1' of family\MessageBreak
+ `#2' doesn't set\MessageBreak
+ a valid state. This will be interpreted\MessageBreak
+ as \string\FamilyKeyStateProcessed
+ }%
+ \FamilyKeyStateProcessed
+ \fi
+ \fi
+ }%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
}
-\newcommand*{\scr@pti@ntest}{}
-\def\scr@pti@ntest#1#2=#3\@nil{\scr@ifundefinedorrelax{KV@#1@#2}}
\newcommand*{\dont@let@as@internal@defined}{/}
\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse
\DefineFamily{KOMA}
@@ -259,12 +357,12 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: scrklang.dtx
-%%% From File: scrlfile.dtx
-\def\scrlfileversion{2012/06/15 v3.12}
-\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
-\@tempa
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
+\RequirePackage{scrlfile}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -293,12 +391,12 @@
\else
\@ifundefined{#1}{%
\begingroup
- \expandafter\def\expandafter\@tempa
+ \expandafter\def\expandafter\reserved@a
\expandafter{\csname scr@#1\endcsname}
- \expandafter\def\expandafter\@tempb
+ \expandafter\def\expandafter\reserved@b
\expandafter{\csname #1\endcsname}
\expandafter\expandafter\expandafter\endgroup
- \expandafter\expandafter\expandafter\let\expandafter\@tempb\@tempa
+ \expandafter\expandafter\expandafter\let\expandafter\reserved@b\reserved@a
\if@atdocument\else
\g@addto@macro\document{%
\expandafter\ifx\csname #1\expandafter\endcsname
@@ -341,21 +439,252 @@
\fi
}
\newcommand\ifstr[2]{%
- \begingroup\protected@edef\@tempa{#1}\protected@edef\@tempb{#2}%
- \ifx\@tempa\@tempb
+ \begingroup\protected@edef\reserved@a{#1}\protected@edef\reserved@b{#2}%
+ \ifx\reserved@a\reserved@b
\endgroup\expandafter\@firstoftwo
\else
\endgroup\expandafter\@secondoftwo
\fi
}
+\newcommand*{\ifstrstart}[2]{%
+ \begingroup
+ \edef\reserved@a{\noexpand\@ifstrstart{#1}{#2}}%
+ \reserved@a{\aftergroup\@firstoftwo}{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\@ifstrstart}[2]{%
+ \def\reserved@a ##1#2##2\@nil{%
+ \if\relax\detokenize{##1}\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
+ \reserved@a#1#2\@nil
+}
+\newcommand*{\ifisdimen}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
+ \expandafter\def\expandafter\reserved@b\expandafter{\string\dimen}%
+ \ifstrstart{\reserved@a}{\reserved@b}{%
+ \afterassignment\scr@ifrelax@to@nnil
+ \@tempdima=#1\relax\@nnil{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\scr@ifrelax@to@nnil}{}
+\def\scr@ifrelax@to@nnil#1\@nnil{%
+ \begingroup
+ \def\reserved@a{#1}\def\reserved@b{\relax}%
+ \ifx\reserved@a\reserved@b
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup
+}
+\newcommand*{\ifisdimexpr}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
+ \expandafter\def\expandafter\reserved@b\expandafter{\string\dimexpr}%
+ \ifstrstart{\reserved@a}{\reserved@b}{%
+ \afterassignment\scr@ifemptyorrelax@to@nnil
+ \@tempdima=#1\relax\@nnil{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\scr@ifemptyorrelax@to@nnil}{}
+\def\scr@ifemptyorrelax@to@nnil#1\@nnil{%
+ \begingroup
+ \def\reserved@a{#1}\def\reserved@b{\relax}%
+ \ifx\reserved@a\reserved@b
+ \aftergroup\@firstoftwo
+ \else
+ \ifx\reserved@a\@empty
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \fi
+ \endgroup
+}
+\newcommand*{\ifisskip}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
+ \expandafter\def\expandafter\reserved@b\expandafter{\string\skip}%
+ \ifstrstart{\reserved@a}{\reserved@b}{%
+ \afterassignment\scr@ifrelax@to@nnil
+ \@tempskipa=#1\relax\@nnil{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\ifisglueexpr}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
+ \expandafter\def\expandafter\reserved@b\expandafter{\string\glueexpr}%
+ \ifstrstart{\reserved@a}{\reserved@b}{%
+ \afterassignment\scr@ifemptyorrelax@to@nnil
+ \@tempskipa=#1\relax\@nnil{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\ifiscount}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
+ \expandafter\def\expandafter\reserved@b\expandafter{\string\count}%
+ \ifstrstart{\reserved@a}{\reserved@b}{%
+ \afterassignment\scr@ifrelax@to@nnil
+ \@tempcnta=#1\relax\@nnil{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\ifisnumexpr}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter{\expandafter\meaning\reserved@a}%
+ \expandafter\def\expandafter\reserved@b\expandafter{\string\numexpr}%
+ \ifstrstart{\reserved@a}{\reserved@b}{%
+ \afterassignment\scr@ifemptyorrelax@to@nnil
+ \@tempcnta=#1\relax\@nnil{%
+ \aftergroup\@firstoftwo
+ }{%
+ \aftergroup\@secondoftwo
+ }%
+ }{\aftergroup\@secondoftwo}%
+ \endgroup
+}
+\newcommand*{\ifiscounter}[1]{%
+ \begingroup
+ \@ifundefined{c@#1}%
+ {\aftergroup\@secondoftwo}%
+ {\aftergroup\@firstoftwo}%
+ \endgroup
+}
+\newcommand*{\ifisinteger}[1]{%
+ \begingroup
+ \edef\reserved@a{#1}\expandafter
+ \scr@ifintegerplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
+ {\aftergroup\@secondoftwo}
+ \endgroup
+}
+\newcommand*{\scr@ifintegerplusminus}{}
+\def\scr@ifintegerplusminus#1#2\@nil{%
+ \def\scr@next{\scr@ifintegerplusminus #2\@nil}%
+ \if #1-\relax
+ \else \if #1+\relax
+ \else
+ \def\scr@next{%
+ \afterassignment\scr@ifrelax@to@nnil
+ \@tempcnta=#1#2\relax\@nnil
+ }%
+ \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else
+ \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else
+ \let\scr@next\@secondoftwo
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi
+ \fi
+ \scr@next
+}
+\newcommand*{\ifisdimension}[1]{%
+ \begingroup
+ \edef\reserved@a{#1\relax}\expandafter
+ \scr@ifdimensionplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
+ {\aftergroup\@secondoftwo}
+ \endgroup
+}
+\newcommand*{\scr@ifdimensionplusminus}{}
+\def\scr@ifdimensionplusminus#1#2\@nil{%
+ \def\scr@next{\scr@ifdimensionplusminus #2\@nil}%
+ \if #1-\relax
+ \else \if #1+\relax
+ \else
+ \def\scr@next{%
+ \afterassignment\scr@ifrelax@to@nnil
+ \@tempdima=#1#2\@nnil
+ }%
+ \if #1,\else\if #1.\else
+ \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else
+ \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else
+ \let\scr@next\@secondoftwo
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi
+ \fi
+ \fi
+ \scr@next
+}
+\newcommand*{\ifisglue}[1]{%
+ \begingroup
+ \edef\reserved@a{#1\relax}\expandafter
+ \scr@ifglueplusminus\reserved@a\@nil{\aftergroup\@firstoftwo}%
+ {\aftergroup\@secondoftwo}
+ \endgroup
+}
+\newcommand*{\scr@ifglueplusminus}{}
+\def\scr@ifglueplusminus#1#2\@nil{%
+ \def\scr@next{\scr@ifglueplusminus #2\@nil}%
+ \if #1-\relax
+ \else \if #1+\relax
+ \else
+ \def\scr@next{%
+ \afterassignment\scr@ifrelax@to@nnil
+ \@tempskipa=#1#2\@nnil
+ }%
+ \if #1,\else\if #1.\else
+ \if #10\else\if #11\else\if #12\else\if #13\else\if #14\else
+ \if #15\else\if #16\else\if #17\else\if #18\else\if #19\else
+ \let\scr@next\@secondoftwo
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi
+ \fi
+ \fi
+ \scr@next
+}
\newcommand\ifnumber[1]{%
\begingroup\@tempswafalse\let\scr@next\test@number
- \expandafter\scr@next#1\scr@next
- \if@tempswa
- \endgroup\expandafter\@firstoftwo
- \else
- \endgroup\expandafter\@secondoftwo
- \fi
+ \expandafter\scr@next#1\scr@next
+ \if@tempswa
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup
}
\newcommand*{\test@number}[1]{%
\ifx \scr@next#1
@@ -374,6 +703,30 @@
}
\newcommand*{\gobble@till@scr@next}{}
\def\gobble@till@scr@next#1\scr@next{}
+\newcommand\ifintnumber[1]{%
+ \begingroup\@tempswafalse\let\scr@next\scr@test@sign
+ \expandafter\scr@next#1\scr@next
+ \if@tempswa
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup
+}
+\newcommand*{\scr@test@sign}[1]{%
+ \ifx \scr@next#1
+ \let\scr@next\relax
+ \else
+ \if #1-%
+ \else
+ \ifx #1+%
+ \else
+ \def\scr@next{\let\scr@next\test@number\scr@next #1}%
+ \fi
+ \fi
+ \fi
+ \scr@next
+}
\newcommand{\ifdimen}[1]{%
\begingroup\@tempswatrue\let\scr@next\test@posdimen
\expandafter\test@dimen#1\scr@next
@@ -409,8 +762,8 @@
}
\newcommand*{\test@trueunt}{}
\def\test@trueunt#1true#2true#3\test@trueunt{%
- \edef\@tempa{#1}
- \ifx\@tempa\@empty\test@@ifdimunt{#2}\else\test@@ifdimunt{#1}\fi
+ \edef\reserved@a{#1}%
+ \ifx\reserved@a\@empty\test@@ifdimunt{#2}\else\test@@ifdimunt{#1}\fi
}
\newcommand*\test@@ifdimunt[1]{%
\@tempswafalse
@@ -516,77 +869,198 @@
\ClassInfo{#1}{#2\@gobble}%
}
\newcommand*{\FamilyExecuteOptions}[3][.\@currname.\@currext]{%
- \def\reserved@a##1\@nil{%
- \@for\scr@key@atlist:=#3\do{%
- \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
- \scr@ifundefinedorrelax{KV@#2@\scr@key@name}{}{%
- \protected@edef\reserved@a{\noexpand\setkeys{#2}{\scr@key@atlist}%
- \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}%
- \noexpand\def\noexpand\scr@key@name{\scr@key@name}%
- }%
- \reserved@a
- }%
- \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{}{%
- \protected@edef\reserved@a{%
- \noexpand\setkeys{#2#1}{\scr@key@atlist}%
- \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}%
- \noexpand\def\noexpand\scr@key@name{\scr@key@name}%
+ \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
+ \@for\scr@key@atlist:=#3\do{%
+ \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
+ \ifx\scr@key@name\@empty\else
+ \ifx\scr@key@name\space\else
+ \scr@ifundefinedorrelax{KV@#2@\scr@key@name}{%
+ \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{%
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ Member `#1' of family `#2'\MessageBreak
+ cannot handle option `\scr@key@name'.\MessageBreak
+ So it cannot be set%
+ \ifx\scr@key@value\@empty\else
+ \space to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.%
+ }%
+ }{%
+ \scr@execute@option{#2#1}%
+ }%
+ }{%
+ \scr@execute@option{#2}%
+ \ifstr{#1}{}{}{%
+ \scr@ifundefinedorrelax{KV@#2#1\scr@key@name}{}{%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \scr@execute@option{#2#1}%
+ \FamilyKeyStateProcessed
+ \else
+ \scr@execute@option{#2#1}%
+ \fi
+ }%
+ }%
}%
- \reserved@a
- }%
- \let\CurrentOption\scr@key@atlist
- \csname ds@\CurrentOption\endcsname
- }%
- \edef\CurrentOption{##1}%
+ \scr@show@key@state@error
+ \fi
+ \fi
}%
- \expandafter\reserved@a\CurrentOption\@nil
+ \@nameuse{scr@after@options@#1@hook}%
}
-\@onlypreamble\FamilyExecuteOptions
-\newcommand*{\FamilyOptions}[2]{%
- \Family@Options{#1}{#2}{%
+\newcommand*{\scr@show@key@state@error}{%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed\else
\PackageError{scrbase}{%
- option `\scr@key@name' unknown at family `#1'%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
}{%
- You have used \string\FamilyOptions{#1} to set
- `\scr@key@atlist',\MessageBreak
- but family `#1' does not know any option named
- `\scr@key@name'.\MessageBreak
- See the manual for the package or class using family `#1' for
- more\MessageBreak
- informations about options and their values.%
+ Option
+ `\expandafter\detokenize\expandafter{\scr@key@name}'\MessageBreak
+ \ifx\FamilyMemberOfKey\@empty\else
+ of member `\FamilyMemberOfKey'\MessageBreak
+ \fi
+ \ifx\FamilyOfKey\@empty\else
+ of family `\FamilyOfKey'\MessageBreak
+ \fi
+ \ifx\FamilyKeyState\FamilyKeyStateNeedValue
+ expects a value, but has been used without any value.%
+ \else
+ cannot handle value\MessageBreak
+ `\expandafter\detokenize\expandafter{\scr@key@value}',%
+ \MessageBreak
+ \ifx\FamilyKeyState\FamilyKeyStateUnknownValue
+ because this is an unsupported value.%
+ \else
+ because \FamilyKeyState.
+ \fi
+ \fi
}%
- }%
+ \fi
}
-\newcommand*{\Family@Options}[3]{%
+\newcommand*{\FamilyOptions}[2]{%
+ \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}%
\@for\scr@key@atlist:=#2\do{%
\ifx\scr@key@atlist\@empty\else
\ifx\scr@key@atlist\space\else
\expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
+ \let\scr@key@run@errors\@empty
\scr@key@found@false
- \edef\@tempa{\csname #1@key@familylist\endcsname}%
- \@for\@tempa:=\@tempa\do{%
- \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{%
+ \edef\reserved@a{\csname #1@key@familylist\endcsname}%
+ \@for\reserved@a:=\reserved@a\do{%
+ \scr@ifundefinedorrelax{KV@\reserved@a @\scr@key@name}{}{%
+ \expandafter\scr@execute@option\expandafter{\reserved@a}%
\scr@key@found@true
- \protected@edef\reserved@a{%
- \noexpand\setkeys{\@tempa}{%
- \unexpanded\expandafter{\scr@key@atlist}}%
- \noexpand\def\noexpand\@tempa{%
- \unexpanded\expandafter{\@tempa}}%
- \noexpand\def\noexpand\scr@key@atlist{%
- \unexpanded\expandafter{\scr@key@atlist}}%
- \noexpand\def\noexpand\scr@key@name{%
- \unexpanded\expandafter{\scr@key@name}}%
- \noexpand\def\noexpand\scr@key@value{%
- \unexpanded\expandafter{\scr@key@value}}%
- }%
- \reserved@a
+ \ifx\scr@key@run@errors\relax\else
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \let\scr@key@run@errors\relax
+ \else
+ \ifx\FamilyKeyState\FamilyKeyStateUnknownValue
+ \edef\scr@key@run@errors{%
+ \unexpanded\expandafter{\scr@key@run@errors}%
+ \noexpand\MessageBreak
+ \FamilyMemberOfKey: unkown value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'.%
+ }%
+ \else
+ \ifx\FamilyKeyState\FamilyKeyStateNeedValue
+ \edef\scr@key@run@errors{%
+ \unexpanded\expandafter{\scr@key@run@errors}%
+ \noexpand\MessageBreak
+ \FamilyMemberOfKey: value expected.
+ }%
+ \else
+ \edef\scr@key@run@errors{%
+ \unexpanded\expandafter{\scr@key@run@errors}%
+ \noexpand\MessageBreak
+ \FamilyMemberOfKey: \FamilyKeyState.
+ }%
+ \fi
+ \fi
+ \fi
+ \fi
}%
}%
- \ifscr@key@found@\else#3\fi
+ \ifscr@key@found@
+ \ifx\scr@key@run@errors\relax\else
+ \ifx\scr@key@run@errors\@empty\else
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ The members of family `#1' cannot set option
+ `\scr@key@name'
+ \ifx\scr@key@value\@empty\else
+ \MessageBreak
+ to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.\MessageBreak
+ Here's what each member says:
+ \scr@key@run@errors
+ }%
+ \fi
+ \fi
+ \else
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ No one of the members of family `#1'\MessageBreak
+ can handle option `\scr@key@name'.\MessageBreak
+ So it cannot be set%
+ \ifx\scr@key@value\@empty\else
+ \space to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.%
+ }%
+ \fi
\fi
\fi
}%
+ \@nameuse{scr@after@options@#1@hook}%
+}
+\newcommand*{\scr@execute@option}[1]{%
+ \protected@edef\reserved@a{%
+ \noexpand\let\noexpand\KV@err\noexpand\scr@KV@err
+ \noexpand\setkeys{#1}{%
+ \unexpanded\expandafter{\scr@key@atlist}}%
+ \noexpand\def\noexpand\scr@key@atlist{%
+ \unexpanded\expandafter{\scr@key@atlist}}%
+ \noexpand\def\noexpand\scr@key@name{%
+ \unexpanded\expandafter{\scr@key@name}}%
+ \noexpand\def\noexpand\scr@key@value{%
+ \unexpanded\expandafter{\scr@key@value}}
+ \ifx\scr@key@run@errors\relax
+ \noexpand\let\noexpand\scr@key@run@errors\relax
+ \else
+ \noexpand\def\noexpand\scr@key@run@errors{%
+ \unexpanded\expandafter{\scr@key@run@errors}}%
+ \fi
+ \noexpand\def\expandafter\noexpand
+ \csname scr@after@options@#1@hook\endcsname{%
+ \expandafter\unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@after@options@#1@hook\endcsname
+ }}%
+ }%
+ \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions
+ \reserved@a
+ \let\AtEndOfFamilyOptions\@firstofone
+ \ifx\FamilyKeyState\FamilyKeyStateUnknown
+ \PackageInfo{scrbase}{Unknown processing state.\MessageBreak
+ Processing option `\scr@key@atlist'\MessageBreak
+ \ifx\FamilyMemberOfKey\@empty\else
+ of member `\FamilyMemberOfKey'\MessageBreak
+ \fi
+ of family `\FamilyOfKey'\MessageBreak
+ doesn't set a valid state.\MessageBreak
+ This will be interpreted\MessageBreak
+ as \string\FamilyKeyStateProcessed
+ }%
+ \FamilyKeyStateProcessed
+ \fi
}
+\newcommand*{\scr@key@run@errors}{}
\newif\ifscr@key@found@
\newcommand*{\scr@key@atlist}{}
\newcommand*{\scr@key@name}{}
@@ -597,88 +1071,56 @@
\KV@@sp@def\scr@key@value{#2}%
}
\newcommand*{\FamilyOption}[3]{%
- \Family@Option{#1}{#2}{#3}{%
- \PackageError{scrbase}{%
- unknown option `\scr@key@name' for familie `#1'%
- }{%
- You have used \string\FamilyOption{#1} to set
- `\scr@key@name',\MessageBreak
- but family '#1' does not know any option named
- `\scr@key@name'.\MessageBreak
- See the the manual of the class or package, that provides
- family\MessageBreak
- `#1' for more informations about options and their values.%
- }%
- }%
-}
-\newcommand*{\Family@Option}[4]{%
\expandafter\KV@@sp@def\expandafter\scr@key@name\expandafter{#2}%
- \scr@key@found@false
- \edef\@tempa{\csname #1@key@familylist\endcsname}%
- \@for\@tempa:=\@tempa\do{%
- \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{%
- \scr@key@found@true
- \let\@tempb\@tempa
- }%
- }%
- \ifscr@key@found@
- \let\reserved@a\@empty
- \@for\@tempa:=#3\do{%
- \expandafter\KV@@sp@def\expandafter\@tempa\expandafter{\@tempa}%
- \ifx\@tempa\@empty\else
- \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}%
+ \let\reserved@a\@empty
+ \@for\reserved@b:=#3\do{%
+ \ifx\reserved@b\@empty\else
+ \ifx\reserved@b\space\else
+ \edef\reserved@a{\unexpanded\expandafter{\reserved@a},%
+ \scr@key@name=\unexpanded\expandafter{\reserved@b}}%
\fi
- }%
- \ifx\reserved@a\@empty
- \protected@edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}%
- \else
- \protected@edef\reserved@a{%
- \noexpand\setkeys{\@tempb}{\expandafter\@gobble\reserved@a}}%
\fi
- \reserved@a
- \else
- #4
- \fi
-}
-\scr@ifundefinedorrelax{unexpanded}{%
- \newcommand*{\g@addto@macro@temp}{}%
- \newcommand{\l@addto@macro}[2]{%
- \begingroup%
- \toks@\expandafter{#1#2}%
- \xdef\g@addto@macro@temp{\the\toks@}%
- \endgroup
- \let#1\g@addto@macro@temp
- }%
-}{%
- \newcommand{\l@addto@macro}[2]{%
- \edef#1{\unexpanded\expandafter{#1#2}}%
}%
+ \def\reserved@b{\FamilyOptions{#1}}%
+ \expandafter\reserved@b\expandafter{\reserved@a}%
}
-\newcommand*{\FamilyUnknownKeyValue}[4]{%
- \ifx\scr@removeunused\@empty
- \PackageError{%
- scrbase%
- }{%
- option `#2' of family `#1' has no value `#3'%
- }{%
- You've tried to set option `#2' of family '#1' to value `#3'.\MessageBreak
- But allowed values are only:\MessageBreak
- #4\FamilyElseValues.\MessageBreak
- See the manual of the class or package, that provides family
- `#1'\MessageBreak
- for more information about options and their values.%
+\@ifundefined{l@addto@macro}{}{%
+ \begingroup
+ \long\def\reserved@a#1#2{%
+ \edef#1{\unexpanded\expandafter{#1#2}}%
}%
- \else
- \global\let\scr@removeunused\@empty
- \PackageInfo{%
- scrbase%
- }{%
- option `#2' of family `#1' has no value `#3'.\MessageBreak
- Allowed values for option `#2' of family `#1'\MessageBreak
- would be:\MessageBreak
- #4\FamilyElseValues.\MessageBreak
- Maybe another class or package provides this option.\MessageBreak
- Global option ignored
+ \ifx\reserved@a\l@addto@macro\else
+ \PackageWarning{scrbase}{%
+ Someone also uses macro name \string\l@addto@macro.\MessageBreak
+ When KOMA-Script author decided to use macro name\MessageBreak
+ \string\l@addto@macro\space first, there was no other
+ free\MessageBreak
+ LaTeX package using this macro name.\MessageBreak
+ In the meantime other package authers decided to use\MessageBreak
+ same macro name, but unfortunatly not all of those\MessageBreak
+ are compatible with KOMA-Script's definition, e.g.,\MessageBreak
+ while adding definitions with arguments to macros.\MessageBreak
+ Because of such potentially incompatible definitions,\MessageBreak
+ KOMA-Script will redefine the command now.\MessageBreak
+ Please ask the author of the other package to\MessageBreak
+ rename his macro, if a problem results in the\MessageBreak
+ redefinition%
+ }%
+ \fi
+ \endgroup
+}
+\long\def\l@addto@macro#1#2{%
+ \edef#1{\unexpanded\expandafter{#1#2}}%
+}%
+\newcommand*{\FamilyUnknownKeyValue}[4]{%
+ \FamilyKeyStateUnknownValue
+ \ifx\FamilyElseValues\@empty\else
+ \PackageWarning{scrbase}{non empty \string\FamilyElseValue
+ ignored.\MessageBreak
+ Setting this command to a non empty\MessageBreak
+ value for option `#2' of\MessageBreak
+ family `#1' is deprecated,\MessageBreak
+ but has been found
}%
\fi
}
@@ -690,12 +1132,12 @@
\DefineFamilyKey[{#1}]{#2}{#3}[true]{\FamilySetBool{#2}{#3}{#4}{##1}}%
}
\newcommand*{\FamilySetBool}[4]{%
- \ifstr{#4}{true}{\@nameuse{#3true}}{%
- \ifstr{#4}{on}{\@nameuse{#3true}}{%
- \ifstr{#4}{yes}{\@nameuse{#3true}}{%
- \ifstr{#4}{false}{\@nameuse{#3false}}{%
- \ifstr{#4}{off}{\@nameuse{#3false}}{%
- \ifstr{#4}{no}{\@nameuse{#3false}}{%
+ \ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
\FamilyUnknownKeyValue{#1}{#2}{#4}{%
`true', `on', `yes', `false', `off', `no'%
}%
@@ -707,6 +1149,101 @@
}%
\let\FamilyElseValues\@empty
}
+\newcommand*{\FamilyCounterKey}[4][.\@currname.\@currext]{%
+ \@ifundefined{c@#4}{\newcounter{#4}}{}%
+ \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounter{#2}{#3}{#4}{##1}}%
+}
+\newcommand*{\FamilySetCounter}[4]{%
+ \ifiscount{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
+ \ifisdimen{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
+ \ifisskip{#4}{\value{#3}=#4\FamilyKeyState\Processed}{%
+ \ifisnumexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
+ \ifisdimexpr{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
+ \ifisinteger{#4}{\value{#3}=#4\FamilyKeyStateProcessed}{%
+ \ifiscounter{#4}{\value{#3}=\value{#4}\FamilyKeyStateProcessed}{%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ integer numbers, counters, lengths, skips, dimens
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\FamilyCounterMacroKey}[4][.\@currname.\@currext]{%
+ \ifdefined#4\else\let#4\z@\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounterMacro{#2}{#3}{#4}{##1}}%
+}
+\newcommand*{\FamilySetCounterMacro}[4]{%
+ \begingroup
+ \ifiscount{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
+ \ifisdimen{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
+ \ifisskip{#4}{\@tempcnta=#4\FamilyKeyState\Processed}{%
+ \ifisnumexpr{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
+ \ifisdimexpr{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
+ \ifisinteger{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{%
+ \ifiscounter{#4}{%
+ \@tempcnta=\value{#4}\FamilyKeyStateProcessed}{%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ integer numbers, counters, lengths, skips, dimens
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\def\expandafter#3\expandafter{\the\@tempcnta}%
+}
+\newcommand*{\FamilyLengthKey}[4][.\@currname.\@currext]{%
+ \ifdefined#4\else\newlength{#4}\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLength{#2}{#3}{#4}{##1}}%
+}
+\newcommand*{\FamilySetLength}[4]{%
+ \ifiscount{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \ifisdimen{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{%
+ \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ length values, counters, lengths, skips, dimens
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+\newcommand*{\FamilyLengthMacroKey}[4][.\@currname.\@currext]{%
+ \ifdefined#4\else\let#4\z@\fi
+ \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLengthMacro{#2}{#3}{#4}{##1}}%
+}
+\newcommand*{\FamilySetLengthMacro}[4]{%
+ \begingroup
+ \ifiscount{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
+ \ifisdimen{#4}{\@temskipa=#4\FamilyKeyStateProcessed}{%
+ \ifisskip{#4}{\@tempkipa=#4\FamilyKeyState\Processed}{%
+ \ifisnumexpr{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
+ \ifisdimexpr{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
+ \ifisglue{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ length values, counters, lengths, skips, dimens
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\def\expandafter#3\expandafter{\the\@tempskipa}%
+}
\newcommand*{\FamilyNumericalKey}[3][.\@currname.\@currext]{%
\@ifnextchar [%]
{\Family@Numerical@Key{#1}{#2}{#3}}{\Family@Numerical@Key{#1}{#2}{#3}[]}%
@@ -724,30 +1261,31 @@
\newcommand*{\FamilySetNumerical}[5]{%
\begingroup
\edef\@searched{#5}%
- \let\@tempa=\@empty
- \let\@tempb=\@empty
+ \let\reserved@a=\@empty
+ \let\reserved@b=\@empty
\@tempswafalse
\@for\@valuelist:=#4\do{%
\if@tempswa\else
- \edef\@tempc{\expandafter\@firstoftwo\@valuelist}%
- \edef\@tempa{\@tempa\@tempb`\@tempc'}%
- \edef\@tempb{, }%
- \ifx\@tempc\@searched
+ \edef\reserved@c{\expandafter\@firstoftwo\@valuelist}%
+ \edef\reserved@a{\reserved@a\reserved@b`\reserved@c'}%
+ \edef\reserved@b{, }%
+ \ifx\reserved@c\@searched
\@tempswatrue
- \edef\@tempa{\expandafter\@secondoftwo\@valuelist}%
+ \edef\reserved@a{\expandafter\@secondoftwo\@valuelist}%
\fi
\fi
}%
\if@tempswa
- \edef\@tempa{\endgroup
- \noexpand\@namedef{#3}{\@tempa}%
+ \edef\reserved@a{\endgroup
+ \noexpand\@namedef{#3}{\reserved@a}%
+ \noexpand\FamilyKeyStateProcessed
}%
\else
- \edef\@tempa{\endgroup
- \noexpand\FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}%
+ \edef\reserved@a{\endgroup
+ \noexpand\FamilyUnknownKeyValue{#1}{#2}{#5}{\reserved@a}%
}%
\fi
- \@tempa
+ \reserved@a
\let\FamilyElseValues\@empty
}
\newcommand*{\FamilyStringKey}[3][.\@currname.\@currext]{%
@@ -759,129 +1297,389 @@
\DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\def#5{##1}}%
}
\newcommand{\Family@String@Key}[4]{%
- \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}}%
-}
-%%% From File: scrklang.dtx
-\newcommand*{\providecaptionname}[3]{%
- \@ifundefined{captions#1}{%
- \@ifundefined{cap@info@#1@done}{%
- \PackageInfo{scrbase}{%
- No captions found for `#1'\MessageBreak
- --> skipped%
+ \DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
+}
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+\newcommand*{\defcaptionname}{%
+ \@ifstar\scr@def@scaptionname\scr@def@captionname
+}
+\newcommand*{\scr@def@scaptionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at \string\defcaptionname}%
+ \else
+ \expandafter\ifx\csname extras\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname extras\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
+ \fi
}%
- \expandafter\let\csname cap@info@#1@done\endcsname\@empty
- }{}%
- }{%
+ \reserved@b
+ }%
+}
+\newcommand*{\scr@def@activateactivelanguageaftergroup}[2]{%
+ \@onelevel@sanitize\languagename
+ \@tempswafalse
+ \ifx\languagename\scr@reserved@a
+ \@tempswatrue
+ \else
+ \ifcsname l@\scr@reserved@a\endcsname
+ \expandafter\ifnum\csname l@\scr@reserved@a\endcsname=\language
+ \@tempswatrue
+ \fi
+ \fi
+ \fi
+ \if@tempswa
+ \def\reserved@b{\endgroup
+ \PackageInfo{scrbase}{activating \languagename\space \string#1}%
+ \def#1{#2}%
+ }%
+ \fi
+}
+\newcommand\scr@trim@spaces[1]{%
+ \expandafter\KV@@sp@def\expandafter#1\expandafter{#1}%
+}
+\newcommand*{\scr@def@captionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
\begingroup
- \let\@tempa\endgroup
- \def\@tempb{\relax\undefined\relax}%
- \let #2\@tempb\relax
- \csname captions#1\endcsname
- \ifx #2\@tempb\relax
- \edef\@tempb{#1}%
- \@onelevel@sanitize\@tempb
- \@onelevel@sanitize\languagename
- \ifx\@tempb\languagename
- \def\@tempa{\endgroup%
- \expandafter\g@addto@macro\csname captions#1\endcsname{%
- \def#2{#3}}%
- \csname captions#1\endcsname
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at \string\defcaptionname}%
+ \else
+ \@tempswafalse
+ \begingroup
+ \@tempswafalse
+ \ifcsname extras\scr@reserved@a\endcsname
+ \let#2\relax
+ \csname extras\scr@reserved@a\endcsname
+ \ifx #2\relax \else \aftergroup\@tempswatrue \fi
+ \fi
+ \endgroup
+ \if@tempswa
+ \expandafter\g@addto@macro\csname extras\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \else
+ \expandafter\ifx\csname captions\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname captions\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \fi
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
+ \fi
+ }%
+ \reserved@b
+ }%
+}
+\newcommand*{\providecaptionname}{%
+ \@ifstar\scr@provide@scaptionname\scr@provide@captionname
+}
+\newcommand*{\scr@provide@scaptionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at
+ \string\providecaptionname}%
+ \else
+ \begingroup
+ \let#2\relax
+ \csname extras\scr@reserved@a\endcsname
+ \csname captions\scr@reserved@a\endcsname
+ \ifx #2\relax \aftergroup\@firstofone
+ \else
+ \aftergroup\@gobble
+ \fi
+ \endgroup
+ {%
+ \expandafter\ifx\csname extras\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\@gobbletwo
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname extras\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
}%
+ \fi
+ }%
+ \reserved@b
+ }%
+}
+\newcommand*{\scr@provide@captionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at
+ \string\providecaptionname}%
\else
- \def\@tempa{\endgroup%
- \expandafter\g@addto@macro\csname captions#1\endcsname{%
- \def#2{#3}}%
+ \begingroup
+ \let#2\relax
+ \csname captions\scr@reserved@a\endcsname
+ \csname extras\scr@reserved@a\endcsname
+ \ifx #2\relax \aftergroup\@firstofone
+ \else
+ \aftergroup\@gobble
+ \fi
+ \endgroup
+ {%
+ \expandafter\ifx\csname captions\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\@gobbletwo
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname captions\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
}%
\fi
- \else
- \PackageInfo{scrbase}{%
- `\string#2' at language `#1' already
- defined\MessageBreak
- --> skipped%
- }%
- \fi
- \@tempa
+ }%
+ \reserved@b
}%
}
-\newcommand*{\newcaptionname}[3]{%
- \@ifundefined{captions#1}{%
- \PackageInfo{scrbase}{%
- No captions found for `#1' --> defining%
- }%
- \@namedef{captions#1}{}%
- }{}%
- \begingroup
- \def\@tempb{\relax\undefined\relax}%
- \let #2\@tempb\relax
- \csname captions#1\endcsname
- \ifx #2\@tempb\relax\else
- \PackageError{scrbase}{%
- `\string#2' at language `#1' already defined%
- }{%
- You've told me to define `\string#2' at language
- `#1',\MessageBreak
- but it is already defined.\MessageBreak
- It will be redefined, if you'll continue.%
+\newcommand*{\newcaptionname}{%
+ \@ifstar\scr@new@scaptionname\scr@new@captionname
+}
+\newcommand*{\scr@new@scaptionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at \string\newcaptionname}%
+ \else
+ \begingroup
+ \let#2\relax
+ \csname captions\scr@reserved@a\endcsname
+ \csname extras\scr@reserved@a\endcsname
+ \ifx #2\relax
+ \else
+ \PackageError{scrbase}{%
+ `\string#2' already defined\MessageBreak
+ for language `\scr@reserved@a'%
+ }{%
+ You've told me to define `\string#2' for language
+ `\scr@reserved@a',\MessageBreak
+ but is has already been defined.\MessageBreak
+ Nevertheless, if you'll continue it will be redefined.%
+ }%
+ \fi
+ \endgroup
+ \expandafter\ifx\csname extras\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname extras\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
+ \fi
}%
- \fi
- \endgroup
- \expandafter\g@addto@macro\csname captions#1\endcsname{%
- \def#2{#3}%
+ \reserved@b
}%
- \begingroup
- \edef\@tempb{#1}%
- \@onelevel@sanitize\@tempb
- \@onelevel@sanitize\languagename
- \ifx\@tempb\languagename
- \def\@tempa{\endgroup\csname captions#1\endcsname}%
- \else
- \let\@tempa\endgroup
- \fi
- \@tempa
}
-\newcommand*{\renewcaptionname}[3]{%
- \@ifundefined{captions#1}{%
- \PackageError{scrbase}{%
- No captions found for `#1'%
- }{%
- You've told me to redefine the caption `\string#2' at language
- `#1',\MessageBreak
- but `\expandafter\string\csname captions#1\endcsname' is not
- defined.\MessageBreak
- If you'll continue it will be defined.%
- }
- \@namedef{captions#1}{}%
- }{}%
- \begingroup
- \def\@tempb{\relax\undefined\relax}%
- \let #2\@tempb\relax
- \csname captions#1\endcsname
- \ifx #2\@tempb\relax
- \PackageError{scrbase}{%
- `\string#2' not defined at language `#1'%
- }{%
- You've told me to redefine `\string#2' at language
- `#1',\MessageBreak
- but it is not defined.\MessageBreak
- If you'll continue it will be defined.%
+\newcommand*{\scr@new@captionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at \string\newcaptionname}%
+ \else
+ \begingroup
+ \let#2\relax
+ \csname captions\scr@reserved@a\endcsname
+ \csname extras\scr@reserved@a\endcsname
+ \ifx #2\relax
+ \else
+ \PackageError{scrbase}{%
+ `\string#2' already defined\MessageBreak
+ for language `\scr@reserved@a'%
+ }{%
+ You've told me to define `\string#2' for language
+ `\scr@reserved@a',\MessageBreak
+ but is has already been defined.\MessageBreak
+ Nevertheless, if you'll continue it will be redefined.%
+ }%
+ \fi
+ \endgroup
+ \expandafter\ifx\csname captions\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname captions\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
+ \fi
}%
- \fi
- \endgroup
- \expandafter\g@addto@macro\csname captions#1\endcsname{%
- \def#2{#3}%
+ \reserved@b
+ }%
+}
+\newcommand*{\renewcaptionname}{%
+ \@ifstar\scr@renew@scaptionname\scr@renew@captionname
+}
+\newcommand*{\scr@renew@scaptionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at \string\renewcaptionname}%
+ \else
+ \begingroup
+ \let#2\relax
+ \csname captions\scr@reserved@a\endcsname
+ \csname extras\scr@reserved@a\endcsname
+ \ifx #2\relax
+ \PackageError{scrbase}{%
+ `\string#2' not defined at language `\scr@reserved@a'%
+ }{%
+ You've told me to redefine `\string#2' at language
+ `\scr@reserved@a',\MessageBreak
+ but is hasn't been defined before.\MessageBreak
+ Nevertheless, if you'll continue I'll define it at
+ `\expandafter\string\csname extras\scr@reserved@a\endcsname'%
+ }%
+ \fi
+ \endgroup
+ \expandafter\ifx\csname extras\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname extras\scr@reserved@a\endcsname{%
+ \def#2{#3}%
+ }%
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
+ \fi
+ }%
+ \reserved@b
+ }%
+}
+\newcommand*{\scr@renew@captionname}[3]{%
+ \if@atdocument \expandafter\@firstofone
+ \else \expandafter\AtBeginDocument
+ \fi
+ {%
+ \begingroup
+ \let\reserved@b\endgroup
+ \edef\scr@reserved@a{#1}%
+ \@onelevel@sanitize\scr@reserved@a
+ \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=%
+ \scr@reserved@a \do{%
+ \scr@trim@spaces\scr@reserved@a
+ \ifx\scr@reserved@a\@empty
+ \PackageWarning{scrbase}{empty language at \string\renewcaptionname}%
+ \else
+ \begingroup
+ \let#2\relax
+ \csname extras\scr@reserved@a\endcsname
+ \ifx #2\relax
+ \csname captions\scr@reserved@a\endcsname
+ \ifx #2\relax
+ \PackageError{scrbase}{%
+ `\string#2' not defined at language `\scr@reserved@a'%
+ }{%
+ You've told me to redefine `\string#2' at language
+ `\scr@reserved@a',\MessageBreak
+ but it hasn't been defined before.\MessageBreak
+ Nevertheless, if you'll continue I'll define it at
+ `\expandafter\string
+ \csname captions\scr@reserved@a\endcsname'%
+ }%
+ \fi
+ \expandafter\ifx\csname captions\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname captions\scr@reserved@a\endcsname{\def#2{#3}}%
+ \else
+ \expandafter\ifx\csname extras\scr@reserved@a\endcsname\relax
+ \expandafter\expandafter\expandafter\gdef
+ \else
+ \expandafter\expandafter\expandafter\g@addto@macro
+ \fi
+ \csname extras\scr@reserved@a\endcsname{\def#2{#3}}%
+ \fi
+ \endgroup
+ \scr@def@activateactivelanguageaftergroup{#2}{#3}%
+ \fi
+ }%
+ \reserved@b
}%
- \begingroup
- \edef\@tempb{#1}%
- \@onelevel@sanitize\@tempb
- \@onelevel@sanitize\languagename
- \ifx\@tempb\languagename
- \def\@tempa{\endgroup\csname captions#1\endcsname}%
- \else
- \let\@tempa\endgroup
- \fi
- \@tempa
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index c15df2e0466..010e693f9c2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -1,47 +1,46 @@
%%
%% This is file `scrbook.cls',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `class,book')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-version.dtx (with options: `class,book')
+%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load,chapter')
-%% scrkcomp.dtx (with options: `class,book,option')
-%% scrkmisc.dtx (with options: `class,book,option')
-%% scrklang.dtx (with options: `class,book,option')
-%% scrkfont.dtx (with options: `class,book,option')
-%% scrktare.dtx (with options: `class,book,option')
-%% scrkpar.dtx (with options: `class,book,option')
-%% scrktitl.dtx (with options: `class,book,option')
-%% scrksect.dtx (with options: `class,book,option')
-%% scrkpage.dtx (with options: `class,book,option')
-%% scrkfloa.dtx (with options: `class,book,option')
-%% scrkftn.dtx (with options: `class,book,option')
-%% scrkliof.dtx (with options: `class,book,option')
-%% scrkbib.dtx (with options: `class,book,option')
-%% scrkidx.dtx (with options: `class,book,option')
-%% scrklist.dtx (with options: `class,book,option')
-%% scrkmisc.dtx (with options: `class,book,execoption')
-%% scrkcomp.dtx (with options: `class,book,body')
-%% scrkfont.dtx (with options: `class,book,body')
-%% scrklang.dtx (with options: `class,book,body')
-%% scrktare.dtx (with options: `class,book,body')
-%% scrkpar.dtx (with options: `class,book,body')
-%% scrktitl.dtx (with options: `class,book,body')
-%% scrksect.dtx (with options: `class,book,body')
-%% scrkmisc.dtx (with options: `class,book,body')
-%% scrkpage.dtx (with options: `class,book,body')
-%% scrkfloa.dtx (with options: `class,book,body')
-%% scrkftn.dtx (with options: `class,book,body')
-%% scrkliof.dtx (with options: `class,book,body')
-%% scrkbib.dtx (with options: `class,book,body')
-%% scrkidx.dtx (with options: `class,book,body')
-%% scrklist.dtx (with options: `class,book,body')
+%% scrkernel-compatibility.dtx (with options: `class,book,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,book,option')
+%% scrkernel-language.dtx (with options: `class,book,option')
+%% scrkernel-fonts.dtx (with options: `class,book,option')
+%% scrkernel-typearea.dtx (with options: `class,book,option')
+%% scrkernel-paragraphs.dtx (with options: `class,book,option')
+%% scrkernel-title.dtx (with options: `class,book,option')
+%% scrkernel-sections.dtx (with options: `class,book,option')
+%% scrkernel-pagestyles.dtx (with options: `class,book,option')
+%% scrkernel-floats.dtx (with options: `class,book,option')
+%% scrkernel-footnotes.dtx (with options: `class,book,option')
+%% scrkernel-listsof.dtx (with options: `class,book,option')
+%% scrkernel-bibliography.dtx (with options: `class,book,option')
+%% scrkernel-index.dtx (with options: `class,book,option')
+%% scrkernel-listsandtabulars.dtx (with options: `class,book,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,book,execoption')
+%% scrkernel-compatibility.dtx (with options: `class,book,body')
+%% scrkernel-fonts.dtx (with options: `class,book,body')
+%% scrkernel-language.dtx (with options: `class,book,body')
+%% scrkernel-typearea.dtx (with options: `class,book,body')
+%% scrkernel-paragraphs.dtx (with options: `class,book,body')
+%% scrkernel-title.dtx (with options: `class,book,body')
+%% scrkernel-sections.dtx (with options: `class,book,body')
+%% scrkernel-miscellaneous.dtx (with options: `class,book,body')
+%% scrkernel-pagestyles.dtx (with options: `class,book,body')
+%% scrkernel-floats.dtx (with options: `class,book,body')
+%% scrkernel-footnotes.dtx (with options: `class,book,body')
+%% scrkernel-listsof.dtx (with options: `class,book,body')
+%% scrkernel-bibliography.dtx (with options: `class,book,body')
+%% scrkernel-index.dtx (with options: `class,book,body')
+%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -73,9 +72,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -95,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -104,20 +103,45 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- \KOMAScriptVersion\space document class (\ClassName)%
+ 2013/12/19 v3.12 KOMA-Script
+ document class (\ClassName)%
]
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: tocbasic.dtx
-\def\tocbasicversion{2012/04/04 v3.10b}
-\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
-\@tempa
+%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+\RequirePackage{tocbasic}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+\newif\if@scr@emulatestandardclasses
+\let\scr@emulatestandardclassestrue\relax
+\let\scr@emulatestandardclassesfalse\relax
+\DeclareOption{emulatestandardclasses}{%
+ \let\if@scr@emulatestandardclasses\iftrue
+ \KOMAExecuteOptions{%
+ fontsize=10pt,%
+ headings=standardclasses,%
+ cleardoublepage=current
+ }%
+ \newcommand*{\defaultpapersize}{letter}%
+ \AtEndOfClass{%
+ \setkomafont{descriptionlabel}{\bfseries}%
+ \setkomafont{dictum}{\normalfont\small}%
+ \setkomafont{caption}{}%
+ \setkomafont{captionlabel}{}%
+ \setcapindent{0pt}%
+ \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}%
+ \PreventPackageFromLoading{scrpage2}%
+ \setkomafont{pagenumber}{\normalfont}%
+ \setkomafont{pageheadfoot}{\normalfont}%
+ \cfoot[\pagemark]{}%
+ }%
+}
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -133,6 +157,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfClass{%
@@ -144,6 +169,7 @@
class.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -193,22 +219,25 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrkmisc.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
- \if@tempswa
- \setlength{\overfullrule}{5pt}%
- \else
- \setlength{\overfullrule}{\z@}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \setlength{\overfullrule}{\z@}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: scrklang.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
}
@@ -219,8 +248,23 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsoleteOption{\PackageInfoNoLine{\KOMAClassName}}%
- {#1#2}{fontsize=#1#2}%
+ \ifstr{#1}{10}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{11}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{12}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \KOMA@UseDeprecatedOption{\PackageWarningNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }%
+ }%
+ }
}{\@headlines}%
}{\@headlines}%
}
@@ -255,8 +299,9 @@
}%
\@tempa
}%
+ \FamilyKeyStateProcessed
}
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -326,7 +371,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -367,82 +412,88 @@
{relative}{10},%
{absolute}{11}%
}{#1}%
- \ifcase\number\@tempa% 0
- \endgroup
- \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 1
- \endgroup
- \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 2
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 3
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 4
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 5
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 6
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .3333\linewidth\@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 7
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .3333\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 8
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 9
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 10
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\par@updaterelative
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\number\@tempa% 0
+ \endgroup
+ \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 1
+ \endgroup
+ \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 2
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 3
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 4
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 5
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 6
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .3333\linewidth\@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 7
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .3333\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 8
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 9
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 10
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\par@updaterelative
- }%
- \or%11
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\relax
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\par@updaterelative
+ \fi
+ \let\default@par@update=\par@updaterelative
+ }%
+ \or%11
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\relax
- }%
- \else% sonst
- \endgroup
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\relax
+ \fi
+ \let\default@par@update=\relax
+ }%
+ \else% should never be
+ \endgroup
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnkownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -453,13 +504,26 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newif\if@titlepage
\@titlepagetrue
-\KOMA@ifkey{titlepage}{@titlepage}%
+\newif\if@titlepageiscoverpage
+\KOMA@key{titlepage}[true]{%
+ \ifstr{#1}{firstiscover}{%
+ \@titlepagetrue
+ \@titlepageiscoverpagetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `firstiscover'}%
+ \KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@titlepageiscoverpagefalse
+ \fi
+ }%
+}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newif\if@openright
\@openrighttrue
\KOMA@key{open}{%
@@ -468,15 +532,17 @@
{right}{1},%
{left}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \@openrightfalse
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
- \or
- \@openrighttrue
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
- \or
- \@openrighttrue
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \@openrightfalse
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
+ \or
+ \@openrighttrue
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
+ \or
+ \@openrighttrue
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption{openright}{open=right}
@@ -499,17 +565,19 @@
{noendperiod}{2},{noperiodatend}{2},%
{noenddot}{2},{nodotatend}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\@empty
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhooktrue
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\@empty
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhooktrue
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \fi
\fi
\fi
}
@@ -528,13 +596,16 @@
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
- \if@tempswa
- \def\appendixmore{\@chapterprefixtrue}%
- \else
- \def\appendixmore{\@chapterprefixfalse}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \def\appendixmore{\@chapterprefixtrue}%
+ \else
+ \def\appendixmore{\@chapterprefixfalse}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
@@ -564,76 +635,100 @@
{appendixwithoutprefixline}{9},%
{optiontotocandhead}{10},{optiontoheadandtoc}{10},%
{optiontotoc}{11},%
- {optiontohead}{12}%
+ {optiontohead}{12},%
+ {standardclasses}{13}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2.3\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.725\baselineskip
- \@plus .115\baselineskip \@minus .192\baselineskip}%
- }%
- \renewcommand*{\size@part}{\Huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@chapter}{\huge}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.5\baselineskip
- \@plus .1\baselineskip \@minus .167\baselineskip}%
- }%
- \renewcommand*{\size@part}{\huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@chapter}{\LARGE}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{1.8\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.35\baselineskip
- \@plus 0.09\baselineskip \@minus .15\baselineskip}%
- }%
- \renewcommand*{\size@part}{\LARGE}%
- \renewcommand*{\size@partnumber}{\LARGE}%
- \renewcommand*{\size@chapter}{\Large}%
- \renewcommand*{\size@section}{\large}%
- \renewcommand*{\size@subsection}{\normalsize}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \KOMA@options{open=any}{}%
- \or
- \KOMA@options{open=right}{}%
- \or
- \KOMA@options{open=left}{}%
- \or
- \KOMA@options{chapterprefix=true}{}%
- \or
- \KOMA@options{chapterprefix=false}{}%
- \or
- \KOMA@options{appendixprefix=true}{}%
- \or
- \KOMA@options{appendixprefix=false}{}%
- \or
- \scr@activate@xsection{3}%
- \or
- \scr@activate@xsection{2}%
- \or
- \scr@activate@xsection{1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{2.3\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.725\baselineskip
+ \@plus .115\baselineskip \@minus .192\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\huge}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{2\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.5\baselineskip
+ \@plus .1\baselineskip \@minus .167\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\LARGE}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{1.8\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.35\baselineskip
+ \@plus 0.09\baselineskip \@minus .15\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\LARGE}%
+ \renewcommand*{\size@partnumber}{\LARGE}%
+ \renewcommand*{\size@chapter}{\Large}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\large}%
+ \renewcommand*{\size@subsection}{\normalsize}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \KOMAoptions{open=any}%
+ \or
+ \KOMAoptions{open=right}%
+ \or
+ \KOMAoptions{open=left}%
+ \or
+ \KOMAoptions{chapterprefix=true}%
+ \or
+ \KOMAoptions{chapterprefix=false}%
+ \or
+ \KOMAoptions{appendixprefix=true}%
+ \or
+ \KOMAoptions{appendixprefix=false}%
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{50\p@}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{40\p@}%
+ }%
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\Huge}%
+ \renewcommand*{\size@chapterprefix}{\huge}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \renewcommand*{\sectfont}{\bfseries}%
+ \KOMAoptions{open=right,chapterprefix=true}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
@@ -643,17 +738,29 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \KOMA@options{headinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{headinclude=#1}{}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \KOMA@options{footinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{footinclude=#1,DIV=current}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\@twosidetrue
@@ -669,6 +776,7 @@
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
+ \FamilyKeyStateProcessed
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -676,6 +784,7 @@
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
}%
}{}%
}%
@@ -714,7 +823,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -784,7 +893,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -802,11 +911,13 @@
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
+ \FamilyKeyStateProcessed
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
@@ -829,7 +940,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -843,28 +954,36 @@
{bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},%
{numberedbib}{7},%
{flat}{8},{left}{8},%
- {graduated}{9},{indent}{9},{indented}{9}%
+ {graduated}{9},{indent}{9},{indented}{9},%
+ {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
}{#1}%
- \ifcase \@tempa\relax
- \KOMA@options{index=notoc}{}%
- \or
- \KOMA@options{index=totoc}{}%
- \or
- \KOMA@options{listof=notoc}{}%
- \or
- \KOMA@options{listof=totoc}{}%
- \or
- \KOMA@options{listof=numbered}{}%
- \or
- \KOMA@options{bibliography=nottotoc}{}%
- \or
- \KOMA@options{bibliography=totoc}{}%
- \or
- \KOMA@options{bibliography=totocnumbered}{}%
- \or
- \@toclefttrue
- \or
- \@tocleftfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \KOMAExecuteOptions{index=notoc}%
+ \or
+ \KOMAExecuteOptions{index=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=notoc}%
+ \or
+ \KOMAExecuteOptions{listof=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=numbered}%
+ \or
+ \KOMAExecuteOptions{bibliography=nottotoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \or
+ \@toclefttrue
+ \or
+ \@tocleftfalse
+ \or
+ \setuptoc{toc}{numberline}%
+ \or
+ \unsettoc{toc}{numberline}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat}
@@ -883,86 +1002,104 @@
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
{entryprefix}{6},
- {chapterentry}{7},{withchapterentry}{7},%
- {nochaptergap}{8},{ignorechapter}{8},%
- {chaptergapsmall}{9},{smallchaptergap}{9},%
- {chaptergapline}{10},{onelinechaptergap}{10}%
+ {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
+ {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
+ {chapterentry}{9},{withchapterentry}{9},%
+ {nochaptergap}{10},{ignorechapter}{10},%
+ {chaptergapsmall}{11},{smallchaptergap}{11},%
+ {chaptergapline}{12},{onelinechaptergap}{12}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\float@@listhead}{%
- \chapter*
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \or% totoc
- \renewcommand*{\float@@listhead}{%
- \addchap
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% numbered
- \renewcommand*{\float@@listhead}{%
- \chapter
- }%
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% flat
- \@dynlisttrue
- \or% graduated
- \@dynlistfalse
- \or% leveldown
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \or% entryprefix
- \@dynlisttrue
- \doforeachtocfile[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\float@@listhead}{%
+ \chapter*
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \or% totoc
+ \renewcommand*{\float@@listhead}{%
+ \addchap
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% numbered
+ \renewcommand*{\float@@listhead}{%
+ \chapter
+ }%
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% flat
+ \@dynlisttrue
+ \or% graduated
+ \@dynlistfalse
+ \or% leveldown
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \AtAddToTocList[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \or% chapterentry
- \KOMA@options{chapteratlists=entry}{}%
- \or% chaptergap
- \KOMA@options{chapteratlists=\z@}{}%
- \or% chaptergapsmall
- \KOMA@options{chapteratlists=10\p@}{}%
- \or% chaptergapline
- \KOMA@options{chapteratlists=\baselineskip}{}%
+ \or% numberline
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }
+ \or% nonumberline
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }
+ \or% chapterentry
+ \KOMAExecuteOptions{chapteratlists=entry}%
+ \or% chaptergap
+ \KOMAExecuteOptions{chapteratlists=\z@}%
+ \or% chaptergapsmall
+ \KOMAExecuteOptions{chapteratlists=10\p@}%
+ \or% chaptergapline
+ \KOMAExecuteOptions{chapteratlists=\baselineskip}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
@@ -978,7 +1115,8 @@
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
}%
}
-%%% From File: scrkbib.dtx
+\BeforeTOCHead{\@chaptertolistsfalse}
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1031,43 +1169,76 @@
}
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
-}
+ \ifbib@leveldown
+ \section*{\bibname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \else
+ \chapter*{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
+}%
+\newif\ifbib@leveldown
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
- \let\FamilyElseValues\scr@bibstylelist
\KOMA@set@ncmdkey{bibliography}{@tempa}{%
{notoc}{0},{nottotoc}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
{numbered}{2},{totocnumbered}{2},{tocnumbered}{2},{numberedtotoc}{2},%
- {numberedtoc}{2}%
+ {numberedtoc}{2},%
+ {leveldown}{3},%
+ {standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \ifbib@leveldown
+ \section*{\bibname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \else
+ \chapter*{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
}%
\or% totoc
\renewcommand*\bib@heading{%
- \addchap{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \ifbib@leveldown
+ \addsec{\bibname}
+ \else
+ \if@chaptertolists
+ \@chaptertolistsfalse\addchap{\bibname}\@chaptertoliststrue
+ \else
+ \addchap{\bibname}
+ \fi
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
}%
\or% numbered
\renewcommand*\bib@heading{%
- \chapter{\bibname}%
- \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
- {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \ifbib@leveldown
+ \section{\bibname}%
+ \else
+ \if@chaptertolists
+ \@chaptertolistsfalse\chapter{\bibname}\@chaptertoliststrue
+ \else
+ \chapter{\bibname}
+ \fi
+ \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
+ {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \fi
}
+ \or% leveldown
+ \bib@leveldowntrue
+ \or% standardlevel
+ \bib@leveldownfalse
\fi
}{%
\csname scr@bibstyle@#1\endcsname
+ \FamilyKeyStateProcessed
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\idx@@heading}{%
\chapter*
}
@@ -1076,26 +1247,63 @@
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\idx@@heading}{%
- \chapter*
- }%
- \or
- \renewcommand*{\idx@@heading}{%
- \addchap
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\idx@@heading}{%
+ \chapter*
+ }%
+ \or
+ \renewcommand*{\idx@@heading}{%
+ \addchap
+ }%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: scrklist.dtx
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: scrkcomp.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+\newcommand*\scr@setlength[4]{%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \else
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
@@ -1119,12 +1327,20 @@
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\normalsize{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1136,12 +1352,20 @@
}%
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\small{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
@@ -1153,12 +1377,20 @@
}%
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\footnotesize{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1211,29 +1443,37 @@
{\the\@tempdima}{\the\@tempdimb}%
}%
\normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \fi
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1246,9 +1486,16 @@
\if@tempswa\noexpand\@list@extra\fi
}%
\let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1260,9 +1507,16 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1274,8 +1528,15 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1288,8 +1549,13 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1299,7 +1565,7 @@
\labelwidth=\dimexpr \leftmargin-\labelsep
\topsep \the\topsep
\parsep \z@
- \partopsep \the\parsep
+ \partopsep \the\partopsep
\itemsep \topsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1309,7 +1575,7 @@
\csname @listiv\endcsname
\endgroup
\edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1318,7 +1584,7 @@
\csname @listv\endcsname
\endgroup
\edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1327,15 +1593,36 @@
\csname @listvi\endcsname
\endgroup
\edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@listi
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1366,23 +1653,61 @@
}%
}%
}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
-\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
+\newcommand*{\scr@DeclareOldFontCommand}[3]{%
+ \DeclareRobustCommand #1{\@fontswitch {%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#2}'%
+ }%
+ #2%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#3}'%
+ }%
+ #3%
+ }%
+ }%
+}
+\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\scr@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\scr@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\scr@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\scr@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\scr@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\scr@DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: scrklang.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
\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: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1393,7 +1718,40 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: scrkpar.dtx
+\if@scr@emulatestandardclasses
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f@size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f@size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if@twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
+ \else
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
+ \fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved@a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved@a
+ \fi
+\fi
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1521,7 +1879,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -1554,13 +1912,60 @@
\newcommand{\dedication}[1]{\gdef\@dedication{%
#1%
}}%
-\newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}%
+\newcommand*{\next@tpage}{%
+ \@thanks\global\let\@thanks\@empty
+ \clearpage
+ \csname titlepage@restore\endcsname
+ \thispagestyle{empty}%
+ \let\footnote\thanks
+ \setcounter{footnote}{0}%
+}
+\newcommand*{\next@tdpage}{%
+ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi
+}
\newcommand*\maketitle[1][1]{%
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \else
+ \def\and{%
+ \end{tabular}%
+ \hskip 1em \@plus.17fil%
+ \begin{tabular}[t]{c}%
+ }%
+ \fi
\if@titlepage
\begin{titlepage}
\setcounter{page}{%
#1%
}%
+ \if@titlepageiscoverpage
+ \edef\titlepage@restore{%
+ \noexpand\endgroup
+ \noexpand\global\noexpand\@colht\the\@colht
+ \noexpand\global\noexpand\@colroom\the\@colroom
+ \noexpand\global\vsize\the\vsize
+ \noexpand\global\noexpand\@titlepageiscoverpagefalse
+ \noexpand\let\noexpand\titlepage@restore\noexpand\relax
+ }%
+ \begingroup
+ \topmargin=\dimexpr \coverpagetopmargin-1in\relax
+ \oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \textwidth=\dimexpr
+ \paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
+ \textheight=\dimexpr
+ \paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
+ \headheight=0pt
+ \headsep=0pt
+ \footskip=\baselineskip
+ \@colht=\textheight
+ \@colroom=\textheight
+ \vsize=\textheight
+ \columnwidth=\textwidth
+ \hsize=\columnwidth
+ \linewidth=\hsize
+ \else
+ \let\titlepage@restore\relax
+ \fi
\let\footnotesize\small
\let\footnoterule\relax
\let\footnote\thanks
@@ -1568,53 +1973,69 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoubleemptypage
- \thispagestyle{empty}%
+ \noindent\@extratitle\next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}%
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null\vfill
\begin{center}
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}%
+ {\usekomafont{subject}{\@subject\par}}%
\vskip 3em
\fi
- {\titlefont\huge \@title\par}%
+ {\usekomafont{title}{\huge \@title\par}}%
\vskip 1em
- {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
\vskip 2em
- {\Large \lineskip 0.75em
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip 0.75em
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1.5em
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus3fill
- {\Large \@publishers \par}%
+ {\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks
+ \@thanks\let\@thanks\@empty
\vfill\null
- \if@twoside\next@tpage
- \begin{minipage}[t]{\textwidth}
- \@uppertitleback
- \end{minipage}\par
- \vfill
- \begin{minipage}[b]{\textwidth}
- \@lowertitleback
- \end{minipage}
+ \if@twoside
+ \@tempswatrue
+ \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
+ \else
+ \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
+ \@tempswafalse
+ \fi\fi
+ \fi
+ \if@tempswa
+ \next@tpage
+ \begin{minipage}[t]{\textwidth}
+ \@uppertitleback
+ \end{minipage}\par
+ \vfill
+ \begin{minipage}[b]{\textwidth}
+ \@lowertitleback
+ \end{minipage}\par
+ \@thanks\let\@thanks\@empty
+ \fi
\fi
- \ifx\@dedication\@empty \else
- \next@tpage\null\vfill
- {\centering \Large \@dedication \par}%
+ \ifx\@dedication\@empty
+ \else
+ \next@tdpage\null\vfill
+ {\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoubleemptypage \fi
+ \@thanks\let\@thanks\@empty
+ \cleardoubleemptypage
\fi
+ \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
\end{titlepage}
\else
\par
@@ -1628,92 +2049,115 @@
}%
\fi
\begingroup
+ \let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
+ \@makeextratitle
+ \next@tdpage
\@maketitle
\else
+ \ifx\@extratitle\@empty\else
+ \twocolumn[\@makeextratitle]\next@tdpage
+ \fi
\twocolumn[\@maketitle]%
\fi
\else
- \newpage
- \global\@topnum\z@
+ \@makeextratitle
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
\endgroup
\fi
\setcounter{footnote}{0}%
- \let\thanks\relax
- \let\maketitle\relax
- \let\@maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@author\@empty
- \global\let\@date\@empty
- \global\let\@title\@empty
- \global\let\@subtitle\@empty
- \global\let\@extratitle\@empty
- \global\let\@titlehead\@empty
- \global\let\@subject\@empty
- \global\let\@publishers\@empty
- \global\let\@uppertitleback\@empty
- \global\let\@lowertitleback\@empty
- \global\let\@dedication\@empty
- \global\let\author\relax
- \global\let\title\relax
- \global\let\extratitle\relax
- \global\let\titlehead\relax
- \global\let\subject\relax
- \global\let\publishers\relax
- \global\let\uppertitleback\relax
- \global\let\lowertitleback\relax
- \global\let\dedication\relax
- \global\let\date\relax
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \let\thanks\relax
+ \let\maketitle\relax
+ \let\@maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@date\@empty
+ \global\let\@title\@empty
+ \global\let\@subtitle\@empty
+ \global\let\@extratitle\@empty
+ \global\let\@titlehead\@empty
+ \global\let\@subject\@empty
+ \global\let\@publishers\@empty
+ \global\let\@uppertitleback\@empty
+ \global\let\@lowertitleback\@empty
+ \global\let\@dedication\@empty
+ \global\let\author\relax
+ \global\let\title\relax
+ \global\let\extratitle\relax
+ \global\let\titlehead\relax
+ \global\let\subject\relax
+ \global\let\publishers\relax
+ \global\let\uppertitleback\relax
+ \global\let\lowertitleback\relax
+ \global\let\dedication\relax
+ \global\let\date\relax
+ \fi
\global\let\and\relax
}%
-\newcommand*{\@maketitle}{%
- \clearpage
- \let\footnote\thanks
+\newcommand*{\@makeextratitle}{%
+ \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+ \noindent\@extratitle \next@tdpage
\fi
+}
+\newcommand*{\@maketitle}{%
+ \next@tdpage
+ \global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null
\vskip 2em%
\begin{center}%
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}
+ {\usekomafont{subject}{\@subject \par}}%
\vskip 1.5em
\fi
- {\titlefont\huge \@title \par}%
+ {\usekomafont{title}{\huge \@title \par}}%
\vskip .5em
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
\vskip 1em
- {\Large
- \lineskip .5em%
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip .5em%
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1em%
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus 1em
- {\Large \@publishers \par}
+ {\usekomafont{publishers}{\@publishers \par}}%
\ifx\@dedication\@empty \else
\vskip 2em
- {\Large \@dedication \par}
+ {\usekomafont{dedication}{\@dedication \par}}%
\fi
\end{center}%
\par
\vskip 2em
}%
+\newcommand*{\coverpagetopmargin}{%
+ \dimexpr \topmargin+1in\relax
+}
+\newcommand*{\coverpagebottommargin}{%
+ 2\dimexpr\coverpagetopmargin\relax
+}
+\newcommand*{\coverpageleftmargin}{%
+ \dimexpr \evensidemargin+1in\relax
+}
+\newcommand*{\coverpagerightmargin}{\coverpageleftmargin}
\newenvironment{titlepage}{%
\cleardoublepage
\if@twocolumn
@@ -1731,9 +2175,14 @@
\newcommand*\titlefont{\sectfont}%
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}%
\newkomafont{subtitle}{\usekomafont{title}\large}%
+\newkomafont{titlehead}{}%
+\newkomafont{author}{\Large}
+\newkomafont{date}{\Large}
+\newkomafont{publishers}{\Large}
+\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newif\if@mainmatter\@mainmattertrue
\newcommand*\frontmatter{%
\if@twoside\cleardoubleoddpage\else\clearpage\fi
@@ -1754,6 +2203,20 @@
\csname appendixmore\endcsname
}
\newcommand*\chaptermark[1]{}
+\newcommand*\addchapmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=\m@ne
+ \chaptermark{#1}%
+ \endgroup
+}
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
+}
\newif\if@altsecnumformat\@altsecnumformatfalse
\newif\if@autodot
\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
@@ -1906,6 +2369,37 @@
\fi\fi}
\newcommand*\autodot{\if@altsecnumformat.\fi}
\setcounter{secnumdepth}{2}
+\newcommand*{\partnumdepth}{%
+ \m@ne
+}
+\newcommand*{\chapternumdepth}{\z@}
+\newcommand*{\sectionnumdepth}{\@ne}
+\newcommand*{\subsectionnumdepth}{\tw@}
+\newcommand*{\subsubsectionnumdepth}{\thr@@}
+\newcommand*{\paragraphnumdepth}{4}
+\newcommand*{\subparagraphnumdepth}{5}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
+}
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
+}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -2014,26 +2508,26 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >-2\relax
+ \ifnumbered{part}{%
\refstepcounter{part}%
\@maybeautodot\thepart%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{\thepart}{\scr@ds@tocentry}%
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{}{\scr@ds@tocentry}%
\fi
- \fi
+ }%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\interlinepenalty \@M
\normalfont\sectfont\nobreak
- \ifnum \c@secnumdepth >-2\relax
+ \ifnumbered{part}{%
\size@partnumber{\partformat}%
\partheadmidvskip
- \fi
+ }{}%
\size@part{#2}\strut
\ifx\partmark\@gobble
\@mkboth{}{}\par
@@ -2175,87 +2669,24 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >\m@ne
+ \ifnumbered{chapter}{%
\if@mainmatter
\refstepcounter{chapter}%
\@maybeautodot\thechapter
\typeout{\@chapapp\space\thechapter.}%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
\else
\ifx\scr@ds@tocentry\@empty\else
- \addchaptertocentry{}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
+ \addchaptertocentry{}{\scr@ds@tocentry}%
\fi
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
- \fi
+ }%
\expandafter\chaptermark\expandafter{\scr@ds@head}%
\ifdim \@chapterlistsgap>\z@
\doforeachtocfile{%
@@ -2293,7 +2724,8 @@
\else
\let\@tempa\@hangfrom
\fi
- \@tempa{\ifnum \c@secnumdepth >\m@ne%
+ \@tempa{%
+ \ifnumbered{chapter}{%
\if@mainmatter
\if@chapterprefix
\expandafter\size@chapterprefix
@@ -2305,13 +2737,21 @@
\size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
\fi
\fi
- \fi
+ }{}%
}%
{\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}%
\nobreak\chapterheadendvskip
}
\newcommand*{\addchaptertocentry}[2]{%
\addtocentrydefault{chapter}{#1}{#2}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addxcontentsline{\@currext}{chapteratlist}[{#1}]{#2}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{\scr@float@addtolists@warning}%
+ \fi
}
\newcommand*{\@schapter}[1]{%
\if@twocolumn
@@ -2367,26 +2807,6 @@
\@schapter{#2}%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
\ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax
\ifdim \@chapterlistsgap>\z@
@@ -2401,15 +2821,9 @@
}%
\fi
\fi
- \if@twoside
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \else
- \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
- \fi
+ \addchapmark{\scr@ds@head}%
}%
-\newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}}%
+\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
\AfterPackage{hyperref}{%
\@ifpackagelater{hyperref}{2001/02/19}{}{%
\ClassWarningNoLine{\KOMAClassName}{%
@@ -2442,14 +2856,9 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \if@twoside
- \ifx\@mkboth\markboth
- \expandafter\markright\expandafter{%
- \expandafter\MakeMarkcase{\scr@ds@head}}%
- \fi
- \fi
+ \addsecmark{\scr@ds@head}%
}
-\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newcommand*{\addsectiontocentry}[2]{%
\addtocentrydefault{section}{#1}{#2}%
}
@@ -2462,14 +2871,16 @@
\newcommand*{\addsubparagraphtocentry}[2]{%
\addtocentrydefault{subparagraph}{#1}{#2}%
}
-\newcommand\section{\@startsection{section}{1}{\z@}%
+\newcommand\section{%
+ \@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
-\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\newcommand\subsection{%
+ \@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2477,7 +2888,8 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
-\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\newcommand\subsubsection{%
+ \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2485,12 +2897,14 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
-\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\paragraph{%
+ \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
-\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+\newcommand\subparagraph{%
+ \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
@@ -2508,7 +2922,6 @@
\let\raggedsection\raggedright
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
-\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
\newkomafont{chapterentry}{\usekomafont{disposition}}
@@ -2558,9 +2971,15 @@
\if \@tempa u%
\set@preamble@vpos{0}{#2}%
\fi%
+ \if \@tempa b%
+ \set@preamble@vpox{0}{#2}%
+ \fi
\if \@tempa o%
\set@preamble@vpos{1}{#2}%
\fi%
+ \if \@tempa t%
+ \set@preamble@vpos{1}{#2}%
+ \fi
}%
\@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
\@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
@@ -2598,9 +3017,9 @@
\ClassError{\KOMAClassName}{%
inconsistent hpos options%
}{%
- You said `#2' as position option. But you have
+ You've said `#2' as position option. But you have
to\MessageBreak
- use only one from `l', `r' or `c' not two of
+ use only one of `l', `r', or `c' not two of
these.\MessageBreak
If you'll continue only first hpos option will be
used%
@@ -2616,9 +3035,9 @@
\ClassError{\KOMAClassName}{%
inconsistent vpos options%
}{%
- You said `#2' as position option. But you have
+ You've said `#2' as position option. But you have
to\MessageBreak
- use only one from `o' or `u' not two of
+ use only one of `t', `o', `b', or `u' not two of
these.\MessageBreak
If you'll continue only first vpos option will be
used%
@@ -2724,7 +3143,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -2801,7 +3220,37 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: scrkpage.dtx
+\newcommand*{\scr@package@not@recommended}[2]{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
+ }%
+}
+\scr@package@not@recommended{emptypage}{%
+ option\MessageBreak
+ `cleardoublepage' with one of it's\MessageBreak
+ several values}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{fancyhdr}{%
+ \MessageBreak
+ package `scrpage2' or `scrlayer-scrpage'}
+\scr@package@not@recommended{titlesec}{%
+ the package only\MessageBreak
+ if you really need it, because it breaks several\MessageBreak
+ KOMA-Script features, i.e., option `headings' and\MessageBreak
+ the extended optional argument of the section\MessageBreak
+ commands
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2858,17 +3307,16 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\ifnum \c@secnumdepth >\m@ne
+ {\MakeMarkcase{\ifnumbered{chapter}{%
\if@mainmatter
\chaptermarkformat
\fi
- \fi
- ##1}}{}%
+ }{}##1}%
+ }{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside
- \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\z@
- \sectionmarkformat\fi
+ \markright{\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}%
##1}}%
\fi
}%
@@ -2913,7 +3361,7 @@
\else
\onecolumn
\fi
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -3246,8 +3694,8 @@
\let\scr@tmp@footnotetext=\@footnotetext
\let\@footnotetext=\@gobble
\sbox\@tempboxa{%
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
#3\unskip\strut}}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
@@ -3263,23 +3711,25 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}}%
+ {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
{#3\unskip\strut\par}}}%
\else%
\ifdim\cap@indent<\z@
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
\else%
\if@capbreak
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
\else
- {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ {{\usekomafont{captionlabel}{%
+ #2\captionformat}}}}#3\unskip\strut\par}}}%
\fi
\fi
\fi
@@ -3296,11 +3746,12 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}%
+ {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
#3}}%
}%
- {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
+ {\usesizeofkomafont{caption}{%
+ \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
\fi
\endgroup
}
@@ -3424,14 +3875,14 @@
\newenvironment{figure}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@float{figure}%
+ \@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@dblfloat{figure}%
+ \@dblfloat{figure}%
}{%
\end@dblfloat
}
@@ -3466,7 +3917,7 @@
}{%
\end@dblfloat
}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -3604,7 +4055,7 @@
\endgroup
\@footnotemark
}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -3613,12 +4064,14 @@
}
\renewcommand*{\numberline}[1]{%
\numberline@box{%
- \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ \numberline@prefix
+ \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
+ \numberline@postfix
}%
}
\newcommand*{\numberline@prefix}{}
\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
@@ -3683,11 +4136,7 @@
\begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup
}
\newcommand{\addtocentrydefault}[3]{%
- \ifstr{#2}{}{%
- \addcontentsline{toc}{#1}{#3}%
- }{%
- \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}%
- }%
+ \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}%
}
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
@@ -3703,21 +4152,34 @@
}
\newcommand*{\scr@float@listhead@warning}{%
\ClassWarning{\KOMAClassName}{%
- Usage of deprecated \string\float@listhead!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@listhead.\MessageBreak
- Definition of \string\float@listhead\space my be removed from\MessageBreak
- `\KOMAClassName' soon, so it should not be used
+ \string\float@listhead\space detected!\MessageBreak
+ Implementation of \string\float@listhead\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Maybe implementation of \string\float@listhead\space will\MessageBreak
+ be removed from KOMA-Script soon.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@listhead\space interface
}%
}
\newcommand*{\scr@float@addtolists@warning}{%
\ClassWarningNoLine{\KOMAClassName}{%
\string\float@addtolists\space detected!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@addtolists.\MessageBreak
- Support for \string\float@addtolists\space may be removed
- from\MessageBreak
- `\KOMAClassName' soon
+ Implementation of \string\float@addtolist\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Since Version 3.12 support for deprecated\MessageBreak
+ \string\float@addtolist\space interface has been\MessageBreak
+ restricted to only some of the KOMA-Script\MessageBreak
+ features and been removed from others.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@addtolist\space interface
}%
\global\let\scr@float@addtolists@warning\relax
}
@@ -3731,7 +4193,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: scrkbib.dtx
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -3816,13 +4278,15 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
\newcommand*{\idx@heading}{%
\if@openright\cleardoublepage\else\clearpage\fi%
- \twocolumn[\idx@@heading{\indexname}]%
+ \twocolumn[%
+ \@chaptertolistsfalse
+ \idx@@heading{\indexname}]%
\@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
}
\newenvironment{theindex}{%
@@ -3849,7 +4313,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: scrklist.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -3954,8 +4418,22 @@
\newenvironment{addmargin*}{%
\@tempswafalse
\if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \ClassWarning{\KOMAClassName}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\advance\@listdepth\@ne
\endlist
}
@@ -3986,7 +4464,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 05e1a2c3ef5..12e566fb90c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -1,18 +1,17 @@
%%
%% This is file `scrdate.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,scrdate')
+%% scrkernel-version.dtx (with options: `package,scrdate')
%% scrtime.dtx (with options: `package,scrdate,identify')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `load')
%% scrtime.dtx (with options: `package,scrdate,option')
%% scrtime.dtx (with options: `package,scrdate,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,9 +43,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -66,17 +65,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrtime.dtx
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- \KOMAScriptVersion\space package (%
- day of the week)]
-%%% From File: scrkbase.dtx
+ 2011/03/31 v3.08b KOMA-Script package
+ (day of the week)%
+]
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: scrtime.dtx
-%%% From File: scrtime.dtx
+%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
@@ -213,7 +213,7 @@
* Local config file scrdate.cfg used^^J%
*************************************}}
{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index b4be678a478..ec03d9c0029 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -1,37 +1,36 @@
%%
%% This is file `scrextend.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% scrextend.dtx (with options: `package,extend,preidentify')
-%% scrkvers.dtx (with options: `package,extend')
+%% scrkernel-version.dtx (with options: `package,extend')
%% scrextend.dtx (with options: `package,extend,identify,prepare')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `load')
%% scrextend.dtx (with options: `package,extend,option')
-%% scrkcomp.dtx (with options: `package,extend,option')
-%% scrkmisc.dtx (with options: `package,extend,option')
-%% scrkfont.dtx (with options: `package,extend,option')
-%% scrktitl.dtx (with options: `package,extend,option')
-%% scrksect.dtx (with options: `package,extend,option')
-%% scrkpage.dtx (with options: `package,extend,option')
-%% scrkfloa.dtx (with options: `package,extend,option')
-%% scrkftn.dtx (with options: `package,extend,option')
-%% scrklist.dtx (with options: `package,extend,option')
-%% scrkmisc.dtx (with options: `package,extend,execoption')
-%% scrkcomp.dtx (with options: `package,extend,body')
-%% scrkfont.dtx (with options: `package,extend,body')
-%% scrktitl.dtx (with options: `package,extend,body')
-%% scrksect.dtx (with options: `package,extend,body')
-%% scrkmisc.dtx (with options: `package,extend,body')
-%% scrkpage.dtx (with options: `package,extend,body')
-%% scrkfloa.dtx (with options: `package,extend,body')
-%% scrkftn.dtx (with options: `package,extend,body')
-%% scrklist.dtx (with options: `package,extend,body')
+%% scrkernel-compatibility.dtx (with options: `package,extend,option')
+%% scrkernel-miscellaneous.dtx (with options: `package,extend,option')
+%% scrkernel-fonts.dtx (with options: `package,extend,option')
+%% scrkernel-title.dtx (with options: `package,extend,option')
+%% scrkernel-sections.dtx (with options: `package,extend,option')
+%% scrkernel-pagestyles.dtx (with options: `package,extend,option')
+%% scrkernel-floats.dtx (with options: `package,extend,option')
+%% scrkernel-footnotes.dtx (with options: `package,extend,option')
+%% scrkernel-listsandtabulars.dtx (with options: `package,extend,option')
+%% scrkernel-miscellaneous.dtx (with options: `package,extend,execoption')
+%% scrkernel-compatibility.dtx (with options: `package,extend,body')
+%% scrkernel-fonts.dtx (with options: `package,extend,body')
+%% scrkernel-title.dtx (with options: `package,extend,body')
+%% scrkernel-sections.dtx (with options: `package,extend,body')
+%% scrkernel-miscellaneous.dtx (with options: `package,extend,body')
+%% scrkernel-pagestyles.dtx (with options: `package,extend,body')
+%% scrkernel-floats.dtx (with options: `package,extend,body')
+%% scrkernel-footnotes.dtx (with options: `package,extend,body')
+%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -63,7 +62,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrextend.dtx
+%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
\PackageWarning{scrextend}{%
@@ -75,9 +74,9 @@
}%
\expandafter\endinput
\fi
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -97,9 +96,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrextend.dtx
+%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesPackage{scrextend}[\KOMAScriptVersion\space KOMA-Script package
(extend other classes with features of KOMA-Script classes)]
\newcommand*{\scr@ext@activate}[1]{%
@@ -123,9 +122,9 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: scrextend.dtx
+%%% From File: $Id: scrextend.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
\AtEndOfPackage{%
@@ -143,16 +142,10 @@
}
\AtEndOfPackage{%
\KOMA@key{extendedfeature}{%
- \PackageError{scrextend}{%
- Option `extendedfeature' too late%
- }{%
- Option `extendedfeature' my be used only while loading the
- package.\MessageBreak
- But you've tried to set it up later%
- }%
+ \def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -170,6 +163,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfPackage{%
@@ -183,6 +177,7 @@
package.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -232,20 +227,23 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrkmisc.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
- \if@tempswa
- \setlength{\overfullrule}{5pt}%
- \else
- \setlength{\overfullrule}{\z@}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \setlength{\overfullrule}{\z@}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption
[scrextend]
{final}{draft=false}
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
@@ -276,14 +274,31 @@
}{%
\@tempa
}%
+ \FamilyKeyStateProcessed
}
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
\@titlepagefalse
- }{}
-\KOMA@ifkey{titlepage}{@titlepage}%
+ }{}%
+ \scr@ifundefinedorrelax{if@titlepageiscoverpage}{%
+ \expandafter\newif\csname if@titlepageiscoverpage\endcsname
+ \@titlepageiscoverpagefalse
+ }{}%
+\KOMA@key{titlepage}[true]{%
+ \ifstr{##1}{firstiscover}{%
+ \@titlepagetrue
+ \@titlepageiscoverpagetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `firstiscover'}%
+ \KOMA@set@ifkey{titlepage}{@titlepage}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@titlepageiscoverpagefalse
+ \fi
+ }%
+}
\def\scr@ext@immediate@title{%
\scr@ext@activate{title}%
\let\scr@ext@immediate@title\relax
@@ -292,8 +307,9 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: scrksect.dtx
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -306,6 +322,7 @@
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
+ \FamilyKeyStateProcessed
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -313,6 +330,7 @@
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
}%
}{}%
}%
@@ -348,8 +366,8 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: scrkfloa.dtx
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -367,11 +385,13 @@
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
+ \FamilyKeyStateProcessed
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
@@ -394,11 +414,46 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: scrklist.dtx
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMAProcessOptions\relax
-%%% From File: scrkcomp.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+\newcommand*\scr@setlength[4]{%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \else
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\PackageWarning{scrextend}{%
Using fallback calculation to setup font sizes\MessageBreak
@@ -422,12 +477,20 @@
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\normalsize{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
@@ -439,12 +502,20 @@
}%
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\small{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
@@ -456,12 +527,20 @@
}%
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\footnotesize{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
@@ -514,29 +593,37 @@
{\the\@tempdima}{\the\@tempdimb}%
}%
\normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \fi
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -549,9 +636,16 @@
\if@tempswa\noexpand\@list@extra\fi
}%
\let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -563,9 +657,16 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -577,8 +678,15 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -591,8 +699,13 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -602,7 +715,7 @@
\labelwidth=\dimexpr \leftmargin-\labelsep
\topsep \the\topsep
\parsep \z@
- \partopsep \the\parsep
+ \partopsep \the\partopsep
\itemsep \topsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -612,7 +725,7 @@
\csname @listiv\endcsname
\endgroup
\edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -621,7 +734,7 @@
\csname @listv\endcsname
\endgroup
\edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -630,18 +743,39 @@
\csname @listvi\endcsname
\endgroup
\edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@listi
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
}%
}
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -675,14 +809,61 @@
\newcommand{\dedication}[1]{\gdef\@dedication{%
##1%
}}%
-\newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}%
+\newcommand*{\next@tpage}{%
+ \@thanks\global\let\@thanks\@empty
+ \clearpage
+ \csname titlepage@restore\endcsname
+ \thispagestyle{empty}%
+ \let\footnote\thanks
+ \setcounter{footnote}{0}%
+}
+\newcommand*{\next@tdpage}{%
+ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi
+}
\let\maketitle\relax\let\@maketitle\relax
\newcommand*\maketitle[1][1]{%
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \else
+ \def\and{%
+ \end{tabular}%
+ \hskip 1em \@plus.17fil%
+ \begin{tabular}[t]{c}%
+ }%
+ \fi
\if@titlepage
\begin{titlepage}
\setcounter{page}{%
##1%
}%
+ \if@titlepageiscoverpage
+ \edef\titlepage@restore{%
+ \noexpand\endgroup
+ \noexpand\global\noexpand\@colht\the\@colht
+ \noexpand\global\noexpand\@colroom\the\@colroom
+ \noexpand\global\vsize\the\vsize
+ \noexpand\global\noexpand\@titlepageiscoverpagefalse
+ \noexpand\let\noexpand\titlepage@restore\noexpand\relax
+ }%
+ \begingroup
+ \topmargin=\dimexpr \coverpagetopmargin-1in\relax
+ \oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \textwidth=\dimexpr
+ \paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
+ \textheight=\dimexpr
+ \paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
+ \headheight=0pt
+ \headsep=0pt
+ \footskip=\baselineskip
+ \@colht=\textheight
+ \@colroom=\textheight
+ \vsize=\textheight
+ \columnwidth=\textwidth
+ \hsize=\columnwidth
+ \linewidth=\hsize
+ \else
+ \let\titlepage@restore\relax
+ \fi
\let\footnotesize\small
\let\footnoterule\relax
\let\footnote\thanks
@@ -690,53 +871,69 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoubleemptypage
- \thispagestyle{empty}%
+ \noindent\@extratitle\next@tdpage
\fi
\parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}%
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null\vfill
\begin{center}
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}%
+ {\usekomafont{subject}{\@subject\par}}%
\vskip 3em
\fi
- {\titlefont\huge \@title\par}%
+ {\usekomafont{title}{\huge \@title\par}}%
\vskip 1em
- {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
\vskip 2em
- {\Large \lineskip 0.75em
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip 0.75em
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1.5em
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus3fill
- {\Large \@publishers \par}%
+ {\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks
+ \@thanks\let\@thanks\@empty
\vfill\null
- \if@twoside\next@tpage
- \begin{minipage}[t]{\textwidth}
- \@uppertitleback
- \end{minipage}\par
- \vfill
- \begin{minipage}[b]{\textwidth}
- \@lowertitleback
- \end{minipage}
+ \if@twoside
+ \@tempswatrue
+ \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
+ \else
+ \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
+ \@tempswafalse
+ \fi\fi
+ \fi
+ \if@tempswa
+ \next@tpage
+ \begin{minipage}[t]{\textwidth}
+ \@uppertitleback
+ \end{minipage}\par
+ \vfill
+ \begin{minipage}[b]{\textwidth}
+ \@lowertitleback
+ \end{minipage}\par
+ \@thanks\let\@thanks\@empty
+ \fi
\fi
- \ifx\@dedication\@empty \else
- \next@tpage\null\vfill
- {\centering \Large \@dedication \par}%
+ \ifx\@dedication\@empty
+ \else
+ \next@tdpage\null\vfill
+ {\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoubleemptypage \fi
+ \@thanks\let\@thanks\@empty
+ \cleardoubleemptypage
\fi
+ \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
\end{titlepage}
\else
\par
@@ -750,92 +947,115 @@
}%
\fi
\begingroup
+ \let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
+ \@makeextratitle
+ \next@tdpage
\@maketitle
\else
+ \ifx\@extratitle\@empty\else
+ \twocolumn[\@makeextratitle]\next@tdpage
+ \fi
\twocolumn[\@maketitle]%
\fi
\else
- \newpage
- \global\@topnum\z@
+ \@makeextratitle
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
\endgroup
\fi
\setcounter{footnote}{0}%
- \let\thanks\relax
- \let\maketitle\relax
- \let\@maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@author\@empty
- \global\let\@date\@empty
- \global\let\@title\@empty
- \global\let\@subtitle\@empty
- \global\let\@extratitle\@empty
- \global\let\@titlehead\@empty
- \global\let\@subject\@empty
- \global\let\@publishers\@empty
- \global\let\@uppertitleback\@empty
- \global\let\@lowertitleback\@empty
- \global\let\@dedication\@empty
- \global\let\author\relax
- \global\let\title\relax
- \global\let\extratitle\relax
- \global\let\titlehead\relax
- \global\let\subject\relax
- \global\let\publishers\relax
- \global\let\uppertitleback\relax
- \global\let\lowertitleback\relax
- \global\let\dedication\relax
- \global\let\date\relax
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \let\thanks\relax
+ \let\maketitle\relax
+ \let\@maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@date\@empty
+ \global\let\@title\@empty
+ \global\let\@subtitle\@empty
+ \global\let\@extratitle\@empty
+ \global\let\@titlehead\@empty
+ \global\let\@subject\@empty
+ \global\let\@publishers\@empty
+ \global\let\@uppertitleback\@empty
+ \global\let\@lowertitleback\@empty
+ \global\let\@dedication\@empty
+ \global\let\author\relax
+ \global\let\title\relax
+ \global\let\extratitle\relax
+ \global\let\titlehead\relax
+ \global\let\subject\relax
+ \global\let\publishers\relax
+ \global\let\uppertitleback\relax
+ \global\let\lowertitleback\relax
+ \global\let\dedication\relax
+ \global\let\date\relax
+ \fi
\global\let\and\relax
}%
-\newcommand*{\@maketitle}{%
- \clearpage
- \let\footnote\thanks
+\newcommand*{\@makeextratitle}{%
+ \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+ \noindent\@extratitle \next@tdpage
\fi
+}
+\newcommand*{\@maketitle}{%
+ \next@tdpage
+ \global\@topnum=\z@
\parskip\z@ \parindent\z@ \parfillskip\z@\@plus 1fil
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null
\vskip 2em%
\begin{center}%
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}
+ {\usekomafont{subject}{\@subject \par}}%
\vskip 1.5em
\fi
- {\titlefont\huge \@title \par}%
+ {\usekomafont{title}{\huge \@title \par}}%
\vskip .5em
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
\vskip 1em
- {\Large
- \lineskip .5em%
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip .5em%
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1em%
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus 1em
- {\Large \@publishers \par}
+ {\usekomafont{publishers}{\@publishers \par}}%
\ifx\@dedication\@empty \else
\vskip 2em
- {\Large \@dedication \par}
+ {\usekomafont{dedication}{\@dedication \par}}%
\fi
\end{center}%
\par
\vskip 2em
}%
+\newcommand*{\coverpagetopmargin}{%
+ \dimexpr \topmargin+1in\relax
+}
+\newcommand*{\coverpagebottommargin}{%
+ 2\dimexpr\coverpagetopmargin\relax
+}
+\newcommand*{\coverpageleftmargin}{%
+ \dimexpr \evensidemargin+1in\relax
+}
+\newcommand*{\coverpagerightmargin}{\coverpageleftmargin}
\scr@ifundefinedorrelax{titlepage}{%
\newenvironment{titlepage}{%
\if@twocolumn
@@ -855,13 +1075,17 @@
\newcommand*\titlefont{\sectfont}%
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}%
\newkomafont{subtitle}{\usekomafont{title}\large}%
+\newkomafont{titlehead}{}%
+\newkomafont{author}{\Large}
+\newkomafont{date}{\Large}
+\newkomafont{publishers}{\Large}
+\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: scrksect.dtx
-\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -929,13 +1153,13 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newcommand*{\titlepagestyle}{plain}
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\ftn@rule@test@values}{%
\ifdim\ftn@rule@height <\z@
\ClassWarning{\KOMAClassName}{%
@@ -1090,7 +1314,7 @@
\endgroup
\@footnotemark
}
-%%% From File: scrklist.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
\list{}{\settowidth{\labelwidth}{{%
@@ -1116,8 +1340,22 @@
\newenvironment{addmargin*}{%
\@tempswafalse
\if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \PackageWarning{scrextend}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\advance\@listdepth\@ne
\endlist
}
@@ -1146,7 +1384,7 @@
}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 97cd681456c..5108000ef64 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -1,17 +1,16 @@
%%
%% This is file `scrfontsizes.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package')
-%% scrkfont.dtx (with options: `package,generator,identify')
-%% scrkfont.dtx (with options: `package,generator,option')
-%% scrkfont.dtx (with options: `package,generator,body')
+%% scrkernel-version.dtx (with options: `package')
+%% scrkernel-fonts.dtx (with options: `package,generator,identify')
+%% scrkernel-fonts.dtx (with options: `package,generator,option')
+%% scrkernel-fonts.dtx (with options: `package,generator,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -43,9 +42,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -65,15 +64,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesPackage{scrfontsizes}[%
- \KOMAScriptVersion\space package
- (font size file generator)]
-%%% From File: scrkfont.dtx
+ 2013/12/19 v3.12 KOMA-Script
+ package (font size file generator)]
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProcessOptions\relax
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
\ifstr{#1}{scrsize}{%
@@ -358,7 +357,7 @@
\immediate\closeout\@fontfile
}
\@onlypreamble\generatefontfile
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 262c4f6cfda..a2af19454d7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -1,18 +1,17 @@
%%
%% This is file `scrhack.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,scrhack')
+%% scrkernel-version.dtx (with options: `package,scrhack')
%% scrhack.dtx (with options: `package,identify')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `load')
%% scrhack.dtx (with options: `package,option')
%% scrhack.dtx (with options: `package,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,9 +43,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -66,16 +65,17 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
%%% using: package,identify
-\ProvidesPackage{scrhack}
- [\KOMAScriptVersion\space
- package (hacking other packages)]
-%%% From File: scrkbase.dtx
+\ProvidesPackage{scrhack}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package
+]
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
\@scrhack@hyperreftrue
@@ -86,7 +86,7 @@
\KOMA@ifkey{listings}{@scrhack@listings}%
\@scrhack@listingstrue
\KOMAProcessOptions\relax
-%%% From File: scrhack.dtx
+%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
%%% using: package,body
\newcommand{\scr@ifexpected}[2]{%
\begingroup
@@ -124,6 +124,7 @@
\AtEndOfPackage{%
\KOMA@key[.scrhack.sty]{hyperref}{%
\PackageWarning{scrhack}{option `hyperref=#1' ignored}%
+ \FamilyKeyStateProcessed
}%
\if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi
}%
@@ -132,22 +133,25 @@
\AfterPackage*{float}{%
\KOMA@key[.scrhack.sty]{float}{%
\PackageWarning{scrhack}{option `float' ignored}%
+ \FamilyKeyStateProcessed
}%
\if@scrhack@float\scr@hack@load\@pkgextension{float}\fi
}
\AfterPackage*{floatrow}{%
\KOMA@key[.scrhack.sty]{floatrow}{%
\PackageWarning{scrhack}{option `floatrow' ignored}%
+ \FamilyKeyStateProcessed
}%
\if@scrhack@floatrow\scr@hack@load\@pkgextension{floatrow}\fi
}
\AfterPackage*{listings}{%
\KOMA@key[.scrhack.sty]{listings}{%
\PackageWarning{scrhack}{option `listings' ignored}%
+ \FamilyKeyStateProcessed
}%
\if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index 1492ea66856..10862f91b46 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -7,7 +7,7 @@
%% scrjura.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2012
+%% Copyright (c) 2007-2013
%% Markus Kohm and any individual authors listed elsewhere in this file.
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
@@ -38,10 +38,10 @@
%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
-%%% From File: scrjura.dtx
+%%% From File: $Id: scrjura.dtx 1562 2013-12-19 07:51:16Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2011/09/30 v0.6 KOMA-Script for jurists
+ [2013/11/04 v0.7 KOMA-Script for jurists
(package)%
]
\@ifpackageloaded{hyperref}{%
@@ -53,45 +53,45 @@
hyperref\MessageBreak
behind the loading of package scrjura.}%
}
-\RequirePackage{scrkbase}
+\RequirePackage{scrkbase}[2013/03/26]
+\RequirePackage{tocbasic}
\DeclareOption{contract}{%
\g@addto@macro\document\contract%
}
\newcounter{juratoclevel}\setcounter{juratoclevel}{\@M}
\KOMA@key{juratotoc}[true]{%
\begingroup
- \newif\if@setjuratoclevel\@setjuratocleveltrue
- \let\juratoclevel@@FamilyUnknownKeyValue\FamilyUnknownKeyValue
- \renewcommand*{\FamilyUnknownKeyValue}[4]{%
- \setcounter{juratoclevel}{#1}%
- \@setjuratoclevelfalse
- }%
\KOMA@set@ifkey{juratoclevel}{@tempswa}{#1}%
- \if@setjuratoclevel
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
\setcounter{juratoclevel}{2}%
\else
\setcounter{juratoclevel}{\@M}%
\fi
+ \else
+ \setcounter{juratoclevel}{#1}%
+ \FamilyKeyStateProcessed
\fi
\endgroup
}
+\providecommand*{\toclevel@cpar}{\arabic{juratoclevel}}
\newcommand*{\cpar@numberwidth}{2em}
\newcommand*{\cpar@indent}{1.5em}
\KOMA@key{juratocnumberwidth}{%
\begingroup\setlength{\@tempdima}{#1}\endgroup
\renewcommand*{\cpar@numberwidth}{#1}%
+ \FamilyKeyStateProcessed
}
\KOMA@key{juratocindent}{%
\begingroup\setlength{\@tempdima}{#1}\endgroup
\renewcommand*{\cpar@indent}{#1}%
+ \FamilyKeyStateProcessed
}
\KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak}
\newif\ifparnumber
\KOMA@key{parnumber}[true]{%
- \ifstr{#1}{auto}{\AutoPar}{%
- \ifstr{#1}{manual}{\ManualPar}{%
- \def\FamilyElseValue{, `auto', `semi'}%
+ \ifstr{#1}{auto}{\AutoPar\FamilyKeyStateProcessed}{%
+ \ifstr{#1}{manual}{\ManualPar\FamilyKeyStateProcessed}{%
\KOMA@set@ifkey{parnumber}{parnumber}{#1}%
}%
}%
@@ -106,31 +106,35 @@
{right}{3},%
{both}{4}%
}{#1}%
- \ifcase\number\@tempa
- \endgroup
- \let\Paragraphmark\@gobble
- \or
- \endgroup
- \renewcommand*{\Paragraphmark}[1]{%
- \markright{\csname MakeMarkcase\endcsname{##1}}}%
- \or
- \endgroup
- \renewcommand*{\Paragraphmark}[1]{%
- \markboth{\csname MakeMarkcase\endcsname{##1}}%
- {\csname MakeMarkcase\endcsname{##1}}}%
- \or
- \endgroup
- \renewcommand*{\Paragraphmark}[1]{%
- \ifx
- \@mkboth\@gobbletwo
- \else
- \markright{\csname MakeMarkcase\endcsname{##1}}%
- \fi}%
- \or
- \endgroup
- \renewcommand*{\Paragraphmark}[1]{%
- \@mkboth{\csname MakeMarkcase\endcsname{##1}}%
- {\csname MakeMarkcase\endcsname{##1}}}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase\number\@tempa
+ \endgroup
+ \let\Paragraphmark\@gobble
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{%
+ \markright{\csname MakeMarkcase\endcsname{##1}}}%
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{%
+ \markboth{\csname MakeMarkcase\endcsname{##1}}%
+ {\csname MakeMarkcase\endcsname{##1}}}%
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{%
+ \ifx
+ \@mkboth\@gobbletwo
+ \else
+ \markright{\csname MakeMarkcase\endcsname{##1}}%
+ \fi}%
+ \or
+ \endgroup
+ \renewcommand*{\Paragraphmark}[1]{%
+ \@mkboth{\csname MakeMarkcase\endcsname{##1}}%
+ {\csname MakeMarkcase\endcsname{##1}}}%
+ \else
+ \endgroup
+ \fi
\else
\endgroup
\fi
@@ -156,39 +160,41 @@
{paragraphonly}{44},{onlyparagraph}{44},%
{ParagraphOnly}{44},{OnlyParagraph}{44}%
}{#1}%
- \@tempcnta=\@tempa\relax
- \@tempcntb=\z@
- \@whilenum \@tempcnta>9 \do{%
- \advance\@tempcnta -10\relax
- \advance\@tempcntb \@ne\relax
- }%
- \ifcase \@tempcnta
- \or
- \aftergroup\def\aftergroup\parcite@format
- \aftergroup{\aftergroup0\aftergroup}%
- \or
- \aftergroup\def\aftergroup\parcite@format
- \aftergroup{\aftergroup1\aftergroup}%
- \or
- \aftergroup\def\aftergroup\parcite@format
- \aftergroup{\aftergroup2\aftergroup}%
- \or
- \aftergroup\def\aftergroup\parcite@format
- \aftergroup{\aftergroup-\aftergroup1\aftergroup}%
- \fi
- \ifcase \@tempcntb
- \or
- \aftergroup\def\aftergroup\sentencecite@format
- \aftergroup{\aftergroup0\aftergroup}%
- \or
- \aftergroup\def\aftergroup\sentencecite@format
- \aftergroup{\aftergroup1\aftergroup}%
- \or
- \aftergroup\def\aftergroup\sentencecite@format
- \aftergroup{\aftergroup2\aftergroup}%
- \or
- \aftergroup\def\aftergroup\sentencecite@format
- \aftergroup{\aftergroup-\aftergroup1\aftergroup}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@tempcnta=\@tempa\relax
+ \@tempcntb=\z@
+ \@whilenum \@tempcnta>9 \do{%
+ \advance\@tempcnta -10\relax
+ \advance\@tempcntb \@ne\relax
+ }%
+ \ifcase \@tempcnta
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup0\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup1\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup2\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\parcite@format
+ \aftergroup{\aftergroup-\aftergroup1\aftergroup}%
+ \fi
+ \ifcase \@tempcntb
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup0\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup1\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup2\aftergroup}%
+ \or
+ \aftergroup\def\aftergroup\sentencecite@format
+ \aftergroup{\aftergroup-\aftergroup1\aftergroup}%
+ \fi
\fi
\endgroup
}
@@ -196,6 +202,22 @@
\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
\KOMAProcessOptions\relax
\newcommand*{\jura@env@type}{}
+\newcommand*{\ellipsispar}[1][1]{%
+ \begingroup
+ \KOMAoptions{parnumber=manual}\parellipsis\par
+ \addtocounter{par}{#1}%
+ \protected@write\@auxout{}{%
+ \string\newmaxpar{\jura@env@type}%
+ {\thecontractAbsoluteParagraph}%
+ {\thepar}%
+ }%
+ \endgroup
+ \addtocounter{par}{-1}\refstepcounter{par}%
+ \ignorespaces
+}
+\newcommand*{\parellipsis}{%
+ \scr@ifundefinedorrelax{textellipsis}{\dots}{\textellipsis}%
+}
\newcommand*{\contract}{%
\ifx\jura@env@type\@empty
\let\@doendpe\contract@doendpe
@@ -222,12 +244,13 @@
\newcounter{contractParagraph}
\renewcommand*{\thecontractParagraph}{%
{\contract@Paragraphformat{\arabic{contractParagraph}}}}
-\DeclareRobustCommand*{\contract@Paragraphformat}[1]{\paragraphformat{#1}}
-\newcommand*{\paragraphformat}[1]{\S~#1}
+\DeclareRobustCommand*{\contract@Paragraphformat}[1]{\Paragraphformat{#1}}
+\newcommand*{\Paragraphformat}[1]{\S~#1}
\newcounter{contractSubParagraph}
\@addtoreset{SubParagraph}{Paragraph}
\renewcommand*{\thecontractSubParagraph}{%
{\theParagraph\alph{contractSubParagraph}}}
+\newcounter{contractAbsoluteParagraph}
\define@key{contract}{title}{%
\def\contract@title{#1}%
\ifx\contract@entry\relax\def\contract@entry{\contract@title}\fi
@@ -264,6 +287,7 @@
\newcommand*{\theHParagraph}{\theH@AbsParagraph}
\newcommand*{\theHSubParagraph}{\theH@AbsParagraph}
\newcommand*{\contract@paragraph}[1]{%
+ \stepcounter{contractAbsoluteParagraph}%
\ManualPar\parnumbertrue
\let\contract@title\relax
\let\contract@entry\relax
@@ -272,6 +296,7 @@
\contract@dummyfalse
\ifx\relax#1\relax\else\setkeys{contract}{#1}\fi
\ifcontract@dummy\else
+ \par
\@afterindentfalse
\addvspace{\contract@preskip}%
\fi
@@ -284,7 +309,7 @@
\let\@elt\@stpelt
\cl@Paragraph
\endgroup
- \protected@edef\theParagraph{\S~\contract@number}%
+ \protected@edef\theParagraph{\contract@Paragraphformat{\contract@number}}%
\protected@edef\@currentlabel{\theParagraph}%
\fi
\stepcounter{@AbsParagraph}%
@@ -302,15 +327,12 @@
\ifcontract@dummy\else
\begingroup
\if@juratitlepagebreak\else\interlinepenalty\@M\fi
- \contract@paragraph@font \theParagraph
- \ifx\contract@title\relax\else\enskip\contract@title\fi
+ \contract@paragraph@font{\theParagraph
+ \ifx\contract@title\relax\else\enskip\fi}%
+ \contract@title
\ifx\contract@entry\relax\else
- \addcontentsline{toc}{cpar}{%
- \protect\numberline{\theParagraph}\contract@entry
- }%
- \addcontentsline{cpa}{cpar}{%
- \protect\numberline{\theParagraph}\contract@entry
- }%
+ \addxcontentsline{toc}{cpar}[\theParagraph]\contract@entry
+ \addxcontentsline{cpa}{cpar}[\theParagraph]\contract@entry
\fi
\ifx\contract@head\relax\else
\expandafter\Paragraphmark\expandafter{%
@@ -322,6 +344,7 @@
\fi
}
\newcommand*{\contract@subparagraph}[1]{%
+ \stepcounter{contractAbsoluteParagraph}%
\ManualPar\parnumbertrue
\let\contract@title\relax
\let\contract@entry\relax
@@ -330,6 +353,7 @@
\contract@dummyfalse
\ifx\relax#1\relax\else\setkeys{contract}{#1}\fi
\ifcontract@dummy\else
+ \par
\@afterindentfalse
\vskip\contract@preskip
\fi
@@ -359,15 +383,12 @@
\ifcontract@dummy\else
\begingroup
\if@juratitlepagebreak\else\interlinepenalty\@M\fi
- \contract@paragraph@font \theSubParagraph
- \ifx\contract@title\relax\else\enskip\contract@title\fi
+ \contract@paragraph@font{\theSubParagraph
+ \ifx\contract@title\relax\else\enskip\fi}%
+ \contract@title
\ifx\contract@entry\relax\else
- \addcontentsline{toc}{cpar}{%
- \protect\numberline{\theSubParagraph}\contract@entry
- }%
- \addcontentsline{cpa}{cpar}{%
- \protect\numberline{\theSubParagraph}\contract@entry
- }%
+ \addxcontentsline{toc}{cpar}[\theSubParagraph]\contract@entry
+ \addxcontentsline{cpa}{cpar}[\theSubParagraph]\contract@entry
\fi
\ifx\contract@head\relax\else
\expandafter\Paragraphmark\expandafter{%
@@ -441,26 +462,57 @@
\renewcommand*{\thepar}{\arabic{par}}
\newcommand*{\theHpar}{\theH@AbsParagraph-\Roman{par}}
\newcommand*{\parformat}{(\thepar)}
+\newkomafont{parnumber}{}
\renewcommand*\p@par{{\jura@usetype{\jura@env@type}\theSubParagraph\jura@separator{\nobreakspace}}}
\@addtoreset{par}{Paragraph}
\@addtoreset{par}{SubParagraph}
\newcommand*{\contract@everypar}{%
\ifparnumber
- \refstepcounter{par}%
- \refstepcounter{sentence}%
+ \ifx\scrjura@special@par\relax
+ \ifx\scrjura@special@reset@par\relax\else
+ \global\let\thepar\scrjura@special@reset@par
+ \global\let\scrjura@special@reset@par\relax
+ \fi
+ \refstepcounter{par}%
+ \refstepcounter{sentence}%
+ \else
+ \ifx\scrjura@special@reset@par\relax
+ \global\let\scrjura@special@reset@par\thepar
+ \fi
+ \global\let\thepar\scrjura@special@par
+ \global\let\scrjura@special@par\relax
+ \setcounter{sentence}{0}\refstepcounter{sentence}%
+ \fi
\begingroup
\protected@write\@auxout{\let\contract@Paragraphformat\@firstofone}{%
- \string\newmaxpar{contract}{\theSubParagraph}{\arabic{par}}}%
- \getmaxpar\@tempa{contract}{\theSubParagraph}%
+ \string\newmaxpar{contract}%
+ {\thecontractAbsoluteParagraph}%
+ {\thepar}}%
+ \getmaxpar\@tempa{contract}{\thecontractAbsoluteParagraph}%
\typeout{Stored max is \@tempa}%
- \ifnum \@tempa>\@ne
- \parformat\nobreakspace
+ \def\reserved@a##1\@nnil{\def\@tempa{##1}}%
+ \afterassignment\reserved@a\@tempcnta=0\@tempa\relax\@nnil
+ \ifnum \@tempcnta>\@ne
+ {\usekomafont{parnumber}{\parformat\nobreakspace}}%
+ \else
+ \def\reserved@a{\relax}%
+ \ifx\@tempa\reserved@a
+ \else
+ {\usekomafont{parnumber}{\parformat\nobreakspace}}%
+ \fi
\fi
\endgroup
\else
- \setcounter{sentence}{0}\refstepcounter{sentence}%
+ \setcounter{sentence}{-1}\refstepcounter{sentence}%
\fi
}
+\newcommand*{\thisparnumber}[1]{%
+ \def\scrjura@special@par{#1}%
+}
+\newcommand*{\scrjura@special@par}{}
+\let\scrjura@special@par\relax
+\newcommand*{\scrjura@special@reset@par}{}
+\let\scrjura@special@reset@par\relax
\newcommand*{\refL}{\@ifstar {\ref@L*}{\ref@L{}}}
\newcommand*{\ref@L}[2]{%
\begingroup
@@ -519,7 +571,7 @@
}
\newcommand*{\ref@ParagraphN}[2]{%
\begingroup
- \let\paragraphformat\relax
+ \let\Paragraphformat\relax
\ref@Paragraph{#1}{#2}%
\endgroup
}
@@ -683,43 +735,39 @@
\newcommand*{\sentencenumericformat}[1]{\@arabic{\number #1\relax}.}
\newcommand*{\parname}{Paragraph}
\AtBeginDocument{%
- \providecaptionname{german}\parname{Absatz}%
- \providecaptionname{german}\parshortname{Abs.}%
- \providecaptionname{german}\sentencename{Satz}%
- \providecaptionname{german}\sentenceshortname{S.}%
- \providecaptionname{ngerman}\parname{Absatz}%
- \providecaptionname{ngerman}\parshortname{Abs.}%
- \providecaptionname{ngerman}\sentencename{Satz}%
- \providecaptionname{ngerman}\sentenceshortname{S.}%
- \providecaptionname{austrian}\parname{Absatz}%
- \providecaptionname{austrian}\parshortname{Abs.}%
- \providecaptionname{austrian}\sentencename{Satz}%
- \providecaptionname{austrian}\sentenceshortname{S.}%
- \providecaptionname{naustrian}\parname{Absatz}%
- \providecaptionname{naustrian}\parshortname{Abs.}%
- \providecaptionname{naustrian}\sentencename{Satz}%
- \providecaptionname{naustrian}\sentenceshortname{S.}%
+ \providecaptionname{german,ngerman,austrian,naustrian}\parname{Absatz}%
+ \providecaptionname{german,ngerman,austrian,naustrian}\parshortname{Abs.}%
+ \providecaptionname{german,ngerman,austrian,naustrian}\sentencename{Satz}%
+ \providecaptionname{german,ngerman,austrian,naustrian}\sentenceshortname{S.}%
+ \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\parname{paragraph}%
+ \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\parshortname{par.}%
+ \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\sentencename{sentence}%
+ \providecaptionname{english,american,british,canadian,USenglish,UKenglish}\sentenceshortname{sent.}%
}
\providecommand*{\parname}{\scrjura@lang@error{\parname}}
\providecommand*{\parshortname}{\scrjura@lang@error{\parshortname}}
\providecommand*{\sentencename}{\scrjura@lang@error{\sentencename}}
\providecommand*{\sentenceshortname}{\scrjura@lang@error{\sentenceshortname}}
\newcommand*{\scrjura@lang@error}[1]{%
- \PackageErrorNoLine{scrjura}{%
+ \PackageError{scrjura}{%
current language not supported%
}{%
- Currently scrjura only supports languages `german',
- `ngerman', `austrian', and `naustrian'.\MessageBreak
- It seems, that you are using another language (maybe
- \languagename).\MessageBreak
- Because of this you have to define \string#1\space by
- yourself!\MessageBreak
+ Currently scrjura only supports languages `german', `ngerman',
+ `austrian',\MessageBreak
+ `naustrian', `english', `american', `british', `canadian', `USenglish',
+ and\MessageBreak
+ `UKenglish'.\MessageBreak
+ It seems, that you are using another language (maybe `\languagename') or
+ that\MessageBreak
+ your language selection isn't compatible to package `babel'.\MessageBreak
+ Because of this you have to define `\string#1' by yourself!\MessageBreak
It would be nice if you'll send your definitions to the author.%
}%
\textbf{??}%
}
\newcommand*{\newmaxpar}[3]{%
\begingroup
+ \expandafter\let\csname #1@Paragraphformat\endcsname\@firstofone
\protected@edef\@tempa{#2}\@onelevel@sanitize\@tempa
\expandafter\xdef\csname max@#1@\@tempa\endcsname{#3}%
\endgroup
@@ -737,7 +785,7 @@
\fi
\@tempa
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index 9a68b924979..0852a04ac5d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -1,19 +1,18 @@
%%
%% This is file `scrkbase.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,scrkbase')
-%% scrkbase.dtx (with options: `package,option,koma')
-%% scrkfont.dtx (with options: `package,option,scrkbase')
+%% scrkernel-version.dtx (with options: `package,scrkbase')
+%% scrkernel-basics.dtx (with options: `package,option,koma')
+%% scrkernel-fonts.dtx (with options: `package,option,scrkbase')
%% scrlfile.dtx (with options: `load')
-%% scrkbase.dtx (with options: `package,body,koma')
-%% scrkfont.dtx (with options: `package,body,scrkbase')
+%% scrkernel-basics.dtx (with options: `package,body,koma')
+%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -45,9 +44,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -67,14 +66,17 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- \KOMAScriptVersion\space package
- (KOMA-Script-dependent basics and keyval usage)]
+ 2013/12/19 v3.12 KOMA-Script
+ package (%
+ KOMA-Script-dependent
+ basics and keyval usage)]
\RequirePackage{scrbase}[\KOMAScriptVersion]
\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{%
\DefineFamilyMember{KOMA}%
@@ -83,64 +85,19 @@
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
-%%% From File: scrkfont.dtx
-%%% From File: scrlfile.dtx
-\def\scrlfileversion{2012/06/15 v3.12}
-\edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]}
-\@tempa
-%%% From File: scrkbase.dtx
-\newcommand*{\KOMAExecuteOptions}{\FamilyExecuteOptions{KOMA}}
-\@onlypreamble\KOMAExecuteOptions
-\newcommand*{\KOMAoptions}[1]{%
- \let\post@kopt@hook\@empty
- \KOMA@options{#1}{%
- \PackageError{scrkbase}{%
- unknown KOMA option `\scr@key@name'%
- }{%
- You have used \string\KOMAoptions\space to set
- `\scr@key@atlist',\MessageBreak
- but KOMA-Script does not know any option named
- `\scr@key@name'.\MessageBreak
- See the KOMA-Script manual for more informations about options
- and\MessageBreak
- their values.%
- }%
- }%
- \post@kopt@hook\let\post@kopt@hook\relax
-}
-\newcommand*{\KOMA@options}{\Family@Options{KOMA}}
-\newcommand*{\post@kopt@hook}{}
-\let\post@kopt@hook\relax
-\newcommand*{\AfterKOMAoptions}{%
- \ifx\post@kopt@hook\relax
- \PackageWarning{scrkbase}{%
- \string\AfterKOMAoptions\space can only be used inside a\MessageBreak
- KOMA-Script option that is called using \string\KOMAoptions.\MessageBreak
- Because of this, command will be ignored%
- }%
- \expandafter\@gobbletwo
- \else
- \expandafter\l@addto@macro
- \fi
- \post@kopt@hook
-}
-\newcommand*{\KOMAoption}[2]{%
- \let\post@kopt@hook\@empty
- \Family@Option{KOMA}{#1}{#2}{%
- \PackageError{scrkbase}{%
- unknown KOMA option `\scr@key@name'%
- }{%
- You have used \string\KOMAoption\space to set
- `\scr@key@name',\MessageBreak
- but KOMA-Script does not know any option named
- `\scr@key@name'.\MessageBreak
- See the KOMA-Script manual for more informations about options
- and\MessageBreak
- their values.%
- }%
- }%
- \post@kopt@hook\let\post@kopt@hook\relax
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
+\RequirePackage{scrlfile}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
+ \FamilyExecuteOptions[#1]{KOMA}%
}
+\newcommand*{\KOMAoptions}{\FamilyOptions{KOMA}}
+\newcommand*{\AfterKOMAoptions}{}
+\let\AfterKOMAoptions\AtEndOfFamilyOptions
+\newcommand*{\KOMAoption}{\FamilyOption{KOMA}}
\newcommand*{\KOMA@unknown@keyval}{\FamilyUnknownKeyValue{KOMA}}
\newcommand*{\KOMA@ifkey}{%
\DefineFamilyMember{KOMA}%
@@ -165,14 +122,22 @@
}
\newcommand*{\KOMA@UseDeprecatedOption}[3]{%
\let\scr@sr@co\CurrentOption
- #1{%
- You've used obsolete option `#2'.\MessageBreak
- Usage of this option indicates an old document and\MessageBreak
- changes compatibility level using\MessageBreak
- `#3,version=first'.\MessageBreak
- If you don't want this, you should simply replace\MessageBreak
- usage of option `#2' by `#3'%
- }%
+ \begingroup
+ #1{%
+ You've used obsolete option `#2'.\MessageBreak
+ Usage of this option indicates an old document and\MessageBreak
+ \scr@ifundefinedorrelax{KV@KOMA.\@currname.\@currext @version}{%
+ changes compatibility level using\MessageBreak
+ `#3,version=first'.\MessageBreak
+ If you don't want this, y%
+ }{%
+ is deprecated.\MessageBreak
+ Y%
+ }%
+ ou should simply replace\MessageBreak
+ usage of option `#2' by `#3'%
+ }%
+ \endgroup
\KOMAExecuteOptions{#3,version=first}%
\let\CurrentOption\scr@sr@co
}
@@ -200,55 +165,21 @@
\KOMAExecuteOptions{#3}%
\let\CurrentOption\scr@sr@co
}
-\newcommand*{\KOMA@DeclareObsoleteOption}{%
- \@ifnextchar [%]
- {\KOMA@@DeclareObsoleteOption}%
- {\KOMA@@DeclareObsoleteOption[\@gobbletwo]}%
-}
-\newcommand*{\KOMA@@DeclareObsoleteOption}{}
-\def\KOMA@@DeclareObsoleteOption[#1]{%
- \@ifnextchar [%]
- {\KOMA@@@DeclareObsoleteOption{#1}}%
- {\KOMA@@@DeclareObsoleteOption{#1}[]}%
-}
-\newcommand*{\KOMA@@@DeclareObsoleteOption}{}
-\def\KOMA@@@DeclareObsoleteOption#1[#2]#3#4{%
- \ifstr{#2}{}{%
- \KOMA@iv@DeclareObsoleteOption{#1}{\@currname}{#3}{#4}%
- }{%
- \KOMA@UseObsoleteOption{#1}{#2}{#3}{#4}%
- }%
-}
-\newcommand*{\KOMA@iv@DeclareObsoleteOption}[4]{%
- \DeclareOption{#3}{\KOMA@UseObsoleteOption{#1{#2}}{#3}{#4}}%
-}
-\newcommand*{\KOMA@UseObsoleteOption}[3]{%
- \let\scr@sr@co\CurrentOption
- #1{%
- You've used obsolete option `#2'.\MessageBreak
- \protect\KOMAExecuteOptions{#3} will be\MessageBreak
- used instead.\MessageBreak
- You may simply replace `#2'\MessageBreak
- by `#3'%
- }%
- \KOMAExecuteOptions{#3}%
- \let\CurrentOption\scr@sr@co
-}
\newcommand*{\scr@sr@co}{}
-\newcommand*{\KOMA@newobsoletecommand}[3][\@gobbletwo]{%
- \newcommand*{#2}{\KOMA@UseObsoleteCommand{#1}{\string#2}{#3}}%
+\newcommand*{\KOMA@newdeprecatedcommand}[3][\@gobbletwo]{%
+ \newcommand*{#2}{\KOMA@UseDeprecatedCommand{#1}{\string#2}{#3}}%
}
-\newcommand*{\KOMA@UseObsoleteCommand}[3]{%
+\newcommand*{\KOMA@UseDeprecatedCommand}[3]{%
#1{%
scrkbase%
}{%
- You've used the obsolete command `#2'.\MessageBreak
+ You've used deprecated command `#2'.\MessageBreak
\protect\KOMAoptions{#3} will be used instead.\MessageBreak
You should also replace `#2' by `\protect\KOMAoptions{#3}'%
}%
\KOMAoptions{#3}%
}
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*{\setkomafont}[2]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{%
@@ -336,6 +267,72 @@
\@nameuse{scr@fnt@#1}%
}%
}
+\newcommand*{\usesizeofkomafont}[1]{%
+ \begingroup
+ \let\color\@gobble\let\normalcolor\relax
+ \@tempcnta=\currentgrouplevel
+ \usekomafont{#1}{%
+ \ifnum \currentgrouplevel>\numexpr\@tempcnta\relax
+ \edef\reserved@a{\noexpand\egroup\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}%
+ \noexpand\bgroup}%
+ \else
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}}%
+ \fi
+ \reserved@a
+ }%
+ \selectfont
+}
+\newcommand*{\usefamilyofkomafont}{\use@ofkomafont{family}}
+\newcommand*{\useseriesofkomafont}{\use@ofkomafont{series}}
+\newcommand*{\useshaperofkomafont}{\use@ofkomafont{shape}}
+\newcommand*{\useencodingofkomafont}{\use@ofkomafont{encoding}}
+\newcommand*{\usefontofkomafont}[1]{%
+ \begingroup
+ \let\color\@gobble\let\normalcolor\relax
+ \@tempcnta=\currentgrouplevel
+ \usekomafont{#1}{%
+ \ifnum \currentgrouplevel>\numexpr\@tempcnta\relax
+ \edef\reserved@a{\noexpand\egroup\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}%
+ \noexpand\fontfamily{\f@family}%
+ \noexpand\fontseries{\f@series}%
+ \noexpand\fontshape{\f@shape}%
+ \noexpand\fontencoding{\f@encoding}%
+ \noexpand\bgroup}%
+ \else
+ \edef\reserved@a{\noexpand\endgroup
+ \noexpand\fontsize{\f@size}{\f@baselineskip}}%
+ \noexpand\fontfamily{\f@family}%
+ \noexpand\fontseries{\f@series}%
+ \noexpand\fontshape{\f@shape}%
+ \noexpand\fontencoding{\f@encoding}%
+ \fi
+ \reserved@a
+ }%
+ \selectfont
+}
+\newcommand*{\use@ofkomafont}[2]{%
+ \begingroup
+ \let\color\@gobble\let\normalcolor\relax
+ \@tempcnta=\currentgrouplevel
+ \usekomafont{#2}{%
+ \ifnum \currentgrouplevel>\numexpr\@tempcnta\relax
+ \edef\reserved@a{\noexpand\egroup\noexpand\endgroup
+ \expandafter\noexpand\csname font#1\endcsname
+ {\csname f@#1\endcsname}%
+ \noexpand\bgroup}%
+ \else
+ \edef\reserved@a{\noexpand\endgroup
+ \expandafter\noexpand\csname font#1\endcsname
+ {\csname f@#1\endcsname}%
+ }%
+ \fi
+ \reserved@a
+ }%
+ \selectfont
+}
\newcommand*{\newkomafont}[3][\relax]{%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
\expandafter\expandafter\expandafter\newcommand
@@ -344,7 +341,7 @@
\csname @#2font\endcsname%
}%
\ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
+ \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname[1]{#1}%
\fi
}
\newcommand*{\aliaskomafont}[2]{%
@@ -352,7 +349,7 @@
#2%
}%
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
new file mode 100644
index 00000000000..8fa4d604372
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -0,0 +1,1148 @@
+%%
+%% This is file `scrlayer-notecolumn.sty',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,identify')
+%% scrlayer.dtx (with options: `interface,trace,notecolumn,init')
+%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,init')
+%% scrlayer.dtx (with options: `interface,trace,notecolumn,options')
+%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,options')
+%% scrlayer.dtx (with options: `interface,trace,notecolumn,body')
+%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,body')
+%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (identify)
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{scrlayer-notecolumn}[%
+ 15/11/2013 v0.1.1514
+ package
+ (end user interface for scrlayer)]
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init)
+\RequirePackage{scrlayer}
+\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
+ \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
+}{%
+ \ifx\scrlayer@AtEndOfPackage\@firstofone
+ \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
+ \fi
+}
+\let\scrlayer@AtEndOfPackage\AtEndOfPackage
+\scrlayerInitInterface
+%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (init)
+\@tempswatrue
+\scr@ifundefinedorrelax{pdfsavepos}{%
+ \expandafter\@tempswafalse
+}{%
+ \scr@ifundefinedorrelax{pdflastypos}{%
+ \expandafter\@tempswafalse
+ }{}%
+}
+\if@tempswa\else
+ \PackageError{scrlayer-notecolumn}{missing pdfTeX features}{%
+ This package needs \string\pdfsavepos\space and
+ \string\pdflastypos.\MessageBreak
+ This error is fatal, because usage of the package without these
+ features\MessageBreak
+ cannot work!\MessageBreak
+ You shouldn't continue, but if you'd try, I'll try to abort the LaTeX run
+ }%
+ \batchmode\csname @@end\endcsname\end
+\fi
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (options)
+\KOMA@key{markcase}{%
+ \begingroup
+ \KOMA@set@ncmdkey{markcase}{reserved@a}{%
+ {upper}{0},{lower}{1},{used}{2},%
+ {ignoreuppercase}{3},{nouppercase}{3},%
+ {ignoreupper}{3},{noupper}{3}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifnum \reserved@a>\m@ne
+ \aftergroup\let\aftergroup\MakeMarkcase
+ \ifcase \reserved@a
+ \aftergroup\MakeUppercase
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \or
+ \aftergroup\MakeLowercase
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \or
+ \aftergroup\@firstofone
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \else
+ \aftergroup\scrlayer@ignoreuppercase
+ \aftergroup\scrlayer@forceignoreuppercasetrue
+ \fi
+ \fi
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
+ \fi
+ \endgroup
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @markcase}
+\KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autooneside}
+\KOMA@key{automark}[]{%
+ \scrlayer@testunexpectedarg{automark}{#1}%
+ \scrlayer@AtEndOfPackage{%
+ \if@chapter
+ \automark[section]{chapter}%
+ \else
+ \automark[subsection]{section}%
+ \fi
+ }%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark@default}
+\KOMA@key{manualmark}[]{%
+ \scrlayer@testunexpectedarg{manualmark}{#1}%
+ \scrlayer@AtEndOfPackage{\manualmark}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark@default}
+\KOMA@key{onpsselect}{%
+ \l@addto@macro{\@ps@initialhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect@default}
+\KOMA@key{onpsinit}{%
+ \l@addto@macro{\@ps@hook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit@default}
+\KOMA@key{onpsoneside}{%
+ \l@addto@macro{\@ps@onesidehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside@default}
+\KOMA@key{onpstwoside}{%
+ \l@addto@macro{\@ps@twosidehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside@default}
+\KOMA@key{onpsoddpage}{%
+ \l@addto@macro{\@ps@oddpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage@default}
+\KOMA@key{onpsevenpage}{%
+ \l@addto@macro{\@ps@evenpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage@default}
+\KOMA@key{onpsfloatpage}{%
+ \l@addto@macro{\@ps@floatpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage@default}
+\KOMA@key{onpsnonfloatpage}{%
+ \l@addto@macro{\@ps@nonfloatpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsnonfloatpage}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default}
+\KOMA@key{onpsbackground}{%
+ \l@addto@macro{\@ps@backgroundhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsbackground}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @onpsbackground@default}
+\KOMA@key{onpsforeground}{%
+ \l@addto@macro{\@ps@foregroundhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsforeground}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @onpsforeground@default}
+\KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @deactivatepagestylelayers}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default}
+\KOMA@ifkey{draft}{scrlayer@draft}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft@default}
+\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite@default}
+\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default}
+%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (options)
+\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (body)
+\KOMAProcessOptions\relax
+%%% From File: $Id: scrlayer-notecolumn.dtx 1514 2013-11-15 08:23:09Z mjk $ (body)
+\scrlayerAddToInterface\DeclareNoteColumn{%
+ \newcommand*{\DeclareNoteColumn}[2][]{%
+ \@ifundefined{slnc@#2@box}{%
+ \expandafter\newsavebox\csname slnc@#2@box\endcsname
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@box\endcsname\relax
+ }%
+ }{}%
+ \@ifundefined{slnc@#2@unprocessed}{%
+ \@namedef{slnc@#2@unprocessed}{}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@unprocessed\endcsname\relax
+ }%
+ }{}%
+ \@ifundefined{slnc@#2@pos}{%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@pos\endcsname\relax
+ }%
+ }{}%
+ \@ifundefined{slnc@#2@width}{%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@width\endcsname\relax
+ }%
+ }{}%
+ \@ifundefined{scr@fnt@notecolumn.#2}{%
+ \@ifundefined{@notecolumn.#2font}{%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname @notecolumn.#2font\endcsname\relax
+ }%
+ }{%
+ \PackageInfo{scrlayer-notecolumn}{using already defined
+ macro\MessageBreak
+ `\expandafter\string\csname @notecolumn.#2font\endcsname' for font
+ element\MessageBreak
+ `notecolumn.#2'%
+ }%
+ }%
+ \newkomafont{notecolumn.#2}{}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname scr@fnt@notecolumn.#2\endcsname\relax
+ }%
+ }{%
+ \PackageInfo{scrlayer-notecolumn}{using already defined font
+ element\MessageBreak
+ `notecolumn.#2'%
+ }%
+ }%
+ \newcommand*{\slnc@name}{}%
+ \edef\slnc@name{#2}%
+ \FamilyExecuteOptions[.definenotecolumn]{KOMAarg}{marginpar,#1}%
+ \let\slnc@name\relax
+ \DeclareLayer[%
+ foreground,%
+ align=tl,%
+ voffset=1in+\topmargin+\headheight+\headsep,%
+ height=\dimexpr\textheight+\topskip\relax,%
+ hoffset=\csname slnc@#2@pos\endcsname,%
+ width=\csname slnc@#2@width\endcsname,%
+ contents=\slnc@processnotes{#2}%
+ ]{notecolumn.#2}
+ \AddLayersToPageStyle{@everystyle@}{notecolumn.#2}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \RemoveLayersFromPageStyle{@everystyle@}{notecolumn.#2}%
+ \DestroyLayer{notecolumn.#2}%
+ }%
+ \@cons\slnc@processnotecolumns{{#2}}%
+ }%
+}
+\scrlayerAddToInterface\slnc@processnotecolumns{%
+ \newcommand*{\slnc@processnotecolumns}{}%
+}
+\scrlayerAddToInterface\slnc@testforpagestylewarning{%
+ \newcommand*{\slnc@testforpagestylewarning}{%
+ \IfLayerPageStyleExists{\currentpagestyle}{}{%
+ \PackageWarning{scrlayer-notecolumn}{%
+ output of note columns delayed,\MessageBreak
+ because with `\currentpagestyle'\MessageBreak
+ a page style has been selected, that\MessageBreak
+ isn't a layer page style,%
+ }%
+ }%
+ }%
+}
+\AfterSelectAnyPageStyle{\slnc@testforpagestylewarning}
+\DefineFamilyMember[.definenotecolumn]{KOMAarg}
+\DefineFamilyKey[.definenotecolumn]{KOMAarg}{position}{%
+ \@namedef{slnc@\slnc@name @pos}{\dimexpr #1\relax}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@position}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@position@default}
+\DefineFamilyKey[.definenotecolumn]{KOMAarg}{width}{%
+ \@namedef{slnc@\slnc@name @width}{\dimexpr #1\relax}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@width}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@width@default}
+\DefineFamilyKey[.definenotecolumn]{KOMAarg}{font}{%
+ \setkomafont{notecolumn.\slnc@name}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@font}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@font@default}
+\DefineFamilyKey[.definenotecolumn]{KOMAarg}{marginpar}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{marginpar}{#1}%
+ \edef\reserved@a{\noexpand\slnc@defpos{\slnc@name}}\reserved@a
+ \@namedef{slnc@\slnc@name @width}{\marginparwidth}%
+}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@marginpar}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@marginpar@default}
+\scrlayerAddToInterface\slnc@defpos{%
+ \newcommand*\slnc@defpos[1]{%
+ \@namedef{slnc@#1@pos}{%
+ \ifodd\value{page}
+ \if@reversemargin
+ \dimexpr \oddsidemargin+1in
+ -\marginparsep-\csname slnc@#1@width\endcsname\relax
+ \else
+ \dimexpr \oddsidemargin+1in
+ +\textwidth+\marginparsep\relax
+ \fi
+ \else
+ \if@twoside
+ \if@reversemargin
+ \dimexpr \evensidemargin+1in
+ +\textwidth+\marginparsep\relax
+ \else
+ \dimexpr \evensidemargin+1in
+ -\marginparsep-\csname slnc@#1@width\endcsname\relax
+ \fi
+ \else
+ \if@reversemargin
+ \dimexpr \oddsidemargin+1in
+ -\marginparsep-\csname slnc@#1@width\endcsname\relax
+ \else
+ \dimexpr \oddsidemargin+1in
+ +\textwidth+\marginparsep\relax
+ \fi
+ \fi
+ \fi
+ }%
+ }%
+}%
+\DefineFamilyKey[.definenotecolumn]{KOMAarg}{normalmarginpar}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{normalmarginpar}{#1}%
+ \edef\reserved@a{\noexpand\slnc@defnormalpos{\slnc@name}}\reserved@a
+ \@namedef{slnc@\slnc@name @width}{\marginparwidth}%
+}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@normalmarginpar}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@normalmarginpar@default}
+\scrlayerAddToInterface\slnc@defnormalpos{%
+ \newcommand*\slnc@defnormalpos[1]{%
+ \@namedef{slnc@#1@pos}{%
+ \ifodd\value{page}
+ \dimexpr \oddsidemargin+1in
+ +\textwidth+\marginparsep\relax
+ \else
+ \if@twoside
+ \dimexpr \evensidemargin+1in
+ -\marginparsep-\csname slnc@#1@width\endcsname\relax
+ \else
+ \dimexpr \oddsidemargin+1in
+ +\textwidth+\marginparsep\relax
+ \fi
+ \fi
+ }%
+ }%
+}%
+\DefineFamilyKey[.definenotecolumn]{KOMAarg}{reversemarginpar}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{reversemarginpar}{#1}%
+ \edef\reserved@a{\noexpand\slnc@defreversepos{\slnc@name}}\reserved@a
+ \@namedef{slnc@\slnc@name @width}{\marginparwidth}%
+}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@reversemarginpar}
+\scrlayer@AddCsToInterface{KV@KOMAarg.definenotecolumn@reversemarginpar@default}
+\scrlayerAddToInterface\slnc@defreversepos{%
+ \newcommand*\slnc@defreversepos[1]{%
+ \@namedef{slnc@#1@pos}{%
+ \ifodd\value{page}
+ \dimexpr \oddsidemargin+1in
+ -\marginparsep-\csname slnc@#1@width\endcsname\relax
+ \else
+ \if@twoside
+ \dimexpr \evensidemargin+1in
+ +\textwidth+\marginparsep\relax
+ \else
+ \dimexpr \oddsidemargin+1in
+ -\marginparsep-\csname slnc@#1@width\endcsname\relax
+ \fi
+ \fi
+ }%
+ }%
+}%
+\scrlayerAddToInterface\DeclareNewNoteColumn{%
+ \newcommand*{\DeclareNewNoteColumn}[2][]{%
+ \scr@ifundefinedorrelax{slnc@#2@box}{}{%
+ \PackageError{scrlayer-notecolumn}{note column `#2' already defined}{%
+ You may declare only note columns, that haven't been declared
+ previously using\MessageBreak
+ \string\DeclareNewNoteColumn. See also the alternatives
+ \string\RedeclareNoteColumn,\MessageBreak
+ \string\ProvideNoteColumn, and \string\DeclareNoteColumn.\MessageBreak
+ Nevertheless, if you'll continue, declaration will be done.%
+ }%
+ }%
+ \DeclareNoteColumn[{#1}]{#2}%
+ }%
+}
+\scrlayerAddToInterface\ProvideNoteColumn{%
+ \newcommand*{\ProvideNoteColumn}[2][]{%
+ \scr@ifundefinedorrelax{slnc@#2@box}{}{%
+ \PackageInfo{scrlayer-notecolumn}{\string\ProvideNoteColumn{#2}
+ ignored,\MessageBreak
+ because of already defined\MessageBreak
+ not column}%
+ }{%
+ \DeclareNoteColumn[{#1}]{#2}%
+ }%
+ }%
+}
+\scrlayerAddToInterface\RedeclareNoteColumn{%
+ \newcommand*{\RedeclareNoteColumn}[2][]{%
+ \scr@ifundefinedorrelax{slnc@#2@box}{%
+ \PackageError{scrlayer-notecolumn}{note column `#2' undefined}{%
+ You may declare only note columns, that have been declared
+ previously using\MessageBreak
+ \string\RedeclareNoteColumn. See also the alternatives
+ \string\DeclareNewNoteColumn,\MessageBreak
+ \string\ProvideNoteColumn, and \string\DeclareNoteColumn.\MessageBreak
+ Nevertheless, if you'll continue, declaration will be done.%
+ }%
+ }{}%
+ \DeclareNoteColumn[{#1}]{#2}%
+ }%
+}
+\scrlayerAddToInterface\tf@slnc{%
+ \newwrite\tf@slnc
+ \AtBeginDocument{%
+ \immediate\write\@auxout{%
+ \noexpand\csname slnc@initwrite\noexpand\endcsname
+ }%
+ }%
+ \AtEndDocument{\let\slnc@initwrite\slnc@openwrite}%
+}
+\scrlayerAddToInterface\slnc@initwrite{}%
+\scrlayerAddToInterface\slnc@openwrite{%
+ \newcommand*{\slnc@openwrite}{%
+ \immediate\closeout\slnc@file
+ \PackageInfo{scrlayer-notecolumn}{%
+ Opening `\jobname.slnc'\MessageBreak
+ for writing}%
+ \immediate\openout\tf@slnc\jobname.slnc
+ }%
+}
+\AfterReadingMainAux{%
+ \immediate\closeout\tf@slnc
+ \scr@ifundefinedorrelax{pdfmdfivesum}{%
+ \PackageWarningNoLine{scrlayer-notecolumn}{%
+ \string\pdfmdfivesum\space unavailable.\MessageBreak
+ The package needs \string\pdfmdfivesum\space to test\MessageBreak
+ whether or not one more LaTeX run will\MessageBreak
+ be needed to make the note columns\MessageBreak
+ right. If this command is unavailable\MessageBreak
+ you have to do the decision without\MessageBreak
+ this help of the package.%
+ }%
+ }{%
+ \begingroup
+ \edef\reserved@a{\pdfmdfivesum file {\jobname.slnc}}%
+ \ifx \slnc@mdfivesum\reserved@a
+ \PackageInfo{scrlayer-notecolumn}{%
+ MD5 of current `\jobname.slnc':\MessageBreak
+ \reserved@a}%
+ \else
+ \PackageWarningNoLine{scrlayer-notecolumn}{%
+ MD5 of slnc-file changed.\MessageBreak
+ Last: \slnc@mdfivesum\MessageBreak
+ New: \space \reserved@a\MessageBreak
+ At least one more LaTeX rerun need to\MessageBreak
+ make note columns right%
+ }%
+ \aftergroup\@tempswatrue
+ \fi
+ \endgroup
+ }%
+}
+\scrlayerAddToInterface\makenote{%
+ \newcommand{\makenote}[2][marginpar]{%
+ \@bsphack
+ \pdfsavepos
+ \addtocontents{slnc}{%
+ \string\slnc@note{#1}%
+ {\noexpand\number\value{slncpage}}%
+ {\noexpand\number\pdflastypos}%
+ {#2}%
+ }%
+ \@esphack
+ }%
+}
+\@ifundefined{c@slncpage}{%
+ \newcounter{slncpage}%
+ \AddToLayerPageStyleOptions{@everystyle@}{%
+ onbackground=\stepcounter{slncpage}%
+ }%
+}{}
+\scrlayerAddToInterface\slnc@processnotes{%
+ \newcommand*{\slnc@processnotes}[1]{%
+ \begingroup
+ \slnc@readnotes{\value{slncpage}}%
+ \expandafter\let\expandafter\reserved@a
+ \csname slnc@#1@unprocessed\endcsname
+ \expandafter\global
+ \expandafter\let\csname slnc@#1@unprocessed\endcsname\@empty
+ \def\slnc@notesyncfonttest##1{%
+ \ifhmode
+ \PackageError{scrlayer-notecolumn}{%
+ illegal font setting for `notecolumn.##1'%
+ }{%
+ Current setting of font for `notecolumn.##1' switches
+ from\MessageBreak
+ vertical mode to horizontal mode. This is
+ illegal!\MessageBreak
+ You have to change the font setting to fix
+ this.\MessageBreak
+ If you'll continue vertical alignment of notes may fail%
+ }%
+ \par\vskip-\dimexpr \baselineskip+\parskip\relax
+ \fi
+ }%
+ \long\def\slnc@note##1##2##3##4{%
+ \let\PackageInfo\PackageWarning
+ \ifnum ##2>\value{slncpage}\relax
+ \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{%
+ \slnc@note{##1}{##2}{##3}{##4}%
+ }%
+ \else
+ \ifnum ##2<\value{slncpage}\relax
+ \PackageWarning{scrlayer-notecolumn}{note of type `#1' delayed.}%
+ \fi
+ \boxmaxdepth\maxdepth
+ \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
+ \expandafter\hsize\csname slnc@#1@width\endcsname
+ \normalfont\normalsize
+ {%
+ \let\color\@gobble
+ \usekomafont{notecolumn.#1}{%
+ \slnc@notesyncfonttest{#1}%
+ \expandafter\ifvoid\csname slnc@#1@box\endcsname
+ \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
+ \kern\dimexpr\topskip-\baselineskip\relax
+ }%
+ \fi
+ \scr@ifundefinedorrelax{pdfpageheight}{%
+ \@tempdima=\paperheight
+ }{%
+ \@tempdima=\pdfpageheight
+ }%
+ \@tempdima=\dimexpr \@tempdima-##3sp
+ -1in-\topmargin
+ -\headheight-\headsep
+ -\baselineskip
+ \relax
+ \@tempdimb=\dimexpr \expandafter\ht\csname slnc@#1@box\endcsname
+ +\expandafter\dp\csname slnc@#1@box\endcsname
+ \relax
+ \typeout{Soll: \the\@tempdima^^JIst: \space\the\@tempdimb}%
+ \ifdim\@tempdima<\@tempdimb
+ \PackageInfo{scrlayer-notecolumn}{%
+ Note moved down from\MessageBreak
+ \the\@tempdima\space to \the\@tempdimb\MessageBreak
+ at note box `#1'
+ }%
+ \else
+ \ifdim\@tempdima>\@tempdimb
+ \PackageInfo{scrlayer-notecolumn}{%
+ Adding vertical white space from\MessageBreak
+ \the\@tempdimb\space to \the\@tempdima\MessageBreak
+ into note box `#1'
+ }%
+ \expandafter\setbox\csname slnc@#1@box\endcsname
+ \vbox {%
+ \expandafter\unvbox\csname slnc@#1@box\endcsname
+ \kern\dimexpr\@tempdima-\@tempdimb\relax
+ }%
+ \fi
+ \fi
+ \expandafter\ifvoid\expandafter\csname slnc@#1@box\endcsname
+ \else
+ \@tempdima\dimexpr
+ \dp\strutbox
+ -\dp\csname slnc@#1@box\endcsname
+ \relax
+ \expandafter\unvbox\csname slnc@#1@box\endcsname
+ \ifdim\@tempdima>\z@ \kern\@tempdima\fi
+ \fi
+ \strut\ignorespaces ##4\par
+ }%
+ }%
+ }%
+ \fi
+ }%
+ \def\slnc@sync##1##2##3##4{%
+ \ifnum ##2>\value{slncpage}\relax
+ \expandafter\g@addto@macro\csname slnc@#1@unprocessed\endcsname{%
+ \slnc@sync{##1}{##2}{##3}{}%
+ }%
+ \else
+ \if@filesw
+ \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
+ \expandafter\unvbox\csname slnc@#1@box\endcsname
+ \pdfsavepos
+ \protected@write\@auxout{}{%
+ \string\newlabel{notecolumn.##1.##3.syncnote.label}{%
+ {%
+ \noexpand\number\pdflastypos
+ }{\thepage}%
+ }%
+ }%
+ }%
+ \fi
+ \fi
+ }%
+ \reserved@a
+ \expandafter\ifvoid\csname slnc@#1@box\endcsname
+ \PackageInfo{scrlayer-notecolumn}{Note box `#1' empty}%
+ \else
+ \ifdim \dimexpr \expandafter\ht\csname slnc@#1@box\endcsname
+ +\expandafter\dp\csname slnc@#1@box\endcsname
+ \relax >\textheight\relax
+ \PackageInfo{scrlayer-notecolumn}{Split note box `#1'}%
+ \splittopskip\topskip
+ \splitmaxdepth\baselineskip
+ \usekomafont{notecolumn.#1}{%
+ \expandafter\vsplit\csname slnc@#1@box\endcsname to
+ \textheight\relax
+ }%
+ \expandafter\ifvoid\csname slnc@#1@box\endcsname
+ \else
+ \expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
+ \expandafter\unvbox\csname slnc@#1@box\endcsname
+ }%
+ \fi
+ \else
+ \PackageInfo{scrlayer-notecolumn}{Flush note box `#1'}%
+ \usekomafont{notecolumn.#1}{%
+ \expandafter\box\csname slnc@#1@box\endcsname%
+ }%
+ \fi
+ \fi
+ \expandafter\global
+ \expandafter\setbox\csname slnc@#1@box\expandafter\endcsname
+ \expandafter\box\csname slnc@#1@box\endcsname
+ \endgroup
+ }
+}
+\scrlayerAddToInterface\slnc@readnotes{%
+ \newcommand*\slnc@readnotes[1]{%
+ \ifeof\slnc@file\else
+ \ifnum \number #1<\slnc@unprocessed\relax
+ \@tempswafalse
+ \else
+ \@tempswatrue
+ \fi
+ \@whilesw\if@tempswa\fi{%
+ \edef\reserved@a{%
+ \noexpand\makeatletter
+ \endlinechar\m@ne
+ \read\noexpand\slnc@file to\noexpand\reserved@a
+ \endlinechar\the\endlinechar\relax
+ \catcode`\noexpand\@=\the\catcode`\@\relax
+ }%
+ \reserved@a
+ \expandafter\slnc@iofv\expandafter\reserved@b\reserved@a
+ \@empty\@empty\@empty\@empty\@empty
+ \@tempswafalse
+ \@for\reserved@c :={\slnc@note },{\slnc@sync }\do{%
+ \ifx\reserved@b\reserved@c \@tempswatrue\fi
+ }%
+ \if@tempswa
+ \@tempswafalse
+ \expandafter\slnc@iiiofv\expandafter\reserved@b\reserved@a
+ \@empty\@empty\@empty\@empty\@empty
+ \ifx\reserved@b\@empty
+ \PackageError{scrlayer-notecolumn}{internal syntax error}{%
+ Unexpected syntax of file `\jobname.slnc'.\MessageBreak
+ Second argument should be a number.\MessageBreak
+ I don't know what to do with\MessageBreak
+ \expandafter\detokenize\expandafter{\reserved@a}%
+ }%
+ \@tempswatrue
+ \else
+ \global\let\slnc@unprocessed\reserved@b
+ \expandafter\slnc@iiofv\expandafter\reserved@b\reserved@a
+ \@empty\@empty\@empty\@empty\@empty
+ \@ifundefined{slnc@\reserved@b @unprocessed}{%
+ \PackageWarning{scrlayer-notecolumn}{%
+ column `\reserved@b' undefined.\MessageBreak
+ You should declare the column before the usage.\MessageBreak
+ Notes will be lost
+ }%
+ }{%
+ \expandafter\g@addto@macro
+ \csname slnc@\reserved@b @unprocessed\expandafter\endcsname
+ \expandafter{%
+ \reserved@a
+ }%
+ }%
+ \ifnum \number #1<\slnc@unprocessed\relax
+ \@tempswafalse
+ \else
+ \@tempswatrue
+ \fi
+ \fi
+ \else
+ \PackageInfo{scrlayer-notecolumn}{%
+ Ignoring `\expandafter\detokenize\expandafter{\reserved@a}'}%
+ \@tempswatrue
+ \fi
+ \ifeof\slnc@file\@tempswafalse\fi
+ }%
+ \fi
+ }%
+}
+\scrlayerAddToInterface\slnc@iofv{%
+ \newcommand\slnc@iofv[6]{\def#1{#2}}%
+}
+\scrlayerAddToInterface\slnc@iiofiv{%
+ \newcommand\slnc@iiofv[6]{\def#1{#3}}%
+}
+\scrlayerAddToInterface\slnc@iiiofiv{%
+ \newcommand\slnc@iiiofv[6]{\def#1{#4}}%
+}
+\scrlayerAddToInterface\slnc@unprocessed{%
+ \newcommand*{\slnc@unprocessed}{0}%
+}
+\scrlayerAddToInterface\slnc@mdfivesum{%
+ \let\slnc@mdfivesum\@empty
+}
+\scrlayerAddToInterface\slnc@file{%
+ \scr@ifundefinedorrelax{pdfmdfivesum}{}{%
+ \xdef\slnc@mdfivesum{\pdfmdfivesum file {\jobname.slnc}}%
+ \PackageInfo{scrlayer-notecolumn}{%
+ MD5 of last `\jobname.slnc':\MessageBreak
+ \slnc@mdfivesum}%
+ }%
+ \newread\slnc@file
+ \immediate\openin\slnc@file \jobname.slnc
+ \scrlayerOnAutoRemoveInterface{\immediate\closeout\slnc@file}%
+}
+\scrlayerAddToInterface\c@slnc@clearnote@label{%
+ \newcounter{slnc@clearnote@label}%
+}
+\scrlayerAddToInterface\clearnotecolumn{%
+ \newcommand*\clearnotecolumn[1][marginpar]{%
+ \begingroup
+ \slnc@autoclearnotecolumnsfalse
+ \stepcounter{slnc@clearnote@label}%
+ \if@filesw
+ \protected@write\@auxout{%
+ \let\theslncpage\relax
+ \let\slnc@voidtest\relax
+ }{%
+ \string\newlabel{notecolumn.\theslnc@clearnote@label}%
+ {{\theslncpage}{\slnc@voidtest{#1}}}%
+ }%
+ \fi
+ \scr@ifundefinedorrelax{r@notecolumn.\theslnc@clearnote@label}{%
+ \PackageInfo{scrlayer-notecolumn}{%
+ Using estimated to low value for clearing\MessageBreak
+ note colum `#1'%
+ }
+ \edef\slnc@cmp@value{\the\value{slncpage}}%
+ \let\reserved@a\z@
+ }{%
+ \edef\reserved@a{%
+ \@nameuse{r@notecolumn.\theslnc@clearnote@label}\@empty\@empty
+ }%
+ \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
+ \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
+ }%
+ \ifnum \reserved@a=\z@
+ \ifvmode
+ \ifdim \pagetotal<\topskip
+ \else
+ \slnc@readnotes{\slnc@cmp@value}%
+ \fi
+ \else
+ \slnc@readnotes{\slnc@cmp@value}%
+ \fi
+ \begingroup
+ \aftergroup\@tempswafalse
+ \long\def\slnc@note##1##2##3##4{%
+ \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi
+ }%
+ \let\slnc@sync\slnc@note
+ \csname slnc@#1@unprocessed\endcsname
+ \endgroup
+ \else
+ \PackageInfo{scrlayer-notecolumn}{%
+ box of note column `#1'\MessageBreak
+ not empty after page of \string\clearnotecolumn}%
+ \@tempswatrue
+ \fi
+ \if@tempswa
+ \IfLayerPageStyleExists{\currentpagestyle}{}{%
+ \PackageWarning{scrlayer-notecolumn}{%
+ \string\clearnotecolumn\space while active non-layer page
+ style.\MessageBreak
+ Activate empty page style until note column\MessageBreak
+ has been cleared%
+ }%
+ \pagestyle{empty}%
+ }%
+ \@tempswatrue
+ \fi
+ \@whilesw\if@tempswa\fi{%
+ \clearpage
+ \expandafter\ifcase \slnc@voidtest{#1}%
+ \begingroup
+ \aftergroup\@tempswafalse
+ \long\def\slnc@note##1##2##3##4{%
+ \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi
+ }%
+ \let\slnc@sync\slnc@note
+ \csname slnc@#1@unprocessed\endcsname
+ \endgroup
+ \else
+ \@tempswatrue
+ \fi
+ \if@tempswa
+ \null
+ \fi
+ }%
+ \endgroup
+ }%
+}
+\scrlayerAddToInterface{\slnc@firstof}{%
+ \def\slnc@firstof#1#2\@nil{#1}%
+}
+\scrlayerAddToInterface{slnc@secondof}{%
+ \def\slnc@secondof#1#2#3\@nil{#2}%
+}
+\scrlayerAddToInterface\slnc@voidtest{%
+ \newcommand*{\slnc@voidtest}[1]{%
+ \expandafter\ifvoid \csname slnc@#1@box\endcsname \z@\else \@ne\fi
+ }%
+}
+\scrlayerAddToInterface\clearnotecolumns{%
+ \newcommand*\clearnotecolumns[1][\relax]{%
+ \begingroup
+ \slnc@autoclearnotecolumnsfalse
+ \ifx\relax#1\relax\else
+ \let\slnc@processnotecolumns\@empty
+ \edef\reserved@a{#1}%
+ \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=%
+ \reserved@a\do {%
+ \ifx\reserved@a\@empty\else
+ \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns
+ \expandafter{\expandafter\@elt\expandafter{\reserved@a}}%
+ \fi
+ }%
+ \fi
+ \stepcounter{slnc@clearnote@label}%
+ \if@filesw
+ \begingroup
+ \def\@elt##1{+\slnc@voidtest{##1}}%
+ \protected@write\@auxout{%
+ \let\theslncpage\relax
+ \let\slnc@voidtest\relax
+ }{%
+ \string\newlabel{notecolumn.\theslnc@clearnote@label}%
+ {{\theslncpage}{\numexpr \slnc@processnotecolumns\relax}}%
+ }%
+ \endgroup
+ \fi
+ \scr@ifundefinedorrelax{r@notecolumn.\theslnc@clearnote@label}{%
+ \begingroup
+ \def\@elt##1{, `##1'}%
+ \PackageInfo{scrlayer-notecolumn}{%
+ Using estimated to low value for\MessageBreak
+ clearing note colums\MessageBreak
+ \expandafter\@gobble\slnc@processnotecolumns
+ }%
+ \endgroup
+ \edef\slnc@cmp@value{\the\value{slncpage}}%
+ \let\reserved@a\z@
+ }{%
+ \edef\reserved@a{%
+ \@nameuse{r@notecolumn.\theslnc@clearnote@label}\@empty\@empty
+ }%
+ \edef\slnc@cmp@value{\expandafter\slnc@firstof\reserved@a\@nil}%
+ \edef\reserved@a{\expandafter\slnc@secondof\reserved@a\@nil}%
+ }%
+ \ifcase \reserved@a\relax
+ \ifvmode
+ \ifdim \pagetotal<\topskip
+ \else
+ \slnc@readnotes{\slnc@cmp@value}%
+ \fi
+ \else
+ \slnc@readnotes{\slnc@cmp@value}%
+ \fi
+ \begingroup
+ \aftergroup\@tempswafalse
+ \long\def\slnc@note##1##2##3##4{%
+ \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi
+ }%
+ \let\slnc@sync\slnc@note
+ \def\@elt##1{\csname slnc@##1@unprocessed\endcsname}%
+ \slnc@processnotecolumns
+ \endgroup
+ \else
+ \PackageInfo{scrlayer-notecolumn}{%
+ box of at least one note column\MessageBreak
+ not empty after page of \string\clearnotecolumns}%
+ \@tempswatrue
+ \fi
+ \if@tempswa
+ \IfLayerPageStyleExists{\currentpagestyle}{}{%
+ \PackageWarning{scrlayer-notecolumn}{%
+ \string\clearnotecolumns\space while active non-layer page
+ style.\MessageBreak
+ Activate empty page style until note column\MessageBreak
+ has been cleared%
+ }%
+ \pagestyle{empty}%
+ }%
+ \@tempswatrue
+ \fi
+ \@whilesw\if@tempswa\fi{%
+ \clearpage
+ \begingroup
+ \def\@elt##1{+\slnc@voidtest{##1}}%
+ \ifcase \numexpr \slnc@processnotecolumns\relax
+ \aftergroup\@tempswafalse
+ \long\def\slnc@note##1##2##3##4{%
+ \ifnum ##2>\slnc@cmp@value\relax \else \aftergroup\@tempswatrue\fi
+ }%
+ \let\slnc@sync\slnc@note
+ \def\@elt##1{\csname slnc@##1@unprocessed\endcsname}%
+ \slnc@processnotecolumns
+ \else
+ \aftergroup\@tempswatrue
+ \fi
+ \endgroup
+ \if@tempswa
+ \null
+ \fi
+ }%
+ \endgroup
+ }%
+}
+\scrlayerAddToInterface{\c@slnc@syncpoint}{%
+ \newcounter{slnc@syncpoint}%
+}
+\scrlayerAddToInterface{\syncwithnotecolumn}{%
+ \newcommand*{\syncwithnotecolumn}[1][marginpar]{%
+ \begingroup
+ \edef\reserved@a{\endgroup\noexpand\syncwithnotecolumns[{#1}]}%
+ \reserved@a
+ }%
+}
+\scrlayerAddToInterface{\syncwithnotecolumns}{%
+ \newcommand*{\syncwithnotecolumns}[1][\relax]{%
+ \begingroup
+ \ifx\relax#1\relax\else
+ \let\slnc@processnotecolumns\@empty
+ \edef\reserved@a{#1}%
+ \expandafter\@for\expandafter\reserved@a\expandafter:\expandafter=%
+ \reserved@a\do {%
+ \ifx\reserved@a\@empty\else
+ \expandafter\l@addto@macro\expandafter\slnc@processnotecolumns
+ \expandafter{\expandafter\@elt\expandafter{\reserved@a}}%
+ \fi
+ }%
+ \fi
+ \stepcounter{slnc@syncpoint}%
+ \def\@elt##1{%
+ \addtocontents{slnc}{%
+ \string\slnc@sync{##1}%
+ {\noexpand\number\value{slncpage}}%
+ {\theslnc@syncpoint}%
+ {}%
+ }%
+ }%
+ \slnc@processnotecolumns
+ \ifvmode
+ \let\slnc@voffset\@empty%
+ \expandafter\@firstofone
+ \else
+ \PackageWarning{scrlayer-notecolumn}{%
+ \string\syncwithnotecolumn\space in hmode.\MessageBreak
+ Using \string\syncwithnotecolumn\space in horizontal\MessageBreak
+ mode may result in unwanted vertical\MessageBreak
+ space inside paragraphs and may lost\MessageBreak
+ colours of text of notes. \space So perhaps you\MessageBreak
+ should move \string\syncwithnotecolumn\space before\MessageBreak
+ or after the paragraph%
+ }%
+ \let\slnc@voffset\@empty%\def\slnc@voffset{-\number\baselineskip}%
+ \expandafter\slnc@vadjust
+ \fi
+ {%
+ \if@filesw
+ \pdfsavepos
+ \protected@write\@auxout{}{%
+ \string\newlabel{notecolumn.\theslnc@syncpoint.synctext.label}{%
+ {%
+ \noexpand\number
+ \numexpr \pdflastypos\slnc@voffset\relax
+ }{\thepage}%
+ }%
+ }%
+ \fi
+ \@ifundefined{r@notecolumn.\theslnc@syncpoint.synctext.label}{%
+ \PackageInfo{scrlayer-notecolumn}{%
+ No text label for \string\syncwithnotecolumn.\MessageBreak
+ Need rerun to sync position}%
+ }{%
+ \edef\reserved@a{%
+ \@nameuse{r@notecolumn.\theslnc@syncpoint.synctext.label}%
+ \@empty\@empty
+ }%
+ \edef\slnc@textpos{\expandafter\slnc@firstof\reserved@a\@nil}%
+ \edef\slnc@textpage{\expandafter\slnc@secondof\reserved@a\@nil}%
+ \let\slnc@notepos\slnc@textpos
+ \let\slnc@notepage\slnc@textpage
+ \def\@elt##1{%
+ \@ifundefined{r@notecolumn.##1.\theslnc@syncpoint.syncnote.label}{%
+ \PackageInfo{scrlayer-notecolumn}{%
+ No note label for sync with note column\MessageBreak
+ `##1'.\MessageBreak
+ Need rerun to sync position}%
+ \G@refundefinedtrue
+ }{%
+ \edef\reserved@a{%
+ \@nameuse{r@notecolumn.##1.\theslnc@syncpoint.syncnote.label}%
+ \@empty\@empty
+ }%
+ \edef\reserved@b{\expandafter\slnc@firstof\reserved@a\@nil}%
+ \edef\reserved@c{\expandafter\slnc@secondof\reserved@a\@nil}%
+ \ifnum \slnc@notepage<\reserved@c\relax
+ \let\slnc@notepos=\reserved@b
+ \let\slnc@notepage=\reserved@c
+ \else
+ \ifnum \slnc@notepage=\reserved@c\relax
+ \ifnum \slnc@notepos>\reserved@b
+ \let\slnc@notepos=\reserved@b
+ \let\slnc@notepage=\reserved@c
+ \fi
+ \fi
+ \fi
+ }%
+ }%
+ \slnc@processnotecolumns
+ \ifnum\slnc@textpage>\slnc@notepage\relax
+ \PackageInfo{scrlayer-notecolumn}{%
+ Last note page before last text page.\MessageBreak
+ Need rerun to sync position}%
+ \else
+ \ifnum\slnc@textpage<\slnc@notepage\relax
+ \@whilenum \slnc@textpage<\slnc@notepage\do {%
+ \newpage\null\vskip-\dimexpr \baselineskip+\parskip\relax
+ \edef\slnc@textpage{\the\numexpr\slnc@textpage+1\relax}%
+ }%
+ \scr@ifundefinedorrelax{pdfpageheight}{%
+ \@tempdima=\paperheight
+ }{%
+ \@tempdima=\pdfpageheight
+ }%
+ \@tempdima=\dimexpr \@tempdima
+ -\topmargin-1in
+ -\headheight-\headsep
+ -\topskip+\baselineskip
+ \relax
+ \edef\slnc@textpos{\number\@tempdima}%
+ \PackageInfo{scrlayer-notecolumn}{%
+ Top position is \slnc@textpos%
+ }%
+ \fi
+ \ifnum\slnc@notepos>\slnc@textpos\relax
+ \PackageInfo{scrlayer-notecolumn}{%
+ Last note position before last text\MessageBreak
+ position.\MessageBreak
+ Need rerun to sync position%
+ }%
+ \else
+ \ifnum\slnc@notepos<\slnc@textpos\relax
+ \@tempdima=\numexpr \slnc@textpos-\slnc@notepos\relax sp
+ \PackageInfo{scrlayer-notecolumn}{%
+ skipping \the\@tempdima\space to sync%
+ }%
+ \vskip\@tempdima
+ \fi
+ \fi
+ \fi
+ }%
+ }%
+ \endgroup
+ }%
+}
+\scrlayerAddToInterface\slnc@vadjust{%
+ \newcommand{\slnc@vadjust}[1]{%
+ \@bsphack
+ \vadjust{#1}%
+ \@esphack
+ }%
+}
+\DeclareNoteColumn{marginpar}
+\let\reserved@a\clearpage
+\def\clearpage{%
+ \ifslnc@autoclearnotecolumns\clearnotecolumns\relax\fi
+}%
+\expandafter\g@addto@macro\expandafter\clearpage\expandafter{\reserved@a}
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
+\@ifundefined{KOMAScript}{%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}}{}
+\endinput
+%%
+%% End of file `scrlayer-notecolumn.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
new file mode 100644
index 00000000000..6519c581d17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -0,0 +1,1665 @@
+%%
+%% This is file `scrlayer-scrpage.sty',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,identify')
+%% scrlayer.dtx (with options: `interface,trace,scrpage,init')
+%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,init')
+%% scrlayer.dtx (with options: `interface,trace,scrpage,options')
+%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,options')
+%% scrlayer.dtx (with options: `interface,trace,scrpage,body')
+%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 2012-2013 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (identify)
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{scrlayer-scrpage}[%
+ 14/12/2013 v0.9.1548
+ package
+ (end user interface for scrlayer)]
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init)
+\RequirePackage{scrlayer}
+\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
+ \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
+}{%
+ \ifx\scrlayer@AtEndOfPackage\@firstofone
+ \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
+ \fi
+}
+\let\scrlayer@AtEndOfPackage\AtEndOfPackage
+\scrlayerInitInterface
+%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (init)
+\AtEndOfPackage{%
+ \scr@ifundefinedorrelax{KOMAClassName}{%
+ \PackageInfoNoLine{scrlayer-scrpage}{%
+ auto-selection of `pagestyleset=standard'}%
+ \FamilyExecuteOptions[.scrlayer-scrpage.sty]{KOMA}{pagestyleset=standard}%
+ }{%
+ \PackageInfoNoLine{scrlayer-scrpage}{%
+ auto-selection of `pagestyleset=KOMA-Script'}%
+ \FamilyExecuteOptions[.scrlayer-scrpage.sty]{KOMA}%
+ {pagestyleset=KOMA-Script}%
+ }%
+}
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (options)
+\KOMA@key{markcase}{%
+\scrlayer@AtEndOfPackage{%
+ \begingroup
+ \KOMA@set@ncmdkey{markcase}{reserved@a}{%
+ {upper}{0},{lower}{1},{used}{2},%
+ {ignoreuppercase}{3},{nouppercase}{3},%
+ {ignoreupper}{3},{noupper}{3}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifnum \reserved@a>\m@ne
+ \aftergroup\let\aftergroup\MakeMarkcase
+ \ifcase \reserved@a
+ \aftergroup\MakeUppercase
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \or
+ \aftergroup\MakeLowercase
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \or
+ \aftergroup\@firstofone
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \else
+ \aftergroup\scrlayer@ignoreuppercase
+ \aftergroup\scrlayer@forceignoreuppercasetrue
+ \fi
+ \fi
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
+ \fi
+ \endgroup
+}%
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @markcase}
+\KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autooneside}
+\KOMA@key{automark}[]{%
+ \scrlayer@testunexpectedarg{automark}{#1}%
+ \scrlayer@AtEndOfPackage{%
+ \if@chapter
+ \automark[section]{chapter}%
+ \else
+ \automark[subsection]{section}%
+ \fi
+ }%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @automark@default}
+\KOMA@key{manualmark}[]{%
+ \scrlayer@testunexpectedarg{manualmark}{#1}%
+ \scrlayer@AtEndOfPackage{\manualmark}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @manualmark@default}
+\KOMA@key{onpsselect}{%
+ \l@addto@macro{\@ps@initialhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsselect@default}
+\KOMA@key{onpsinit}{%
+ \l@addto@macro{\@ps@hook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsinit@default}
+\KOMA@key{onpsoneside}{%
+ \l@addto@macro{\@ps@onesidehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoneside@default}
+\KOMA@key{onpstwoside}{%
+ \l@addto@macro{\@ps@twosidehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpstwoside@default}
+\KOMA@key{onpsoddpage}{%
+ \l@addto@macro{\@ps@oddpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsoddpage@default}
+\KOMA@key{onpsevenpage}{%
+ \l@addto@macro{\@ps@evenpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsevenpage@default}
+\KOMA@key{onpsfloatpage}{%
+ \l@addto@macro{\@ps@floatpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsfloatpage@default}
+\KOMA@key{onpsnonfloatpage}{%
+ \l@addto@macro{\@ps@nonfloatpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsnonfloatpage}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default}
+\KOMA@key{onpsbackground}{%
+ \l@addto@macro{\@ps@backgroundhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsbackground}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @onpsbackground@default}
+\KOMA@key{onpsforeground}{%
+ \l@addto@macro{\@ps@foregroundhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @onpsforeground}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @onpsforeground@default}
+\KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @deactivatepagestylelayers}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default}
+\KOMA@ifkey{draft}{scrlayer@draft}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @draft@default}
+\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @forceoverwrite@default}
+\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
+\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoremoveinterfaces}
+\scrlayer@AddCsToInterface{%
+ KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default}
+%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (options)
+\KOMA@key{headwidth}{%
+ \begingroup
+ \sls@split@at@colon#1::\@nil
+ \ifx\reserved@a\@empty \let\reserved@a\sls@headwidth\fi
+ \edef\reserved@a{%
+ \noexpand\endgroup
+ \noexpand\sls@set@hf@width{head}{\reserved@b}{\reserved@a}%
+ }%
+ \reserved@a
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth@default}
+\KOMA@key{footwidth}{%
+ \begingroup
+ \sls@split@at@colon#1::\@nil
+ \ifx\reserved@a\@empty \let\reserved@a\sls@footwidth\fi
+ \edef\reserved@a{%
+ \noexpand\endgroup
+ \noexpand\sls@set@hf@width{foot}{\reserved@b}{\reserved@a}%
+ }%
+ \reserved@a
+ \FamilyKeyStateProcessed
+}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth@default}
+\scrlayerAddToInterface\sls@split@at@colon{%
+ \def\sls@split@at@colon#1:#2:#3\@nil{%
+ \ifstr{#3}{}{}{%
+ \ifstr{#3}{:}{}{%
+ \PackageWarning{scrlayer}{extra `:' found!\MessageBreak
+ You've used more than one colon at the argument\MessageBreak
+ of a two value option.\MessageBreak
+ The extra value(s) will be ignored%
+ }%
+ }%
+ }%
+ \def\reserved@a{#1}%
+ \def\reserved@b{#2}%
+ }%
+}
+\scrlayerAddToInterface\sls@set@hf@width{%
+ \newcommand*{\sls@set@hf@width}[3]{%
+ \sls@settowidthof{\@tempdima}{#3}%
+ \ifdim\@tempdima>\paperwidth
+ \PackageWarning
+ {scrlayer-scrpage}%
+ {You've set width of #1 to a value\MessageBreak
+ greater than width of page!\MessageBreak%
+ I'll reduce width of #1 to width of page}%
+ \setlength{\@tempdima}{\paperwidth}%
+ \else
+ \ifdim\@tempdima<\z@
+ \PackageWarning
+ {scrlayer-scrpage}%
+ {You've set width of #1 to negative value!\MessageBreak%
+ I'll set it to 0pt}%
+ \setlength{\@tempdima}{\z@}%
+ \fi
+ \fi
+ \expandafter\edef\csname sls@#1width\endcsname{\the\@tempdima}%
+ \setlength{\@tempdima}{\textwidth}%
+ \addtolength{\@tempdima}{-\csname sls@#1width\endcsname}%
+ \ifstr{#2}{}{%
+ \ifdim \csname sls@#1width\endcsname
+ = \dimexpr \textwidth+\marginparwidth+\marginparsep\relax
+ \setlength{\@tempdimb}{\z@}
+ \else
+ \if@twoside
+ \setlength{\@tempdimb}{.3333333333\@tempdima}%
+ \else
+ \setlength{\@tempdimb}{.5\@tempdima}%
+ \fi
+ \fi
+ }{%
+ \sls@settowidthof{\@tempdimb}{#2}%
+ }
+ \addtolength{\@tempdima}{-\@tempdimb}%
+ \ifdim\@tempdimb<\z@
+ \setlength{\@tempdimb}{-\@tempdimb}%
+ \expandafter\edef\csname sls@odd#1shift\endcsname{-\the\@tempdimb}%
+ \else
+ \expandafter\edef\csname sls@odd#1shift\endcsname{\the\@tempdimb}%
+ \fi
+ \ifdim\@tempdima<\z@
+ \setlength{\@tempdima}{-\@tempdima}%
+ \expandafter\edef\csname sls@even#1shift\endcsname{-\the\@tempdima}%
+ \else
+ \expandafter\edef\csname sls@even#1shift\endcsname{\the\@tempdima}%
+ \fi
+ }%
+}
+\scrlayerAddToInterface\sls@headwidth{%
+ \scr@ifundefinedorrelax{@headwidth}{%
+ \newcommand*{\sls@headwidth}{\textwidth}%
+ }{%
+ \newcommand*{\sls@headwidth}{\@headwidth}%
+ }%
+}
+\scrlayerAddToInterface\sls@oddheadshift{\newcommand*{\sls@oddheadshift}{\z@}}
+\scrlayerAddToInterface\sls@evenheadshift{\newcommand*{\sls@evenheadshift}{\z@}}
+\scrlayerAddToInterface\sls@footwidth{%
+ \scr@ifundefinedorrelax{@footwidth}{%
+ \newcommand*{\sls@footwidth}{\textwidth}%
+ }{%
+ \newcommand*{\sls@footwidth}{\@footwidth}%
+ }%
+}
+\scrlayerAddToInterface\sls@oddfootshift{\newcommand*{\sls@oddfootshift}{\z@}}
+\scrlayerAddToInterface\sls@evenfootshift{\newcommand*{\sls@evenfootshift}{\z@}}
+\scrlayerAddToInterface\sls@settotwidthof{%
+ \newcommand*{\sls@settowidthof}[2]{%
+ \ifstr{#2}{paper}{%
+ \setlength{#1}{\paperwidth}%
+ }{%
+ \ifstr{#2}{text}{%
+ \setlength{#1}{\textwidth}%
+ }{%
+ \ifstr{#2}{marginpar}{%
+ \setlength{#1}{\dimexpr \marginparwidth+\marginparsep\relax}%
+ }{%
+ \ifstr{#2}{textwithmarginpar}{%
+ \setlength{#1}{\dimexpr\textwidth
+ +\marginparwidth
+ +\marginparsep\relax}%
+ }{%
+ \ifstr{#2}{head}{%
+ \setlength{#1}{\sls@headwidth}%
+ }{%
+ \ifstr{#2}{foot}{%
+ \setlength{#1}{\sls@footwidth}%
+ }{%
+ \ifstr{#2}{headtopline}{%
+ \setlength{#1}{\sls@headabove@linelength}%
+ }{%
+ \ifstr{#2}{headsepline}{%
+ \setlength{#1}{\sls@headbelow@linelength}%
+ }{%
+ \ifstr{#2}{footsepline}{%
+ \setlength{#1}{\sls@footabove@linelength}%
+ }{%
+ \ifstr{#2}{footbotline}{%
+ \setlength{#1}{\sls@footbelow@linelength}%
+ }{%
+ \ifstr{#2}{page}{%
+ \setlength{#1}{\paperwidth}%
+ \begingroup
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname ta@bcor\endcsname\relax\else
+ \addtolength{#1}{-\ta@bcor}%
+ \fi
+ }{%
+ \setlength{#1}{\dimexpr #2\relax}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+}
+\scrlayerAddToInterface\sls@deftowidthof{%
+ \newcommand*{\sls@deftowidthof}[2]{%
+ \ifstr{#2}{autohead}{%
+ \expandafter\def\csname #1\endcsname{\sls@headwidth}%
+ }{%
+ \ifstr{#2}{autofoot}{%
+ \expandafter\def\csname #1\endcsname{\sls@footwidth}%
+ }{%
+ \sls@settowidthof{\@tempdima}{#2}%
+ \expandafter\edef\csname #1\endcsname{\the\@tempdima}%
+ }%
+ }%
+ }%
+}
+\KOMA@key{headtopline}[:]{\sls@set@values{head}{above}{#1}}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headtopline}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headtopline@default}
+\KOMA@key{headsepline}[:]{\sls@set@values{head}{below}{#1}}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headsepline}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headsepline@default}
+\KOMA@key{footsepline}[:]{\sls@set@values{foot}{above}{#1}}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footsepline}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footsepline@default}
+\KOMA@key{footbotline}[:]{\sls@set@values{foot}{below}{#1}}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline@default}
+\scrlayerAddToInterface\sls@set@values{%
+ \newcommand*{\sls@set@values}[3]{%
+ \begingroup
+ \let\reserved@a\@empty
+ \let\reserved@b\@empty
+ \ifstr{#3}{true}{\def\reserved@a{.4pt}\def\reserved@b{sls@#1width}}{%
+ \ifstr{#3}{yes}{\def\reserved@a{.4pt}\def\reserved@b{sls@#1width}}{%
+ \ifstr{#3}{on}{\def\reserved@a{.4pt}\def\reserved@b{sls@#1width}}{%
+ \ifstr{#3}{false}{\def\reserved@a{\z@}\def\reserved@b{z@}}{%
+ \ifstr{#3}{no}{\def\reserved@a{\z@}\def\reserved@b{z@}}{%
+ \ifstr{#3}{off}{\def\reserved@a{\z@}\def\reserved@b{z@}}{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ \ifx\reserved@a\@empty
+ \sls@split@at@colon#3::\@nil
+ \ifx\reserved@a\@empty
+ \def\reserved@a{\endgroup\@namedef{sls@#1#2@linethickness}{.4pt}}%
+ \else
+ \setlength{\@tempdima}{\dimexpr\reserved@a\relax}%
+ \edef\reserved@a{%
+ \noexpand\endgroup
+ \noexpand\@namedef{sls@#1#2@linethickness}{\the\@tempdima}%
+ }%
+ \fi
+ \ifx\reserved@b\@empty
+ \def\reserved@b{%
+ \reserved@a
+ \@namedef{sls@#1#2@linelength}{\@nameuse{sls@#1width}}%
+ }%
+ \else
+ \edef\reserved@b{%
+ \noexpand\reserved@a
+ \noexpand\sls@deftowidthof{sls@#1#2@linelength}{\reserved@b}%
+ }%
+ \fi
+ \else
+ \edef\reserved@b{%
+ \noexpand\endgroup
+ \noexpand\@namedef{sls@#1#2@linethickness}{\reserved@a}%
+ \noexpand\@namedef{sls@#1#2@linelength}{%
+ \expandafter\noexpand\csname \reserved@b\endcsname
+ }%
+ }%
+ \fi
+ \reserved@b
+ }%
+}
+\scrlayerAddToInterface\sls@headabove@linelength{%
+ \newcommand*{\sls@headabove@linelength}{\sls@headwidth}%
+}
+\scrlayerAddToInterface\sls@headabove{%
+ \newcommand*{\sls@headabove@linethickness}{\z@}%
+}
+\scrlayerAddToInterface\sls@headbelow@linelength{%
+ \newcommand*{\sls@headbelow@linelength}{\sls@headwidth}%
+}
+\scrlayerAddToInterface\sls@headbelow@linethickness{%
+ \newcommand*{\sls@headbelow@linethickness}{\z@}%
+}
+\scrlayerAddToInterface\sls@footabove@linelength{%
+ \newcommand*{\sls@footabove@linelength}{\sls@footwidth}%
+}
+\scrlayerAddToInterface\sls@footabove@linethickness{%
+ \newcommand*{\sls@footabove@linethickness}{\z@}%
+}
+\scrlayerAddToInterface\sls@footbelow@linelength{%
+ \newcommand*{\sls@footbelow@linelength}{\sls@footwidth}%
+}
+\scrlayerAddToInterface\sls@footbelow@linethickness{%
+ \newcommand*{\sls@footbelow@linethickness}{\z@}%
+}
+\scrlayerAddCsToInterface{ifsls@plain@head@above@line}{%
+ \KOMA@ifkey{plainheadtopline}{sls@plain@head@above@line}%
+ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainheadtopline}%
+ \scrlayer@AddCsToInterface{%
+ KV@KOMA.scrlayer-scrpage.sty@plainheadtopline@default}%
+ \scrlayer@AddCsToInterface{sls@plain@head@above@linetrue}
+ \scrlayer@AddCsToInterface{sls@plain@head@above@linefalse}
+}
+\scrlayerAddCsToInterface{ifsls@plain@head@sbelow@line}{%
+ \KOMA@ifkey{plainheadsepline}{sls@plain@head@below@line}%
+ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainheadsepline}%
+ \scrlayer@AddCsToInterface{%
+ KV@KOMA.scrlayer-scrpage.sty@plainheadsepline@default}%
+ \scrlayer@AddCsToInterface{sls@plain@head@below@linetrue}%
+ \scrlayer@AddCsToInterface{sls@plain@head@below@linefalse}%
+}
+\scrlayerAddCsToInterface{ifsls@plain@foot@above@line}{%
+ \KOMA@ifkey{plainfootsepline}{sls@plain@foot@above@line}%
+ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainfootsepline}%
+ \scrlayer@AddCsToInterface{%
+ KV@KOMA.scrlayer-scrpage.sty@plainfootsepline@default}%
+ \scrlayer@AddCsToInterface{sls@plain@foot@above@linetrue}%
+ \scrlayer@AddCsToInterface{sls@plain@foot@above@linefalse}%
+}
+\scrlayerAddCsToInterface{ifsls@plain@foot@below@line}{%
+ \KOMA@ifkey{plainfootbotline}{sls@plain@foot@below@line}%
+ \scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainfootbotline}%
+ \scrlayer@AddCsToInterface{%
+ KV@KOMA.scrlayer-scrpage.sty@plainfootbotline@default}%
+ \scrlayer@AddCsToInterface{sls@plain@foot@below@linetrue}%
+ \scrlayer@AddCsToInterface{sls@plain@foot@below@linefalse}%
+}
+\scrlayerAddToInterface\sls@hfline@adjust{%
+ \newcommand*{\sls@hfline@adjust}{0}%
+}
+\KOMA@key{ilines}[]{%
+ \ifx\relax#1\relax
+ \renewcommand*{\sls@hfline@adjust}{0}%
+ \FamilyKeyStateProcessed
+ \else
+ \def\FamilyKeyStateProcessed{unexpected value}%
+ \fi
+}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@ilines}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@ilines@default}
+\KOMA@key{clines}[]{%
+ \ifx\relax#1\relax
+ \renewcommand*{\sls@hfline@adjust}{1}%
+ \FamilyKeyStateProcessed
+ \else
+ \def\FamilyKeyStateProcessed{unexpected value}%
+ \fi
+}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@clines}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@clines@default}
+\KOMA@key{olines}[]{%
+ \ifx\relax#1\relax
+ \renewcommand*{\sls@hfline@adjust}{2}%
+ \FamilyKeyStateProcessed
+ \else
+ \def\FamilyKeyStateProcessed{unexpected value}%
+ \fi
+}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@olines}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@olines@default}
+\KOMA@key{pagestyleset}{%
+ \scr@ifundefinedorrelax{sls@ps@style@#1}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \@nameuse{sls@ps@style@#1}%
+ \FamilyKeyStateProcessed
+ }%
+}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@pagestyleset}
+\scrlayerAddToInterface\sls@ps@style@standard{%
+ \newcommand*{\sls@ps@style@standard}{%
+ \let\MakeMarkcase\MakeUppercase
+ \scrlayer@AtEndOfPackage{%
+ \pagestyle{scrheadings}%
+ \clearpairofpagestyles
+ \ihead{\headmark}%
+ \ohead{\pagemark}%
+ \cfoot[\if@twoside\else\pagemark\fi]{}%
+ }%
+ }%
+}
+\scrlayerAddCsToInterface{sls@ps@style@KOMA-Script}{%
+ \@namedef{sls@ps@style@KOMA-Script}{%
+ \let\MakeMarkcase\@firstofone
+ \scrlayer@AtEndOfPackage{%
+ \pagestyle{scrheadings}%
+ \clearpairofpagestyles
+ \ohead{\if@twoside\headmark\fi}%
+ \chead{\if@twoside\else\headmark\fi}%
+ \ofoot[\if@twoside\pagemark\fi]{\if@twoside\pagemark\fi}%
+ \cfoot[\if@twoside\else\pagemark\fi]{\if@twoside\else\pagemark\fi}%
+ \scr@ifundefinedorrelax{KOMAClassName}{}{%
+ \ifstr{\KOMAClassName}{scrlttr2}{%
+ \clearpairofpagestyles
+ \lehead[\ifnum\@pageat\z@\pagemark\fi]
+ {\ifnum\@pageat\z@\pagemark\else\leftmark\fi}%
+ \lohead[\ifnum\@pageat\z@\pagemark\fi]
+ {\ifnum\@pageat\z@\pagemark\else\leftmark\fi}%
+ \chead[\ifnum\@pageat\@ne\pagemark\fi]
+ {\ifcase\@pageat \rightmark\or \pagemark\or \rightmark\fi}%
+ \rehead[\ifnum\@pageat\tw@\pagemark\fi]
+ {\ifcase\@pageat \leftmark\or \rightmark\or \pagemark
+ \else \rightmark\fi}%
+ \rohead[\ifnum\@pageat\tw@\pagemark\fi]
+ {\ifcase\@pageat \leftmark\or \rightmark\or \pagemark
+ \else \rightmark\fi}%
+ \lefoot[\ifnum\@pageat\thr@@\pagemark\fi]
+ {\ifnum\@pageat\thr@@\pagemark\fi}%
+ \cfoot[\ifnum\@pageat 4 \pagemark\fi]
+ {\ifnum\@pageat 4 \pagemark\fi}%
+ \refoot[\ifnum\@pageat 5 \pagemark\fi]
+ {\ifnum\@pageat 5 \pagemark\fi}%
+ }{}%
+ }%
+ }%
+ }%
+}
+\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{komastyle}{%
+ pagestyleset=KOMA-Script}
+\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{standardstyle}{%
+ pagestyleset=standard}
+\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{markuppercase}{markcase=upper}
+\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{markusedcase}{markcase=used}
+\KOMA@DeclareDeprecatedOption[scrlayer-scrpage]{nouppercase}{%
+ markcase=ignoreuppercase%
+}
+\KOMA@ifkey{hmode}{sls@leavevmode}
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode}%
+\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
+\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
+\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (body)
+\KOMAProcessOptions\relax
+%%% From File: $Id: scrlayer-scrpage.dtx 1548 2013-12-14 17:36:23Z mjk $ (body)
+\scrlayerAddToInterface\setheadwidth{%
+ \newcommand*{\setheadwidth}[2][]{%
+ \KOMAoptions{headwidth=#2:#1}%
+ }%
+}
+\scrlayerAddToInterface\setfootwidth{%
+ \newcommand*{\setfootwidth}[2][]{%
+ \KOMAoptions{footwidth=#2:#1}%
+ }%
+}
+\scrlayerAddToInterface\setheadtopline{%
+ \newcommand*{\setheadtopline}{\sls@setline{head}{above}}%
+}
+\scrlayerAddToInterface\setheadsepline{%
+ \newcommand*{\setheadsepline}{\sls@setline{head}{below}}%
+}
+\scrlayerAddToInterface\setfootsepline{%
+ \newcommand*{\setfootsepline}{\sls@setline{foot}{above}}%
+}
+\scrlayerAddToInterface\setfootbotline{%
+ \newcommand*{\setfootbotline}{\sls@setline{foot}{below}}%
+}
+\scrlayerAddToInterface\sls@setline{%
+ \newcommand*\sls@setline[2]{%
+ \@ifnextchar[%]
+ {\sls@@setline{#1}{#2}}{\sls@@@setline{#1#2}}%
+ }%
+}
+\scrlayerAddToInterface\sls@@setline{%
+ \def\sls@@setline#1#2[#3]{%
+ \ifstr{#3}{auto}{%
+ \sls@deftowidthof{sls@#1#2@linelength}{#3#1}%
+ }{%
+ \sls@deftowidthof{sls@#1#2@linelength}{#3}%
+ }%
+ \sls@@@setline{#1#2}%
+ }%
+}
+\scrlayerAddToInterface\sls@@@setline{%
+ \def\sls@@@setline#1#2{%
+ \edef\@tempa{#2}\edef\@tempb{current}
+ \ifstr{#2}{}{}{%
+ \ifstr{#2}{current}{}{%
+ \setlength{\@tempdima}{#2}%
+ \expandafter\edef\csname sls@#1@linethickness\endcsname%
+ {\the\@tempdima}%
+ }%
+ }%
+ \PackageWarning{scrlayer-scrpage}{%
+ Command deprecated!\MessageBreak
+ Usage of `\string\setheadtopline',
+ `\string\setheadsepline',\MessageBreak
+ `\string\setfootsepline', and `\string\setfootbotline'\MessageBreak
+ became deprecated with scrlayer-scrpage.\MessageBreak
+ You should use KOMA-Script options\MessageBreak
+ `headsepline', `headtopline', `footsepline',\MessageBreak
+ or `footbotline' with values\MessageBreak
+ `<line thickness>:<line length>' to setup\MessageBreak
+ the line length and thickness, and\MessageBreak
+ `\string\setkomafont' or `\string\addtokomafont' to\MessageBreak
+ setup the colour%
+ }%
+ \@ifnextchar[%]
+ {%
+ \sls@@@@setline{#1}%
+ }{%
+ }%
+ }%
+}
+\scrlayerAddToInterface\sls@@@@setline{%
+ \def\sls@@@@setline#1[#2]{%
+ \ifstr{#1}{headabove}{\setkomafont{headtopline}{#2}}{%
+ \ifstr{#1}{headbelow}{\setkomafont{headsepline}{#2}}{%
+ \ifstr{#1}{footabove}{\setkomafont{footsepline}{#2}}{%
+ \setkomafont{footbotline}{#2}%
+ }%
+ }%
+ }%
+ }%
+}
+\@ifundefined{scr@fnt@headtopline}{%
+ \@ifundefined{@headtoplinefont}{%
+ \scrlayer@AddCsToInterface{@headtoplinefont}%
+ }{}%
+ \newkomafont{headtopline}{}%
+ \scrlayer@AddCsToInterface{scr@fnt@headtopline}%
+}{}
+\@ifundefined{scr@fnt@headsepline}{%
+ \@ifundefined{@headseplinefont}{%
+ \scrlayer@AddCsToInterface{@headseplinefont}%
+ }{}%
+ \newkomafont{headsepline}{}%
+ \scrlayer@AddCsToInterface{scr@fnt@headsepline}%
+}{}
+\@ifundefined{scr@fnt@footsepline}{%
+ \@ifundefined{@footseplinefont}{%
+ \scrlayer@AddCsToInterface{@footseplinefont}%
+ }{}%
+ \newkomafont{footsepline}{}%
+ \scrlayer@AddCsToInterface{scr@fnt@footsepline}%
+}{}
+\@ifundefined{scr@fnt@footbotline}{%
+ \@ifundefined{@footbotlinefont}{%
+ \scrlayer@AddCsToInterface{@footbotlinefont}%
+ }{}%
+ \newkomafont{footbotline}{}%
+ \scrlayer@AddCsToInterface{scr@fnt@footbotline}%
+}{}
+\AtBeginDocument{%
+ \ifdim \headheight <\baselineskip
+ \PackageWarningNoLine{scrlayer-scrpage}{Very small head height
+ detected!\MessageBreak
+ Using scrlayer-scrpage the head height\MessageBreak
+ should be at least \string\baselineskip, which is\MessageBreak
+ \the\baselineskip\space currently.\MessageBreak
+ But head height is currently
+ \the\headheight\space only.\MessageBreak
+ You may use\MessageBreak
+ \@ifpackageloaded{geometry}{%
+ geometry option `head=\the\baselineskip'%
+ }{%
+ \@ifpackageloaded{typearea}{%
+ typearea option `headheight=\the\baselineskip'%
+ }{%
+ \string\setlength{\string\headheight}{\the\baselineskip}%
+ }%
+ }\MessageBreak
+ to avoid this warning%
+ }%
+ \fi
+}
+\scrlayerAddToInterface\defpagestyle{%
+ \newcommand*{\defpagestyle}[3]{%
+ \sls@defhead{#1}#2\@empty\@empty\@empty
+ \sls@deffoot{#1}#3\@empty\@empty\@empty
+ \DeclarePageStyleByLayers{#1}{%
+ #1.head.odd,#1.head.even,#1.head.oneside,%
+ #1.head.above.line,#1.head.below.line,%
+ #1.foot.odd,#1.foot.even,#1.foot.oneside,%
+ #1.foot.above.line,#1.foot.below.line%
+ }%
+ \edef\reserved@a{%
+ \noexpand\scrlayerOnAutoRemoveInterface[scrlayer-scrpage.sty]{%
+ \noexpand\DestroyLayer{#1.head.odd}%
+ \noexpand\DestroyLayer{#1.head.even}%
+ \noexpand\DestroyLayer{#1.head.oneside}%
+ \noexpand\DestroyLayer{#1.head.above.line}%
+ \noexpand\DestroyLayer{#1.head.below.line}%
+ \noexpand\DestroyLayer{#1.foot.odd}%
+ \noexpand\DestroyLayer{#1.foot.even}%
+ \noexpand\DestroyLayer{#1.foot.oneside}%
+ \noexpand\DestroyLayer{#1.foot.above.line}%
+ \noexpand\DestroyLayer{#1.foot.below.line}%
+ \noexpand\ifstr{\noexpand\currentpagestyle}{#1}{%
+ \noexpand\PackageWarning{scrlayer-scrpage}{%
+ page style `#1' not longer valid.\noexpand\MessageBreak
+ The page style has been defined using\noexpand\MessageBreak
+ interface `scrlayer-scrpage.sty', that\noexpand\MessageBreak
+ has been removed%
+ }%
+ }{}%
+ \noexpand\DestroyRealLayerPageStyle{#1}%
+ }%
+ }\reserved@a
+ }%
+}
+\scrlayerAddToInterface\sls@defhead{%
+ \newcommand*\sls@defhead[1]{%
+ \@ifnextchar(%)
+ {\sls@@defhead{#1}}%
+ {\sls@@defhead{#1}(\sls@headabove@linelength,\sls@headabove@linethickness)}%
+ }%
+}
+\scrlayerAddToInterface\sls@@defhead{%
+ \def\sls@@defhead#1(#2,#3)#4#5#6{%
+ \@ifnextchar(%)
+ {\sls@@@defhead{#1}({#2},{#3}){#4}{#5}{#6}}%
+ {\sls@@@defhead{#1}%
+ ({#2},{#3})%
+ {#4}{#5}{#6}%
+ (\sls@headbelow@linelength,\sls@headbelow@linethickness)}%
+ }%
+}
+\scrlayerAddToInterface\sls@@@defhead{%
+ \def\sls@@@defhead#1(#2,#3)#4#5#6(#7,#8){%
+ \DeclareLayer[%
+ background,%
+ hoffset=\sls@leftmargin{head},%
+ voffset=\sls@topmargin+\dp\strutbox,%
+ width=\sls@headwidth,%
+ height=0pt,%
+ align=bl,%
+ contents={%
+ {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{%
+ \sls@hf@rule{headtop}{#2}{#3}}}}%
+ }%
+ ]{#1.head.above.line}%
+ \DeclareLayer[%
+ background,%
+ hoffset=\sls@leftmargin{head},%
+ voffset=\sls@topmargin+\headheight-\ht\strutbox+#8,%
+ width=\sls@headwidth,%
+ height=0pt,%
+ align=tl,%
+ contents={%
+ {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{%
+ \sls@hf@rule{headsep}{#7}{#8}}}}%
+ }%
+ ]{#1.head.below.line}%
+ \DeclareLayer[%
+ background,evenpage,twoside,%
+ head,%
+ hoffset=\sls@leftmargin{head},%
+ width=\sls@headwidth,%
+ contents={%
+ \sls@secure@box\headheight{%
+ \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#4}}}}%
+ ]{#1.head.odd}%
+ \DeclareLayer[%
+ background,oddpage,twoside,%
+ head,%
+ hoffset=\sls@leftmargin{head},%
+ width=\sls@headwidth,%
+ contents={%
+ \sls@secure@box\headheight{%
+ \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#5}}}}%
+ ]{#1.head.even}%
+ \DeclareLayer[%
+ background,oddpage,oneside,%
+ head,%
+ hoffset=\sls@leftmargin{head},%
+ width=\sls@headwidth,%
+ contents={%
+ \sls@secure@box\headheight{%
+ \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagehead}{#6}}}}%
+ ]{#1.head.oneside}%
+ }%
+}
+\scrlayerAddToInterface\sls@deffoot{%
+ \newcommand*\sls@deffoot[1]{%
+ \@ifnextchar(%)
+ {\sls@@deffoot{#1}}%
+ {\sls@@deffoot{#1}(\sls@footabove@linelength,\sls@footabove@linethickness)}%
+ }%
+}
+\scrlayerAddToInterface\sls@@deffoot{%
+ \def\sls@@deffoot#1(#2,#3)#4#5#6{%
+ \@ifnextchar(%)
+ {\sls@@@deffoot{#1}({#2},{#3}){#4}{#5}{#6}}%
+ {\sls@@@deffoot{#1}%
+ ({#2},{#3})%
+ {#4}{#5}{#6}%
+ (\sls@footbelow@linelength,\sls@footbelow@linethickness)}%
+ }%
+}
+\scrlayerAddToInterface\sls@@@deffoot{%
+ \def\sls@@@deffoot#1(#2,#3)#4#5#6(#7,#8){%
+ \DeclareLayer[%
+ foreground,%
+ hoffset=\sls@leftmargin{foot},%
+ voffset=\sls@topmargin
+ +\headheight+\headsep
+ +\textheight
+ +\footskip-\footheight
+ +2\dp\strutbox,%
+ width=\sls@footwidth,%
+ height=0pt,%
+ align=bl,%
+ contents={%
+ {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{%
+ \sls@hf@rule{footsep}{#2}{#3}}}}%
+ }%
+ ]{#1.foot.above.line}%
+ \DeclareLayer[%
+ foreground,%
+ hoffset=\sls@leftmargin{foot},%
+ voffset=\sls@topmargin
+ +\headheight+\headsep
+ +\textheight
+ +\footskip
+ +2\dp\strutbox
+ +#8,%
+ width=\sls@footwidth,%
+ height=0pt,%
+ align=bl,%
+ contents={%
+ {\normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{%
+ \sls@hf@rule{footbot}{#7}{#8}}}}%
+ }%
+ ]{#1.foot.below.line}%
+ \DeclareLayer[%
+ foreground,evenpage,twoside,%
+ foot,%
+ hoffset=\sls@leftmargin{foot},%
+ width=\sls@footwidth,%
+ contents={%
+ \sls@secure@box\footheight{%
+ \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#4}}}}%
+ ]{#1.foot.odd}%
+ \DeclareLayer[%
+ foreground,oddpage,twoside,%
+ foot,%
+ hoffset=\sls@leftmargin{foot},%
+ width=\sls@footwidth,%
+ contents={%
+ \sls@secure@box\footheight{%
+ \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#5}}}}%
+ ]{#1.foot.even}%
+ \DeclareLayer[%
+ foreground,oddpage,oneside,%
+ foot,%
+ hoffset=\sls@leftmargin{foot},%
+ width=\sls@footwidth,%
+ contents={%
+ \sls@secure@box\footheight{%
+ \normalfont\usekomafont{pageheadfoot}{\usekomafont{pagefoot}{#6}}}}%
+ ]{#1.foot.oneside}%
+ }%
+}
+\scrlayerAddToInterface\sls@secure@box{%
+ \newcommand*{\sls@secure@box}[2]{%
+ \begingroup
+ \setbox\z@\vbox{%
+ \ifsls@leavevmode\leavevmode\expandafter\ignorespaces\fi
+ #2%
+ }%
+ \ifdim #1<\dimexpr \ht\z@+\dp\z@\relax
+ \PackageWarning{scrlayer-scrpage}{%
+ \string#1 to low.\MessageBreak
+ At least \the\dimexpr \ht\z@+\dp\z@\relax\space needed,\MessageBreak
+ but only \the#1 found.\MessageBreak
+ I'll enlarge \string#1, for further\MessageBreak
+ processing, but you should do this yourself,\MessageBreak
+ e.g.,
+ \scr@ifundefinedorrelax{geometry}{%
+ \scr@ifundefinedorrelax{typearea}{%
+ using\MessageBreak
+ \space\space\string\setlength{\string#1}{%
+ \the\dimexpr \ht\z@+\dp\z@\relax}\MessageBreak
+ in your preamble%
+ }{%
+ setting typearea's option\MessageBreak
+ `\expandafter\@gobble\string#1=\the\dimexpr \ht\z@+\dp\z@\relax'%
+ }%
+ }{%
+ \ifx #1\headheight
+ setting geometry's option\MessageBreak
+ `head=\the\dimexpr \ht\z@+\dp\z@\relax'%
+ \else
+ using\MessageBreak
+ \space\space\string\setlength{\string#1}{%
+ \the\dimexpr \ht\z@+\dp\z@\relax}\MessageBreak
+ in your preamble%
+ \fi
+ }%
+ .\MessageBreak
+ I'll also
+ \ifx #1\headheight decrease \string\topmargin
+ \else increase \string\footskip\fi
+ }%
+ \@tempdima\dimexpr \ht\z@+\dp\z@\relax
+ \ifx #1\headheight
+ \global\advance\topmargin by \dimexpr #1-(\ht\z@+\dp\z@)\relax
+ \dp\z@\dimexpr \dp\z@+\ht\z@+\dp\z@-\headheight\relax
+ \else
+ \global\advance\footskip by \dimexpr \ht\z@+\dp\z@-#1\relax
+ \fi
+ \global#1\@tempdima
+ \fi
+ \usebox\z@
+ \endgroup
+ }%
+}
+\@ifundefined{scr@fnt@pagehead}{%
+ \@ifundefined{@pageheadfont}{%
+ \newkomafont{pagehead}{}%
+ \scrlayer@AddCsToInterface{@pageheadfont}%
+ }{%
+ \newcommand*{\scr@fnt@pagehead}{\@pageheadfont}%
+ }%
+ \scrlayer@AddCsToInterface{scr@fnt@pagehead}%
+}{}
+\@ifundefined{scr@fnt@pageheadfoot}{%
+ \newcommand*{\scr@fnt@pageheadfoot}{\headfont}%
+ \scrlayer@AddCsToInterface{scr@fnt@pageheadfoot}%
+ \@ifundefined{headfont}{%
+ \newcommand*{\headfont}{\normalcolor\slshape}%
+ }{}
+}{}
+\@ifundefined{scr@fnt@pagefoot}{%
+ \newcommand*{\scr@fnt@pagefoot}{\footfont}%
+ \scrlayer@AddCsToInterface{scr@fnt@pagefoot}%
+ \@ifundefined{footfont}{%
+ \newcommand*{\footfont}{}%
+ \scrlayer@AddCsToInterface{footfont}%
+ }{}%
+ \let\scr@fnt@wrn@pagefoot\relax
+}{}
+\scrlayerAddToInterface\sls@hf@rule{%
+ \newcommand*\sls@hf@rule[3]{%
+ \begingroup
+ \normalfont\usekomafont{#1line}{%
+ \vbox to \z@{%
+ \kern -\dimexpr #3\relax
+ \ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi
+ \if@twoside\ifodd\value{page}\else
+ \ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi
+ \fi\fi
+ \if@tempswa
+ \hskip \z@\@plus 1fill\@minus \paperwidth
+ \fi
+ \vrule \@width\dimexpr #2\relax \@height\dimexpr #3\relax \@depth\z@
+ \ifnum \sls@hfline@adjust<\tw@ \@tempswatrue\else \@tempswafalse\fi
+ \if@twoside\ifodd\value{page}\else
+ \ifnum \sls@hfline@adjust>\z@ \@tempswatrue \else \@tempswafalse\fi
+ \fi\fi
+ \if@tempswa
+ \hskip \z@\@plus 1fill\@minus \paperwidth\null
+ \fi
+ }%
+ }%
+ \endgroup
+ }%
+}
+\scrlayerAddToInterface\sls@topmargin{%
+ \newcommand*{\sls@topmargin}{\dimexpr\topmargin+1in\relax}%
+}
+\scrlayerAddToInterface\sls@leftmargin{%
+ \newcommand*{\sls@leftmargin}[1]{%
+ \dimexpr
+ \if@twoside
+ \ifodd\value{page}
+ \oddsidemargin+\csname sls@odd#1shift\endcsname
+ \else
+ \evensidemargin+\csname sls@even#1shift\endcsname
+ \fi
+ \else
+ \oddsidemargin+\csname sls@odd#1shift\endcsname
+ \fi
+ +1in\relax
+ }%
+}
+\scrlayerAddToInterface\newpagestyle{%
+ \newcommand*\newpagestyle[3]{%
+ \@ifundefined{ps@#1}{\defpagestyle{#1}{#2}{#3}}{%
+ \PackageError{scrlayer-scrpage}{Page style `#1' already defined}{%
+ Only not yet defined page style may be defined using
+ \string\newpagestyle.\MessageBreak
+ You may use either \string\renewpagestyle, \string\providepagestyle,
+ or \string\defpagestyle\MessageBreak
+ with already defined page styles.\MessageBreak
+ If you'll continue, your command will be ignored.%
+ }%
+ }%
+ }%
+}
+\scrlayerAddToInterface\renewpagestyle{%
+ \newcommand*\renewpagestyle[3]{%
+ \@ifundefined{ps@#1}{%
+ \PackageError{scrlayer-scrpage}{Undefined page style `#1'}{%
+ Only already defined page style may be re-defined using
+ \string\renewpagestyle.\MessageBreak
+ You may use either \string\newpagestyle, \string\providepagestyle,
+ or \string\defpagestyle\MessageBreak
+ with not yet defined page styles.\MessageBreak
+ If you'll continue, your command will be ignored.%
+ }%
+ }{%
+ \defpagestyle{#1}{#2}{#3}%
+ }%
+ }%
+}
+\scrlayerAddToInterface\providepagestyle{%
+ \newcommand*\providepagestyle[3]{%
+ \@ifundefined{ps@#1}{%
+ \defpagestyle{#1}{#2}{#3}%
+ }{%
+ \PackageInfo{scrlayer-scrpage}{%
+ page style `#1' already defined.\MessageBreak
+ New definition ignored%
+ }%
+ }%
+ }%
+}
+\scrlayerAddToInterface{\deftriplepagestyle}{%
+ \newcommand*{\deftriplepagestyle}[1]{%
+ \let\@tempa\defpagestyle
+ \scrlayer@triplestyle{#1}%
+ }%
+}
+\scrlayerAddToInterface{\newtriplepagestyle}{%
+ \newcommand*{\newtriplepagestyle}[1]{%
+ \let\@tempa\newpagestyle
+ \scrlayer@triplestyle{#1}%
+ }%
+}
+\scrlayerAddToInterface{\renewtriplepagestyle}{%
+ \newcommand*{\renewtriplepagestyle}[1]{%
+ \let\@tempa\renewpagestyle
+ \scrlayer@triplestyle{#1}%
+ }%
+}
+\scrlayerAddToInterface{\providetriplepagestyle}{%
+ \newcommand*{\providetriplepagestyle}[1]{%
+ \let\@tempa\providepagestyle
+ \scrlayer@triplestyle{#1}%
+ }%
+}
+\scrlayerAddToInterface\scrlayer@triplestyle{%
+ \def\scrlayer@triplestyle#1{%
+ \@ifnextchar[%]
+ {\scrlayer@@triplestyle{#1}}%
+ {\scrlayer@@triplestyle{#1}[\z@]}%
+ }
+}
+\scrlayerAddToInterface\scrlayer@@triplestyle{%
+ \def\scrlayer@@triplestyle#1[#2]{%
+ \@ifnextchar[%]
+ {\scrlayer@@@triplestyle{#1}[#2]}%
+ {\scrlayer@@@triplestyle{#1}[\z@][#2]}%
+ }%
+}
+\scrlayerAddToInterface\scrlayer@@@triplestyle{%
+ \def\scrlayer@@@triplestyle#1[#2][#3]#4#5#6#7#8#9{%
+ \@tempa{#1}{%
+ (\sls@headwidth,#2)%
+ {%
+ \makebox[\z@][l]{#6}\hfill
+ \makebox[\z@][c]{#5}\hfill
+ \makebox[\z@][r]{#4}%
+ }{%
+ \makebox[\z@][l]{#4}\hfill
+ \makebox[\z@][c]{#5}\hfill
+ \makebox[\z@][r]{#6}%
+ }{%
+ \makebox[\z@][l]{#4}\hfill
+ \makebox[\z@][c]{#5}\hfill
+ \makebox[\z@][r]{#6}%
+ }%
+ (\sls@headwidth,#3)%
+ }{%
+ (\sls@footwidth,#3)%
+ {%
+ \makebox[\z@][l]{#9}\hfill
+ \makebox[\z@][c]{#8}\hfill
+ \makebox[\z@][r]{#7}%
+ }{%
+ \makebox[\z@][l]{#7}\hfill
+ \makebox[\z@][c]{#8}\hfill
+ \makebox[\z@][r]{#9}%
+ }{%
+ \makebox[\z@][l]{#7}\hfill
+ \makebox[\z@][c]{#8}\hfill
+ \makebox[\z@][r]{#9}%
+ }%
+ (\sls@footwidth,#2)%
+ }%
+ }%
+}
+\scrlayerAddToInterface{\deftripstyle}{%
+ \newcommand*{\deftripstyle}{%
+ \PackageWarning{scrlayer-scrpage}{%
+ Command \string\deftripstyle\space is deprecate.\MessageBreak
+ You should replace it by \string\deftriplepagestyle,\MessageBreak
+ e.g.,%
+ }%
+ \let\deftripstyle\deftriplepagestyle
+ \deftripstyle
+ }%
+}
+\scrlayerAddToInterface\defpairofpagestyles{%
+ \newcommand*{\defpairofpagestyles}[3][]{%
+ \def\reserved@a##1##2##3##4##5##6##7\@nil{##1##2##3##4##5##6}%
+ \edef\reserved@a{\expandafter\reserved@a #2xxxxxx\@nil}%
+ \ifstr\reserved@a{plain.}{%
+ \PackageError{scrlayer-scrpage}{plain page style `#2' not allowed}{%
+ You may not define a plain page style using
+ \string\defpairofpagestyles, \string\newpairofpagestyles,
+ \string\renewpairofpagestyles, or\MessageBreak
+ \string\providepairofpagestyles. I'd suggest to simply define the
+ corresponding\MessageBreak
+ non-plain page style to also define the plain one.\MessageBreak
+ If you'll continue, your command will be ignored.}%
+ }{%
+ \sls@init@pair@page@style*{#2}%
+ \sls@init@pair@page@style*{plain.#2}%
+ \ifx\relax #1\relax\else
+ \scr@ifundefinedorrelax{sls@ps@#1@even@left@head}{%
+ \PackageError{scrlayer-scrpage}{`#1' not a pair page style}{%
+ Only pair page styles may be used to initialise new pairs of page
+ styles. So\MessageBreak
+ optional argument of \string\defpairofpagestyles,
+ \string\newpairofpagestyles,\MessageBreak
+ \string\renewpairofpagestyles, or \string\providepairofpagestyle has
+ to be a pair\MessageBreak
+ page style or should be unused.\MessageBreak
+ If you'll continue, the initialisation will be ignored.}%
+ }{%
+ \sls@init@pair@page@style{#2}{#1}%
+ \scr@ifundefinedorrelax{sls@ps@plain.#1@even@left@head}{%
+ \sls@init@pair@page@style{plain.#2}{#1}%
+ }{%
+ \sls@init@pair@page@style{plain.#2}{plain.#1}%
+ }%
+ }%
+ \fi
+ \edef\reserved@a{%
+ \noexpand\scrlayerOnAutoRemoveInterface[scrlayer-scrpage.sty]{%
+ \noexpand\sls@init@pair@page@style**{#2}%
+ \noexpand\sls@init@pair@page@style**{plain.#2}%
+ \noexpand\expandafter\noexpand\ifx\noexpand
+ \csname ps@plain.#2\noexpand\endcsname\noexpand\ps@plain
+ \noexpand\PackageWarning{scrlayer-scrpage}{%
+ page style `#2' not longer valid.\noexpand\MessageBreak
+ This was the current plain page style.\noexpand\MessageBreak
+ Making current plain page style empty.\noexpand\MessageBreak
+ The page style has been defined using\noexpand\MessageBreak
+ interface `scrlayer-scrpage.sty', that\noexpand\MessageBreak
+ has been removed%
+ }%
+ \noexpand\def\noexpand\ps@plain{%
+ \noexpand\def\noexpand\@oddhead{}\noexpand\def\noexpand\@evenhead{}%
+ \noexpand\def\noexpand\@oddhead{}\noexpand\def\noexpand\@evenhead{}%
+ }%
+ \noexpand\fi
+ }%
+ }\reserved@a
+ \sls@def@pair@page@style@member{#2}%
+ \AddToLayerPageStyleOptions{#2}{%
+ onselect={%
+ \expandafter\let\expandafter\ps@plain\csname ps@plain.#2\endcsname
+ \expandafter\let\expandafter\ps@headings\csname ps@#2\endcsname
+ \def\sls@currentheadings{#2}%
+ \def\sls@currentplain{plain.#2}%
+ #3%
+ }%
+ }%
+ \sls@def@pair@page@style@member{plain.#2}%
+ \AddToLayerPageStyleOptions{plain.#2}{%
+ onselect={%
+ \expandafter\let\expandafter\ps@plain\csname ps@plain.#2\endcsname
+ \expandafter\let\expandafter\ps@headings\csname ps@#2\endcsname
+ \def\sls@currentheadings{#2}%
+ \def\sls@currentplain{plain.#2}%
+ #3%
+ },%
+ oninit={%
+ \expandafter
+ \ifx\csname ifsls@plain@head@above@line\expandafter\endcsname
+ \csname iftrue\endcsname\else
+ \let\sls@headabove@linelength\z@
+ \let\sls@headabove@linethickness\z@
+ \fi
+ \expandafter
+ \ifx\csname ifsls@plain@head@below@line\expandafter\endcsname
+ \csname iftrue\endcsname\else
+ \let\sls@headbelow@linelength\z@
+ \let\sls@headbelow@linethickness\z@
+ \fi
+ \expandafter
+ \ifx\csname ifsls@plain@foot@above@line\expandafter\endcsname
+ \csname iftrue\endcsname\else
+ \let\sls@footabove@linelength\z@
+ \let\sls@footabove@linethickness\z@
+ \fi
+ \expandafter
+ \ifx\csname ifsls@plain@foot@below@line\expandafter\endcsname
+ \csname iftrue\endcsname\else
+ \let\sls@footbelow@linelength\z@
+ \let\sls@footbelow@linethickness\z@
+ \fi
+ }%
+ }%
+ }%
+ }%
+}
+\scrlayerAddToInterface\sls@currentheadings{%
+ \newcommand*\sls@currentheadings{scrheadings}%
+}
+\scrlayerAddToInterface\sls@currentplain{%
+ \newcommand*\sls@currentplain{plain.scrheadings}%
+}
+\scrlayerAddToInterface\sls@init@pair@page@style{%
+ \newcommand*{\sls@init@pair@page@style}{%
+ \@ifstar {%
+ \@ifstar {%
+ \sls@let@pair@page@style\relax
+ }{%
+ \sls@let@pair@page@style\@empty
+ }
+ }{%
+ \sls@init@@pair@page@style
+ }%
+ }%
+}
+\scrlayerAddToInterface\sls@init@@pair@page@style{%
+ \newcommand*{\sls@init@@pair@page@style}[2]{%
+ \expandafter\let\csname sls@ps@#1@even@left@head\expandafter\endcsname
+ \csname sls@ps@#2@even@left@head\endcsname
+ \expandafter\let\csname sls@ps@#1@even@middle@head\expandafter\endcsname
+ \csname sls@ps@#2@even@middle@head\endcsname
+ \expandafter\let\csname sls@ps@#1@even@right@head\expandafter\endcsname
+ \csname sls@ps@#2@even@right@head\endcsname
+ \expandafter\let\csname sls@ps@#1@odd@left@head\expandafter\endcsname
+ \csname sls@ps@#2@odd@left@head\endcsname
+ \expandafter\let\csname sls@ps@#1@odd@middle@head\expandafter\endcsname
+ \csname sls@ps@#2@odd@middle@head\endcsname
+ \expandafter\let\csname sls@ps@#1@odd@right@head\expandafter\endcsname
+ \csname sls@ps@#2@odd@right@head\endcsname
+ \expandafter\let\csname sls@ps@#1@even@left@foot\expandafter\endcsname
+ \csname sls@ps@#2@even@left@foot\endcsname
+ \expandafter\let\csname sls@ps@#1@even@middle@foot\expandafter\endcsname
+ \csname sls@ps@#2@even@middle@foot\endcsname
+ \expandafter\let\csname sls@ps@#1@even@right@foot\expandafter\endcsname
+ \csname sls@ps@#2@even@right@foot\endcsname
+ \expandafter\let\csname sls@ps@#1@odd@left@foot\expandafter\endcsname
+ \csname sls@ps@#2@odd@left@foot\endcsname
+ \expandafter\let\csname sls@ps@#1@odd@middle@foot\expandafter\endcsname
+ \csname sls@ps@#2@odd@middle@foot\endcsname
+ \expandafter\let\csname sls@ps@#1@odd@right@foot\expandafter\endcsname
+ \csname sls@ps@#2@odd@right@foot\endcsname
+ }%
+}
+\scrlayerAddToInterface\sls@let@pair@page@style{%
+ \newcommand*{\sls@let@pair@page@style}[2]{%
+ \expandafter\let\csname sls@ps@#2@even@left@head\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@even@middle@head\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@even@right@head\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@odd@left@head\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@odd@middle@head\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@odd@right@head\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@even@left@foot\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@even@middle@foot\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@even@right@foot\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@odd@left@foot\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@odd@middle@foot\endcsname #1%
+ \expandafter\let\csname sls@ps@#2@odd@right@foot\endcsname #1%
+ }%
+}
+\scrlayerAddToInterface\sls@def@pair@page@style@member{%
+ \newcommand*{\sls@def@pair@page@style@member}[1]{%
+ \defpagestyle{#1}{%
+ {%
+ \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright
+ \strut\@nameuse{sls@ps@#1@even@left@head}\strut}}%
+ \parbox{\sls@headwidth}{\centering
+ \strut\@nameuse{sls@ps@#1@even@middle@head}\strut}%
+ \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft
+ \strut\@nameuse{sls@ps@#1@even@right@head}\strut}}%
+ }{%
+ \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright
+ \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}%
+ \parbox{\sls@headwidth}{\centering
+ \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}%
+ \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft
+ \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}%
+ }{%
+ \makebox[0pt][l]{\parbox{\sls@headwidth}{\raggedright
+ \strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}%
+ \parbox{\sls@headwidth}{\centering
+ \strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}%
+ \makebox[0pt][r]{\parbox{\sls@headwidth}{\raggedleft
+ \strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}%
+ }%
+ }{%
+ {%
+ \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright
+ \strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}%
+ \parbox{\sls@footwidth}{\centering
+ \strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}%
+ \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft
+ \strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}%
+ }{%
+ \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright
+ \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}%
+ \parbox{\sls@footwidth}{\centering
+ \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}%
+ \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft
+ \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}%
+ }{%
+ \makebox[0pt][l]{\parbox{\sls@footwidth}{\raggedright
+ \strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}%
+ \parbox{\sls@footwidth}{\centering
+ \strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}%
+ \makebox[0pt][r]{\parbox{\sls@footwidth}{\raggedleft
+ \strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}%
+ }%
+ }%
+ }%
+}
+\scrlayerAddToInterface\newpairofpagestyles{%
+ \newcommand*{\newpairofpagestyles}[3][]{%
+ \scr@ifundefinedorrelax{ps@#2}{%
+ \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{%
+ \PackageError{scrlayer-scrpage}{%
+ Plain page style of `#2' already defined}{%
+ You may only define a new pair of page styles, if neither the style
+ itself\MessageBreak
+ nor it's plain page style has already been defined.\MessageBreak
+ You may use only \string\defpairofpagestyles\space or
+ \string\providepairofpagestyles\space with partly\MessageBreak
+ already defined page styles.\MessageBreak
+ If you'll continue, your command will be ignored.%
+ }%
+ }%
+ }{%
+ \PackageError{scrlayer-scrpage}{%
+ Page style `#2' already defined}{%
+ You may only define a new pair of page styles, if neither the style
+ itself\MessageBreak
+ nor it's plain page style has already been defined.\MessageBreak
+ You may use either \string\renewpairsofpagestyles,
+ \string\defpairofpagestyles, or\MessageBreak
+ \string\providepairofpagestyles\space with already defined page
+ styles.\MessageBreak
+ If you'll continue, your command will be ignored.%
+ }%
+ }%
+ }%
+}
+\scrlayerAddToInterface\renewpairofpagestyles{%
+ \newcommand*{\renewpairofpagestyles}[3][]{%
+ \scr@ifundefinedorrelax{ps@#2}{%
+ \PackageError{scrlayer-scrpage}{%
+ Undefined page style `#2'}{%
+ You may only redefine existing pairs of page styles. You may use
+ either\MessageBreak
+ \string\newpairsofpagestyles, \string\defpairofpagestyles, or
+ \string\providepairofpagestyles\MessageBreak
+ with not yet defined page styles.\MessageBreak
+ If you'll continue, your command will be ignored.%
+ }%
+ }{%
+ \@ifundefined{ps@plain.#2}{%
+ \PackageError{scrlayer-scrpage}{%
+ Undefined plain page style of `#2'}{%
+ You may only redefine existing pairs of page styles. You may use
+ either\MessageBreak
+ \string\defpairofpagestyles\space or
+ \string\providepairofpagestyles\space with partly already
+ defined\MessageBreak
+ page styles.\MessageBreak
+ If you'll continue, your command will be ignored.%
+ }%
+ }{\defpairofpagestyles[#1]{#2}{#3}}%
+ }%
+ }%
+}
+\scrlayerAddToInterface\providepairofpagestyles{%
+ \newcommand*{\providepairofpagestyles}[3][]{%
+ \scr@ifundefinedorrelax{ps@#2}{%
+ \@ifundefined{ps@plain.#2}{\defpairofpagestyles[#1]{#2}{#3}}{%
+ \PackageInfo{scrlayer-scrpage}{%
+ Plain page style of `#2' already\MessageBreak
+ defined. Definition ignored}%
+ }%
+ }{%
+ \PackageInfo{scrlayer-scrpage}{%
+ Page style of `#2' already defined.\MessageBreak
+ Definition ignored}%
+ }%
+ }%
+}
+\newpairofpagestyles{scrheadings}{}%
+\DeclarePageStyleAlias{scrplain}{plain.scrheadings}
+\scrlayerOnAutoRemoveInterface{\DestroyPageStyleAlias{scrplain}}
+\scrlayerAddToInterface\ihead{%
+ \newcommand*{\ihead}{\@ifnextchar[{\@@ihead}{\@ihead}}%
+}
+\scrlayerAddToInterface\@ihead{%
+ \newcommand*{\@ihead}[1]{\rehead{#1}\lohead{#1}}%
+}
+\scrlayerAddToInterface\@@ihead{%
+ \newcommand*{\@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}%
+}
+\scrlayerAddToInterface\ohead{%
+ \newcommand*{\ohead}{\@ifnextchar[{\@@ohead}{\@ohead}}%
+}
+\scrlayerAddToInterface\@ohead{%
+ \newcommand*{\@ohead}[1]{\lehead{#1}\rohead{#1}}%
+}
+\scrlayerAddToInterface\@@ohead{%
+ \newcommand*{\@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}%
+}
+\scrlayerAddToInterface\chead{%
+ \newcommand*{\chead}{\@ifnextchar[{\@@chead}{\@chead}}%
+}
+\scrlayerAddToInterface\@chead{%
+ \newcommand*{\@chead}[1]{\cehead{#1}\cohead{#1}}%
+}
+\scrlayerAddToInterface\@@chead{%
+ \newcommand*{\@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}%
+}
+\scrlayerAddToInterface\lehead{%
+ \newcommand*{\lehead}{\sls@renewelement{even}{left}{head}}%
+}
+\scrlayerAddToInterface\lohead{%
+ \newcommand*{\lohead}{\sls@renewelement{odd}{left}{head}}%
+}
+\scrlayerAddToInterface\rehead{%
+ \newcommand*{\rehead}{\sls@renewelement{even}{right}{head}}%
+}
+\scrlayerAddToInterface\rohead{%
+ \newcommand*{\rohead}{\sls@renewelement{odd}{right}{head}}%
+}
+\scrlayerAddToInterface\cehead{%
+ \newcommand*{\cehead}{\sls@renewelement{even}{middle}{head}}%
+}
+\scrlayerAddToInterface\cohead{%
+ \newcommand*{\cohead}{\sls@renewelement{odd}{middle}{head}}%
+}
+\scrlayerAddToInterface\ifoot{%
+ \newcommand*{\ifoot}{\@ifnextchar[{\@@ifoot}{\@ifoot}}%
+}
+\scrlayerAddToInterface\@ifoot{%
+ \newcommand*{\@ifoot}[1]{\refoot{#1}\lofoot{#1}}%
+}
+\scrlayerAddToInterface\@@ifoot{%
+ \newcommand*{\@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}%
+}
+\scrlayerAddToInterface\ofoot{%
+ \newcommand*{\ofoot}{\@ifnextchar[{\@@ofoot}{\@ofoot}}%
+}
+\scrlayerAddToInterface\@ofoot{%
+ \newcommand*{\@ofoot}[1]{\lefoot{#1}\rofoot{#1}}%
+}
+\scrlayerAddToInterface\@@ofoot{%
+ \newcommand*{\@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}%
+}
+\scrlayerAddToInterface\cfoot{%
+ \newcommand*{\cfoot}{\@ifnextchar[{\@@cfoot}{\@cfoot}}%
+}
+\scrlayerAddToInterface\@cfoot{%
+ \newcommand*{\@cfoot}[1]{\cefoot{#1}\cofoot{#1}}%
+}
+\scrlayerAddToInterface\@@cfoot{%
+ \newcommand*{\@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}%
+}
+\scrlayerAddToInterface\lefoot{%
+ \newcommand*{\lefoot}{\sls@renewelement{even}{left}{foot}}%
+}
+\scrlayerAddToInterface\lofoot{%
+ \newcommand*{\lofoot}{\sls@renewelement{odd}{left}{foot}}%
+}
+\scrlayerAddToInterface\refoot{%
+ \newcommand*{\refoot}{\sls@renewelement{even}{right}{foot}}%
+}
+\scrlayerAddToInterface\rofoot{%
+ \newcommand*{\rofoot}{\sls@renewelement{odd}{right}{foot}}%
+}
+\scrlayerAddToInterface\cefoot{%
+ \newcommand*{\cefoot}{\sls@renewelement{even}{middle}{foot}}%
+}
+\scrlayerAddToInterface\cofoot{%
+ \newcommand*{\cofoot}{\sls@renewelement{odd}{middle}{foot}}%
+}
+\scrlayerAddToInterface\sls@renewelement{%
+ \newcommand*{\sls@renewelement}[3]{%
+ \@ifnextchar[%]
+ {\sls@@@renewelement{#1}{#2}{#3}}%
+ {\sls@@renewelement{#1}{#2}{#3}}%
+ }%
+}
+\scrlayerAddToInterface\sls@@renewelement{%
+ \newcommand*{\sls@@renewelement}[4]{%
+ \scr@ifundefinedorrelax{sls@ps@\sls@currentheadings @#1@#2@#3}{%
+ \@namedef{sls@ps@scrheadings@#1@#2@#3}{#4}%
+ }{%
+ \@namedef{sls@ps@\sls@currentheadings @#1@#2@#3}{#4}%
+ }%
+ }%
+}
+\scrlayerAddToInterface\sls@@@renewelement{%
+ \def\sls@@@renewelement#1#2#3[#4]#5{%
+ \sls@@renewplainelement{#1}{#2}{#3}{#4}%
+ \sls@@renewelement{#1}{#2}{#3}{#5}%
+ }%
+}
+\scrlayerAddToInterface\sls@@renewplainelement{%
+ \newcommand*{\sls@@renewplainelement}[4]{%
+ \scr@ifundefinedorrelax{sls@ps@\sls@currentplain @#1@#2@#3}{%
+ \@namedef{sls@ps@plain.scrheadings@#1@#2@#3}{#4}%
+ }{%
+ \@namedef{sls@ps@\sls@currentplain @#1@#2@#3}{#4}%
+ }%
+ }%
+}
+\scrlayerAddToInterface\clearmainofpairofpagestyles{%
+ \newcommand*{\clearmainofpairofpagestyles}{%
+ \ihead{}\chead{}\ohead{}\ifoot{}\cfoot{}\ofoot{}%
+ }%
+}
+\scrlayerAddToInterface\clearscrheadings{%
+ \let\clearscrheadings\clearmainofpairofpagestyles
+}
+\scrlayerAddToInterface\clearplainofpairofpagestyles{%
+ \newcommand*{\clearplainofpairofpagestyles}{%
+ \sls@@renewplainelement{odd}{left}{head}{}%
+ \sls@@renewplainelement{odd}{right}{head}{}%
+ \sls@@renewplainelement{odd}{middle}{head}{}%
+ \sls@@renewplainelement{even}{left}{head}{}%
+ \sls@@renewplainelement{even}{right}{head}{}%
+ \sls@@renewplainelement{even}{middle}{head}{}%
+ \sls@@renewplainelement{odd}{left}{foot}{}%
+ \sls@@renewplainelement{odd}{right}{foot}{}%
+ \sls@@renewplainelement{odd}{middle}{foot}{}%
+ \sls@@renewplainelement{even}{left}{foot}{}%
+ \sls@@renewplainelement{even}{right}{foot}{}%
+ \sls@@renewplainelement{even}{middle}{foot}{}%
+ }%
+}
+\scrlayerAddToInterface\clearscrplain{%
+ \let\clearscrplain\clearplainofpairofpagestyles
+}
+\scrlayerAddToInterface\clearpairofpagestyles{%
+ \newcommand*{\clearpairofpagestyles}{%
+ \ihead[]{}\chead[]{}\ohead[]{}\ifoot[]{}\cfoot[]{}\ofoot[]{}%
+ }%
+}
+\scrlayerAddToInterface\clearscrheadfoot{%
+ \let\clearscrheadfoot\clearpairofpagestyles
+}
+\scrlayerAddToInterface\ps@useheadings{%
+ \newcommand*\ps@useheadings{%
+ \PackageWarning{scrlayer-scrpage}{incompatible page style!\MessageBreak
+ Page styles like `headings' and `plain'\MessageBreak
+ are incompatible with the page styles\MessageBreak
+ of scrlayer-scrpage. You shouldn't mix\MessageBreak
+ them up. Therefore page style\MessageBreak
+ `useheadings' is not longer provided.\MessageBreak
+ Usage is deprecated and will be replaced\MessageBreak
+ by `scrheadings'%
+ }%
+ \let\ps@useheadings\ps@scrheadings
+ \ps@useheadings
+ }%
+}
+\scrlayerAddCsToInterface{ps@plain.useheadings}{%
+ \@namedef{ps@plain.useheadings}{\@nameuse{ps@plain.scrheadings}}%
+}
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
+\@ifundefined{KOMAScript}{%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}}{}
+\endinput
+%%
+%% End of file `scrlayer-scrpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
new file mode 100644
index 00000000000..a11742cf8b2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -0,0 +1,1931 @@
+%%
+%% This is file `scrlayer.sty',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrlayer.dtx (with options: `package,trace,scrlayer,identify')
+%% scrlayer.dtx (with options: `package,trace,scrlayer,init')
+%% scrlayer.dtx (with options: `package,trace,scrlayer,options')
+%% scrlayer.dtx (with options: `package,trace,scrlayer,body')
+%% scrlayer.dtx (with options: `package,trace,scrlayer,final')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 2012-2013 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (identify)
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{scrlayer}[%
+ 31/10/2013 v0.9.1480
+ package
+ (defining layers and page styles)]
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (init)
+\RequirePackage{scrkbase}[2013/03/05]
+\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
+ \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
+}{%
+ \ifx\scrlayer@AtEndOfPackage\@firstofone
+ \AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
+ \fi
+}
+\let\scrlayer@AtEndOfPackage\AtEndOfPackage
+\newcommand*{\scrlayer@testunexpectedarg}[2]{%
+ \ifx\relax#2\relax\else
+ \PackageError{scrlayer}{unexpected value to `#1'}{%
+ Option `#1' doesn't expect any value.\MessageBreak
+ If you'll continue, the value `#2' will be ignored.%
+ }%
+ \fi
+}
+\scr@ifundefinedorrelax{if@chapter}{%
+ \newif\if@chapter
+ \scr@ifundefinedorrelax{chapter}{\@chapterfalse}{\@chaptertrue}%
+}{}
+\scr@ifundefinedorrelax{if@mainmatter}{%
+ \scr@ifundefinedorrelax{mainmatter}{%
+ \newif\if@mainmatter\@mainmattertrue
+ }{%
+ \PackageWarningNoLine{scrlayer}{%
+ \string\mainmatter\space defined without
+ \string\if@mainmatter!\MessageBreak
+ Note, that several packages need
+ \string\if@mainmatter\space\MessageBreak
+ to detect whether or no the main matter has been\MessageBreak
+ entered. So does scrlayer. Because of this\MessageBreak
+ it will extend \string\mainmatter, now%
+ }%
+ \newif\if@mainmatter\@mainmattertrue
+ \expandafter\def\expandafter\mainmatter\expandafter{%
+ \expandafter\@mainmattertrue\mainmatter}%
+ \scr@ifundefinedorrelax{frontmatter}{}{%
+ \expandafter\def\expandafter\frontmatter\expandafter{%
+ \expandafter\@mainmatterfalse\frontmatter}
+ }%
+ \scr@ifundefinedorrelax{backmatter}{}{%
+ \expandafter\def\expandafter\backmatter{%
+ \expandafter\@mainmatterfalse\backmattter}%
+ }%
+ }%
+}{}
+\@ifundefined{footheight}{%
+ \newlength{\footheight}%
+ \setlength{\footheight}{-12345sp}%
+}{%
+ \PackageInfo{scrlayer}{Using already defined \string\footheight\MessageBreak
+ hoping, that this is a length and\MessageBreak
+ not only a macro}%
+}
+\AtBeginDocument{%
+ \ifdim\footheight=-12345sp
+ \PackageInfo{scrlayer}{Setting magic \string\footheight\space to
+ \string\baselineskip\space while\MessageBreak
+ \string\begin{document}}%
+ \setlength{\footheight}{\baselineskip}
+ \fi
+}
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (options)
+\KOMA@key{markcase}{%
+ \begingroup
+ \KOMA@set@ncmdkey{markcase}{reserved@a}{%
+ {upper}{0},{lower}{1},{used}{2},%
+ {ignoreuppercase}{3},{nouppercase}{3},%
+ {ignoreupper}{3},{noupper}{3}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifnum \reserved@a>\m@ne
+ \aftergroup\let\aftergroup\MakeMarkcase
+ \ifcase \reserved@a
+ \aftergroup\MakeUppercase
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \or
+ \aftergroup\MakeLowercase
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \or
+ \aftergroup\@firstofone
+ \aftergroup\scrlayer@forceignoreuppercasefalse
+ \else
+ \aftergroup\scrlayer@ignoreuppercase
+ \aftergroup\scrlayer@forceignoreuppercasetrue
+ \fi
+ \fi
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
+ \fi
+ \endgroup
+}
+\providecommand*{\MakeMarkcase}[1]{#1}
+\DeclareRobustCommand*{\scrlayer@ignoreuppercase}[1]{%
+ \begingroup
+ \let\uppercase\@firstofone
+ \let\MakeUppercase\@firstofone
+ \expandafter\let\csname MakeUppercase \endcsname\@firstofone
+ #1%
+ \endgroup
+}
+\newif\ifscrlayer@forceignoreuppercase
+\KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue
+\KOMA@key{automark}[]{%
+ \scrlayer@testunexpectedarg{automark}{#1}%
+ \scrlayer@AtEndOfPackage{%
+ \if@chapter
+ \automark[section]{chapter}%
+ \else
+ \automark[subsection]{section}%
+ \fi
+ }%
+ \FamilyKeyStateProcessed
+}
+\KOMA@key{manualmark}[]{%
+ \scrlayer@testunexpectedarg{manualmark}{#1}%
+ \scrlayer@AtEndOfPackage{\manualmark}%
+ \FamilyKeyStateProcessed
+}
+\KOMA@key{onpsselect}{%
+ \l@addto@macro{\@ps@initialhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@initialhook}{}
+\KOMA@key{onpsinit}{%
+ \l@addto@macro{\@ps@hook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@hook}{}
+\KOMA@key{onpsoneside}{%
+ \l@addto@macro{\@ps@onesidehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@onesidehook}{}
+\KOMA@key{onpstwoside}{%
+ \l@addto@macro{\@ps@twosidehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@twosidehook}{}
+\KOMA@key{onpsoddpage}{%
+ \l@addto@macro{\@ps@oddpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@oddpagehook}{}
+\KOMA@key{onpsevenpage}{%
+ \l@addto@macro{\@ps@evenpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@evenpagehook}{}
+\KOMA@key{onpsfloatpage}{%
+ \l@addto@macro{\@ps@floatpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@floatpagehook}{}
+\KOMA@key{onpsnonfloatpage}{%
+ \l@addto@macro{\@ps@nonfloatpagehook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@nonfloatpagehook}{}
+\KOMA@key{onpsbackground}{%
+ \l@addto@macro{\@ps@backgroundhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@backgroundhook}{}
+\KOMA@key{onpsforeground}{%
+ \l@addto@macro{\@ps@foregroundhook}{#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\@ps@foregroundhook}{}
+\KOMA@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}
+\KOMA@ifkey{draft}{scrlayer@draft}
+\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
+\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (body)
+\KOMAProcessOptions\relax
+\@ifundefined{headmark}{}{%
+ \PackageWarningNoLine{scrlayer}{%
+ \string\headmark\space detected!\MessageBreak
+ \string\headmark\space will either be set to
+ \string\rightmark\MessageBreak
+ or \string\leftmark inside of page styles.\MessageBreak
+ This means, that \string\headmark\space will be overwritten\MessageBreak
+ at every page layer usage!\MessageBreak
+ Nevertheless it will stay unchanged outside\MessageBreak
+ of page layers.\MessageBreak
+ I hope, this won't break your document%
+ }%
+}
+\@ifundefined{pagemark}{%
+ \DeclareRobustCommand\pagemark{{\pnumfont{\thepage}}}%
+}{}%
+\@ifundefined{pnumfont}{%
+ \newcommand{\pnumfont}{\normalfont}%
+}{}
+\@ifundefined{scr@fnt@pagenumber}{%
+ \newcommand{\scr@fnt@pagenumber}{\pnumfont}%
+}{}
+\providecommand*{\partmarkformat}{\partname\ \thepart. \ }%
+\if@chapter
+ \providecommand*{\@chapapp}{\chaptername}%
+ \providecommand*{\chaptermarkformat}{\@chapapp\ \thechapter. \ }%
+ \providecommand*{\sectionmarkformat}{\thesection. \ }%
+\else
+ \providecommand*{\sectionmarkformat}{\GenericMarkFormat{section}}%
+\fi
+\scr@ifundefinedorrelax{@seccntmarkformat}{%
+ \providecommand*{\GenericMarkFormat}{\@seccntformat}%
+}{%
+ \providecommand*{\GenericMarkFormat}[1]{\@seccntmarkformat{#1}}%
+}
+\providecommand*{\@mkleft}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markleft
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \PackageWarning{scrlayer}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkleft.\MessageBreak
+ Nevertheless, \string\markleft\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markleft
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkright}{%
+ \begingroup
+ \ifx\@mkboth\markboth \aftergroup\markright
+ \else
+ \ifx\@mkboth\@gobbletwo \aftergroup\@gobble
+ \else \def\@gobbletwo##1##2{}%
+ \ifx \@mkboth\@gobbletwo \aftergroup\@gobble
+ \else
+ \PackageWarning{scrlayer}{%
+ package incompatibility detected!\MessageBreak
+ \string\@mkboth it neither \string\markboth nor any\MessageBreak
+ kind of two arguments gobbling,\MessageBreak
+ e.g., \string\@gobbletwo.\MessageBreak
+ So I don't known, what to do\MessageBreak
+ with \string\@mkright.\MessageBreak
+ Nevertheless, \string\markright\space will be\MessageBreak
+ used%
+ }%
+ \aftergroup\markright
+ \fi
+ \fi
+ \fi
+ \endgroup
+}%
+\providecommand*{\@mkdouble}[1]{%
+ \@mkboth{#1}{#1}%
+}
+\providecommand*{\markleft}[1]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \expandafter\@markleft\@themark {#1}%
+ \@temptokena \expandafter{\@themark}%
+ \mark{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\providecommand{\@markleft}[3]{%
+ \@temptokena {#2}%
+ \unrestored@protected@xdef\@themark{{#3}{\the\@temptokena}}%
+}
+\newcommand*{\manualmark}{%
+ \begingroup
+ \def\@elt##1{%
+ \aftergroup\let\expandafter\aftergroup\csname ##1mark\endcsname
+ \aftergroup\@gobble
+ }%
+ \scrlayer@level@list
+ \endgroup
+ \let\@mkleft\@gobble
+ \let\@mkright\@gobble
+ \let\@mkdouble\@gobble
+ \let\@mkboth\@gobbletwo
+}
+\newcommand*{\automark}{%
+ \@ifstar{\@automark}{\manualmark\@automark}%
+}
+\newcommand*{\@automark}[2][]{%
+ \ifstr{#2}{}{%
+ \ifstr{#1}{}{%
+ \automark@basics
+ }{%
+ \automark@basics
+ \automark@righthigh{#1}%
+ }%
+ }{%
+ \ifstr{#1}{}{%
+ \automark@basics
+ \automark@leftlow{#2}%
+ }{%
+ \automark@basics
+ \automark@both{#1}{#2}%
+ }%
+ }%
+}
+\newcommand*{\automark@basics}{%
+ \let\@mkleft\markleft
+ \let\@mkright\markright
+ \let\@mkboth\markboth
+ \def\@mkdouble##1{\@mkboth{##1}{##1}}%
+}
+\newcommand*{\automark@righthigh}[1]{%
+ \ifscrlayer@level@prepared{#1}{%
+ \expandafter\def\csname #1mark\endcsname##1{%
+ \begingroup
+ \@tempswafalse
+ \if@twoside\@tempswatrue
+ \else\ifscrlayer@autooneside\else\@tempswatrue\fi\fi
+ \expandafter\endgroup
+ \if@tempswa
+ \@mkright{%
+ \MakeMarkcase{%
+ \ifnum \c@secnumdepth<\numexpr \csname #1level\endcsname +0\relax
+ \else\if@mainmatter \csname #1markformat\endcsname\fi\fi
+ ##1%
+ }%
+ }%
+ \fi
+ }%
+ }{}%
+}
+\newcommand*{\automark@leftlow}[1]{%
+ \ifscrlayer@level@prepared{#1}{%
+ \expandafter\def\csname #1mark\endcsname ##1{%
+ \if@twoside
+ \expandafter\@mkboth
+ \else
+ \expandafter\@mkdouble
+ \fi
+ {%
+ \MakeMarkcase{%
+ \ifnum \c@secnumdepth<\numexpr \csname #1level\endcsname +0\relax
+ \else\if@mainmatter \csname #1markformat\endcsname\fi\fi
+ ##1%
+ }%
+ }\@empty
+ }%
+ }{}%
+}
+\newcommand*{\automark@both}[2]{%
+ \ifscrlayer@level@prepared{#1}{%
+ \ifscrlayer@level@prepared{#2}{%
+ \ifnum \numexpr \csname #1level\endcsname +0\relax
+ > \numexpr \csname #2level\endcsname +0\relax
+ \automark@leftlow{#2}%
+ \automark@righthigh{#1}%
+ \else \ifnum \numexpr \csname #1level\endcsname +0\relax
+ = \numexpr \csname #2level\endcsname +0\relax
+ \expandafter\def\csname #2mark\endcsname##1{%
+ \@mkdouble{%
+ \MakeMarkcase{%
+ \ifnum \c@secnumdepth<\numexpr
+ \csname #2level\endcsname +0\relax
+ \else
+ \if@mainmatter \csname #2markformat\endcsname\fi
+ \fi
+ ##1%
+ }%
+ }%
+ }%
+ \else
+ \expandafter\def\csname #1mark\endcsname##1{%
+ \begingroup
+ \@tempswafalse
+ \if@twoside\@tempswatrue
+ \else\ifscrlayer@autooneside\else\@tempswatrue\fi\fi
+ \expandafter\endgroup
+ \if@tempswa
+ \@mkleft{%
+ \MakeMarkcase{%
+ \ifnum \c@secnumdepth
+ < \numexpr\csname #1level\endcsname +0\relax
+ \else
+ \if@mainmatter \csname #1markformat\endcsname\fi
+ \fi
+ ##1%
+ }%
+ }%
+ \fi
+ }%
+ \expandafter\def\csname #2mark\endcsname##1{%
+ \@mkboth{}{%
+ \MakeMarkcase{%
+ \ifnum \c@secnumdepth
+ < \numexpr \csname #2level\endcsname +0\relax
+ \else\if@mainmatter \csname #2markformat\endcsname\fi\fi
+ ##1%
+ }%
+ }%
+ }%
+ \fi
+ \fi
+ }{}%
+ }{}%
+}
+\newcommand*{\ifscrlayer@level@prepared}[1]{%
+ \typeout{1: \detokenize{#1}}%
+ \scr@ifundefinedorrelax{#1level}{%
+ \PackageError{scrlayer}{numbering depth of `#1' unknown}{%
+ Someone told me to use a section mark for level `#1',\MessageBreak
+ but the numbering depth hasn't been declared before. You may solve this
+ using\MessageBreak
+ \string\DeclareSectionNumberDepth{#1}{NUMBER}.%
+ }%
+ \@secondoftwo
+ }{%
+ \@firstoftwo
+ }%
+}
+\newcommand*{\DeclareSectionNumberDepth}[2]{%
+ \expandafter\edef\csname #1level\endcsname{\the\numexpr #2\relax}%
+ \@ifundefined{#1mark}{%
+ \expandafter\let\csname #1mark\endcsname\@gobble
+ }{}%
+ \@ifundefined{#1markformat}{%
+ \@namedef{#1markformat}{\GenericMarkFormat{#1}}%
+ }{}%
+ \begingroup
+ \@tempswatrue
+ \def\@elt##1{\ifstr{#1}{##1}{\@tempswafalse}{}}%
+ \scrlayer@level@list
+ \if@tempswa
+ \aftergroup\@firstofone
+ \else
+ \aftergroup\@gobble
+ \fi
+ \endgroup
+ {%
+ \l@addto@macro\scrlayer@level@list{\@elt{#1}}%
+ }%
+}
+\newcommand*{\scrlayer@level@list}{}
+\scr@ifundefinedorrelax{part}{}{%
+ \DeclareSectionNumberDepth{part}{-1}%
+}
+\if@chapter
+ \DeclareSectionNumberDepth{chapter}{0}%
+\fi
+\newcommand*{\scrlayer@level@init}{%
+ \@tempcnta=1
+ \def\reserved@b##1{%
+ \@tempswatrue
+ \def\reserved@a{##1}%
+ \@whilesw \if@tempswa \fi {%
+ \scr@ifundefinedorrelax{\reserved@a}{%
+ \@tempswafalse
+ }{%
+ \@ifundefined{\reserved@a level}{%
+ \expandafter\DeclareSectionNumberDepth
+ \expandafter{\reserved@a}{\@tempcnta}%
+ }{}%
+ \advance \@tempcnta by \@ne
+ \edef\reserved@a{sub\reserved@a}%
+ }%
+ }%
+ }%
+ \reserved@b{section}%
+ \reserved@b{paragraph}%
+ \reserved@b{minisec}%
+}
+\scrlayer@level@init
+\AtBeginDocument{%
+ \scrlayer@level@init
+}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.definelayer]{KOMAarg}
+\newcommand*{\def@scr@l@pos}[4]{%
+ \@namedef{scr@l@\scr@current@layer @x}{#1}%
+ \@namedef{scr@l@\scr@current@layer @y}{#2}%
+ \@namedef{scr@l@\scr@current@layer @w}{#3}%
+ \@namedef{scr@l@\scr@current@layer @h}{#4}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{hoffset}{%
+ \@namedef{scr@l@\scr@current@layer @x}{\dimexpr #1\relax}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{voffset}{%
+ \@namedef{scr@l@\scr@current@layer @y}{\dimexpr #1\relax}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{width}{%
+ \@namedef{scr@l@\scr@current@layer @w}{\dimexpr #1\relax}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{height}{%
+ \@namedef{scr@l@\scr@current@layer @h}{\dimexpr #1\relax}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{align}{%
+ \@namedef{scr@l@\scr@current@layer @align}{#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{contents}{%
+ \@namedef{scr@l@\scr@current@layer @contents}{#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{background}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{background}{#1}%
+ \csname @scr@l@\scr@current@layer @backgroundtrue\endcsname
+ \csname @scr@l@\scr@current@layer @foregroundfalse\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{foreground}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{foreground}{#1}%
+ \csname @scr@l@\scr@current@layer @backgroundfalse\endcsname
+ \csname @scr@l@\scr@current@layer @foregroundtrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{oddpage}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{oddpage}{#1}%
+ \csname @scr@l@\scr@current@layer @oddtrue\endcsname
+ \csname @scr@l@\scr@current@layer @evenfalse\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{evenpage}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{evenpage}{#1}%
+ \csname @scr@l@\scr@current@layer @oddfalse\endcsname
+ \csname @scr@l@\scr@current@layer @eventrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{floatpage}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{floatpage}{#1}%
+ \csname @scr@l@\scr@current@layer @nonfloatpagefalse\endcsname
+ \csname @scr@l@\scr@current@layer @floatpagetrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{nonfloatpage}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{twoside}{#1}%
+ \csname @scr@l@\scr@current@layer @nonfloatpagetrue\endcsname
+ \csname @scr@l@\scr@current@layer @floatpagefalse\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{oneside}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{oneside}{#1}%
+ \csname @scr@l@\scr@current@layer @twosidefalse\endcsname
+ \csname @scr@l@\scr@current@layer @onesidetrue\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{twoside}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{twoside}{#1}%
+ \csname @scr@l@\scr@current@layer @twosidetrue\endcsname
+ \csname @scr@l@\scr@current@layer @onesidefalse\endcsname
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{page}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{page}{#1}%
+ \def@scr@l@pos{\z@}{\z@}{\paperwidth}{\paperheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{topmargin}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{topmargin}{#1}%
+ \def@scr@l@pos{\z@}{\z@}{\paperwidth}{\dimexpr \topmargin+1in\relax}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{head}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{head}{#1}%
+ \def@scr@l@pos{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi
+ +1in
+ \relax
+ }{%
+ \dimexpr \topmargin+1in+\headheight\relax
+ }{\textwidth}{\headheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{bl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{headsep}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{head}{#1}%
+ \def@scr@l@pos{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi
+ +1in
+ \relax
+ }{%
+ \dimexpr \topmargin+1in+\headheight\relax
+ }{\textwidth}{\headsep}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{textarea}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{textarea}{#1}%
+ \def@scr@l@pos{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi
+ +1in
+ \relax
+ }{%
+ \dimexpr \topmargin+1in+\headheight+\headsep\relax
+ }{\textwidth}{\textheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{foot}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{foot}{#1}%
+ \def@scr@l@pos{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi
+ +1in
+ \relax
+ }{%
+ \dimexpr \topmargin+1in+\headheight+\headsep+\textheight
+ +\footskip+\dp\strutbox-\footheight\relax
+ }{\textwidth}{\footheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{footskip}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{foot}{#1}%
+ \def@scr@l@pos{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi
+ +1in
+ \relax
+ }{%
+ \dimexpr \topmargin+1in+\headheight+\headsep+\textheight\relax
+ }{\textwidth}{\dimexpr\footskip+\dp\strutbox-\footheight\relax}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{bottommargin}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{bottommargin}{#1}%
+ \def@scr@l@pos{\z@}{%
+ \dimexpr \topmargin+1in+\headheight+\headsep
+ +\textheight
+ +\footskip+\dp\strutbox\relax
+ }{\paperwidth}{\dimexpr\paperheight-\layeryoffset\relax}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{leftmargin}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{leftmargin}{#1}%
+ \def@scr@l@pos{\z@}{\z@}{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi
+ +1in
+ \relax
+ }{\paperheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{rightmargin}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{rightmargin}{#1}%
+ \def@scr@l@pos{\paperwidth}{\z@}{%
+ \dimexpr \paperwidth-1in-\textwidth
+ -\if@twoside\ifodd\value{page}\oddsidemargin\else\evensidemargin\fi
+ \else\oddsidemargin\fi\relax
+ }{\paperheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tr}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{innermargin}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{innermargin}{#1}%
+ \def@scr@l@pos{%
+ \if@twoside
+ \ifodd\value{page} \z@
+ \else \dimexpr \evensidemargin+1in+\textwidth\relax
+ \fi
+ \else \z@\fi
+ }{\z@}{%
+ \dimexpr
+ \if@twoside\ifodd\value{page} \oddsidemargin+1in
+ \else \paperwidth-\layerxoffset\fi
+ \else \oddsidemargin+1in\fi
+ \relax
+ }{\paperheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{outermargin}[\relax]{%
+ \FamilyKeyStateProcessed
+ \scrlayer@testunexpectedarg{outermargin}{#1}%
+ \def@scr@l@pos{%
+ \dimexpr
+ \if@twoside\ifodd\value{page} \oddsidemargin+1in+\textwidth
+ \else \z@\fi
+ \else \oddsidemargin+1in+\textwidth\fi
+ \relax
+ }{\z@}{%
+ \dimexpr
+ \if@twoside\ifodd\value{page}\paperwidth-\layerxoffset
+ \else \evensidemargin+1in\fi
+ \else \paperwidth-\layerxoffset\fi
+ \relax
+ }{\paperheight}%
+ \@namedef{scr@l@\scr@current@layer @align}{tl}%
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{area}{%
+ \def@scr@l@pos#1
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayer]{KOMAarg}{clone}{%
+ \scr@ifundefinedorrelax{scr@l@#1@x}{%
+ \FamilyKeyStateUnknownValue
+ \PackageError{scrlayer}{layer `#1' undefined}{%
+ You can clone only already defined layers.\MessageBreak
+ If you'll continue, `clone=#1' will be ignored.%
+ }%
+ }{%
+ \FamilyKeyStateProcessed
+ \scrlayer@clone@attribute{\scr@current@layer}{#1}{x}%
+ \scrlayer@clone@attribute{\scr@current@layer}{#1}{y}%
+ \scrlayer@clone@attribute{\scr@current@layer}{#1}{w}%
+ \scrlayer@clone@attribute{\scr@current@layer}{#1}{h}%
+ \scrlayer@clone@attribute{\scr@current@layer}{#1}{align}%
+ \scrlayer@clone@attribute{\scr@current@layer}{#1}{contents}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{background}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{foreground}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{odd}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{even}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{oneside}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{twoside}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{floatpage}%
+ \scrlayer@clone@switch{\scr@current@layer}{#1}{nonfloatpage}%
+ }%
+}
+\newcommand*{\scrlayer@clone@attribute}[3]{%
+ \expandafter\let\csname scr@l@#1@#3\expandafter\endcsname
+ \csname scr@l@#2@#3\expandafter\endcsname
+}
+\newcommand*{\scrlayer@clone@switch}[3]{%
+ \expandafter\let\csname if@scr@l@#1@#3\expandafter\endcsname
+ \csname if@scr@l@#2@#3\expandafter\endcsname
+}
+\newcommand*{\DeclareLayer}[2][]{%
+ \def\scr@current@layer{#2}%
+ \@namedef{scr@l@#2@x}{\z@}%
+ \@namedef{scr@l@#2@y}{\z@}%
+ \@namedef{scr@l@#2@w}{\paperwidth}%
+ \@namedef{scr@l@#2@h}{\paperheight}%
+ \@namedef{scr@l@#2@align}{tl}%
+ \@namedef{scr@l@#2@contents}{}%
+ \expandafter\newif\csname if@scr@l@#2@background\endcsname
+ \csname @scr@l@#2@backgroundtrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@foreground\endcsname
+ \csname @scr@l@#2@foregroundtrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@odd\endcsname
+ \csname @scr@l@#2@oddtrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@even\endcsname
+ \csname @scr@l@#2@eventrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@oneside\endcsname
+ \csname @scr@l@#2@onesidetrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@twoside\endcsname
+ \csname @scr@l@#2@twosidetrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@floatpage\endcsname
+ \csname @scr@l@#2@floatpagetrue\endcsname
+ \expandafter\newif\csname if@scr@l@#2@nonfloatpage\endcsname
+ \csname @scr@l@#2@nonfloatpagetrue\endcsname
+ \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}%
+}
+\newcommand*{\scr@current@layer}{}
+\newcommand*{\IfLayerExists}[1]{%
+ \scr@ifundefinedorrelax{scr@l@#1@x}{%
+ \expandafter\@secondoftwo
+ }{%
+ \expandafter\@firstoftwo
+ }%
+}
+\newcommand*{\DeclareNewLayer}[2][]{%
+ \IfLayerExists{#2}{%
+ \PackageError{scrlayer}{layer `#2' already defined}{%
+ You may declare only layer, that haven't been declared previously
+ using\MessageBreak
+ \string\DeclareNewLayer. See also the alternatives
+ \string\RedeclareLayer,\MessageBreak
+ \string\ModifyLayer\space and \string\ProvideLayer.\MessageBreak
+ If you'll continue, declaration will be ignored.}%
+ }{\DeclareLayer[{#1}]{#2}}%
+}
+\newcommand*{\ProvideLayer}[2][]{%
+ \IfLayerExists{#2}{%
+ \PackageInfo{scrlayer}{\string\ProvideLayer{#2} ignored,\MessageBreak
+ because of already defined layer}%
+ }{\DeclareNewLayer[{#1}]{#2}}%
+}
+\newcommand*{\RedeclareLayer}[2][]{%
+ \IfLayerExists{#2}{}{%
+ \PackageError{scrlayer}{layer `#2' not yet defined}{%
+ You may declare only already declared layers using
+ \string\RedeclareLayer.\MessageBreak
+ See also the alternatives
+ \string\DeclareLayer and \string\ProvideLayer.\MessageBreak
+ Nevertheless, if you'll continue, declaration will be done.}%
+ }%
+ \DeclareLayer[{#1}]{#2}%
+}
+\newcommand*{\ModifyLayer}[2][]{%
+ \IfLayerExists{#2}{%
+ \FamilyExecuteOptions[.definelayer]{KOMAarg}{#1}%
+ }{%
+ \PackageError{scrlayer}{layer `#2' not yet defined}{%
+ You may modify only already declared layers using
+ \string\ModifyLayer.\MessageBreak
+ See also the alternatives
+ \string\DeclareLayer and \string\ProvideLayer.\MessageBreak
+ Nevertheless, if you'll continue, declaration will be done.}%
+ \DeclareLayer[{#1}]{#2}%
+ }%
+}
+\newcommand*{\DestroyLayer}[1]{%
+ \IfLayerExists{#1}{%
+ \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
+ \expandafter\let\csname scr@l@#1@h\endcsname\relax
+ \expandafter\let\csname scr@l@#1@align\endcsname\relax
+ \expandafter\let\csname scr@l@#1@contents\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@background\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@backgroundfalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@backgroundtrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@foreground\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@foregroundfalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@foregroundtrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@odd\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@oddfalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@oddtrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@even\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@evenfalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@eventrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@oneside\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@onesidefalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@onesidetrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@twoside\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@twosidefalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@twosidetrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@floatpage\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@floatpagefalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@floatpagetrue\endcsname\relax
+ \expandafter\let\csname if@scr@l@#1@nonfloatpage\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@nonfloatpagefalse\endcsname\relax
+ \expandafter\let\csname @scr@l@#1@nonfloatpagetrue\endcsname\relax
+ }{%
+ \PackageInfo{scrlayer}{\string\DestroyLayer{#1} ignored,\MessageBreak
+ because that layer doesn't exist\MessageBreak
+ (any longer)%
+ }%
+ }%
+}
+\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}}%
+ \@tempcnta=\numexpr \dimexpr\layerwidth + .5mm\relax/\dimexpr 1mm\relax\relax
+ \multiput(0,0)(1mm\@gobble,0){\@tempcnta}{%
+ \line(0,-1){1mm\@gobble}%
+ }%
+ \@tempcnta=\numexpr \dimexpr\layerwidth + 2.5mm\relax/\dimexpr 5mm\relax\relax
+ \multiput(0,0)(5mm\@gobble,0){\@tempcnta}{%
+ \line(0,-1){2mm\@gobble}%
+ }%
+ \@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){%
+ \makebox(0,0)[ct]{\the\numexpr\@tempcnta-\@multicnt\relax}}%
+ }%
+ \put(0,-\layerheight\@gobble){\line(1,0){\layerwidth\@gobble}}%
+ \@tempcnta=\numexpr \dimexpr\layerwidth + .05in\relax/\dimexpr .1in\relax\relax
+ \multiput(0,-\layerheight\@gobble)(.1in\@gobble,0){\@tempcnta}{%
+ \line(0,1){1mm\@gobble}%
+ }%
+ \@tempcnta=\numexpr \dimexpr\layerwidth + .25in\relax/\dimexpr .5in\relax\relax
+ \multiput(0,-\layerheight\@gobble)(.5in\@gobble,0){\@tempcnta}{%
+ \line(0,1){2mm\@gobble}%
+ }%
+ \@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){%
+ \makebox(0,0)[cb]{\the\numexpr\@tempcnta-\@multicnt\relax}}%
+ }%
+ \put(0,0){\line(0,-1){\layerheight\@gobble}}%
+ \@tempcnta\numexpr \dimexpr\layerheight + .5mm\relax/\dimexpr 1mm\relax\relax
+ \multiput(0,0)(0,-1mm\@gobble){\@tempcnta}{%
+ \line(1,0){1mm\@gobble}%
+ }%
+ \@tempcnta\numexpr \dimexpr\layerheight + 2.5mm\relax/\dimexpr 5mm\relax\relax
+ \multiput(0,0)(0,-5mm\@gobble){\@tempcnta}{%
+ \line(1,0){2mm\@gobble}%
+ }%
+ \@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){%
+ \makebox(0,0)[cl]{\the\numexpr\@tempcnta-\@multicnt\relax}}%
+ }%
+ \put(\layerwidth\@gobble,0){\line(0,-1){\layerheight\@gobble}}%
+ \@tempcnta\numexpr \dimexpr\layerheight + .05in\relax/\dimexpr .1in\relax\relax
+ \multiput(\layerwidth\@gobble,0)(0,-.1in\@gobble){\@tempcnta}{%
+ \line(-1,0){1mm\@gobble}%
+ }%
+ \@tempcnta\numexpr \dimexpr\layerheight + .25in\relax/\dimexpr .5in\relax\relax
+ \multiput(\layerwidth\@gobble,0)(0,-.5in\@gobble){\@tempcnta}{%
+ \line(-1,0){2mm\@gobble}%
+ }%
+ \@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){%
+ \makebox(0,0)[cr]{\the\numexpr\@tempcnta-\@multicnt\relax}}%
+ }%
+ \end{picture}}%
+}
+\DefineFamily{KOMAarg}
+\DefineFamilyMember[.definelayerpagestyle]{KOMAarg}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onselect}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @initialhook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{oninit}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @hook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ononeside}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @onesidehook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{ontwoside}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @twosidehook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onoddpage}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @oddpagehook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onevenpage}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @evenpagehook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onfloatpage}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @floatpagehook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onnonfloatpage}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @nonfloatpagehook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onbackground}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @backgroundhook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\DefineFamilyKey[.definelayerpagestyle]{KOMAarg}{onforeground}{%
+ \expandafter\l@addto@macro
+ \csname @ps@\scrlayer@current@pagestyle @foregroundhook\endcsname
+ {#1}%
+ \FamilyKeyStateProcessed
+}
+\newcommand*{\DeclarePageStyleByLayers}[3][]{%
+ \edef\scrlayer@current@pagestyle{\GetRealPageStyle{#2}}%
+ \expandafter\scrlayer@declare@ps@by@layers\expandafter{%
+ \scrlayer@current@pagestyle
+ }{#1}{#3}%
+}
+\newcommand*{\scrlayer@declare@ps@by@layers}[3]{%
+ \@namedef{@ps@#1@initialhook}{\@ps@initialhook}%
+ \@namedef{@ps@#1@hook}{\@ps@hook}%
+ \@namedef{@ps@#1@backgroundhook}{\@ps@backgroundhook}%
+ \@namedef{@ps@#1@foregroundhook}{\@ps@foregroundhook}%
+ \@namedef{@ps@#1@oddpagehook}{\@ps@oddpagehook}%
+ \@namedef{@ps@#1@evenpagehook}{\@ps@evenpagehook}%
+ \@namedef{@ps@#1@onesidehook}{\@ps@onesidehook}%
+ \@namedef{@ps@#1@twosidehook}{\@ps@twosidehook}%
+ \@namedef{@ps@#1@floatpagehook}{\@ps@floatpagehook}%
+ \@namedef{@ps@#1@nonfloatpagehook}{\@ps@nonfloatpagehook}%
+ \FamilyExecuteOptions[.definelayerpagestyle]{KOMAarg}{#2}%
+ \@namedef{ps@#1}{%
+ \renewcommand*{\currentpagestyle}{#1}%
+ \@nameuse{@ps@@everystyle@@initialhook}%
+ \@nameuse{@ps@#1@initialhook}%
+ \renewcommand*{\currentpagestyle}{#1}%
+ \renewcommand*{\@oddhead}{%
+ \begingroup
+ \let\headmark\rightmark
+ \@nameuse{@ps@@everystyle@@hook}%
+ \@nameuse{@ps@#1@hook}%
+ \@nameuse{@ps@@everystyle@@\if@twoside two\else one\fi sidehook}%
+ \@nameuse{@ps@#1@\if@twoside two\else one\fi sidehook}%
+ \@nameuse{@ps@@everystyle@@oddpagehook}%
+ \@nameuse{@ps@#1@oddpagehook}%
+ \@nameuse{@ps@@everystyle@@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@@everystyle@@backgroundhook}%
+ \@nameuse{@ps@#1@backgroundhook}%
+ \parbox[t][\headheight][t]{\linewidth}{%
+ \vskip \dimexpr -\topmargin-1in
+ -\headheight
+ -\ht\strutbox\relax
+ \hskip \dimexpr -\oddsidemargin-1in\relax
+ \strut\makebox[\z@][l]{%
+ \ForEachLayerOfPageStyle{@everystyle@}{%
+ \scrlayer@do@page@style@element@layer{background}{odd}%
+ {########1}%
+ }%
+ \ForEachLayerOfPageStyle{#1}{%
+ \scrlayer@do@page@style@element@layer{background}{odd}%
+ {########1}%
+ }%
+ }%
+ }%
+ \endgroup
+ }%
+ \renewcommand*{\@evenhead}{%
+ \begingroup
+ \let\headmark\leftmark
+ \@nameuse{@ps@@everystyle@@hook}%
+ \@nameuse{@ps@#1@hook}%
+ \@nameuse{@ps@@everystyle@@twosidehook}%
+ \@nameuse{@ps@#1@twosidehook}%
+ \@nameuse{@ps@@everystyle@@evenpagehook}%
+ \@nameuse{@ps@#1@evenpagehook}%
+ \@nameuse{@ps@@everystyle@@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@@everystyle@@backgroundhook}%
+ \@nameuse{@ps@#1@backgroundhook}%
+ \parbox[t][\headheight][t]{\linewidth}{%
+ \vskip \dimexpr -\topmargin-1in
+ -\headheight
+ -\ht\strutbox\relax
+ \hskip \dimexpr-\evensidemargin-1in\relax
+ \strut\makebox[\z@][l]{%
+ \ForEachLayerOfPageStyle{@everystyle@}{%
+ \scrlayer@do@page@style@element@layer{background}{even}%
+ {########1}%
+ }%
+ \ForEachLayerOfPageStyle{#1}{%
+ \scrlayer@do@page@style@element@layer{background}{even}%
+ {########1}%
+ }%
+ }%
+ }%
+ \endgroup
+ }%
+ \renewcommand*{\@oddfoot}{%
+ \begingroup
+ \let\headmark\rightmark
+ \@nameuse{@ps@@everystyle@@hook}%
+ \@nameuse{@ps@#1@hook}%
+ \@nameuse{@ps@@everystyle@@\if@twoside two\else one\fi sidehook}%
+ \@nameuse{@ps@#1@\if@twoside two\else one\fi sidehook}%
+ \@nameuse{@ps@@everystyle@@oddpagehook}%
+ \@nameuse{@ps@#1@oddpagehook}%
+ \@nameuse{@ps@@everystyle@@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@@everystyle@@foregroundhook}%
+ \@nameuse{@ps@#1@foregroundhook}%
+ \parbox[t][\headheight][t]{\linewidth}{%
+ \vskip \dimexpr -\topmargin-1in
+ -\headheight
+ -\headsep
+ -\textheight
+ -\footskip
+ -\ht\strutbox\relax
+ \hskip \dimexpr -\oddsidemargin-1in\relax
+ \strut\makebox[\z@][l]{%
+ \ForEachLayerOfPageStyle{@everystyle@}{%
+ \scrlayer@do@page@style@element@layer{foreground}{odd}%
+ {########1}%
+ }%
+ \ForEachLayerOfPageStyle{#1}{%
+ \scrlayer@do@page@style@element@layer{foreground}{odd}%
+ {########1}%
+ }%
+ }%
+ }%
+ \endgroup
+ }%
+ \renewcommand*{\@evenfoot}{%
+ \begingroup
+ \let\headmark\leftmark
+ \@nameuse{@ps@@everystyle@@hook}%
+ \@nameuse{@ps@#1@hook}%
+ \@nameuse{@ps@@everystyle@@twosidehook}%
+ \@nameuse{@ps@#1@twosidehook}%
+ \@nameuse{@ps@@everystyle@@evenpagehook}%
+ \@nameuse{@ps@#1@evenpagehook}%
+ \@nameuse{@ps@@everystyle@@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@#1@\if@fcolmade\else non\fi floatpagehook}%
+ \@nameuse{@ps@@everystyle@@foregroundhook}%
+ \@nameuse{@ps@#1@foregroundhook}%
+ \parbox[t][\headheight][t]{\linewidth}{%
+ \vskip \dimexpr -\topmargin-1in
+ -\headheight
+ -\headsep
+ -\textheight
+ -\footskip
+ -\ht\strutbox\relax
+ \hskip \dimexpr-\evensidemargin-1in\relax
+ \strut\makebox[\z@][l]{%
+ \ForEachLayerOfPageStyle{@everystyle@}{%
+ \scrlayer@do@page@style@element@layer{foreground}{even}%
+ {########1}%
+ }%
+ \ForEachLayerOfPageStyle{#1}{%
+ \scrlayer@do@page@style@element@layer{foreground}{even}%
+ {########1}%
+ }%
+ }%
+ }%
+ \endgroup
+ }%
+ }%
+ \@namedef{@ps@#1@layers}{}%
+ \@for \reserved@a:=#3\do {%
+ \ifstr\reserved@a\@empty{}{%
+ \expandafter\@cons\csname @ps@#1@layers\endcsname{{\reserved@a}}%
+ }%
+ }%
+}
+\newcommand*{\ForEachLayerOfPageStyle}[2]{%
+ \begingroup
+ \edef\reserved@a{\GetRealPageStyle{#1}}%
+ \def\@elt##1{\ifscrlayer@deactivate@layers\else #2\fi}%
+ \@nameuse{@ps@\reserved@a @layers}%
+ \endgroup
+}
+\newcommand*{\scrlayer@do@page@style@element@layer}[3]{%
+ \begingroup
+ \expandafter\ifx\csname if@scr@l@#3@\if@fcolmade\else non\fi floatpage%
+ \expandafter\endcsname\csname iftrue\endcsname
+ \expandafter\ifx\csname if@scr@l@#3@\if@twoside two\else one\fi side%
+ \expandafter\endcsname\csname iftrue\endcsname
+ \expandafter
+ \ifx\csname if@scr@l@#3@#1\expandafter\endcsname
+ \csname iftrue\endcsname
+ \expandafter
+ \ifx\csname if@scr@l@#3@#2\expandafter\endcsname
+ \csname iftrue\endcsname
+ \ifscrlayer@draft
+ \scr@layerbox(\csname scr@l@#3@x\endcsname,%
+ \csname scr@l@#3@y\endcsname)%
+ (\csname scr@l@#3@w\endcsname,%
+ \csname scr@l@#3@h\endcsname)%
+ [\csname scr@l@#3@align\endcsname]%
+ {\layercontentsmeasure}%
+ \fi
+ \scr@layerbox(\csname scr@l@#3@x\endcsname,%
+ \csname scr@l@#3@y\endcsname)%
+ (\csname scr@l@#3@w\endcsname,%
+ \csname scr@l@#3@h\endcsname)%
+ [\csname scr@l@#3@align\endcsname]%
+ {\csname scr@l@#3@contents\endcsname}%
+ \fi
+ \fi
+ \fi
+ \fi
+ \endgroup
+}
+\def\scr@layerbox(#1,#2)(#3,#4){%
+ \@ifnextchar [%]
+ {\scr@@layerbox(#1,#2)(#3,#4)}{\scr@@layerbox(#1,#2)(#3,#4)[]}%
+}
+\def\scr@@layerbox(#1,#2)(#3,#4)[#5]#6{%
+ \begingroup
+ \edef\layerxoffset{#1}%
+ \edef\layeryoffset{#2}%
+ \edef\layerwidth{#3}%
+ \edef\layerheight{#4}%
+ \def\scr@l@valign{t}%
+ \def\scr@l@halign{l}%
+ \edef\reserved@b{#5}%
+ \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=%
+ \reserved@b\do{%
+ \if t\reserved@a
+ \def\scr@l@valign{t}%
+ \else
+ \if c\reserved@a
+ \def\scr@l@valign{c}%
+ \def\scr@l@halign{c}%
+ \else
+ \if b\reserved@a
+ \def\scr@l@valign{b}%
+ \else
+ \if l\reserved@a
+ \def\scr@l@halign{l}%
+ \else
+ \if r\reserved@a
+ \def\scr@l@halign{r}%
+ \else
+ \PackageWarning{scrlayer}{%
+ Unknown alignment `\reserved@a' ignored}%
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ \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
+ \makebox[\z@][l]{%
+ \hskip\layerxoffset
+ \makebox[\z@][\scr@l@halign]{%
+ \parbox[\scr@l@valign][\layerheight][\scr@l@valign]{\layerwidth}{%
+ \vskip\z@\strut{%
+ \ifscrlayer@forceignoreuppercase
+ \expandafter\let\csname MakeUppercase \endcsname\@firstofone
+ \let\MakeUppercase\@firstofone
+ \let\uppercase\@firstofone
+ \fi
+ #6%
+ }\strut\vskip\z@
+ }%
+ }%
+ }%
+ }%
+ \endgroup
+}
+\newcommand*{\DeclareNewPageStyleByLayers}[2][]{%
+ \@ifundefined{ps@#2}{}{%
+ \PackageError{scrlayer}{%
+ Page style `#2' already defined%
+ }{%
+ You may use \string\DeclareNewPageStyleByLayers\space to declare a new
+ page style only\MessageBreak
+ if that page style hasn't been declared or defined before.\MessageBreak
+ You may use either \string\ProvidePageStyleByLayers\space to declare the
+ page style only\MessageBreak
+ if it hasn't been declared or defined before, or
+ \string\RedeclarePageStyleByLayers\MessageBreak
+ to overwrite the former
+ declaration or definition of the page style%
+ \@ifundefined{@ps@#2@layers}{}{,\MessageBreak
+ or \string\AddLayersToPageStyle\space to add further layers to the
+ already declared\MessageBreak
+ page style, or \string\RemoveLayersFromPageStyle\space to remove
+ layers from the\MessageBreak
+ already declared page style}.\MessageBreak
+ Nevertheless, if you'll continue, the page style will be
+ overwritten\MessageBreak
+ by the new declaration.%
+ }%
+ }%
+ \DeclarePageStyleByLayers[{#1}]{#2}%
+}
+\newcommand*{\ProvidePageStyleByLayers}[3][]{%
+ \@ifundefined{ps@#2}{%
+ \DeclarePageStyleByLayers[{#1}]{#2}{#3}%
+ }{%
+ \PackageInfo{scrlayer}{%
+ \string\ProvidePageStyleByLayers{#2}{#3} ignored,\MessageBreak
+ because page style `#2'\MessageBreak
+ already exists%
+ }%
+ }%
+}
+\newcommand*{\RedeclarePageStyleByLayers}[2][]{%
+ \@ifundefined{ps@#2}{%
+ \PackageError{scrlayer}{%
+ Page style `#2' not yet defined%
+ }{%
+ You may use \string\RedeclarePageStyleByLayers\space to declare a page
+ style only\MessageBreak
+ if that page style has already been declared or defined.\MessageBreak
+ You may use either \string\DeclareNewPageStyleByLayers,
+ \string\DeclarePageStyleByLayers,\MessageBreak
+ or \string\ProvidePageStyleByLayers\space to declare that not yet
+ defined page style.\MessageBreak
+ Nevertheless, if you'll continue, the page style will be declared.%
+ }%
+ }{}%
+ \DeclarePageStyleByLayers[{#1}]{#2}%
+}
+\newcommand*{\AddLayersToPageStyle}[2]{%
+ \edef\reserved@b{\GetRealPageStyle{#1}}%
+ \IfLayerPageStyleExists{\reserved@b}{%
+ \@for \reserved@a:=#2\do {%
+ \ifstr\reserved@a\@empty{}{%
+ \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname
+ {{\reserved@a}}%
+ }%
+ }%
+ }{%
+ \scrlayer@lpm@error{#1}{adding layers}%
+ }%
+}
+\newcommand*{\AddLayersAtEndOfPageStyle}{%
+ \AddLayersToPageStyle
+}
+\newcommand*{\AddLayersAtBeginOfPageStyle}[2]{%
+ \begingroup
+ \let\@cons\@snoc
+ \AddLayersToPageStyle{#1}{#2}%
+ \endgroup
+}
+\newcommand*{\@snoc}[2]{%
+ \begingroup\let\@elt\relax\xdef#1{\@elt #2#1}\endgroup
+}
+\newcommand*{\RemoveLayersFromPageStyle}[2]{%
+ \edef\reserved@b{\GetRealPageStyle{#1}}%
+ \IfLayerPageStyleExists{#1}{%
+ \@for \reserved@a:=#2\do {%
+ \ifstr\reserved@a\@empty{}{%
+ \expandafter\remove@layer@from@page@style\expandafter{\reserved@a}%
+ {\reserved@b}%
+ }%
+ }%
+ }{%
+ \scrlayer@lpm@error{#1}{removing layers}%
+ }%
+}
+\newcommand*{\remove@layer@from@page@style}[2]{%
+ \begingroup
+ \expandafter\let\expandafter\reserved@a\csname @ps@#2@layers\endcsname
+ \@namedef{@ps@#2@layers}{}%
+ \def\@elt##1{%
+ \ifstr{#1}{##1}{}{%
+ \expandafter\@cons\csname @ps@#2@layers\endcsname{{##1}}%
+ }%
+ }\reserved@a
+ \endgroup
+}
+\newcommand*{\scrlayer@lpm@error}[2]{%
+ \PackageError{scrlayer}{`#1' is not a layer page style}{%
+ \scr@ifundefinedorrelax{ps@#1}{%
+ Page style `#1' is not defined,
+ }{%
+ Page style `#1' is not a layer page style,
+ }%
+ but #2\MessageBreak
+ may be used only for layer page styles declared using\MessageBreak
+ \string\DeclarePageStyleByLayers,
+ \string\DeclareNewPageStyleByLayers,\MessageBreak
+ of \string\ProvidePageStyleByLayers.\MessageBreak
+ If you'll continue, your operation will be ignored.%
+ }%
+}
+\newcommand*{\AddLayersToPageStyleAfterLayer}[3]{%
+ \edef\reserved@b{\GetRealPageStyle{#1}}%
+ \IfLayerPageStyleExists{\reserved@b}{%
+ \begingroup
+ \expandafter\let\expandafter\reserved@a
+ \csname @ps@\reserved@b @layers\endcsname
+ \@namedef{@ps@\reserved@b @layers}{}%
+ \def\@elt##1{%
+ \ifstr{##1}\@empty{}{%
+ \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname{{##1}}%
+ \ifstr{##1}{#3}{%
+ \@for \reserved@a:=#2\do {%
+ \ifstr\reserved@a\@empty{}{%
+ \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname
+ {{\reserved@a}}%
+ }%
+ }%
+ }{}%
+ }%
+ }%
+ \reserved@a
+ \endgroup
+ }{%
+ \scrlayer@lpm@error{#1}{adding layers}%
+ }%
+}
+\newcommand*{\AddLayersToPageStyleBeforeLayer}[3]{%
+ \edef\reserved@b{\GetRealPageStyle{#1}}%
+ \IfLayerPageStyleExists{\reserved@b}{%
+ \begingroup
+ \expandafter\let\expandafter\reserved@a
+ \csname @ps@\reserved@b @layers\endcsname
+ \@namedef{@ps@\reserved@b @layers}{}%
+ \def\@elt##1{%
+ \ifstr{##1}\@empty{}{%
+ \ifstr{##1}{#3}{%
+ \@for \reserved@a:=#2\do {%
+ \ifstr\reserved@a\@empty{}{%
+ \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname
+ {{\reserved@a}}%
+ }%
+ }%
+ }{}%
+ \expandafter\@cons\csname @ps@#1@layers\endcsname{{##1}}%
+ }%
+ }%
+ \reserved@a
+ \endgroup
+ }{%
+ \scrlayer@lpm@error{#1}{adding layers}%
+ }%
+}
+\newcommand*{\UnifyLayersAtPageStyle}[1]{%
+ \edef\reserved@b{\GetRealPageStyle{#1}}%
+ \IfLayerPageStyleExists{\reserved@b}{%
+ \expandafter\let\expandafter\reserved@a
+ \csname @ps@\reserved@b @layers\endcsname
+ \@namedef{@ps@\reserved@b @layers}{}%
+ \begingroup
+ \def\@elt##1{%
+ \ifstr{##1}\@empty{}{%
+ \remove@layer@from@page@style{##1}{\reserved@b}%
+ \expandafter\@cons\csname @ps@\reserved@b @layers\endcsname{{##1}}%
+ }%
+ }%
+ \reserved@a
+ \endgroup
+ }{%
+ \scrlayer@lpm@error{#1}{unifying}%
+ }%
+}
+\newcommand*{\ModifyLayerPageStyleOptions}[2]{%
+ \edef\reserved@a{\GetRealPageStyle{#1}}%
+ \IfLayerPageStyleExists{#1}{%
+ \expandafter\scrlayer@modify@layer@ps@options\expandafter{%
+ \reserved@a
+ }{#2}%
+ }{%
+ \scrlayer@lpm@error{#1}{modifying}%
+ }%
+}
+\newcommand*{\scrlayer@modify@layer@ps@options}[2]{%
+ \begingroup
+ \def\scrlayer@current@pagestyle{#1}%
+ \@namedef{@ps@#1@initialhook}{}%
+ \@namedef{@ps@#1@hook}{}%
+ \@namedef{@ps@#1@backgroundhook}{}%
+ \@namedef{@ps@#1@foregroundhook}{}%
+ \@namedef{@ps@#1@oddpagehook}{}%
+ \@namedef{@ps@#1@evenpagehook}{}%
+ \@namedef{@ps@#1@onesidehook}{}%
+ \@namedef{@ps@#1@twosidehook}{}%
+ \@namedef{@ps@#1@floatpagehook}{}%
+ \@namedef{@ps@#1@nonfloatpagehook}{}%
+ \FamilyExecuteOptions[.definelayerpagestyle]{KOMAarg}{#2}%
+ \def\reserved@a{\endgroup}%
+ \def\@sls@##1{%
+ \expandafter\let\expandafter\reserved@b\csname @ps@#1@##1hook\endcsname
+ \ifx\reserved@b\@empty\else
+ \l@addto@macro\reserved@a{\@namedef{@ps@#1@##1hook}}%
+ \expandafter\l@addto@macro\expandafter\reserved@a\expandafter{%
+ \expandafter{%
+ \reserved@b
+ }%
+ }%
+ \fi
+ }%
+ \@sls@{initial}%
+ \@sls@{}%
+ \@sls@{background}%
+ \@sls@{foreground}%
+ \@sls@{oddpage}%
+ \@sls@{evenpage}%
+ \@sls@{oneside}%
+ \@sls@{twoside}%
+ \@sls@{floatpage}%
+ \@sls@{nonfloatpage}%
+ \reserved@a
+}
+\newcommand*{\AddToLayerPageStyleOptions}[2]{%
+ \IfLayerPageStyleExists{#1}{%
+ \def\scrlayer@current@pagestyle{#1}%
+ \FamilyExecuteOptions[.definelayerpagestyle]{KOMAarg}{#2}%
+ }{%
+ \scrlayer@lpm@error{#1}{modifying}%
+ }%
+}
+\newcommand*{\DeclarePageStyleAlias}[2]{%
+ \edef\reserved@a{\GetRealPageStyle{#2}}%
+ \scr@ifundefinedorrelax{ps@\reserved@a}{%
+ \PackageError{scrlayer}{unknown real page style `#2'}{%
+ You've tried to declare an alias for page style `#2',\MessageBreak
+ but the real page style of `#2' is undefined.\MessageBreak
+ You can define aliases, only if the real page style has been
+ defined.\MessageBreak
+ If you'll continue, the declaration will be ignored.%
+ }%
+ \DestroyRealLayerPageStyle{#1}%
+ \DestroyLayerAlias{#1}%
+ }{%
+ \@namedef{@ps@#1@alias}{#2}%
+ \@namedef{ps@#1}{\pagestyle{\@nameuse{@ps@#1@alias}}}%
+ }%
+}
+\newcommand*{\DeclareNewPageStyleAlias}[1]{%
+ \@ifundefined{ps@#1}{}{%
+ \PackageError{scrlayer}{%
+ Page style `#1' already defined%
+ }{%
+ You may use \string\DeclareNewPageStyleAlias\space to declare a new
+ page style only\MessageBreak
+ if that page style hasn't been declared or defined before.\MessageBreak
+ You may use either \string\ProvidePageStyleAlias\space to declare the
+ page style only\MessageBreak
+ if it hasn't been declared or defined before, or
+ \string\RedeclarePageStyleAlias\MessageBreak
+ to overwrite the former declaration or definition of the page
+ style\MessageBreak
+ Nevertheless, if you'll continue, the page style will be
+ overwritten\MessageBreak
+ by the new alias.%
+ }%
+ }%
+ \DeclarePageStyleAlias{#1}%
+}
+\newcommand*{\ProvidePageStyleAlias}[2]{%
+ \@ifundefined{ps@#1}{%
+ \DeclarePageStyleAlias{#1}{#2}%
+ }{%
+ \PackageInfo{scrlayer}{%
+ \string\ProvidePageStyleAlias{#1}{#2} ignored,\MessageBreak
+ because page style `#1' already\MessageBreak
+ exists%
+ }%
+ }%
+}
+\newcommand*{\RedeclarePageStyleAlias}[1]{%
+ \@ifundefined{ps@#1}{%
+ \PackageError{scrlayer}{%
+ Page style `#1' not yet defined%
+ }{%
+ You may use \string\RedeclarePageStyleAlias\space to declare a page
+ style only\MessageBreak
+ if that page style has already been declared or defined.\MessageBreak
+ You may use either \string\DeclareNewPageStyleAlias,
+ \string\DeclarePageStyleAlias,\MessageBreak
+ or \string\ProvidePageStyleAlias\space to declare that not yet
+ defined page style.\MessageBreak
+ Nevertheless, if you'll continue, the page style will be declared.%
+ }%
+ }{}%
+ \DeclarePageStyleAlias{#1}%
+}
+\newcommand*{\DestroyPageStyleAlias}[1]{%
+ \scr@ifundefinedorrelax{@ps@#1@alias}{}{%
+ \expandafter\let\csname @ps@#1@alias\endcsname\relax
+ \expandafter\let\csname ps@#1\endcsname\relax
+ }%
+}
+\newcommand*{\GetRealPageStyle}[1]{%
+ \scr@ifundefinedorrelax{@ps@#1@alias}{#1}{%
+ \expandafter\GetRealPageStyle\expandafter{%
+ \expandafter\csname @ps@#1@alias\expandafter\endcsname\expandafter}%
+ }%
+}
+\newcommand*{\IfLayerPageStyleExists}[1]{%
+ \scr@ifundefinedorrelax{ps@#1}{%
+ \expandafter\@secondoftwo
+ }{%
+ \scr@ifundefinedorrelax{@ps@#1@layers}{%
+ \scr@ifundefinedorrelax{@ps@#1@alias}{%
+ \expandafter\@secondoftwo
+ }{%
+ \expandafter\IfLayerPageStyleExists\expandafter{%
+ \expandafter\csname @ps@#1@alias\expandafter\endcsname\expandafter}%
+ }%
+ }{%
+ \expandafter\@firstoftwo
+ }%
+ }%
+}
+\newcommand*{\IfRealLayerPageStyleExists}[1]{%
+ \scr@ifundefinedorrelax{ps@#1}{%
+ \expandafter\@secondoftwo
+ }{%
+ \scr@ifundefinedorrelax{@ps@#1@layers}{%
+ \expandafter\@secondoftwo
+ }{%
+ \expandafter\@firstoftwo
+ }%
+ }%
+}
+\newcommand*{\IfLayerAtPageStyle}[2]{%
+ \IfLayerPageStyleExists{#1}{%
+ \begingroup
+ \edef\reserved@a{\GetRealPageStyle{#1}}%
+ \@tempswafalse
+ \ifstr{#2}{}{%
+ \expandafter\ifx\csname @ps@\reserved@a @layers\endcsname\@empty
+ \@tempswatrue
+ \fi
+ }{%
+ \expandafter\ForEachLayerOfPageStyle\expandafter{%
+ \reserved@a}{\ifstr{##1}{#2}{\aftergroup\@tempswatrue}{}}%
+ }%
+ \if@tempswa \aftergroup\@firstoftwo \else \aftergroup\@secondoftwo \fi
+ \expandafter\endgroup
+ }{%
+ \scrlayer@lpm@error{#1}{testing for layers}%
+ \expandafter\@gobbletwo
+ }%
+}
+\newcommand*{\IfSomeLayersAtPageStyle}[2]{%
+ \IfLayerPageStyleExists{#1}{%
+ \begingroup
+ \@tempswafalse
+ \@for \reserved@a:=#2\do {%
+ \edef\reserved@a{\noexpand\IfLayerAtPageStyle{#1}{\reserved@a}}%
+ \reserved@a{\@tempswatrue}{}%
+ }%
+ \if@tempswa \aftergroup\@firstoftwo \else \aftergroup\@secondoftwo \fi
+ \expandafter\endgroup
+ }{%
+ \scrlayer@lpm@error{#1}{testing for layers}%
+ \expandafter\@gobbletwo
+ }%
+}
+\newcommand*{\IfLayersAtPageStyle}[2]{%
+ \IfLayerPageStyleExists{#1}{%
+ \begingroup
+ \@tempswatrue
+ \ifstr{#2}{}{%
+ \edef\reserved@a{\GetRealPageStyle{#1}}%
+ \expandafter\ifx\csname @scr@\reserved@a @layers\endcsname\@empty \else
+ \@tempswafalse
+ \fi
+ }{%
+ \@for \reserved@a:=#2\do {%
+ \edef\reserved@a{\noexpand\IfLayerAtPageStyle{#1}{\reserved@a}}%
+ \reserved@a{}{\@tempswafalse}%
+ }%
+ }%
+ \if@tempswa \aftergroup\@firstoftwo \else \aftergroup\@secondoftwo \fi
+ \expandafter\endgroup
+ }{%
+ \scrlayer@lpm@error{#1}{testing for layers}%
+ \expandafter\@gobbletwo
+ }%
+}
+\newcommand*{\DestroyRealLayerPageStyle}[1]{%
+ \IfRealLayerPageStyleExists{#1}{%
+ \expandafter\let\csname @ps@#1@initialhook\endcsname\relax
+ \expandafter\let\csname @ps@#1@hook\endcsname\relax
+ \expandafter\let\csname @ps@#1@backgroundhook\endcsname\relax
+ \expandafter\let\csname @ps@#1@foregroundhook\endcsname\relax
+ \expandafter\let\csname @ps@#1@oddpagehook\endcsname\relax
+ \expandafter\let\csname @ps@#1@evenpagehook\endcsname\relax
+ \expandafter\let\csname @ps@#1@onesidehook\endcsname\relax
+ \expandafter\let\csname @ps@#1@twosidehook\endcsname\relax
+ \expandafter\let\csname @ps@#1@floatpagehook\endcsname\relax
+ \expandafter\let\csname @ps@#1@nonfloatpagehook\endcsname\relax
+ \expandafter\let\csname @ps@#1@layers\endcsname\relax
+ \expandafter\let\csname ps@#1\endcsname\relax
+ \ifstr{\currentpagestyle}{#1}{%
+ \def\currentpagestyle{scrlayer@empty}%
+ \let\@oddhead\@empty\let\@evenhead\@empty
+ \let\@oddfoot\@empty\let\@evenfoot\@empty
+ }{}%
+ \if@specialpage
+ \ifstr{\@specialstyle}{#1}{%
+ \global\let\@specialstyle\relax
+ \global\@specialpagefalse
+ }{}%
+ \fi
+ }{%
+ \PackageInfo{scrlayer}{%
+ \string\DestroyRealLayerPageStyle{#1} ignored,\MessageBreak
+ because the layer page style isn't\MessageBreak
+ defined (any longer)%
+ }%
+ }%
+}
+\newcommand*{\currentpagestyle}{}
+\PackageInfo{scrlayer}{patching LaTeX kernel macro \string\pagestyle}
+\def\reserved@a{\scrlayer@exec@before@pagestyle@hook{##1}}
+\expandafter\expandafter\expandafter\renewcommand
+\expandafter\expandafter\expandafter*%
+\expandafter\expandafter\expandafter\pagestyle
+\expandafter\expandafter\expandafter[%
+\expandafter\expandafter\expandafter1%
+\expandafter\expandafter\expandafter]%
+\expandafter\expandafter\expandafter{%
+ \expandafter\reserved@a
+ \pagestyle{#1}%
+ \edef\currentpagestyle{\GetRealPageStyle{#1}}%
+ \scrlayer@exec@after@pagestyle@hook{#1}%
+}
+\AtBeginDocument{%
+ \begingroup
+ \let\scrlayer@exec@before@pagestyle@hook\@gobble
+ \let\scrlayer@exec@after@pagestyle@hook\@gobble
+ \def\ps@test{}%
+ \pagestyle{test}%
+ \ifstr{\currentpagestyle}{test}{}{%
+ \PackageError{scrlayer}{package incompatibility detected}{%
+ Another package redefines \string\pagestyle\space incompatible with
+ scrlayer.\MessageBreak
+ This disables setting of \string\currentpagestyle\space and may
+ be serious.\MessageBreak
+ Maybe you could prevent this loading package scrlayer
+ later.\MessageBreak
+ If not you should either not use scrlayer or not the other
+ package,\MessageBreak
+ that redefines \string\pagestyle.%
+ }%
+ }%
+ \endgroup
+}
+\newcommand*{\BeforeSelectAnyPageStyle}[1]{%
+ \expandafter\renewcommand\expandafter*%
+ \expandafter\scrlayer@exec@before@pagestyle@hook
+ \expandafter[\expandafter1\expandafter]\expandafter{%
+ \scrlayer@exec@before@pagestyle@hook{##1}#1}%
+}
+\newcommand*{\scrlayer@exec@before@pagestyle@hook}[1]{}
+\newcommand*{\AfterSelectAnyPageStyle}[1]{%
+ \expandafter\renewcommand\expandafter*%
+ \expandafter\scrlayer@exec@after@pagestyle@hook
+ \expandafter[\expandafter1\expandafter]\expandafter{%
+ \scrlayer@exec@after@pagestyle@hook{##1}#1}%
+}
+\newcommand*{\scrlayer@exec@after@pagestyle@hook}[1]{}
+\newcommand*{\scrlayerAddToInterface}[2][\@currname.\@currext]{%
+ \begingroup
+ \edef\reserve@a{%
+ \noexpand\scrlayerAddCsToInterface[#1]{\expandafter\@gobble\string #2}%
+ }%
+ \expandafter\endgroup\reserve@a
+}
+\newcommand{\scrlayerAddCsToInterface}[3][\@currname.\@currext]{%
+ \@ifundefined{scrlayer@#1@commandlist}{%
+ \PackageError{scrlayer}{unkown interface `#1'}{%
+ I've been told to add a command sequence to an interface, that hasn't
+ been\MessageBreak
+ defined yet. Please initialise every interface using
+ \string\InitInterface\space before\MessageBreak
+ trying to add command sequences to it.\MessageBreak
+ If you'll continue, the command will be ignored.%
+ }%
+ }{%
+ \@ifundefined{#2}{%
+ \scrlayer@AddCsToInterface[#1]{#2}#3%
+ }{%
+ \@ifundefined{scrlayer@command@#2}{%
+ \ifscrlayer@forceoverwrite
+ \PackageWarning{scrlayer}{%
+ Overloading `\@backslashchar#2'!\MessageBreak
+ scrlayer detected, that the given command\MessageBreak
+ has been defined already, when\MessageBreak
+ `#1' tried to define it again.\MessageBreak
+ Nevertheless, while scrlayer is in force overwrite\MessageBreak
+ mode currently, the original definition will be\MessageBreak
+ removed%
+ }%
+ \expandafter\let\csname #2\endcsname\relax
+ \scrlayer@AddCsToInterface[#1]{#2}#3%
+ \else
+ \PackageError{scrlayer}{cannot define `\@backslashchar#2'}{%
+ scrlayer interface `#1' has tried to
+ define command\MessageBreak
+ `\@backslashchar#2', but this has already been defined\MessageBreak
+ and is not part of another interface. So it cannot be
+ defined.\MessageBreak
+ Before continuing you should solve this conflict.\MessageBreak
+ Nevertheless, you may use option `forceoverwrite' to get only a
+ warning instead\MessageBreak
+ of an error. But this wouldn't solve the problem at
+ all!\MessageBreak
+ This error is almost fatal, so you should abort the LaTeX
+ run.%
+ }%
+ \fi
+ }{%
+ \ifscrlayer@autoremoveinterfaces
+ \PackageInfo{scrlayer}{%
+ already define interface command\MessageBreak
+ `\@backslashchar#2' detected.\MessageBreak
+ Command has been defined by interface\MessageBreak
+ `\@nameuse{scrlayer@command@#2}'.\MessageBreak
+ To continue installation of interface\MessageBreak
+ `#1', interface\MessageBreak
+ `\@nameuse{scrlayer@command@#2}' will\MessageBreak
+ be removed%
+ }%
+ \@nameuse{scrlayer@\@nameuse{scrlayer@command@#2}@onremove}%
+ \begingroup
+ \def\@elt##1{%
+ \aftergroup\let\aftergroup##1\aftergroup\relax
+ }%
+ \@nameuse{scrlayer@\@nameuse{scrlayer@command@#2}@commandlist}%
+ \endgroup
+ \expandafter\let\csname
+ scrlayer@\@nameuse{scrlayer@command@#2}@commandlist\endcsname\relax
+ \expandafter\let\csname
+ scrlayer@\@nameuse{scrlayer@command@#2}@onremove\endcsname\relax
+ \expandafter\let\csname #2\endcsname\relax
+ \scrlayer@AddCsToInterface[#1]{#2}#3%
+ \else
+ \PackageError{scrlayer}{cannot define `\@backslashchar#2'}{%
+ Interface command `\@backslashchar#2' has already
+ been\MessageBreak
+ defined by interface
+ `\@nameuse{scrlayer@command@#2}'.\MessageBreak
+ So it cannot be defined again.\MessageBreak
+ You may try scrlayer option `autoremoveinterfaces' to
+ automatically remove\MessageBreak
+ older interfaces in such conflict situations.\MessageBreak
+ For now, it's recommended so solve the problem before you'll
+ continue.%
+ }%
+ \fi
+ }%
+ }%
+ }%
+}%
+\newcommand*\scrlayer@AddCsToInterface[2][\@currname.\@currext]{%
+ \expandafter\expandafter\expandafter\def\expandafter
+ \csname scrlayer@#1@commandlist\expandafter\expandafter\expandafter\endcsname
+ \expandafter\expandafter\expandafter{%
+ \csname scrlayer@#1@commandlist\expandafter\endcsname
+ \expandafter\@elt\csname #2\endcsname
+ }%
+ \@namedef{scrlayer@command@#2}{#1}%
+}
+\newcommand*{\scrlayerInitInterface}[1][\@currname.\@currext]{%
+ \@ifundefined{scrlayer@#1@commandlist}{%
+ \@namedef{scrlayer@#1@commandlist}{}%
+ }{%
+ \begingroup
+ \def\@elt##1{\space\space\string##1\MessageBreak}%
+ \PackageError{scrlayer}{interface `#1' already initialised}{%
+ You've tried to initialise scrlayer interface `#1',\MessageBreak
+ but an interface of this name has been initialised
+ already.\MessageBreak
+ Here's a list of all macros of the already initialised
+ interface:\MessageBreak
+ \@nameuse{scrlayer@#1@commandlist}.%
+ If you'll continue, this re-initialisation will be ignored.%
+ }%
+ \endgroup
+ }%
+}
+\newcommand*{\scrlayerOnAutoRemoveInterface}[2][\@currname.\@currext]{%
+ \@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
+ \expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
+}
+%%% From File: $Id: scrlayer.dtx 1480 2013-10-31 10:00:02Z mjk $ (final)
+\DeclareNewPageStyleByLayers{@everystyle@}{}
+\RedeclarePageStyleByLayers{empty}{}
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
+\@ifundefined{KOMAScript}{%
+ \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
+ M\kern.05em A\kern.1em-\kern.1em Script}}}{}
+\endinput
+%%
+%% End of file `scrlayer.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls b/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
deleted file mode 100644
index 1583e2b5dd7..00000000000
--- a/Master/texmf-dist/tex/latex/koma-script/scrlettr.cls
+++ /dev/null
@@ -1,715 +0,0 @@
-%%
-%% This is file `scrlettr.cls',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% scrlettr.dtx (with options: `scrlettr')
-%% scrlogo.dtx (with options: `logo')
-%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
-%%
-%% This file was generated from file(s) of the KOMA-Script bundle.
-%% ---------------------------------------------------------------
-%%
-%% It may be distributed under the conditions of the
-%% LaTeX Project Public License in the version distributed together
-%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
-%%
-%% This file may only be distributed together with a copy of the
-%% KOMA-Script bundle. You may however distribute the
-%% KOMA-Script bundle without all such generated files. See also
-%% `lppl.txt' or `lppl-de.txt' for additional information.
-%%
-%% The list of files belonging to KOMA-Script distribution is given in
-%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
-%% additional information.
-%%
-%% If this file is a beta version, you may not be allowed to distribute
-%% it. Look at the comments below to see if this is the case.
-%%
-%% English and German manuals are part of KOMA-Script bundle.
-%% ----------------------------------------------------------
-%%
-%% See `README'.
-%%
-%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
-%% find a complete unmodified copy of LaTeX2e at
-%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
-%%
-%%% From: scrlettr.dtx
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{scrlettr}
- [2002/05/24 v2.6e
- OBSOLETE
- LaTeX2e KOMA
- document class]
-\ClassWarningNoLine{scrlettr}{%
- THIS CLASS IS OBSOLETE AND NOT LONGER SUPPORTED!\MessageBreak
- Since the new KOMA-Script letter class ``scrlttr2'' was\MessageBreak
- released, the use of ``scrlettr'' is obsolete.\MessageBreak
- You should not use this class for writing new letters.\MessageBreak
- You should use ``scrlttr2''.\MessageBreak
- All old commands of ``scrlettr'' are supported at\MessageBreak
- the new class ``scrlttr2''. But the length are not\MessageBreak
- and the typearea was changed - even using the\MessageBreak
- compatiblity option ``KOMAold''. So you may have\MessageBreak
- to do some changes}
-\newcommand*\@ptsize{}
-\newif\if@bigloc
-\newif\if@orgdate
-\DeclareOption{10pt}{\renewcommand*\@ptsize{0}}
-\DeclareOption{11pt}{\renewcommand*\@ptsize{1}}
-\DeclareOption{12pt}{\renewcommand*\@ptsize{2}}
-\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
-\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue%
- \ClassWarningNoLine{scrlettr}{This is no twoside-layout but openright!}
-}
-\DeclareOption{draft}{\overfullrule 5pt}
-\DeclareOption{final}{\setlength\overfullrule{0pt}}
-\DeclareOption{a4paper}{
- \setlength{\paperwidth}{210mm}
- \setlength{\paperheight}{297mm}}
-\DeclareOption{wlocfield}{\@bigloctrue}
-\DeclareOption{slocfield}{\@biglocfalse}
-\DeclareOption{orgdate}{\@orgdatetrue}
-\DeclareOption{scrdate}{\@orgdatefalse}
-\ExecuteOptions{12pt,oneside,final,slocfield,a4paper}
-\ProcessOptions
-\input{size1\@ptsize.clo}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
-\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{\@nomath\sfb}
-\newcommand*\descfont{\sffamily\bfseries}
-\newcommand*\sectfont{\sffamily\bfseries}
-\newcommand*\pnumfont{\normalfont}
-\newcommand*\headfont{\slshape}
-\newcommand*\capfont{\normalfont}
-\newcommand*\caplabelfont{\normalfont}
-\AtBeginDocument{
- \def\captionsenglish{%
- \def\yourrefname{Your ref.}
- \def\yourmailname{Your letter of}
- \def\myrefname{Our ref.}
- \def\customername{Customer no.}
- \def\invoicename{Invoice no.}
- \def\subjectname{Subject}
- \def\ccname{cc}
- \def\enclname{encl}
- \def\headtoname{To}
- \def\datename{Date}
- \def\pagename{Page}}
- \let\captionsUSenglish=\captionsenglish
- \let\captionsamerican=\captionsUSenglish
- \let\captionsbritish=\captionsenglish
- \let\captionsUKenglish=\captionsenglish
- \def\captionsgerman{%
- \def\yourrefname{Ihr Zeichen}
- \def\yourmailname{Ihr Schreiben vom}
- \def\myrefname{Unser Zeichen}
- \def\customername{Kundennummer}
- \def\invoicename{Rechnungsnummer}
- \def\subjectname{Betr.}
- \def\ccname{Kopien an}
- \def\enclname{Anlagen}
- \def\headtoname{An}
- \def\datename{Datum}
- \def\pagename{Seite}}
- \let\captionsaustrian=\captionsgerman
- \let\captionsngerman=\captionsgerman
- \def\captionsfrench{%
- \def\yourrefname{Vos r\'ef\'erences}
- \def\yourmailname{Votre lettre du}
- \def\myrefname{Nos r\'ef\'erences}
- \def\customername{Num\'ero de client}
- \def\invoicename{Num\'ero de facture}
- \def\subjectname{Concernant}
- \def\ccname{Copie \`a}
- \def\enclname{Annexes}
- \def\headtoname{A}
- \def\datename{Date}
- \def\pagename{Page}}
- \def\captionsitalian{%
- \def\yourrefname{Vs./Rif.}
- \def\yourmailname{Vs.~lettera del}
- \def\myrefname{Ns./Rif.}
- \def\customername{Nr.~cliente}
- \def\invoicename{Nr.~fattura}
- \def\subjectname{Oggetto}
- \def\ccname{Per conoscenza}
- \def\enclname{Allegato}
- \def\headtoname{A}
- \def\datename{Data}
- \def\pagename{Pagina}}
- \def\captionsspanish{%
- \def\yourrefname{Su ref.}
- \def\yourmailname{Su carta de}
- \def\myrefname{Nuestra ref.}
- \def\customername{No. de cliente}
- \def\invoicename{No. de factura}
- \def\subjectname{Asunto}
- \def\ccname{Copias}
- \def\enclname{Adjunto}
- \def\headtoname{A}
- \def\datename{Fecha}
- \def\pagename{P\'agina}}
- \if@orgdate
- \ifx\dateenglish\undefined
- \def\dateenglish{\def\today{\number\day/\number\month/\number\year}}
- \fi
- \else
- \def\dateenglish{\def\today{\number\day/\number\month/\number\year}}
- \def\dateUSenglish{\def\today{\number\month/\number\day/\number\year}}
- \let\datebritish=\dateenglish
- \let\dateUKenglish=\dateenglish
- \let\dateamerican=\dateUSenglish
- \def\dategerman{\def\today{\number\day.\,\number\month.\,\number\year}}
- \let\dateaustrian=\dategerman
- \let\datengerman=\dategerman
- \let\datefrench=\dategerman
- \let\dateitalian=\dategerman
- \let\datespanish=\dategerman
- \fi
- \captionsenglish
- \dateenglish
- \ifx\languagename\undefined
- \ClassWarningNoLine{scrlettr}{\string\languagename\space not
- defined, using \string\language.\MessageBreak
- This may result in use of wrong language!\MessageBreak
- You should use a compatible language
- package\MessageBreak
- (e.g. `Babel', `german', `french', ...)}
- \ifx\l@american\undefined\else\ifnum\language=\l@american
- \captionsamerican
- \dateamerican
- \fi\fi
- \ifx\l@british\undefined\else\ifnum\language=\l@british
- \captionsbritish
- \datebritish
- \fi\fi
- \ifx\l@UKenglish\undefined\else\ifnum\language=\l@UKenglish
- \captionsUKenglish
- \dateUKenglish
- \fi\fi
- \ifx\l@USenglish\undefined\else\ifnum\language=\l@USenglish
- \captionsUSenglish
- \dateUSenglish
- \fi\fi
- \ifx\l@austrian\undefined\else\ifnum\language=\l@austrian
- \captionsaustrian
- \dateaustrian
- \fi\fi
- \ifx\l@german\undefined\else\ifnum\language=\l@german
- \captionsgerman
- \dategerman
- \fi\fi
- \ifx\l@ngerman\undefined\else\ifnum\language=\l@ngerman
- \captionsngerman
- \datengerman
- \fi\fi
- \ifx\l@french\undefined\else\ifnum\language=\l@french
- \captionsfrench
- \datefrench
- \fi\fi
- \ifx\l@italian\undefined\else\ifnum\language=\l@italian
- \captionsitalian
- \dateitalian
- \fi\fi
- \ifx\l@spanish\undefined\else\ifnum\language=\l@spanish
- \captionsspanish
- \datespanish
- \fi\fi
- \else
- \edef\@tempa{nohyphenation}
- \ifx\languagename\@tempa
- \ClassWarningNoLine{scrlettr}
- {You've selected language ``\languagename''.\MessageBreak
- Maybe your LaTeX format contains Babel extension\MessageBreak
- but you have not selected a language using\MessageBreak
- Babel package.\MessageBreak
- Please select another language!\MessageBreak
- Only as a workaround english captions and date\MessageBreak
- will be used}
- \else
- \expandafter\selectlanguage\expandafter{\languagename}
- \ClassInfo{scrlettr}{used language is \languagename}
- \fi
- \fi
-}
-\oddsidemargin 0in
-\evensidemargin 0in
-\marginparwidth 0.9in
-\marginparsep 0.1in
-\marginparpush 0.45\baselineskip
-\topmargin -19mm % mk 941012, was: -15.5mm
-\headheight 23mm % mk 950411, was: 22mm
-\headsep 8mm % mk 941012, was: 9mm
-\footskip 20mm % mk 941012, was: 30mm
-\textheight 226mm % mk 950411, was: 217mm
-\textwidth 159.2mm
-
-\parskip 0.5\baselineskip % mk 941012
-\parindent 0pt
-\smallskipamount=0.5\parskip
-\medskipamount =\parskip
-\bigskipamount =2\parskip
-\footnotesep 0.8\baselineskip
-\skip\footins 0.75\baselineskip plus 2pt minus 4pt
-\skip\@mpfootins =\skip\footins
-\columnsep 1cc
-\columnseprule 0pt
-\floatsep 1\baselineskip plus 2pt minus 2pt
-\textfloatsep 20pt plus 2pt minus 4pt
-\intextsep 1\baselineskip plus 2pt minus 2pt
-\dblfloatsep 1\baselineskip plus 2pt minus 2pt
-\dbltextfloatsep 20pt plus 2pt minus 4pt
-\@fptop 0pt plus 1fil
-\@fpsep 0.7\baselineskip plus 2fil
-\@fpbot 0pt plus 1fil
-\@dblfptop 0pt plus 1fil
-\@dblfpsep 0.7\baselineskip plus 2fil
-\@dblfpbot 0pt plus 1fil
-\arraycolsep 5pt
-\tabcolsep 6pt
-\arrayrulewidth 0.4pt
-\doublerulesep 2pt
-\fboxsep 3pt
-\fboxrule 0.4pt
-\tabbingsep \labelsep
-\topsep 0.25\baselineskip
-\partopsep 0pt
-\itemsep 0.25\baselineskip
-\parsep 0.25\baselineskip % ak: 1\baselineskip
-\labelsep .5em
-\leftmargini 2.5em
-\leftmarginii 2.2em
-\leftmarginiii 1.87em
-\leftmarginiv 1.7em
-\leftmarginv 1em
-\leftmarginvi 1em
-\leftmargin\leftmargini
-\labelwidth\leftmargini
-\advance\labelwidth-\labelsep
-\def\@listI{\leftmargin\leftmargini}
-\let\@listi\@listI
-\def\@listii{\leftmargin\leftmarginii
- \labelwidth\leftmarginii\advance\labelwidth-\labelsep}
-\def\@listiii{\leftmargin\leftmarginiii
- \labelwidth\leftmarginiii\advance\labelwidth-\labelsep}
-\def\@listiv{\leftmargin\leftmarginiv
- \labelwidth\leftmarginiv\advance\labelwidth-\labelsep}
-\def\@listv{\leftmargin\leftmarginv
- \labelwidth\leftmarginv\advance\labelwidth-\labelsep}
-\def\@listvi{\leftmargin\leftmarginvi
- \labelwidth\leftmarginvi\advance\labelwidth-\labelsep}
-\@listi
-
-\@lowpenalty 51
-\@medpenalty 151
-\@highpenalty 301
-\@beginparpenalty -\@lowpenalty
-\@endparpenalty -\@lowpenalty
-\@itempenalty -\@lowpenalty
-
-\def\theenumi{\arabic{enumi}}
-\def\theenumii{\alph{enumii}}
-\def\theenumiii{\roman{enumiii}}
-\def\theenumiv{\Alph{enumiv}}
-\def\labelenumi{\theenumi.}
-\def\labelenumii{\theenumii)}
-\def\labelenumiii{\theenumiii.}
-\def\labelenumiv{\theenumiv.}
-\def\p@enumii{\theenumi}
-\def\p@enumiii{\theenumi\theenumii)}
-\def\p@enumiv{\p@enumiii\theenumiii}
-\def\labelitemi{$\bullet$}
-\def\labelitemii{\bf --}
-\def\labelitemiii{$\triangleright$}
-\def\labelitemiv{$\cdot$}
-\newenvironment{description}
- {\list{}{\labelwidth\z@ \itemindent-\leftmargin
- \let\makelabel\descriptionlabel}}
- {\endlist}
-\newcommand\descriptionlabel[1]{\hspace\labelsep
- \descfont #1}
-\newenvironment{labeling}[2][]
- {\def\sc@septext{#1}
- \list{}{\settowidth{\labelwidth}{#2#1}
- \leftmargin\labelwidth \advance\leftmargin by \labelsep
- \let\makelabel\labelinglabel}}
- {\endlist}
-\newcommand\labelinglabel[1]{#1\hfil\sc@septext}
-\newenvironment{verse}
- {\let\\=\@centercr
- \list{}{\itemsep \z@
- \itemindent -1.5em%
- \listparindent\itemindent
- \rightmargin \leftmargin
- \advance\leftmargin 1.5em}%
- \item[]}
- {\endlist}
-\newenvironment{quotation}
- {\list{}{\listparindent 1em%
- \itemindent \listparindent
- \rightmargin \leftmargin
- \parsep \z@ \@plus\p@}%
- \item[]}
- {\endlist}
-\newenvironment{quote}
- {\list{}{\rightmargin\leftmargin}%
- \item[]}
- {\endlist}
-\def\fromname{}
-\def\frombranch{} % RTL 21.04.94
-\def\fromsig{\fromname}
-\def\fromaddress{}
-\def\fromplace{}
-\def\fromlocation{}
-\def\frombackaddress{}
-\def\telephonenum{}
-\def\varyourref{}
-\def\varyourmail{}
-\def\varmyref{}
-\def\varcustomer{}
-\def\varinvoice{}
-\def\varrefitemi{}
-\def\varrefitemii{}
-\def\varrefitemiii{}
-\def\varrefitemnamei{}
-\def\varrefitemnameii{}
-\def\varrefitemnameiii{}
-\def\@specialmail{}
-\def\@title{}
-\def\@subject{}
-\def\name#1 {\def\fromname{#1}}
-\def\branch#1 {\def\frombranch{#1}} % RTL 21.04.94
-\def\signature#1{\def\fromsig{#1}}
-\long\def\address#1{\def\fromaddress{#1}}
-\def\place#1 {\def\fromplace{#1}}
-\long\def\location#1{\def\fromlocation{#1}}
-\def\backaddress#1{\def\frombackaddress{#1}}
-\def\telephone#1{\def\telephonenum{#1}}
-\def\yourref#1 {\def\varyourref{#1}}
-\def\yourmail#1 {\def\varyourmail{#1}}
-\def\myref#1 {\def\varmyref{#1}}
-\def\customer#1 {\def\varcustomer{#1}}
-\def\invoice#1 {\def\varinvoice{#1}}
-\def\refitemi#1 {\def\varrefitemi{#1}}
-\def\refitemii#1{\def\varrefitemii{#1}}
-\def\refitemiii#1{\def\varrefitemiii{#1}}
-\def\refitemnamei#1{\def\varrefitemnamei{#1}}
-\def\refitemnameii#1{\def\varrefitemnameii{#1}}
-\def\refitemnameiii#1{\def\varrefitemnameiii{#1}}
-\def\specialmail#1{\def\@specialmail{#1}}
-\def\title#1 {\def\@title{#1}}
-\def\subject#1 {\def\@subject{{\bf #1}}}
-\long\def\firsthead#1{\def\@firsthead{#1}}
-\long\def\firstfoot#1{\def\@firstfoot{#1}}
-\long\def\nexthead#1{\def\@nexthead{#1}}
-\long\def\nextfoot#1{\def\@nextfoot{#1}}
-\newif\if@fold
-\newif\if@afield
-\newif\if@subj
-\newif\if@subjafter
-\def\foldmarkson {\@foldtrue}
-\def\foldmarksoff {\@foldfalse}
-\def\addrfieldon {\@afieldtrue}
-\def\addrfieldoff {\@afieldfalse}
-\def\subjecton {\@subjtrue}
-\def\subjectoff {\@subjfalse}
-\newcommand*\subjectafteron {\@subjaftertrue}
-\newcommand*\subjectafteroff{\@subjafterfalse}
-\newdimen\sc@temp
-\newdimen\sc@@temp
-\newdimen\foldhskip
-\newdimen\foldvskipi
-\newdimen\foldvskipii
-\newdimen\foldvskipiii
-\newdimen\addrvskip
-\newdimen\addrindent
-\newdimen\addrwidth
-\newdimen\addrheight
-\newdimen\locwidth
-\newdimen\refvskip
-\newdimen\sigindent
-\foldhskip 3.5mm
-\foldvskipi 62mm % war: 65mm RTL
-\foldvskipii 45mm % mk 960531 (war: 40.5mm)
-\foldvskipiii 54mm % mk 960531 (war: 58.5mm)
-\addrvskip 7.5mm
-\addrindent 0mm
-\addrwidth 70mm
-\addrheight 35mm
-\locwidth\textwidth
-\advance\locwidth by -\addrwidth
-\if@bigloc % mk 940330
- \advance\locwidth by \locwidth
- \divide\locwidth by 3
-\else
- \divide\locwidth by 2
-\fi
-\refvskip 5.5mm
-\sigindent 0mm
-\def\adrentry#1#2#3#4#5#6#7#8{\def\@tempa{#1}\ifx \@tempa\@empty \else
- \def\@tempa{#2}\ifx \@tempa\@empty
- \expandafter\def\csname #8\endcsname{#1\\#3}
- \else
- \expandafter\def\csname #8\endcsname{#2 #1\\#3}
- \fi \fi}
-\def\adrchar#1{}
-\long\def\letter#1{\newpage
- \if@twoside\ifodd\c@page\else \thispagestyle{empty}\null\newpage \fi\fi
- \c@page\@ne \interlinepenalty=200 \@processto{#1}}
-\def\stopletter{}
-\def\endletter{\stopletter\@@par\pagebreak\@@par}
-\long\def\@processto#1{\expandafter\@xproc #1\\@@@\ifx\toaddress\@empty
- \else\expandafter\@yproc #1@@@\fi}
-\long\def\@xproc #1\\#2@@@{\def\toname{#1}\def\toaddress{#2}}
-\long\def\@yproc #1\\#2@@@{\def\toaddress{#2}}
-\def\stopbreaks{\interlinepenalty \@M
- \def\par{\@@par\nobreak}\let\\=\@nobreakcr
- \let\vspace\@nobreakvspace}
-\def\@nobreakvspace{\@ifstar{\@nobreakvspacex}{\@nobreakvspacex}}
-\def\@nobreakvspacex#1{\ifvmode\nobreak\vskip #1\relax\else
- \@bsphack\vadjust{\nobreak\vskip #1}\@esphack\fi}
-\def\@nobreakcr{\vadjust{\penalty\@M}\@ifstar{\@xnewline}{\@xnewline}}
-\def\startbreaks{\let\\=\@normalcr
- \interlinepenalty 200\def\par{\@@par\penalty 200}}
-\def\@foldmarks{\if@fold \bgroup
- \reversemarginpar\vspace{\foldvskipi}
- \marginpar{\hspace{\foldhskip}\rule{2mm}{.2pt}} \vspace{\foldvskipii}
- \marginpar{\hspace{\foldhskip}\rule{4mm}{.2pt}} \vspace{\foldvskipiii}
- \marginpar{\hspace{\foldhskip}\rule{2mm}{.2pt}}
- \vspace{-\foldvskipiii}\vspace{-\foldvskipii}\vspace{-\foldvskipi}
- \egroup \fi}
-\def\@addrfield{\bgroup
- \setbox0\vbox{\hsize\addrwidth
- \ifx\frombackaddress\@empty \else
- \underline{\scriptsize \sf \frombackaddress} \fi}
- \setbox1\vbox{\hsize\addrwidth
- \ifx\@specialmail\@empty \else
- \underline{\@specialmail} \fi}
- \setbox2\vbox{\hsize\addrwidth
- \toname \\ \toaddress}
- \vskip\addrvskip \hskip\addrindent
- \vbox to \addrheight{%
- \ifx\frombackaddress\@empty \else \box0 \fi
- \ifx\@specialmail\@empty \else \vfil\box1 \fi
- \vfil\box2\vfil}\egroup}
-\def\@locfield{\begin{minipage}[b]{\locwidth}\fromlocation\end{minipage}}
-\newif\if@ref
-\def\@datefield{\@reffalse
- \ifx\varyourref\@empty \else \@reftrue \fi
- \ifx\varyourmail\@empty \else \@reftrue \fi
- \ifx\varmyref\@empty \else \@reftrue \fi
- \ifx\varcustomer\@empty \else \@reftrue \fi
- \ifx\varinvoice\@empty \else \@reftrue \fi
- \ifx\varrefitemi\@empty \else \@reftrue \fi
- \ifx\varrefitemii\@empty \else \@reftrue \fi
- \ifx\varrefitemiii\@empty \else \@reftrue \fi
- \vskip -\parskip
- \vskip \refvskip
- \if@ref
- \ifx\varyourref\@empty \else
- \settowidth{\sc@temp}{\varyourref}
- \setbox0\hbox{\scriptsize \sf \yourrefname}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varyourref}\hfill
- \fi
- \ifx\varyourmail\@empty \else
- \settowidth{\sc@temp}{\varyourmail}
- \setbox0\hbox{\scriptsize \sf \yourmailname}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varyourmail}\hfill
- \fi
- \ifx\varmyref\@empty \else
- \settowidth{\sc@temp}{\varmyref}
- \setbox0\hbox{\scriptsize \sf \myrefname}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varmyref}\hfill
- \fi
- \ifx\varcustomer\@empty \else
- \settowidth{\sc@temp}{\varcustomer}
- \setbox0\hbox{\scriptsize \sf \customername}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varcustomer}\hfill
- \fi
- \ifx\varinvoice\@empty \else
- \settowidth{\sc@temp}{\varinvoice}
- \setbox0\hbox{\scriptsize \sf \invoicename}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varinvoice}\hfill
- \fi
- \ifx\varrefitemi\@empty \else
- \settowidth{\sc@temp}{\varrefitemi}
- \setbox0\hbox{\scriptsize \sf \varrefitemnamei}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varrefitemi}\hfill
- \fi
- \ifx\varrefitemii\@empty \else
- \settowidth{\sc@temp}{\varrefitemii}
- \setbox0\hbox{\scriptsize \sf \varrefitemnameii}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varrefitemii}\hfill
- \fi
- \ifx\varrefitemiii\@empty \else
- \settowidth{\sc@temp}{\varrefitemiii}
- \setbox0\hbox{\scriptsize \sf \varrefitemnameiii}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \varrefitemiii}\hfill
- \fi
- \ifx\@date\@empty \else
- \settowidth{\sc@temp}{\@date}
- \setbox0\hbox{\scriptsize \sf \datename}
- \ifdim \sc@temp > \wd0 \sc@@temp\sc@temp \else \sc@@temp\wd0 \fi
- \parbox[t]{\sc@@temp}{\noindent \box0\par \@date}
- \fi
- \par
- \vspace{2.5\baselineskip}
- \else
- {\ifx\@date\@empty \else \raggedleft\fromplace\ \@date\par \fi}
- \vspace{1.5\baselineskip}
- \fi}
-\def\maketitle{\ifx\@title\@empty \else
- {\centering \LARGE \sectfont \@title\par}
- \vspace{1\baselineskip} \fi}
-\def\@subjfield{{%
- \if@subjafter%
- \centering%
- \else%
- \if@subj\ifx\@subject\@empty\else\subjectname:\ \fi\fi
- \@subject\par\nobreak\vspace{1\baselineskip}%
- \fi}}
-\def\opening#1{\thispagestyle{firstpage} \null \@foldmarks
- \if@afield \@addrfield \hfill \@locfield \par \fi
- \@datefield
- \maketitle
- \if@subjafter\else\@subjfield\fi
- #1\par%
- \vspace{0.5\baselineskip}% added by unknown
- \nobreak%
- \if@subjafter\@subjfield\fi}
-\newcommand*\presig@skip{}
-\newcommand*{\setpresigskip}[1]{%
- \begingroup%
- \setlength{\@tempdima}{#1}%
- \endgroup%
- \edef\presig@skip{#1}}
-\setpresigskip{2\baselineskip}
-\long\def\closing#1{\par\nobreak\vspace{0.5\baselineskip}
- \stopbreaks \noindent \sc@temp\textwidth \advance\sc@temp by
- -\sigindent \hspace{\sigindent}%
- \parbox{\sc@temp}{\raggedright\ignorespaces #1\mbox{}\\[\presig@skip]
- \fromsig\strut}\par
- \vspace{1.5\baselineskip}}
-\def\ps{\par\startbreaks}
-\newcommand*{\ccnameseparator}{: }
-\newcommand*{\cc}[1]{\par\noindent\parbox[t]{\textwidth}
- {\@hangfrom{\ccname\ccnameseparator}%
- \ignorespaces #1\strut}\par}
-\newcommand*{\enclnameseparator}{: }
-\newcommand*{\encl}[1]{\par\noindent%
- \parbox[t]{\textwidth}{%
- \ifx\enclname\@empty\else\@hangfrom{\enclname\enclnameseparator}\fi%
- \ignorespaces #1\strut}\par}
-\def\footnoterule{\kern-1\p@
- \hrule width 0.4\columnwidth
- \kern .6\p@}
-\newcommand\deffootnote[4][]{%
- \long\def\@makefntext##1{%
- \edef\@tempa{#1}\ifx\@tempa\@empty
- \@setpar{\@@par
- \@tempdima = \hsize
- \addtolength{\@tempdima}{-#2}
- \parshape \@ne #2 \@tempdima}%
- \else
- \@setpar{\@@par
- \@tempdima = \hsize
- \addtolength{\@tempdima}{-#1}
- \@tempdimb = \hsize
- \addtolength{\@tempdimb}{-#2}
- \parshape \tw@ #1 \@tempdima #2 \@tempdimb}%
- \fi
- \par
- \parindent #3\noindent
- \hbox to \z@{\hss\@@makefnmark}##1}
- \def\@@makefnmark{\hbox{#4}}
-}
-\newcommand*\deffootnotemark[1]{\def\@makefnmark{\hbox{#1}}}
-\def\thefootnotemark{\@thefnmark}
-\let\textsuperscript\@textsuperscript
-\deffootnote[1em]{1.5em}{1em}
- {\textsuperscript{\thefootnotemark}}
-\deffootnotemark{\textsuperscript{\thefootnotemark}}
-\def\theequation{\arabic{equation}}
-\setcounter{topnumber}{2}
-\def\topfraction{.7}
-\setcounter{bottomnumber}{1}
-\def\bottomfraction{.3}
-\setcounter{totalnumber}{3}
-\def\textfraction{.2}
-\def\floatpagefraction{.5}
-\setcounter{dbltopnumber}{2}
-\def\dbltopfraction{.7}
-\def\dblfloatpagefraction{.5}
-\def\@firsthead{%
- \parbox[b]{\textwidth}
- {\begin{center}
- \ifx\fromname\@empty\else
- \textsc{\ignorespaces\fromname}\\[-8pt]
- \rule{\textwidth}{.4pt}\\
- \fi
- \ifx\fromaddress\@empty\else
- \ignorespaces\fromaddress
- \fi
- \end{center}}}
-\def\@firstfoot{}
-\def\@nexthead{%
- \parbox[b]{\textwidth}
- {\ifx\fromname\@empty\else
- \textsc{\ignorespaces\fromname}\\[8pt]
- \fi
- \headtoname\ \ignorespaces\toname\hfill\datename:\ \@date\hfill
- \pagename\ \thepage\\[-8pt]
- \rule{\textwidth}{.4pt}}}
-\def\@nextfoot{}
-
-\def\ps@plain{%
- \def\@evenhead{\sffamily\bfseries\fontsize{10pt}{12}\selectfont
- \hfil-- \thepage\ --\hfil}%
- \let\@oddhead\@evenhead%
- \def\@evenfoot{}%
- \def\@oddfoot{}}
-\def\ps@firstpage{%
- \def\@evenhead{\@firsthead}%
- \let\@oddhead\@evenhead%
- \def\@evenfoot{\@firstfoot}%
- \let\@oddfoot\@evenfoot}
-\def\ps@headings{%
- \def\@evenhead{\@nexthead}%
- \let\@oddhead\@evenhead%
- \def\@evenfoot{\@nextfoot}%
- \let\@oddfoot\@evenfoot}
-\@foldtrue
-\@afieldtrue
-\@subjfalse
-\@subjafterfalse
-\ps@plain
-\pagenumbering{arabic}
-\raggedbottom
-\frenchspacing
-%%% From File: scrlogo.dtx
-\@ifundefined{KOMAScript}{%
- \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
- M\kern.05em A\kern.1em-\kern.1em Script}}}{}
-\endinput
-%%
-%% End of file `scrlettr.cls'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index 98982fb25e2..bdd0d59a782 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -1,49 +1,48 @@
%%
%% This is file `scrlfile.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% scrlfile.dtx (with options: `scrlfile')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2007
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2002-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
%%
-%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3c of the license.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later and of this work.
+%% 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 work has the LPPL maintenance status "author-maintained".
+%% 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 Current Maintainer and author of this work is Markus Kohm.
+%% 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.
%%
-%% This file may only be distributed together with the files
-%% `scrlogo.dtx', `scrlfile.dtx' and `scrlfile.ins'. You may however
-%% distribute the files `scrlogo.dtx', `scrlfile.dtx' and `scrlfile.ins'
-%% without this file. See also `scrlfile.dtx' for additional information.
-%%
-%% If this file is a beta version, you are not allowed to distribute it.
+%% 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.
%% ----------------------------------------------------------
%%
-%% A short version of the english manual is at `scrlfile.dtx', too.
+%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrlfile.dtx
-\def\scrlfileversion{2012/06/15 v3.12}
+%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\ProvidesPackage{scrlfile}[%
- \scrlfileversion\space KOMA-Script package (loading files)]
+ 2013/12/19 v3.12 KOMA-Script
+ package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
^^J\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm^^J}
@@ -100,18 +99,47 @@
\scr@@onefilewithoptions[{#2}][{#3}]{#4}%
\scr@load@hook{lateafter}{#1.#4}%
}
-\newcommand*{\ReplaceFile}[2]{%
+\newcommand*{\ReplaceInput}[2]{%
\expandafter\edef\csname #1-@alias\endcsname{#2}%
}
+\newcommand*{\ReplaceFile}{%
+ \PackageError{scrlfile}{%
+ usage of not documented command `\string\ReplaceFile'%
+ }{%
+ Command `\string\ReplaceFile' has been implemented accidentally in
+ KOMA-Script 2.96\MessageBreak
+ and replaced by `\string\ReplaceInput' in KOMA-Script 3.12.\MessageBreak
+ You should replace `\string\ReplaceFile' by `\string\ReplaceInput' to
+ avoid this error\MessageBreak
+ message%
+ }%
+ \ReplaceInput
+}
+\newcommand*{\UnReplaceInput}[1]{%
+ \ifcsname #1-@alias\endcsname
+ \expandafter\let\csname #1-@alias\endcsname\relax
+ \fi
+}
\newcommand*{\@replacefilewithext}[3]{%
\expandafter\edef\csname #1.#3-@aliasname\endcsname{#2}%
-}
+ }
\newcommand*{\ReplacePackage}[2]{%
\@replacefilewithext{#1}{#2}\@pkgextension
}
\newcommand*{\ReplaceClass}[2]{%
\@replacefilewithext{#1}{#2}\@clsextension
}
+\newcommand*{\@unreplacefilewithext}[2]{%
+ \ifcsname #1.#2-@aliasname\endcsname
+ \expandafter\let\csname #1.#2-@aliasname\endcsname\relax
+ \fi
+}
+\newcommand*{\UnReplacePackage}[1]{%
+ \@unreplacefilewithext{#1}\@pkgextension
+}
+\newcommand*{\UnReplaceClass}[1]{%
+ \@unreplacefilewithext{#1}\@clsextension
+}
\newcommand*{\scr@replacefile@msg}[2]{%
\PackageInfo{scrlfile}{inputing `#1' instead of `#2'}%
}
@@ -211,18 +239,23 @@
\@ifstar{\@PreventPackageFromLoading\PackageInfo}%
{\@PreventPackageFromLoading\PackageWarning}%
}
-\newcommand*{\@PreventPackageFromLoading}[2]{%
- \edef\reserved@b{#2}%
+\newcommand*{\@PreventPackageFromLoading}[1]{%
+ \@ifnextchar [%]
+ {\@@PreventPackageFromLoading#1}{\@@PreventPackageFromLoading#1[]}%
+}
+\newcommand*{\@@PreventPackageFromLoading}{}
+\def\@@PreventPackageFromLoading#1[#2]#3{%
+ \edef\reserved@b{\zap@space#3 \@empty}%
\ifx \reserved@b\@empty
#1{scrlfile}{%
- \string\PreventPackageFromLoading\space with empty argument\MessageBreak
- ignored%
+ \string\PreventPackageFromLoading\space with empty packages\MessageBreak
+ argument ignored%
}%
\else
\ifx\scrlfile@excludedpackages\@empty
\let\scrlfile@saved@RequirePackage\RequirePackage
\let\RequirePackage\scrlfile@RequirePackage
- \def\reserved@a#2{%
+ \def\reserved@a##1##{%
\@latex@error
{\noexpand \usepackage before \string\documentclass}%
{\noexpand \usepackage may only appear in the document
@@ -242,7 +275,13 @@
\fi
\expandafter\@for \expandafter\reserved@a\expandafter:\expandafter=%
\reserved@b\do {%
- \ifx\reserved@a\@empty\else
+ \ifx\reserved@a\@empty
+ #1{scrlfile}{%
+ empty package argument for
+ \string\PreventPackageFromLoading\MessageBreak
+ ignored%
+ }%
+ \else
\expandafter\@ifpackageloaded\expandafter{\reserved@a}{%
#1{scrlfile}{%
package `\reserved@a' already loaded.\MessageBreak
@@ -251,6 +290,18 @@
}{%
\edef\scrlfile@excludedpackages{\scrlfile@excludedpackages,%
\reserved@a}%
+ \if\relax\detokenize{#2}\relax\else
+ \@ifundefined{scrlfile@exclude@package@\reserved@a @do}{%
+ \@namedef{scrlfile@exclude@package@\reserved@a @do}{}%
+ }{}%
+ \expandafter\def
+ \csname scrlfile@exclude@package@\reserved@a
+ @do\expandafter\expandafter\expandafter\endcsname
+ \expandafter\expandafter\expandafter{%
+ \csname scrlfile@exclude@package@\reserved@a @do\endcsname
+ #2%
+ }%
+ \fi
}%
\fi
}%
@@ -274,20 +325,67 @@
\let#1\scrlfile@excludedpackages
}
\@onlypreamble\StorePreventPackageFromLoading
+\newcommand*{\UnPreventPackageFromLoading}{%
+ \@ifstar {\@tempswatrue\@UnPreventPackageFromLoading}%
+ {\@tempswafalse\@UnPreventPackageFromLoading}%
+}
+\newcommand*{\@UnPreventPackageFromLoading}[1]{%
+ \edef\reserved@b{\zap@space#1 \@empty}%
+ \if@tempswa
+ \@for\reserved@a:=\reserved@b\do {%
+ \ifx\reserved@a\@empty \else
+ \ifcsname scrlfile@exclude@package@\reserved@a @do\endcsname
+ \expandafter\let
+ \csname scrlfile@exclude@package@\reserved@a @do\endcsname
+ \undefined
+ \fi
+ \fi
+ }%
+ \fi
+ \ifcsname scrlfile@excludedpackages\endcsname
+ \let\reserved@a\scrlfile@excludedpackages
+ \let\scrlfile@excludedpackages\@empty
+ \expandafter\@for\expandafter\reserved@c
+ \expandafter:\expandafter=\reserved@a
+ \do{%
+ \ifx\reserved@c\@empty\else
+ \@expandtwoargs\in@{,\reserved@c,}{,\reserved@b,}%
+ \ifin@
+ \else
+ \edef\scrlfile@excludedpackages{%
+ \scrlfile@excludedpackages,\reserved@c
+ }%
+ \fi
+ \fi
+ }%
+ \ifx\scrlfile@excludedpackages\@empty\ResetPreventPackageFromLoading\fi
+ \fi
+}
\newcommand*{\scrlfile@RequirePackage}[2][]{%
\let\reserved@c\@empty
- \@for\reserved@b:=#2\do {%
+ \let\reserved@d\@empty
+ \edef\reserved@b{\zap@space#2 \@empty}%
+ \expandafter\@for\expandafter\reserved@b\expandafter:\expandafter=\reserved@b
+ \do {%
\begingroup
\@tempswatrue
\@for\reserved@a:=\scrlfile@excludedpackages\do {%
\ifx\reserved@a\reserved@b
- \PackageInfo{scrlfile}{Excluding package `\reserved@b'\MessageBreak
- from loading}%
\@tempswafalse
\fi
}%
\if@tempswa
\xdef\reserved@c{\reserved@c,\reserved@b}%
+ \else
+ \ifx\reserved@b\@empty\else
+ \PackageInfo{scrlfile}{Excluding package `\reserved@b'\MessageBreak
+ from loading}%
+ \@ifundefined{scrlfile@exclude@package@\reserved@b @do}{%
+ }{%
+ \expandafter\g@addto@macro\expandafter\reserved@d
+ \csname scrlfile@exclude@package@\reserved@b @do\endcsname
+ }%
+ \fi
\fi
\endgroup
}%
@@ -297,6 +395,7 @@
\edef\reserved@a{\noexpand\scrlfile@saved@RequirePackage[#1]{%
\expandafter\@gobble\reserved@c\@empty}}%
\fi
+ \expandafter\reserved@d
\reserved@a
}
\newcommand{\scr@gobbleopt}[1][]{}
@@ -384,7 +483,7 @@
\endgroup
\if@nobreak\ifvmode\nobreak\fi\fi
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index cc24f44765e..3ee13c1b7fa 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -1,46 +1,45 @@
%%
%% This is file `scrlttr2.cls',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `class,letter')
-%% scrkbase.dtx (with options: `load')
-%% scrkcomp.dtx (with options: `class,letter,option')
-%% scrkmisc.dtx (with options: `class,letter,option')
-%% scrklco.dtx (with options: `class,letter,option')
-%% scrklang.dtx (with options: `class,letter,option')
-%% scrkfont.dtx (with options: `class,letter,option')
-%% scrkvars.dtx (with options: `class,letter,option')
-%% scrkplen.dtx (with options: `class,letter,option')
-%% scrktare.dtx (with options: `class,letter,option')
-%% scrkpar.dtx (with options: `class,letter,option')
-%% scrkpage.dtx (with options: `class,letter,option')
-%% scrkfloa.dtx (with options: `class,letter,option')
-%% scrkftn.dtx (with options: `class,letter,option')
-%% scrklist.dtx (with options: `class,letter,option')
-%% scrknpap.dtx (with options: `class,letter,option')
-%% scrkcile.dtx (with options: `class,letter,option')
-%% scrkmisc.dtx (with options: `class,letter,execoption')
-%% scrkcomp.dtx (with options: `class,letter,body')
-%% scrkfont.dtx (with options: `class,letter,body')
-%% scrkmisc.dtx (with options: `class,letter,body')
-%% scrklco.dtx (with options: `class,letter,body')
-%% scrklang.dtx (with options: `class,letter,body')
-%% scrkvars.dtx (with options: `class,letter,body')
-%% scrkplen.dtx (with options: `class,letter,body')
-%% scrktare.dtx (with options: `class,letter,body')
-%% scrkpar.dtx (with options: `class,letter,body')
-%% scrkpage.dtx (with options: `class,letter,body')
-%% scrkfloa.dtx (with options: `class,letter,body')
-%% scrkftn.dtx (with options: `class,letter,body')
-%% scrklist.dtx (with options: `class,letter,body')
-%% scrknpap.dtx (with options: `class,letter,body')
-%% scrkcile.dtx (with options: `class,letter,body')
+%% scrkernel-version.dtx (with options: `class,letter')
+%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-compatibility.dtx (with options: `class,letter,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,letter,option')
+%% scrkernel-letterclassoptions.dtx (with options: `class,letter,option')
+%% scrkernel-language.dtx (with options: `class,letter,option')
+%% scrkernel-fonts.dtx (with options: `class,letter,option')
+%% scrkernel-variables.dtx (with options: `class,letter,option')
+%% scrkernel-pseudolengths.dtx (with options: `class,letter,option')
+%% scrkernel-typearea.dtx (with options: `class,letter,option')
+%% scrkernel-paragraphs.dtx (with options: `class,letter,option')
+%% scrkernel-pagestyles.dtx (with options: `class,letter,option')
+%% scrkernel-floats.dtx (with options: `class,letter,option')
+%% scrkernel-footnotes.dtx (with options: `class,letter,option')
+%% scrkernel-listsandtabulars.dtx (with options: `class,letter,option')
+%% scrkernel-notepaper.dtx (with options: `class,letter,option')
+%% scrkernel-circularletters.dtx (with options: `class,letter,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,letter,execoption')
+%% scrkernel-compatibility.dtx (with options: `class,letter,body')
+%% scrkernel-fonts.dtx (with options: `class,letter,body')
+%% scrkernel-miscellaneous.dtx (with options: `class,letter,body')
+%% scrkernel-letterclassoptions.dtx (with options: `class,letter,body')
+%% scrkernel-language.dtx (with options: `class,letter,body')
+%% scrkernel-variables.dtx (with options: `class,letter,body')
+%% scrkernel-pseudolengths.dtx (with options: `class,letter,body')
+%% scrkernel-typearea.dtx (with options: `class,letter,body')
+%% scrkernel-paragraphs.dtx (with options: `class,letter,body')
+%% scrkernel-pagestyles.dtx (with options: `class,letter,body')
+%% scrkernel-floats.dtx (with options: `class,letter,body')
+%% scrkernel-footnotes.dtx (with options: `class,letter,body')
+%% scrkernel-listsandtabulars.dtx (with options: `class,letter,body')
+%% scrkernel-notepaper.dtx (with options: `class,letter,body')
+%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -72,9 +71,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -94,7 +93,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrlttr2%
@@ -103,11 +102,12 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- \KOMAScriptVersion\space document class (\ClassName)%
+ 2013/12/19 v3.12 KOMA-Script
+ document class (\ClassName)%
]
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -123,6 +123,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfClass{%
@@ -134,6 +135,7 @@
class.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -183,19 +185,22 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrkmisc.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
- \if@tempswa
- \setlength{\overfullrule}{5pt}%
- \else
- \setlength{\overfullrule}{\z@}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \setlength{\overfullrule}{\z@}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption
{final}{draft=false}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter\AtEndOfClass\expandafter{%
@@ -209,7 +214,7 @@
}{}%
}
\AtEndOfClass{\LoadLetterOption{DIN}}
-%%% From File: scrklang.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
@@ -218,7 +223,7 @@
}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
12%
}
@@ -229,8 +234,23 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsoleteOption{\PackageInfoNoLine{\KOMAClassName}}%
- {#1#2}{fontsize=#1#2}%
+ \ifstr{#1}{10}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{11}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{12}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \KOMA@UseDeprecatedOption{\PackageWarningNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }%
+ }%
+ }
}{\@headlines}%
}{\@headlines}%
}
@@ -265,10 +285,11 @@
}%
\@tempa
}%
+ \FamilyKeyStateProcessed
}
-%%% From File: scrkvars.dtx
-%%% From File: scrkplen.dtx
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -339,7 +360,7 @@
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -380,82 +401,88 @@
{relative}{10},%
{absolute}{11}%
}{#1}%
- \ifcase\number\@tempa% 0
- \endgroup
- \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 1
- \endgroup
- \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 2
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 3
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 4
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 5
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 6
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .3333\linewidth\@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 7
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .3333\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 8
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 9
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 10
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\par@updaterelative
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\number\@tempa% 0
+ \endgroup
+ \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 1
+ \endgroup
+ \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 2
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 3
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 4
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 5
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 6
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .3333\linewidth\@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 7
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .3333\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 8
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 9
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 10
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\par@updaterelative
- }%
- \or%11
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\relax
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\par@updaterelative
+ \fi
+ \let\default@par@update=\par@updaterelative
+ }%
+ \or%11
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\relax
- }%
- \else% sonst
- \endgroup
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\relax
+ \fi
+ \let\default@par@update=\relax
+ }%
+ \else% should never be
+ \endgroup
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnkownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -466,17 +493,29 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \KOMA@options{headinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{headinclude=#1}{}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \KOMA@options{footinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{footinclude=#1,DIV=current}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\@twosidefalse
@@ -492,6 +531,7 @@
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
+ \FamilyKeyStateProcessed
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -499,6 +539,7 @@
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
}%
}{}%
}%
@@ -537,8 +578,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: scrkfloa.dtx
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -556,11 +597,13 @@
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
+ \FamilyKeyStateProcessed
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
@@ -583,8 +626,8 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: scrklist.dtx
-%%% From File: scrknpap.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue
\newcommand*{\@alignfrom}{0}
\KOMA@key{fromalign}{%
@@ -596,7 +639,9 @@
{locationright}{4},{rightlocation}{4},{location}{4},%
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
- \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
+ \fi
}
\newcommand*{\@rulefrom}{0}
\KOMA@ncmdkey{fromrule}[below]{@rulefrom}{%
@@ -604,6 +649,7 @@
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
\KOMA@ifkey{fromphone}{@phone}
+\KOMA@ifkey{frommobilephone}{@mobilephone}
\KOMA@ifkey{fromfax}{@fax}
\KOMA@ifkey{fromemail}{@email}
\KOMA@ifkey{fromurl}{@www}
@@ -673,35 +719,46 @@
{underlined}{2},%
{plain}{3}%
}{#1}%
- \ifcase\@tempa
- \endgroup
- \@baddrfalse
- \or
- \endgroup
- \@baddrtrue
- \or
- \endgroup
- \@baddrtrue
- \let\backaddr@format\underline
- \or
- \endgroup
- \@baddrtrue
- \let\backaddr@format\@firstofone
- \else
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \endgroup
+ \@baddrfalse
+ \or
+ \endgroup
+ \@baddrtrue
+ \or
+ \endgroup
+ \@baddrtrue
+ \let\backaddr@format\underline
+ \or
+ \endgroup
+ \@baddrtrue
+ \let\backaddr@format\@firstofone
+ \else
+ \endgroup
+ \fi
+ \else
\endgroup
- \fi
+ \FamilyKeyStateUnknownValue
+ \fi
}
\newif\if@bigloc
\KOMA@key{locfield}[wide]{%
\begingroup
\KOMA@set@ncmdkey{locfield}{@tempa}{{wide}{0},{narrow}{1}}{#1}%
- \ifcase\@tempa
- \endgroup
- \@bigloctrue
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \endgroup
+ \@bigloctrue
+ \else
+ \endgroup
+ \@biglocfalse
+ \fi
\else
\endgroup
- \@biglocfalse
- \fi
+ \FamilyKeyStateUnknownValue
+ \fi
}
\KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide}
\KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow}
@@ -709,48 +766,35 @@
\newcommand*{\@usefolds}{TMBPL}
\KOMA@key{foldmarks}[true]{%
\begingroup
- \def\FamilyUnknownKeyValue##1##2##3##4{%
- \def\sc@nf@ldch@rs####1{%
- \ifx ####1\@nil\else
- \if ####1T\g@addto@macro\@usefolds{####1}\else
- \if ####1M\g@addto@macro\@usefolds{####1}\else
- \if ####1B\g@addto@macro\@usefolds{####1}\else
- \if ####1P\g@addto@macro\@usefolds{####1}\else
- \if ####1L\g@addto@macro\@usefolds{####1}\else
- \if ####1V\g@addto@macro\@usefolds{L}\else
- \if ####1H\g@addto@macro\@usefolds{TMBP}\else
- \if ####1t\scr@removechar\@usefolds{T}\else
- \if ####1m\scr@removechar\@usefolds{M}\else
- \if ####1b\scr@removechar\@usefolds{B}\else
- \if ####1p\scr@removechar\@usefolds{P}\else
- \if ####1l\scr@removechar\@usefolds{L}\else
- \if ####1v%
+ \KOMA@set@ifkey\@empty{@fold}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@fold\aftergroup\@foldtrue\else\aftergroup\@foldfalse\fi
+ \aftergroup\FamilyKeyStateProcessed
+ \else
+ \aftergroup\FamilyKeyStateProcessed
+ \def\sc@nf@ldch@rs##1{%
+ \ifx ##1\@nil\else
+ \if ##1T\g@addto@macro\@usefolds{##1}\else
+ \if ##1M\g@addto@macro\@usefolds{##1}\else
+ \if ##1B\g@addto@macro\@usefolds{##1}\else
+ \if ##1P\g@addto@macro\@usefolds{##1}\else
+ \if ##1L\g@addto@macro\@usefolds{##1}\else
+ \if ##1V\g@addto@macro\@usefolds{L}\else
+ \if ##1H\g@addto@macro\@usefolds{TMBP}\else
+ \if ##1t\scr@removechar\@usefolds{T}\else
+ \if ##1m\scr@removechar\@usefolds{M}\else
+ \if ##1b\scr@removechar\@usefolds{B}\else
+ \if ##1p\scr@removechar\@usefolds{P}\else
+ \if ##1l\scr@removechar\@usefolds{L}\else
+ \if ##1v%
\scr@removechar\@usefolds{L}%
\else
- \if ####1h%
+ \if ##1h%
\scr@removechar\@usefolds{T}%
\scr@removechar\@usefolds{M}%
\scr@removechar\@usefolds{B}%
\else
- \ClassError{\KOMAClassName}{%
- unknown fold mark switch `####1'}{%
- You should use option `foldmarks'
- either with one of\MessageBreak
- \@spaces `true', `on', or `yes' to
- switch fold marks on,\MessageBreak
- \@spaces `false', `off', or `no' to
- switch fold marks off,\MessageBreak
- or a combination of\MessageBreak
- \@spaces `T', `M', `B', 'P', 'L', `V',
- `H' to select dedicated fold
- marks\MessageBreak
- or\MessageBreak
- \@spaces `t', `m', 'b', 'p', 'l', 'v',
- 'h' to deselect dedicated fold
- marks.\MessageBreak
- See the KOMA-Script manual for more
- information.
- }%
+ \aftergroup\FamilyKeyStateUnknownValue
\fi
\fi
\fi
@@ -769,9 +813,7 @@
\fi
}%
\expandafter\sc@nf@ldch@rs#1\@nil
- }%
- \KOMA@set@ifkey\@empty{@fold}{#1}%
- \if@fold\aftergroup\@foldtrue\else\aftergroup\@foldfalse\fi
+ \fi
\endgroup
}
\newcommand*{\scr@removechar}[2]{%
@@ -787,26 +829,32 @@
\KOMA@key{refline}[wide]{%
\begingroup
\KOMA@set@ncmdkey{refline}{@tempa}{{wide}{0},{narrow}{1},%
- {dateleft}{2},{leftdate}{2},%
- {dateright}{3},{rightdate}{3},%
- {nodate}{4}%
- }{#1}%
- \ifcase\@tempa
- \endgroup
- \@refwidetrue
- \or
- \endgroup
- \@refwidefalse
- \or
- \endgroup
- \def\@datepos{2}%
- \or
- \endgroup
- \def\@datepos{1}%
- \or
+ {dateleft}{2},{leftdate}{2},%
+ {dateright}{3},{rightdate}{3},%
+ {nodate}{4}%
+ }{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \endgroup
+ \@refwidetrue
+ \or
+ \endgroup
+ \@refwidefalse
+ \or
+ \endgroup
+ \def\@datepos{2}%
+ \or
+ \endgroup
+ \def\@datepos{1}%
+ \or
+ \endgroup
+ \def\@datepos{0}%
+ \fi
+ \else
\endgroup
- \def\@datepos{0}%
- \fi
+ \FamilyKeyStateUnknownValue
+ \fi
}
\newcommand{\subject@format}[1]{#1}
\newcommand*{\raggedsubject}{}
@@ -824,22 +872,27 @@
{right}{6},%
{centered}{7}%
}{#1}%
- \ifcase\@tempa
- \aftergroup\@subjtrue
- \or
- \aftergroup\@subjfalse
- \or
- \aftergroup\@subjaftertrue
- \or
- \aftergroup\@subjafterfalse
- \or
- \aftergroup\let\aftergroup\subject@format\aftergroup\underline
- \or
- \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedright
- \or
- \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedleft
- \or
- \aftergroup\let\aftergroup\raggedsubject\aftergroup\centering
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\@tempa
+ \aftergroup\@subjtrue
+ \or
+ \aftergroup\@subjfalse
+ \or
+ \aftergroup\@subjaftertrue
+ \or
+ \aftergroup\@subjafterfalse
+ \or
+ \aftergroup\let\aftergroup\subject@format\aftergroup\underline
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedright
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\raggedleft
+ \or
+ \aftergroup\let\aftergroup\raggedsubject\aftergroup\centering
+ \fi
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
}
@@ -861,40 +914,83 @@
{top}{10},{head}{10},{bot}{11},{foot}{11},%
{left}{20},{middle}{21},{center}{21},{centered}{21},{right}{22}%
}{#1}%
- \ifnum\@tempa<10
- \edef\@tempa{\endgroup\edef\noexpand\@pageat{\@tempa}}%
- \else
- \ifnum\@tempa<20
- \@tempcnta\@pageat\relax
- \ifnum\@tempcnta>2
- \advance\@tempcnta by -3
- \fi
- \ifnum\@tempa=11
- \advance\@tempcnta by 3
- \fi
- \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifnum\@tempa<10
+ \edef\@tempa{\endgroup\edef\noexpand\@pageat{\@tempa}}%
\else
- \ifnum\@pageat>2
- \edef\@pageat{3}%
+ \ifnum\@tempa<20
+ \@tempcnta\@pageat\relax
+ \ifnum\@tempcnta>2
+ \advance\@tempcnta by -3
+ \fi
+ \ifnum\@tempa=11
+ \advance\@tempcnta by 3
+ \fi
+ \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}%
\else
- \edef\@pageat{0}%
+ \ifnum\@pageat>2
+ \edef\@pageat{3}%
+ \else
+ \edef\@pageat{0}%
+ \fi
+ \@tempcnta\@tempa
+ \advance\@tempcnta by -20
+ \advance\@tempcnta by\@pageat
+ \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}%
\fi
- \@tempcnta\@tempa
- \advance\@tempcnta by -20
- \advance\@tempcnta by\@pageat
- \edef\@tempa{\endgroup\edef\noexpand\@pageat{\the\@tempcnta}}%
\fi
+ \else
+ \def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
}
-%%% From File: scrkcile.dtx
-%%% From File: scrkmisc.dtx
+\newif\if@scrsymbols
+\KOMA@key{symbolicnames}[true]{%
+ \KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
+ \if@scrsymbols
+ \if@atdocument
+ \begingroup
+ \@tempswafalse
+ \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{%
+ \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{%
+ \scr@ifundefinedorrelax{Email}{\@tempswatrue}{%
+ \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{%
+ }%
+ }%
+ }%
+ }%
+ \if@tempswa
+ \aftergroup\@scrsymbolsfalse
+ \ClassWarning{scrlttr2}{Option `symbolicnames'
+ ignorred.\MessageBreak
+ You've tried to set option `symbolicnames'\MessageBreak
+ after \string\begin{document}, but without\MessageBreak
+ loading package `marvosym' before.\MessageBreak
+ You should either switch on option\MessageBreak
+ `symbolicnames' before \string\begin{document}\MessageBreak
+ or load package `marvosym' in the document\MessageBreak
+ preamble to avoid this warning%
+ }%
+ \fi
+ \endgroup
+ \else
+ \ifstr{\@currname.\@currext}{scrlttr2.cls}{%
+ \expandafter\AtEndOfClass
+ }{%
+ \expandafter\@firstofone
+ }%
+ {\RequirePackage{marvosym}}%
+ \fi
+ \fi
+}
+%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMAExecuteOptions{%
parskip=false,%
- headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -906,7 +1002,42 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+\newcommand*\scr@setlength[4]{%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \else
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
@@ -930,12 +1061,20 @@
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\normalsize{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
@@ -947,12 +1086,20 @@
}%
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\small{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
@@ -964,12 +1111,20 @@
}%
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\footnotesize{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1022,29 +1177,37 @@
{\the\@tempdima}{\the\@tempdimb}%
}%
\normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \fi
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1057,9 +1220,16 @@
\if@tempswa\noexpand\@list@extra\fi
}%
\let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1071,9 +1241,16 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1085,8 +1262,15 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1099,8 +1283,13 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1110,7 +1299,7 @@
\labelwidth=\dimexpr \leftmargin-\labelsep
\topsep \the\topsep
\parsep \z@
- \partopsep \the\parsep
+ \partopsep \the\partopsep
\itemsep \topsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1120,7 +1309,7 @@
\csname @listiv\endcsname
\endgroup
\edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1129,7 +1318,7 @@
\csname @listv\endcsname
\endgroup
\edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1138,15 +1327,36 @@
\csname @listvi\endcsname
\endgroup
\edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@listi
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1172,18 +1382,56 @@
}%
}%
}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
-\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
+\newcommand*{\scr@DeclareOldFontCommand}[3]{%
+ \DeclareRobustCommand #1{\@fontswitch {%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#2}'%
+ }%
+ #2%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#3}'%
+ }%
+ #3%
+ }%
+ }%
+}
+\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\scr@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\scr@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\scr@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\scr@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\scr@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\scr@DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
@@ -1228,7 +1476,37 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: scrklco.dtx
+\newcommand*{\scr@package@not@recommended}[2]{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
+ }%
+}
+\scr@package@not@recommended{emptypage}{%
+ option\MessageBreak
+ `cleardoublepage' with one of it's\MessageBreak
+ several values}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{fancyhdr}{%
+ \MessageBreak
+ package `scrpage2' or `scrlayer-scrpage'}
+\scr@package@not@recommended{titlesec}{%
+ the package only\MessageBreak
+ if you really need it, because it breaks several\MessageBreak
+ KOMA-Script features, i.e., option `headings' and\MessageBreak
+ the extended optional argument of the section\MessageBreak
+ commands
+}
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -1270,13 +1548,26 @@
\newcommand*{\LOPNP@size}{}
\newcommand*{\@PapersizeWarning}{%
\begingroup%
- \edef\@tempc{\noexpand\@tempswatrue
- \noexpand\ifdim\paperwidth=\the\paperwidth\noexpand\else
- \noexpand\@tempswafalse\noexpand\fi
- \noexpand\ifdim\paperheight=\the\paperheight\noexpand\else
- \noexpand\@tempswafalse\noexpand\fi
+ \edef\@tempc{\noexpand\@tempswafalse
+ \noexpand\ifdim\paperwidth<\the\dimexpr\paperwidth-.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\ifdim\paperwidth>\the\dimexpr\paperwidth+.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\ifdim\paperheight<\the\dimexpr\paperheight-.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\ifdim\paperheight>\the\dimexpr\paperheight+.1mm\relax
+ \relax
+ \noexpand\else
+ \noexpand\@tempswatrue
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\fi
+ \noexpand\fi
\noexpand\@@PapersizeWarning
- }
+ }%
\def\@tempb{letter}\ifx\LOPNP@size\@tempb%
\setlength{\paperheight}{11in}\setlength{\paperwidth}{8.5in}%
\else\def\@tempb{legal}\ifx\LOPNP@size\@tempb%
@@ -1317,8 +1608,8 @@
}
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
- }
-%%% From File: scrklang.dtx
+}
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\ClassInfo{%
@@ -1357,6 +1648,7 @@
\providecaptionname{english}\datename{Date}%
\providecaptionname{english}\pagename{Page}%
\providecaptionname{english}\phonename{Phone}%
+ \providecaptionname{english}\mobilephonename{Mobile phone}%
\providecaptionname{english}\faxname{Fax}%
\providecaptionname{english}\emailname{Email}%
\providecaptionname{english}\wwwname{Url}%
@@ -1375,6 +1667,7 @@
\providecaptionname{USenglish}\datename{Date}%
\providecaptionname{USenglish}\pagename{Page}%
\providecaptionname{USenglish}\phonename{Phone}%
+ \providecaptionname{USenglish}\mobilephonename{Cell phone}%
\providecaptionname{USenglish}\faxname{Fax}%
\providecaptionname{USenglish}\emailname{Email}%
\providecaptionname{USenglish}\wwwname{Url}%
@@ -1393,6 +1686,7 @@
\providecaptionname{american}\datename{Date}%
\providecaptionname{american}\pagename{Page}%
\providecaptionname{american}\phonename{Phone}%
+ \providecaptionname{american}\mobilephonename{Cell phone}%
\providecaptionname{american}\faxname{Fax}%
\providecaptionname{american}\emailname{Email}%
\providecaptionname{american}\wwwname{Url}%
@@ -1411,6 +1705,7 @@
\providecaptionname{british}\datename{Date}%
\providecaptionname{british}\pagename{Page}%
\providecaptionname{british}\phonename{Phone}%
+ \providecaptionname{british}\mobilephonename{Mobile phone}%
\providecaptionname{british}\faxname{Fax}%
\providecaptionname{british}\emailname{Email}%
\providecaptionname{british}\wwwname{Url}%
@@ -1429,6 +1724,7 @@
\providecaptionname{UKenglish}\datename{Date}%
\providecaptionname{UKenglish}\pagename{Page}%
\providecaptionname{UKenglish}\phonename{Phone}%
+ \providecaptionname{UKenglish}\mobilephonename{Mobile phone}%
\providecaptionname{UKenglish}\faxname{Fax}%
\providecaptionname{UKenglish}\emailname{Email}%
\providecaptionname{UKenglish}\wwwname{Url}%
@@ -1447,6 +1743,7 @@
\providecaptionname{german}\datename{Datum}%
\providecaptionname{german}\pagename{Seite}%
\providecaptionname{german}\phonename{Telephon}%
+ \providecaptionname{german}\mobilephonename{Mobiltelephon}%
\providecaptionname{german}\faxname{Fax}%
\providecaptionname{german}\emailname{E-Mail}%
\providecaptionname{german}\wwwname{URL}%
@@ -1465,6 +1762,7 @@
\providecaptionname{ngerman}\datename{Datum}%
\providecaptionname{ngerman}\pagename{Seite}%
\providecaptionname{ngerman}\phonename{Telefon}%
+ \providecaptionname{ngerman}\mobilephonename{Handy}%
\providecaptionname{ngerman}\faxname{Fax}%
\providecaptionname{ngerman}\emailname{E-Mail}%
\providecaptionname{ngerman}\wwwname{URL}%
@@ -1483,6 +1781,7 @@
\providecaptionname{austrian}\datename{Datum}%
\providecaptionname{austrian}\pagename{Seite}%
\providecaptionname{austrian}\phonename{Telefon}%
+ \providecaptionname{austrian}\mobilephonename{Mobiltelefon}%
\providecaptionname{austrian}\faxname{Fax}%
\providecaptionname{austrian}\emailname{E-Mail}%
\providecaptionname{austrian}\wwwname{URL}%
@@ -1501,6 +1800,7 @@
\providecaptionname{naustrian}\datename{Datum}%
\providecaptionname{naustrian}\pagename{Seite}%
\providecaptionname{naustrian}\phonename{Telefon}%
+ \providecaptionname{naustrian}\phonename{Handy}%
\providecaptionname{naustrian}\faxname{Fax}%
\providecaptionname{naustrian}\emailname{E-Mail}%
\providecaptionname{naustrian}\wwwname{URL}%
@@ -1519,6 +1819,7 @@
\providecaptionname{french}\datename{Date}%
\providecaptionname{french}\pagename{Page}%
\providecaptionname{french}\phonename{T\'el\'ephone}%
+ \providecaptionname{french}\mobilephonename{Portable}%
\providecaptionname{french}\faxname{T\'el\'efax}%
\providecaptionname{french}\emailname{E-mail}%
\providecaptionname{french}\wwwname{URL}%
@@ -1538,6 +1839,7 @@
\providecaptionname{italian}\datename{Data}%
\providecaptionname{italian}\pagename{Pagina}%
\providecaptionname{italian}\phonename{Telefono}%
+ \providecaptionname{italian}\mobilephonename{Telefonino}%
\providecaptionname{italian}\faxname{Fax}%
\providecaptionname{italian}\emailname{Email}%
\providecaptionname{italian}\wwwname{Sito Web}%
@@ -1556,6 +1858,7 @@
\providecaptionname{spanish}\datename{Fecha}%
\providecaptionname{spanish}\pagename{P\'agina}%
\providecaptionname{spanish}\phonename{Tel\'efono}%
+ \providecaptionname{spanish}\mobilephonename{M\'ovil}%
\providecaptionname{spanish}\faxname{Fax}%
\providecaptionname{spanish}\emailname{Email}% or Correo electr\'onico
\providecaptionname{spanish}\wwwname{URL}% or P\`agina web
@@ -1574,6 +1877,7 @@
\providecaptionname{croatian}\datename{Nadnevak}%
\providecaptionname{croatian}\pagename{Stranica}%
\providecaptionname{croatian}\phonename{Telefon}%
+ \providecaptionname{croatian}\mobilphonename{Mobitel}%
\providecaptionname{croatian}\faxname{Fax}%
\providecaptionname{croatian}\emailname{E-Mail}%
\providecaptionname{croatian}\wwwname{URL}%
@@ -1592,6 +1896,7 @@
\providecaptionname{dutch}\datename{Datum}%
\providecaptionname{dutch}\pagename{Pagina}%
\providecaptionname{dutch}\phonename{Telefoon}%
+ \providecaptionname{dutch}\mobilephonename{Mobieltje}%
\providecaptionname{dutch}\faxname{Fax}%
\providecaptionname{dutch}\emailname{E--mail}%
\providecaptionname{dutch}\wwwname{URL}%
@@ -1610,6 +1915,7 @@
\providecaptionname{finnish}\datename{P\"aiv\"a}%
\providecaptionname{finnish}\pagename{Sivu}%
\providecaptionname{finnish}\phonename{Puhelin}%
+ \providecaptionname{finnish}\mobilephonename{Matkapuhelin}%
\providecaptionname{finnish}\faxname{Faksi}%
\providecaptionname{finnish}\emailname{S\"ahk\"oposti}%
\providecaptionname{finnish}\wwwname{URL}%
@@ -1628,6 +1934,7 @@
\providecaptionname{norsk}\datename{Dato}%
\providecaptionname{norsk}\pagename{Side}%
\providecaptionname{norsk}\phonename{Telefon}%
+ \providecaptionname{norsk}\mobilephonename{Mobiltelefon}%
\providecaptionname{norsk}\faxname{Telefaks}%
\providecaptionname{norsk}\emailname{E-post}%
\providecaptionname{norsk}\wwwname{Url}%
@@ -1646,6 +1953,7 @@
\providecaptionname{swedish}\datename{Datum}%
\providecaptionname{swedish}\pagename{Sida}%
\providecaptionname{swedish}\phonename{Telefon}%
+ \providecaptionname{swedish}\mobilephonename{Mobiltelefon}%
\providecaptionname{swedish}\faxname{Telefax}%
\providecaptionname{swedish}\emailname{E-post}%
\providecaptionname{swedish}\wwwname{Hemsida}%
@@ -1753,7 +2061,12 @@
will be used%
}%
\else
- \expandafter\selectlanguage\expandafter{\languagename}%
+ \ClassInfo{scrlttr2}{%
+ trying to activate captions and date\MessageBreak
+ of language `\languagename'%
+ }%
+ \csname date\languagename\endcsname
+ \csname captions\languagename\endcsname
\ClassInfo{%
scrlttr2%
}{%
@@ -1762,12 +2075,12 @@
`british', `american', `USenglish',\MessageBreak
`german', `ngerman', `austrian', `naustrian',\MessageBreak
`dutch', `italian', `spanish',\MessageBreak
- `croatian', `finnish', `norsk'%
+ `croatian', `finnish', `norsk', `swedish'%
}%
\fi
\fi
}
-%%% From File: scrkvars.dtx
+%%% From File: $Id: scrkernel-variables.dtx 1389 2013-10-01 16:06:04Z mjk $
\newcommand*{\newkomavar}{%
\@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -1896,7 +2209,7 @@
}%
\endgroup
}
-%%% From File: scrkplen.dtx
+%%% From File: $Id: scrkernel-pseudolengths.dtx 1388 2013-10-01 16:03:42Z mjk $
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -1950,7 +2263,7 @@
}%
\@tempa%
}
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1961,7 +2274,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2087,7 +2400,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2182,11 +2495,11 @@
\pagenumbering{arabic}
\raggedbottom
\onecolumn
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -2323,7 +2636,7 @@
\endgroup
\@footnotemark
}
-%%% From File: scrklist.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
\setlength{\leftmarginiii}{1.87em}
@@ -2419,8 +2732,22 @@
\newenvironment{addmargin*}{%
\@tempswafalse
\if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \ClassWarning{\KOMAClassName}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\advance\@listdepth\@ne
\endlist
}
@@ -2451,7 +2778,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: scrknpap.dtx
+%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -2504,6 +2831,9 @@
{\usekomafont{fromaddress}\strut\ignorespaces
\usekomavar{fromaddress}%
\if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
\if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
@@ -2545,6 +2875,9 @@
{\usekomafont{fromaddress}\strut\ignorespaces
\usekomavar{fromaddress}%
\if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
\if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
@@ -2590,6 +2923,9 @@
{\usekomafont{fromaddress}\strut\ignorespaces
\usekomavar{fromaddress}%
\if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
\if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
@@ -2636,6 +2972,7 @@
\else
\newkomafont{refvalue}{}
\fi
+\newkomafont{placeanddate}{}
\newkomafont{title}{\normalcolor\sffamily\bfseries}
\newkomafont{subject}{\normalcolor\bfseries}
\@newplength{foldmarkhpos}
@@ -3255,6 +3592,9 @@
{\usekomafont{fromaddress}\strut\ignorespaces
\usekomavar{fromaddress}%
\if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
\if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
@@ -3293,6 +3633,9 @@
{\usekomafont{fromaddress}\strut\ignorespaces
\usekomavar{fromaddress}%
\if@phone\\\usekomavar*{fromphone}\usekomavar{fromphone}\fi%
+ \if@mobilephone%
+ \\\usekomavar*{frommobilephone}\usekomavar{frommobilephone}%
+ \fi%
\if@fax\\\usekomavar*{fromfax}\usekomavar{fromfax}\fi%
\if@email\\\usekomavar*{fromemail}\usekomavar{fromemail}\fi%
\if@www\\\usekomavar*{fromurl}\usekomavar{fromurl}\fi%
@@ -3421,9 +3764,9 @@
\else
\ifcase \@datepos\else
\ifnum \@datepos=1 \enskip\hfill\fi
- \ifkomavarempty{place}{}{%
- \usekomavar{place}\usekomavar{placeseparator}}%
- \usekomavar{date}%
+ {\usekomafont{placeanddate}{\ifkomavarempty{place}{}{%
+ \usekomavar{place}\usekomavar{placeseparator}}%
+ \usekomavar{date}}}%
\fi
\fi
}%
@@ -3693,7 +4036,7 @@
\newkomavar{PPdatamatrix}
\newkomavar{addresseeimage}
\newkomavar[\usekomavar{place}]{placeseparator}
-\setkomavar{placeseparator}{,~}
+\setkomavar{placeseparator}{,\nobreakspace}
\newkomavar[\subjectname]{subjectseparator}
\setkomavar{subjectseparator}{: }
\newkomavar[\ccname]{ccseparator}
@@ -3701,15 +4044,19 @@
\newkomavar[\enclname]{enclseparator}
\setkomavar{enclseparator}{: }
\newkomavar{backaddressseparator}
-\setkomavar{backaddressseparator}{,~}
-\newkomavar[\phonename]{phoneseparator}
-\setkomavar{phoneseparator}{:~}
-\newkomavar[\faxname]{faxseparator}
-\setkomavar{faxseparator}{:~}
-\newkomavar[\emailname]{emailseparator}
-\setkomavar{emailseparator}{:~}
-\newkomavar[\wwwname]{urlseparator}
-\setkomavar{urlseparator}{:~}
+\setkomavar{backaddressseparator}{,\nobreakspace}
+\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator}
+\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace}
+\newkomavar[%
+ \if@scrsymbols\Mobilefone\else\mobilephonename\fi
+]{mobilephoneseparator}
+\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}}
+\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator}
+\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace}
+\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator}
+\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace}
+\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator}
+\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi}
\newkomavar{zipcodeseparator}
\setkomavar{zipcodeseparator}{\,--\,}
\newkomavar[\headfromname]{fromname}
@@ -3718,6 +4065,8 @@
\newkomavar[\usekomavar{toname}]{toaddress}
\newkomavar[\usekomavar*{phoneseparator}%
\usekomavar{phoneseparator}]{fromphone}
+\newkomavar[\usekomavar*{mobilephoneseparator}%
+ \usekomavar{mobilephoneseparator}]{frommobilephone}
\newkomavar[\usekomavar*{faxseparator}%
\usekomavar{faxseparator}]{fromfax}
\newkomavar[\usekomavar*{emailseparator}%
@@ -3734,7 +4083,7 @@
\usekomavar{subjectseparator}]{subject}
\newkomavar[\datename]{date}
\setkomavar{date}{\@date}
-%%% From File: scrkcile.dtx
+%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
\newcommand*{\adrchar}{\addrchar}
@@ -3745,7 +4094,7 @@
\expandafter\def\csname #9\endcsname{#2 #1\\#3}%
\fi \fi}
\newcommand*{\addrchar}[1]{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
deleted file mode 100644
index 73aeb46512c..00000000000
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage.sty
+++ /dev/null
@@ -1,445 +0,0 @@
-%%
-%% This is file `scrpage.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% scrpage.dtx (with options: `scrpage,v1')
-%% scrlogo.dtx (with options: `logo')
-%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
-%%
-%% This file was generated from file(s) of the KOMA-Script bundle.
-%% ---------------------------------------------------------------
-%%
-%% It may be distributed under the conditions of the
-%% LaTeX Project Public License in the version distributed together
-%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
-%%
-%% This file may only be distributed together with a copy of the
-%% KOMA-Script bundle. You may however distribute the
-%% KOMA-Script bundle without all such generated files. See also
-%% `lppl.txt' or `lppl-de.txt' for additional information.
-%%
-%% The list of files belonging to KOMA-Script distribution is given in
-%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
-%% additional information.
-%%
-%% If this file is a beta version, you may not be allowed to distribute
-%% it. Look at the comments below to see if this is the case.
-%%
-%% English and German manuals are part of KOMA-Script bundle.
-%% ----------------------------------------------------------
-%%
-%% See `README'.
-%%
-%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
-%% find a complete unmodified copy of LaTeX2e at
-%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
-%%
-%%% From File: scrpage.dtx
-\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{scrpage}[2008/02/29 v1.3e KOMA-Script
- package]
-\DeclareOption{headinclude}{%
- \PassOptionsToPackage{headinclude}{typearea}%
-}
-\DeclareOption{headexclude}{%
- \PassOptionsToPackage{headexclude}{typearea}%
-}
-\DeclareOption{footinclude}{%
- \PassOptionsToPackage{footinclude}{typearea}%
-}
-\DeclareOption{footexclude}{%
- \PassOptionsToPackage{footexclude}{typearea}%
-}
-\ExecuteOptions{%
-headinclude,footinclude%
-}
-\ProcessOptions\relax
-\newif\if@chapter
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname chapter\endcsname\relax
- \@chapterfalse
-\else
- \@chaptertrue
-\fi
-\def\@tempa{\newif\if@mainmatter\@mainmattertrue}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname mainmatter\endcsname\relax
-\else
- \let\@tempa\relax
-\fi
-\@tempa
-\let\headmark\relax
-\DeclareRobustCommand\pagemark{{\pnumfont\thepage}}
-\def\defpagestyle{%
- \@ifstar
- {\@defpagestyle[-]}%
- {\@defpagestyle[+]}}
-\if@twoside
- \def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \def\@tempa{+}%
- \def\@tempb{#1}%
- \ifx\@tempa\@tempb
- \let\@mkboth\markboth
- \if@chapter
- \def\chaptermark####1{%
- \markboth {\ifnum \c@secnumdepth >\m@ne%
- \if@mainmatter\chaptermarkformat\fi\fi ####1}{%
- \ifnum \c@secnumdepth >\m@ne%
- \if@mainmatter\chaptermarkformat\fi\fi ####1}}%
- \def\sectionmark####1{%
- \markright {\ifnum \c@secnumdepth >\z@%
- \sectionmarkformat\fi ####1}}%
- \else
- \def\sectionmark####1{%
- \markboth {\ifnum \c@secnumdepth >\z@%
- \if@mainmatter\sectionmarkformat\fi\fi ####1}{%
- \ifnum \c@secnumdepth >\z@%
- \if@mainmatter\sectionmarkformat\fi\fi ####1}}%
- \def\subsectionmark####1{%
- \markright {\ifnum \c@secnumdepth >\@ne%
- \subsectionmarkformat\fi ####1}}%
- \fi
- \else
- \let\@mkboth\@gobbletwo
- \if@chapter
- \def\chaptermark####1{}%
- \else
- \def\subsectionmark####1{}%
- \fi
- \def\sectionmark####1{}%
- \fi
- \def@twosidehead#3
- \def@twosidefoot#4
- }
- }
-\else
- \def\@defpagestyle[#1]#2#3#4{%
- \expandafter\def\csname ps@#2\endcsname{%
- \def\@tempa{+}%
- \def\@tempb{#1}%
- \ifx\@tempa\@tempb
- \let\@mkboth\markboth
- \if@chapter
- \def\chaptermark####1{%
- \markright {\ifnum \c@secnumdepth >\m@ne%
- \if@mainmatter\chaptermarkformat\fi\fi ####1}}%
- \def\sectionmark####1{}%
- \else
- \def\sectionmark####1{%
- \markright{\ifnum \c@secnumdepth >\z@%
- \if@mainmatter\sectionmarkformat\fi\fi ####1}}%
- \def\subsectionmark####1{}%
- \fi
- \else
- \let\@mkboth\@gobbletwo
- \if@chapter
- \def\chaptermark####1{}%
- \else
- \def\subsectionmark####1{}%
- \fi
- \def\sectionmark####1{}%
- \fi
- \def@onesidehead#3
- \def@onesidefoot#4
- }
- }
-\fi
-\def\def@twosidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{\let\headmark\leftmark%
- \hss\hskip\@evenheadshift\vbox{\hsize=\@headwidth\relax%
- \hf@rule{#1}{#2}{\@headwidth}%
- \vskip#2
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \headfont\strut #3}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- }\hskip\@oddheadshift\hss}%
- \def\@oddhead{\let\headmark\rightmark
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf@rule{#1}{#2}{\@headwidth}%
- \vskip#2%
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \headfont\strut #4}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- }\hskip\@evenheadshift\hss}%
-}
-\def\def@onesidehead(#1,#2)#3#4#5(#6,#7){%
- \def\@evenhead{}%
- \def\@oddhead{\let\headmark\rightmark
- \hss\hskip\@oddheadshift\vbox{\hsize=\@headwidth\relax
- \hf@rule{#1}{#2}{\@headwidth}%
- \vskip#2%
- \vskip\baselineskip
- \hb@xt@\@headwidth{{%
- \headfont\strut #5}}%
- \hf@rule{#6}{#7}{\@headwidth}%
- }\hskip\@evenheadshift\hss}%
-}
-\def\def@twosidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{\let\headmark\leftmark
- \hss\hskip\@evenfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \headfont\footfont\strut #3}}%
- \botfoot@rule{#6}{#7}}\hskip\@oddfootshift\hss}%
- \def\@oddfoot{\let\headmark\rightmark
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \headfont\footfont\strut #4}}%
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
-}
-\def\def@onesidefoot(#1,#2)#3#4#5(#6,#7){%
- \def\@evenfoot{}%
- \def\@oddfoot{\let\headmark\rightmark
- \hss\hskip\@oddfootshift\vbox{\hsize=\@footwidth\relax
- \topfoot@rule{#1}{#2}\hb@xt@\@footwidth{{%
- \headfont\footfont\strut #5}}
- \botfoot@rule{#6}{#7}}\hskip\@evenfootshift\hss}%
-}
-
-\newcommand\topfoot@rule[2]{%
- \@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
- \advance\@tempdima by -#2
- \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}%
- \vskip-\@tempdima}
-\newcommand\botfoot@rule[2]{%
- \@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip
- \advance\@tempdima by #2
- \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}%
-}
-\newcommand\hf@rule[3]{%
- \setlength{\@tempdimb}{#1}
- \setlength{\@tempdimb}{.5\@tempdimb}%
- \hb@xt@#3{%
- \hfill%
- \llap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
- \rlap{\vrule\@depth#2\@height\z@\@width\@tempdimb}%
- \hfill%
- }%
-}
-\def\newpagestyle{%
- \@ifstar
- {\@newpagestyle[-]}%
- {\@newpagestyle[+]}}
-\def\@newpagestyle[#1]#2#3#4{%
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \else
- \PackageError
- {scrpage}%
- {Your command was ignored}%
- {There is already a pagestyle named ``#1''.\MessageBreak%
- Use \protect\defpagestyle\space, \protect\renewpagestyle or
- \protect\providepagestyle.}%
- \fi
-}
-\def\renewpagestyle{%
- \@ifstar
- {\@renewpagestyle[-]}%
- {\@renewpagestyle[+]}}
-\def\@renewpagestyle[#1]#2#3#4{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \PackageError
- {scrpage}%
- {Your command was ignored}%
- {There is no pagestyle named ``#1''.\MessageBreak%
- Use \protect\defpagestyle, \protect\newpagestyle or
- \protect\providepagestyle.}%
- \else
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \fi
-}
-\def\providepagestyle{%
- \@ifstar
- {\@providepagestyle[-]}%
- {\@providepagestyle[+]}}
-\def\@providepagestyle[#1]#2#3#4{%
- \expandafter\ifx\csname ps@#2\endcsname\relax
- \@defpagestyle[#1]{#2}{#3}{#4}%
- \else
- \PackageInfo
- {scrpage}%
- {\protect\providepagestyle\protect{#1\protect} ignored.}%
- \fi
-}
-\def\deftripstyle{%
- \@ifstar
- {\@deftripstyle[-]}%
- {\@deftripstyle[+]}}
-\def\@deftripstyle[#1]#2{%
- \@ifnextchar[%]
- {\@@deftripstyle[#1]{#2}}%
- {\@@deftripstyle[#1]{#2}[\z@]}}
-\def\@@deftripstyle[#1]#2[#3]{%
- \def\@tempa{#1}%
- \@ifnextchar[%]
- {\@@@deftripstyle#2[#3]}%
- {\@@@deftripstyle#2[\z@][#3]}}
-\def\@@@deftripstyle#1[#2][#3]#4#5#6#7#8#9{%
- \def\@tempb{+}%
- \ifx\@tempa\@tempb
- \defpagestyle{#1}%
- {(\@headwidth,#2)%
- {\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}%
- {(\@footwidth,#3)%
- {\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}%
- \else
- \defpagestyle*{#1}%
- {(\@headwidth,#2)%
- {\rlap{#6}\hfill{#5}\hfill\llap{#4}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- {\rlap{#4}\hfill{#5}\hfill\llap{#6}}%
- (\@headwidth,#3)}%
- {(\@footwidth,#3)%
- {\rlap{#9}\hfill{#8}\hfill\llap{#7}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- {\rlap{#7}\hfill{#8}\hfill\llap{#9}}%
- (\@footwidth,#2)}%
- \fi
-}
-\newcommand*{\settowidthof}[2]{%
- \edef\@tempa{#2}%
- \edef\@tempb{paper}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}%
- \else\edef\@tempb{text}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}%
- \else\edef\@tempb{textwithmarginpar}\ifx\@tempa\@tempb
- \setlength{#1}{\textwidth}%
- \addtolength{#1}{\marginparwidth}%
- \addtolength{#1}{\marginparsep}%
- \else\edef\@tempb{head}\ifx\@tempa\@tempb
- \setlength{#1}{\@headwidth}%
- \else\edef\@tempb{foot}\ifx\@tempa\@tempb
- \setlength{#1}{\@footwidth}%
- \else\edef\@tempb{headtopline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@headabove@linelength}%
- \else\edef\@tempb{headsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@headbelow@linelength}%
- \else\edef\@tempb{footsepline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@footabove@linelength}%
- \else\edef\@tempb{footbotline}\ifx\@tempa\@tempb
- \setlength{#1}{\scr@footbelow@linelength}%
- \else\edef\@tempb{page}\ifx\@tempa\@tempb
- \setlength{#1}{\paperwidth}%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname ta@bcor\endcsname\relax\else
- \addtolength{#1}{-\ta@bcor}%
- \fi
- \else
- \setlength{#1}{#2}%
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
-}
-\newcommand*{\deftowidthof}[2]{%
- \edef\@tempa{#2}\edef\@tempb{autohead}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@headwidth}%
- \else\edef\@tempb{autofoot}\ifx\@tempa\@tempb
- \expandafter\def\csname #1\endcsname{\@footwidth}%
- \else
- \settowidthof{\@tempdima}{#2}%
- \expandafter\edef\csname #1\endcsname{\the\@tempdima}%
- \fi
- \fi
-}
-\newcommand*{\setheadwidth}[2][\@empty]{%
- \set@hf@width{head}{#1}{#2} %
-}
-\newcommand*{\setfootwidth}[2][\@empty]{%
- \set@hf@width{foot}{#1}{#2}%
-}
-\newcommand*{\set@hf@width}[3]{%
- \settowidthof{\@tempdima}{#3}%
- \ifdim\@tempdima>\paperwidth
- \PackageWarning
- {scrpage}%
- {You've set width of #1 to a value\MessageBreak
- greater than width of page!\MessageBreak%
- I`ll reduce width of #1 to width of page}%
- \setlength{\@tempdima}{\paperwidth}%
- \else
- \ifdim\@tempdima<\z@
- \PackageWarning
- {scrpage}%
- {You've set width of #1 to negative value!\MessageBreak%
- I'll set it to 0pt}%
- \setlength{\@tempdima}{\z@}%
- \fi
- \fi
- \expandafter\edef\csname @#1width\endcsname{\the\@tempdima}%
- \edef\@tempa{#2}%
- \setlength{\@tempdima}{\textwidth}%
- \addtolength{\@tempdima}{-\csname @#1width\endcsname}%
- \ifx\@tempa\@empty
- \if@twoside
- \setlength{\@tempdimb}{.3333333333\@tempdima}%
- \else
- \setlength{\@tempdimb}{.5\@tempdima}%
- \fi
- \else
- \setlength{\@tempdimb}{#2}%
- \fi
- \addtolength{\@tempdima}{-\@tempdimb}%
- \ifdim\@tempdimb<\z@
- \setlength{\@tempdimb}{-\@tempdimb}%
- \expandafter\edef\csname @odd#1shift\endcsname{-\the\@tempdimb}%
- \else
- \expandafter\edef\csname @odd#1shift\endcsname{\the\@tempdimb}%
- \fi
- \ifdim\@tempdima<\z@
- \setlength{\@tempdima}{-\@tempdima}%
- \expandafter\edef\csname @even#1shift\endcsname{-\the\@tempdima}%
- \else
- \expandafter\edef\csname @even#1shift\endcsname{\the\@tempdima}%
- \fi
-}
-\newcommand*{\@headwidth}{\textwidth}%
-\newcommand*{\@oddheadshift}{\z@}%
-\newcommand*{\@evenheadshift}{\z@}%
-\newcommand*{\@footwidth}{\textwidth}%
-\newcommand*{\@oddfootshift}{\z@}%
-\newcommand*{\@evenfootshift}{\z@}%
-\providecommand*{\pnumfont}{\normalfont}
-\providecommand*{\headfont}{\normalfont%
-}
-\providecommand{\partmarkformat} {\partname\ \thepart. \ }
-\if@chapter
- \providecommand{\chaptermarkformat} {\@chapapp\ \thechapter. \ }
- \providecommand{\sectionmarkformat} {\thesection. \ }
-\else
- \providecommand{\sectionmarkformat} {\thesection\quad}
- \providecommand{\subsectionmarkformat} {\thesubsection\quad}
-\fi
-\InputIfFileExists{scrpage.cfg}
- {\typeout{*************************************^^J%
- * Local config file scrpage.cfg used^^J%
- *************************************}}
- {}
-%%% From File: scrlogo.dtx
-\@ifundefined{KOMAScript}{%
- \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
- M\kern.05em A\kern.1em-\kern.1em Script}}}{}
-\endinput
-%%
-%% End of file `scrpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index b3216cfe07e..710d4a9daa0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -1,14 +1,13 @@
%%
%% This is file `scrpage2.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% scrpage.dtx (with options: `scrpage,v2')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -40,11 +39,11 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrpage.dtx
+%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{scrpage2}
- [2010/04/22 v2.5 LaTeX2e KOMA-Script
- package]
+\ProvidesPackage{scrpage2}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package (page head and foot)]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
\ifin@
@@ -145,8 +144,7 @@
\@ifundefined{MakeMarkcase}{\let\MakeMarkcase\relax}{}}
\DeclareOption{standardstyle}{\def\scrheadings@style{standard}
\@ifundefined{MakeMarkcase}{\let\MakeMarkcase\MakeUppercase}{}}
-\ExecuteOptions{%
-}
+\ExecuteOptions{}
\ProcessOptions\relax
\newif\if@chapter
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -186,7 +184,6 @@
\def@foot#4
}%
}
-
\def\def@head{%
\@ifnextchar(%)
{\def@@head}%
@@ -256,14 +253,12 @@
\newcommand\topfoot@rule[2]{%
\@tempdima\baselineskip\advance\@tempdima by-.7\normalbaselineskip
\advance\@tempdima by -#2
- \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}%
- {footabove}%
+ \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footabove}%
\vskip-\@tempdima}
\newcommand\botfoot@rule[2]{%
\@tempdima-\baselineskip\advance\@tempdima by .3\normalbaselineskip
\advance\@tempdima by #2
- \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}%
- {footbelow}%
+ \vskip\@tempdima\hf@rule{#1}{#2}{\@footwidth}{footbelow}%
}
\newcommand*{\hf@rule}[4]{%
\setlength{\@tempdimb}{#1}
@@ -649,9 +644,7 @@
}
\fi
\providecommand*{\pnumfont}{\normalfont}
-\providecommand*{\headfont}{\normalfont%
- \slshape%
-}
+\providecommand*{\headfont}{\normalfont\slshape}
\def\scr@fnt@wrn@pagehead#1{%
`pagehead' is only an alias of `pageheadfoot'.\MessageBreak
Font of page foot may also be changed%
@@ -988,7 +981,7 @@
\ifcase\@pageat
\lehead[\pagemark]{\pagemark}\lohead[\pagemark]{\pagemark}%
\chead{\rightmark}%
- \rehead{\leftmark}\lohead{\leftmark}%
+ \rehead{\leftmark}\rohead{\leftmark}%
\or
\lehead{\leftmark}\lohead{\leftmark}%
\chead[\pagemark]{\pagemark}%
@@ -1036,10 +1029,22 @@
\ifx\csname sectionmark\endcsname\relax
\ifx\@mkboth\markboth\@automarktrue\fi
\else
- \ifx\sectionmark\@gobble\else\@automarktrue\fi
+ \ifx\sectionmark\@gobble\else
+ \begingroup
+ \def\@gobble#1{}\ifx\sectionmark\@gobble\else
+ \aftergroup\@automarktrue
+ \fi
+ \endgroup
+ \fi
\fi
\else
- \ifx\chaptermark\@gobble\else\@automarktrue\fi
+ \ifx\chaptermark\@gobble\else
+ \begingroup
+ \def\@gobble#1{}\ifx\chaptermark\@gobble\else
+ \aftergroup\@automarktrue
+ \fi
+ \endgroup
+ \fi
\fi
\InputIfFileExists{scrpage.cfg}
{\typeout{*************************************^^J%
@@ -1068,7 +1073,7 @@
into the preamble of your document.\MessageBreak
A better solution would be to use typearea package}%
\fi\fi}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 2273ebb3618..5047dbcbe99 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -1,47 +1,46 @@
%%
%% This is file `scrreprt.cls',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `class,report')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-version.dtx (with options: `class,report')
+%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load,chapter')
-%% scrkcomp.dtx (with options: `class,report,option')
-%% scrkmisc.dtx (with options: `class,report,option')
-%% scrklang.dtx (with options: `class,report,option')
-%% scrkfont.dtx (with options: `class,report,option')
-%% scrktare.dtx (with options: `class,report,option')
-%% scrkpar.dtx (with options: `class,report,option')
-%% scrktitl.dtx (with options: `class,report,option')
-%% scrksect.dtx (with options: `class,report,option')
-%% scrkpage.dtx (with options: `class,report,option')
-%% scrkfloa.dtx (with options: `class,report,option')
-%% scrkftn.dtx (with options: `class,report,option')
-%% scrkliof.dtx (with options: `class,report,option')
-%% scrkbib.dtx (with options: `class,report,option')
-%% scrkidx.dtx (with options: `class,report,option')
-%% scrklist.dtx (with options: `class,report,option')
-%% scrkmisc.dtx (with options: `class,report,execoption')
-%% scrkcomp.dtx (with options: `class,report,body')
-%% scrkfont.dtx (with options: `class,report,body')
-%% scrklang.dtx (with options: `class,report,body')
-%% scrktare.dtx (with options: `class,report,body')
-%% scrkpar.dtx (with options: `class,report,body')
-%% scrktitl.dtx (with options: `class,report,body')
-%% scrksect.dtx (with options: `class,report,body')
-%% scrkmisc.dtx (with options: `class,report,body')
-%% scrkpage.dtx (with options: `class,report,body')
-%% scrkfloa.dtx (with options: `class,report,body')
-%% scrkftn.dtx (with options: `class,report,body')
-%% scrkliof.dtx (with options: `class,report,body')
-%% scrkbib.dtx (with options: `class,report,body')
-%% scrkidx.dtx (with options: `class,report,body')
-%% scrklist.dtx (with options: `class,report,body')
+%% scrkernel-compatibility.dtx (with options: `class,report,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,report,option')
+%% scrkernel-language.dtx (with options: `class,report,option')
+%% scrkernel-fonts.dtx (with options: `class,report,option')
+%% scrkernel-typearea.dtx (with options: `class,report,option')
+%% scrkernel-paragraphs.dtx (with options: `class,report,option')
+%% scrkernel-title.dtx (with options: `class,report,option')
+%% scrkernel-sections.dtx (with options: `class,report,option')
+%% scrkernel-pagestyles.dtx (with options: `class,report,option')
+%% scrkernel-floats.dtx (with options: `class,report,option')
+%% scrkernel-footnotes.dtx (with options: `class,report,option')
+%% scrkernel-listsof.dtx (with options: `class,report,option')
+%% scrkernel-bibliography.dtx (with options: `class,report,option')
+%% scrkernel-index.dtx (with options: `class,report,option')
+%% scrkernel-listsandtabulars.dtx (with options: `class,report,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,report,execoption')
+%% scrkernel-compatibility.dtx (with options: `class,report,body')
+%% scrkernel-fonts.dtx (with options: `class,report,body')
+%% scrkernel-language.dtx (with options: `class,report,body')
+%% scrkernel-typearea.dtx (with options: `class,report,body')
+%% scrkernel-paragraphs.dtx (with options: `class,report,body')
+%% scrkernel-title.dtx (with options: `class,report,body')
+%% scrkernel-sections.dtx (with options: `class,report,body')
+%% scrkernel-miscellaneous.dtx (with options: `class,report,body')
+%% scrkernel-pagestyles.dtx (with options: `class,report,body')
+%% scrkernel-floats.dtx (with options: `class,report,body')
+%% scrkernel-footnotes.dtx (with options: `class,report,body')
+%% scrkernel-listsof.dtx (with options: `class,report,body')
+%% scrkernel-bibliography.dtx (with options: `class,report,body')
+%% scrkernel-index.dtx (with options: `class,report,body')
+%% scrkernel-listsandtabulars.dtx (with options: `class,report,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -73,9 +72,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -95,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -104,20 +103,46 @@
report%
}
\ProvidesClass{\KOMAClassName}[%
- \KOMAScriptVersion\space document class (\ClassName)%
+ 2013/12/19 v3.12 KOMA-Script
+ document class (\ClassName)%
]
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: tocbasic.dtx
-\def\tocbasicversion{2012/04/04 v3.10b}
-\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
-\@tempa
+%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+\RequirePackage{tocbasic}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+\newif\if@scr@emulatestandardclasses
+\let\scr@emulatestandardclassestrue\relax
+\let\scr@emulatestandardclassesfalse\relax
+\DeclareOption{emulatestandardclasses}{%
+ \let\if@scr@emulatestandardclasses\iftrue
+ \KOMAExecuteOptions{%
+ fontsize=10pt,%
+ headings=standardclasses,%
+ cleardoublepage=current
+ }%
+ \newcommand*{\defaultpapersize}{letter}%
+ \AtEndOfClass{%
+ \setkomafont{descriptionlabel}{\bfseries}%
+ \setkomafont{dictum}{\normalfont\small}%
+ \setkomafont{caption}{}%
+ \setkomafont{captionlabel}{}%
+ \setcapindent{0pt}%
+ \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}%
+ \PreventPackageFromLoading{scrpage2}%
+ \setkomafont{pagenumber}{\normalfont}%
+ \setkomafont{pageheadfoot}{\normalfont}%
+ \cfoot[\pagemark]{}%
+ \pagestyle{plain}%
+ }%
+}
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -133,6 +158,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfClass{%
@@ -144,6 +170,7 @@
class.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -193,22 +220,25 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrkmisc.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
- \if@tempswa
- \setlength{\overfullrule}{5pt}%
- \else
- \setlength{\overfullrule}{\z@}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \setlength{\overfullrule}{\z@}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: scrklang.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
}
@@ -219,8 +249,23 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsoleteOption{\PackageInfoNoLine{\KOMAClassName}}%
- {#1#2}{fontsize=#1#2}%
+ \ifstr{#1}{10}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{11}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{12}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \KOMA@UseDeprecatedOption{\PackageWarningNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }%
+ }%
+ }
}{\@headlines}%
}{\@headlines}%
}
@@ -255,8 +300,9 @@
}%
\@tempa
}%
+ \FamilyKeyStateProcessed
}
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -326,7 +372,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -367,82 +413,88 @@
{relative}{10},%
{absolute}{11}%
}{#1}%
- \ifcase\number\@tempa% 0
- \endgroup
- \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 1
- \endgroup
- \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 2
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 3
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 4
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 5
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 6
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .3333\linewidth\@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 7
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .3333\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 8
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 9
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 10
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\par@updaterelative
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\number\@tempa% 0
+ \endgroup
+ \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 1
+ \endgroup
+ \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 2
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 3
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 4
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 5
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 6
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .3333\linewidth\@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 7
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .3333\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 8
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 9
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 10
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\par@updaterelative
- }%
- \or%11
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\relax
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\par@updaterelative
+ \fi
+ \let\default@par@update=\par@updaterelative
+ }%
+ \or%11
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\relax
- }%
- \else% sonst
- \endgroup
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\relax
+ \fi
+ \let\default@par@update=\relax
+ }%
+ \else% should never be
+ \endgroup
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnkownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -453,17 +505,30 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newif\if@titlepage
\@titlepagetrue
-\KOMA@ifkey{titlepage}{@titlepage}%
+\newif\if@titlepageiscoverpage
+\KOMA@key{titlepage}[true]{%
+ \ifstr{#1}{firstiscover}{%
+ \@titlepagetrue
+ \@titlepageiscoverpagetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `firstiscover'}%
+ \KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@titlepageiscoverpagefalse
+ \fi
+ }%
+}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
\newif\if@abstrt\@abstrtfalse
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareStandardOption{abstracton}{abstract=true}
\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newif\if@openright
\@openrightfalse
\KOMA@key{open}{%
@@ -472,15 +537,17 @@
{right}{1},%
{left}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \@openrightfalse
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
- \or
- \@openrighttrue
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
- \or
- \@openrighttrue
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \@openrightfalse
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
+ \or
+ \@openrighttrue
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
+ \or
+ \@openrighttrue
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption{openright}{open=right}
@@ -503,17 +570,19 @@
{noendperiod}{2},{noperiodatend}{2},%
{noenddot}{2},{nodotatend}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\@empty
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhooktrue
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\@empty
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhooktrue
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \fi
\fi
\fi
}
@@ -532,13 +601,16 @@
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
- \if@tempswa
- \def\appendixmore{\@chapterprefixtrue}%
- \else
- \def\appendixmore{\@chapterprefixfalse}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \def\appendixmore{\@chapterprefixtrue}%
+ \else
+ \def\appendixmore{\@chapterprefixfalse}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
@@ -568,76 +640,100 @@
{appendixwithoutprefixline}{9},%
{optiontotocandhead}{10},{optiontoheadandtoc}{10},%
{optiontotoc}{11},%
- {optiontohead}{12}%
+ {optiontohead}{12},%
+ {standardclasses}{13}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2.3\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.725\baselineskip
- \@plus .115\baselineskip \@minus .192\baselineskip}%
- }%
- \renewcommand*{\size@part}{\Huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@chapter}{\huge}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.5\baselineskip
- \@plus .1\baselineskip \@minus .167\baselineskip}%
- }%
- \renewcommand*{\size@part}{\huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@chapter}{\LARGE}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{1.8\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.35\baselineskip
- \@plus 0.09\baselineskip \@minus .15\baselineskip}%
- }%
- \renewcommand*{\size@part}{\LARGE}%
- \renewcommand*{\size@partnumber}{\LARGE}%
- \renewcommand*{\size@chapter}{\Large}%
- \renewcommand*{\size@section}{\large}%
- \renewcommand*{\size@subsection}{\normalsize}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \KOMA@options{open=any}{}%
- \or
- \KOMA@options{open=right}{}%
- \or
- \KOMA@options{open=left}{}%
- \or
- \KOMA@options{chapterprefix=true}{}%
- \or
- \KOMA@options{chapterprefix=false}{}%
- \or
- \KOMA@options{appendixprefix=true}{}%
- \or
- \KOMA@options{appendixprefix=false}{}%
- \or
- \scr@activate@xsection{3}%
- \or
- \scr@activate@xsection{2}%
- \or
- \scr@activate@xsection{1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{2.3\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.725\baselineskip
+ \@plus .115\baselineskip \@minus .192\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\huge}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{2\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.5\baselineskip
+ \@plus .1\baselineskip \@minus .167\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\LARGE}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{1.8\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.35\baselineskip
+ \@plus 0.09\baselineskip \@minus .15\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\LARGE}%
+ \renewcommand*{\size@partnumber}{\LARGE}%
+ \renewcommand*{\size@chapter}{\Large}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\large}%
+ \renewcommand*{\size@subsection}{\normalsize}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \KOMAoptions{open=any}%
+ \or
+ \KOMAoptions{open=right}%
+ \or
+ \KOMAoptions{open=left}%
+ \or
+ \KOMAoptions{chapterprefix=true}%
+ \or
+ \KOMAoptions{chapterprefix=false}%
+ \or
+ \KOMAoptions{appendixprefix=true}%
+ \or
+ \KOMAoptions{appendixprefix=false}%
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{50\p@}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{40\p@}%
+ }%
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\Huge}%
+ \renewcommand*{\size@chapterprefix}{\huge}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \renewcommand*{\sectfont}{\bfseries}%
+ \KOMAoptions{open=right,chapterprefix=true}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
@@ -647,17 +743,29 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \KOMA@options{headinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{headinclude=#1}{}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \KOMA@options{footinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{footinclude=#1,DIV=current}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\@twosidefalse
@@ -673,6 +781,7 @@
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
+ \FamilyKeyStateProcessed
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -680,6 +789,7 @@
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
}%
}{}%
}%
@@ -718,7 +828,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -788,7 +898,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -806,11 +916,13 @@
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
+ \FamilyKeyStateProcessed
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
@@ -833,7 +945,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -847,28 +959,36 @@
{bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},%
{numberedbib}{7},%
{flat}{8},{left}{8},%
- {graduated}{9},{indent}{9},{indented}{9}%
+ {graduated}{9},{indent}{9},{indented}{9},%
+ {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
}{#1}%
- \ifcase \@tempa\relax
- \KOMA@options{index=notoc}{}%
- \or
- \KOMA@options{index=totoc}{}%
- \or
- \KOMA@options{listof=notoc}{}%
- \or
- \KOMA@options{listof=totoc}{}%
- \or
- \KOMA@options{listof=numbered}{}%
- \or
- \KOMA@options{bibliography=nottotoc}{}%
- \or
- \KOMA@options{bibliography=totoc}{}%
- \or
- \KOMA@options{bibliography=totocnumbered}{}%
- \or
- \@toclefttrue
- \or
- \@tocleftfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \KOMAExecuteOptions{index=notoc}%
+ \or
+ \KOMAExecuteOptions{index=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=notoc}%
+ \or
+ \KOMAExecuteOptions{listof=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=numbered}%
+ \or
+ \KOMAExecuteOptions{bibliography=nottotoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \or
+ \@toclefttrue
+ \or
+ \@tocleftfalse
+ \or
+ \setuptoc{toc}{numberline}%
+ \or
+ \unsettoc{toc}{numberline}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat}
@@ -887,86 +1007,104 @@
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
{entryprefix}{6},
- {chapterentry}{7},{withchapterentry}{7},%
- {nochaptergap}{8},{ignorechapter}{8},%
- {chaptergapsmall}{9},{smallchaptergap}{9},%
- {chaptergapline}{10},{onelinechaptergap}{10}%
+ {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
+ {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
+ {chapterentry}{9},{withchapterentry}{9},%
+ {nochaptergap}{10},{ignorechapter}{10},%
+ {chaptergapsmall}{11},{smallchaptergap}{11},%
+ {chaptergapline}{12},{onelinechaptergap}{12}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\float@@listhead}{%
- \chapter*
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \or% totoc
- \renewcommand*{\float@@listhead}{%
- \addchap
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% numbered
- \renewcommand*{\float@@listhead}{%
- \chapter
- }%
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% flat
- \@dynlisttrue
- \or% graduated
- \@dynlistfalse
- \or% leveldown
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \or% entryprefix
- \@dynlisttrue
- \doforeachtocfile[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\float@@listhead}{%
+ \chapter*
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \or% totoc
+ \renewcommand*{\float@@listhead}{%
+ \addchap
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% numbered
+ \renewcommand*{\float@@listhead}{%
+ \chapter
+ }%
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% flat
+ \@dynlisttrue
+ \or% graduated
+ \@dynlistfalse
+ \or% leveldown
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \AtAddToTocList[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \or% chapterentry
- \KOMA@options{chapteratlists=entry}{}%
- \or% chaptergap
- \KOMA@options{chapteratlists=\z@}{}%
- \or% chaptergapsmall
- \KOMA@options{chapteratlists=10\p@}{}%
- \or% chaptergapline
- \KOMA@options{chapteratlists=\baselineskip}{}%
+ \or% numberline
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }
+ \or% nonumberline
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }
+ \or% chapterentry
+ \KOMAExecuteOptions{chapteratlists=entry}%
+ \or% chaptergap
+ \KOMAExecuteOptions{chapteratlists=\z@}%
+ \or% chaptergapsmall
+ \KOMAExecuteOptions{chapteratlists=10\p@}%
+ \or% chaptergapline
+ \KOMAExecuteOptions{chapteratlists=\baselineskip}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
@@ -982,7 +1120,8 @@
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
}%
}
-%%% From File: scrkbib.dtx
+\BeforeTOCHead{\@chaptertolistsfalse}
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1035,43 +1174,76 @@
}
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
-}
+ \ifbib@leveldown
+ \section*{\bibname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \else
+ \chapter*{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
+}%
+\newif\ifbib@leveldown
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
- \let\FamilyElseValues\scr@bibstylelist
\KOMA@set@ncmdkey{bibliography}{@tempa}{%
{notoc}{0},{nottotoc}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
{numbered}{2},{totocnumbered}{2},{tocnumbered}{2},{numberedtotoc}{2},%
- {numberedtoc}{2}%
+ {numberedtoc}{2},%
+ {leveldown}{3},%
+ {standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \ifbib@leveldown
+ \section*{\bibname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \else
+ \chapter*{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
}%
\or% totoc
\renewcommand*\bib@heading{%
- \addchap{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \ifbib@leveldown
+ \addsec{\bibname}
+ \else
+ \if@chaptertolists
+ \@chaptertolistsfalse\addchap{\bibname}\@chaptertoliststrue
+ \else
+ \addchap{\bibname}
+ \fi
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
}%
\or% numbered
\renewcommand*\bib@heading{%
- \chapter{\bibname}%
- \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
- {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \ifbib@leveldown
+ \section{\bibname}%
+ \else
+ \if@chaptertolists
+ \@chaptertolistsfalse\chapter{\bibname}\@chaptertoliststrue
+ \else
+ \chapter{\bibname}
+ \fi
+ \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
+ {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \fi
}
+ \or% leveldown
+ \bib@leveldowntrue
+ \or% standardlevel
+ \bib@leveldownfalse
\fi
}{%
\csname scr@bibstyle@#1\endcsname
+ \FamilyKeyStateProcessed
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\idx@@heading}{%
\chapter*
}
@@ -1080,26 +1252,63 @@
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\idx@@heading}{%
- \chapter*
- }%
- \or
- \renewcommand*{\idx@@heading}{%
- \addchap
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\idx@@heading}{%
+ \chapter*
+ }%
+ \or
+ \renewcommand*{\idx@@heading}{%
+ \addchap
+ }%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: scrklist.dtx
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: scrkcomp.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+\newcommand*\scr@setlength[4]{%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \else
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
@@ -1123,12 +1332,20 @@
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\normalsize{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1140,12 +1357,20 @@
}%
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\small{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
@@ -1157,12 +1382,20 @@
}%
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\footnotesize{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1215,29 +1448,37 @@
{\the\@tempdima}{\the\@tempdimb}%
}%
\normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \fi
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1250,9 +1491,16 @@
\if@tempswa\noexpand\@list@extra\fi
}%
\let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1264,9 +1512,16 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1278,8 +1533,15 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1292,8 +1554,13 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1303,7 +1570,7 @@
\labelwidth=\dimexpr \leftmargin-\labelsep
\topsep \the\topsep
\parsep \z@
- \partopsep \the\parsep
+ \partopsep \the\partopsep
\itemsep \topsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1313,7 +1580,7 @@
\csname @listiv\endcsname
\endgroup
\edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1322,7 +1589,7 @@
\csname @listv\endcsname
\endgroup
\edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1331,15 +1598,36 @@
\csname @listvi\endcsname
\endgroup
\edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@listi
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1365,23 +1653,61 @@
}%
}%
}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
-\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
+\newcommand*{\scr@DeclareOldFontCommand}[3]{%
+ \DeclareRobustCommand #1{\@fontswitch {%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#2}'%
+ }%
+ #2%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#3}'%
+ }%
+ #3%
+ }%
+ }%
+}
+\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\scr@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\scr@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\scr@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\scr@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\scr@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\scr@DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: scrklang.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
\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: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1392,7 +1718,40 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: scrkpar.dtx
+\if@scr@emulatestandardclasses
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f@size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f@size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if@twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
+ \else
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
+ \fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved@a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved@a
+ \fi
+\fi
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1520,7 +1879,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -1553,13 +1912,60 @@
\newcommand{\dedication}[1]{\gdef\@dedication{%
#1%
}}%
-\newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}%
+\newcommand*{\next@tpage}{%
+ \@thanks\global\let\@thanks\@empty
+ \clearpage
+ \csname titlepage@restore\endcsname
+ \thispagestyle{empty}%
+ \let\footnote\thanks
+ \setcounter{footnote}{0}%
+}
+\newcommand*{\next@tdpage}{%
+ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi
+}
\newcommand*\maketitle[1][1]{%
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \else
+ \def\and{%
+ \end{tabular}%
+ \hskip 1em \@plus.17fil%
+ \begin{tabular}[t]{c}%
+ }%
+ \fi
\if@titlepage
\begin{titlepage}
\setcounter{page}{%
#1%
}%
+ \if@titlepageiscoverpage
+ \edef\titlepage@restore{%
+ \noexpand\endgroup
+ \noexpand\global\noexpand\@colht\the\@colht
+ \noexpand\global\noexpand\@colroom\the\@colroom
+ \noexpand\global\vsize\the\vsize
+ \noexpand\global\noexpand\@titlepageiscoverpagefalse
+ \noexpand\let\noexpand\titlepage@restore\noexpand\relax
+ }%
+ \begingroup
+ \topmargin=\dimexpr \coverpagetopmargin-1in\relax
+ \oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \textwidth=\dimexpr
+ \paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
+ \textheight=\dimexpr
+ \paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
+ \headheight=0pt
+ \headsep=0pt
+ \footskip=\baselineskip
+ \@colht=\textheight
+ \@colroom=\textheight
+ \vsize=\textheight
+ \columnwidth=\textwidth
+ \hsize=\columnwidth
+ \linewidth=\hsize
+ \else
+ \let\titlepage@restore\relax
+ \fi
\let\footnotesize\small
\let\footnoterule\relax
\let\footnote\thanks
@@ -1567,53 +1973,69 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoubleemptypage
- \thispagestyle{empty}%
+ \noindent\@extratitle\next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}%
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null\vfill
\begin{center}
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}%
+ {\usekomafont{subject}{\@subject\par}}%
\vskip 3em
\fi
- {\titlefont\huge \@title\par}%
+ {\usekomafont{title}{\huge \@title\par}}%
\vskip 1em
- {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
\vskip 2em
- {\Large \lineskip 0.75em
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip 0.75em
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1.5em
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus3fill
- {\Large \@publishers \par}%
+ {\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks
+ \@thanks\let\@thanks\@empty
\vfill\null
- \if@twoside\next@tpage
- \begin{minipage}[t]{\textwidth}
- \@uppertitleback
- \end{minipage}\par
- \vfill
- \begin{minipage}[b]{\textwidth}
- \@lowertitleback
- \end{minipage}
+ \if@twoside
+ \@tempswatrue
+ \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
+ \else
+ \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
+ \@tempswafalse
+ \fi\fi
+ \fi
+ \if@tempswa
+ \next@tpage
+ \begin{minipage}[t]{\textwidth}
+ \@uppertitleback
+ \end{minipage}\par
+ \vfill
+ \begin{minipage}[b]{\textwidth}
+ \@lowertitleback
+ \end{minipage}\par
+ \@thanks\let\@thanks\@empty
+ \fi
\fi
- \ifx\@dedication\@empty \else
- \next@tpage\null\vfill
- {\centering \Large \@dedication \par}%
+ \ifx\@dedication\@empty
+ \else
+ \next@tdpage\null\vfill
+ {\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoubleemptypage \fi
+ \@thanks\let\@thanks\@empty
+ \cleardoubleemptypage
\fi
+ \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
\end{titlepage}
\else
\par
@@ -1627,92 +2049,115 @@
}%
\fi
\begingroup
+ \let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
+ \@makeextratitle
+ \next@tdpage
\@maketitle
\else
+ \ifx\@extratitle\@empty\else
+ \twocolumn[\@makeextratitle]\next@tdpage
+ \fi
\twocolumn[\@maketitle]%
\fi
\else
- \newpage
- \global\@topnum\z@
+ \@makeextratitle
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
\endgroup
\fi
\setcounter{footnote}{0}%
- \let\thanks\relax
- \let\maketitle\relax
- \let\@maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@author\@empty
- \global\let\@date\@empty
- \global\let\@title\@empty
- \global\let\@subtitle\@empty
- \global\let\@extratitle\@empty
- \global\let\@titlehead\@empty
- \global\let\@subject\@empty
- \global\let\@publishers\@empty
- \global\let\@uppertitleback\@empty
- \global\let\@lowertitleback\@empty
- \global\let\@dedication\@empty
- \global\let\author\relax
- \global\let\title\relax
- \global\let\extratitle\relax
- \global\let\titlehead\relax
- \global\let\subject\relax
- \global\let\publishers\relax
- \global\let\uppertitleback\relax
- \global\let\lowertitleback\relax
- \global\let\dedication\relax
- \global\let\date\relax
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \let\thanks\relax
+ \let\maketitle\relax
+ \let\@maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@date\@empty
+ \global\let\@title\@empty
+ \global\let\@subtitle\@empty
+ \global\let\@extratitle\@empty
+ \global\let\@titlehead\@empty
+ \global\let\@subject\@empty
+ \global\let\@publishers\@empty
+ \global\let\@uppertitleback\@empty
+ \global\let\@lowertitleback\@empty
+ \global\let\@dedication\@empty
+ \global\let\author\relax
+ \global\let\title\relax
+ \global\let\extratitle\relax
+ \global\let\titlehead\relax
+ \global\let\subject\relax
+ \global\let\publishers\relax
+ \global\let\uppertitleback\relax
+ \global\let\lowertitleback\relax
+ \global\let\dedication\relax
+ \global\let\date\relax
+ \fi
\global\let\and\relax
}%
-\newcommand*{\@maketitle}{%
- \clearpage
- \let\footnote\thanks
+\newcommand*{\@makeextratitle}{%
+ \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+ \noindent\@extratitle \next@tdpage
\fi
+}
+\newcommand*{\@maketitle}{%
+ \next@tdpage
+ \global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null
\vskip 2em%
\begin{center}%
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}
+ {\usekomafont{subject}{\@subject \par}}%
\vskip 1.5em
\fi
- {\titlefont\huge \@title \par}%
+ {\usekomafont{title}{\huge \@title \par}}%
\vskip .5em
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
\vskip 1em
- {\Large
- \lineskip .5em%
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip .5em%
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1em%
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus 1em
- {\Large \@publishers \par}
+ {\usekomafont{publishers}{\@publishers \par}}%
\ifx\@dedication\@empty \else
\vskip 2em
- {\Large \@dedication \par}
+ {\usekomafont{dedication}{\@dedication \par}}%
\fi
\end{center}%
\par
\vskip 2em
}%
+\newcommand*{\coverpagetopmargin}{%
+ \dimexpr \topmargin+1in\relax
+}
+\newcommand*{\coverpagebottommargin}{%
+ 2\dimexpr\coverpagetopmargin\relax
+}
+\newcommand*{\coverpageleftmargin}{%
+ \dimexpr \evensidemargin+1in\relax
+}
+\newcommand*{\coverpagerightmargin}{\coverpageleftmargin}
\newenvironment{titlepage}{%
\cleardoublepage
\if@twocolumn
@@ -1730,6 +2175,11 @@
\newcommand*\titlefont{\sectfont}%
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}%
\newkomafont{subtitle}{\usekomafont{title}\large}%
+\newkomafont{titlehead}{}%
+\newkomafont{author}{\Large}
+\newkomafont{date}{\Large}
+\newkomafont{publishers}{\Large}
+\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
\newenvironment{abstract}{%
@@ -1765,7 +2215,7 @@
\if@twocolumn\else\endquotation\fi
\fi
}
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newcommand*\appendix{\par%
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -1774,6 +2224,20 @@
\csname appendixmore\endcsname
}
\newcommand*\chaptermark[1]{}
+\newcommand*\addchapmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=\m@ne
+ \chaptermark{#1}%
+ \endgroup
+}
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
+}
\newif\if@altsecnumformat\@altsecnumformatfalse
\newif\if@autodot
\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
@@ -1926,6 +2390,37 @@
\fi\fi}
\newcommand*\autodot{\if@altsecnumformat.\fi}
\setcounter{secnumdepth}{2}
+\newcommand*{\partnumdepth}{%
+ \m@ne
+}
+\newcommand*{\chapternumdepth}{\z@}
+\newcommand*{\sectionnumdepth}{\@ne}
+\newcommand*{\subsectionnumdepth}{\tw@}
+\newcommand*{\subsubsectionnumdepth}{\thr@@}
+\newcommand*{\paragraphnumdepth}{4}
+\newcommand*{\subparagraphnumdepth}{5}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
+}
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
+}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -2029,26 +2524,26 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >-2\relax
+ \ifnumbered{part}{%
\refstepcounter{part}%
\@maybeautodot\thepart%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{\thepart}{\scr@ds@tocentry}%
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{}{\scr@ds@tocentry}%
\fi
- \fi
+ }%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\interlinepenalty \@M
\normalfont\sectfont\nobreak
- \ifnum \c@secnumdepth >-2\relax
+ \ifnumbered{part}{%
\size@partnumber{\partformat}%
\partheadmidvskip
- \fi
+ }{}%
\size@part{#2}\strut
\ifx\partmark\@gobble
\@mkboth{}{}\par
@@ -2190,61 +2685,18 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >\m@ne
+ \ifnumbered{chapter}{%
\refstepcounter{chapter}%
\@maybeautodot\thechapter
\typeout{\@chapapp\space\thechapter.}%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
- \fi
+ }%
\expandafter\chaptermark\expandafter{\scr@ds@head}%
\ifdim \@chapterlistsgap>\z@
\doforeachtocfile{%
@@ -2282,7 +2734,8 @@
\else
\let\@tempa\@hangfrom
\fi
- \@tempa{\ifnum \c@secnumdepth >\m@ne%
+ \@tempa{%
+ \ifnumbered{chapter}{%
\if@chapterprefix
\expandafter\size@chapterprefix
\else
@@ -2292,13 +2745,21 @@
\if@chapterprefix
\size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
\fi
- \fi
+ }{}%
}%
{\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}%
\nobreak\chapterheadendvskip
}
\newcommand*{\addchaptertocentry}[2]{%
\addtocentrydefault{chapter}{#1}{#2}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addxcontentsline{\@currext}{chapteratlist}[{#1}]{#2}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{\scr@float@addtolists@warning}%
+ \fi
}
\newcommand*{\@schapter}[1]{%
\if@twocolumn
@@ -2354,26 +2815,6 @@
\@schapter{#2}%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
\ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax
\ifdim \@chapterlistsgap>\z@
@@ -2388,15 +2829,9 @@
}%
\fi
\fi
- \if@twoside
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \else
- \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
- \fi
+ \addchapmark{\scr@ds@head}%
}%
-\newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}}%
+\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
\newcommand*\addsec{\secdef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
@@ -2421,14 +2856,9 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \if@twoside
- \ifx\@mkboth\markboth
- \expandafter\markright\expandafter{%
- \expandafter\MakeMarkcase{\scr@ds@head}}%
- \fi
- \fi
+ \addsecmark{\scr@ds@head}%
}
-\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newcommand*{\addsectiontocentry}[2]{%
\addtocentrydefault{section}{#1}{#2}%
}
@@ -2441,14 +2871,16 @@
\newcommand*{\addsubparagraphtocentry}[2]{%
\addtocentrydefault{subparagraph}{#1}{#2}%
}
-\newcommand\section{\@startsection{section}{1}{\z@}%
+\newcommand\section{%
+ \@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
-\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\newcommand\subsection{%
+ \@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2456,7 +2888,8 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
-\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\newcommand\subsubsection{%
+ \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2464,12 +2897,14 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
-\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\paragraph{%
+ \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
-\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+\newcommand\subparagraph{%
+ \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
@@ -2487,7 +2922,6 @@
\let\raggedsection\raggedright
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
-\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
\newkomafont{chapterentry}{\usekomafont{disposition}}
@@ -2537,9 +2971,15 @@
\if \@tempa u%
\set@preamble@vpos{0}{#2}%
\fi%
+ \if \@tempa b%
+ \set@preamble@vpox{0}{#2}%
+ \fi
\if \@tempa o%
\set@preamble@vpos{1}{#2}%
\fi%
+ \if \@tempa t%
+ \set@preamble@vpos{1}{#2}%
+ \fi
}%
\@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
\@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
@@ -2577,9 +3017,9 @@
\ClassError{\KOMAClassName}{%
inconsistent hpos options%
}{%
- You said `#2' as position option. But you have
+ You've said `#2' as position option. But you have
to\MessageBreak
- use only one from `l', `r' or `c' not two of
+ use only one of `l', `r', or `c' not two of
these.\MessageBreak
If you'll continue only first hpos option will be
used%
@@ -2595,9 +3035,9 @@
\ClassError{\KOMAClassName}{%
inconsistent vpos options%
}{%
- You said `#2' as position option. But you have
+ You've said `#2' as position option. But you have
to\MessageBreak
- use only one from `o' or `u' not two of
+ use only one of `t', `o', `b', or `u' not two of
these.\MessageBreak
If you'll continue only first vpos option will be
used%
@@ -2703,7 +3143,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -2776,7 +3216,37 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: scrkpage.dtx
+\newcommand*{\scr@package@not@recommended}[2]{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
+ }%
+}
+\scr@package@not@recommended{emptypage}{%
+ option\MessageBreak
+ `cleardoublepage' with one of it's\MessageBreak
+ several values}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{fancyhdr}{%
+ \MessageBreak
+ package `scrpage2' or `scrlayer-scrpage'}
+\scr@package@not@recommended{titlesec}{%
+ the package only\MessageBreak
+ if you really need it, because it breaks several\MessageBreak
+ KOMA-Script features, i.e., option `headings' and\MessageBreak
+ the extended optional argument of the section\MessageBreak
+ commands
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2833,15 +3303,14 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\ifnum \c@secnumdepth >\m@ne
+ {\MakeMarkcase{\ifnumbered{chapter}{%
\chaptermarkformat
- \fi
- ##1}}{}%
+ }{}##1}%
+ }{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside
- \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\z@
- \sectionmarkformat\fi
+ \markright{\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}%
##1}}%
\fi
}%
@@ -2886,7 +3355,7 @@
\else
\onecolumn
\fi
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -3219,8 +3688,8 @@
\let\scr@tmp@footnotetext=\@footnotetext
\let\@footnotetext=\@gobble
\sbox\@tempboxa{%
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
#3\unskip\strut}}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
@@ -3236,23 +3705,25 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}}%
+ {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
{#3\unskip\strut\par}}}%
\else%
\ifdim\cap@indent<\z@
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
\else%
\if@capbreak
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
\else
- {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ {{\usekomafont{captionlabel}{%
+ #2\captionformat}}}}#3\unskip\strut\par}}}%
\fi
\fi
\fi
@@ -3269,11 +3740,12 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}%
+ {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
#3}}%
}%
- {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
+ {\usesizeofkomafont{caption}{%
+ \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
\fi
\endgroup
}
@@ -3393,14 +3865,14 @@
\newenvironment{figure}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@float{figure}%
+ \@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@dblfloat{figure}%
+ \@dblfloat{figure}%
}{%
\end@dblfloat
}
@@ -3431,7 +3903,7 @@
}{%
\end@dblfloat
}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -3569,7 +4041,7 @@
\endgroup
\@footnotemark
}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -3578,12 +4050,14 @@
}
\renewcommand*{\numberline}[1]{%
\numberline@box{%
- \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ \numberline@prefix
+ \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
+ \numberline@postfix
}%
}
\newcommand*{\numberline@prefix}{}
\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
@@ -3648,11 +4122,7 @@
\begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup
}
\newcommand{\addtocentrydefault}[3]{%
- \ifstr{#2}{}{%
- \addcontentsline{toc}{#1}{#3}%
- }{%
- \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}%
- }%
+ \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}%
}
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
@@ -3668,21 +4138,34 @@
}
\newcommand*{\scr@float@listhead@warning}{%
\ClassWarning{\KOMAClassName}{%
- Usage of deprecated \string\float@listhead!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@listhead.\MessageBreak
- Definition of \string\float@listhead\space my be removed from\MessageBreak
- `\KOMAClassName' soon, so it should not be used
+ \string\float@listhead\space detected!\MessageBreak
+ Implementation of \string\float@listhead\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Maybe implementation of \string\float@listhead\space will\MessageBreak
+ be removed from KOMA-Script soon.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@listhead\space interface
}%
}
\newcommand*{\scr@float@addtolists@warning}{%
\ClassWarningNoLine{\KOMAClassName}{%
\string\float@addtolists\space detected!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@addtolists.\MessageBreak
- Support for \string\float@addtolists\space may be removed
- from\MessageBreak
- `\KOMAClassName' soon
+ Implementation of \string\float@addtolist\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Since Version 3.12 support for deprecated\MessageBreak
+ \string\float@addtolist\space interface has been\MessageBreak
+ restricted to only some of the KOMA-Script\MessageBreak
+ features and been removed from others.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@addtolist\space interface
}%
\global\let\scr@float@addtolists@warning\relax
}
@@ -3696,7 +4179,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: scrkbib.dtx
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -3781,13 +4264,15 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
\newcommand*{\idx@heading}{%
\if@openright\cleardoublepage\else\clearpage\fi%
- \twocolumn[\idx@@heading{\indexname}]%
+ \twocolumn[%
+ \@chaptertolistsfalse
+ \idx@@heading{\indexname}]%
\@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
}
\newenvironment{theindex}{%
@@ -3814,7 +4299,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: scrklist.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -3919,8 +4404,22 @@
\newenvironment{addmargin*}{%
\@tempswafalse
\if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \ClassWarning{\KOMAClassName}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\advance\@listdepth\@ne
\endlist
}
@@ -3951,7 +4450,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index b51cc2cfd6e..3ecc4041cff 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -1,15 +1,14 @@
%%
%% This is file `scrsize10pt.clo',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `clo,10pt')
-%% scrkfont.dtx (with options: `clo,10pt')
-%% scrkpar.dtx (with options: `clo,10pt')
+%% scrkernel-version.dtx (with options: `clo,10pt')
+%% scrkernel-fonts.dtx (with options: `clo,10pt')
+%% scrkernel-paragraphs.dtx (with options: `clo,10pt')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesFile{%
scrsize10pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -150,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{@list@extra}{}{%
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index 257f0b597d2..b2503e2997d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -1,15 +1,14 @@
%%
%% This is file `scrsize11pt.clo',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `clo,11pt')
-%% scrkfont.dtx (with options: `clo,11pt')
-%% scrkpar.dtx (with options: `clo,11pt')
+%% scrkernel-version.dtx (with options: `clo,11pt')
+%% scrkernel-fonts.dtx (with options: `clo,11pt')
+%% scrkernel-paragraphs.dtx (with options: `clo,11pt')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesFile{%
scrsize11pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -150,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{@list@extra}{}{%
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index 4828563d507..b049b3438de 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -1,15 +1,14 @@
%%
%% This is file `scrsize12pt.clo',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `clo,12pt')
-%% scrkfont.dtx (with options: `clo,12pt')
-%% scrkpar.dtx (with options: `clo,12pt')
+%% scrkernel-version.dtx (with options: `clo,12pt')
+%% scrkernel-fonts.dtx (with options: `clo,12pt')
+%% scrkernel-paragraphs.dtx (with options: `clo,12pt')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,9 +40,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -63,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -150,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{@list@extra}{}{%
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index 865a709066c..f0dcf27ebb3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -1,18 +1,17 @@
%%
%% This is file `scrtime.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,scrtime')
+%% scrkernel-version.dtx (with options: `package,scrtime')
%% scrtime.dtx (with options: `package,scrtime,identify')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `load')
%% scrtime.dtx (with options: `package,scrtime,option')
%% scrtime.dtx (with options: `package,scrtime,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,9 +43,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -66,21 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrtime.dtx
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- \KOMAScriptVersion\space package (%
- time of LaTeX run)]
-%%% From File: scrkbase.dtx
+ 2011/03/31 v3.08b KOMA-Script package
+ (time of LaTeX run)%
+]
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: scrtime.dtx
+%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
\newif\if@Hxii
\KOMA@ifkey{12h}{@Hxii}
\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
\KOMAProcessOptions\relax
-%%% From File: scrtime.dtx
+%%% From File: $Id: scrtime.dtx 1383 2013-10-01 15:44:28Z mjk $
\def\thistime{%
\@ifstar
{\let\@tempif\iffalse\@thistime}
@@ -94,7 +94,7 @@
\the\@tempcnta{#1}\@tempif\ifnum\@tempcntb<10 0\fi\fi\the\@tempcntb%
\endgroup}
\newcommand*{\settime}[1]{\renewcommand*{\@thistime}[1][]{#1}}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
index 177de6fea03..005d3113d67 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
@@ -7,7 +7,7 @@
%% scrwfile.dtx (with options: `package,trace,scrwfile,identify,option,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2010-2012 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2010-2013 by Markus Kohm <komascript(at)gmx.info>
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,10 +44,10 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: scrwfile.dtx
+%%% From File: $Id: scrwfile.dtx 1562 2013-12-19 07:51:16Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrwfile}
- [2012/03/05 v0.1d-alpha LaTeX2e KOMA-Script package (write and clone files)]
+ [2013/08/05 v0.1f-alpha LaTeX2e KOMA-Script package (write and clone files)]
\PackageWarningNoLine{scrwfile}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
@@ -143,8 +143,44 @@
\fi
}
\newcommand*{\scrwfile@saved@starttoc}{}
-\let\scrwfile@saved@starttoc\@starttoc
-\let\@starttoc\scrwfile@starttoc
+\AtBeginDocument{%
+ \begingroup
+ \@ifpackageloaded{hyperref}{%
+ \scr@ifundefinedorrelax{Hy@AtBeginDocument}{%
+ \PackageWarning{scrwfile}{%
+ Incompatible `hyperref` package detected!\MessageBreak
+ You are using a `hyperref` version, that\MessageBreak
+ doesn't provide `\string\Hy@AtBeginDocument`.\MessageBreak
+ This may or may not work.\MessageBreak
+ Using immediate redefinition%
+ }%
+ \aftergroup\@firstofone
+ }{%
+ \def\reserved@a{\AtBeginDocument}%
+ \ifx\Hy@AtBeginDocumentHook\@undefined
+ \PackageInfo{scrwfile}{%
+ Using immediate redefinition%
+ }%
+ \aftergroup\@firstofone
+ \else
+ \PackageInfo{scrwfile}{%
+ Using `\string\Hy@AtBeginDocument`%
+ }%
+ \aftergroup\Hy@AtBeginDocument
+ \fi
+ }%
+ }{%
+ \aftergroup\@firstofone
+ }%
+ \endgroup
+ {%
+ \PackageInfo{scrwfile}{%
+ Extending `\string\@starttoc`
+ }%
+ \let\scrwfile@saved@starttoc\@starttoc
+ \let\@starttoc\scrwfile@starttoc
+ }%
+}
\newcommand*{\scrwfile@process@clones}[1]{%
\scr@ifundefinedorrelax{scrwfile@clone@#1}{}{%
\begingroup
@@ -202,7 +238,7 @@
\iftocfeature{#2}{totoc}{\setuptoc{#3}{totoc}}{}%
}%
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 79e6fe43728..2a782c7d570 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -1,50 +1,51 @@
%%
%% This is file `tocbasic.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
%% tocbasic.dtx (with options: `package')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 2008-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
%%
-%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, version 1.3c of the license.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later and of this work.
+%% 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 work has the LPPL maintenance status "author-maintained".
+%% 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 Current Maintainer and author of this work is Markus Kohm.
+%% 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.
%%
-%% This file may only be distributed together with the files
-%% `scrlogo.dtx' and `tocbasic.dtx'. You may however distribute the files
-%% `scrlogo.dtx' and `tocbasic.dtx' without this file.
-%% See also `tocbasic.dtx' 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.
%%
-%% If this file is a beta version, you are not allowed to distribute it.
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
%%
-%% Currently there is only a short english manual at `tocbasic.dtx', that
-%% should also be found as `tocbasic.pdf'.
+%% See `README'.
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
-%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996.
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: tocbasic.dtx
-\def\tocbasicversion{2012/04/04 v3.10b}
-\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\ProvidesPackage{tocbasic}
- [\tocbasicversion\space KOMA-Script package
- (handling toc-files)%
- ]
+%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{tocbasic}[%
+ 2013/12/19 v3.12 KOMA-Script
+ package
+ (handling toc-files)%
+]
\ProcessOptions\relax
\RequirePackage{keyval}
\newcommand*{\tb@listoftocs}{}
@@ -225,6 +226,50 @@
\newcommand{\@@addcontentslinetoeachtocfile}[2]{%
\doforeachtocfile{\addcontentsline{\@currext}{#1}{#2}}%
}
+\newcommand*{\addxcontentsline}[2]{%
+ \@ifnextchar [%]
+ {\@addxcontentsline{#1}{#2}}%
+ {\@addxcontentsline{#1}{#2}[]}%
+}
+\newcommand*{\@addxcontentsline}{}
+\def\@addxcontentsline#1#2[#3]#4{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname add#2#1entry\endcsname\relax
+ \tocbasic@addxcontentsline{#1}{#2}{#3}{#4}%
+ \else
+ \@nameuse{add#2#1entry}{#3}{#4}%
+ \fi
+}
+\newcommand*{\nonumberline}{}%
+\newcommand*{\tocbasic@addxcontentsline}[4]{%
+ \if\relax\detokenize{#3}\relax
+ \addcontentsline{#1}{#2}{\protect\nonumberline#4}%
+ \else
+ \addcontentsline{#1}{#2}{\protect\numberline{#3}#4}%
+ \fi
+}
+\newcommand{\addxcontentslinetoeachtocfile}{%
+ \@ifnextchar [%]
+ \@addxcontentslinetoeachtocfile\@@addxcontentslinetoeachtocfile
+}
+\newcommand{\@addxcontentslinetoeachtocfile}[2][]{%
+ \@ifnextchar [%]
+ {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}}%
+ {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}[]}
+}
+\newcommand*{\@@@addxcontentslinetoeachtocfile}{}
+\def\@@@addxcontentslinetoeachtocfile[#1]#2[#3]#4{%
+ \doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[#3]{#4}}%
+}
+\newcommand{\@@addxcontentslinetoeachtocfile}[1]{%
+ \@ifnextchar [%]
+ {\@@@@addxcontentslinetoeachtocfile{#1}}%
+ {\@@@@addxcontentslinetoeachtocfile{#1}[]}%
+}
+\newcommand*{\@@@@addxcontentslinetoeachtocfile}{}
+\def\@@@@addxcontentslinetoeachtocfile#1[#2]#3{%
+ \doforeachtocfile{\addxcontentsline{\@currext}{#1}[{#2}]{#3}}%
+}
\newcommand*{\tocbasic@starttoc}[1]{%
\begingroup
\setlength{\parskip}{\z@}%
@@ -291,6 +336,7 @@
\fi
}%
}{}%
+ \iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}%
\tocbasic@listhead{#1}%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname microtypesetup\endcsname\relax
@@ -326,7 +372,7 @@
\subsection*{##1}%
\ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
\iftocfeature{\@currext}{totoc}{%
- \addcontentsline{toc}{subsection}{##1}%
+ \addxcontentsline{toc}{subsection}{##1}%
}{}%
}%
}{%
@@ -336,7 +382,7 @@
\section*{##1}%
\@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
\iftocfeature{\@currext}{totoc}{%
- \addcontentsline{toc}{section}{##1}%
+ \addxcontentsline{toc}{section}{##1}%
}{}%
}%
}%
@@ -349,7 +395,7 @@
}{%
\section*{##1}%
\iftocfeature{\@currext}{totoc}{%
- \addcontentsline{toc}{section}{##1}%
+ \addxcontentsline{toc}{section}{##1}%
}{}%
\ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
}%
@@ -360,7 +406,7 @@
\chapter*{##1}%
\@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
\iftocfeature{\@currext}{totoc}{%
- \addcontentsline{toc}{chapter}{##1}%
+ \addxcontentsline{toc}{chapter}{##1}%
}{}%
}%
}%
@@ -496,10 +542,10 @@
\tb@ifvalueisnotempty{floatpos}{#1}{\edef\tb@nt@floatpos{#1}}%
}
\define@key{tocbasic}{atbegin}{%
- \tb@ifvalueisnotempty{atbegin}{#1}{\def\tb@nt@atbegin{#1}}%
+ \def\tb@nt@atbegin{#1}%
}
\define@key{tocbasic}{atend}{%
- \tb@ifvalueisnotempty{atend}{#1}{\def\tb@nt@atend{#1}}%
+ \def\tb@nt@atend{#1}%
}
\newcommand*{\DeclareNewTOC}[2][]{%
\tb@floatfalse
@@ -549,6 +595,9 @@
\noexpand\@dottedtocline{\tb@nt@level}{\tb@nt@indent}{\tb@nt@hang}%
}%
}\@tempa
+ \@ifundefined{listof\tb@nt@ext entryname}{%
+ \expandafter\let\csname listof\tb@nt@ext entryname\endcsname\tb@nt@name
+ }{}%
\begingroup\edef\@tempa{\endgroup
\noexpand\newcommand*\csname setup\tb@nt@types\endcsname{%
\noexpand\setuptoc{\tb@nt@ext}%
@@ -557,17 +606,20 @@
\@tempswafalse
\iftb@float
\expandafter\newcommand\expandafter*\csname fps@\tb@nt@type\expandafter
- \endcsname{\tb@nt@floatpos}%
+ \endcsname\expandafter{\tb@nt@floatpos}%
\expandafter\newcommand\expandafter*\csname ftype@\tb@nt@type\expandafter
- \endcsname{\tb@nt@floattype}%
+ \endcsname\expandafter{\tb@nt@floattype}%
\begingroup
\edef\@tempa{%
\noexpand\endgroup
\noexpand\newenvironment{\tb@nt@type}{%
\noexpand\@ifnextchar[%]
{\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}}%
- {\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}%
- [\expandafter\noexpand\csname fps@\tb@nt@type\endcsname]}%
+ {\noexpand\edef\noexpand\reserved@a{%
+ \noexpand\noexpand\noexpand\tb@atbegin@after
+ \noexpand\noexpand\noexpand\@float{\tb@nt@type}%
+ [\noexpand\csname fps@\tb@nt@type\noexpand\endcsname]}%
+ \noexpand\reserved@a}%
}{%
\noexpand\csname \tb@nt@type @atend\noexpand\endcsname
\noexpand\end@float
@@ -575,8 +627,11 @@
\noexpand\newenvironment{\tb@nt@type*}{%
\noexpand\@ifnextchar[%]
{\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}}%
- {\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}%
- [\expandafter\noexpand\csname fps@\tb@nt@type\endcsname]}%
+ {\noexpand\edef\noexpand\reserved@a{%
+ \noexpand\noexpand\noexpand\tb@atbegin@after
+ \noexpand\noexpand\noexpand\@dblfloat{\tb@nt@type}%
+ [\noexpand\csname fps@\tb@nt@type\noexpand\endcsname]}%
+ \noexpand\reserved@a}%
}{%
\noexpand\csname \tb@nt@type @atend\noexpand\endcsname
\noexpand\end@dblfloat
@@ -673,7 +728,7 @@
\@tempa
}
\newcommand*{\tb@nt@autofloattype}{16}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 0ae8915dfde..a38fea1372a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -7,7 +7,7 @@
%% tocstyle.dtx (with options: `package,trace,tocstyle')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2012 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2007-2013 by Markus Kohm <komascript(at)gmx.info>
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -47,10 +47,10 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: tocstyle.dtx
+%%% From File: $Id: tocstyle.dtx 1562 2013-12-19 07:51:16Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
- [2009/11/09 v0.2d-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
+ [2013/08/11 v0.2e-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
\PackageWarningNoLine{tocstyle}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
@@ -748,12 +748,7 @@
\settocfeature[-1]{leaders}{\hfill}%
\settocfeature[0]{entryvskip}{1em\@plus\p@}%
\settocfeature[0]{leaders}{\hfill}%
- \settocfeature[0]{entryhook}{%
- \begingroup
- \edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\bfseries\fi
- \endgroup
- }%
+ \settocfeature[0]{entryhook}{\bfseries}
\iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
@@ -766,27 +761,34 @@
\fi
}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname sectfont\endcsname\relax
+\expandafter\ifx\csname KOMAClassName\endcsname\relax
\newtocstyle{KOMAlike}{%
\settocfeature{dothook}{\normalfont}%
\settocfeature[-1]{entryhook}{\sffamily\bfseries}%
\settocfeature[-1]{entryvskip}{2.25em\@plus\p@}%
\settocfeature[-1]{leaders}{\hfill}%
+ \settocfeature[-1]{pagenumberhook}{\sffamily\bfseries}%
\settocfeature[0]{entryvskip}{1em\@plus\p@}%
\settocfeature[0]{leaders}{\hfill}%
- \settocfeature[0]{entryhook}{%
- \begingroup
- \edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi
- \endgroup
- }%
+ \settocfeature[0]{entryhook}{\sffamily\bfseries}
+ \settocfeature[0]{pagenumberhook}{\sffamily\bfseries}%
\iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
\begingroup
\edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi
+ \ifx\tocstyleAliasTOC\@tempa
+ \aftergroup\sffamily\aftergroup\bfseries
+ \fi
+ \endgroup
+ }%
+ \settocfeature[1]{pagenumberhook}{%
+ \begingroup
+ \edef\@tempa{toc}%
+ \ifx\tocstyleAliasTOC\@tempa
+ \aftergroup\sffamily\aftergroup\bfseries
+ \fi
\endgroup
}%
\fi
@@ -794,31 +796,47 @@
\else
\newtocstyle{KOMAlike}{%
\settocfeature{dothook}{\normalfont}%
- \settocfeature[-1]{entryhook}{\sectfont}%
+ \settocfeature[-1]{entryhook}{\usekomafont{partentry}}%
\settocfeature[-1]{entryvskip}{2.25em\@plus\p@}%
\settocfeature[-1]{leaders}{\hfill}%
+ \settocfeature[-1]{pagenumberhook}{\usekomafont{partentrypagenumber}}%
\settocfeature[0]{entryvskip}{1em\@plus\p@}%
\settocfeature[0]{leaders}{\hfill}%
- \settocfeature[0]{entryhook}{%
- \begingroup
- \edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi
- \endgroup
- }%
+ \settocfeature[0]{entryhook}{\usekomafont{chapterentry}}%
+ \settocfeature[0]{pagenumberhook}{\usekomafont{chapterentrypagenumber}}%
\iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
\begingroup
\edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi
- \endgroup
+ \ifx\tocstyleAliasTOC\@tempa
+ \def\@tempa{\endgroup\usekomafont{sectionentry}}%
+ \else
+ \let\@tempa\endgroup
+ \fi
+ \@tempa
+ }%
+ \settocfeature[1]{pagenumberhook}{%
+ \begingroup
+ \edef\@tempa{toc}%
+ \ifx\tocstyleAliasTOC\@tempa
+ \def\@tempa{\endgroup\usekomafont{sectionentrypagenumber}}%
+ \else
+ \let\@tempa\endgroup
+ \fi
+ \@tempa
}%
\fi
}
\fi
\newcommand*{\tocstyle@deprecated@style@KOMAScript}{KOMAlike}%
\newtocstyle[KOMAlike]{classic}{%
+ \settocfeature[-1]{pagenumberhook}{\normalfont\normalcolor}%
+ \settocfeature[0]{pagenumberhook}{\normalfont\normalcolor}%
+ \iftochaschapter\else
+ \settocfeature[1]{pagenumberhook}{\normalfont\normalcolor}%
+ \fi
\settocfeature{pagenumberhook}{\normalfont\normalcolor}%
\settocfeature{raggedhook}{\raggedright}%
}
@@ -836,7 +854,7 @@
}{%
\PackageInfo{tocstyle}{no tocstyle.cfg found}%
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 8d50c5beb73..836273a82af 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -1,20 +1,19 @@
%%
%% This is file `typearea.sty',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `package,typearea')
-%% scrktare.dtx (with options: `package,identify')
-%% scrkbase.dtx (with options: `load')
-%% scrktare.dtx (with options: `package,option')
-%% scrkcomp.dtx (with options: `package,typearea,option')
-%% scrktare.dtx (with options: `package,body')
-%% scrkcomp.dtx (with options: `package,typearea,body')
+%% scrkernel-version.dtx (with options: `package,typearea')
+%% scrkernel-typearea.dtx (with options: `package,identify')
+%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-typearea.dtx (with options: `package,option')
+%% scrkernel-compatibility.dtx (with options: `package,typearea,option')
+%% scrkernel-typearea.dtx (with options: `package,body')
+%% scrkernel-compatibility.dtx (with options: `package,typearea,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -46,9 +45,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -68,11 +67,13 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- \KOMAScriptVersion\space package (type area)]
+ 2013/12/19 v3.12 KOMA-Script
+ package (type area)]
\typeout{%
Package typearea, \csname ver@typearea.sty\endcsname^^J%
\@spaces\@spaces\@spaces\@spaces\space\space
@@ -80,9 +81,9 @@
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -226,12 +227,28 @@
\setlength{\@tempdima}{#1\baselineskip}%
\endgroup
\def\ta@hh{#1\baselineskip}%
+ \FamilyKeyStateProcessed
+}
+\KOMA@key{footlines}{%
+ \begingroup
+ \setlength{\@tempdima}{#1\baselineskip}%
+ \endgroup
+ \def\ta@fh{#1\baselineskip}%
+ \FamilyKeyStateProcessed
}
\KOMA@key{headheight}{%
\begingroup
\setlength{\@tempdima}{#1}%
\endgroup
\def\ta@hh{#1}%
+ \FamilyKeyStateProcessed
+}
+\KOMA@key{footheight}{%
+ \begingroup
+ \setlength{\@tempdima}{#1}%
+ \endgroup
+ \def\ta@fh{#1}%
+ \FamilyKeyStateProcessed
}
\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
\KOMA@ifkey{headinclude}{@hincl}
@@ -245,20 +262,22 @@
\edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
\setlength{\ta@bcor}{#1}%
\fi
+ \FamilyKeyStateProcessed
}
\AtEndOfPackage{\KOMA@key{BCOR}{\typearea[{#1}]{last}}}
\KOMA@key{DIV}[calc]{%
\edef\@tempa{#1}%
\def\@tempb{last}\ifx\@tempa\@tempb\let\@tempa=\@lastdiv\fi
\def\@tempb{current}\ifx\@tempa\@tempb\else
- \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=0 \else
- \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=2 \else
- \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=3 \else
+ \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=\z@ \else
+ \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=\tw@ \else
+ \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=\thr@@ \else
\ta@div=\@tempa
\fi
\fi
\fi
\fi
+ \FamilyKeyStateProcessed
}
\AtEndOfPackage{\KOMA@key{DIV}{\typearea[current]{#1}}}
\KOMA@DeclareDeprecatedOption[typearea]{DIVcalc}{DIV=calc}
@@ -272,6 +291,7 @@
\ifstr{#1}{semi}{%
\@twosidetrue
\@semitwosidetrue
+ \FamilyKeyStateProcessed
}{%
\def\FamilyElseValue{, `semi'}%
\KOMA@set@ifkey{twoside}{@twoside}{#1}%
@@ -293,7 +313,9 @@
\KOMA@key{twocolumn}[true]{%
\if@atdocument\clearpage\fi
\KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \csname recalctypearea\endcsname
+ \ifx\FamilyKeyState\FammilyKeyStateProcessed
+ \csname recalctypearea\endcsname
+ \fi
}
\KOMA@DeclareStandardOption%
[typearea]%
@@ -304,26 +326,32 @@
{off}{-1},{no}{-1},{false}{-1},%
{auto}{0},{automedia}{1},{dvips}{2},{pdftex}{3},{dvipdfmx}{4}%
}{#1}%
- \ifcase\number\@tempa\relax
- \endgroup
- \set@pdftexpagesize
- \set@dvipspagesize
- \or
- \endgroup
- \set@pdftexpagesize
- \set@vtexpagesize
- \set@dvipspagesize
- \or
- \endgroup
- \set@dvipspagesize
- \or
- \endgroup
- \set@pdftexpagesize
- \or
- \endgroup
- \set@dvipdfmxpagesize
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\number\@tempa\relax
+ \endgroup
+ \set@pdftexpagesize
+ \set@dvipspagesize
+ \or
+ \endgroup
+ \set@pdftexpagesize
+ \set@vtexpagesize
+ \set@dvipspagesize
+ \or
+ \endgroup
+ \set@dvipspagesize
+ \or
+ \endgroup
+ \set@pdftexpagesize
+ \or
+ \endgroup
+ \set@dvipdfmxpagesize
+ \fi
+ \edef\@pagesizelast{#1}%
+ \else
+ \endgroup
+ \FamilyKeyStateUnknownValue
\fi
- \edef\@pagesizelast{#1}%
}
\newcommand{\set@pdftexpagesize}{%
\AtBeginDocument{%
@@ -336,7 +364,10 @@
\begingroup
\@tempswafalse
\scr@ifdvioutput{\@tempswatrue}{%
- \ifnotundefined{if@dvips}{\let\if@tempswa\if@dvips}{}%
+ \ifnotundefined{if@dvips}{%
+ \expandafter\let\csname if@tempswa\expandafter\endcsname
+ \csname if@dvips\endcsname
+ }{}%
}%
\if@tempswa
\endgroup
@@ -382,15 +413,17 @@
\let\set@vtexpagesize=\@empty
}
\newcommand*{\scr@updatedvipspagesize}{%
- \special{ps::\@percentchar\@percentchar
- PageBoundingBox: 0 0 \the\numexpr\paperwidth/\dimexpr 1bp\relax\relax
- \space \the\numexpr\paperheight/\dimexpr 1bp\relax\relax^^J%
- \@percentchar\@percentchar BeginPageSetup^^J%
- << /PageSize [\the\numexpr\paperwidth/\dimexpr 1bp\relax\relax\space
- \the\numexpr\paperheight/\dimexpr 1bp\relax\relax]
- >> setpagedevice^^J%<<
- 0 0 bop^^J%
- \@percentchar\@percentchar EndPageSetup}%
+ \scr@ifundefinedorrelax{XeTeXversion}{%
+ \special{ps::\@percentchar\@percentchar
+ PageBoundingBox: 0 0 \the\numexpr\paperwidth/\dimexpr 1bp\relax\relax
+ \space \the\numexpr\paperheight/\dimexpr 1bp\relax\relax^^J%
+ \@percentchar\@percentchar BeginPageSetup^^J%
+ << /PageSize [\the\numexpr\paperwidth/\dimexpr 1bp\relax\relax\space
+ \the\numexpr\paperheight/\dimexpr 1bp\relax\relax]
+ >> setpagedevice^^J%<<
+ 0 0 bop^^J%
+ \@percentchar\@percentchar EndPageSetup}%
+ }{}%
}
\AtBeginDocument{%
\renewcommand*{\set@pdftexpagesize}{%
@@ -399,35 +432,52 @@
}%
\ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
\renewcommand*{\set@dvipspagesize}{%
- \scr@ifundefinedorrelax{AtNextShipout}{%
- \scr@ifundefinedorrelax{AtBeginShipoutNext}{%
- \begingroup
- \protected@edef\reserved@a{\endgroup
- \scr@updatedvipspagesize}\reserved@a
- }{%
- \begingroup
- \protected@edef\reserved@a{\endgroup
- \protect\AtBeginShipoutNext{%
- \protect\bgroup
- \protect\global\protect\setbox\AtBeginShipoutBox\protect\vbox{%
- \scr@updatedvipspagesize
- \protect\box\AtBeginShipoutBox
- }%
- \protect\egroup
- }}\reserved@a
+ \begingroup
+ \@tempswafalse
+ \scr@ifdvioutput{\@tempswatrue}{%
+ \ifnotundefined{if@dvips}{%
+ \expandafter\let\csname if@tempswa\expandafter\endcsname
+ \csname if@dvips\endcsname
+ }{}%
}%
- }{%
- \begingroup
- \protected@edef\reserved@a{\endgroup
- \protect\AtNextShipout{%
- \protect\bgroup
- \protect\global\protect\setbox\protect\@cclv\protect\vbox{%
- \scr@updatedvipspagesize
- \protect\box\protect\@cclv
- }%
- \protect\egroup
- }}\reserved@a
- }%
+ \if@tempswa
+ \endgroup
+ \scr@ifundefinedorrelax{AtNextShipout}{%
+ \scr@ifundefinedorrelax{AtBeginShipoutNext}{%
+ \begingroup
+ \protected@edef\reserved@a{\endgroup
+ \scr@updatedvipspagesize}%
+ \reserved@a
+ }{%
+ \begingroup
+ \protected@edef\reserved@a{\endgroup
+ \protect\AtBeginShipoutNext{%
+ \protect\bgroup
+ \protect\global\protect\setbox\AtBeginShipoutBox
+ \protect\vbox{%
+ \scr@updatedvipspagesize
+ \protect\box\AtBeginShipoutBox
+ }%
+ \protect\egroup
+ }}%
+ \reserved@a
+ }%
+ }{%
+ \begingroup
+ \protected@edef\reserved@a{\endgroup
+ \protect\AtNextShipout{%
+ \protect\bgroup
+ \protect\global\protect\setbox\protect\@cclv\protect\vbox{%
+ \scr@updatedvipspagesize
+ \protect\box\protect\@cclv
+ }%
+ \protect\egroup
+ }}%
+ \reserved@a
+ }%
+ \else
+ \endgroup
+ \fi
}%
\else
\let\set@dvipspagesize=\setnot@dvipspagesize
@@ -465,6 +515,7 @@
\setlength{\paperheight}{\@tempdima}%
\@landscapetrue
\fi
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{landscape}{%
\@seascapefalse
@@ -474,6 +525,7 @@
\setlength{\paperheight}{\@tempdima}%
\@landscapetrue
\fi
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{portrait}{%
\if@landscape
@@ -482,6 +534,7 @@
\setlength{\paperheight}{\@tempdima}%
\@landscapefalse
\fi
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{letter}{%
\if@landscape
@@ -491,6 +544,7 @@
\setlength\paperheight{11in}%
\setlength\paperwidth {8.5in}%
\fi
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{legal}{%
\if@landscape
@@ -500,6 +554,7 @@
\setlength\paperheight{14in}%
\setlength\paperwidth {8.5in}%
\fi
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{executive}{%
\if@landscape
@@ -509,9 +564,12 @@
\setlength\paperheight{10.5in}%
\setlength\paperwidth {7.25in}%
\fi
+ \FamilyKeyStateProcessed
}{%
\iso@paper{#1}%
- \if@tempswa\else
+ \if@tempswa
+ \FamilyKeyStateProcessed
+ \else
\expandafter\maybe@pair#1::\@nil
\if@tempswa
\ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax
@@ -528,6 +586,7 @@
\setlength\paperwidth{\@tempa}%
\setlength\paperheight{\@tempb}%
\fi
+ \FamilyKeyStateProcessed
\else
\KOMA@unknown@keyval{paper}{#1}{%
`letter', `legal', `executive', `a'<nr>, `b'<nr>,
@@ -554,7 +613,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -573,6 +632,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfPackage{%
@@ -586,6 +646,7 @@
package.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -635,8 +696,9 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrktare.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -644,7 +706,8 @@
***************************************%
}
}{}
-\KOMAExecuteOptions{paper=A4}
+\providecommand*{\defaultpapersize}{A4}
+\KOMAExecuteOptions{paper=\defaultpapersize}
\if@twoside
\if@semitwoside
\KOMAExecuteOptions{twoside=semi}
@@ -685,7 +748,11 @@
\if@semitwoside
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
- \evensidemargin=\oddsidemargin
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \evensidemargin=\oddsidemargin
+ \else
+ \advance\evensidemargin by1.5\ta@hblk
+ \fi
\else
\advance\oddsidemargin by\ta@hblk
\advance\oddsidemargin by\ta@bcor
@@ -812,7 +879,9 @@
\fi
\hsize=\columnwidth
\linewidth\hsize
- \scr@ifundefinedorrelax{@pagesizelast}{}{\KOMAoptions{pagesize=\@pagesizelast}}%
+ \scr@ifundefinedorrelax{@pagesizelast}{}{%
+ \KOMAoptions{pagesize=\@pagesizelast}%
+ }%
\fi
}
\newcommand*{\scr@grouplevel@test}[1]{%
@@ -871,7 +940,7 @@
DIV values. Using DIV calculation for good line\MessageBreak
width%
}%
- \ta@div=2
+ \ta@div=\tw@
\else
\xdef\@tempa{\ta@divlist{}}%
\@tempdima=#1pt
@@ -923,9 +992,9 @@
\areaset[current]{\textwidth}{\textheight}%
\else
\def\@tempb{current}\ifx\@tempa\@tempb\else
- \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=0 \else
- \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=2 \else
- \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=3 \else
+ \def\@tempb{default}\ifx\@tempa\@tempb\ta@div=\z@ \else
+ \def\@tempb{calc}\ifx\@tempa\@tempb\ta@div=\tw@ \else
+ \def\@tempb{classic}\ifx\@tempa\@tempb\ta@div=\thr@@ \else
\ta@div=\@tempa
\fi
\fi
@@ -940,7 +1009,15 @@
\headheight=\ta@hh
}%
\headsep=1.5\baselineskip
- \footskip=3.5\baselineskip
+ \@ifundefined{footheight}{%
+ \newlength\footheight
+ }{}%
+ \@ifundefined{ta@fh}{%
+ \footheight=1.25\baselineskip
+ }{%
+ \footheight=\ta@fh
+ }%
+ \footskip=\dimexpr\footheight+2.25\baselineskip
\marginparsep=1cc
\marginparpush=0.45\baselineskip
\ifnum\ta@div=\z@
@@ -1075,6 +1152,18 @@
\ta@layoutinfo{\number\ta@div}{\the\@tempcnta}%
\@typearea@end
\activateareas
+ \ifdim \dimexpr 1in+\topmargin
+ +\headheight+\headsep
+ +\textheight
+ +\footskip+\dp\strutbox\relax
+ >\paperheight
+ \PackageWarningNoLine{typearea}{%
+ page content and margins higher than paper.\MessageBreak
+ This may result in page footer out of paper.\MessageBreak
+ You should decrease DIV, decrease foot height,\MessageBreak
+ or include footer into type area%
+ }%
+ \fi
\fi
}
\newcommand*{\ta@layoutinfo}[2]{%
@@ -1139,7 +1228,11 @@
\if@semitwoside
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
- \evensidemargin\oddsidemargin
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \evensidemargin=\oddsidemargin
+ \else
+ \advance\evensidemargin by1.5\ta@hblk
+ \fi
\else
\advance\oddsidemargin by\ta@hblk
\advance\oddsidemargin by\ta@bcor
@@ -1169,7 +1262,19 @@
\advance\headheight by-10\p@
\fi
\headsep=1.5\baselineskip
- \footskip=3.5\baselineskip
+ \@ifundefined{footheight}{\newlength\footheight}{}
+ \if@areasetadvanced
+ \@ifundefined{ta@fh}{%
+ \footheight=1.25\baselineskip
+ \footskip=3.5\baselineskip
+ }{%
+ \footheight=\ta@fh
+ \footskip=\dimexpr \footheight+2.25\baselineskip\relax
+ }%
+ \else
+ \footheight=1.25\baselineskip
+ \footskip=3.5\baselineskip
+ \fi
\ta@vblk=\paperheight
\advance\ta@vblk by-\textheight
\divide\ta@vblk by3
@@ -1209,10 +1314,22 @@
\ta@layoutinfo{areaset}{}%
\@areaset@end
\activateareas
+ \ifdim \dimexpr 1in+\topmargin
+ +\headheight+\headsep
+ +\textheight
+ +\footskip+\dp\strutbox\relax
+ >\paperheight
+ \PackageWarningNoLine{typearea}{%
+ page content and margins higher than paper.\MessageBreak
+ This may result in page footer out of paper.\MessageBreak
+ You should decrease DIV, decrease foot height,\MessageBreak
+ or decreate height of text area%
+ }%
+ \fi
}
\typearea[current]{current}
-%%% From File: scrkcomp.dtx
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index d196a1ff118..0d5a10a2db4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -1,16 +1,15 @@
%%
%% This is file `visualize.lco',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `trace')
-%% scrklco.dtx (with options: `lco,visualize,head')
-%% scrklco.dtx (with options: `lco,visualize,body')
-%% scrknpap.dtx (with options: `lco,visualize,body')
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,visualize,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,visualize,body')
+%% scrkernel-notepaper.dtx (with options: `lco,visualize,body')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,9 +41,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -64,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\ProvidesFile{%
visualize%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -80,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: scrklco.dtx
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 1499 2013-11-05 17:22:29Z mjk $
\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}}
\newcommand*{\showfields}[1]{%
\AtBeginLetter{%
@@ -155,7 +154,7 @@
\@ifundefined{showfield@by@#1}{%
\LCOWarning{visualize}{Unknown show type `#1'.\MessageBreak
You should simply set one of the supported\MessageBreak
- show types `frame', `edge', `rule'.\MessageBreak
+ show types `frame', `edges', `rule'.\MessageBreak
Style `frame' will be used instead}%
\let\showfield\showfield@by@frame
}{%
@@ -575,7 +574,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: scrknpap.dtx
+%%% From File: $Id: scrkernel-notepaper.dtx 1380 2013-10-01 15:31:55Z mjk $
\endinput
%%
%% End of file `visualize.lco'.