summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-24 23:19:31 +0000
committerKarl Berry <karl@freefriends.org>2015-04-24 23:19:31 +0000
commit0a00b3b492fd27dc12cddae602b2c43206a17d74 (patch)
tree40a09bf2208cc13bcd727626e1ee058e2caa68b1 /Master/texmf-dist/tex/latex/koma-script
parent77b150bbd42aa48ba71627e09763785b26adfcfd (diff)
koma-script (24apr15)
git-svn-id: svn://tug.org/texlive/trunk@37036 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.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco4
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak10
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls1794
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty23
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls1979
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty838
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty22
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty40
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty61
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty351
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty162
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty328
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty54
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty353
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls1198
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls1970
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo9
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/setspace.hak121
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty62
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty217
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco10
44 files changed, 6455 insertions, 3315 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index 3676418a1f7..6bb388a5d9f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
DIN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DIN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 18585de41aa..74498fba698 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
DINmtext%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
DINmtext%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index df005e80458..a3870bafdfa 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
KOMAold%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
KOMAold%
@@ -204,7 +204,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
\def\setpresigskip{\@setplength{sigbeforevskip}}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index 1b24ba79003..4c73fbae95a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 2c35798db09..b1798039be8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
NF%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
NF%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index 1f97ea1a915..5b7fa8f1e7f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index 2281b595d76..0344addbd12 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index d3b1fbcca8b..8422ca17396 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index ecc02d56cb6..aba5ef456bc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index 1aa79641a13..e42bf1a24ee 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 1380 2013-10-01 15:31:55Z mjk $
\ProvidesFile{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 14c34469c91..6aeb5bb3984 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
SN%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SN%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index f671e05ca6c..235409a8ee6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
SNleft%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
SNleft%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index 8b03dad1b8d..904b179192e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
UScommercial9
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 6b398813ecf..6d65875fb04 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
UScommercial9DW
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -78,7 +78,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
UScommercial9DW%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index eab558c75b9..994992696cc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\ProvidesFile{float.hak}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\scr@ifexpected{\newfloat}{%
\long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
\let\float@do=\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index a24ba2706dc..55344ddc7e3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\scr@ifexpected{\DeclareNewFloatType}{%
\long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
\expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index 6d280ab7010..5ec44ceeaab 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\scr@ifexpected\@schapter{%
\def\@schapter#1{%
\H@old@schapter{#1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index 83f437dbe43..be727867916 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\ProvidesFile{listings.hak}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
\newcommand*{\scr@do@hack@listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 817f2916aee..0b9e8d895ea 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -73,7 +73,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,28 +95,34 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@clsextenstion}{\@clsextenstion}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
\newcommand*{\KOMAClassName}{%
scrartcl%
}
\newcommand*{\ClassName}{%
article%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
+%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $
\RequirePackage{tocbasic}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
]
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
change of end dot feature after \string\begin{document}%
@@ -151,7 +157,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -186,14 +192,22 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{version}{first}%
}{%
\ClassInfoNoLine{\KOMAClassName}{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{version}{#1}%
}%
}
+\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA@key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -259,24 +273,44 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@v@is@lt}[1]{%
+ \scr@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@gt}[1]{%
+ \scr@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@le}[1]{%
+ \numexpr\scr@compatibility-\@ne\relax<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@ge}[1]{%
+ \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -339,8 +373,11 @@
\@tempa
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -400,19 +437,53 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
\FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @tempswa%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@tempswa\flushbottom
+ \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
}
+\KOMAExecuteOptions{twoside=false}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \FamilyKeyStateProcessed
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \fi
}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -421,6 +492,16 @@
\def\scr@parskip{#2}%
\def\scr@parfillskip{#3}%
\def\par@update{\let\par@update\default@par@update\par@updaterelative}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f@parindent}{\the\parindent}
\newcommand*{\f@parskip}{\the\parskip}
@@ -458,53 +539,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -518,6 +612,9 @@
}%
\or%11
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -545,7 +642,9 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\newif\if@titlepage
\@titlepagefalse
\newif\if@titlepageiscoverpage
@@ -554,21 +653,32 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{titlepage}{firstiscover}%
}{%
\def\FamilyElseValue{, `firstiscover'}%
\KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{titlepage}{firstiscover}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
\fi
}%
}
+\KOMA@kav@xadd{.%
+ \KOMAClassFileName
+}{titlepage}{\if@titlepage true\else false\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: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
{autoendperiod}{0},{autoenddot}{0},{auto}{0},%
@@ -578,6 +688,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if@atdocument\scr@dotchangeatdocument{#1}\else
\let\scr@altsecnumhook\@empty
@@ -593,6 +704,7 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
\KOMA@ifkey{sectionentrydots}{@sectionentrywithdots}
@@ -607,7 +719,12 @@
{standardclasses}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax% big
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@section}{\Large}%
@@ -615,7 +732,12 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
+ \or % normal
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}%
\renewcommand*{\size@part}{\huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@section}{\large}%
@@ -623,7 +745,12 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
+ \or % small
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}%
\renewcommand*{\size@part}{\LARGE}%
\renewcommand*{\size@partnumber}{\LARGE}%
\renewcommand*{\size@section}{\normalsize}%
@@ -631,20 +758,37 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \or
- \or
- \or
- \or
- \or
- \or
- \or
+ \or % openany
+ \or % openright
+ \or % openleft
+ \or % twolinechapter
+ \or % onelinechapter
+ \or % twolineappendix
+ \or % onelineappend
+ \or % optiontotocandhead
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr@activate@xsection{3}%
- \or
+ \or % optiontotoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
\scr@activate@xsection{2}%
- \or
+ \or % optiontohead
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
\scr@activate@xsection{1}%
- \or
+ \or % standardclasses
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
\renewcommand*{\size@part}{\huge}%
\renewcommand*{\size@partnumber}{\Large}%
\renewcommand*{\size@section}{\Large}%
@@ -656,14 +800,16 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{big}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{headinclude=#1}%
}{%
@@ -671,11 +817,13 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
@@ -683,8 +831,8 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
-\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -698,6 +846,9 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{current}%
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -706,6 +857,9 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{#1}%
}%
}{%
\ifx\@currname\KOMAClassName
@@ -716,6 +870,8 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}%
+ {cleardoublepage}{#1}%
}%
}{}%
\fi
@@ -748,6 +904,23 @@
\cleardoublestandardpage
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{cleardoublepage}{%
+ \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi
+}
+\AtEndOfClass{%
+ \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
+ {%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{\@tempa}%
+}
\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage}
\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage}
\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage
@@ -757,7 +930,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -785,49 +958,113 @@
{middlebeside}{13},{besidemiddle}{13},%
{bottombeside}{14},{besidebottom}{14}%
}{#1}%
- \ifcase \@tempa\relax
- \@tablecaptionabovetrue
- \@figurecaptionabovetrue
- \@captionabovetrue
- \or
- \@tablecaptionabovefalse
- \@figurecaptionabovefalse
- \@captionabovefalse
- \or
- \@tablecaptionabovetrue
- \or
- \@tablecaptionabovefalse
- \or
- \@figurecaptionabovetrue
- \or
- \@figurecaptionabovefalse
- \or
- \onelinecaptionstrue
- \or
- \onelinecaptionsfalse
- \or
- \renewcommand*{\scap@pos}{r}%
- \or
- \renewcommand*{\scap@pos}{l}%
- \or
- \renewcommand*{\scap@pos}{i}%
- \or
- \renewcommand*{\scap@pos}{o}%
- \or
- \renewcommand*{\scap@valign}{t}%
- \or
- \renewcommand*{\scap@valign}{c}%
- \or
- \renewcommand*{\scap@valign}{b}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax % heading
+ \@tablecaptionabovetrue
+ \@figurecaptionabovetrue
+ \@captionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \or % signature
+ \@tablecaptionabovefalse
+ \@figurecaptionabovefalse
+ \@captionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \or % tableheading
+ \@tablecaptionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \or % tablesignature
+ \@tablecaptionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \or % figureheading
+ \@figurecaptionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \or % figuresignature
+ \@figurecaptionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \or % oneline
+ \onelinecaptionstrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \or % nooneline
+ \onelinecaptionsfalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \or % rightbeside
+ \renewcommand*{\scap@pos}{r}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \or % leftbeside
+ \renewcommand*{\scap@pos}{l}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \or % innerbeside
+ \renewcommand*{\scap@pos}{i}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \or % outerbeside
+ \renewcommand*{\scap@pos}{o}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \or % topbeside
+ \renewcommand*{\scap@valign}{t}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \or % centeredbeside
+ \renewcommand*{\scap@valign}{c}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \or % bottombeside
+ \renewcommand*{\scap@valign}{b}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}
\KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
\newif\if@komalongtable\@komalongtabletrue
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -846,17 +1083,40 @@
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
}%
}
+\AtBeginDocument{%
+ \ifx\@footnotemark\scr@saved@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
+ \else\ifx\@footnotemark\scr@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
+ \fi\fi
+}
\newcommand*{\scr@footmisc@options}{}
\PassOptionsToPackage{\noexpand\scr@footmisc@options}{footmisc}
\newcommand*{\scr@saved@footnotemark}{%
@@ -874,7 +1134,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -895,33 +1155,45 @@
{sectionentrywithoutdots}{13},{sectionentryfill}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % index
\KOMAoptions{index=notoc}%
- \or
+ \or % noindex
\KOMAoptions{index=totoc}%
- \or
+ \or % listof
\KOMAoptions{listof=notoc}%
- \or
+ \or % nolistof
\KOMAoptions{listof=totoc}%
- \or
+ \or % listofnumbered
\KOMAoptions{listof=numbered}%
- \or
+ \or % nobibliography
\KOMAoptions{bibliography=nottotoc}%
- \or
+ \or % bibliography
\KOMAoptions{bibliography=totoc}%
- \or
+ \or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
- \or
+ \or % flat
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
- \or
+ \or % graduated
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
- \or
+ \or % indenttextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
\setuptoc{toc}{numberline}%
- \or
+ \or % leftaligntextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
\unsettoc{toc}{numberline}%
- \or
+ \or % chapterentrywithdots/sectionentrywithdots
\KOMAoptions{sectionentrydots=true}%
- \or
+ \or % chapterentrywithoutdots/sectionentrywithoutdots
\KOMAoptions{sectionentrydots=false}%
\fi
\fi
@@ -946,7 +1218,15 @@
{leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % notoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
\section*
}%
@@ -959,6 +1239,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
\addsec
}%
@@ -971,6 +1259,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
\section
}%
@@ -983,10 +1279,17 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -994,6 +1297,7 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% entryprefix
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -1013,14 +1317,20 @@
}%
}%
}%
- \or% numberline
+ \or% indenttextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
\AtAddToTocList[float]{%
\setuptoc{\@currext}{numberline}%
}
- \or% nonumberline
+ \or% leftaligntextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -1030,11 +1340,15 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1053,6 +1367,16 @@
\let\newblock\@empty
\let\bib@beginhook\@empty
\let\bib@endhook\@empty
+ \@ifundefined{scr@current@bibstyle}{}{%
+ \ifstr{\scr@current@bibstyle}{}{}{%
+ \edef\reserved@a{%
+ \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
+ {\scr@current@bibstyle}%
+ }\reserved@a
+ }%
+ }%
+ \def\scr@current@bibstyle{#2}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
\csname scr@bibstyle@#1\endcsname
#3%
}%
@@ -1106,7 +1430,15 @@
{leveldown}{3},%
{standardlevel}{4}%
}{#1}%
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % notoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\subsection*{\refname}%
@@ -1117,6 +1449,14 @@
\fi
}%
\or% totoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\subsection*{%
@@ -1130,6 +1470,14 @@
\fi
}%
\or% numbered
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\subsection{\refname}%
@@ -1140,19 +1488,29 @@
\fi
}
\or% leveldown
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
\bib@leveldowntrue
\or% standardlevel
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
\bib@leveldownfalse
\fi
}{%
- \csname scr@bibstyle@#1\endcsname
\FamilyKeyStateProcessed
+ \edef\reserved@a{%
+ \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
+ {\scr@current@bibstyle}%
+ }\reserved@a
+ \csname scr@bibstyle@#1\endcsname
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\idx@@heading}{%
\section*
}
@@ -1162,29 +1520,39 @@
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}%
\ifcase \@tempa\relax
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\section*
}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\addsec
}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}
+\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
\else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -1218,325 +1586,325 @@
\fi
\fi
}
-\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
- \ClassWarning{\KOMAClassName}{%
- Using fallback calculation to setup font sizes\MessageBreak
- for basic size `#2'}%
- \scr@ifundefinedorrelax{dimexpr}{%
- \ClassError{\KOMAClassName}{%
- feature only allowed using e-TeX%
- }{%
- The fallback calculation to setup font sizes was implemented
- using e-TeX.\MessageBreak
- You should not continue, because the fallback calculation would fail%
- }
- }{%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \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}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
+\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{fontsize}%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi
+ \expandafter\ifnum\scr@v@is@lt{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
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\partopsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \edef\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \edef\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \edef\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \normalsize
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\partopsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
- \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
+ \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
+}
+\scr@ifundefinedorrelax{changefontsizes}{%
+ \let\changefontsizes\simple@changefontsizes
+}{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\changefontsizes\space already defined.\MessageBreak
+ I hope, the definition is compatible,\MessageBreak
+ because I do not change it%
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1545,20 +1913,29 @@
\edef\@tempb{\strip@pt\@tempdimb}%
\addtolength{\@tempdimb}{-10\p@}%
\edef\@ptsize{\strip@pt\@tempdimb}%
-\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{
+\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
- \changefontsizes{\@tempa}%
+ \edef\@tempa{%
+ \noexpand\changefontsizes{\@tempa}%
+ \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ }\@tempa
}%
}%
}
@@ -1611,12 +1988,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1660,7 +2037,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1788,7 +2165,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2126,7 +2503,7 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\setcounter{secnumdepth}{3}
\newcommand*{\ifnumbered}[1]{%
\scr@ifundefinedorrelax{#1numdepth}{%
@@ -2395,205 +2772,311 @@
\let\raggedsection\raggedright
\DefineFamily{KOMAarg}
\DefineFamilyMember[.dsc]{KOMAarg}
-\newcommand*{\DeclareSectionCommand}[2][]{%
- \edef\reserved@a{%
- \noexpand\FamilyStringKey[.dsc]{KOMAarg}{style}{%
- \expandafter\noexpand\csname scr@#2@style\endcsname
+\newcommand*{\DeclareSectionCommandStyleOption}[3]{%
+ \DeclareSectionCommandDummyOption{#2}%
+ \expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}%
+ }%
+}
+\newcommand*{\DeclareSectionCommandDummyOption}[1]{%
+ \@ifstar {%
+ \g@addto@macro{\scr@dsc@dummyoptions}{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}%
}%
- }\reserved@a
- \scr@ifundefinedorrelax{scr@local@levelincrease}{%
- \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
- {\scr@local@levelincrease}%
+ \g@addto@macro{\scr@dsc@dummyoptions}{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}%
+ }%
}%
- \scr@ifundefinedorrelax{scr@local@leveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
- \expandafter\noexpand\csname #2numdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
- \expandafter\noexpand\csname #2numdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@leveloffset\relax}%
- \edef\scr@local@leveloffset{%
- \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
- }%
- }%
- }%
- }\reserved@a
+}
+\newcommand*{\scr@dsc@dummyoptions}{}
+\newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{##1}%
+ \fi
+ \fi
}%
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{indent}{%
- \expandafter\noexpand\csname scr@#2@sectionindent\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{beforeskip}{%
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{afterskip}{%
- \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{font}{%
- \noexpand\IfExistskomafont{#2}{%
- \noexpand\setkomafont
+}
+\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}%
+ \fi
+ }%
+}
+\newcommand*{\DeclareSectionCommandStyleFontOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \IfExistskomafont{#3\scr@dsc@current#4}{%
+ \setkomafont
+ }{%
+ \newkomafont
+ }{#3\scr@dsc@current#4}{##1}%
+ \FamilyKeyStateProcessed
+ }%
+}
+\DeclareSectionCommandDummyOption{style}
+\DeclareSectionCommandDummyOption{expandtopt}*
+\DeclareSectionCommandDummyOption{increaselevel}
+\DeclareSectionCommandDummyOption{level}
+\DeclareSectionCommandDummyOption{toclevel}
+\DeclareSectionCommandDummyOption{tocindent}
+\DeclareSectionCommandDummyOption{tocnumwidth}
+\newcommand*{\scr@dsc@style@section@options}{}
+\DeclareSectionCommandStyleLengthOption{section}
+ {indent}{scr@}{@sectionindent}
+\DeclareSectionCommandStyleLengthOption{section}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{section}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{section}{font}{}{}
+\newcommand*{\scr@dsc@style@part@options}{}
+\DeclareSectionCommandStyleLengthOption{part}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{part}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{part}{font}{}{}
+\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number}
+\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+}
+\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current number}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{number font}
+ {prefixfont}%
+ }{}%
+}
+\newif\ifscr@dsc@parametersonly
+\newcommand*{\DeclareSectionCommand}[2][]{%
+ \edef\scr@dsc@current{#2}%
+ \scr@dsc@dummyoptions
+ \scr@dsc@parametersonlyfalse
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \ifstr{##1}{}{%
+ \ifscr@dsc@parametersonlytrue
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@start##1}{%
+ \FamilyKeyStateUnknownValue
}{%
- \noexpand\newkomafont
- }{#2}{####1}%
- \noexpand\FamilyKeyStateProcessed
- }%
- }\reserved@a
- \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
- \let\scr@local@counterwithin\relax
- \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname #2tocdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname #2tocdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@tocleveloffset\relax}%
- \edef\scr@local@tocleveloffset{%
- \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
- }%
- }%
+ \@namedef{scr@\scr@dsc@current @style}{##1}%
+ \FamilyKeyStateProcessed
}%
- }\reserved@a
+ }%
}%
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocindent}{%
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocnumwidth}{%
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname}%
- }\reserved@a
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
\begingroup
- \scr@ifundefinedorrelax{#2numdepth}{%
- \scr@declaresectioncommanderror{#2}{section level}{level}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionindent}{%
- \scr@declaresectioncommanderror{#2}{section indent}{indent}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionbeforeskip}{%
- \scr@declaresectioncommanderror{#2}{before section skip}{beforeskip}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionafterskip}{%
- \scr@declaresectioncommanderror{#2}{after section skip}{afterskip}%
- }{}%
- \IfExistskomafont{#2}{}{%
- \scr@declaresectioncommanderror{#2}{font}{font}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@tocindent}{%
- \scr@declaresectioncommanderror{#2}{toc entry indent}{tocindent}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@tocnumwidth}{%
- \scr@declaresectioncommanderror{#2}{toc entry number
- width}{tocnumwidth}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}
+ {section command style}{style}%
}{}%
\endgroup
\@firstofone{%
- \@ifundefined{c@#2}{\newcounter{#2}}{}%
- \ifx\scr@local@counterwithin\relax
- \else\ifx\scr@local@counterwithin\@empty
- \@namedef{the#2}{\arabic{#2}}%
- \else
- \@removefromreset{#2}{\scr@local@counterwithin}%
- \@addtoreset{#2}{\scr@local@counterwithin}%
- \expandafter\def\csname the#2\expandafter\endcsname{%
- \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
- \fi
- \fi
- \@ifundefined{#2format}{%
- \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
- }{}%
- \ifstr{\csname scr@#2@style\endcsname}{}{%
- \ClassInfo{\KOMAClassName}{%
- not defining `\expandafter\string\csname #2\endcsname' due
- to\MessageBreak
- empty section style%
- }%
+ \scr@dsc@dummyoptions
+ \@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
+ \FamilyBoolKey[.dsc]{KOMAarg}{expandtopt}{scr@dsc@expandtopt}%
+ \scr@dsc@expandtoptfalse
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \scr@ifundefinedorrelax{scr@#2@style}{%
- \ClassWarning{\KOMAClassName}{using default section style}%
- \@namedef{scr@#2@style}{section}%
- }{}%
- \expandafter\edef\csname #2\endcsname{%
- \noexpand\scr@ifundefinedorrelax{%
- scr@start\csname scr@#2@style\endcsname}{%
- \noexpand\ClassError{\noexpand\KOMAClassName}{%
- section style `\csname scr@#2@style\endcsname' not defined}{%
- A not yet defined section style `\csname scr@#2@style\endcsname'
- has been setup for\MessageBreak
- `\expandafter\string\csname #2\endcsname'. You should either setup
- another style\MessageBreak
- or define the style.\MessageBreak
- If you'll continue, style `section' will be used as an emergency
- fallback.%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ }%
+ \scr@ifundefinedorrelax{scr@local@leveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
+ \expandafter\noexpand\csname \scr@dsc@current numdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
+ \expandafter\noexpand\csname \scr@dsc@current numdepth\endcsname
}%
- \noexpand\def\expandafter\noexpand\csname scr@#2@style\endcsname
- {section}%
- }{}%
- \expandafter\noexpand
- \csname scr@start\csname scr@#2@style\endcsname\endcsname
- {#2}%
- \expandafter\noexpand\csname #2numdepth\endcsname
- \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
- \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname{%
- \noexpand\ifdim\noexpand\glueexpr
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
- <\noexpand\z@
- \unexpanded{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}%
- \fi
- }%
- \noexpand\fi
\unexpanded{%
- \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ {\numexpr ##1+\scr@local@leveloffset\relax}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
}%
}%
- }%
+ }\reserved@a
}%
- \@ifundefined{DeclareSectionNumberDepth}{%
- \@ifundefined{#2markformat}{%
- \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
- }{}%
- \@ifundefined{#2mark}{%
- \expandafter\let\csname #2mark\endcsname\@gobble
- }{}%
+ \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
+ \let\scr@local@counterwithin\relax
+ \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}%
+ }\reserved@a
}{%
- \DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@tocleveloffset\relax}%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset
+ +\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
}%
- \scr@ifundefinedorrelax{#2tocdepth}{%
- \expandafter\let\csname #2tocdepth\expandafter\endcsname
- \csname #2numdepth\endcsname
- }{}%
- \expandafter\providecommand\expandafter*%
- \csname add#2tocentry\endcsname[2]{%
- \addtocentrydefault{#2}{##1}{##2}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{
+ ##1}%
+ \fi
+ \fi
+ }%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
+ ##1}%
+ \fi
+ \fi
}%
- \scr@ifundefinedorrelax{l@#2}{%
- \expandafter\edef\csname l@#2\endcsname{%
- \noexpand\bprot@dottedtocline
- \expandafter\noexpand\csname #2tocdepth\endcsname
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \begingroup
+ \scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent}
+ {tocindent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number
+ width}{tocnumwidth}%
+ }{}%
+ \@nameuse{scr@dsc@style@%
+ \@nameuse{scr@\scr@dsc@current @style}%
+ @neededoptionstest}%
+ \endgroup
+ \@firstofone{%
+ \@ifundefined{c@#2}{\newcounter{#2}}{}%
+ \ifx\scr@local@counterwithin\relax
+ \else\ifx\scr@local@counterwithin\@empty
+ \@namedef{the#2}{\arabic{#2}}%
+ \else
+ \@removefromreset{#2}{\scr@local@counterwithin}%
+ \@addtoreset{#2}{\scr@local@counterwithin}%
+ \expandafter\def\csname the#2\expandafter\endcsname{%
+ \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
+ \fi
+ \fi
+ \@ifundefined{#2format}{%
+ \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \ifscr@dsc@parametersonly
+ \ClassInfo{\KOMAClassName}{%
+ not defining `\expandafter\string\csname #2\endcsname' due
+ to\MessageBreak
+ empty section style option%
+ }%
+ \else
+ \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{%
+ \ClassWarning{\KOMAClassName}{%
+ not defining `\expandafter\string\csname #2\endcsname'
+ due\MessageBreak
+ to not yet defined section style\MessageBreak
+ `\@nameuse{scr@#2@style}'%
+ }%
+ }{%
+ \expandafter\edef\csname #2\endcsname{%
+ \expandafter\noexpand
+ \csname scr@start\csname scr@#2@style\endcsname\endcsname
+ {#2}%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
+ \expandafter\noexpand\csname scr@#2@beforeskip\endcsname
+ \expandafter\noexpand\csname scr@#2@afterskip\endcsname{%
+ \noexpand\ifdim\noexpand\glueexpr
+ \expandafter\noexpand\csname scr@#2@beforeskip\endcsname
+ <\noexpand\z@
+ \unexpanded{%
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ }%
+ \noexpand\fi
+ \unexpanded{%
+ \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ }%
+ }%
+ }%
+ }%
+ \fi
+ \@ifundefined{DeclareSectionNumberDepth}{%
+ \@ifundefined{#2markformat}{%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \@ifundefined{#2mark}{%
+ \expandafter\let\csname #2mark\endcsname\@gobble
+ }{}%
+ }{%
+ \DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
}%
- }{}%
+ \scr@ifundefinedorrelax{#2tocdepth}{%
+ \expandafter\let\csname #2tocdepth\expandafter\endcsname
+ \csname #2numdepth\endcsname
+ }{}%
+ \expandafter\providecommand\expandafter*%
+ \csname add#2tocentry\endcsname[2]{%
+ \addtocentrydefault{#2}{##1}{##2}%
+ }%
+ \scr@ifundefinedorrelax{l@#2}{%
+ \expandafter\edef\csname l@#2\endcsname{%
+ \noexpand\bprot@dottedtocline
+ \expandafter\noexpand\csname #2tocdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@tocindent\endcsname
+ \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
+ }%
+ }{}%
+ }%
}%
}
\newcommand*{\scr@declaresectioncommanderror}[3]{%
@@ -2734,7 +3217,7 @@
}%
\reserved@a
}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{style}{}%
+ \scr@dsc@dummyoptions
\FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
{\scr@local@levelincrease}%
\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
@@ -2746,14 +3229,6 @@
\the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
}%
- \DefineFamilyKey[.dsc]{KOMAarg}{indent}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{beforeskip}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{afterskip}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{font}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{counterwidthin}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
}%
}%
@@ -2762,7 +3237,7 @@
\let\scr@local@tocleveloffset\relax
}
\newcommand*{\bprot@dottedtocline}[5]{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\ifnum #1>\c@tocdepth \else
\begingroup
\@tempcnta 20010
@@ -2791,7 +3266,7 @@
\newcommand*{\partnumdepth}{%
\z@
}
-\newcommand*{\scr@part@sectionbeforeskip}{%
+\newcommand*{\scr@part@beforeskip}{%
4ex
}
\newcommand*{\partheadstartvskip}{%
@@ -2800,16 +3275,15 @@
\newcommand*{\partheadmidvskip}{%
\par\nobreak
}
-\newcommand*{\scr@part@sectionafterskip}{%
+\newcommand*{\scr@part@afterskip}{%
3ex
}
\newcommand*{\partheadendvskip}{%
\vskip\@tempskipa
}
-\newcommand*{\scr@part@sectionindent}{\z@}
-\newcommand*{\scr@part@style}{}
+\newcommand*{\scr@part@style}{part}
\newcommand\part{\par
- \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr\scr@part@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip%
\@afterindentfalse
@@ -2863,7 +3337,7 @@
\fi
\endgroup
\nobreak
- \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \@tempskipa=\glueexpr\scr@part@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\@afterheading
@@ -2877,7 +3351,7 @@
\sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par
\endgroup
\nobreak
- \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \@tempskipa=\glueexpr\scr@part@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\@afterheading
@@ -2917,16 +3391,20 @@
\scr@ds@tocentry}%
\fi
\@spart{#2}%
- \ifx\partmark\@gobble
- \@mkboth{}{}%
- \else
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \fi
+ \expandafter\addpartmark\expandafter{\scr@ds@head}%
}
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
+
+\newcommand*\addpartmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=-2
+ \partmark{#1}%
+ \endgroup
+}
\newcommand*{\parttocdepth}{\m@ne}
\let\parttocdepth\m@ne
\newcommand*{\scr@part@tocindent}{\z@}
@@ -2951,7 +3429,7 @@
\usekomafont{partentry}{#1\nobreak
\usekomafont{partentrypagenumber}{\hfil\nobreak
\hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\endgroup
\penalty20010
\else
@@ -3006,7 +3484,7 @@
\hfill}}\nobreak
\hb@xt@\@pnumwidth{\hss#2}}}\par
\endgroup
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\penalty20008
\fi
\fi
@@ -3036,12 +3514,12 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \addsecmark{\scr@ds@head}%
+ \expandafter\addsecmark\expandafter{\scr@ds@head}%
}
\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.13a}\relax
\@afterindentfalse \vskip 1.5ex
\else
\if@noskipsec \leavevmode \fi
@@ -3054,7 +3532,7 @@
\fi
\fi
{\parindent \z@
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}#1\par\nobreak}\nobreak%
@@ -3090,8 +3568,15 @@
}
\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
\renewcommand*{\@seccntformat}[1]{%
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ \expandafter\ifnum\scr@v@is@lt{3.17}\relax
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ \else
+ \scr@ifundefinedorrelax{#1format}{%
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ }{\expandafter\protect\csname #1format\endcsname}%
+ \fi
}
\newcommand*\addsecmark[1]{%
\begingroup
@@ -3152,14 +3637,14 @@
tocindent=10em,%
tocnumwidth=5em%
]{subparagraph}
-\ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\relax
+\expandafter\ifnum\scr@v@is@lt{3.15}\relax
\let\scr@subparagraph@sectionindent\parindent
\else
\def\scr@subparagraph@sectionindent{\scr@parindent}%
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3191,14 +3676,12 @@
}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
\newcommand*{\scr@tpo}{0}
-\newcommand*{\is@thispageodd}{%
+\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
\begingroup
\@tempcnta=\scr@tpo
\advance\@tempcnta by\@ne
\xdef\scr@tpo{\the\@tempcnta}%
- \protected@write\@auxout{\let\arabic\relax}{%
- \string\new@tpo@label{\scr@tpo}{\arabic{page}}}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\relax
\protect\G@refundefinedtrue
\ClassWarning{\KOMAClassName}{%
@@ -3213,8 +3696,15 @@
\aftergroup\thispagewasoddfalse
\fi
\endgroup
+ \edef\is@thispageodd@setlabel{%
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ }%
+ #1%
\@esphack
}
+\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
\newcommand{\ifthispageodd}{%
\is@thispageodd
@@ -3329,7 +3819,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3350,8 +3840,10 @@
Maybe you should load package `scrlayer-scrpage',\MessageBreak
before using this element%
}
-\newcommand*
- {\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*{%
+ \pagemark
+}{%
+ {\usekomafont{pagenumber}{%
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
@@ -3422,19 +3914,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-\if@twoside
- \flushbottom
-\else
- \raggedbottom
-\fi
-\if@twocolumn
- \twocolumn
- \sloppy
- \flushbottom
-\else
- \onecolumn
-\fi
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -3978,7 +4458,7 @@
}{%
\end@dblfloat
}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -4115,7 +4595,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
\renewcommand*{\numberline}[1]{%
\numberline@box{%
\numberline@prefix
@@ -4247,7 +4727,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -4332,7 +4812,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -4365,7 +4845,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -4469,7 +4949,7 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
\edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
@@ -4510,7 +4990,7 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
- \item\relax%
+ \item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newcommand*\descfont{\sffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 96211f7bb03..31070b6a4d3 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,14 +66,18 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (%
KOMA-Script-independent
basics and keyval usage)]
@@ -365,12 +369,12 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
}
@@ -431,7 +435,8 @@
If \expandafter\string\csname #1\endcsname\space does not behave
like\MessageBreak
it was described at the KOMA-Script manual, try to\MessageBreak
- load `scrbase.sty' earlier or find out at which\MessageBreak
+ load `scrbase.\scr@pkgextension' earlier or find out at
+ which\MessageBreak
package or class \expandafter\string\csname #1\endcsname\space
was defined before\@gobble
}%
@@ -1383,7 +1388,7 @@
\newcommand{\Family@String@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\def#4{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\defcaptionname}{%
\@ifstar\scr@def@scaptionname\scr@def@captionname
}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index a53ff0c3649..1ce6f2ff0b8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -73,7 +73,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,30 +95,36 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@clsextenstion}{\@clsextenstion}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
\newcommand*{\KOMAClassName}{%
scrbook%
}
\newcommand*{\ClassName}{%
book%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
+%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $
\RequirePackage{tocbasic}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\newif\if@openright
\@openrighttrue
\newcommand*{\scr@dotchangeatdocument}[1]{%
@@ -151,23 +157,23 @@
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
\newcommand*{\size@chapterprefix}{\size@chapter}
-\newcommand*{\scr@chapter@sectionbeforeskip}{\z@}
-\let\scr@chapter@sectionbeforeskip\z@
-\newcommand*{\scr@chapter@sectionafterskip}{\z@}
-\let\scr@chapter@sectionafterskip\z@
-\newcommand*{\scr@chapter@sectionindent}{\z@}
+\newcommand*{\scr@chapter@beforeskip}{\z@}
+\let\scr@chapter@beforeskip\z@
+\newcommand*{\scr@chapter@afterskip}{\z@}
+\let\scr@chapter@afterskip\z@
+\newcommand*{\scr@chapter@innerskip}{\z@}
\let\scr@chapter@sectionindent\z@
-\newcommand*{\scr@chapter@style}{}
+\newcommand*{\scr@chapter@style}{chapter}
\newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}
\newcommand*{\chapterheadendvskip}{\vskip\@tempskipa}
-\newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}
+\newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}
\newcommand*{\size@section}{}
\newcommand*{\size@subsection}{}
\newcommand*{\size@subsubsection}{}
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -202,14 +208,22 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{version}{first}%
}{%
\ClassInfoNoLine{\KOMAClassName}{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{version}{#1}%
}%
}
+\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA@key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -275,24 +289,44 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@v@is@lt}[1]{%
+ \scr@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@gt}[1]{%
+ \scr@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@le}[1]{%
+ \numexpr\scr@compatibility-\@ne\relax<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@ge}[1]{%
+ \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -355,8 +389,11 @@
\@tempa
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -416,19 +453,53 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
\FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @tempswa%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@tempswa\flushbottom
+ \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
}
+\KOMAExecuteOptions{twoside=true}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \FamilyKeyStateProcessed
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \fi
}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -437,6 +508,16 @@
\def\scr@parskip{#2}%
\def\scr@parfillskip{#3}%
\def\par@update{\let\par@update\default@par@update\par@updaterelative}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f@parindent}{\the\parindent}
\newcommand*{\f@parskip}{\the\parskip}
@@ -474,53 +555,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -534,6 +628,9 @@
}%
\or%11
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -561,7 +658,9 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -570,17 +669,29 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{titlepage}{firstiscover}%
}{%
\def\FamilyElseValue{, `firstiscover'}%
\KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{titlepage}{firstiscover}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
\fi
}%
}
+\KOMA@kav@xadd{.%
+ \KOMAClassFileName
+}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
{any}{0},%
@@ -588,18 +699,27 @@
{left}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openany}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openright}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openleft}%
\ifcase \@tempa\relax
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{openany}%
\@openrightfalse
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{openright}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{openleft}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{open}{right}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{openright}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
\KOMA@key{numbers}{%
@@ -611,6 +731,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if@atdocument\scr@dotchangeatdocument{#1}\else
\let\scr@altsecnumhook\@empty
@@ -626,20 +747,42 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-\KOMA@ifkey{chapterprefix}{@chapterprefix}
+\newif\if@chapterprefix
+\KOMA@key{chapterprefix}[true]{%
+ \KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}%
+ {chapterprefix}{@chapterprefix}%
+ \KOMA@kav@remove{.\KOMAClassFileName}%
+ {headings}{twolinechapter}%
+ \KOMA@kav@remove{.\KOMAClassFileName}%
+ {headings}{onelinechapter}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}%
+ {headings}{%
+ \if@chapterprefix twolinechapter\else onelinechapter\fi
+ }%
+ \fi
+}
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}%
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
\if@tempswa
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixtrue}%
}{%
\l@addto@macro\appendixmore{\@chapterprefixtrue}%
}%
\else
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixfalse}%
}{%
@@ -672,17 +815,23 @@
{standardclasses}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
- \renewcommand*{\scr@chapter@sectionbeforeskip}{3.3\baselineskip+\parskip}%
- \renewcommand*{\scr@chapter@sectionafterskip}{%
+ \ifcase \@tempa\relax% big
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}%
+ \renewcommand*{\scr@chapter@beforeskip}{3.3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@afterskip}{%
1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
}%
+ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa
\else\vskip\@tempskipa\fi
}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\huge}%
@@ -692,17 +841,23 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\scr@chapter@sectionbeforeskip}{3\baselineskip+\parskip}%
- \renewcommand*{\scr@chapter@sectionafterskip}{%
+ \or % normal
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}%
+ \renewcommand*{\scr@chapter@beforeskip}{3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@afterskip}{%
1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
}%
+ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa
\else\vskip\@tempskipa\fi
}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\LARGE}%
@@ -712,17 +867,23 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\scr@chapter@sectionbeforeskip}{2.8\baselineskip+\parskip}%
- \renewcommand*{\scr@chapter@sectionafterskip}{%
+ \or % small
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}%
+ \renewcommand*{\scr@chapter@beforeskip}{2.8\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@afterskip}{%
1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
}%
+ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa
\else\vskip\@tempskipa\fi
}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\LARGE}%
\renewcommand*{\size@partnumber}{\LARGE}%
\renewcommand*{\size@chapter}{\Large}%
@@ -732,32 +893,50 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
+ \or % openany
\KOMAoptions{open=any}%
- \or
+ \or % openright
\KOMAoptions{open=right}%
- \or
+ \or % openleft
\KOMAoptions{open=left}%
- \or
+ \or % twolinechapter
\KOMAoptions{chapterprefix=true}%
- \or
+ \or % onelinechapter
\KOMAoptions{chapterprefix=false}%
- \or
+ \or % twolineappendix
\KOMAoptions{appendixprefix=true}%
- \or
+ \or % onelineappend
\KOMAoptions{appendixprefix=false}%
- \or
+ \or % optiontotocandhead
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr@activate@xsection{3}%
- \or
+ \or % optiontotoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
\scr@activate@xsection{2}%
- \or
+ \or % optiontohead
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
\scr@activate@xsection{1}%
- \or
- \renewcommand*{\scr@chapter@sectionbeforeskip}{50\p@}%
- \renewcommand*{\scr@chapter@sectionafterskip}{40\p@}%
+ \or % standardclasses
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
+ \renewcommand*{\scr@chapter@beforeskip}{50\p@}%
+ \renewcommand*{\scr@chapter@afterskip}{40\p@}%
+ \renewcommand*{\scr@chapter@innerskip}{20\p@}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{\vskip\@tempskipa}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip 20\p@}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\Huge}%
@@ -772,14 +951,17 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{big}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{headinclude=#1}%
}{%
@@ -787,11 +969,13 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
@@ -799,8 +983,8 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
-\@twosidetrue
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -814,6 +998,9 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{current}%
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -822,6 +1009,9 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{#1}%
}%
}{%
\ifx\@currname\KOMAClassName
@@ -832,6 +1022,8 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}%
+ {cleardoublepage}{#1}%
}%
}{}%
\fi
@@ -864,6 +1056,23 @@
\cleardoublestandardpage
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{cleardoublepage}{%
+ \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi
+}
+\AtEndOfClass{%
+ \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
+ {%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{\@tempa}%
+}
\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage}
\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage}
\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage
@@ -873,7 +1082,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -901,49 +1110,113 @@
{middlebeside}{13},{besidemiddle}{13},%
{bottombeside}{14},{besidebottom}{14}%
}{#1}%
- \ifcase \@tempa\relax
- \@tablecaptionabovetrue
- \@figurecaptionabovetrue
- \@captionabovetrue
- \or
- \@tablecaptionabovefalse
- \@figurecaptionabovefalse
- \@captionabovefalse
- \or
- \@tablecaptionabovetrue
- \or
- \@tablecaptionabovefalse
- \or
- \@figurecaptionabovetrue
- \or
- \@figurecaptionabovefalse
- \or
- \onelinecaptionstrue
- \or
- \onelinecaptionsfalse
- \or
- \renewcommand*{\scap@pos}{r}%
- \or
- \renewcommand*{\scap@pos}{l}%
- \or
- \renewcommand*{\scap@pos}{i}%
- \or
- \renewcommand*{\scap@pos}{o}%
- \or
- \renewcommand*{\scap@valign}{t}%
- \or
- \renewcommand*{\scap@valign}{c}%
- \or
- \renewcommand*{\scap@valign}{b}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax % heading
+ \@tablecaptionabovetrue
+ \@figurecaptionabovetrue
+ \@captionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \or % signature
+ \@tablecaptionabovefalse
+ \@figurecaptionabovefalse
+ \@captionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \or % tableheading
+ \@tablecaptionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \or % tablesignature
+ \@tablecaptionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \or % figureheading
+ \@figurecaptionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \or % figuresignature
+ \@figurecaptionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \or % oneline
+ \onelinecaptionstrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \or % nooneline
+ \onelinecaptionsfalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \or % rightbeside
+ \renewcommand*{\scap@pos}{r}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \or % leftbeside
+ \renewcommand*{\scap@pos}{l}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \or % innerbeside
+ \renewcommand*{\scap@pos}{i}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \or % outerbeside
+ \renewcommand*{\scap@pos}{o}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \or % topbeside
+ \renewcommand*{\scap@valign}{t}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \or % centeredbeside
+ \renewcommand*{\scap@valign}{c}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \or % bottombeside
+ \renewcommand*{\scap@valign}{b}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}
\KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
\newif\if@komalongtable\@komalongtabletrue
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -962,17 +1235,40 @@
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
}%
}
+\AtBeginDocument{%
+ \ifx\@footnotemark\scr@saved@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
+ \else\ifx\@footnotemark\scr@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
+ \fi\fi
+}
\newcommand*{\scr@footmisc@options}{}
\PassOptionsToPackage{\noexpand\scr@footmisc@options}{footmisc}
\newcommand*{\scr@saved@footnotemark}{%
@@ -990,7 +1286,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1011,33 +1307,45 @@
{chapterentrywithoutdots}{13},{chapterentryfill}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % index
\KOMAoptions{index=notoc}%
- \or
+ \or % noindex
\KOMAoptions{index=totoc}%
- \or
+ \or % listof
\KOMAoptions{listof=notoc}%
- \or
+ \or % nolistof
\KOMAoptions{listof=totoc}%
- \or
+ \or % listofnumbered
\KOMAoptions{listof=numbered}%
- \or
+ \or % nobibliography
\KOMAoptions{bibliography=nottotoc}%
- \or
+ \or % bibliography
\KOMAoptions{bibliography=totoc}%
- \or
+ \or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
- \or
+ \or % flat
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
- \or
+ \or % graduated
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
- \or
+ \or % indenttextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
\setuptoc{toc}{numberline}%
- \or
+ \or % leftaligntextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
\unsettoc{toc}{numberline}%
- \or
+ \or % chapterentrywithdots/sectionentrywithdots
\KOMAoptions{chapterentrydots=true}%
- \or
+ \or % chapterentrywithoutdots/sectionentrywithoutdots
\KOMAoptions{chapterentrydots=false}%
\fi
\fi
@@ -1066,7 +1374,15 @@
{chaptergapline}{12},{onelinechaptergap}{12}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % notoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
\chapter*
}%
@@ -1079,6 +1395,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
\addchap
}%
@@ -1091,6 +1415,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
\chapter
}%
@@ -1103,10 +1435,17 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -1114,6 +1453,7 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% entryprefix
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -1133,14 +1473,20 @@
}%
}%
}%
- \or% numberline
+ \or% indenttextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
\AtAddToTocList[float]{%
\setuptoc{\@currext}{numberline}%
}
- \or% nonumberline
+ \or% leftaligntextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -1158,6 +1504,10 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
@@ -1165,15 +1515,39 @@
\newcommand*{\@chapterlistsgap}{10\p@}
\newif\if@chaptertolists\@chaptertolistsfalse
\KOMA@key{chapteratlists}[entry]{%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}%
\ifstr{#1}{entry}{%
\@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}%
+ \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chapterentry}%
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
+ \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}%
+ {\@chapterlistsgap}%
+ \def\reserved@a{\z@}%
+ \ifx\@chapterlistsgap\reserved@a
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergap}%
+ \else
+ \def\reserved@a{10\p@}%
+ \ifx\@chapterlistsgap\reserved@a
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \else
+ \def\reserved@a{\baselineskip}%
+ \ifx\@chapterlistsgap\reserved@a
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \fi
+ \fi
+ \fi
}%
- \FamilyKeyStateProcessed
}
\BeforeTOCHead{\@chaptertolistsfalse}
-%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1192,6 +1566,16 @@
\let\newblock\@empty
\let\bib@beginhook\@empty
\let\bib@endhook\@empty
+ \@ifundefined{scr@current@bibstyle}{}{%
+ \ifstr{\scr@current@bibstyle}{}{}{%
+ \edef\reserved@a{%
+ \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
+ {\scr@current@bibstyle}%
+ }\reserved@a
+ }%
+ }%
+ \def\scr@current@bibstyle{#2}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
\csname scr@bibstyle@#1\endcsname
#3%
}%
@@ -1245,7 +1629,15 @@
{leveldown}{3},%
{standardlevel}{4}%
}{#1}%
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % notoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\section*{\bibname}%
@@ -1256,6 +1648,14 @@
\fi
}%
\or% totoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\addsec{\bibname}
@@ -1269,6 +1669,14 @@
\fi
}%
\or% numbered
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\section{\bibname}%
@@ -1283,19 +1691,29 @@
\fi
}
\or% leveldown
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
\bib@leveldowntrue
\or% standardlevel
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
\bib@leveldownfalse
\fi
}{%
- \csname scr@bibstyle@#1\endcsname
\FamilyKeyStateProcessed
+ \edef\reserved@a{%
+ \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
+ {\scr@current@bibstyle}%
+ }\reserved@a
+ \csname scr@bibstyle@#1\endcsname
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\idx@@heading}{%
\chapter*
}
@@ -1305,29 +1723,39 @@
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}%
\ifcase \@tempa\relax
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\chapter*
}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\addchap
}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}
+\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
\else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -1361,325 +1789,325 @@
\fi
\fi
}
-\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
- \ClassWarning{\KOMAClassName}{%
- Using fallback calculation to setup font sizes\MessageBreak
- for basic size `#2'}%
- \scr@ifundefinedorrelax{dimexpr}{%
- \ClassError{\KOMAClassName}{%
- feature only allowed using e-TeX%
- }{%
- The fallback calculation to setup font sizes was implemented
- using e-TeX.\MessageBreak
- You should not continue, because the fallback calculation would fail%
- }
- }{%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \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}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
+\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{fontsize}%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi
+ \expandafter\ifnum\scr@v@is@lt{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
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\partopsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \edef\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \edef\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \edef\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \normalsize
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\partopsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
- \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
+ \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
+}
+\scr@ifundefinedorrelax{changefontsizes}{%
+ \let\changefontsizes\simple@changefontsizes
+}{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\changefontsizes\space already defined.\MessageBreak
+ I hope, the definition is compatible,\MessageBreak
+ because I do not change it%
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1688,24 +2116,35 @@
\edef\@tempb{\strip@pt\@tempdimb}%
\addtolength{\@tempdimb}{-10\p@}%
\edef\@ptsize{\strip@pt\@tempdimb}%
-\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{
+\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{bk\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `bk\@tempb.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
- \changefontsizes{\@tempa}%
+ \edef\@tempa{%
+ \noexpand\changefontsizes{\@tempa}%
+ \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ }\@tempa
}%
}%
}%
@@ -1759,12 +2198,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1808,7 +2247,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1936,7 +2375,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2241,7 +2680,7 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
\scr@ifundefinedorrelax{#1numdepth}{%
@@ -2510,205 +2949,347 @@
\let\raggedsection\raggedright
\DefineFamily{KOMAarg}
\DefineFamilyMember[.dsc]{KOMAarg}
-\newcommand*{\DeclareSectionCommand}[2][]{%
- \edef\reserved@a{%
- \noexpand\FamilyStringKey[.dsc]{KOMAarg}{style}{%
- \expandafter\noexpand\csname scr@#2@style\endcsname
+\newcommand*{\DeclareSectionCommandStyleOption}[3]{%
+ \DeclareSectionCommandDummyOption{#2}%
+ \expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}%
+ }%
+}
+\newcommand*{\DeclareSectionCommandDummyOption}[1]{%
+ \@ifstar {%
+ \g@addto@macro{\scr@dsc@dummyoptions}{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}%
}%
- }\reserved@a
- \scr@ifundefinedorrelax{scr@local@levelincrease}{%
- \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
- {\scr@local@levelincrease}%
+ \g@addto@macro{\scr@dsc@dummyoptions}{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}%
+ }%
}%
- \scr@ifundefinedorrelax{scr@local@leveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
- \expandafter\noexpand\csname #2numdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
- \expandafter\noexpand\csname #2numdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@leveloffset\relax}%
- \edef\scr@local@leveloffset{%
- \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
- }%
- }%
- }%
- }\reserved@a
+}
+\newcommand*{\scr@dsc@dummyoptions}{}
+\newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{##1}%
+ \fi
+ \fi
+ }%
+}
+\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}%
+ \fi
}%
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{indent}{%
- \expandafter\noexpand\csname scr@#2@sectionindent\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{beforeskip}{%
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{afterskip}{%
- \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{font}{%
- \noexpand\IfExistskomafont{#2}{%
- \noexpand\setkomafont
+}
+\newcommand*{\DeclareSectionCommandStyleFontOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \IfExistskomafont{#3\scr@dsc@current#4}{%
+ \setkomafont
+ }{%
+ \newkomafont
+ }{#3\scr@dsc@current#4}{##1}%
+ \FamilyKeyStateProcessed
+ }%
+}
+\DeclareSectionCommandDummyOption{style}
+\DeclareSectionCommandDummyOption{expandtopt}*
+\DeclareSectionCommandDummyOption{increaselevel}
+\DeclareSectionCommandDummyOption{level}
+\DeclareSectionCommandDummyOption{toclevel}
+\DeclareSectionCommandDummyOption{tocindent}
+\DeclareSectionCommandDummyOption{tocnumwidth}
+\newcommand*{\scr@dsc@style@section@options}{}
+\DeclareSectionCommandStyleLengthOption{section}
+ {indent}{scr@}{@sectionindent}
+\DeclareSectionCommandStyleLengthOption{section}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{section}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{section}{font}{}{}
+\newcommand*{\scr@dsc@style@chapter@options}{}
+\DeclareSectionCommandStyleLengthOption{chapter}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{chapter}
+ {innerskip}{scr@}{@innerskip}
+\DeclareSectionCommandStyleLengthOption{chapter}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{chapter}{font}{}{}
+\DeclareSectionCommandStyleFontOption{chapter}{prefixfont}{}{prefix}
+\newcommand*{\scr@dsc@style@part@options}{}
+\DeclareSectionCommandStyleLengthOption{part}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{part}
+ {innerskip}{scr@}{@innerskip}
+\DeclareSectionCommandStyleLengthOption{part}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{part}{font}{}{}
+\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number}
+\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+}
+\newcommand*{\scr@dsc@style@chapter@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip}
+ {innerskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before chapter skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after chaper skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current prefix}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{prefix line font}
+ {prefixfont}%
+ }{}%
+}
+\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip}
+ {innerskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current number}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{number font}
+ {prefixfont}%
+ }{}%
+}
+\newif\ifscr@dsc@parametersonly
+\newcommand*{\DeclareSectionCommand}[2][]{%
+ \edef\scr@dsc@current{#2}%
+ \scr@dsc@dummyoptions
+ \scr@dsc@parametersonlyfalse
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \ifstr{##1}{}{%
+ \ifscr@dsc@parametersonlytrue
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@start##1}{%
+ \FamilyKeyStateUnknownValue
}{%
- \noexpand\newkomafont
- }{#2}{####1}%
- \noexpand\FamilyKeyStateProcessed
- }%
- }\reserved@a
- \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
- \let\scr@local@counterwithin\relax
- \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname #2tocdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname #2tocdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@tocleveloffset\relax}%
- \edef\scr@local@tocleveloffset{%
- \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
- }%
- }%
+ \@namedef{scr@\scr@dsc@current @style}{##1}%
+ \FamilyKeyStateProcessed
}%
- }\reserved@a
+ }%
}%
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocindent}{%
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocnumwidth}{%
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname}%
- }\reserved@a
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
\begingroup
- \scr@ifundefinedorrelax{#2numdepth}{%
- \scr@declaresectioncommanderror{#2}{section level}{level}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionindent}{%
- \scr@declaresectioncommanderror{#2}{section indent}{indent}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionbeforeskip}{%
- \scr@declaresectioncommanderror{#2}{before section skip}{beforeskip}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionafterskip}{%
- \scr@declaresectioncommanderror{#2}{after section skip}{afterskip}%
- }{}%
- \IfExistskomafont{#2}{}{%
- \scr@declaresectioncommanderror{#2}{font}{font}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@tocindent}{%
- \scr@declaresectioncommanderror{#2}{toc entry indent}{tocindent}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@tocnumwidth}{%
- \scr@declaresectioncommanderror{#2}{toc entry number
- width}{tocnumwidth}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}
+ {section command style}{style}%
}{}%
\endgroup
\@firstofone{%
- \@ifundefined{c@#2}{\newcounter{#2}}{}%
- \ifx\scr@local@counterwithin\relax
- \else\ifx\scr@local@counterwithin\@empty
- \@namedef{the#2}{\arabic{#2}}%
- \else
- \@removefromreset{#2}{\scr@local@counterwithin}%
- \@addtoreset{#2}{\scr@local@counterwithin}%
- \expandafter\def\csname the#2\expandafter\endcsname{%
- \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
- \fi
- \fi
- \@ifundefined{#2format}{%
- \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
- }{}%
- \ifstr{\csname scr@#2@style\endcsname}{}{%
- \ClassInfo{\KOMAClassName}{%
- not defining `\expandafter\string\csname #2\endcsname' due
- to\MessageBreak
- empty section style%
- }%
+ \scr@dsc@dummyoptions
+ \@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
+ \FamilyBoolKey[.dsc]{KOMAarg}{expandtopt}{scr@dsc@expandtopt}%
+ \scr@dsc@expandtoptfalse
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \scr@ifundefinedorrelax{scr@#2@style}{%
- \ClassWarning{\KOMAClassName}{using default section style}%
- \@namedef{scr@#2@style}{section}%
- }{}%
- \expandafter\edef\csname #2\endcsname{%
- \noexpand\scr@ifundefinedorrelax{%
- scr@start\csname scr@#2@style\endcsname}{%
- \noexpand\ClassError{\noexpand\KOMAClassName}{%
- section style `\csname scr@#2@style\endcsname' not defined}{%
- A not yet defined section style `\csname scr@#2@style\endcsname'
- has been setup for\MessageBreak
- `\expandafter\string\csname #2\endcsname'. You should either setup
- another style\MessageBreak
- or define the style.\MessageBreak
- If you'll continue, style `section' will be used as an emergency
- fallback.%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ }%
+ \scr@ifundefinedorrelax{scr@local@leveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
+ \expandafter\noexpand\csname \scr@dsc@current numdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
+ \expandafter\noexpand\csname \scr@dsc@current numdepth\endcsname
}%
- \noexpand\def\expandafter\noexpand\csname scr@#2@style\endcsname
- {section}%
- }{}%
- \expandafter\noexpand
- \csname scr@start\csname scr@#2@style\endcsname\endcsname
- {#2}%
- \expandafter\noexpand\csname #2numdepth\endcsname
- \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
- \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname{%
- \noexpand\ifdim\noexpand\glueexpr
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
- <\noexpand\z@
- \unexpanded{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}%
- \fi
- }%
- \noexpand\fi
\unexpanded{%
- \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ {\numexpr ##1+\scr@local@leveloffset\relax}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
}%
}%
- }%
+ }\reserved@a
}%
- \@ifundefined{DeclareSectionNumberDepth}{%
- \@ifundefined{#2markformat}{%
- \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
- }{}%
- \@ifundefined{#2mark}{%
- \expandafter\let\csname #2mark\endcsname\@gobble
- }{}%
+ \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
+ \let\scr@local@counterwithin\relax
+ \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}%
+ }\reserved@a
}{%
- \DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@tocleveloffset\relax}%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset
+ +\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
}%
- \scr@ifundefinedorrelax{#2tocdepth}{%
- \expandafter\let\csname #2tocdepth\expandafter\endcsname
- \csname #2numdepth\endcsname
- }{}%
- \expandafter\providecommand\expandafter*%
- \csname add#2tocentry\endcsname[2]{%
- \addtocentrydefault{#2}{##1}{##2}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{
+ ##1}%
+ \fi
+ \fi
}%
- \scr@ifundefinedorrelax{l@#2}{%
- \expandafter\edef\csname l@#2\endcsname{%
- \noexpand\bprot@dottedtocline
- \expandafter\noexpand\csname #2tocdepth\endcsname
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
+ ##1}%
+ \fi
+ \fi
+ }%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \begingroup
+ \scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent}
+ {tocindent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number
+ width}{tocnumwidth}%
+ }{}%
+ \@nameuse{scr@dsc@style@%
+ \@nameuse{scr@\scr@dsc@current @style}%
+ @neededoptionstest}%
+ \endgroup
+ \@firstofone{%
+ \@ifundefined{c@#2}{\newcounter{#2}}{}%
+ \ifx\scr@local@counterwithin\relax
+ \else\ifx\scr@local@counterwithin\@empty
+ \@namedef{the#2}{\arabic{#2}}%
+ \else
+ \@removefromreset{#2}{\scr@local@counterwithin}%
+ \@addtoreset{#2}{\scr@local@counterwithin}%
+ \expandafter\def\csname the#2\expandafter\endcsname{%
+ \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
+ \fi
+ \fi
+ \@ifundefined{#2format}{%
+ \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \ifscr@dsc@parametersonly
+ \ClassInfo{\KOMAClassName}{%
+ not defining `\expandafter\string\csname #2\endcsname' due
+ to\MessageBreak
+ empty section style option%
+ }%
+ \else
+ \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{%
+ \ClassWarning{\KOMAClassName}{%
+ not defining `\expandafter\string\csname #2\endcsname'
+ due\MessageBreak
+ to not yet defined section style\MessageBreak
+ `\@nameuse{scr@#2@style}'%
+ }%
+ }{%
+ \expandafter\edef\csname #2\endcsname{%
+ \expandafter\noexpand
+ \csname scr@start\csname scr@#2@style\endcsname\endcsname
+ {#2}%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
+ \expandafter\noexpand\csname scr@#2@beforeskip\endcsname
+ \expandafter\noexpand\csname scr@#2@afterskip\endcsname{%
+ \noexpand\ifdim\noexpand\glueexpr
+ \expandafter\noexpand\csname scr@#2@beforeskip\endcsname
+ <\noexpand\z@
+ \unexpanded{%
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ }%
+ \noexpand\fi
+ \unexpanded{%
+ \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ }%
+ }%
+ }%
+ }%
+ \fi
+ \@ifundefined{DeclareSectionNumberDepth}{%
+ \@ifundefined{#2markformat}{%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \@ifundefined{#2mark}{%
+ \expandafter\let\csname #2mark\endcsname\@gobble
+ }{}%
+ }{%
+ \DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
}%
- }{}%
+ \scr@ifundefinedorrelax{#2tocdepth}{%
+ \expandafter\let\csname #2tocdepth\expandafter\endcsname
+ \csname #2numdepth\endcsname
+ }{}%
+ \expandafter\providecommand\expandafter*%
+ \csname add#2tocentry\endcsname[2]{%
+ \addtocentrydefault{#2}{##1}{##2}%
+ }%
+ \scr@ifundefinedorrelax{l@#2}{%
+ \expandafter\edef\csname l@#2\endcsname{%
+ \noexpand\bprot@dottedtocline
+ \expandafter\noexpand\csname #2tocdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@tocindent\endcsname
+ \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
+ }%
+ }{}%
+ }%
}%
}
\newcommand*{\scr@declaresectioncommanderror}[3]{%
@@ -2849,7 +3430,7 @@
}%
\reserved@a
}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{style}{}%
+ \scr@dsc@dummyoptions
\FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
{\scr@local@levelincrease}%
\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
@@ -2861,14 +3442,6 @@
\the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
}%
- \DefineFamilyKey[.dsc]{KOMAarg}{indent}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{beforeskip}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{afterskip}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{font}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{counterwidthin}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
}%
}%
@@ -2985,7 +3558,7 @@
}%
}
\newcommand*{\bprot@dottedtocline}[5]{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\ifnum #1>\c@tocdepth \else
\begingroup
\@tempcnta 20010
@@ -3027,24 +3600,24 @@
\newcommand*{\partnumdepth}{%
\m@ne
}
-\newcommand*{\scr@part@sectionbeforeskip}{%
+\newcommand*{\scr@part@beforeskip}{%
\z@ \@plus 1fil + \baselineskip
}
\newcommand*{\partheadstartvskip}{%
\null\vskip-\baselineskip\vskip\@tempskipa
}
+\newcommand*{\scr@part@innerskip}{20\p@}
\newcommand*{\partheadmidvskip}{%
\par\nobreak
- \vskip 20\p@
+ \vskip\@tempskipa
}
-\newcommand*{\scr@part@sectionafterskip}{%
+\newcommand*{\scr@part@afterskip}{%
\z@ \@plus 1fil
}
\newcommand*{\partheadendvskip}{%
\vskip\@tempskipa\newpage
}
-\newcommand*{\scr@part@sectionindent}{\z@}
-\newcommand*{\scr@part@style}{}
+\newcommand*{\scr@part@style}{part}
\newcommand*{\partheademptypage}{%
\if@twoside\if@openright
\null%
@@ -3060,7 +3633,7 @@
\else
\@tempswafalse
\fi
- \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr\scr@part@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
@@ -3105,6 +3678,7 @@
\normalfont\sectfont\nobreak
\ifnumbered{part}{%
\size@partnumber{\partformat}%
+ \setlength{\@tempskipa}{\scr@part@innerskip}%
\partheadmidvskip
}{}%
\size@part{#2}\strut
@@ -3127,7 +3701,7 @@
\@endpart
}
\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}%
- \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \@tempskipa=\glueexpr\scr@part@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\partheademptypage
@@ -3152,7 +3726,7 @@
\else
\@tempswafalse
\fi
- \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr\scr@part@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
@@ -3185,16 +3759,20 @@
\scr@ds@tocentry}%
\fi
\@spart{#2}%
- \ifx\partmark\@gobble
- \@mkboth{}{}%
- \else
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \fi
+ \expandafter\addpartmark\expandafter{\scr@ds@head}%
}
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
+
+\newcommand*\addpartmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=-2
+ \partmark{#1}%
+ \endgroup
+}
\newcommand*{\parttocdepth}{\m@ne}
\let\parttocdepth\m@ne
\newcommand*{\scr@part@tocindent}{\z@}
@@ -3219,7 +3797,7 @@
\usekomafont{partentry}{#1\nobreak
\usekomafont{partentrypagenumber}{\hfil\nobreak
\hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\endgroup
\penalty20010
\else
@@ -3248,17 +3826,17 @@
\newcommand*{\use@chapter@o@preamble}{%
{%
\settoheight{\@tempdima}{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\vbox{\chapterheadstartvskip}%
}%
\settodepth{\@tempdimb}{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\vbox{\chapterheadstartvskip}%
}%
\addtolength{\@tempdima}{\@tempdimb}%
- \setbox0\vbox{%
+ \setbox\z@\vbox{%
\use@preamble{chapter@o}%
}%
\setlength{\@tempdimb}{\ht0}%
@@ -3267,7 +3845,7 @@
\vskip-\baselineskip
\vbox to \@tempdima{%
\vfill
- \box0
+ \box\z@
}%
\vss
}\vskip-\parskip\vskip-\baselineskip
@@ -3333,7 +3911,7 @@
\addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
\fi
\else
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.15}\relax\else
+ \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else
\begingroup
\let\@elt\@stpelt
\csname cl@chapter\endcsname
@@ -3377,12 +3955,12 @@
\use@preamble{chapter@u}%
}
\newcommand*{\@@makechapterhead}[1]{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}%
+ \normalfont\sectfont\nobreak\nobreak\usefontofkomafont{chapter}%
\if@mainmatter
\def\IfUseNumber{\ifnumbered{chapter}}%
\else\let\IfUseNumber\@secondoftwo\fi
@@ -3399,7 +3977,9 @@
\usekomafont{chapter}{%
\IfUsePrefixLine{%
{\usekomafont{chapterprefix}{%
- \chapterformat\chapterheadmidvskip
+ \chapterformat
+ \setlength{\@tempskipa}{\scr@chapter@innerskip}%
+ \chapterheadmidvskip
}}%
}{%
\chapterformat
@@ -3414,7 +3994,7 @@
}%
}%
\nobreak\par\nobreak
- \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadendvskip
}
@@ -3447,7 +4027,7 @@
\fi
}
\newcommand*{\@@makeschapterhead}[1]{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
@@ -3456,7 +4036,7 @@
\raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par
}%
\nobreak\par\nobreak
- \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadendvskip%
}
@@ -3509,7 +4089,7 @@
}%
\fi
\fi
- \addchapmark{\scr@ds@head}%
+ \expandafter\addchapmark\expandafter{\scr@ds@head}%
}%
\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
\AfterPackage{hyperref}{%
@@ -3530,7 +4110,7 @@
\ifnum \lastpenalty<20010
\addpenalty{-\@highpenalty}%
\fi
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}%
+ \expandafter\ifnum\scr@v@is@lt{3.15}%
\vskip 1.0em \@plus\p@
\else
\addvspace{1.0em \@plus\p@}%
@@ -3559,7 +4139,7 @@
\fi
\hfill}}\nobreak
\hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\endgroup
\penalty20009
\else
@@ -3573,7 +4153,8 @@
\newcounter{chapter}
\renewcommand*{\thechapter}{\@arabic\c@chapter}
\newcommand*{\chapterformat}{%
- \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}%
+ \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot
+ \IfUsePrefixLine{}{\enskip}}%
}
\newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }%
\thechapter\autodot\enskip}
@@ -3634,12 +4215,12 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \addsecmark{\scr@ds@head}%
+ \expandafter\addsecmark\expandafter{\scr@ds@head}%
}
\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.13a}\relax
\@afterindentfalse \vskip 1.5ex
\else
\if@noskipsec \leavevmode \fi
@@ -3652,7 +4233,7 @@
\fi
\fi
{\parindent \z@
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}#1\par\nobreak}\nobreak%
@@ -3696,8 +4277,15 @@
}
\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
\renewcommand*{\@seccntformat}[1]{%
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ \expandafter\ifnum\scr@v@is@lt{3.17}\relax
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ \else
+ \scr@ifundefinedorrelax{#1format}{%
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ }{\expandafter\protect\csname #1format\endcsname}%
+ \fi
}
\newcommand*\addsecmark[1]{%
\begingroup
@@ -3755,14 +4343,14 @@
tocindent=12em,%
tocnumwidth=6em%
]{subparagraph}
-\ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\relax
+\expandafter\ifnum\scr@v@is@lt{3.15}\relax
\let\scr@subparagraph@sectionindent\parindent
\else
\def\scr@subparagraph@sectionindent{\scr@parindent}%
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3791,7 +4379,7 @@
\setlength\fboxrule{.4\p@}
\@addtoreset{equation}{chapter}
\renewcommand*\theequation{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}\relax
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
@@ -3800,14 +4388,12 @@
}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
\newcommand*{\scr@tpo}{0}
-\newcommand*{\is@thispageodd}{%
+\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
\begingroup
\@tempcnta=\scr@tpo
\advance\@tempcnta by\@ne
\xdef\scr@tpo{\the\@tempcnta}%
- \protected@write\@auxout{\let\arabic\relax}{%
- \string\new@tpo@label{\scr@tpo}{\arabic{page}}}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\relax
\protect\G@refundefinedtrue
\ClassWarning{\KOMAClassName}{%
@@ -3822,8 +4408,15 @@
\aftergroup\thispagewasoddfalse
\fi
\endgroup
+ \edef\is@thispageodd@setlabel{%
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ }%
+ #1%
\@esphack
}
+\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
\newcommand{\ifthispageodd}{%
\is@thispageodd
@@ -3938,7 +4531,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3959,8 +4552,10 @@
Maybe you should load package `scrlayer-scrpage',\MessageBreak
before using this element%
}
-\newcommand*
- {\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*{%
+ \pagemark
+}{%
+ {\usekomafont{pagenumber}{%
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
@@ -4038,19 +4633,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-\if@twoside
- \flushbottom
-\else
- \raggedbottom
-\fi
-\if@twocolumn
- \twocolumn
- \sloppy
- \flushbottom
-\else
- \onecolumn
-\fi
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -4546,7 +5129,7 @@
\newcommand*\tablename{Table}
\newcounter{figure}[chapter]
\renewcommand*\thefigure{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}\relax
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
@@ -4577,7 +5160,7 @@
}
\newcounter{table}[chapter]
\renewcommand*\thetable{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}\relax
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
@@ -4606,7 +5189,7 @@
}{%
\end@dblfloat
}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -4744,7 +5327,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -4882,7 +5465,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -4967,7 +5550,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -5002,7 +5585,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -5106,7 +5689,7 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
\edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
@@ -5147,7 +5730,7 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
- \item\relax%
+ \item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newcommand*\descfont{\sffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 00ab0cd59e0..90e21e8ac99 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,16 +65,20 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 75d3cce607a..e1ca3ebe971 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -63,7 +63,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
+%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
\PackageWarning{scrextend}{%
@@ -75,7 +75,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -97,11 +97,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
\ProvidesPackage{scrextend}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -125,32 +129,34 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrextend.dtx 1586 2013-12-28 17:17:15Z mjk $
+%%% From File: $Id: scrextend.dtx 1980 2015-03-09 12:46:05Z kohm $
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
\AtEndOfPackage{%
\scr@ifundefinedorrelax{scr@ext@immediate@#1}{}{%
- \PackageErrorNoLine{unkown extended feature `#1'}{%
- You have used option `extendedfeature' to activate an extended feature
- named\MessageBreak
- `#1', but there is no such extended feature.\MessageBreak
- See the KOMA-Script manual for more infromation about known
- activatable\MessageBreak
+ \PackageWarningNoLine{unkown extended feature `#1'\MessageBreak
+ You have used option `extendedfeature' to\MessageBreak
+ activate an extended feature `#1',\MessageBreak
+ but there is no such extended feature.\MessageBreak
+ See the KOMA-Script manual for more\MessageBreak
+ information about known activatable\MessageBreak
extended features%
}%
}%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@xadd{.scrextend.sty}{extendedfeature}{#1}%
}
\AtEndOfPackage{%
\KOMA@key{extendedfeature}{%
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -163,6 +169,10 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ scrextend.\scr@pkgextension
+ }{version}{first}%
}{%
\PackageInfoNoLine{%
scrextend%
@@ -171,6 +181,9 @@
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrextend.\scr@pkgextension
+ }{version}{#1}%
}%
}
\AtEndOfPackage{%
@@ -240,22 +253,44 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@v@is@lt}[1]{%
+ \scr@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@gt}[1]{%
+ \scr@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@le}[1]{%
+ \numexpr\scr@compatibility-\@ne\relax<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@ge}[1]{%
+ \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
}
+\KOMA@kav@xadd{.scrextend.\scr@pkgextension}{draft}{%
+ \ifdim\overfullrule>\z@ true\else false\fi
+}
\KOMA@DeclareStandardOption
[scrextend]
{final}{draft=false}
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
@@ -287,8 +322,11 @@
\@tempa
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrextend.\scr@pkgextension
+ }{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
\expandafter\newif\csname if@titlepage\endcsname
@@ -303,14 +341,26 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ scrextend.\scr@pkgextension
+ }{titlepage}{firstiscover}%
}{%
\def\FamilyElseValue{, `firstiscover'}%
\KOMA@set@ifkey{titlepage}{@titlepage}{##1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.%
+ scrextend.\scr@pkgextension
+ }{titlepage}{firstiscover}%
+ \KOMA@kav@replacebool{.%
+ scrextend.\scr@pkgextension
+ }{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
\fi
}%
}
+\KOMA@kav@xadd{.%
+ scrextend.\scr@pkgextension
+}{titlepage}{\if@titlepage true\else false\fi}
\def\scr@ext@immediate@title{%
\scr@ext@activate{title}%
\let\scr@ext@immediate@title\relax
@@ -319,8 +369,8 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -334,6 +384,9 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ scrextend.\scr@pkgextension
+ }{cleardoublepage}{current}%
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -342,20 +395,11 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrextend.\scr@pkgextension
+ }{cleardoublepage}{#1}%
}%
}{%
- \ifx\@currname\KOMAClassName
- \ifx\@currext\@clsextension
- \ifstr{#1}{headings}{%
- \def\@tempc{\endgroup%
- \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
- \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
- \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
- \FamilyKeyStateProcessed
- }%
- }{}%
- \fi
- \fi
}%
}%
\@tempc
@@ -384,14 +428,31 @@
\cleardoublestandardpage
\fi
}
+\KOMA@kav@add{.%
+ scrextend.\scr@pkgextension
+}{cleardoublepage}{%
+ \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi
+}
+\AtEndOfPackage{%
+ \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
+ {%
+ scrextend.\scr@pkgextension
+ }{cleardoublepage}%
+ \KOMA@kav@removekey{.%
+ scrextend.\scr@pkgextension
+ }{cleardoublepage}%
+ \KOMA@kav@xadd{.%
+ scrextend.\scr@pkgextension
+ }{cleardoublepage}{\@tempa}%
+}
\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage}
\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage}
\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% 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 $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -410,17 +471,40 @@
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ scrextend.\scr@pkgextension
+ }{footnotes}{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ scrextend.\scr@pkgextension
+ }{footnotes}{nomultiple}%
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
}%
}
+\AtBeginDocument{%
+ \ifx\@footnotemark\scr@saved@footnotemark
+ \KOMA@kav@removekey{.%
+ scrextend.\scr@pkgextension
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ scrextend.\scr@pkgextension
+ }{footnotes}{nomultiple}%
+ \else\ifx\@footnotemark\scr@footnotemark
+ \KOMA@kav@removekey{.%
+ scrextend.\scr@pkgextension
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ scrextend.\scr@pkgextension
+ }{footnotes}{multiple}%
+ \fi\fi
+}
\newcommand*{\scr@footmisc@options}{}
\PassOptionsToPackage{\noexpand\scr@footmisc@options}{footmisc}
\newcommand*{\scr@saved@footnotemark}{%
@@ -438,13 +522,13 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
\else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -478,328 +562,327 @@
\fi
\fi
}
-\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
- \PackageWarning{scrextend}{%
- Using fallback calculation to setup font sizes\MessageBreak
- for basic size `#2'}%
- \scr@ifundefinedorrelax{dimexpr}{%
- \PackageError{scrextend}{%
- feature only allowed using e-TeX%
- }{%
- The fallback calculation to setup font sizes was implemented
- using e-TeX.\MessageBreak
- You should not continue, because the fallback calculation would fail%
- }
- }{%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \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}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
+\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
+ \KOMA@kav@removekey{.%
+ scrextend.\scr@pkgextension
+ }{fontsize}%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \expandafter\ifnum\scr@v@is@lt{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
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\partopsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \edef\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \edef\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \edef\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \normalsize
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\partopsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
- \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
+ \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
+}
+\scr@ifundefinedorrelax{changefontsizes}{%
+ \let\changefontsizes\simple@changefontsizes
+}{%
+ \PackageWarning{scrextend}{%
+ \string\changefontsizes\space already defined.\MessageBreak
+ I hope, the definition is compatible,\MessageBreak
+ because I do not change it%
}%
}
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -1108,10 +1191,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
\@restonecolfalse
@@ -1140,14 +1223,12 @@
\aliaskomafont{dictumtext}{dictum}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
\newcommand*{\scr@tpo}{0}
-\newcommand*{\is@thispageodd}{%
+\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
\begingroup
\@tempcnta=\scr@tpo
\advance\@tempcnta by\@ne
\xdef\scr@tpo{\the\@tempcnta}%
- \protected@write\@auxout{\let\arabic\relax}{%
- \string\new@tpo@label{\scr@tpo}{\arabic{page}}}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\relax
\protect\G@refundefinedtrue
\PackageWarning{scrextend}{%
@@ -1162,8 +1243,15 @@
\aftergroup\thispagewasoddfalse
\fi
\endgroup
+ \edef\is@thispageodd@setlabel{%
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ }%
+ #1%
\@esphack
}
+\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
\newcommand{\ifthispageodd}{%
\is@thispageodd
@@ -1179,22 +1267,22 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\ftn@rule@test@values}{%
\ifdim\ftn@rule@height <\z@
- \ClassWarning{\KOMAClassName}{%
+ \PackageWarning{scrextend}{%
You might get into trouble, because the\MessageBreak
height of the footnote rule has a value\MessageBreak
less than 0%
}%
\else
\ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
- \ClassWarning{\KOMAClassName}{%
+ \PackageWarning{scrextend}{%
You might get into trouble, because the\MessageBreak
height of the footnote rule has a value\MessageBreak
greater than \the\dimexpr\skip\footins -2.6\p@\relax
@@ -1202,14 +1290,14 @@
\fi
\fi
\ifdim\ftn@rule@width <\z@
- \ClassWarning{\KOMAClassName}{%
+ \PackageWarning{scrextend}{%
You might get into trouble, because the width\MessageBreak
or length of the footnote rule has a value\MessageBreak
less than 0pt%
}%
\else
\ifdim\ftn@rule@width >\columnwidth
- \ClassWarning{\KOMAClassName}{%
+ \PackageWarning{scrextend}{%
You might get into trouble, because the width\MessageBreak
or length of the footnote rule has a value\MessageBreak
greater than \string\columnwidth
@@ -1310,7 +1398,7 @@
\ifx\reserved@a\@makefnmark
\deffootnotemark{\textsuperscript{\thefootnotemark}}
\else
- \IfFileExists{etoolbox.sty}{%
+ \IfFileExists{etoolbox.\@pkgextension}{%
\PackageInfo{scrextend}{%
unexpected definition of `\string\@makefnmark'.\MessageBreak
Trying to patch it%
@@ -1339,7 +1427,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
\list{}{\settowidth{\labelwidth}{{%
@@ -1364,7 +1452,7 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
\edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
@@ -1405,7 +1493,7 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
- \item\relax%
+ \item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 8b89ce43aa8..af69718c235 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -42,7 +42,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,15 +64,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\ProvidesPackage{scrfontsizes}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
\ifstr{#1}{scrsize}{%
@@ -119,7 +123,7 @@
\immediate\write\@fontfile{\@percentchar^^J%
\@percentchar\space This is file `#1#2.clo', generated with^^J%
\@percentchar\space scrfontsizes
- \csname ver@scrfontsizes.sty\endcsname,^^J%
+ \csname ver@scrfontsizes.\scr@pkgextension\endcsname,^^J%
\@percentchar\space Copyright (c) Markus Kohm.^^J%
\@percentchar^^J%
\string\ProvidesFile{#1#2.clo}[%
@@ -157,7 +161,7 @@
\begingroup\footnotesize\@listi
\immediate\write\@fontfile{%
\string\def\string\footnotesize{\@percentchar^^J%
- \@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}%
+ \@ind\string\@setfontsize\string\footnotesize{\f@size}{\f@baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
\@ind\string\abovedisplayshortskip\space \the\abovedisplayshortskip^^J%
@@ -337,6 +341,8 @@
\endgroup
\immediate\write\@fontfile{%
\string\@ifundefined{@list@extra}{}{\@percentchar^^J%
+ \string\expandafter\string\ifnum\string\scr@v@is@ge{3.17}%
+ \string\par@updaterelative\string\fi^^J%
\@ind\string\l@addto@macro{\string\@listi}{\string\@list@extra}%
\@percentchar^^J%
\@ind\string\let\string\@listI=\string\@listi^^J%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 6d485f32da8..b2a4a5df1c1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,28 +65,34 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
-\@scrhack@hyperreftrue
+\KOMAExecuteOptions{hyperref=true}%
\KOMA@ifkey{float}{@scrhack@float}%
-\@scrhack@floattrue
-\KOMA@ifkey{floatrow}{@scrhack@floatrow}%
-\@scrhack@floatrowtrue
-\KOMA@ifkey{listings}{@scrhack@listings}%
-\@scrhack@listingstrue
+\KOMAExecuteOptions{float=true}%
+\KOMA@ifkey{floatrow}{@scrhack@floatrow}
+\KOMAExecuteOptions{floatrow=true}
+\KOMA@ifkey{listings}{@scrhack@listings}
+\KOMAExecuteOptions{listings=true}
+\KOMA@ifkey{setspace}{@scrhack@setspace}
+\KOMAExecuteOptions{setspace=true}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 1383 2013-10-01 15:44:28Z mjk $
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
%%% using: package,body
\newcommand{\scr@ifexpected}[2]{%
\begingroup
@@ -120,6 +126,7 @@
\PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak
detection of hyperref version, that doesn't\MessageBreak
need that hack,}%
+ \KOMAExecuteOptions[.scrhack.sty]{hyperref=false}%
}{%
\AtEndOfPackage{%
\KOMA@key[.scrhack.sty]{hyperref}{%
@@ -151,6 +158,13 @@
}%
\if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi
}
+\AfterPackage*{setspace}{%
+ \KOMA@key[.scrhack.sty]{setspace}{%
+ \PackageWarning{scrhack}{option `setspace' ignored}%
+ \FamilyKeyStateProcessed
+ }%
+ \if@scrhack@setspace\scr@hack@load\@pkgextension{setspace}\fi
+}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index fd58b674a9f..8757e2fa7f9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -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: $Id: scrjura.dtx 1908 2015-01-22 07:34:15Z kohm $
+%%% From File: $Id: scrjura.dtx 1979 2015-03-09 09:44:10Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}
- [2014/11/22 v0.9 KOMA-Script for jurists
+ [2015/03/09 v0.9a KOMA-Script for jurists
(package)%
]
\@ifpackageloaded{hyperref}{%
@@ -70,10 +70,12 @@
\fi
\else
\setcounter{juratoclevel}{#1}%
- \FamilyKeyStateProcessed
\fi
\endgroup
+ \FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.scrjura.sty}{juratotoc}{\value{juratoclevel}}%
}
+\KOMA@kav@xadd{.scrjura.sty}{juratotoc}{\value{juratoclevel}}%
\providecommand*{\toclevel@cpar}{\arabic{juratoclevel}}
\newcommand*{\cpar@numberwidth}{2em}
\newcommand*{\cpar@indent}{1.5em}
@@ -81,21 +83,40 @@
\begingroup\setlength{\@tempdima}{#1}\endgroup
\renewcommand*{\cpar@numberwidth}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.scrjura.sty}{juratocnumberwidth}{\cpar@numberwidth}%
}
+\KOMA@kav@add{.scrjura.sty}{juratocnumberwidth}{\cpar@numberwidth}
\KOMA@key{juratocindent}{%
\begingroup\setlength{\@tempdima}{#1}\endgroup
\renewcommand*{\cpar@indent}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.scrjura.sty}{juratocindent}{\cpar@indent}%
}
+\KOMA@kav@add{.scrjura.sty}{juratocindent}{\cpar@indent}%
\KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak}
\newif\ifparnumber
\KOMA@key{parnumber}[true]{%
- \ifstr{#1}{auto}{\AutoPar\FamilyKeyStateProcessed}{%
- \ifstr{#1}{manual}{\ManualPar\FamilyKeyStateProcessed}{%
+ \ifstr{#1}{auto}{%
+ \AutoPar
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.scrjura.sty}{parnumber}{manual}%
+ \KOMA@kav@remove{.scrjura.sty}{parnumber}{auto}%
+ \KOMA@kav@add{.scrjura.sty}{parnumber}{auto}%
+ }{%
+ \ifstr{#1}{manual}{%
+ \ManualPar
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.scrjura.sty}{parnumber}{manual}%
+ \KOMA@kav@remove{.scrjura.sty}{parnumber}{auto}%
+ \KOMA@kav@add{.scrjura.sty}{parnumber}{manual}%
+ }{%
\KOMA@set@ifkey{parnumber}{parnumber}{#1}%
+ \KOMA@kav@replacebool{.scrjura.sty}{parnumber}{parnumber}%
}%
}%
}
+\KOMA@kav@add{.scrjura.sty}{parnumber}{true}
+\KOMA@kav@add{.scrjura.sty}{parnumber}{auto}
\newcommand*{\Clausemark}[1]{}
\KOMA@key{paragraphmark}{%
\begingroup
@@ -135,10 +156,14 @@
\else
\endgroup
\fi
+ \FamilyKeyStateProcessed
\else
\endgroup
+ \FamilyKeyStateUnknownValue
\fi
+ \KOMA@kav@xreplacevalue{.scrjura.sty}{paragraphmark}{#1}%
}
+\KOMA@kav@add{.scrjura.sty}{paragraphmark}{false}
\KOMA@DeclareDeprecatedOption[scrjura]{markright}{paragraphmark=forceright}
\KOMA@DeclareDeprecatedOption[scrjura]{markboth}{paragraphmark=forceboth}
\newcommand*{\parcite@format}{0}
@@ -161,6 +186,7 @@
{ParagraphOnly}{44},{OnlyParagraph}{44}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
\@tempcnta=\@tempa\relax
\@tempcntb=\z@
\@whilenum \@tempcnta>9 \do{%
@@ -195,9 +221,34 @@
\aftergroup\def\aftergroup\sentencecite@format
\aftergroup{\aftergroup-\aftergroup1\aftergroup}%
\fi
+ \else
+ \aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrjura.sty}{ref}%
+ \ifcase\parcite@format
+ \KOMA@kav@add{.scrjura.sty}{ref}{parlong}%
+ \or
+ \KOMA@kav@add{.scrjura.sty}{ref}{parshort}%
+ \or
+ \KOMA@kav@add{.scrjura.sty}{ref}{parnumeric}%
+ \or
+ \KOMAQkav@add{.scrjura.sty}{ref}{paroff}%
+ \fi
+ \ifcase\sentencecite@format
+ \KOMA@kav@add{.scrjura.sty}{ref}{sentencelong}%
+ \or
+ \KOMA@kav@add{.scrjura.sty}{ref}{sentenceshort}%
+ \or
+ \KOMA@kav@add{.scrjura.sty}{ref}{sentencenumeric}%
+ \or
+ \KOMA@kav@add{.scrjura.sty}{ref}{sentenceoff}%
+ \fi
+ \fi
}
+\KOMA@kav@add{.scrjura.sty}{ref}{parlong}%
+\KOMA@kav@add{.scrjura.sty}{ref}{sentencelong}%
\KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
\KOMAProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index bfc4d9fcf7a..63f70bf603a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,47 +66,267 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (%
KOMA-Script-dependent
basics and keyval usage)]
\RequirePackage{scrbase}[\KOMAScriptVersion]
\newcommand*{\KOMA@key}[1][.\@currname.\@currext]{%
- \DefineFamilyMember{KOMA}%
- \DefineFamilyKey[#1]{KOMA}%
+ \DefineFamilyMember[{#1}]{KOMA}%
+ \@ifundefined{scr@kav@KOMA#1}{\@namedef{scr@kav@KOMA#1}{}}{}%
+ \DefineFamilyKey[{#1}]{KOMA}%
+}
+\newcommand*{\KOMA@kav@add}[3]{%
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@add{#1}%
+ }{%
+ \expandafter\l@addto@macro\csname scr@kav@KOMA#1\endcsname{\do{{#2}{#3}}}%
+ }%
+}
+\newcommand*{\KOMA@kav@xadd}[3]{%
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@xadd{#1}%
+ }{%
+ \protected@edef\reserved@a{{#2}{#3}}%
+ \expandafter\l@addto@macro\csname scr@kav@KOMA#1\expandafter\endcsname
+ \expandafter{\expandafter\do\expandafter{\reserved@a}}%
+ }%
+}
+\newcommand*{\KOMA@kav@remove}[3]{%
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@remove{#1}%
+ }{%
+ \begingroup
+ \def\reserved@a{\endgroup\@namedef{scr@kav@KOMA#1}{}}%
+ \edef\reserved@b{\detokenize{{#2}{#3}}}%
+ \def\do##1{%
+ \edef\reserved@c{\detokenize{##1}}%
+ \ifx\reserved@b\reserved@c\else
+ \l@addto@macro\reserved@a{%
+ \expandafter\l@addto@macro\csname scr@kav@KOMA#1\endcsname{%
+ \do{##1}%
+ }%
+ }%
+ \fi
+ }%
+ \@nameuse{scr@kav@KOMA#1}%
+ \reserved@a
+ }%
+}
+\newcommand*{\KOMA@kav@removekey}[2]{%
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@removekey{#1}%
+ }{%
+ \begingroup
+ \def\reserved@a{\endgroup\@namedef{scr@kav@KOMA#1}{}}%
+ \edef\reserved@b{\detokenize{#2}}%
+ \def\reserved@d##1##2{\edef\reserved@c{\detokenize{##1}}}%
+ \def\do##1{%
+ \reserved@d##1\relax
+ \ifx\reserved@b\reserved@c\else
+ \l@addto@macro\reserved@a{%
+ \expandafter\l@addto@macro\csname scr@kav@KOMA#1\endcsname{%
+ \do{##1}%
+ }%
+ }%
+ \fi
+ }%
+ \@nameuse{scr@kav@KOMA#1}%
+ \reserved@a
+ }%
+}
+\newcommand*{\KOMA@kav@replacevalue}[3]{%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@replacevalue{#1}%
+ }{%
+ \KOMA@kav@removekey{#1}{#2}%
+ \KOMA@kav@add{#1}{#2}{#3}%
+ }%
+ \fi
+}
+\newcommand*{\KOMA@kav@xreplacevalue}[3]{%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@replacevalue{#1}%
+ }{%
+ \KOMA@kav@removekey{#1}{#2}%
+ \KOMA@kav@xadd{#1}{#2}{#3}%
+ }%
+ \fi
+}
+\newcommand*{\KOMA@kav@replacebool}[3]{%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{scr@kav@KOMA#1}{%
+ \KOMA@internal@error\KOMA@kav@replacebool{#1}%
+ }{%
+ \KOMA@kav@remove{#1}{#2}{false}%
+ \KOMA@kav@remove{#1}{#2}{true}%
+ \expandafter\ifx\csname if#3\expandafter\endcsname
+ \csname iftrue\endcsname
+ \KOMA@kav@xadd{#1}{#2}{true}%
+ \else
+ \KOMA@kav@xadd{#1}{#2}{false}%
+ \fi
+ }%
+ \fi
+}
+\newcommand*{\KOMA@kav@defall}[2]{%
+ \@ifundefined{scr@kav@KOMA#2}{%
+ \KOMA@internal@error\KOMA@kav@defall{#1}%
+ }{%
+ \begingroup
+ \let\reserved@a\@empty
+ \def\reserved@b##1##2{\l@addto@macro\reserved@a{,{##1=##2}}}%
+ \def\do##1{\reserved@b##1}%
+ \@nameuse{scr@kav@KOMA#2}%
+ \ifx\reserved@a\@empty
+ \def\reserved@b{\endgroup\let#1\@empty}%
+ \else
+ \edef\reserved@b{%
+ \unexpanded{\endgroup\def#1}{%
+ \unexpanded
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@gobble\reserved@a}}}%
+ \fi
+ \reserved@b
+ }%
+}
+\newcommand*{\KOMA@kav@defone}[3]{%
+ \@ifundefined{scr@kav@KOMA#2}{%
+ \KOMA@internal@error\KOMA@kav@defall{#1}%
+ }{%
+ \begingroup
+ \let\reserved@a\@empty
+ \def\reserved@b##1##2{%
+ \ifstr{##1}{#3}{\l@addto@macro\reserved@a{,{##2}}}{}%
+ }%
+ \def\do##1{\reserved@b##1}%
+ \@nameuse{scr@kav@KOMA#2}%
+ \ifx\reserved@a\@empty
+ \def\reserved@b{\endgroup\let#1\@empty}%
+ \else
+ \edef\reserved@b{%
+ \unexpanded{\endgroup\def#1}{%
+ \unexpanded
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@gobble\reserved@a}}}%
+ \fi
+ \reserved@b
+ }%
+}
+\newcommand*{\KOMA@internal@error}[2]{%
+ \PackageError{scrkbase}{internal error using \string#1{#2}}{%
+ You've found an internal error either in KOMA-Script or a third
+ party\MessageBreak
+ definition, that uses KOMA-Script internal macros.\MessageBreak
+ Please send a bug report with a minimal but complete example,
+ that\MessageBreak
+ shows this error, to komascript at gmx dot info or report it
+ at\MessageBreak
+ <http://www.komascript.de/forum/20> (you need an account to do so).%
+ }%
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\RequirePackage{scrlfile}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
}
\newcommand*{\KOMAoptions}{\FamilyOptions{KOMA}}
+\newcommand*{\KOMAoptionsOf}[2][\@firstofone]{%
+ \scr@ifundefinedorrelax{scr@kav@KOMA.#2}{%
+ \PackageError{scrkbase}{\string\KOMAoptionsOf\space not supported}{%
+ #2 is not the name of a KOMA-Script package or\MessageBreak
+ KOMA-Script class, that supports \string\KOMAoptionsOf.}%
+ }{%
+ \begingroup
+ \def\reserved@a{#1}%
+ \KOMA@kav@defall\reserved@b{.#2}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\reserved@a\expandafter{\reserved@b}%
+ }%
+}
+\newcommand*{\KOMAoptionOf}[3][\@firstofone]{%
+ \scr@ifundefinedorrelax{scr@kav@KOMA.#2}{%
+ \PackageError{scrkbase}{\string\KOMAoptionOf\space not supported}{%
+ #2 is not the name of a KOMA-Script package or\MessageBreak
+ KOMA-Script class, that supports \string\KOMAoptionOf.}%
+ }{%
+ \begingroup
+ \def\reserved@a{#1}%
+ \KOMA@kav@defone\reserved@b{.#2}{#3}%
+ \ifx\reserved@b\@empty
+ \PackageWarning{scrkbase}{option `#3' for `#2' unset}%
+ \endgroup
+ \else
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\reserved@a\expandafter{\reserved@b}%
+ \fi
+ }%
+}
\newcommand*{\AfterKOMAoptions}{}
\let\AfterKOMAoptions\AtEndOfFamilyOptions
\newcommand*{\KOMAoption}{\FamilyOption{KOMA}}
\newcommand*{\KOMA@unknown@keyval}{\FamilyUnknownKeyValue{KOMA}}
-\newcommand*{\KOMA@ifkey}{%
- \DefineFamilyMember{KOMA}%
- \FamilyBoolKey{KOMA}%
+\newcommand*{\KOMA@ifkey}[2][.\@currname.\@currext]{%
+ \begingroup\edef\reserved@a{\noexpand\KOMA@@ifkey{#1}{#2}}%
+ \expandafter\endgroup\reserved@a
+}
+\newcommand*{\KOMA@@ifkey}[3]{%
+ \@ifundefined{if#3}{%
+ \expandafter\newif\csname if#3\endcsname
+ }{}%
+ \KOMA@key[{#1}]{#2}[true]{%
+ \KOMA@set@ifkey{#2}{#3}{##1}%
+ \KOMA@kav@replacebool{#1}{#2}{#3}%
+ }%
+ \csname if#3\endcsname
+ \KOMA@kav@xadd{#1}{#2}{true}%
+ \else
+ \KOMA@kav@xadd{#1}{#2}{false}%
+ \fi
}
\newcommand*{\KOMA@set@ifkey}{\FamilySetBool{KOMA}}
-\newcommand*{\KOMA@ncmdkey}{%
- \DefineFamilyMember{KOMA}%
- \FamilyNumericalKey{KOMA}%
+\newcommand*{\KOMA@ncmdkey}[2][.\@currname.\@currext]{%
+ \begingroup\edef\reserved@a{\noexpand\KOMA@@ncmdkey{#1}{#2}}%
+ \expandafter\endgroup\reserved@a
+}
+\newcommand*{\KOMA@@ncmdkey}[2]{%
+ \@ifnextchar [%]
+ {\KOMA@@@ncmdkey{#1}{#2}}{\KOMA@@@ncmdkey{#1}{#2}[]}
+}
+\newcommand*{\KOMA@@@cmdkey}{}
+\def\KOMA@@@ncmdkey#1#2[#3]#4#5{%
+ \@ifundefined{#4}{\@namedef{#4}{0}}{}%
+ \ifx\relax#3\relax
+ \KOMA@key[{#1}]{#2}{%
+ \KOMA@set@ncmdkey{#2}{#4}{#5}{##1}%
+ \KOMA@kav@replacevalue{#1}{#2}{##1}%
+ }%
+ \else
+ \KOMA@key[{#1}]{#2}[{#3}]{%
+ \KOMA@set@ncmdkey{#2}{#4}{#5}{##1}%
+ \KOMA@kav@replacevalue{#1}{#2}{##1}%
+ }%
+ \fi
}
\newcommand*{\KOMA@set@ncmdkey}{\FamilySetNumerical{KOMA}}
\newcommand*{\KOMA@DeclareDeprecatedOption}{%
@@ -190,7 +410,7 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*{\IfExistskomafont}[1]{%
\@ifundefined{scr@fnt@#1}{%
\@ifundefined{scr@fnt@instead@#1}{\@secondoftwo}{\@firstoftwo}%
@@ -287,69 +507,70 @@
}
\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
+ \scr@prepareforkomafont
+ \sbox\@tempboxa{%
+ \usekomafont{#1}{%
+ \xdef\g@scr@usefont{%
+ \noexpand\fontsize{\f@size}{\f@baselineskip}\noexpand\selectfont
+ }%
+ }%
}%
- \selectfont
+ \endgroup
+ \g@scr@usefont
}
\newcommand*{\usefamilyofkomafont}{\use@ofkomafont{family}}
\newcommand*{\useseriesofkomafont}{\use@ofkomafont{series}}
-\newcommand*{\useshaperofkomafont}{\use@ofkomafont{shape}}
+\newcommand*{\useshapeofkomafont}{\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
+ \scr@prepareforkomafont
+ \sbox\@tempboxa{%
+ \usekomafont{#1}{%
+ \xdef\g@scr@usefont{%
\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
+ \noexpand\usefont{\f@encoding}{\f@family}{\f@series}{\f@shape}%
+ }%
+ }%
}%
- \selectfont
+ \endgroup
+ \g@scr@usefont
}
\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}%
+ \scr@prepareforkomafont
+ \sbox\@tempboxa{%
+ \usekomafont{#2}{%
+ \xdef\g@scr@usefont{%
+ \expandafter\noexpand
+ \csname font#1\endcsname{\csname f@#1\endcsname}\noexpand\selectfont
}%
- \fi
- \reserved@a
+ }%
}%
- \selectfont
+ \endgroup
+ \g@scr@usefont
+}
+\newcommand*{\g@scr@usefont}{%
+ \PackageError{scrkbase}{%
+ undefined usage of \string\g@scr@usefont
+ }{%
+ \string\g@scr@usefont\space is an internal macro of KOMA-Script and
+ should\MessageBreak
+ not be used this way.\MessageBreak
+ This may be an internal error of KOMA-Script, a mistake of a package
+ author,\MessageBreak
+ or a mistake of the user.%
+ }%
+}
+\newcommand*{\scr@komafontrelaxlist}{%
+ \do\color \do\normalcolor
+ \do\uppercase \do\lowercase \do\MakeUppercase \do\MakeLowercase
+}
+\newcommand*{\scr@prepareforkomafont}{%
+ \long\def\do##1{\let##1\relax}\scr@komafontrelaxlist
+}
+\newcommand*{\addtokomafontrelaxlist}[1]{%
+ \l@addto@macro\scr@komafontrelaxlist{\do#1}%
}
\newcommand*{\newkomafont}[3][\relax]{%
\expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
index c6b1a2365d4..bae97046942 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -52,7 +52,7 @@
2014/06/03 v0.1.1760 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -83,7 +83,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -113,10 +113,15 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{markcase}%
+ \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \fi
+}
+\KOMA@key{autooneside}[true]{%
+ \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}%
}
-\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{%
@@ -127,100 +132,161 @@
\fi
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{automark}{}%
}
-\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
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{manualmark}{}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+}
+\KOMA@key{deactivatepagestylelayers}[true]{%
+ \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
+ {scrlayer@deactivate@layers}%
+}
+\KOMA@key{draft}[true]{%
+ \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}%
+}
+\KOMA@key{forceoverwrite}[true]{%
+ \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}%
+}
+\KOMA@key{autoremoveinterfaces}[true]{%
+ \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
+ {scrlayer@autoremoveinterfaces}%
}
-\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 1760 2014-06-03 08:28:36Z kohm $ (options)
\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body)
\KOMAProcessOptions\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autooneside\endcsname\relax
+\expandafter\let\csname KV@KOMA.\@currname.\@currext @automark\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @automark@default\endcsname\relax
+\expandafter\let\csname KV@KOMA.\@currname.\@currext @manualmark\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @manualmark@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsselect\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsselect@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsinit\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsinit@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoneside\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoneside@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpstwoside\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpstwoside@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoddpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoddpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsevenpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsevenpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsfloatpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsfloatpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsbackground\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsbackground@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsforeground\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsforeground@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers\endcsname
+ \relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default\endcsname
+ \relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @draft\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @draft@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @forceoverwrite\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @forceoverwrite@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
+ \relax
%%% From File: $Id: scrlayer-notecolumn.dtx 1760 2014-06-03 08:28:36Z kohm $ (body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
index c977855c1f5..a2e4bd938b2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -45,13 +45,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (identify)
+%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -62,7 +62,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (init)
+%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (init)
\AtEndOfPackage{%
\sls@auto@pagestyleset%
}
@@ -78,7 +78,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
\begingroup
@@ -109,11 +109,16 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{markcase}%
+ \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \fi
}%
}
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @markcase}
-\KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue
-\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autooneside}
+\KOMA@key{autooneside}[true]{%
+ \KOMA@set@ifkey{autooneside}{scrlayer@autooneside}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}%
+}
\KOMA@key{automark}[]{%
\scrlayer@testunexpectedarg{automark}{#1}%
\scrlayer@AtEndOfPackage{%
@@ -124,95 +129,87 @@
\fi
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{automark}{}%
}
-\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
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{manualmark}{}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}%
}
-\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
+ \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
+}
+\KOMA@key{deactivatepagestylelayers}[true]{%
+ \KOMA@set@ifkey{deactivatepagestylelayers}{scrlayer@deactivate@layers}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{deactivatepagestylelayers}
+ {scrlayer@deactivate@layers}%
+}
+\KOMA@key{draft}[true]{%
+ \KOMA@set@ifkey{draft}{scrlayer@draft}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{draft}{scrlayer@draft}%
+}
+\KOMA@key{forceoverwrite}[true]{%
+ \KOMA@set@ifkey{forceoverwrite}{scrlayer@forceoverwrite}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{forceoverwrite}{scrlayer@forceoverwrite}%
}
-\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 1899 2015-01-08 08:57:02Z kohm $ (options)
+\KOMA@key{autoremoveinterfaces}[true]{%
+ \KOMA@set@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}{#1}%
+ \KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
+ {scrlayer@autoremoveinterfaces}%
+}
+%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (options)
\KOMA@key{headwidth}{%
\begingroup
\sls@split@at@iicolons#1:::\@nil
@@ -220,9 +217,12 @@
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\sls@set@hf@width{head}{\reserved@b}{\reserved@c}{\reserved@a}%
+ \noexpand\FamilyKeyStateProcessed
+ \noexpand\KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{headwidth}{%
+ \reserved@a:\reserved@b:\reserved@c
+ }%
}%
\reserved@a
- \FamilyKeyStateProcessed
}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headwidth@default}
@@ -233,9 +233,12 @@
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\sls@set@hf@width{foot}{\reserved@b}{\reserved@c}{\reserved@a}%
+ \noexpand\FamilyKeyStateProcessed
+ \noexpand\KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{footwidth}{%
+ \reserved@a:\reserved@b:\reserved@c
+ }%
}%
\reserved@a
- \FamilyKeyStateProcessed
}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footwidth@default}
@@ -316,21 +319,25 @@
\scrlayerAddToInterface\sls@headwidth{%
\scr@ifundefinedorrelax{@headwidth}{%
\newcommand*{\sls@headwidth}{\textwidth}%
+ \KOMA@kav@add{.scrlayer-scrpage.sty}{headwidth}{\textwidth:0pt:0pt}%
}{%
\newcommand*{\sls@headwidth}{\@headwidth}%
+ \KOMA@kav@xadd{.scrlayer-scrpage.sty}{headwidth}{\@headwidth:0pt:0pt}%
}%
}
-\scrlayerAddToInterface\sls@oddheadshift{\newcommand*{\sls@oddheadshift}{\z@}}
-\scrlayerAddToInterface\sls@evenheadshift{\newcommand*{\sls@evenheadshift}{\z@}}
+\scrlayerAddToInterface\sls@oddheadshift{\newcommand*{\sls@oddheadshift}{0pt}}
+\scrlayerAddToInterface\sls@evenheadshift{\newcommand*{\sls@evenheadshift}{0pt}}
\scrlayerAddToInterface\sls@footwidth{%
\scr@ifundefinedorrelax{@footwidth}{%
\newcommand*{\sls@footwidth}{\textwidth}%
+ \KOMA@kav@add{.scrlayer-scrpage.sty}{footwidth}{\textwidth:0pt:0pt}
}{%
\newcommand*{\sls@footwidth}{\@footwidth}%
+ \KOMA@kav@xadd{.scrlayer-scrpage.sty}{footwidth}{\@footwidth:0pt:0pt}
}%
}
-\scrlayerAddToInterface\sls@oddfootshift{\newcommand*{\sls@oddfootshift}{\z@}}
-\scrlayerAddToInterface\sls@evenfootshift{\newcommand*{\sls@evenfootshift}{\z@}}
+\scrlayerAddToInterface\sls@oddfootshift{\newcommand*{\sls@oddfootshift}{0pt}}
+\scrlayerAddToInterface\sls@evenfootshift{\newcommand*{\sls@evenfootshift}{0pt}}
\scrlayerAddToInterface\sls@settotwidthof{%
\newcommand*{\sls@settowidthof}[2]{%
\ifstr{#2}{paper}{%
@@ -401,67 +408,83 @@
}%
}%
}
-\KOMA@key{headtopline}[:]{\sls@set@values{head}{above}{#1}}
+\KOMA@key{headtopline}[:]{%
+ \sls@set@values[headtopline]{head}{above}{#1}%
+}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headtopline}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headtopline@default}
-\KOMA@key{headsepline}[:]{\sls@set@values{head}{below}{#1}}
+\KOMA@key{headsepline}[:]{%
+ \sls@set@values[headsepline]{head}{below}{#1}%
+}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headsepline}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@headsepline@default}
-\KOMA@key{footsepline}[:]{\sls@set@values{foot}{above}{#1}}
+\KOMA@key{footsepline}[:]{%
+ \sls@set@values[footsepline]{foot}{above}{#1}%
+}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footsepline}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footsepline@default}
-\KOMA@key{footbotline}[:]{\sls@set@values{foot}{below}{#1}}
+\KOMA@key{footbotline}[:]{%
+ \sls@set@values[footbotline]{foot}{below}{#1}%
+}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@footbotline@default}
\scrlayerAddToInterface\sls@set@values{%
- \newcommand*{\sls@set@values}[3]{%
+ \newcommand*{\sls@set@values}[4][]{%
\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@}}{%
- }%
- }%
+ \ifstr{#1}{}{%
+ \FamilyKeyStateUnknown
+ }{%
+ \KOMA@set@ifkey{#1}{@tempswa}{#4}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \edef\reserved@b{%
+ \noexpand\endgroup
+ \noexpand\@namedef{sls@#2#3@linethickness}{.4pt}%
+ \noexpand\@namedef{sls@#2#3@linelength}{%
+ \expandafter\noexpand\csname sls@#2width\endcsname
}%
}%
- }%
- }%
- \ifx\reserved@a\@empty
- \sls@split@at@colon#3::\@nil
+ \else
+ \def\reserved@b{%
+ \endgroup
+ \@namedef{sls@#2#3@linethickness}{0pt}%
+ \@namedef{sls@#2#3@linelength}{0pt}%
+ }%
+ \fi
+ \else
+ \let\reserved@a\@empty
+ \let\reserved@b\@empty
+ \sls@split@at@colon#4::\@nil
\ifx\reserved@a\@empty
- \def\reserved@a{\endgroup\@namedef{sls@#1#2@linethickness}{.4pt}}%
+ \def\reserved@a{\endgroup\@namedef{sls@#2#3@linethickness}{.4pt}}%
\else
\setlength{\@tempdima}{\dimexpr\reserved@a\relax}%
\edef\reserved@a{%
\noexpand\endgroup
- \noexpand\@namedef{sls@#1#2@linethickness}{\the\@tempdima}%
+ \noexpand\@namedef{sls@#2#3@linethickness}{\the\@tempdima}%
}%
\fi
\ifx\reserved@b\@empty
\def\reserved@b{%
\reserved@a
- \@namedef{sls@#1#2@linelength}{\@nameuse{sls@#1width}}%
+ \@namedef{sls@#2#3@linelength}{\@nameuse{sls@#2width}}%
}%
\else
\edef\reserved@b{%
\noexpand\reserved@a
- \noexpand\sls@deftowidthof{sls@#1#2@linelength}{\reserved@b}%
+ \noexpand\sls@deftowidthof{sls@#2#3@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
+ \FamilyKeyStateProcessed
+ \ifstr{#1}{}{}{%
+ \KOMA@kav@xreplacevalue{.scrlayer-scrpage.sty}{#1}{%
+ \csname sls@#2#3@linethickness\endcsname
+ :\csname sls@#2#3@linelength\endcsname
+ }%
+ }%
}%
}
\scrlayerAddToInterface\sls@split@at@colon{%
@@ -483,26 +506,38 @@
\newcommand*{\sls@headabove@linelength}{\sls@headwidth}%
}
\scrlayerAddToInterface\sls@headabove{%
- \newcommand*{\sls@headabove@linethickness}{\z@}%
+ \newcommand*{\sls@headabove@linethickness}{0pt}%
}
+\KOMA@kav@xadd{.scrlayer-scrpage.sty}{headtopline}{%
+ \expandafter\noexpand\sls@headabove@linethickness:%
+ \expandafter\noexpand\sls@headabove@linelength}
\scrlayerAddToInterface\sls@headbelow@linelength{%
\newcommand*{\sls@headbelow@linelength}{\sls@headwidth}%
}
\scrlayerAddToInterface\sls@headbelow@linethickness{%
- \newcommand*{\sls@headbelow@linethickness}{\z@}%
+ \newcommand*{\sls@headbelow@linethickness}{0pt}%
}
+\KOMA@kav@xadd{.scrlayer-scrpage.sty}{headsepline}{%
+ \expandafter\noexpand\sls@headbelow@linethickness:%
+ \expandafter\noexpand\sls@headbelow@linelength}
\scrlayerAddToInterface\sls@footabove@linelength{%
\newcommand*{\sls@footabove@linelength}{\sls@footwidth}%
}
\scrlayerAddToInterface\sls@footabove@linethickness{%
- \newcommand*{\sls@footabove@linethickness}{\z@}%
+ \newcommand*{\sls@footabove@linethickness}{0pt}%
}
+\KOMA@kav@xadd{.scrlayer-scrpage.sty}{footsepline}{%
+ \expandafter\noexpand\sls@footabove@linethickness:%
+ \expandafter\noexpand\sls@footabove@linelength}
\scrlayerAddToInterface\sls@footbelow@linelength{%
\newcommand*{\sls@footbelow@linelength}{\sls@footwidth}%
}
\scrlayerAddToInterface\sls@footbelow@linethickness{%
- \newcommand*{\sls@footbelow@linethickness}{\z@}%
+ \newcommand*{\sls@footbelow@linethickness}{0pt}%
}
+\KOMA@kav@xadd{.scrlayer-scrpage.sty}{footbotline}{%
+ \expandafter\noexpand\sls@footbelow@linethickness:%
+ \expandafter\noexpand\sls@footbelow@linelength}
\scrlayerAddCsToInterface{ifsls@plain@head@above@line}{%
\KOMA@ifkey{plainheadtopline}{sls@plain@head@above@line}%
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@plainheadtopline}%
@@ -538,10 +573,15 @@
\scrlayerAddToInterface\sls@hfline@adjust{%
\newcommand*{\sls@hfline@adjust}{0}%
}
+\KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{}
\KOMA@key{ilines}[]{%
\ifx\relax#1\relax
\renewcommand*{\sls@hfline@adjust}{0}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{ilines}%
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{clines}%
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{olines}%
+ \KOMA@kav@add{.scrlayer-scrpage.sty}{ilines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -552,6 +592,10 @@
\ifx\relax#1\relax
\renewcommand*{\sls@hfline@adjust}{1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{ilines}%
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{clines}%
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{olines}%
+ \KOMA@kav@add{.scrlayer-scrpage.sty}{clines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -562,6 +606,10 @@
\ifx\relax#1\relax
\renewcommand*{\sls@hfline@adjust}{2}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{ilines}%
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{clines}%
+ \KOMA@kav@removekey{.scrlayer-scrpage.sty}{olines}%
+ \KOMA@kav@add{.scrlayer-scrpage.sty}{olines}{}%
\else
\def\FamilyKeyStateProcessed{unexpected value}%
\fi
@@ -575,6 +623,7 @@
\let\sls@auto@pagestyleset\relax
\@nameuse{sls@ps@style@#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.scrlayer-scrpage.sty}{pagestyleset}{#1}%
}%
}
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@pagestyleset}
@@ -640,9 +689,78 @@
\scrlayer@AddCsToInterface{KV@KOMA.scrlayer-scrpage.sty@hmode@default}%
\scrlayer@AddCsToInterface{sls@leavevmode@linetrue}
\scrlayer@AddCsToInterface{sls@leavevmode@linefalse}
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 1899 2015-01-08 08:57:02Z kohm $ (body)
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @markcase\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autooneside\endcsname\relax
+\expandafter\let\csname KV@KOMA.\@currname.\@currext @automark\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @automark@default\endcsname\relax
+\expandafter\let\csname KV@KOMA.\@currname.\@currext @manualmark\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @manualmark@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsselect\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsselect@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsinit\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsinit@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoneside\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoneside@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpstwoside\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpstwoside@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoddpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsoddpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsevenpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsevenpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsfloatpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsfloatpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsnonfloatpage@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsbackground\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsbackground@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsforeground\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @onpsforeground@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers\endcsname
+ \relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @deactivatepagestylelayers@default\endcsname
+ \relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @draft\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @draft@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @forceoverwrite\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @forceoverwrite@default\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces\endcsname\relax
+\expandafter\let
+ \csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
+ \relax
+%%% From File: $Id: scrlayer-scrpage.dtx 2070 2015-04-08 09:02:19Z kohm $ (body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
\KOMAoptions{headwidth=#2:#1}%
@@ -683,12 +801,24 @@
}
\scrlayerAddToInterface\sls@@@setline{%
\def\sls@@@setline#1#2{%
- \edef\@tempa{#2}\edef\@tempb{current}
+ \edef\@tempa{#2}\edef\@tempb{current}%
\ifstr{#2}{}{}{%
\ifstr{#2}{current}{}{%
\setlength{\@tempdima}{#2}%
- \expandafter\edef\csname sls@#1@linethickness\endcsname%
- {\the\@tempdima}%
+ \ifstr{#1}{headabove}{%
+ \KOMAExecuteOptions[.scrlayer-scrpage.sty]{headtopline=\@tempdima}%
+ }{\ifstr{#1}{headbelow}{%
+ \KOMAExecuteOptions[.scrlayer-scrpage.sty]{headsepline=\@tempdima}%
+ }{%
+ \ifstr{#1}{footabove}{%
+ \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ {footsepline=\@tempdima}%
+ }{%
+ \KOMAExecuteOptions[.scrlayer-scrpage.sty]%
+ {footbotline=\@tempdima}%
+ }%
+ }%
+ }%
}%
}%
\PackageWarning{scrlayer-scrpage}{%
@@ -1032,7 +1162,7 @@
\newcommand*{\headfont}{\normalcolor\slshape}%
}{}
}{}
-\scr@ifundefinedorrelax{scr@wrn@pagehead}{}{%
+\scr@ifundefinedorrelax{scr@fnt@wrn@pagehead}{}{%
\PackageInfo{scrlayer-scrpage}{%
deactivating warning for font element\MessageBreak
`pagehead'}%
@@ -1046,7 +1176,7 @@
\scrlayer@AddCsToInterface{footfont}%
}{}%
}{}
-\scr@ifundefinedorrelax{scr@fnt@pagefoot}{}{%
+\scr@ifundefinedorrelax{scr@fnt@wrn@pagefoot}{}{%
\PackageInfo{scrlayer-scrpage}{%
deactivating warning for font element\MessageBreak
`pagefoot'}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index 34ba0cffb1b..58118f0cb1a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -43,13 +43,13 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (identify)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (init)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (init)
\RequirePackage{scrkbase}[2013/03/05]
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
\AtEndOfPackage{\let\scrlayer@AtEndOfPackage\@firstofone}%
@@ -113,7 +113,7 @@
\setlength{\footheight}{\baselineskip}
\fi
}
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (options)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (options)
\KOMA@key{markcase}{%
\begingroup
\KOMA@set@ncmdkey{markcase}{reserved@a}{%
@@ -143,8 +143,21 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{markcase}%
+ \KOMA@kav@xadd{.scrlayer.sty}{markcase}{#1}%
+ \fi
}
-\providecommand*{\MakeMarkcase}[1]{#1}
+\@ifundefined{MakeMarkcase}{\let\MakeMarkcase\@firstofone}{}
+\ifx\MakeMarkcase\@firstofone
+ \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{used}%
+\else\ifx\MakeMarkcase\MakeUppercase
+ \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{upper}%
+ \else\ifx\MakeMarkcase\MakeLowercase
+ \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{lower}%
+ \else\ifx\MakeMarkcase\scr@ignoreuppercase
+ \KOMA@kav@replacevalue{.scrlayer.sty}{markcase}{ignoreuppercase}%
+\fi\fi\fi\fi
\DeclareRobustCommand*{\scrlayer@ignoreuppercase}[1]{%
\begingroup
\let\uppercase\@firstofone
@@ -155,6 +168,7 @@
}
\newif\ifscrlayer@forceignoreuppercase
\KOMA@ifkey{autooneside}{scrlayer@autooneside}\scrlayer@autoonesidetrue
+\KOMA@kav@replacebool{.scrlayer.sty}{autooneside}{scrlayer@autooneside}
\KOMA@key{automark}[]{%
\scrlayer@testunexpectedarg{automark}{#1}%
\scrlayer@AtEndOfPackage{%
@@ -165,67 +179,93 @@
\fi
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{automark}{}%
}
\KOMA@key{manualmark}[]{%
\scrlayer@testunexpectedarg{manualmark}{#1}%
\scrlayer@AtEndOfPackage{\manualmark}%
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.scrlayer.sty}{automark}%
+ \KOMA@kav@removekey{.scrlayer.sty}{manualmark}%
+ \KOMA@kav@add{.scrlayer.sty}{manualmark}{}%
}
\KOMA@key{onpsselect}{%
\l@addto@macro{\@ps@initialhook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsselect}{#1}%
}
\newcommand*{\@ps@initialhook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsselect}{}
\KOMA@key{onpsinit}{%
\l@addto@macro{\@ps@hook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsinit}{#1}%
}
\newcommand*{\@ps@hook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsinit}{}
\KOMA@key{onpsoneside}{%
\l@addto@macro{\@ps@onesidehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsoneside}{#1}%
}
\newcommand*{\@ps@onesidehook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsoneside}{}
\KOMA@key{onpstwoside}{%
\l@addto@macro{\@ps@twosidehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpstwoside}{#1}%
}
\newcommand*{\@ps@twosidehook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpstwoside}{}
\KOMA@key{onpsoddpage}{%
\l@addto@macro{\@ps@oddpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{#1}%
}
\newcommand*{\@ps@oddpagehook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsoddpage}{}
\KOMA@key{onpsevenpage}{%
\l@addto@macro{\@ps@evenpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{#1}%
}
\newcommand*{\@ps@evenpagehook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsevenpage}{}
\KOMA@key{onpsfloatpage}{%
\l@addto@macro{\@ps@floatpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{#1}%
}
\newcommand*{\@ps@floatpagehook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsfloatpage}{}
\KOMA@key{onpsnonfloatpage}{%
\l@addto@macro{\@ps@nonfloatpagehook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{#1}%
}
\newcommand*{\@ps@nonfloatpagehook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsnonfloatpage}{}
\KOMA@key{onpsbackground}{%
\l@addto@macro{\@ps@backgroundhook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsbackground}{#1}%
}
\newcommand*{\@ps@backgroundhook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsbackground}{}
\KOMA@key{onpsforeground}{%
\l@addto@macro{\@ps@foregroundhook}{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@add{.scrlayer.sty}{onpsforeground}{#1}%
}
\newcommand*{\@ps@foregroundhook}{}
+\KOMA@kav@add{.scrlayer.sty}{onpsforeground}{}
\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 1912 2015-01-26 20:11:06Z kohm $ (body)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
\newcommand*{\rightbotmark}{\expandafter\@rightmark\botmark\@empty\@empty}
@@ -1978,7 +2018,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 1912 2015-01-26 20:11:06Z kohm $ (final)
+%%% From File: $Id: scrlayer.dtx 1962 2015-02-26 08:34:33Z kohm $ (final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index 1cb5d89c21e..5455841f31c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -60,7 +60,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -82,15 +82,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
\ProvidesPackage{scrletter}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
Cannot detect any KOMA-Script class.\MessageBreak
@@ -125,8 +129,8 @@
\endgroup
\let\do@renewforletter@list\@empty
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -143,21 +147,28 @@
}
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
\KOMA@set@ifkey{numericaldate}{@orgdate}{#1}%
+ \KOMA@kav@replacebool{.%
+ scrletter.\scr@pkgextension
+ }{numericaldate}{@orgdate}%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
-%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
-\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
+\KOMA@ifkey{firsthead}{@firsthead}
+\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
\KOMA@key{fromalign}{%
\KOMA@set@ncmdkey{fromalign}{@alignfrom}{%
@@ -169,14 +180,22 @@
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrletter.\scr@pkgextension
+ }{fromalign}{#1}%
\ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
\fi
}
-\newcommand*{\@rulefrom}{0}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{fromalign}{left}
\KOMA@ncmdkey{fromrule}[below]{@rulefrom}{%
{false}{0},{no}{0},{off}{0},{aftername}{1},%
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{fromrule}{false}
\KOMA@ifkey{fromphone}{@phone}
\KOMA@ifkey{frommobilephone}{@mobilephone}
\KOMA@ifkey{fromfax}{@fax}
@@ -195,9 +214,12 @@
{ppbackgroundimage}{3},{ppBackgroundImage}{3},{ppBackGroundImage}{3},%
{image}{4},{Image}{4},%
{PPimage}{4},{PPImage}{4},%
- {ppimage}{4},{ppImage}{4}%
+ {ppimage}{4},{ppImage}{4},%
+ {topaligned}{5},{alignedtop}{5}%
}
-\newcommand*{\ltr@priority}{0}%
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{addrfield}{true}
\KOMA@ncmdkey{priority}[A]{ltr@priority}{%
{no}{0},{off}{0},{false}{0},{manual}{1},%
{B}{1},{b}{1},%
@@ -207,6 +229,9 @@
{priority}{2},{Priority}{2},{PRIORITY}{2},%
{A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
}%
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{priority}{false}
\newcommand{\backaddr@format}[1]{}
\let\backaddr@format\underline
\newif\if@baddr\@baddrtrue
@@ -237,6 +262,27 @@
\else
\endgroup
\fi
+ \if@baddr
+ \ifx\backaddr@format\underline
+ \KOMA@kav@replacevalue{.%
+ scrletter.\scr@pkgextension
+ }{backaddress}{underlined}%
+ \else
+ \ifx\backaddr@format\@firstofone
+ \KOMA@kav@replacevalue{.%
+ scrletter.\scr@pkgextension
+ }{backaddress}{plain}%
+ \else
+ \KOMA@kav@replacevalue{.%
+ scrletter.\scr@pkgextension
+ }{backaddress}{true}%
+ \fi
+ \fi
+ \else
+ \KOMA@kav@replacevalue{.%
+ scrletter.\scr@pkgextension
+ }{backaddress}{false}%
+ \fi
\else
\endgroup
\FamilyKeyStateUnknownValue
@@ -250,15 +296,24 @@
\ifcase\@tempa
\endgroup
\@bigloctrue
+ \KOMA@kav@replacevalue{.%
+ scrletter.\scr@pkgextension
+ }{locfield}{wide}%
\else
\endgroup
\@biglocfalse
+ \KOMA@kav@replacevalue{.%
+ scrletter.\scr@pkgextension
+ }{locfield}{narrow}%
\fi
\else
\endgroup
\FamilyKeyStateUnknownValue
\fi
}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{locfield}{narrow}
\KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide}
\KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow}
\newif\if@fold\@foldtrue
@@ -314,7 +369,21 @@
\expandafter\sc@nf@ldch@rs#1\@nil
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrletter.\scr@pkgextension
+ }{foldmarks}{\@usefolds}%
+ \KOMA@kav@xadd{.%
+ scrletter.\scr@pkgextension
+ }{foldmarks}{\if@fold true\else false\fi}%
+ \fi
}
+\KOMA@kav@xadd{.%
+ scrletter.\scr@pkgextension
+}{foldmarks}{\@usefolds}%
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{foldmarks}{true}%
\newcommand*{\scr@removechar}[2]{%
\def\in@@##1#2##2##3\in@@{%
\ifx\in@##2\else
@@ -337,24 +406,84 @@
\ifcase\@tempa
\endgroup
\@refwidetrue
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{wide}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{narrow}%
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{refline}{wide}%
\or
\endgroup
\@refwidefalse
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{wide}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{narrow}%
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{refline}{narrow}%
\or
\endgroup
\def\@datepos{2}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateleft}%
\or
\endgroup
\def\@datepos{1}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateright}%
\or
\endgroup
\def\@datepos{0}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ scrletter.\scr@pkgextension
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{refline}{nodate}%
\fi
\else
\endgroup
\FamilyKeyStateUnknownValue
\fi
}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{refline}{dateright}%
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{refline}{narrow}%
\newcommand{\subject@format}[1]{#1}
\newcommand*{\raggedsubject}{}
\newif\if@subj
@@ -394,7 +523,43 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrletter.\scr@pkgextension
+ }{subject}{\if@subj titled\else untitled\fi}%
+ \KOMA@kav@xadd{.%
+ scrletter.\scr@pkgextension
+ }{subject}{\if@subjafter after\else before\fi opening}%
+ \ifx\subject@format\undeline
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{subject}{underlined}%
+ \fi
+ \ifx\raggedsubject\raggedright
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{subject}{left}%
+ \else
+ \ifx\raggedsubject\raggedleft
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{subject}{right}%
+ \else
+ \ifx\raggedsubject\centering
+ \KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+ }{subject}{centered}%
+ \fi
+ \fi
+ \fi
+ \fi
}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{subject}{untitled}%
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{subject}{beforeopening}%
\KOMA@ifkey{enlargefirstpage}{@enlargefp}
\KOMA@ifkey{firstfoot}{@firstfoot}\@firstfoottrue
\newcommand*{\@pageat}{4}
@@ -443,10 +608,35 @@
\def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
+ \KOMA@kav@xreplacevalue{.%
+ scrletter.\scr@pkgextension
+ }{pagenumber}{%
+ \ifcase \@pageat
+ topleft%
+ \or
+ topmiddle%
+ \or
+ topright%
+ \or
+ botleft%
+ \or
+ botmiddle%
+ \or
+ botright%
+ \else
+ false%
+ \fi
+ }%
}
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{pagenumber}{botmiddle}
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
+ \KOMA@kav@replacebool{.%
+ scrletter.\scr@pkgextension
+ }{symbolicnames}{@scrsymbols}%
\if@scrsymbols
\if@atdocument
\begingroup
@@ -475,7 +665,7 @@
\fi
\endgroup
\else
- \ifstr{\@currname.\@currext}{scrletter.sty}{%
+ \ifstr{\@currname.\@currext}{scrletter.\scr@pkgextension}{%
\expandafter\AtEndOfPackage
}{%
\expandafter\@firstofone
@@ -484,12 +674,15 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\KOMA@kav@add{.%
+ scrletter.\scr@pkgextension
+}{symbolicnames}{false}%
+%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -604,7 +797,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\PackageInfo{scrletter%
@@ -1117,7 +1310,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\newkomavar}{%
\@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -1243,7 +1436,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -1298,7 +1491,13 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
+\newcommand*{%
+ \letterpagemark
+}{%
+ {\usekomafont{pagenumber}{%
+ \pagename\nobreakspace
+ \thepage}}}
\RequirePackage{scrlayer-scrpage}
\newpairofpagestyles{letter}{%
\clearpairofpagestyles
@@ -1323,7 +1522,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
\newkomavar{firsthead}
\setkomavar{firsthead}{%
\parbox[b]{\useplength{firstheadwidth}}%
@@ -1341,7 +1540,9 @@
}%
}
\newcommand*{\scr@firsthead@postsetvar}{%
- \renewcommand*{\@alignfrom}{10000}%
+ \KOMAExecuteOptions[.%
+ scrletter.\scr@pkgextension
+ ]{fromalign=no}%
}
\newcommand*{\@gen@firsthead}{%
\ifcase\@alignfrom
@@ -1499,11 +1700,13 @@
\newkomafont{refname}{\sffamily\scriptsize}
\newkomafont{refvalue}{}
\newkomafont{placeanddate}{}
+\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries}
\scr@ifundefinedorrelax{scr@fnt@title}{%
- \newkomafont{title}{\normalcolor\sffamily\bfseries}%
+ \aliaskomafont{lettertitle}{title}%
}{}
+\newkomafont{lettersubject}{\normalfont\bfseries}
\scr@ifundefinedorrelax{scr@fnt@subject}{%
- \newkomafont{subject}{\normalcolor\bfseries}%
+ \aliaskomafont{lettersubject}{subject}%
}{}
\@newplength{foldmarkhpos}
\@newplength{foldmarkvpos}
@@ -1576,11 +1779,11 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox0\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{#1\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
- \box0\vskip-\@tempdima%
+ \box\z@\vskip-\@tempdima%
}%
}
\newcommand*{\@foldmark}[2]{%
@@ -1677,7 +1880,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox0\vbox{#3}%
+ \setbox\z@\vbox{#3}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -1786,7 +1989,7 @@
}%
}
\newcommand*{\@addrfield}{%
- \ifcase \@afieldmode\relax
+ \ifcase \ifnum\@afieldmode=5 \@ne\else\@afieldmode\fi\relax
\typeout{Address: No}%
\or
\begingroup%
@@ -1851,7 +2054,7 @@
\usekomafont{specialmail}\usekomavar{specialmail}}%
\hspace*{\useplength{specialmailrightindent}}}%
}%
- \vfil%
+ \ifnum\@afieldmode=\@ne\vfil\fi%
\noindent\hskip\useplength{toaddrindent}%
\setlength{\@tempdima}{\useplength{toaddrwidth}}%
\addtolengthplength[-2]{\@tempdima}{toaddrindent}%
@@ -1924,7 +2127,7 @@
\vbox to \dimexpr \useplength{PPheadheight}-2\fboxsep\relax{%
\setlength{\parindent}{0pt}%
\hsize \dimexpr \useplength{PPheadwidth}-2\fboxsep\relax
- \setbox\@tempboxa\hbox{%
+ \sbox\@tempboxa{%
{\fontsize{20.74pt}{20.74pt}\selectfont
\usekomafont{PPlogo}{P.P.}}\hskip 2mm%
}%
@@ -2175,11 +2378,11 @@
\newcommand*{\@set@reffield}[1]{%
\ifkomavarempty{#1}{}{%
\settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
- \setbox0\hbox{\strut\usekomafont{refname}\usekomavar*{#1}}%
+ \sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}%
\ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
\if@tempswa\enskip\hfill\fi
\parbox[t]{\@tempdima}{\noindent\raggedright
- \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
+ \strut\box\z@\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
\@tempswatrue
}%
}
@@ -2261,14 +2464,14 @@
\@set@reffields%
\if@tempswa
\ifnum \@datepos=1 \@set@reffield{date}\fi%
- \setbox0\hbox{\usekomafont{refname}\strutbox}%
- \ifdim\ht0>\ht\strutbox
+ \sbox\z@{\usekomafont{refname}\strutbox}%
+ \ifdim\ht\z@>\ht\strutbox
\PackageWarningNoLine{scrletter}{%
Font element `refname' should not be larger than
\string\normalsize!}%
\fi
- \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
- \ifdim\ht0>\ht\strutbox
+ \sbox\z@{\usekomafont{refvalue}\strutbox}%
+ \ifdim\ht\z@>\ht\strutbox
\PackageWarningNoLine{scrletter}{%
Font element `refvalue' should not be larger than
\string\normalsize!}%
@@ -2293,7 +2496,7 @@
}{%
\typeout{Title: yes}%
{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
- \centering\LARGE\usekomafont{title}\usekomavar{title}\par}%
+ \centering\LARGE\usekomafont{lettertitle}\usekomavar{title}\par}%
\vskip\baselineskip%
}%
}
@@ -2323,7 +2526,7 @@
\move@topt\vskip\useplength{subjectvpos}%
\expandafter\vb@t@z\expandafter{%
\fi
- \usekomafont{subject}%
+ \usekomafont{lettersubject}%
\raggedsubject{\if@subj \subject@format{\strut\ignorespaces
\usekomavar*{subject}}\fi}%
\subject@format{\strut\ignorespaces\usekomavar{subject}}\par
@@ -2379,6 +2582,7 @@
\newenvironment{letter}[2][]{%
\newpage
\if@twoside\ifodd\c@page\else\thispagestyle{empty}\null\newpage\fi\fi
+\let\pagemark\letterpagemark
\setcounter{page}{\@ne}%
\setcounter{footnote}{0}%
\interlinepenalty=200\@processto{#2}%
@@ -2431,37 +2635,25 @@
\ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi
\@afterindentfalse\@afterheading
}
-\newcommand*{\@xtrimtempa}{%
- \@ifnextchar [{\@@xtrimtempa}{\@@xtrimtempa[]}}
-\newcommand*{\@@xtrimtempa}{}
-\def\@@xtrimtempa[#1]#2\@nil{\def\@tempa{#2}}
-\newcommand*{\@tempdimaismaxwidthof}{}
-\def\@tempdimaismaxwidthof#1\\#2\@nil{%
- \settowidth{\@tempdimb}{\strut\ignorespaces#1}%
- \ifdim\@tempdima<\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
- \def\@tempa{#2}\ifx\@tempa\@empty
- \let\@tempb\relax
- \else
- \expandafter\@xtrimtempa\@tempa\@nil
- \def\@tempb{\expandafter\@tempdimaismaxwidthof\@tempa\@nil}%
- \fi
- \@tempb
-}
\newcommand*{\closing}[1]{{%
- \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par%
- \nobreak\vskip\baselineskip%
- \stopbreaks\noindent%
- \setlength{\@tempdima}{0pt}%
- \expandafter\@tempdimaismaxwidthof\scr@signature@var\\\@nil
- \expandafter\@tempdimaismaxwidthof\strut\ignorespaces#1\\\@nil
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par
+ \nobreak\vskip\baselineskip
+ \stopbreaks\noindent
+ \settowidth{\@tempdima}{%
+ \begin{tabular}{@{}l@{}}
+ #1\tabularnewline
+ \usekomavar{signature}\tabularnewline
+ \end{tabular}
+ }%
\setlength{\@tempdimb}{\hsize}%
\addtolength{\@tempdimb}{-\useplength{sigindent}}%
- \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi%
+ \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
- \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces%
- #1\strut\\[\useplength{sigbeforevskip}]
- \strut\usekomavar{signature}\strut}}\par
- \nobreak\vskip\baselineskip%
+ \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
+ #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}]
+ \strut\ignorespaces
+ \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
+ \nobreak\vskip\baselineskip
}
\newcommand\ps{\par%
\ifdim\parskip=\z@%
@@ -2563,7 +2755,22 @@
\usekomavar{subjectseparator}]{subject}
\newkomavar[\datename]{date}
\setkomavar{date}{\@date}
-%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
+\newcommand*{\scr@saved@date}{}
+\let\scr@saved@date\date
+\renewcommand*{\date}[1]{%
+ \PackageWarning{scrletter}{%
+ \string\date\space changes the internal \string\LaTeX\space date
+ only.\MessageBreak
+ You should note that this changes the default\MessageBreak
+ value of variable `date' only as long as someone\MessageBreak
+ uses `\string\setkomavar` to change the content of\MessageBreak
+ variable `date'.\MessageBreak
+ Therefore, usage of `\string\setkomavar' is recommended\MessageBreak
+ to change the letter's date%
+ }%
+ \scr@saved@date{#1}%
+}
+%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
\newcommand*{\adrchar}{\addrchar}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index a387b45b358..83790e5a166 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $
\ProvidesPackage{scrlfile}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (loading files)]
\typeout{Package scrlfile, \csname ver@scrlfile.sty\endcsname%
^^J\@spaces\@spaces\@spaces\@spaces\space\space
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 74b390edc19..8f48976170f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -71,7 +71,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -93,21 +93,27 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@clsextenstion}{\@clsextenstion}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
\newcommand*{\KOMAClassName}{%
scrlttr2%
}
\newcommand*{\ClassName}{%
letter%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -118,14 +124,22 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{version}{first}%
}{%
\ClassInfoNoLine{\KOMAClassName}{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{version}{#1}%
}%
}
+\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA@key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -191,21 +205,41 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@v@is@lt}[1]{%
+ \scr@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@gt}[1]{%
+ \scr@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@le}[1]{%
+ \numexpr\scr@compatibility-\@ne\relax<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@ge}[1]{%
+ \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
\expandafter
@@ -222,16 +256,22 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
\KOMA@set@ifkey{numericaldate}{@orgdate}{#1}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{numericaldate}{@orgdate}%
\if@orgdate\@orgdatefalse\else\@orgdatetrue\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\@ptsize{%
12%
}
@@ -294,10 +334,13 @@
\@tempa
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -357,20 +400,52 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
\FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @tempswa%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \raggedbottom
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
}
+\KOMAExecuteOptions{twoside=false}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \FamilyKeyStateProcessed
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \fi
+}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \raggedbottom
+ \fi
}
+\KOMAExecuteOptions{twocolumn=false}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -379,6 +454,16 @@
\def\scr@parskip{#2}%
\def\scr@parfillskip{#3}%
\def\par@update{\let\par@update\default@par@update\par@updaterelative}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f@parindent}{\the\parindent}
\newcommand*{\f@parskip}{\the\parskip}
@@ -416,53 +501,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -476,6 +574,9 @@
}%
\or%11
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -503,11 +604,14 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{headinclude=#1}%
}{%
@@ -515,11 +619,13 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
@@ -527,8 +633,8 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
-\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -542,6 +648,9 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{current}%
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -550,6 +659,9 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{#1}%
}%
}{%
\ifx\@currname\KOMAClassName
@@ -560,6 +672,8 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}%
+ {cleardoublepage}{#1}%
}%
}{}%
\fi
@@ -592,6 +706,23 @@
\cleardoublestandardpage
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{cleardoublepage}{%
+ \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi
+}
+\AtEndOfClass{%
+ \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
+ {%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{\@tempa}%
+}
\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage}
\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage}
\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage
@@ -601,8 +732,8 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% 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 $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -621,17 +752,40 @@
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
}%
}
+\AtBeginDocument{%
+ \ifx\@footnotemark\scr@saved@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
+ \else\ifx\@footnotemark\scr@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
+ \fi\fi
+}
\newcommand*{\scr@footmisc@options}{}
\PassOptionsToPackage{\noexpand\scr@footmisc@options}{footmisc}
\newcommand*{\scr@saved@footnotemark}{%
@@ -649,9 +803,10 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
-\KOMA@ifkey{firsthead}{@firsthead}\@firstheadtrue
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
+\KOMA@ifkey{firsthead}{@firsthead}
+\KOMAExecuteOptions{firsthead=true}
\newcommand*{\@alignfrom}{0}
\KOMA@key{fromalign}{%
\KOMA@set@ncmdkey{fromalign}{@alignfrom}{%
@@ -663,14 +818,22 @@
{no}{10000},{false}{10000},{off}{10000}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fromalign}{#1}%
\ifcase\@alignfrom\or\or\or\@firstheadfalse\or\@firstheadfalse\fi
\fi
}
-\newcommand*{\@rulefrom}{0}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{fromalign}{left}
\KOMA@ncmdkey{fromrule}[below]{@rulefrom}{%
{false}{0},{no}{0},{off}{0},{aftername}{1},%
{below}{2},{afteraddress}{2},{true}{2},{yes}{2},{on}{2}%
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{fromrule}{false}
\KOMA@ifkey{fromphone}{@phone}
\KOMA@ifkey{frommobilephone}{@mobilephone}
\KOMA@ifkey{fromfax}{@fax}
@@ -694,7 +857,7 @@
KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
\string\@afieldtrue\space by
\string\KOMAoptions{addrfield=true}.\MessageBreak
- This may result in erros. A better solution would be\MessageBreak
+ This may result in errors. A better solution would be\MessageBreak
to change the code}%
\KOMAoptions{addrfield=true}}
\newcommand*{\@afieldfalse}{%
@@ -704,7 +867,7 @@
KOMA-Script version 3.03. I'll replace the usage of\MessageBreak
\string\@afieldfalse\space by
\string\KOMAoptions{addrfield=false}.\MessageBreak
- This may result in erros. A better solution would be\MessageBreak
+ This may result in errors. A better solution would be\MessageBreak
to change the code}%
\KOMAoptions{addrfield=false}}
\newcommand*{\@afieldmode}{\@ne}
@@ -719,9 +882,12 @@
{ppbackgroundimage}{3},{ppBackgroundImage}{3},{ppBackGroundImage}{3},%
{image}{4},{Image}{4},%
{PPimage}{4},{PPImage}{4},%
- {ppimage}{4},{ppImage}{4}%
+ {ppimage}{4},{ppImage}{4},%
+ {topaligned}{5},{alignedtop}{5}%
}
-\newcommand*{\ltr@priority}{0}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{addrfield}{true}
\KOMA@ncmdkey{priority}[A]{ltr@priority}{%
{no}{0},{off}{0},{false}{0},{manual}{1},%
{B}{1},{b}{1},%
@@ -731,6 +897,9 @@
{priority}{2},{Priority}{2},{PRIORITY}{2},%
{A-PRIORITY}{2},{A-Priority}{2},{a-priority}{2}%
}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{priority}{false}
\newcommand{\backaddr@format}[1]{}
\let\backaddr@format\underline
\newif\if@baddr\@baddrtrue
@@ -761,6 +930,27 @@
\else
\endgroup
\fi
+ \if@baddr
+ \ifx\backaddr@format\underline
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{underlined}%
+ \else
+ \ifx\backaddr@format\@firstofone
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{plain}%
+ \else
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{true}%
+ \fi
+ \fi
+ \else
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{backaddress}{false}%
+ \fi
\else
\endgroup
\FamilyKeyStateUnknownValue
@@ -774,15 +964,24 @@
\ifcase\@tempa
\endgroup
\@bigloctrue
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{locfield}{wide}%
\else
\endgroup
\@biglocfalse
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{locfield}{narrow}%
\fi
\else
\endgroup
\FamilyKeyStateUnknownValue
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{locfield}{narrow}
\KOMA@DeclareDeprecatedOption{wlocfield}{locfield=wide}
\KOMA@DeclareDeprecatedOption{slocfield}{locfield=narrow}
\newif\if@fold\@foldtrue
@@ -838,7 +1037,21 @@
\expandafter\sc@nf@ldch@rs#1\@nil
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{foldmarks}{\@usefolds}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{foldmarks}{\if@fold true\else false\fi}%
+ \fi
}
+\KOMA@kav@xadd{.%
+ \KOMAClassFileName
+}{foldmarks}{\@usefolds}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{foldmarks}{true}%
\newcommand*{\scr@removechar}[2]{%
\def\in@@##1#2##2##3\in@@{%
\ifx\in@##2\else
@@ -861,24 +1074,84 @@
\ifcase\@tempa
\endgroup
\@refwidetrue
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{wide}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{narrow}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{wide}%
\or
\endgroup
\@refwidefalse
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{wide}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{narrow}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{narrow}%
\or
\endgroup
\def\@datepos{2}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
\or
\endgroup
\def\@datepos{1}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
\or
\endgroup
\def\@datepos{0}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateleft}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{dateright}%
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{refline}{nodate}%
\fi
\else
\endgroup
\FamilyKeyStateUnknownValue
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{refline}{dateright}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{refline}{narrow}%
\newcommand{\subject@format}[1]{#1}
\newcommand*{\raggedsubject}{}
\newif\if@subj
@@ -918,7 +1191,43 @@
\aftergroup\FamilyKeyStateUnknownValue
\fi
\endgroup
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{subject}{\if@subj titled\else untitled\fi}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{subject}{\if@subjafter after\else before\fi opening}%
+ \ifx\subject@format\undeline
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{underlined}%
+ \fi
+ \ifx\raggedsubject\raggedright
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{left}%
+ \else
+ \ifx\raggedsubject\raggedleft
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{right}%
+ \else
+ \ifx\raggedsubject\centering
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{subject}{centered}%
+ \fi
+ \fi
+ \fi
+ \fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{subject}{untitled}%
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{subject}{beforeopening}%
\KOMA@ifkey{enlargefirstpage}{@enlargefp}
\KOMA@ifkey{firstfoot}{@firstfoot}\@firstfoottrue
\newcommand*{\@pageat}{4}
@@ -967,10 +1276,35 @@
\def\@tempa{\endgroup\FamilyKeyStateUnknownValue}%
\fi
\@tempa
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{pagenumber}{%
+ \ifcase \@pageat
+ topleft%
+ \or
+ topmiddle%
+ \or
+ topright%
+ \or
+ botleft%
+ \or
+ botmiddle%
+ \or
+ botright%
+ \else
+ false%
+ \fi
+ }%
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{pagenumber}{botmiddle}
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{symbolicnames}{@scrsymbols}%
\if@scrsymbols
\if@atdocument
\begingroup
@@ -999,7 +1333,7 @@
\fi
\endgroup
\else
- \ifstr{\@currname.\@currext}{scrlttr2.cls}{%
+ \ifstr{\@currname.\@currext}{\KOMAClassFileName}{%
\expandafter\AtEndOfClass
}{%
\expandafter\@firstofone
@@ -1008,13 +1342,16 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{symbolicnames}{false}%
+%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
\begingroup
@@ -1026,9 +1363,9 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
\else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -1062,325 +1399,325 @@
\fi
\fi
}
-\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
- \ClassWarning{\KOMAClassName}{%
- Using fallback calculation to setup font sizes\MessageBreak
- for basic size `#2'}%
- \scr@ifundefinedorrelax{dimexpr}{%
- \ClassError{\KOMAClassName}{%
- feature only allowed using e-TeX%
- }{%
- The fallback calculation to setup font sizes was implemented
- using e-TeX.\MessageBreak
- You should not continue, because the fallback calculation would fail%
- }
- }{%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \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}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
+\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{fontsize}%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi
+ \expandafter\ifnum\scr@v@is@lt{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
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\partopsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \edef\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \edef\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \edef\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \normalsize
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\partopsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
- \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
+ \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
+}
+\scr@ifundefinedorrelax{changefontsizes}{%
+ \let\changefontsizes\simple@changefontsizes
+}{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\changefontsizes\space already defined.\MessageBreak
+ I hope, the definition is compatible,\MessageBreak
+ because I do not change it%
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1389,20 +1726,29 @@
\edef\@tempb{\strip@pt\@tempdimb}%
\addtolength{\@tempdimb}{-10\p@}%
\edef\@ptsize{\strip@pt\@tempdimb}%
-\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{
+\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
- \changefontsizes{\@tempa}%
+ \edef\@tempa{%
+ \noexpand\changefontsizes{\@tempa}%
+ \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ }\@tempa
}%
}%
}
@@ -1455,20 +1801,18 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
\setlength\fboxrule{.4\p@}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
\newcommand*{\scr@tpo}{0}
-\newcommand*{\is@thispageodd}{%
+\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
\begingroup
\@tempcnta=\scr@tpo
\advance\@tempcnta by\@ne
\xdef\scr@tpo{\the\@tempcnta}%
- \protected@write\@auxout{\let\arabic\relax}{%
- \string\new@tpo@label{\scr@tpo}{\arabic{page}}}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\relax
\protect\G@refundefinedtrue
\ClassWarning{\KOMAClassName}{%
@@ -1483,8 +1827,15 @@
\aftergroup\thispagewasoddfalse
\fi
\endgroup
+ \edef\is@thispageodd@setlabel{%
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ }%
+ #1%
\@esphack
}
+\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
\newcommand{\ifthispageodd}{%
\is@thispageodd
@@ -1531,7 +1882,7 @@
commands}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage`}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
{\let\@restore@catcode@level=\z@}{}%
@@ -1646,7 +1997,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
\ClassInfo{scrlttr2%
@@ -2159,7 +2510,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\newkomavar}{%
\@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
\newcommand*{\@newkomavar}[2][\relax]{%
@@ -2285,7 +2636,7 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -2340,7 +2691,7 @@
}%
\@tempa%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2351,7 +2702,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\newcommand*{\scr@selectfont}{}
@@ -2477,7 +2828,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2497,9 +2848,11 @@
Font of page foot will also be changed%
}
\newcommand*{\scr@fnt@pagefoot}{\footfont}
-\newcommand*
- {\pagemark}{{\usekomafont{pagenumber}{%
- \pagename\ %
+\newcommand*{%
+ \pagemark
+}{%
+ {\usekomafont{pagenumber}{%
+ \pagename\nobreakspace
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{%
@@ -2571,13 +2924,11 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
- \raggedbottom
- \onecolumn
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -2714,7 +3065,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
\setlength{\leftmarginiii}{1.87em}
@@ -2809,7 +3160,7 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
\edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
@@ -2850,13 +3201,13 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
- \item\relax%
+ \item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newcommand*\descfont{\sffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
Deprecated usage of \string\@firsthead.\MessageBreak
@@ -2882,7 +3233,9 @@
}%
}
\newcommand*{\scr@firsthead@postsetvar}{%
- \renewcommand*{\@alignfrom}{10000}%
+ \KOMAExecuteOptions[.%
+ \KOMAClassFileName
+ ]{fromalign=no}%
}
\newcommand*{\@gen@firsthead}{%
\ifcase\@alignfrom
@@ -3052,8 +3405,10 @@
\newkomafont{refvalue}{}
\fi
\newkomafont{placeanddate}{}
- \newkomafont{title}{\normalcolor\sffamily\bfseries}%
- \newkomafont{subject}{\normalcolor\bfseries}%
+\newkomafont{lettertitle}{\normalcolor\sffamily\bfseries}
+ \aliaskomafont{lettertitle}{title}%
+\newkomafont{lettersubject}{\normalfont\bfseries}
+ \aliaskomafont{lettersubject}{subject}%
\@newplength{foldmarkhpos}
\@newplength{foldmarkvpos}
\@newplength{tfoldmarkvpos}
@@ -3141,11 +3496,11 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox0\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{#1\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
- \box0\vskip-\@tempdima%
+ \box\z@\vskip-\@tempdima%
}%
}
\newcommand*{\@foldmark}[2]{%
@@ -3242,7 +3597,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox0\vbox{#3}%
+ \setbox\z@\vbox{#3}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -3351,7 +3706,7 @@
}%
}
\newcommand*{\@addrfield}{%
- \ifcase \@afieldmode\relax
+ \ifcase \ifnum\@afieldmode=5 \@ne\else\@afieldmode\fi\relax
\typeout{Address: No}%
\or
\begingroup%
@@ -3416,7 +3771,7 @@
\usekomafont{specialmail}\usekomavar{specialmail}}%
\hspace*{\useplength{specialmailrightindent}}}%
}%
- \vfil%
+ \ifnum\@afieldmode=\@ne\vfil\fi%
\noindent\hskip\useplength{toaddrindent}%
\setlength{\@tempdima}{\useplength{toaddrwidth}}%
\addtolengthplength[-2]{\@tempdima}{toaddrindent}%
@@ -3489,7 +3844,7 @@
\vbox to \dimexpr \useplength{PPheadheight}-2\fboxsep\relax{%
\setlength{\parindent}{0pt}%
\hsize \dimexpr \useplength{PPheadwidth}-2\fboxsep\relax
- \setbox\@tempboxa\hbox{%
+ \sbox\@tempboxa{%
{\fontsize{20.74pt}{20.74pt}\selectfont
\usekomafont{PPlogo}{P.P.}}\hskip 2mm%
}%
@@ -3740,11 +4095,11 @@
\newcommand*{\@set@reffield}[1]{%
\ifkomavarempty{#1}{}{%
\settowidth{\@tempdima}{\strut\usekomafont{refvalue}\usekomavar{#1}}%
- \setbox0\hbox{\strut\usekomafont{refname}\usekomavar*{#1}}%
+ \sbox\z@{\strut\usekomafont{refname}\usekomavar*{#1}}%
\ifdim \@tempdima<\wd0\setlength{\@tempdima}{\wd0}\fi
\if@tempswa\enskip\hfill\fi
\parbox[t]{\@tempdima}{\noindent\raggedright
- \strut\box0\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
+ \strut\box\z@\\\usekomafont{refvalue}\strut\usekomavar{#1}}%
\@tempswatrue
}%
}
@@ -3826,14 +4181,14 @@
\@set@reffields%
\if@tempswa
\ifnum \@datepos=1 \@set@reffield{date}\fi%
- \setbox0\hbox{\usekomafont{refname}\strutbox}%
- \ifdim\ht0>\ht\strutbox
+ \sbox\z@{\usekomafont{refname}\strutbox}%
+ \ifdim\ht\z@>\ht\strutbox
\ClassWarningNoLine{scrlttr2}{%
Font element `refname' should not be larger than
\string\normalsize!}%
\fi
- \setbox0\hbox{\usekomafont{refvalue}\strutbox}%
- \ifdim\ht0>\ht\strutbox
+ \sbox\z@{\usekomafont{refvalue}\strutbox}%
+ \ifdim\ht\z@>\ht\strutbox
\ClassWarningNoLine{scrlttr2}{%
Font element `refvalue' should not be larger than
\string\normalsize!}%
@@ -3858,7 +4213,7 @@
}{%
\typeout{Title: yes}%
{\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
- \centering\LARGE\usekomafont{title}\usekomavar{title}\par}%
+ \centering\LARGE\usekomafont{lettertitle}\usekomavar{title}\par}%
\vskip\baselineskip%
}%
}
@@ -3888,7 +4243,7 @@
\move@topt\vskip\useplength{subjectvpos}%
\expandafter\vb@t@z\expandafter{%
\fi
- \usekomafont{subject}%
+ \usekomafont{lettersubject}%
\raggedsubject{\if@subj \subject@format{\strut\ignorespaces
\usekomavar*{subject}}\fi}%
\subject@format{\strut\ignorespaces\usekomavar{subject}}\par
@@ -4028,37 +4383,25 @@
\ifdim\useplength{subjectvpos}=\z@\if@subjafter\@subjfield\fi\fi
\@afterindentfalse\@afterheading
}
-\newcommand*{\@xtrimtempa}{%
- \@ifnextchar [{\@@xtrimtempa}{\@@xtrimtempa[]}}
-\newcommand*{\@@xtrimtempa}{}
-\def\@@xtrimtempa[#1]#2\@nil{\def\@tempa{#2}}
-\newcommand*{\@tempdimaismaxwidthof}{}
-\def\@tempdimaismaxwidthof#1\\#2\@nil{%
- \settowidth{\@tempdimb}{\strut\ignorespaces#1}%
- \ifdim\@tempdima<\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
- \def\@tempa{#2}\ifx\@tempa\@empty
- \let\@tempb\relax
- \else
- \expandafter\@xtrimtempa\@tempa\@nil
- \def\@tempb{\expandafter\@tempdimaismaxwidthof\@tempa\@nil}%
- \fi
- \@tempb
-}
\newcommand*{\closing}[1]{{%
- \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par%
- \nobreak\vskip\baselineskip%
- \stopbreaks\noindent%
- \setlength{\@tempdima}{0pt}%
- \expandafter\@tempdimaismaxwidthof\scr@signature@var\\\@nil
- \expandafter\@tempdimaismaxwidthof\strut\ignorespaces#1\\\@nil
+ \setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative\nobreak\par
+ \nobreak\vskip\baselineskip
+ \stopbreaks\noindent
+ \settowidth{\@tempdima}{%
+ \begin{tabular}{@{}l@{}}
+ #1\tabularnewline
+ \usekomavar{signature}\tabularnewline
+ \end{tabular}
+ }%
\setlength{\@tempdimb}{\hsize}%
\addtolength{\@tempdimb}{-\useplength{sigindent}}%
- \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi%
+ \ifdim\@tempdima>\@tempdimb\setlength{\@tempdima}{\@tempdimb}\fi
\hspace{\useplength{sigindent}}%
- \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces%
- #1\strut\\[\useplength{sigbeforevskip}]
- \strut\usekomavar{signature}\strut}}\par
- \nobreak\vskip\baselineskip%
+ \parbox{\@tempdima}{\raggedsignature\strut\ignorespaces
+ #1\ifhmode\unskip\strut\fi\\[\useplength{sigbeforevskip}]
+ \strut\ignorespaces
+ \usekomavar{signature}\ifhmode\unskip\strut\fi}}\par
+ \nobreak\vskip\baselineskip
}
\newcommand\ps{\par%
\ifdim\parskip=\z@%
@@ -4160,7 +4503,22 @@
\usekomavar{subjectseparator}]{subject}
\newkomavar[\datename]{date}
\setkomavar{date}{\@date}
-%%% From File: $Id: scrkernel-circularletters.dtx 1384 2013-10-01 15:51:14Z mjk $
+\newcommand*{\scr@saved@date}{}
+\let\scr@saved@date\date
+\renewcommand*{\date}[1]{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\date\space changes the internal \string\LaTeX\space date
+ only.\MessageBreak
+ You should note that this changes the default\MessageBreak
+ value of variable `date' only as long as someone\MessageBreak
+ uses `\string\setkomavar` to change the content of\MessageBreak
+ variable `date'.\MessageBreak
+ Therefore, usage of `\string\setkomavar' is recommended\MessageBreak
+ to change the letter's date%
+ }%
+ \scr@saved@date{#1}%
+}
+%%% From File: $Id: scrkernel-circularletters.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
\newcommand*{\adrchar}{\addrchar}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index bb8e2ca024a..3136df07a1b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -42,7 +42,7 @@
%%% From File: $Id: scrpage.dtx 1547 2013-12-14 17:23:38Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (page head and foot)]
\newcommand*{\@Pass@Obsolete@Option@To@Typearea}[1]{%
\@expandtwoargs\in@{,\CurrentOption,}{,\@curroptions,}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 5f464bf6eef..da0f9488895 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -73,7 +73,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,30 +95,36 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@clsextenstion}{\@clsextenstion}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
\newcommand*{\KOMAClassName}{%
scrreprt%
}
\newcommand*{\ClassName}{%
report%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
+%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $
\RequirePackage{tocbasic}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\newif\if@openright
\@openrightfalse
\newcommand*{\scr@dotchangeatdocument}[1]{%
@@ -151,23 +157,23 @@
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
\newcommand*{\size@chapterprefix}{\size@chapter}
-\newcommand*{\scr@chapter@sectionbeforeskip}{\z@}
-\let\scr@chapter@sectionbeforeskip\z@
-\newcommand*{\scr@chapter@sectionafterskip}{\z@}
-\let\scr@chapter@sectionafterskip\z@
-\newcommand*{\scr@chapter@sectionindent}{\z@}
+\newcommand*{\scr@chapter@beforeskip}{\z@}
+\let\scr@chapter@beforeskip\z@
+\newcommand*{\scr@chapter@afterskip}{\z@}
+\let\scr@chapter@afterskip\z@
+\newcommand*{\scr@chapter@innerskip}{\z@}
\let\scr@chapter@sectionindent\z@
-\newcommand*{\scr@chapter@style}{}
+\newcommand*{\scr@chapter@style}{chapter}
\newcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}
\newcommand*{\chapterheadendvskip}{\vskip\@tempskipa}
-\newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}
+\newcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}
\newcommand*{\size@section}{}
\newcommand*{\size@subsection}{}
\newcommand*{\size@subsubsection}{}
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -203,14 +209,22 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{version}{first}%
}{%
\ClassInfoNoLine{\KOMAClassName}{%
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{version}{#1}%
}%
}
+\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
\AtEndOfClass{%
\KOMA@key{version}[]{%
\ClassError{\KOMAClassName}{%
@@ -276,24 +290,44 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@v@is@lt}[1]{%
+ \scr@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@gt}[1]{%
+ \scr@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@le}[1]{%
+ \numexpr\scr@compatibility-\@ne\relax<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@v@is@ge}[1]{%
+ \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\if@tempswa
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{5pt}%
\else
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{draft}{@tempswa}%
\setlength{\overfullrule}{\z@}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{draft}{false}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\@ptsize{%
11%
}
@@ -356,8 +390,11 @@
\@tempa
}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -417,19 +454,53 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \ifstr{#1}{semi}{%
+ \@twosidetrue
\FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `semi'}%
+ \KOMA@set@ifkey{twoside}{%
+ @tempswa%
+ }{#1}%
+ }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@tempswa\flushbottom
+ \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{twoside}{#1}%
+ \fi
}
+\KOMAExecuteOptions{twoside=false}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
- \FamilyKeyStateProcessed
+ \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{twocolumn}{@twocolumn}%
+ \expandafter\ifnum\scr@v@is@ge{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+ \fi
}
+\AtEndOfClass{%
+ \expandafter\ifnum\scr@v@is@lt{3.17}%
+ \if@twocolumn\twocolumn\sloppy\flushbottom
+ \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi
+ \fi
+}
+\KOMAExecuteOptions{twocolumn=false}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -438,6 +509,16 @@
\def\scr@parskip{#2}%
\def\scr@parfillskip{#3}%
\def\par@update{\let\par@update\default@par@update\par@updaterelative}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full*}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half-}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half+}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{half*}%
}
\newcommand*{\f@parindent}{\the\parindent}
\newcommand*{\f@parskip}{\the\parskip}
@@ -475,53 +556,66 @@
\ifcase\number\@tempa% 0
\endgroup
\setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{never}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 1
\endgroup
\setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 2
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 3
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
\z@ \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half-}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 4
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 5
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
1em \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 6
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.3333\linewidth\@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 7
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.3333\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half+}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 8
\endgroup
\setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{full*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 9
\endgroup
\setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
.25\linewidth \@plus 1fil}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{half*}%
\if@atdocument\AfterKOMAoptions{\selectfont}\fi
\or% 10
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{relative}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -535,6 +629,9 @@
}%
\or%11
\endgroup
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{absolute}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{relative}%
+ \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}%
\ifx\par@updaterelative\undefined
\expandafter\AtEndOfClass
\else
@@ -562,7 +659,9 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
+\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -571,21 +670,32 @@
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{titlepage}{firstiscover}%
}{%
\def\FamilyElseValue{, `firstiscover'}%
\KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.%
+ \KOMAClassFileName
+ }{titlepage}{firstiscover}%
+ \KOMA@kav@replacebool{.%
+ \KOMAClassFileName
+ }{titlepage}{@titlepage}%
\@titlepageiscoverpagefalse
\fi
}%
}
+\KOMA@kav@xadd{.%
+ \KOMAClassFileName
+}{titlepage}{\if@titlepage true\else false\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: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
{any}{0},%
@@ -593,18 +703,27 @@
{left}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{open}{#1}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openany}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openright}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{openleft}%
\ifcase \@tempa\relax
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{openany}%
\@openrightfalse
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{openright}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{openleft}%
\@openrighttrue
\renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{open}{any}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{openany}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
\KOMA@key{numbers}{%
@@ -616,6 +735,7 @@
{noenddot}{2},{nodotatend}{2}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{numbers}{#1}%
\ifcase \@tempa\relax
\if@atdocument\scr@dotchangeatdocument{#1}\else
\let\scr@altsecnumhook\@empty
@@ -631,20 +751,42 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-\KOMA@ifkey{chapterprefix}{@chapterprefix}
+\newif\if@chapterprefix
+\KOMA@key{chapterprefix}[true]{%
+ \KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}%
+ {chapterprefix}{@chapterprefix}%
+ \KOMA@kav@remove{.\KOMAClassFileName}%
+ {headings}{twolinechapter}%
+ \KOMA@kav@remove{.\KOMAClassFileName}%
+ {headings}{onelinechapter}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}%
+ {headings}{%
+ \if@chapterprefix twolinechapter\else onelinechapter\fi
+ }%
+ \fi
+}
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}%
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}{appendixprefix}{#1}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{twolineappendix}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{onelineappendix}%
\if@tempswa
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{twolineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixtrue}%
}{%
\l@addto@macro\appendixmore{\@chapterprefixtrue}%
}%
\else
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{onelineappendix}%
\@ifundefined{appendixmore}{%
\def\appendixmore{\@chapterprefixfalse}%
}{%
@@ -677,17 +819,23 @@
{standardclasses}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
- \renewcommand*{\scr@chapter@sectionbeforeskip}{3.3\baselineskip+\parskip}%
- \renewcommand*{\scr@chapter@sectionafterskip}{%
+ \ifcase \@tempa\relax% big
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{big}%
+ \renewcommand*{\scr@chapter@beforeskip}{3.3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@afterskip}{%
1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
}%
+ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa
\else\vskip\@tempskipa\fi
}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\huge}%
@@ -697,17 +845,23 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\scr@chapter@sectionbeforeskip}{3\baselineskip+\parskip}%
- \renewcommand*{\scr@chapter@sectionafterskip}{%
+ \or % normal
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{normal}%
+ \renewcommand*{\scr@chapter@beforeskip}{3\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@afterskip}{%
1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
}%
+ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa
\else\vskip\@tempskipa\fi
}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\LARGE}%
@@ -717,17 +871,23 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\scr@chapter@sectionbeforeskip}{2.8\baselineskip+\parskip}%
- \renewcommand*{\scr@chapter@sectionafterskip}{%
+ \or % small
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{small}%
+ \renewcommand*{\scr@chapter@beforeskip}{2.8\baselineskip+\parskip}%
+ \renewcommand*{\scr@chapter@afterskip}{%
1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
}%
+ \renewcommand*{\scr@chapter@innerskip}{.5\baselineskip}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\vspace\@tempskipa
+ \expandafter\ifnum\scr@v@is@lt{3.15}\vspace\@tempskipa
\else\vskip\@tempskipa\fi
}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip.5\baselineskip}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\LARGE}%
\renewcommand*{\size@partnumber}{\LARGE}%
\renewcommand*{\size@chapter}{\Large}%
@@ -737,32 +897,50 @@
\renewcommand*{\size@subsubsection}{\normalsize}%
\renewcommand*{\size@paragraph}{\normalsize}%
\renewcommand*{\size@subparagraph}{\normalsize}%
- \or
+ \or % openany
\KOMAoptions{open=any}%
- \or
+ \or % openright
\KOMAoptions{open=right}%
- \or
+ \or % openleft
\KOMAoptions{open=left}%
- \or
+ \or % twolinechapter
\KOMAoptions{chapterprefix=true}%
- \or
+ \or % onelinechapter
\KOMAoptions{chapterprefix=false}%
- \or
+ \or % twolineappendix
\KOMAoptions{appendixprefix=true}%
- \or
+ \or % onelineappend
\KOMAoptions{appendixprefix=false}%
- \or
+ \or % optiontotocandhead
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotocandhead}%
\scr@activate@xsection{3}%
- \or
+ \or % optiontotoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontotoc}%
\scr@activate@xsection{2}%
- \or
+ \or % optiontohead
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotocandhead}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontotoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{optiontohead}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{optiontohead}%
\scr@activate@xsection{1}%
- \or
- \renewcommand*{\scr@chapter@sectionbeforeskip}{50\p@}%
- \renewcommand*{\scr@chapter@sectionafterskip}{40\p@}%
+ \or % standardclasses
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{big}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{normal}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{small}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{headings}{standardclasses}%
+ \KOMA@kav@add{.\KOMAClassFileName}{headings}{standardclasses}%
+ \renewcommand*{\scr@chapter@beforeskip}{50\p@}%
+ \renewcommand*{\scr@chapter@afterskip}{40\p@}%
+ \renewcommand*{\scr@chapter@innerskip}{20\p@}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
\renewcommand*{\chapterheadendvskip}{\vskip\@tempskipa}%
- \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip 20\p@}%
+ \renewcommand*{\chapterheadmidvskip}{\par\nobreak\vskip\@tempskipa}%
\renewcommand*{\size@part}{\Huge}%
\renewcommand*{\size@partnumber}{\huge}%
\renewcommand*{\size@chapter}{\Huge}%
@@ -777,14 +955,17 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{big}
+\KOMA@kav@add{.\KOMAClassFileName}{headings}{onelinechapter}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{headinclude=#1}%
}{%
@@ -792,11 +973,13 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
\@ifundefined{typearea}{%
\PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
@@ -804,8 +987,8 @@
}%
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{footsepline}{false}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
-\@twosidefalse
\KOMA@key{cleardoublepage}{%
\begingroup%
\def\@tempc{%
@@ -819,6 +1002,9 @@
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{current}%
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -827,6 +1013,9 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{#1}%
}%
}{%
\ifx\@currname\KOMAClassName
@@ -837,6 +1026,8 @@
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.\KOMAClassFileName}%
+ {cleardoublepage}{#1}%
}%
}{}%
\fi
@@ -869,6 +1060,23 @@
\cleardoublestandardpage
\fi
}
+\KOMA@kav@add{.%
+ \KOMAClassFileName
+}{cleardoublepage}{%
+ \expandafter\ifnum \scr@v@is@gt{2.98c}empty\else current\fi
+}
+\AtEndOfClass{%
+ \KOMAoptionOf[\expandafter\edef\expandafter\@tempa\@firstofone]%
+ {%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{cleardoublepage}%
+ \KOMA@kav@xadd{.%
+ \KOMAClassFileName
+ }{cleardoublepage}{\@tempa}%
+}
\newcommand*{\cleardoubleoddpage}{\cleardoubleoddemptypage}
\newcommand*{\cleardoubleevenpage}{\cleardoubleevenemptypage}
\newcommand*{\cleardoublepageusingstyle}[1]{\clearpage
@@ -878,7 +1086,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -906,49 +1114,113 @@
{middlebeside}{13},{besidemiddle}{13},%
{bottombeside}{14},{besidebottom}{14}%
}{#1}%
- \ifcase \@tempa\relax
- \@tablecaptionabovetrue
- \@figurecaptionabovetrue
- \@captionabovetrue
- \or
- \@tablecaptionabovefalse
- \@figurecaptionabovefalse
- \@captionabovefalse
- \or
- \@tablecaptionabovetrue
- \or
- \@tablecaptionabovefalse
- \or
- \@figurecaptionabovetrue
- \or
- \@figurecaptionabovefalse
- \or
- \onelinecaptionstrue
- \or
- \onelinecaptionsfalse
- \or
- \renewcommand*{\scap@pos}{r}%
- \or
- \renewcommand*{\scap@pos}{l}%
- \or
- \renewcommand*{\scap@pos}{i}%
- \or
- \renewcommand*{\scap@pos}{o}%
- \or
- \renewcommand*{\scap@valign}{t}%
- \or
- \renewcommand*{\scap@valign}{c}%
- \or
- \renewcommand*{\scap@valign}{b}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax % heading
+ \@tablecaptionabovetrue
+ \@figurecaptionabovetrue
+ \@captionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{heading}%
+ \or % signature
+ \@tablecaptionabovefalse
+ \@figurecaptionabovefalse
+ \@captionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{heading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{signature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}%
+ \or % tableheading
+ \@tablecaptionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{tableheading}%
+ \or % tablesignature
+ \@tablecaptionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tableheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{tablesignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}%
+ \or % figureheading
+ \@figurecaptionabovetrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{figureheading}%
+ \or % figuresignature
+ \@figurecaptionabovefalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figureheading}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{figuresignature}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}%
+ \or % oneline
+ \onelinecaptionstrue
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}%
+ \or % nooneline
+ \onelinecaptionsfalse
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{oneline}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{nooneline}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{nooneline}%
+ \or % rightbeside
+ \renewcommand*{\scap@pos}{r}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}%
+ \or % leftbeside
+ \renewcommand*{\scap@pos}{l}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{leftbeside}%
+ \or % innerbeside
+ \renewcommand*{\scap@pos}{i}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{innerbeside}%
+ \or % outerbeside
+ \renewcommand*{\scap@pos}{o}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{rightbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{leftbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{innerbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{outerbeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{outerbeside}%
+ \or % topbeside
+ \renewcommand*{\scap@valign}{t}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{topbeside}%
+ \or % centeredbeside
+ \renewcommand*{\scap@valign}{c}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \or % bottombeside
+ \renewcommand*{\scap@valign}{b}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{topbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{centeredbeside}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{captions}{bottombeside}%
+ \KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}%
+ \fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{signature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{tablesignature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{figuresignature}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{oneline}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{rightbeside}
+\KOMA@kav@add{.\KOMAClassFileName}{captions}{bottombeside}
\KOMA@DeclareDeprecatedOption{tablecaptionabove}{captions=tableheading}
\KOMA@DeclareDeprecatedOption{tablecaptionbelow}{captions=tablesignature}
\newif\if@komalongtable\@komalongtabletrue
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -967,17 +1239,40 @@
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
}%
}
+\AtBeginDocument{%
+ \ifx\@footnotemark\scr@saved@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{nomultiple}%
+ \else\ifx\@footnotemark\scr@footnotemark
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{footnotes}%
+ \KOMA@kav@add{.%
+ \KOMAClassFileName
+ }{footnotes}{multiple}%
+ \fi\fi
+}
\newcommand*{\scr@footmisc@options}{}
\PassOptionsToPackage{\noexpand\scr@footmisc@options}{footmisc}
\newcommand*{\scr@saved@footnotemark}{%
@@ -995,7 +1290,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1016,33 +1311,45 @@
{chapterentrywithoutdots}{13},{chapterentryfill}{13}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % index
\KOMAoptions{index=notoc}%
- \or
+ \or % noindex
\KOMAoptions{index=totoc}%
- \or
+ \or % listof
\KOMAoptions{listof=notoc}%
- \or
+ \or % nolistof
\KOMAoptions{listof=totoc}%
- \or
+ \or % listofnumbered
\KOMAoptions{listof=numbered}%
- \or
+ \or % nobibliography
\KOMAoptions{bibliography=nottotoc}%
- \or
+ \or % bibliography
\KOMAoptions{bibliography=totoc}%
- \or
+ \or % bibliographynumbered
\KOMAoptions{bibliography=totocnumbered}%
- \or
+ \or % flat
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{flat}%
\@toclefttrue
- \or
+ \or % graduated
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{graduated}%
\@tocleftfalse
- \or
+ \or % indenttextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
\setuptoc{toc}{numberline}%
- \or
+ \or % leftaligntextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
\unsettoc{toc}{numberline}%
- \or
+ \or % chapterentrywithdots/sectionentrywithdots
\KOMAoptions{chapterentrydots=true}%
- \or
+ \or % chapterentrywithoutdots/sectionentrywithoutdots
\KOMAoptions{chapterentrydots=false}%
\fi
\fi
@@ -1071,7 +1378,15 @@
{chaptergapline}{12},{onelinechaptergap}{12}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % notoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}%
\renewcommand*{\float@@listhead}{%
\chapter*
}%
@@ -1084,6 +1399,14 @@
\unsettoc{\@currext}{totoc}%
}%
\or% totoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{totoc}%
\renewcommand*{\float@@listhead}{%
\addchap
}%
@@ -1096,6 +1419,14 @@
\setuptoc{\@currext}{totoc}%
}%
\or% numbered
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nolistof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listof}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{listofnumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{numbered}%
\renewcommand*{\float@@listhead}{%
\chapter
}%
@@ -1108,10 +1439,17 @@
\setuptoc{\@currext}{totoc}%
}%
\or% flat
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{flat}%
\@dynlisttrue
\or% graduated
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{flat}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{graduated}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}%
\@dynlistfalse
\or% leveldown
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{leveldown}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
@@ -1119,6 +1457,7 @@
\setuptoc{\@currext}{leveldown}%
}%
\or% entryprefix
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{entryprefix}%
\@dynlisttrue
\doforeachtocfile[float]{%
\BeforeStartingTOC[\@currext]{%
@@ -1138,14 +1477,20 @@
}%
}%
}%
- \or% numberline
+ \or% indenttextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{indenttextentries}%
\doforeachtocfile[float]{%
\setuptoc{\@currext}{numberline}%
}%
\AtAddToTocList[float]{%
\setuptoc{\@currext}{numberline}%
}
- \or% nonumberline
+ \or% leftaligntextentries
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{indenttextentries}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{leftaligntextentries}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}%
\doforeachtocfile[float]{%
\unsettoc{\@currext}{numberline}%
}%
@@ -1163,6 +1508,10 @@
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{toc}{nolistof}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{notoc}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{graduated}
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{leftaligntextentries}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
@@ -1170,15 +1519,39 @@
\newcommand*{\@chapterlistsgap}{10\p@}
\newif\if@chaptertolists\@chaptertolistsfalse
\KOMA@key{chapteratlists}[entry]{%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chapterentry}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergap}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{listof}{chaptergapline}%
\ifstr{#1}{entry}{%
\@chaptertoliststrue\renewcommand*{\@chapterlistsgap}{\z@}%
+ \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}{entry}%
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chapterentry}%
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
+ \KOMA@kav@replacevalue{.\KOMAClassFileName}{chapteratlists}%
+ {\@chapterlistsgap}%
+ \def\reserved@a{\z@}%
+ \ifx\@chapterlistsgap\reserved@a
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergap}%
+ \else
+ \def\reserved@a{10\p@}%
+ \ifx\@chapterlistsgap\reserved@a
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+ \else
+ \def\reserved@a{\baselineskip}%
+ \ifx\@chapterlistsgap\reserved@a
+ \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapline}%
+ \fi
+ \fi
+ \fi
}%
- \FamilyKeyStateProcessed
}
\BeforeTOCHead{\@chaptertolistsfalse}
-%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
+\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
+\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
+%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1197,6 +1570,16 @@
\let\newblock\@empty
\let\bib@beginhook\@empty
\let\bib@endhook\@empty
+ \@ifundefined{scr@current@bibstyle}{}{%
+ \ifstr{\scr@current@bibstyle}{}{}{%
+ \edef\reserved@a{%
+ \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
+ {\scr@current@bibstyle}%
+ }\reserved@a
+ }%
+ }%
+ \def\scr@current@bibstyle{#2}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{bibliography}{#2}%
\csname scr@bibstyle@#1\endcsname
#3%
}%
@@ -1250,7 +1633,15 @@
{leveldown}{3},%
{standardlevel}{4}%
}{#1}%
- \ifcase \@tempa\relax
+ \ifcase \@tempa\relax % notoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{notoc}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\section*{\bibname}%
@@ -1261,6 +1652,14 @@
\fi
}%
\or% totoc
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{totoc}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\addsec{\bibname}
@@ -1274,6 +1673,14 @@
\fi
}%
\or% numbered
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{nobibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliography}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{bibliographynumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{totoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{numbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{numbered}%
\renewcommand*\bib@heading{%
\ifbib@leveldown
\section{\bibname}%
@@ -1288,19 +1695,29 @@
\fi
}
\or% leveldown
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{leveldown}%
\bib@leveldowntrue
\or% standardlevel
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{bibliography}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{bibliography}{standardlevel}%
\bib@leveldownfalse
\fi
}{%
- \csname scr@bibstyle@#1\endcsname
\FamilyKeyStateProcessed
+ \edef\reserved@a{%
+ \noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
+ {\scr@current@bibstyle}%
+ }\reserved@a
+ \csname scr@bibstyle@#1\endcsname
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\idx@@heading}{%
\chapter*
}
@@ -1310,29 +1727,39 @@
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}%
\ifcase \@tempa\relax
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
\chapter*
}%
\or
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\addchap
}%
\fi
\fi
}
+\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}
+\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
- \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{#1}{#2 \@plus#3 \@minus#4}%
\else
\ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
@@ -1366,325 +1793,325 @@
\fi
\fi
}
-\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
- \ClassWarning{\KOMAClassName}{%
- Using fallback calculation to setup font sizes\MessageBreak
- for basic size `#2'}%
- \scr@ifundefinedorrelax{dimexpr}{%
- \ClassError{\KOMAClassName}{%
- feature only allowed using e-TeX%
- }{%
- The fallback calculation to setup font sizes was implemented
- using e-TeX.\MessageBreak
- You should not continue, because the fallback calculation would fail%
- }
- }{%
- \@defaultunits\@tempdima#2pt\relax\@nnil
- \setlength{\@tempdimc}{\@tempdima}%
- \addtolength{\@tempdimc}{-10\p@}%
- \edef\@ptsize{\strip@pt\@tempdimc}%
- \@defaultunits\@tempdimb#1pt\relax\@nnil
- \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
- \edef\@tempb{\the\@tempdimc}%
- \setlength{\@tempdimc}{\@tempdima}%
- \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
- \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \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}%
- \edef\normalsize{%
- \noexpand\@setfontsize\noexpand\normalsize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listI
- }%
- \setlength{\@tempdima}{0.9125\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\small{%
- \noexpand\@setfontsize\noexpand\small
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@small
- }%
- \setlength{\@tempdima}{.83334\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@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}%
- \edef\footnotesize{%
- \noexpand\@setfontsize\noexpand\footnotesize
- {\the\@tempdima}{\the\@tempdimb}%
- \abovedisplayskip \the\abovedisplayskip
- \abovedisplayshortskip \the\abovedisplayshortskip
- \belowdisplayskip \the\belowdisplayskip
- \belowdisplayshortskip \the\belowdisplayshortskip
- \let\noexpand\@listi\noexpand\@listi@footnotesize
- }%
- \setlength{\@tempdima}{.66667\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
- \noexpand\@setfontsize\noexpand\scriptsize
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{.5\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
- \noexpand\@setfontsize\noexpand\tiny
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.2\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
- \noexpand\@setfontsize\noexpand\large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.44\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
- \noexpand\@setfontsize\noexpand\Large
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{1.728\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
- \noexpand\@setfontsize\noexpand\LARGE
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.074\@tempdimc}%
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
- \noexpand\@setfontsize\noexpand\huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \setlength{\@tempdima}{2.488\@tempdimc}%
+\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
+ \KOMA@kav@removekey{.%
+ \KOMAClassFileName
+ }{fontsize}%
+ \@defaultunits\@tempdima#2pt\relax\@nnil
+ \setlength{\@tempdimc}{\@tempdima}%
+ \addtolength{\@tempdimc}{-10\p@}%
+ \edef\@ptsize{\strip@pt\@tempdimc}%
+ \@defaultunits\@tempdimb#1pt\relax\@nnil
+ \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}%
+ \edef\@tempb{\the\@tempdimc}%
+ \setlength{\@tempdimc}{\@tempdima}%
+ \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
+ \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\normalsize{%
+ \noexpand\@setfontsize\noexpand\normalsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listI
+ }%
+ \setlength{\@tempdima}{0.9125\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\small{%
+ \noexpand\@setfontsize\noexpand\small
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@small
+ }%
+ \setlength{\@tempdima}{.83334\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \edef\footnotesize{%
+ \noexpand\@setfontsize\noexpand\footnotesize
+ {\the\@tempdima}{\the\@tempdimb}%
+ \abovedisplayskip \the\abovedisplayskip
+ \abovedisplayshortskip \the\abovedisplayshortskip
+ \belowdisplayskip \the\belowdisplayskip
+ \belowdisplayshortskip \the\belowdisplayshortskip
+ \let\noexpand\@listi\noexpand\@listi@footnotesize
+ }%
+ \setlength{\@tempdima}{.66667\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\scriptsize{%
+ \noexpand\@setfontsize\noexpand\scriptsize
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{.5\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\tiny{%
+ \noexpand\@setfontsize\noexpand\tiny
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.2\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\large{%
+ \noexpand\@setfontsize\noexpand\large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.44\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Large{%
+ \noexpand\@setfontsize\noexpand\Large
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{1.728\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\LARGE{%
+ \noexpand\@setfontsize\noexpand\LARGE
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.074\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\huge{%
+ \noexpand\@setfontsize\noexpand\huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \setlength{\@tempdima}{2.488\@tempdimc}%
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \edef\Huge{%
+ \noexpand\@setfontsize\noexpand\Huge
+ {\the\@tempdima}{\the\@tempdimb}%
+ }%
+ \normalsize
+ \expandafter\ifnum\scr@v@is@ge{3.17}\@nameuse{par@updaterelative}\fi
+ \expandafter\ifnum\scr@v@is@lt{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
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \let\@listI\@listi
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@small{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listi\endcsname
+ \endgroup
+ \edef\@listi@footnotesize{\leftmargin\leftmargini
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listii\endcsname
+ \endgroup
+ \edef\@listii{\leftmargin\leftmarginii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \the\parsep
+ \itemsep \parsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \expandafter\ifnum\scr@v@is@lt{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}%
+ \csname @listiii\endcsname
+ \endgroup
+ \edef\@listiii{\leftmargin\leftmarginiii
+ \labelwidth=\dimexpr \leftmargin-\labelsep
+ \topsep \the\topsep
+ \parsep \z@
+ \partopsep \the\partopsep
+ \itemsep \topsep
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listiv\endcsname
+ \endgroup
+ \edef\@listiv{\leftmargin\leftmarginiv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listv\endcsname
+ \endgroup
+ \edef\@listv{\leftmargin\leftmarginv
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@tempswafalse
+ \begingroup
+ \def\@list@extra{\aftergroup\@tempswatrue}%
+ \csname @listvi\endcsname
+ \endgroup
+ \edef\@listvi{\leftmargin\leftmarginvi
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
+ \if@tempswa\noexpand\@list@extra\fi
+ }%
+ \@listi
+ \expandafter\ifnum\scr@v@is@lt{3.12}\relax
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
- \noexpand\@setfontsize\noexpand\Huge
- {\the\@tempdima}{\the\@tempdimb}%
- }%
- \normalsize
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \let\@listI\@listi
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@small{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listi\endcsname
- \endgroup
- \edef\@listi@footnotesize{\leftmargin\leftmargini
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listii\endcsname
- \endgroup
- \edef\@listii{\leftmargin\leftmarginii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \the\parsep
- \itemsep \parsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \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}%
- \csname @listiii\endcsname
- \endgroup
- \edef\@listiii{\leftmargin\leftmarginiii
- \labelwidth=\dimexpr \leftmargin-\labelsep
- \topsep \the\topsep
- \parsep \z@
- \partopsep \the\partopsep
- \itemsep \topsep
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listiv\endcsname
- \endgroup
- \edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listv\endcsname
- \endgroup
- \edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@tempswafalse
- \begingroup
- \def\@list@extra{\aftergroup\@tempswatrue}%
- \csname @listvi\endcsname
- \endgroup
- \edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep\relax
- \if@tempswa\noexpand\@list@extra\fi
- }%
- \@listi
- \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
+ \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
+}
+\scr@ifundefinedorrelax{changefontsizes}{%
+ \let\changefontsizes\simple@changefontsizes
+}{%
+ \ClassWarning{\KOMAClassName}{%
+ \string\changefontsizes\space already defined.\MessageBreak
+ I hope, the definition is compatible,\MessageBreak
+ because I do not change it%
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1693,20 +2120,29 @@
\edef\@tempb{\strip@pt\@tempdimb}%
\addtolength{\@tempdimb}{-10\p@}%
\edef\@ptsize{\strip@pt\@tempdimb}%
-\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{
+\InputIfFileExists{\@fontsizefilebase\@tempa.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempa.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
}{%
\InputIfFileExists{\@fontsizefilebase\@tempb pt.clo}{%
\ClassInfo{\KOMAClassName}{%
File `\@fontsizefilebase\@tempb pt.clo' used instead of\MessageBreak
file `\@fontsizefilebase\@tempa.clo' to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb pt}%
}{%
\InputIfFileExists{size\@tempb.clo}{%
\ClassInfo{\KOMAClassName}{%
File `size\@tempb.clo' used to setup font sizes}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{fontsize}%
+ \KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempb}%
}{%
- \changefontsizes{\@tempa}%
+ \edef\@tempa{%
+ \noexpand\changefontsizes{\@tempa}%
+ \noexpand\KOMA@kav@xadd{.\KOMAClassFileName}{fontsize}{\@tempa}%
+ }\@tempa
}%
}%
}
@@ -1759,12 +2195,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1808,7 +2244,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1936,7 +2372,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1868 2014-12-09 12:45:22Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2275,7 +2711,7 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
\scr@ifundefinedorrelax{#1numdepth}{%
@@ -2544,205 +2980,347 @@
\let\raggedsection\raggedright
\DefineFamily{KOMAarg}
\DefineFamilyMember[.dsc]{KOMAarg}
-\newcommand*{\DeclareSectionCommand}[2][]{%
- \edef\reserved@a{%
- \noexpand\FamilyStringKey[.dsc]{KOMAarg}{style}{%
- \expandafter\noexpand\csname scr@#2@style\endcsname
+\newcommand*{\DeclareSectionCommandStyleOption}[3]{%
+ \DeclareSectionCommandDummyOption{#2}%
+ \expandafter\g@addto@macro\csname scr@dsc@style@#1@options\endcsname{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#2}{#3}%
+ }%
+}
+\newcommand*{\DeclareSectionCommandDummyOption}[1]{%
+ \@ifstar {%
+ \g@addto@macro{\scr@dsc@dummyoptions}{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#1}[]{\FamilyKeyStateProcessed}%
}%
- }\reserved@a
- \scr@ifundefinedorrelax{scr@local@levelincrease}{%
- \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
- {\scr@local@levelincrease}%
+ \g@addto@macro{\scr@dsc@dummyoptions}{%
+ \DefineFamilyKey[.dsc]{KOMAarg}{#1}{\FamilyKeyStateProcessed}%
+ }%
}%
- \scr@ifundefinedorrelax{scr@local@leveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
- \expandafter\noexpand\csname #2numdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
- \expandafter\noexpand\csname #2numdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@leveloffset\relax}%
- \edef\scr@local@leveloffset{%
- \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
- }%
- }%
- }%
- }\reserved@a
+}
+\newcommand*{\scr@dsc@dummyoptions}{}
+\newcommand*{\DeclareSectionCommandStyleLengthOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{##1}%
+ \fi
+ \fi
}%
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{indent}{%
- \expandafter\noexpand\csname scr@#2@sectionindent\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{beforeskip}{%
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{afterskip}{%
- \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{font}{%
- \noexpand\IfExistskomafont{#2}{%
- \noexpand\setkomafont
+}
+\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \FamilySetCounter{KOMAarg}{#2}{\@tempcnta}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\edef\csname #3\scr@dsc@current#4 \endcsname{\the\@tempcnta}%
+ \fi
+ }%
+}
+\newcommand*{\DeclareSectionCommandStyleFontOption}[4]{%
+ \DeclareSectionCommandStyleOption{#1}{#2}{%
+ \IfExistskomafont{#3\scr@dsc@current#4}{%
+ \setkomafont
+ }{%
+ \newkomafont
+ }{#3\scr@dsc@current#4}{##1}%
+ \FamilyKeyStateProcessed
+ }%
+}
+\DeclareSectionCommandDummyOption{style}
+\DeclareSectionCommandDummyOption{expandtopt}*
+\DeclareSectionCommandDummyOption{increaselevel}
+\DeclareSectionCommandDummyOption{level}
+\DeclareSectionCommandDummyOption{toclevel}
+\DeclareSectionCommandDummyOption{tocindent}
+\DeclareSectionCommandDummyOption{tocnumwidth}
+\newcommand*{\scr@dsc@style@section@options}{}
+\DeclareSectionCommandStyleLengthOption{section}
+ {indent}{scr@}{@sectionindent}
+\DeclareSectionCommandStyleLengthOption{section}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{section}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{section}{font}{}{}
+\newcommand*{\scr@dsc@style@chapter@options}{}
+\DeclareSectionCommandStyleLengthOption{chapter}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{chapter}
+ {innerskip}{scr@}{@innerskip}
+\DeclareSectionCommandStyleLengthOption{chapter}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{chapter}{font}{}{}
+\DeclareSectionCommandStyleFontOption{chapter}{prefixfont}{}{prefix}
+\newcommand*{\scr@dsc@style@part@options}{}
+\DeclareSectionCommandStyleLengthOption{part}
+ {beforeskip}{scr@}{@beforeskip}
+\DeclareSectionCommandStyleLengthOption{part}
+ {innerskip}{scr@}{@innerskip}
+\DeclareSectionCommandStyleLengthOption{part}
+ {afterskip}{scr@}{@afterskip}
+\DeclareSectionCommandStyleFontOption{part}{font}{}{}
+\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number}
+\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+}
+\newcommand*{\scr@dsc@style@chapter@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip}
+ {innerskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before chapter skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after chaper skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current prefix}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{prefix line font}
+ {prefixfont}%
+ }{}%
+}
+\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip}
+ {innerskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip}
+ {beforeskip}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip}
+ {afterskip}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
+ }{}%
+ \IfExistskomafont{\scr@dsc@current number}{}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{number font}
+ {prefixfont}%
+ }{}%
+}
+\newif\ifscr@dsc@parametersonly
+\newcommand*{\DeclareSectionCommand}[2][]{%
+ \edef\scr@dsc@current{#2}%
+ \scr@dsc@dummyoptions
+ \scr@dsc@parametersonlyfalse
+ \DefineFamilyKey[.dsc]{KOMAarg}{style}{%
+ \ifstr{##1}{}{%
+ \ifscr@dsc@parametersonlytrue
+ \FamilyKeyStateProcessed
+ }{%
+ \scr@ifundefinedorrelax{scr@start##1}{%
+ \FamilyKeyStateUnknownValue
}{%
- \noexpand\newkomafont
- }{#2}{####1}%
- \noexpand\FamilyKeyStateProcessed
- }%
- }\reserved@a
- \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
- \let\scr@local@counterwithin\relax
- \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
- \edef\reserved@a{%
- \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname #2tocdepth\endcsname}%
- }\reserved@a
- }{%
- \edef\reserved@a{%
- \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
- \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
- \expandafter\noexpand\csname #2tocdepth\endcsname
- }%
- \unexpanded{%
- {\numexpr ##1+\scr@local@tocleveloffset\relax}%
- \edef\scr@local@tocleveloffset{%
- \the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
- }%
- }%
+ \@namedef{scr@\scr@dsc@current @style}{##1}%
+ \FamilyKeyStateProcessed
}%
- }\reserved@a
+ }%
}%
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocindent}{%
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname}%
- }\reserved@a
- \edef\reserved@a{%
- \noexpand\FamilyLengthMacroKey[.dsc]{KOMAarg}{tocnumwidth}{%
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname}%
- }\reserved@a
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
\begingroup
- \scr@ifundefinedorrelax{#2numdepth}{%
- \scr@declaresectioncommanderror{#2}{section level}{level}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionindent}{%
- \scr@declaresectioncommanderror{#2}{section indent}{indent}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionbeforeskip}{%
- \scr@declaresectioncommanderror{#2}{before section skip}{beforeskip}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@sectionafterskip}{%
- \scr@declaresectioncommanderror{#2}{after section skip}{afterskip}%
- }{}%
- \IfExistskomafont{#2}{}{%
- \scr@declaresectioncommanderror{#2}{font}{font}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@tocindent}{%
- \scr@declaresectioncommanderror{#2}{toc entry indent}{tocindent}%
- }{}%
- \scr@ifundefinedorrelax{scr@#2@tocnumwidth}{%
- \scr@declaresectioncommanderror{#2}{toc entry number
- width}{tocnumwidth}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @style}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}
+ {section command style}{style}%
}{}%
\endgroup
\@firstofone{%
- \@ifundefined{c@#2}{\newcounter{#2}}{}%
- \ifx\scr@local@counterwithin\relax
- \else\ifx\scr@local@counterwithin\@empty
- \@namedef{the#2}{\arabic{#2}}%
- \else
- \@removefromreset{#2}{\scr@local@counterwithin}%
- \@addtoreset{#2}{\scr@local@counterwithin}%
- \expandafter\def\csname the#2\expandafter\endcsname{%
- \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
- \fi
- \fi
- \@ifundefined{#2format}{%
- \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
- }{}%
- \ifstr{\csname scr@#2@style\endcsname}{}{%
- \ClassInfo{\KOMAClassName}{%
- not defining `\expandafter\string\csname #2\endcsname' due
- to\MessageBreak
- empty section style%
- }%
+ \scr@dsc@dummyoptions
+ \@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
+ \FamilyBoolKey[.dsc]{KOMAarg}{expandtopt}{scr@dsc@expandtopt}%
+ \scr@dsc@expandtoptfalse
+ \scr@ifundefinedorrelax{scr@local@levelincrease}{%
+ \RelaxFamilyKey[.dsc]{KOMAarg}{increaselevel}%
}{%
- \scr@ifundefinedorrelax{scr@#2@style}{%
- \ClassWarning{\KOMAClassName}{using default section style}%
- \@namedef{scr@#2@style}{section}%
- }{}%
- \expandafter\edef\csname #2\endcsname{%
- \noexpand\scr@ifundefinedorrelax{%
- scr@start\csname scr@#2@style\endcsname}{%
- \noexpand\ClassError{\noexpand\KOMAClassName}{%
- section style `\csname scr@#2@style\endcsname' not defined}{%
- A not yet defined section style `\csname scr@#2@style\endcsname'
- has been setup for\MessageBreak
- `\expandafter\string\csname #2\endcsname'. You should either setup
- another style\MessageBreak
- or define the style.\MessageBreak
- If you'll continue, style `section' will be used as an emergency
- fallback.%
+ \FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
+ {\scr@local@levelincrease}%
+ }%
+ \scr@ifundefinedorrelax{scr@local@leveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{level}{%
+ \expandafter\noexpand\csname \scr@dsc@current numdepth\endcsname}%
+ }\reserved@a
+ }{%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{level}{%
+ \expandafter\noexpand\csname \scr@dsc@current numdepth\endcsname
}%
- \noexpand\def\expandafter\noexpand\csname scr@#2@style\endcsname
- {section}%
- }{}%
- \expandafter\noexpand
- \csname scr@start\csname scr@#2@style\endcsname\endcsname
- {#2}%
- \expandafter\noexpand\csname #2numdepth\endcsname
- \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
- \expandafter\noexpand\csname scr@#2@sectionafterskip\endcsname{%
- \noexpand\ifdim\noexpand\glueexpr
- \expandafter\noexpand\csname scr@#2@sectionbeforeskip\endcsname
- <\noexpand\z@
- \unexpanded{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}%
- \fi
- }%
- \noexpand\fi
\unexpanded{%
- \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ {\numexpr ##1+\scr@local@leveloffset\relax}%
+ \edef\scr@local@leveloffset{%
+ \the\numexpr\scr@local@leveloffset+\scr@local@levelincrease\relax
+ }%
}%
}%
- }%
+ }\reserved@a
}%
- \@ifundefined{DeclareSectionNumberDepth}{%
- \@ifundefined{#2markformat}{%
- \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
- }{}%
- \@ifundefined{#2mark}{%
- \expandafter\let\csname #2mark\endcsname\@gobble
- }{}%
+ \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
+ \let\scr@local@counterwithin\relax
+ \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
+ \edef\reserved@a{%
+ \noexpand\FamilyCounterMacroKey[.dsc]{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname}%
+ }\reserved@a
}{%
- \DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
+ \edef\reserved@a{%
+ \noexpand\DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{%
+ \noexpand\FamilySetCounterMacro{KOMAarg}{toclevel}{%
+ \expandafter\noexpand\csname \scr@dsc@current tocdepth\endcsname
+ }%
+ \unexpanded{%
+ {\numexpr ##1+\scr@local@tocleveloffset\relax}%
+ \edef\scr@local@tocleveloffset{%
+ \the\numexpr\scr@local@tocleveloffset
+ +\scr@local@levelincrease\relax
+ }%
+ }%
+ }%
+ }\reserved@a
}%
- \scr@ifundefinedorrelax{#2tocdepth}{%
- \expandafter\let\csname #2tocdepth\expandafter\endcsname
- \csname #2numdepth\endcsname
- }{}%
- \expandafter\providecommand\expandafter*%
- \csname add#2tocentry\endcsname[2]{%
- \addtocentrydefault{#2}{##1}{##2}%
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{
+ ##1}%
+ \fi
+ \fi
}%
- \scr@ifundefinedorrelax{l@#2}{%
- \expandafter\edef\csname l@#2\endcsname{%
- \noexpand\bprot@dottedtocline
- \expandafter\noexpand\csname #2tocdepth\endcsname
- \expandafter\noexpand\csname scr@#2@tocindent\endcsname
- \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
+ \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{%
+ \FamilySetLength{KOMAarg}{#2}{\@tempskipa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dsc@expandtopt
+ \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
+ \the\@tempskipa}%
+ \else
+ \expandafter\edef\csname scr@\scr@dsc@current @tocnumwidth\endcsname{%
+ ##1}%
+ \fi
+ \fi
+ }%
+ \FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
+ \begingroup
+ \scr@ifundefinedorrelax{\scr@dsc@current numdepth}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocindent}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry indent}
+ {tocindent}%
+ }{}%
+ \scr@ifundefinedorrelax{scr@\scr@dsc@current @tocnumwidth}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{toc entry number
+ width}{tocnumwidth}%
+ }{}%
+ \@nameuse{scr@dsc@style@%
+ \@nameuse{scr@\scr@dsc@current @style}%
+ @neededoptionstest}%
+ \endgroup
+ \@firstofone{%
+ \@ifundefined{c@#2}{\newcounter{#2}}{}%
+ \ifx\scr@local@counterwithin\relax
+ \else\ifx\scr@local@counterwithin\@empty
+ \@namedef{the#2}{\arabic{#2}}%
+ \else
+ \@removefromreset{#2}{\scr@local@counterwithin}%
+ \@addtoreset{#2}{\scr@local@counterwithin}%
+ \expandafter\def\csname the#2\expandafter\endcsname{%
+ \csname the\scr@local@counterwithin\endcsname.\arabic{#2}}%
+ \fi
+ \fi
+ \@ifundefined{#2format}{%
+ \@namedef{#2format}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \ifscr@dsc@parametersonly
+ \ClassInfo{\KOMAClassName}{%
+ not defining `\expandafter\string\csname #2\endcsname' due
+ to\MessageBreak
+ empty section style option%
+ }%
+ \else
+ \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{%
+ \ClassWarning{\KOMAClassName}{%
+ not defining `\expandafter\string\csname #2\endcsname'
+ due\MessageBreak
+ to not yet defined section style\MessageBreak
+ `\@nameuse{scr@#2@style}'%
+ }%
+ }{%
+ \expandafter\edef\csname #2\endcsname{%
+ \expandafter\noexpand
+ \csname scr@start\csname scr@#2@style\endcsname\endcsname
+ {#2}%
+ \expandafter\noexpand\csname #2numdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@sectionindent\endcsname
+ \expandafter\noexpand\csname scr@#2@beforeskip\endcsname
+ \expandafter\noexpand\csname scr@#2@afterskip\endcsname{%
+ \noexpand\ifdim\noexpand\glueexpr
+ \expandafter\noexpand\csname scr@#2@beforeskip\endcsname
+ <\noexpand\z@
+ \unexpanded{%
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ }%
+ \noexpand\fi
+ \unexpanded{%
+ \raggedsection\normalfont\sectfont\nobreak\usekomafont{#2}%
+ }%
+ }%
+ }%
+ }%
+ \fi
+ \@ifundefined{DeclareSectionNumberDepth}{%
+ \@ifundefined{#2markformat}{%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
+ }{}%
+ \@ifundefined{#2mark}{%
+ \expandafter\let\csname #2mark\endcsname\@gobble
+ }{}%
+ }{%
+ \DeclareSectionNumberDepth{#2}{\csname #2numdepth\endcsname}%
}%
- }{}%
+ \scr@ifundefinedorrelax{#2tocdepth}{%
+ \expandafter\let\csname #2tocdepth\expandafter\endcsname
+ \csname #2numdepth\endcsname
+ }{}%
+ \expandafter\providecommand\expandafter*%
+ \csname add#2tocentry\endcsname[2]{%
+ \addtocentrydefault{#2}{##1}{##2}%
+ }%
+ \scr@ifundefinedorrelax{l@#2}{%
+ \expandafter\edef\csname l@#2\endcsname{%
+ \noexpand\bprot@dottedtocline
+ \expandafter\noexpand\csname #2tocdepth\endcsname
+ \expandafter\noexpand\csname scr@#2@tocindent\endcsname
+ \expandafter\noexpand\csname scr@#2@tocnumwidth\endcsname
+ }%
+ }{}%
+ }%
}%
}
\newcommand*{\scr@declaresectioncommanderror}[3]{%
@@ -2883,7 +3461,7 @@
}%
\reserved@a
}{%
- \DefineFamilyKey[.dsc]{KOMAarg}{style}{}%
+ \scr@dsc@dummyoptions
\FamilyCounterMacroKey[.dsc]{KOMAarg}{increaselevel}[1]%
{\scr@local@levelincrease}%
\DefineFamilyKey[.dsc]{KOMAarg}{level}{%
@@ -2895,14 +3473,6 @@
\the\numexpr\scr@local@tocleveloffset+\scr@local@levelincrease\relax
}%
}%
- \DefineFamilyKey[.dsc]{KOMAarg}{indent}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{beforeskip}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{afterskip}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{font}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{counterwidthin}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{toclevel}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocindent}{}%
- \DefineFamilyKey[.dsc]{KOMAarg}{tocnumwidth}{}%
\FamilyExecuteOptions[.dsc]{KOMAarg}{#1}%
}%
}%
@@ -3019,7 +3589,7 @@
}%
}
\newcommand*{\bprot@dottedtocline}[5]{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\ifnum #1>\c@tocdepth \else
\begingroup
\@tempcnta 20010
@@ -3049,24 +3619,24 @@
\newcommand*{\partnumdepth}{%
\m@ne
}
-\newcommand*{\scr@part@sectionbeforeskip}{%
+\newcommand*{\scr@part@beforeskip}{%
\z@ \@plus 1fil + \baselineskip
}
\newcommand*{\partheadstartvskip}{%
\null\vskip-\baselineskip\vskip\@tempskipa
}
+\newcommand*{\scr@part@innerskip}{20\p@}
\newcommand*{\partheadmidvskip}{%
\par\nobreak
- \vskip 20\p@
+ \vskip\@tempskipa
}
-\newcommand*{\scr@part@sectionafterskip}{%
+\newcommand*{\scr@part@afterskip}{%
\z@ \@plus 1fil
}
\newcommand*{\partheadendvskip}{%
\vskip\@tempskipa\newpage
}
-\newcommand*{\scr@part@sectionindent}{\z@}
-\newcommand*{\scr@part@style}{}
+\newcommand*{\scr@part@style}{part}
\newcommand*{\partheademptypage}{%
\if@twoside\if@openright
\null%
@@ -3082,7 +3652,7 @@
\else
\@tempswafalse
\fi
- \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr\scr@part@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
@@ -3127,6 +3697,7 @@
\normalfont\sectfont\nobreak
\ifnumbered{part}{%
\size@partnumber{\partformat}%
+ \setlength{\@tempskipa}{\scr@part@innerskip}%
\partheadmidvskip
}{}%
\size@part{#2}\strut
@@ -3149,7 +3720,7 @@
\@endpart
}
\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}%
- \@tempskipa=\glueexpr\scr@part@sectionafterskip\relax
+ \@tempskipa=\glueexpr\scr@part@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\partheademptypage
@@ -3174,7 +3745,7 @@
\else
\@tempswafalse
\fi
- \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr\scr@part@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
@@ -3207,16 +3778,20 @@
\scr@ds@tocentry}%
\fi
\@spart{#2}%
- \ifx\partmark\@gobble
- \@mkboth{}{}%
- \else
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \fi
+ \expandafter\addpartmark\expandafter{\scr@ds@head}%
}
\newcommand*{\@saddpart}{\@spart}
\newcommand*{\partmark}{}
\let\partmark\@gobble
+
+\newcommand*\addpartmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=-2
+ \partmark{#1}%
+ \endgroup
+}
\newcommand*{\parttocdepth}{\m@ne}
\let\parttocdepth\m@ne
\newcommand*{\scr@part@tocindent}{\z@}
@@ -3241,7 +3816,7 @@
\usekomafont{partentry}{#1\nobreak
\usekomafont{partentrypagenumber}{\hfil\nobreak
\hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\endgroup
\penalty20010
\else
@@ -3270,17 +3845,17 @@
\newcommand*{\use@chapter@o@preamble}{%
{%
\settoheight{\@tempdima}{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\vbox{\chapterheadstartvskip}%
}%
\settodepth{\@tempdimb}{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\vbox{\chapterheadstartvskip}%
}%
\addtolength{\@tempdima}{\@tempdimb}%
- \setbox0\vbox{%
+ \setbox\z@\vbox{%
\use@preamble{chapter@o}%
}%
\setlength{\@tempdimb}{\ht0}%
@@ -3289,7 +3864,7 @@
\vskip-\baselineskip
\vbox to \@tempdima{%
\vfill
- \box0
+ \box\z@
}%
\vss
}\vskip-\parskip\vskip-\baselineskip
@@ -3387,12 +3962,12 @@
\use@preamble{chapter@u}%
}
\newcommand*{\@@makechapterhead}[1]{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\nobreak\nobreak\usekomafont{chapter}{}%
+ \normalfont\sectfont\nobreak\nobreak\usefontofkomafont{chapter}%
\def\IfUseNumber{\ifnumbered{chapter}}%
\if@chapterprefix
\raggedchapter
@@ -3407,7 +3982,9 @@
\usekomafont{chapter}{%
\IfUsePrefixLine{%
{\usekomafont{chapterprefix}{%
- \chapterformat\chapterheadmidvskip
+ \chapterformat
+ \setlength{\@tempskipa}{\scr@chapter@innerskip}%
+ \chapterheadmidvskip
}}%
}{%
\chapterformat
@@ -3422,7 +3999,7 @@
}%
}%
\nobreak\par\nobreak
- \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadendvskip
}
@@ -3455,7 +4032,7 @@
\fi
}
\newcommand*{\@@makeschapterhead}[1]{%
- \@tempskipa=\glueexpr \scr@chapter@sectionbeforeskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
@@ -3464,7 +4041,7 @@
\raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par
}%
\nobreak\par\nobreak
- \@tempskipa=\glueexpr \scr@chapter@sectionafterskip\relax
+ \@tempskipa=\glueexpr \scr@chapter@afterskip\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadendvskip%
}
@@ -3517,7 +4094,7 @@
}%
\fi
\fi
- \addchapmark{\scr@ds@head}%
+ \expandafter\addchapmark\expandafter{\scr@ds@head}%
}%
\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
\newcommand*{\chaptertocdepth}{\z@}
@@ -3530,7 +4107,7 @@
\ifnum \lastpenalty<20010
\addpenalty{-\@highpenalty}%
\fi
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.15}%
+ \expandafter\ifnum\scr@v@is@lt{3.15}%
\vskip 1.0em \@plus\p@
\else
\addvspace{1.0em \@plus\p@}%
@@ -3559,7 +4136,7 @@
\fi
\hfill}}\nobreak
\hb@xt@\@pnumwidth{\hss#2}}}\par
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\endgroup
\penalty20009
\else
@@ -3573,7 +4150,8 @@
\newcounter{chapter}
\renewcommand*{\thechapter}{\@arabic\c@chapter}
\newcommand*{\chapterformat}{%
- \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot\enskip}%
+ \mbox{\chapappifchapterprefix{\nobreakspace}\thechapter\autodot
+ \IfUsePrefixLine{}{\enskip}}%
}
\newcommand*\chaptermarkformat{\chapappifchapterprefix{\ }%
\thechapter\autodot\enskip}
@@ -3634,12 +4212,12 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \addsecmark{\scr@ds@head}%
+ \expandafter\addsecmark\expandafter{\scr@ds@head}%
}
\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
+ \expandafter\ifnum\scr@v@is@lt{3.13a}\relax
\@afterindentfalse \vskip 1.5ex
\else
\if@noskipsec \leavevmode \fi
@@ -3652,7 +4230,7 @@
\fi
\fi
{\parindent \z@
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak
\usekomafont{minisec}#1\par\nobreak}\nobreak%
@@ -3690,8 +4268,15 @@
}
\newcommand*{\othersectionlevelsformat}[3]{#3\autodot\enskip}
\renewcommand*{\@seccntformat}[1]{%
- \protect\othersectionlevelsformat{#1}{%
- \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ \expandafter\ifnum\scr@v@is@lt{3.17}\relax
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ \else
+ \scr@ifundefinedorrelax{#1format}{%
+ \protect\othersectionlevelsformat{#1}{%
+ \expandafter\aftergroup\noexpand\@gobble}{\csname the#1\endcsname}%
+ }{\expandafter\protect\csname #1format\endcsname}%
+ \fi
}
\newcommand*\addsecmark[1]{%
\begingroup
@@ -3749,14 +4334,14 @@
tocindent=12em,%
tocnumwidth=6em%
]{subparagraph}
-\ifnum \scr@compatibility<\@nameuse{scr@v@3.15}\relax
+\expandafter\ifnum\scr@v@is@lt{3.15}\relax
\let\scr@subparagraph@sectionindent\parindent
\else
\def\scr@subparagraph@sectionindent{\scr@parindent}%
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3790,14 +4375,12 @@
}
\newcommand*{\new@tpo@label}{\@newl@bel{tpo}}
\newcommand*{\scr@tpo}{0}
-\newcommand*{\is@thispageodd}{%
+\newcommand*{\is@thispageodd}[1][\is@thispageodd@setlabel]{%
\@bsphack
\begingroup
\@tempcnta=\scr@tpo
\advance\@tempcnta by\@ne
\xdef\scr@tpo{\the\@tempcnta}%
- \protected@write\@auxout{\let\arabic\relax}{%
- \string\new@tpo@label{\scr@tpo}{\arabic{page}}}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\relax
\protect\G@refundefinedtrue
\ClassWarning{\KOMAClassName}{%
@@ -3812,8 +4395,15 @@
\aftergroup\thispagewasoddfalse
\fi
\endgroup
+ \edef\is@thispageodd@setlabel{%
+ \unexpanded{\protected@write\@auxout{\let\arabic\relax}}{%
+ \noexpand\string
+ \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
+ }%
+ #1%
\@esphack
}
+\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
\newcommand{\ifthispageodd}{%
\is@thispageodd
@@ -3928,7 +4518,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3949,8 +4539,10 @@
Maybe you should load package `scrlayer-scrpage',\MessageBreak
before using this element%
}
-\newcommand*
- {\pagemark}{{\usekomafont{pagenumber}{%
+\newcommand*{%
+ \pagemark
+}{%
+ {\usekomafont{pagenumber}{%
\thepage}}}
\renewcommand*{\ps@plain}{%
\renewcommand*{\@oddhead}{}%
@@ -4026,19 +4618,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-\if@twoside
- \flushbottom
-\else
- \raggedbottom
-\fi
-\if@twocolumn
- \twocolumn
- \sloppy
- \flushbottom
-\else
- \onecolumn
-\fi
-%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-floats.dtx 2002 2015-03-12 12:06:17Z kohm $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -4586,7 +5166,7 @@
}{%
\end@dblfloat
}
-%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -4724,7 +5304,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1872 2014-12-10 12:51:37Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -4862,7 +5442,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -4947,7 +5527,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -4982,7 +5562,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -5086,7 +5666,7 @@
}
\newenvironment{addmargin*}{%
\@tempswafalse
- \if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \if@twoside\is@thispageodd[]\ifthispagewasodd\else\@tempswatrue\fi\fi
\edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
@@ -5127,7 +5707,7 @@
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne
}%
- \item\relax%
+ \item\is@thispageodd@setlabel\nobreak\ignorespaces
}
\newcommand*\descfont{\sffamily\bfseries}
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 0cc5b20f32a..3ac2246d96e 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\ProvidesFile{%
scrsize10pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,8 +149,9 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\@ifundefined{@list@extra}{}{%
+ \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index dee1298d778..d5360c23e20 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\ProvidesFile{%
scrsize11pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,8 +149,9 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\@ifundefined{@list@extra}{}{%
+ \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index 7f9941bbcd4..4ecfe7ac265 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 1829 2014-11-21 09:27:52Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,8 +149,9 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1824 2014-11-14 08:02:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
\@ifundefined{@list@extra}{}{%
+ \expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index da80bd3b2d8..33dd612b508 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,16 +65,20 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 1874 2014-12-11 13:46:00Z kohm $
\newif\if@Hxii
diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
new file mode 100644
index 00000000000..16bb759651c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
@@ -0,0 +1,121 @@
+%%
+%% This is file `setspace.hak',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `file,setspace.hak')
+%% scrhack.dtx (with options: `hack,setspace,identify')
+%% scrhack.dtx (with options: `hack,setspace,body')
+%%
+%% Copyright (c) 2008-2014 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
+%%
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
+\endgroup
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
+\ProvidesFile{setspace.hak}[%
+ 2015/04/23 v3.17 KOMA-Script
+ package
+ (hacking package
+ setspace)%
+]
+%%% From File: $Id: scrhack.dtx 2073 2015-04-16 08:41:14Z kohm $
+\scr@ifexpected{\onehalfspacing}{%
+ \long\def\onehalfspacing{%
+ \setstretch{1.25}% default
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.25}%
+ \or % 11pt
+ \setstretch {1.213}%
+ \or % 12pt
+ \setstretch {1.241}%
+ \fi
+ }%
+}{%
+ \renewcommand*{\onehalfspacing}{%
+ \@tempdima=\dimexpr (\f@size pt)*1500/
+ (\dimexpr \f@baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}%
+ }%
+}{%
+ \PackageWarning{scrhack}{unknown \string\onehalfspacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+}
+\scr@ifexpected{\doublespacing}{%
+ \long\def\doublespacing{%
+ \setstretch{1.667}% default
+ \ifcase \@ptsize \relax % 10pt
+ \setstretch {1.667}%
+ \or % 11pt
+ \setstretch {1.618}%
+ \or % 12pt
+ \setstretch {1.655}%
+ \fi
+ }%
+}{%
+ \renewcommand*{\doublespacing}{%
+ \@tempdima=\dimexpr (\f@size pt)*2000/
+ (\dimexpr \f@baselineskip\relax)*\p@/1000\relax
+ \expandafter\setstretch\expandafter{\strip@pt\@tempdima}%
+ }%
+}{%
+ \PackageWarning{scrhack}{unknown \string\doublespacing\space
+ definition found!\MessageBreak
+ Maybe you are using a unsupported setpace version}%
+}
+\endinput
+%%
+%% End of file `setspace.hak'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 6c3f4e5e66b..233dd82d314 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
+%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package
(handling toc-files)%
]
@@ -272,10 +272,18 @@
}
\newcommand*{\tocbasic@starttoc}[1]{%
\begingroup
+ \edef\@currext{#1}%
+ \iftocfeature{\@currext}{noparskipfake}{}{%
+ \ifvmode
+ \@tempskipa\lastskip
+ \vskip-\lastskip
+ \addtolength{\@tempskipa}{\parskip}%
+ \vskip\@tempskipa
+ \fi
+ }%
\setlength{\parskip}{\z@}%
\setlength{\parindent}{\z@}%
\setlength{\parfillskip}{\z@\@plus 1fil}%
- \edef\@currext{#1}%
\csname tocbasic@@before@hook\endcsname
\csname tb@#1@before@hook\endcsname
\@starttoc{#1}%
@@ -370,26 +378,36 @@
\subsection[##1]{##1}%
}{%
\subsection*{##1}%
- \iftocfeature{\@currext}{totoc}{%
- \addxcontentsline{toc}{subsection}{##1}%
- }{}%
+ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi
\begingroup
+ \iftocfeature{\@currext}{totoc}{%
+ \addxcontentsline{toc}{subsection}{##1}%
+ }{}%
\@ifundefined{@mkright}{%
\ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
}{%
\@mkright{\MakeMarkcase{##1}}%
}%
\endgroup
+ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi
}%
}{%
\iftocfeature{\@currext}{numbered}{%
\section[##1]{##1}%
}{%
\section*{##1}%
- \iftocfeature{\@currext}{totoc}{%
- \addxcontentsline{toc}{section}{##1}%
- }{}%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
+ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi
+ \begingroup
+ \iftocfeature{\@currext}{totoc}{%
+ \addxcontentsline{toc}{section}{##1}%
+ }{}%
+ \@ifundefined{@mkdouble}{%
+ \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
+ }{%
+ \@mkdouble{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
+ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi
}%
}%
}%
@@ -403,6 +421,7 @@
\begingroup
\@ifundefined{addsec}{%
\section*{##1}%
+ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi
\begingroup
\@ifundefined{@mkright}{%
\ifx\@mkboth\@gobbletwo
@@ -410,14 +429,16 @@
}{%
\@mkright{\MakeMarkcase{##1}}%
}%
+ \addxcontentsline{toc}{section}{##1}%
\endgroup
- \addxcontentsline{toc}{section}{##1}%
+ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi
}{%
\addsec{##1}%
}%
\endgroup
}{%
\section*{##1}%
+ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi
\begingroup
\@ifundefined{@mkright}{%
\ifx\@mkboth\@gobbletwo
@@ -426,17 +447,26 @@
\@mkright{\MakeMarkcase{##1}}%
}%
\endgroup
+ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi
}%
}%
}{%
\iftocfeature{\@currext}{numbered}{%
\chapter[##1]{##1}%
}{%
- \chapter*{##1\unskip
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}}%
- \iftocfeature{\@currext}{totoc}{%
- \addxcontentsline{toc}{chapter}{##1}%
- }{}%
+ \chapter*{##1}%
+ \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi
+ \begingroup
+ \@ifundefined{@mkdouble}{%
+ \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
+ }{%
+ \@mkdouble{\MakeMarkcase{##1}}%
+ }%
+ \iftocfeature{\@currext}{totoc}{%
+ \addxcontentsline{toc}{chapter}{##1}%
+ }{}%
+ \endgroup
+ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi
}%
}%
}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 7455824f1cc..72d056c0e73 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -47,7 +47,7 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: $Id: tocstyle.dtx 1857 2014-12-03 07:22:56Z kohm $
+%%% From File: $Id: tocstyle.dtx 1977 2015-03-09 08:17:29Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
[2013/08/11 v0.2e-alpha KOMA-Script package (versatile toc styles)]
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index 5882d629bcb..d80dd35afb2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -45,7 +45,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,23 +67,27 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+\providecommand*{\scr@pkgextension}{\@pkgextension}
+\AtBeginDocument{%
+ \let\scr@pkgextension\@pkgextension
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2015/02/07 v3.16 KOMA-Script
+ 2015/04/23 v3.17 KOMA-Script
package (type area)]
\typeout{%
- Package typearea, \csname ver@typearea.sty\endcsname^^J%
+ Package typearea, \csname ver@typearea.\@pkgextension\endcsname^^J%
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Frank Neukam, 1992-1994^^J%
\@spaces\@spaces\@spaces\@spaces\space\space
Copyright (C) Markus Kohm, 1994-^^J%
}
-%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\newcommand*\SetDIVList[1]{\def\ta@divlist{{}{}{}{}{}{}{}{}{}#1}}
\newcommand*\SetXDIVList[1]{\def\ta@divlist{#1}}
\newlength{\ta@bcor}
@@ -228,6 +232,8 @@
\endgroup
\def\ta@hh{#1\baselineskip}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headlines}{#1}%
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1\baselineskip}%
}
\KOMA@key{footlines}{%
\begingroup
@@ -235,6 +241,8 @@
\endgroup
\def\ta@fh{#1\baselineskip}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footlines}{#1}%
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1\baselineskip}%
}
\KOMA@key{headheight}{%
\begingroup
@@ -242,6 +250,8 @@
\endgroup
\def\ta@hh{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{headheight}{#1}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{headlines}%
}
\KOMA@key{footheight}{%
\begingroup
@@ -249,6 +259,8 @@
\endgroup
\def\ta@fh{#1}%
\FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.typearea.\scr@pkgextension}{footheight}{#1}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{footlines}%
}
\newif\if@hincl\@ifundefined{if@hsl}{}{\let\if@hincl\if@hsl}
\KOMA@ifkey{headinclude}{@hincl}
@@ -259,10 +271,11 @@
\KOMA@ifkey{mpinclude}{@mincl}
\KOMA@DeclareDeprecatedOption[typearea]{mpexclude}{mpinclude=false}
\KOMA@key{BCOR}{%
- \edef\@tempa{#1}\edef\@tempb{current}\ifx\@tempa\@tempb\else
+ \ifstr{#1}{current}{}{%
\setlength{\ta@bcor}{#1}%
- \fi
+ }%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{BCOR}{#1}%
}
\AtEndOfPackage{%
\KOMA@key{BCOR}{\typearea[{#1}]{last}\FamilyKeyStateProcessed}%
@@ -280,6 +293,7 @@
\fi
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{DIV}{#1}%
}
\AtEndOfPackage{%
\KOMA@key{DIV}{\typearea[current]{#1}\FamilyKeyStateProcessed}%
@@ -291,25 +305,41 @@
\g@addto@macro\@twosidetrue\@semitwosidefalse
\g@addto@macro\@twosidefalse\@semitwosidefalse
\KOMA@key{twoside}[true]{%
- \if@atdocument\if@twoside\cleardoublepage\else\clearpage\fi\fi
+ \if@atdocument\if@twoside
+ \scr@ifundefinedorrelax{cleardoubleoddpage}{%
+ \cleardoublepage
+ }{%
+ \cleardoubleoddpage
+ }%
+ \else\clearpage\fi\fi
\ifstr{#1}{semi}{%
\@twosidetrue
\@semitwosidetrue
\FamilyKeyStateProcessed
}{%
\def\FamilyElseValue{, `semi'}%
- \KOMA@set@ifkey{twoside}{@twoside}{#1}%
+ \KOMA@set@ifkey{twoside}{%
+ @twoside%
+ }{#1}%
}%
- \if@twoside
- \if@semitwoside
- \@mparswitchfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ typearea.\scr@pkgextension
+ }{twoside}{#1}%
+ \if@twoside
+ \if@semitwoside
+ \@mparswitchfalse
+ \else
+ \@mparswitchtrue
+ \fi
\else
- \@mparswitchtrue
- \fi
- \else
- \@mparswitchfalse
- \fi%
- \csname recalctypearea\endcsname
+ \@mparswitchfalse
+ \fi%
+ \csname recalctypearea\endcsname
+ \fi
+}
+\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twoside}{%
+ \if@twoside true\else false\fi
}
\KOMA@DeclareStandardOption%
[typearea]%
@@ -317,11 +347,16 @@
\KOMA@key{twocolumn}[true]{%
\if@atdocument\clearpage\fi
\KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}%
- \ifx\FamilyKeyState
- \FamilyKeyStateProcessed
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@replacebool{.%
+ typearea.\scr@pkgextension
+ }{twocolumn}{@twocolumn}%
\csname recalctypearea\endcsname
\fi
}
+\KOMA@kav@xadd{.typearea.\scr@pkgextension}{twocolumn}{%
+ \if@twocolumn true\else false\fi
+}
\KOMA@DeclareStandardOption%
[typearea]%
{onecolumn}{twocolumn=false}
@@ -352,6 +387,7 @@
\endgroup
\set@dvipdfmxpagesize
\fi
+ \KOMA@kav@xreplacevalue{.typearea.\scr@pkgextension}{pagesize}{#1}%
\edef\@pagesizelast{#1}%
\else
\endgroup
@@ -381,7 +417,7 @@
\if@seascape\special{! TeXDict begin /landplus90{true}store end }\fi
}%
}%
- \ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
+ \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
\let\set@dvipspagesize=\@empty
\else
\let\set@dvipspagesize=\setnot@dvipspagesize
@@ -435,7 +471,7 @@
\ifnotundefined{pdfpagewidth}{\pdfpagewidth=\paperwidth}{}%
\ifnotundefined{pdfpageheight}{\pdfpageheight=\paperheight}{}%
}%
- \ifnum \scr@compatibility>\@nameuse{scr@v@3.02b}\relax
+ \expandafter\ifnum\scr@ta@v@is@gt{3.02b}\relax
\renewcommand*{\set@dvipspagesize}{%
\begingroup
\@tempswafalse
@@ -550,6 +586,8 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{letter}%
}{%
\ifstr{#1}{legal}{%
\if@landscape
@@ -560,6 +598,8 @@
\setlength\paperwidth {8.5in}%
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{legal}%
}{%
\ifstr{#1}{executive}{%
\if@landscape
@@ -570,14 +610,18 @@
\setlength\paperwidth {7.25in}%
\fi
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{executive}%
}{%
\iso@paper{#1}%
\if@tempswa
\FamilyKeyStateProcessed
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{#1}%
\else
\expandafter\maybe@pair#1::\@nil
\if@tempswa
- \ifnum \scr@ta@compatibility<\@nameuse{scr@v@3.01b}\relax
+ \expandafter\ifnum \scr@ta@v@is@lt{3.01b}\relax
\PackageWarningNoLine{typearea}{%
You may have to exchange height and width!\MessageBreak
Until KOMA-Script version 3.01b the semantic\MessageBreak
@@ -592,7 +636,13 @@
\setlength\paperheight{\@tempb}%
\fi
\FamilyKeyStateProcessed
- \else
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{paper}%
+ \if@landscape
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempa:\@tempb}%
+ \else
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{paper}{\@tempb:\@tempa}%
+ \fi
+ \else
\KOMA@unknown@keyval{paper}{#1}{%
`letter', `legal', `executive', `a'<nr>, `b'<nr>,
`c'<nr>, `d'<nr>,\MessageBreak
@@ -603,6 +653,17 @@
}%
}%
}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@landscape
+ \if@seascape
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{seascape}%
+ \else
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{landscape}%
+ \fi
+ \else
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{paper}{portrait}%
+ \fi
+ \fi
}%
}%
}%
@@ -616,9 +677,10 @@
\ifx\@tempb\@empty\@tempswafalse\else\@tempswatrue\fi
\fi
}
+\KOMA@ifkey{usegeometry}{@ta@usegeometry}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
\providecommand*
{\scr@compatibility}{\scr@v@last}
\newcommand*{\scr@ta@compatibility}{\scr@compatibility}
@@ -632,6 +694,10 @@
this value of version is not supported.\MessageBreak
Because of this, version was set to `first'%
}%
+ \FamilyKeyStateProcessed
+ \KOMA@kav@replacevalue{.%
+ typearea.\scr@pkgextension
+ }{version}{first}%
}{%
\PackageInfoNoLine{%
typearea%
@@ -640,6 +706,9 @@
}%
\edef\scr@ta@compatibility{\@nameuse{scr@v@#1}}%
\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ typearea.\scr@pkgextension
+ }{version}{#1}%
}%
}
\AtEndOfPackage{%
@@ -709,8 +778,21 @@
\@namedef{scr@v@3.14}{13}
\@namedef{scr@v@3.15}{14}
\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@last}{14}
-%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
+\@namedef{scr@v@3.17}{15}
+\@namedef{scr@v@last}{15}
+\newcommand*{\scr@ta@v@is@lt}[1]{%
+ \scr@ta@compatibility<\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@gt}[1]{%
+ \scr@ta@compatibility>\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@le}[1]{%
+ \numexpr\scr@ta@compatibility-\@ne <\@nameuse{scr@v@#1}
+}
+\newcommand*{\scr@ta@v@is@ge}[1]{%
+ \numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
+}
+%%% From File: $Id: scrkernel-typearea.dtx 2056 2015-03-30 08:24:20Z kohm $
\InputIfFileExists{typearea.cfg}{%
\typeout{%
***************************************^^J%
@@ -719,7 +801,7 @@
}
}{}
\providecommand*{\defaultpapersize}{A4}
-\KOMAExecuteOptions{paper=\defaultpapersize}
+\KOMAExecuteOptions{paper=\defaultpapersize,pagesize}
\if@twoside
\if@semitwoside
\KOMAExecuteOptions{twoside=semi}
@@ -760,7 +842,7 @@
\if@semitwoside
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@ta@v@is@lt{3.12}\relax
\evensidemargin=\oddsidemargin
\else
\advance\evensidemargin by1.5\ta@hblk
@@ -894,8 +976,62 @@
\scr@ifundefinedorrelax{@pagesizelast}{}{%
\KOMAoptions{pagesize=\@pagesizelast}%
}%
+ \expandafter\ifnum\scr@ta@v@is@ge{3.17}%
+ \csname par@updaterelative\endcsname
+ \fi
+ \fi
+ \edef\scr@geometryargs{%
+ bindingoffset=\the\ta@bcor,
+ lmargin=\the\dimexpr 1in+\oddsidemargin-\ta@bcor\relax,
+ textwidth=\the\textwidth,
+ \if@hincl
+ includehead,%
+ top=\the\dimexpr 1in+\topmargin\relax,
+ \else
+ includehead=false,%
+ top=\the\dimexpr 1in+\topmargin+\headheight+\headsep\relax,
+ \fi
+ headheight=\the\headheight,
+ headsep=\the\headsep,
+ textheight=\the\textheight,
+ \if@fincl
+ includefoot,
+ \else
+ includefoot=false,
+ \fi
+ footskip=\the\footskip,
+ \if@mincl
+ includemp,
+ \else
+ includemp=false,
+ \fi
+ marginparwidth=\the\marginparwidth,
+ marginparsep=\the\marginparsep
+ }%
+ \if@ta@usegeometry
+ \@ifundefined{Gm@save}{%
+ \if@atdocument\else
+ \edef\scr@geometryargs{%
+ paperwidth=\the\paperwidth,paperheight=\the\paperheight,%
+ \scr@geometryargs
+ }%
+ \PassOptionsToPackage{\scr@geometryargs}{geometry}%
+ \fi
+ }{%
+ \edef\Gm@restore@org{\Gm@restore}%
+ \if@atdocument
+ \expandafter\newgeometry\expandafter{\scr@geometryargs}%
+ \else
+ \edef\scr@geometryargs{%
+ paperwidth=\the\paperwidth,paperheight=\the\paperheight,%
+ \scr@geometryargs
+ }%
+ \expandafter\geometry\expandafter{\scr@geometryargs}%
+ \fi
+ }%
\fi
}
+\newcommand*{\scr@geometryargs}{}
\newcommand*{\scr@grouplevel@test}[1]{%
\ifcase\currentgrouptype\else
\PackageWarning{typearea}{%
@@ -941,6 +1077,11 @@
\noexpand\def\noexpand\@lastdiv{\@lastdiv}%
\noexpand\marginparsep=\the\marginparsep\space
\noexpand\marginparwidth=\the\marginparwidth\space
+ \noexpand\def
+ \expandafter\noexpand\csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname{%
+ \unexpanded\expandafter\expandafter\expandafter{%
+ \csname scr@kav@KOMA.typearea.\scr@pkgextension\endcsname}%
+ }%
}%
}%
\reserved@a
@@ -1162,6 +1303,10 @@
}
\fi
\ta@layoutinfo{\number\ta@div}{\the\@tempcnta}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{DIV}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{DIV}{\@lastdiv}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{BCOR}%
+ \KOMA@kav@xadd{.typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}%
\@typearea@end
\activateareas
\ifdim \dimexpr 1in+\topmargin
@@ -1222,6 +1367,10 @@
\setlength{\textwidth}{#2}%
\setlength{\textheight}{#3}%
\def\@lastdiv{areaset}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{DIV}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{DIV}{areaset}%
+ \KOMA@kav@removekey{.typearea.\scr@pkgextension}{BCOR}%
+ \KOMA@kav@add{.typearea.\scr@pkgextension}{BCOR}{\the\ta@bcor}%
\ta@hblk=\paperwidth
\advance\ta@hblk by-\ta@bcor
\advance\ta@hblk by-\textwidth
@@ -1240,7 +1389,7 @@
\if@semitwoside
\advance\oddsidemargin by1.5\ta@hblk
\advance\oddsidemargin by\ta@bcor
- \ifnum \scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \expandafter\ifnum\scr@ta@v@is@lt{3.12}\relax
\evensidemargin=\oddsidemargin
\else
\advance\evensidemargin by1.5\ta@hblk
@@ -1329,7 +1478,7 @@
\ifdim \dimexpr 1in+\topmargin
+\headheight+\headsep
+\textheight
- +\footskip+\dp\strutbox\relax
+ +\footskip+\footheight-\ht\strutbox\relax
>\paperheight
\PackageWarningNoLine{typearea}{%
page content and margins higher than paper.\MessageBreak
@@ -1340,7 +1489,7 @@
\fi
}
\typearea[current]{current}
-%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2081 2015-04-23 06:46:09Z kohm $
%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 516fd2315c7..3eb8044325f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2081 2015-04-23 06:46:09Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/04/23 v3.17 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\ProvidesFile{%
visualize%
.lco}[\KOMAScriptVersion\space letter-class-option]
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 1799 2014-10-04 16:58:57Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 2001 2015-03-12 11:29:57Z kohm $
\@ifpackageloaded{eso-pic}{}{\RequirePackage{eso-pic}}
\newcommand*{\showfields}[1]{%
\AtBeginLetter{%
@@ -574,7 +574,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 1798 2014-10-04 13:59:37Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 2077 2015-04-17 08:18:40Z kohm $
\endinput
%%
%% End of file `visualize.lco'.