summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-26 23:18:36 +0000
committerKarl Berry <karl@freefriends.org>2013-12-26 23:18:36 +0000
commit9b219d1b664067729034647a4b37626cf2bf5e26 (patch)
tree00708467b44f90736dc32ed1bebb95e9c4710139 /Master/texmf-dist/tex/latex/koma-script/scrbook.cls
parentc00c8298eb6913b74270a36c1f1018f1e9946f7b (diff)
koma-script (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32489 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbook.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls1798
1 files changed, 1138 insertions, 660 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index c15df2e0466..010e693f9c2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -1,47 +1,46 @@
%%
%% This is file `scrbook.cls',
-%% generated with the docstrip utility.
+%% generated with the docstrip utility, extended by scrdocstrip.
%%
%% The original source files were:
%%
-%% scrkvers.dtx (with options: `class,book')
-%% scrkbase.dtx (with options: `load')
+%% scrkernel-version.dtx (with options: `class,book')
+%% scrkernel-basics.dtx (with options: `load')
%% tocbasic.dtx (with options: `class,load,chapter')
-%% scrkcomp.dtx (with options: `class,book,option')
-%% scrkmisc.dtx (with options: `class,book,option')
-%% scrklang.dtx (with options: `class,book,option')
-%% scrkfont.dtx (with options: `class,book,option')
-%% scrktare.dtx (with options: `class,book,option')
-%% scrkpar.dtx (with options: `class,book,option')
-%% scrktitl.dtx (with options: `class,book,option')
-%% scrksect.dtx (with options: `class,book,option')
-%% scrkpage.dtx (with options: `class,book,option')
-%% scrkfloa.dtx (with options: `class,book,option')
-%% scrkftn.dtx (with options: `class,book,option')
-%% scrkliof.dtx (with options: `class,book,option')
-%% scrkbib.dtx (with options: `class,book,option')
-%% scrkidx.dtx (with options: `class,book,option')
-%% scrklist.dtx (with options: `class,book,option')
-%% scrkmisc.dtx (with options: `class,book,execoption')
-%% scrkcomp.dtx (with options: `class,book,body')
-%% scrkfont.dtx (with options: `class,book,body')
-%% scrklang.dtx (with options: `class,book,body')
-%% scrktare.dtx (with options: `class,book,body')
-%% scrkpar.dtx (with options: `class,book,body')
-%% scrktitl.dtx (with options: `class,book,body')
-%% scrksect.dtx (with options: `class,book,body')
-%% scrkmisc.dtx (with options: `class,book,body')
-%% scrkpage.dtx (with options: `class,book,body')
-%% scrkfloa.dtx (with options: `class,book,body')
-%% scrkftn.dtx (with options: `class,book,body')
-%% scrkliof.dtx (with options: `class,book,body')
-%% scrkbib.dtx (with options: `class,book,body')
-%% scrkidx.dtx (with options: `class,book,body')
-%% scrklist.dtx (with options: `class,book,body')
+%% scrkernel-compatibility.dtx (with options: `class,book,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,book,option')
+%% scrkernel-language.dtx (with options: `class,book,option')
+%% scrkernel-fonts.dtx (with options: `class,book,option')
+%% scrkernel-typearea.dtx (with options: `class,book,option')
+%% scrkernel-paragraphs.dtx (with options: `class,book,option')
+%% scrkernel-title.dtx (with options: `class,book,option')
+%% scrkernel-sections.dtx (with options: `class,book,option')
+%% scrkernel-pagestyles.dtx (with options: `class,book,option')
+%% scrkernel-floats.dtx (with options: `class,book,option')
+%% scrkernel-footnotes.dtx (with options: `class,book,option')
+%% scrkernel-listsof.dtx (with options: `class,book,option')
+%% scrkernel-bibliography.dtx (with options: `class,book,option')
+%% scrkernel-index.dtx (with options: `class,book,option')
+%% scrkernel-listsandtabulars.dtx (with options: `class,book,option')
+%% scrkernel-miscellaneous.dtx (with options: `class,book,execoption')
+%% scrkernel-compatibility.dtx (with options: `class,book,body')
+%% scrkernel-fonts.dtx (with options: `class,book,body')
+%% scrkernel-language.dtx (with options: `class,book,body')
+%% scrkernel-typearea.dtx (with options: `class,book,body')
+%% scrkernel-paragraphs.dtx (with options: `class,book,body')
+%% scrkernel-title.dtx (with options: `class,book,body')
+%% scrkernel-sections.dtx (with options: `class,book,body')
+%% scrkernel-miscellaneous.dtx (with options: `class,book,body')
+%% scrkernel-pagestyles.dtx (with options: `class,book,body')
+%% scrkernel-floats.dtx (with options: `class,book,body')
+%% scrkernel-footnotes.dtx (with options: `class,book,body')
+%% scrkernel-listsof.dtx (with options: `class,book,body')
+%% scrkernel-bibliography.dtx (with options: `class,book,body')
+%% scrkernel-index.dtx (with options: `class,book,body')
+%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2012
-%% Markus Kohm and any individual authors listed elsewhere in this file.
+%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -73,9 +72,9 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: scrkvers.dtx
+%%% From File: $Id: scrkernel-version.dtx 1560 2013-12-19 07:13:30Z mjk $
\begingroup
- \makeatletter
+ \catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
\newcommand*{\@CheckKOMAScriptVersion}[1]{%
\gdef\KOMAScriptVersion{#1}%
@@ -95,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2012/07/29 v3.11b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -104,20 +103,45 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- \KOMAScriptVersion\space document class (\ClassName)%
+ 2013/12/19 v3.12 KOMA-Script
+ document class (\ClassName)%
]
-%%% From File: scrkbase.dtx
+%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: tocbasic.dtx
-\def\tocbasicversion{2012/04/04 v3.10b}
-\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
-\@tempa
+%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+\RequirePackage{tocbasic}[%
+ 2013/12/19 v3.12 KOMA-Script
+]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist{toc}
\addtotoclist[float]{lof}
\addtotoclist[float]{lot}
-%%% From File: scrkcomp.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+\newif\if@scr@emulatestandardclasses
+\let\scr@emulatestandardclassestrue\relax
+\let\scr@emulatestandardclassesfalse\relax
+\DeclareOption{emulatestandardclasses}{%
+ \let\if@scr@emulatestandardclasses\iftrue
+ \KOMAExecuteOptions{%
+ fontsize=10pt,%
+ headings=standardclasses,%
+ cleardoublepage=current
+ }%
+ \newcommand*{\defaultpapersize}{letter}%
+ \AtEndOfClass{%
+ \setkomafont{descriptionlabel}{\bfseries}%
+ \setkomafont{dictum}{\normalfont\small}%
+ \setkomafont{caption}{}%
+ \setkomafont{captionlabel}{}%
+ \setcapindent{0pt}%
+ \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}%
+ \PreventPackageFromLoading{scrpage2}%
+ \setkomafont{pagenumber}{\normalfont}%
+ \setkomafont{pageheadfoot}{\normalfont}%
+ \cfoot[\pagemark]{}%
+ }%
+}
\newcommand*
{\scr@compatibility}{\scr@v@last}
\KOMA@key{version}[last]{%
@@ -133,6 +157,7 @@
Switching compatibility level to `#1'%
}%
\edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+ \FamilyKeyStateProcessed
}%
}
\AtEndOfClass{%
@@ -144,6 +169,7 @@
class.\MessageBreak
But you've tried to set it up later.%
}%
+ \FamilyKeyStateProcessed
}%
}
\@namedef{scr@v@first}{0}
@@ -193,22 +219,25 @@
\@namedef{scr@v@3.11}{10}
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@last}{10}
-%%% From File: scrkmisc.dtx
+\@namedef{scr@v@3.12}{11}
+\@namedef{scr@v@last}{11}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
- \if@tempswa
- \setlength{\overfullrule}{5pt}%
- \else
- \setlength{\overfullrule}{\z@}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \setlength{\overfullrule}{5pt}%
+ \else
+ \setlength{\overfullrule}{\z@}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: scrklang.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
}
@@ -219,8 +248,23 @@
\def\@pt@@scan #1pt#2\@pt@@scan{%
\ifstr{#2}{pt}{%
\ifnumber{#1}{%
- \KOMA@UseObsoleteOption{\PackageInfoNoLine{\KOMAClassName}}%
- {#1#2}{fontsize=#1#2}%
+ \ifstr{#1}{10}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{11}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \ifstr{#1}{12}{%
+ \KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }{%
+ \KOMA@UseDeprecatedOption{\PackageWarningNoLine{\KOMAClassName}}%
+ {#1#2}{fontsize=#1#2}%
+ }%
+ }%
+ }
}{\@headlines}%
}{\@headlines}%
}
@@ -255,8 +299,9 @@
}%
\@tempa
}%
+ \FamilyKeyStateProcessed
}
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -326,7 +371,7 @@
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: scrkpar.dtx
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -367,82 +412,88 @@
{relative}{10},%
{absolute}{11}%
}{#1}%
- \ifcase\number\@tempa% 0
- \endgroup
- \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 1
- \endgroup
- \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 2
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 3
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- \z@ \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 4
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 5
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- 1em \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 6
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .3333\linewidth\@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 7
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .3333\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 8
- \endgroup
- \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 9
- \endgroup
- \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
- .25\linewidth \@plus 1fil}%
- \if@atdocument\AfterKOMAoptions{\selectfont}\fi
- \or% 10
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\par@updaterelative
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \aftergroup\FamilyKeyStateProcessed
+ \ifcase\number\@tempa% 0
+ \endgroup
+ \setparsizes{1em}{\z@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 1
+ \endgroup
+ \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 2
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 3
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ \z@ \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 4
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 5
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ 1em \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 6
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .3333\linewidth\@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 7
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .3333\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 8
+ \endgroup
+ \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 9
+ \endgroup
+ \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{%
+ .25\linewidth \@plus 1fil}%
+ \if@atdocument\AfterKOMAoptions{\selectfont}\fi
+ \or% 10
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\par@updaterelative
- }%
- \or%11
- \endgroup
- \ifx\par@updaterelative\undefined
- \expandafter\AtEndOfClass
- \else
- \expandafter\@firstofone
- \fi
- {%
- \ifx\par@update\default@par@update
- \let\par@update\relax
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\par@updaterelative
+ \fi
+ \let\default@par@update=\par@updaterelative
+ }%
+ \or%11
+ \endgroup
+ \ifx\par@updaterelative\undefined
+ \expandafter\AtEndOfClass
+ \else
+ \expandafter\@firstofone
\fi
- \let\default@par@update=\relax
- }%
- \else% sonst
- \endgroup
+ {%
+ \ifx\par@update\default@par@update
+ \let\par@update\relax
+ \fi
+ \let\default@par@update=\relax
+ }%
+ \else% should never be
+ \endgroup
+ \fi
+ \else
+ \endgroup
+ \FamilyKeyStateUnkownValue
\fi
}
\KOMA@DeclareDeprecatedOption{parskip-}{parskip=full-}
@@ -453,13 +504,26 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newif\if@titlepage
\@titlepagetrue
-\KOMA@ifkey{titlepage}{@titlepage}%
+\newif\if@titlepageiscoverpage
+\KOMA@key{titlepage}[true]{%
+ \ifstr{#1}{firstiscover}{%
+ \@titlepagetrue
+ \@titlepageiscoverpagetrue
+ \FamilyKeyStateProcessed
+ }{%
+ \def\FamilyElseValue{, `firstiscover'}%
+ \KOMA@set@ifkey{titlepage}{@titlepage}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@titlepageiscoverpagefalse
+ \fi
+ }%
+}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newif\if@openright
\@openrighttrue
\KOMA@key{open}{%
@@ -468,15 +532,17 @@
{right}{1},%
{left}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \@openrightfalse
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
- \or
- \@openrighttrue
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
- \or
- \@openrighttrue
- \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \@openrightfalse
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
+ \or
+ \@openrighttrue
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleoddstandardpage}%
+ \or
+ \@openrighttrue
+ \renewcommand*{\cleardoublestandardpage}{\cleardoubleevenstandardpage}%
+ \fi
\fi
}
\KOMA@DeclareStandardOption{openright}{open=right}
@@ -499,17 +565,19 @@
{noendperiod}{2},{noperiodatend}{2},%
{noenddot}{2},{nodotatend}{2}%
}{#1}%
- \ifcase \@tempa\relax
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\@empty
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhooktrue
- \fi
- \or
- \if@atdocument\scr@dotchangeatdocument{#1}\else
- \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\@empty
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhooktrue
+ \fi
+ \or
+ \if@atdocument\scr@dotchangeatdocument{#1}\else
+ \let\scr@altsecnumhook\scr@altsecnumhookfalse
+ \fi
\fi
\fi
}
@@ -528,13 +596,16 @@
\KOMA@DeclareDeprecatedOption{nochapterprefix}{chapterprefix=false}
\KOMA@key{appendixprefix}[true]{%
\KOMA@set@ifkey{appendixprefix}{@tempswa}{#1}%
- \if@tempswa
- \def\appendixmore{\@chapterprefixtrue}%
- \else
- \def\appendixmore{\@chapterprefixfalse}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \def\appendixmore{\@chapterprefixtrue}%
+ \else
+ \def\appendixmore{\@chapterprefixfalse}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{noappendixprefix}{appendixprefix=false}
+\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
\newcommand*{\size@chapter}{}
@@ -564,76 +635,100 @@
{appendixwithoutprefixline}{9},%
{optiontotocandhead}{10},{optiontoheadandtoc}{10},%
{optiontotoc}{11},%
- {optiontohead}{12}%
+ {optiontohead}{12},%
+ {standardclasses}{13}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2.3\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.725\baselineskip
- \@plus .115\baselineskip \@minus .192\baselineskip}%
- }%
- \renewcommand*{\size@part}{\Huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@chapter}{\huge}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{2\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.5\baselineskip
- \@plus .1\baselineskip \@minus .167\baselineskip}%
- }%
- \renewcommand*{\size@part}{\huge}%
- \renewcommand*{\size@partnumber}{\huge}%
- \renewcommand*{\size@chapter}{\LARGE}%
- \renewcommand*{\size@section}{\Large}%
- \renewcommand*{\size@subsection}{\large}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \renewcommand*{\chapterheadstartvskip}{%
- \vspace*{1.8\baselineskip}%
- }%
- \renewcommand*{\chapterheadendvskip}{%
- \vspace{1.35\baselineskip
- \@plus 0.09\baselineskip \@minus .15\baselineskip}%
- }%
- \renewcommand*{\size@part}{\LARGE}%
- \renewcommand*{\size@partnumber}{\LARGE}%
- \renewcommand*{\size@chapter}{\Large}%
- \renewcommand*{\size@section}{\large}%
- \renewcommand*{\size@subsection}{\normalsize}%
- \renewcommand*{\size@subsubsection}{\normalsize}%
- \renewcommand*{\size@paragraph}{\normalsize}%
- \renewcommand*{\size@subparagraph}{\normalsize}%
- \or
- \KOMA@options{open=any}{}%
- \or
- \KOMA@options{open=right}{}%
- \or
- \KOMA@options{open=left}{}%
- \or
- \KOMA@options{chapterprefix=true}{}%
- \or
- \KOMA@options{chapterprefix=false}{}%
- \or
- \KOMA@options{appendixprefix=true}{}%
- \or
- \KOMA@options{appendixprefix=false}{}%
- \or
- \scr@activate@xsection{3}%
- \or
- \scr@activate@xsection{2}%
- \or
- \scr@activate@xsection{1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{2.3\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.725\baselineskip
+ \@plus .115\baselineskip \@minus .192\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\huge}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{2\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.5\baselineskip
+ \@plus .1\baselineskip \@minus .167\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\LARGE}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{1.8\baselineskip}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{1.35\baselineskip
+ \@plus 0.09\baselineskip \@minus .15\baselineskip}%
+ }%
+ \renewcommand*{\size@part}{\LARGE}%
+ \renewcommand*{\size@partnumber}{\LARGE}%
+ \renewcommand*{\size@chapter}{\Large}%
+ \renewcommand*{\size@chapterprefix}{\size@chapter}%
+ \renewcommand*{\size@section}{\large}%
+ \renewcommand*{\size@subsection}{\normalsize}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \or
+ \KOMAoptions{open=any}%
+ \or
+ \KOMAoptions{open=right}%
+ \or
+ \KOMAoptions{open=left}%
+ \or
+ \KOMAoptions{chapterprefix=true}%
+ \or
+ \KOMAoptions{chapterprefix=false}%
+ \or
+ \KOMAoptions{appendixprefix=true}%
+ \or
+ \KOMAoptions{appendixprefix=false}%
+ \or
+ \scr@activate@xsection{3}%
+ \or
+ \scr@activate@xsection{2}%
+ \or
+ \scr@activate@xsection{1}%
+ \or
+ \renewcommand*{\chapterheadstartvskip}{%
+ \vspace*{50\p@}%
+ }%
+ \renewcommand*{\chapterheadendvskip}{%
+ \vspace{40\p@}%
+ }%
+ \renewcommand*{\size@part}{\Huge}%
+ \renewcommand*{\size@partnumber}{\huge}%
+ \renewcommand*{\size@chapter}{\Huge}%
+ \renewcommand*{\size@chapterprefix}{\huge}%
+ \renewcommand*{\size@section}{\Large}%
+ \renewcommand*{\size@subsection}{\large}%
+ \renewcommand*{\size@subsubsection}{\normalsize}%
+ \renewcommand*{\size@paragraph}{\normalsize}%
+ \renewcommand*{\size@subparagraph}{\normalsize}%
+ \renewcommand*{\sectfont}{\bfseries}%
+ \KOMAoptions{open=right,chapterprefix=true}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
@@ -643,17 +738,29 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: scrkpage.dtx
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
- \KOMA@options{headinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{headinclude=#1}{}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
\newif\if@fsl
\KOMA@key{footsepline}[true]{%
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
- \KOMA@options{footinclude=#1}{}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \@ifundefined{typearea}{%
+ \PassOptionsToPackage{typearea}{headinclude=#1}%
+ }{%
+ \KOMAoptions{footinclude=#1,DIV=current}%
+ }%
+ \fi
}
\KOMA@DeclareDeprecatedOption{footnosepline}{footsepline=false}
\@twosidetrue
@@ -669,6 +776,7 @@
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
\def\cleardoubleevenpage{\cleardoubleevenstandardpage}%
+ \FamilyKeyStateProcessed
}%
}{%
\ifnotundefined{ps@#1}{%
@@ -676,6 +784,7 @@
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
}%
}{}%
}%
@@ -714,7 +823,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
\newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -784,7 +893,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
\else
@@ -802,11 +911,13 @@
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
+ \FamilyKeyStateProcessed
}{%
\ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
+ \FamilyKeyStateProcessed
}{%
\KOMA@unknown@keyval{footnotes}{#1}{`multiple' and `nomultiple'}%
}%
@@ -829,7 +940,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -843,28 +954,36 @@
{bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},%
{numberedbib}{7},%
{flat}{8},{left}{8},%
- {graduated}{9},{indent}{9},{indented}{9}%
+ {graduated}{9},{indent}{9},{indented}{9},%
+ {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
+ {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11}%
}{#1}%
- \ifcase \@tempa\relax
- \KOMA@options{index=notoc}{}%
- \or
- \KOMA@options{index=totoc}{}%
- \or
- \KOMA@options{listof=notoc}{}%
- \or
- \KOMA@options{listof=totoc}{}%
- \or
- \KOMA@options{listof=numbered}{}%
- \or
- \KOMA@options{bibliography=nottotoc}{}%
- \or
- \KOMA@options{bibliography=totoc}{}%
- \or
- \KOMA@options{bibliography=totocnumbered}{}%
- \or
- \@toclefttrue
- \or
- \@tocleftfalse
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \KOMAExecuteOptions{index=notoc}%
+ \or
+ \KOMAExecuteOptions{index=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=notoc}%
+ \or
+ \KOMAExecuteOptions{listof=totoc}%
+ \or
+ \KOMAExecuteOptions{listof=numbered}%
+ \or
+ \KOMAExecuteOptions{bibliography=nottotoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totoc}%
+ \or
+ \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \or
+ \@toclefttrue
+ \or
+ \@tocleftfalse
+ \or
+ \setuptoc{toc}{numberline}%
+ \or
+ \unsettoc{toc}{numberline}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{tocleft}{toc=flat}
@@ -883,86 +1002,104 @@
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
{entryprefix}{6},
- {chapterentry}{7},{withchapterentry}{7},%
- {nochaptergap}{8},{ignorechapter}{8},%
- {chaptergapsmall}{9},{smallchaptergap}{9},%
- {chaptergapline}{10},{onelinechaptergap}{10}%
+ {indenttextentries}{7},{indentunnumbered}{7},{numberline}{7},%
+ {leftaligntextentries}{8},{leftalignunnumbered}{8},{nonumberline}{8},%
+ {chapterentry}{9},{withchapterentry}{9},%
+ {nochaptergap}{10},{ignorechapter}{10},%
+ {chaptergapsmall}{11},{smallchaptergap}{11},%
+ {chaptergapline}{12},{onelinechaptergap}{12}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\float@@listhead}{%
- \chapter*
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \unsettoc{\@currext}{totoc}%
- }%
- \or% totoc
- \renewcommand*{\float@@listhead}{%
- \addchap
- }%
- \doforeachtocfile[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \unsettoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% numbered
- \renewcommand*{\float@@listhead}{%
- \chapter
- }%
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{numbered}%
- \setuptoc{\@currext}{totoc}%
- }%
- \or% flat
- \@dynlisttrue
- \or% graduated
- \@dynlistfalse
- \or% leveldown
- \doforeachtocfile[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \AtAddToTocList[float]{%
- \setuptoc{\@currext}{leveldown}%
- }%
- \or% entryprefix
- \@dynlisttrue
- \doforeachtocfile[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\float@@listhead}{%
+ \chapter*
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
+ \or% totoc
+ \renewcommand*{\float@@listhead}{%
+ \addchap
+ }%
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% numbered
+ \renewcommand*{\float@@listhead}{%
+ \chapter
+ }%
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
+ \or% flat
+ \@dynlisttrue
+ \or% graduated
+ \@dynlistfalse
+ \or% leveldown
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \AtAddToTocList[float]{%
- \BeforeStartingTOC[\@currext]{%
- \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
- \expandafter\def\expandafter\numberline@prefix
- \expandafter{\csname listof\@currext entryname\endcsname
- \nobreakspace}%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
}%
}%
- }%
- \or% chapterentry
- \KOMA@options{chapteratlists=entry}{}%
- \or% chaptergap
- \KOMA@options{chapteratlists=\z@}{}%
- \or% chaptergapsmall
- \KOMA@options{chapteratlists=10\p@}{}%
- \or% chaptergapline
- \KOMA@options{chapteratlists=\baselineskip}{}%
+ \or% numberline
+ \doforeachtocfile[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numberline}%
+ }
+ \or% nonumberline
+ \doforeachtocfile[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numberline}%
+ }
+ \or% chapterentry
+ \KOMAExecuteOptions{chapteratlists=entry}%
+ \or% chaptergap
+ \KOMAExecuteOptions{chapteratlists=\z@}%
+ \or% chaptergapsmall
+ \KOMAExecuteOptions{chapteratlists=10\p@}%
+ \or% chaptergapline
+ \KOMAExecuteOptions{chapteratlists=\baselineskip}%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{liststotoc}{listof=totoc}
@@ -978,7 +1115,8 @@
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
}%
}
-%%% From File: scrkbib.dtx
+\BeforeTOCHead{\@chaptertolistsfalse}
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1031,43 +1169,76 @@
}
\scr@bibstyle@oldstyle
\newcommand*\bib@heading{%
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
-}
+ \ifbib@leveldown
+ \section*{\bibname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \else
+ \chapter*{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
+}%
+\newif\ifbib@leveldown
\KOMA@key{bibliography}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
- \let\FamilyElseValues\scr@bibstylelist
\KOMA@set@ncmdkey{bibliography}{@tempa}{%
{notoc}{0},{nottotoc}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1},%
{numbered}{2},{totocnumbered}{2},{tocnumbered}{2},{numberedtotoc}{2},%
- {numberedtoc}{2}%
+ {numberedtoc}{2},%
+ {leveldown}{3},%
+ {standardlevel}{4}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*\bib@heading{%
- \chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \ifbib@leveldown
+ \section*{\bibname}%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \else
+ \chapter*{\bibname}%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
}%
\or% totoc
\renewcommand*\bib@heading{%
- \addchap{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \ifbib@leveldown
+ \addsec{\bibname}
+ \else
+ \if@chaptertolists
+ \@chaptertolistsfalse\addchap{\bibname}\@chaptertoliststrue
+ \else
+ \addchap{\bibname}
+ \fi
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \fi
}%
\or% numbered
\renewcommand*\bib@heading{%
- \chapter{\bibname}%
- \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
- {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \ifbib@leveldown
+ \section{\bibname}%
+ \else
+ \if@chaptertolists
+ \@chaptertolistsfalse\chapter{\bibname}\@chaptertoliststrue
+ \else
+ \chapter{\bibname}
+ \fi
+ \@mkboth{\MakeMarkcase{\chaptermarkformat \bibname}}%
+ {\MakeMarkcase{\chaptermarkformat \bibname}}%
+ \fi
}
+ \or% leveldown
+ \bib@leveldowntrue
+ \or% standardlevel
+ \bib@leveldownfalse
\fi
}{%
\csname scr@bibstyle@#1\endcsname
+ \FamilyKeyStateProcessed
}%
}
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\idx@@heading}{%
\chapter*
}
@@ -1076,26 +1247,63 @@
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
{totoc}{1},{toc}{1},{notnumbered}{1}%
}{#1}%
- \ifcase \@tempa\relax
- \renewcommand*{\idx@@heading}{%
- \chapter*
- }%
- \or
- \renewcommand*{\idx@@heading}{%
- \addchap
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifcase \@tempa\relax
+ \renewcommand*{\idx@@heading}{%
+ \chapter*
+ }%
+ \or
+ \renewcommand*{\idx@@heading}{%
+ \addchap
+ }%
+ \fi
\fi
}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: scrklist.dtx
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: scrkcomp.dtx
-%%% From File: scrkfont.dtx
+%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
+\newcommand*\scr@setlength[4]{%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \else
+ \ifdim #2<\ifdim #2=\z@ \z@ \else \p@\fi
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{\p@ \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{\p@ \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \else
+ \ifdim #3<\ifdim #3=\z@ \z@ \else \p@\fi
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus\p@ \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus\p@ \@minus#4}%
+ \fi
+ \else
+ \ifdim #4<\ifdim #4=\z@ \z@ \else \p@\fi
+ \setlength{#1}{#2 \@plus#3 \@minus\p@}%
+ \else
+ \setlength{#1}{#2 \@plus#3 \@minus#4}%
+ \fi
+ \fi
+ \fi
+ \fi
+}
\newcommand*{\changefontsizes}[2][1.2\@tempdima]{%
\ClassWarning{\KOMAClassName}{%
Using fallback calculation to setup font sizes\MessageBreak
@@ -1119,12 +1327,20 @@
\setlength{\@tempdimc}{\@tempdima}%
\def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}%
\expandafter\@tempa\expandafter\@tempb\@tempb\@nnil%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\normalsize{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1136,12 +1352,20 @@
}%
\setlength{\@tempdima}{0.9125\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\small{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
@@ -1153,12 +1377,20 @@
}%
\setlength{\@tempdima}{.83334\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\abovedisplayskip}{%
- \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
- \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\abovedisplayskip}{%
+ \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}%
+ \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}%
+ \setlength{\belowdisplayshortskip}{%
+ .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
+ \else
+ \scr@setlength{\abovedisplayskip}%
+ {.8333\@tempdimb}{.1667\@tempdimb}{.5\@tempdimb}%
+ \scr@setlength{\abovedisplayshortskip}{\z@}{.25\@tempdimb}{\z@}%
+ \scr@setlength{\belowdisplayshortskip}%
+ {.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
+ \fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \setlength{\belowdisplayshortskip}{%
- .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}%
\edef\footnotesize{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
@@ -1211,29 +1443,37 @@
{\the\@tempdima}{\the\@tempdimb}%
}%
\normalsize
- \setlength{\footnotesep}{.7\@tempdimc}%
- \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
- .6\@tempdimc}%
- \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
- .3333\@tempdimc}%
- \setlength{\dbltextfloatsep}{\textfloatsep}%
- \setlength{\@fptop}{0\p@ \@plus 1fil}%
- \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@fpbot}{\@fptop}%
- \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
- \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
- \setlength{\@dblfpbot}{\@fptop}%
- \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
- .5\@tempdimc}%
- \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\footnotesep}{.7\@tempdimc}%
+ \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus
+ .6\@tempdimc}%
+ \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus
+ .3333\@tempdimc}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{0\p@ \@plus 1fil}%
+ \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{0\p@ \@plus 1fil}%
+ \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \fi
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus
+ .5\@tempdimc}%
+ \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \scr@setlength{\parsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1246,9 +1486,16 @@
\if@tempswa\noexpand\@list@extra\fi
}%
\let\@listI\@listi
- \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
- .41667\@tempdimc}%
- \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus
+ .41667\@tempdimc}%
+ \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1260,9 +1507,16 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
- .16667\@tempdimc}%
- \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus
+ .16667\@tempdimc}%
+ \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.125\@tempdimb}{.0625\@tempdimb}{.0625\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.25\@tempdimb}{.125\@tempdimb}{.125\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1274,8 +1528,15 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
- \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}%
+ \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\parsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \scr@setlength{\topsep}%
+ {.3333\@tempdimb}{.1667\@tempdimb}{.0833\@tempdimb}%
+ \fi
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1288,8 +1549,13 @@
\itemsep \parsep
\if@tempswa\noexpand\@list@extra\fi
}%
- \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
- \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}%
+ \else
+ \scr@setlength{\topsep}%
+ {.1667\@tempdimb}{.0833\@tempdimb}{.0833\@tempdimb}%
+ \fi
+ \setlength{\partopsep}{\z@ \@plus\z@ \@minus\p@}%
\@tempswafalse
\begingroup
\def\@list@extra{\aftergroup\@tempswatrue}%
@@ -1299,7 +1565,7 @@
\labelwidth=\dimexpr \leftmargin-\labelsep
\topsep \the\topsep
\parsep \z@
- \partopsep \the\parsep
+ \partopsep \the\partopsep
\itemsep \topsep
\if@tempswa\noexpand\@list@extra\fi
}%
@@ -1309,7 +1575,7 @@
\csname @listiv\endcsname
\endgroup
\edef\@listiv{\leftmargin\leftmarginiv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1318,7 +1584,7 @@
\csname @listv\endcsname
\endgroup
\edef\@listv{\leftmargin\leftmarginv
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@tempswafalse
@@ -1327,15 +1593,36 @@
\csname @listvi\endcsname
\endgroup
\edef\@listvi{\leftmargin\leftmarginvi
- \labelwidth=\dimexpr \leftmargin-\labelsep
+ \labelwidth=\dimexpr \leftmargin-\labelsep\relax
\if@tempswa\noexpand\@list@extra\fi
}%
\@listi
- \setlength{\@tempdimb}{\@tempb\@tempdima}%
- \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
- \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
- \setlength\dblfloatsep\intextsep
- \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
+ \setlength{\@tempdimb}{\@tempb\@tempdima}%
+ \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}%
+ \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}%
+ \setlength\dblfloatsep\intextsep
+ \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}%
+ \else
+ \setlength{\@tempdimb}{\f@baselineskip}%
+ \setlength{\footnotesep}{.555\@tempdimb}%
+ \scr@setlength{\skip\footins}%
+ {.75\@tempdimb}{.3333\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\floatsep}%
+ {\@tempdimb}{.1667\@tempdimb}{.1667\@tempdimb}%
+ \scr@setlength{\textfloatsep}%
+ {1.6667\@tempdimb}{.1667\@tempdimb}{.3333\@tempdimb}%
+ \setlength{\intextsep}{\floatsep}%
+ \setlength{\dblfloatsep}{\floatsep}%
+ \setlength{\dbltextfloatsep}{\textfloatsep}%
+ \setlength{\@fptop}{\z@ \@plus 1fil}%
+ \setlength{\@fpsep}{.6667\@tempdimb \@plus 2fil}%
+ \setlength{\@fpbot}{\@fptop}%
+ \setlength{\@dblfptop}{\@fptop}%
+ \setlength{\@dblfpsep}{\@fpsep}%
+ \setlength{\@dblfpbot}{\@fptop}%
+ \scr@setlength{\partopsep}{.2\@tempdimb}{.1\@tempdimb}{.1\@tempdimb}%
+ \fi
}%
}
\expandafter\@defaultunits\expandafter\@tempdima\@ptsize pt\relax\@nnil
@@ -1366,23 +1653,61 @@
}%
}%
}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
-\DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
+\newcommand*{\scr@DeclareOldFontCommand}[3]{%
+ \DeclareRobustCommand #1{\@fontswitch {%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#2}'%
+ }%
+ #2%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of deprecated font command `\string#1'!\MessageBreak
+ You should note, that in 1994 font command `\string#1' has\MessageBreak
+ been defined for compatiblitiy to Script 2.0 only.\MessageBreak
+ Now, after two decades of LaTeX2e and NFSS2, you\MessageBreak
+ shouldn't use such commands any longer and within\MessageBreak
+ KOMA-Script usage of `\string#1' is definitely deprecated.\MessageBreak
+ See `fntguide.pdf' for more information about\MessageBreak
+ recommended font commands.\MessageBreak
+ Note also, that KOMA-Script will remove the definition\MessageBreak
+ of `\string#1' anytime until release of about version 3.20.\MessageBreak
+ But for now, KOMA-Script will replace deprecated
+ `\string#1'\MessageBreak
+ by `\detokenize{#3}'%
+ }%
+ #3%
+ }%
+ }%
+}
+\scr@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\scr@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\scr@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\scr@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\scr@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\scr@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\scr@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\scr@DeclareOldFontCommand{\sfb}{\normalfont\sffamily\bfseries}{%
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: scrklang.dtx
+%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year}%
-%%% From File: scrktare.dtx
+%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1393,7 +1718,40 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: scrkpar.dtx
+\if@scr@emulatestandardclasses
+ \ifnum\@lastdiv=\z@
+ \setlength{\textwidth}{\dimexpr \paperwidth-2in\relax}
+ \ifdim \f@size\p@<10.5\p@
+ \setlength{\@tempdimb}{345\p@}
+ \else\ifdim \f@size\p@<11.5\p@
+ \setlength{\@tempdimb}{360\p@}
+ \else
+ \setlength{\@tempdimb}{390\p@}
+ \fi
+ \fi
+ \if@twocolumn
+ \ifdim\@textwidth>2\@tempdimb\relax
+ \setlength{\textwidth}{2\@tempdimb}
+ \fi
+ \else
+ \ifdim\textwidth>\@tempdimb
+ \setlength{\textwidth}{\@tempdimb}
+ \fi
+ \fi
+ \@settopoint\textwidth
+ \setlength{\@tempdima}{\dimexpr \paperheight-3.5in\relax}
+ \divide\@tempdima\baselineskip
+ \@tempcnta=\@tempdima
+ \setlength{\textheight}{\@tempcnta\baselineskip}
+ \addtolength{\textheight}{\topskip}
+ \edef\reserved@a{%
+ \noexpand\@areasetadvancedtrue
+ \noexpand\areaset[current]{\noexpand\textwidth}{\noexpand\textheight}%
+ \if@areasetadvanced\else\noexpand\@areasetadvancedfalse\fi
+ }\reserved@a
+ \fi
+\fi
+%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1521,7 +1879,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: scrktitl.dtx
+%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -1554,13 +1912,60 @@
\newcommand{\dedication}[1]{\gdef\@dedication{%
#1%
}}%
-\newcommand*{\next@tpage}{\clearpage\thispagestyle{empty}}%
+\newcommand*{\next@tpage}{%
+ \@thanks\global\let\@thanks\@empty
+ \clearpage
+ \csname titlepage@restore\endcsname
+ \thispagestyle{empty}%
+ \let\footnote\thanks
+ \setcounter{footnote}{0}%
+}
+\newcommand*{\next@tdpage}{%
+ \next@tpage\if@twoside \ifodd\value{page}\else\null\next@tpage\fi\fi
+}
\newcommand*\maketitle[1][1]{%
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \else
+ \def\and{%
+ \end{tabular}%
+ \hskip 1em \@plus.17fil%
+ \begin{tabular}[t]{c}%
+ }%
+ \fi
\if@titlepage
\begin{titlepage}
\setcounter{page}{%
#1%
}%
+ \if@titlepageiscoverpage
+ \edef\titlepage@restore{%
+ \noexpand\endgroup
+ \noexpand\global\noexpand\@colht\the\@colht
+ \noexpand\global\noexpand\@colroom\the\@colroom
+ \noexpand\global\vsize\the\vsize
+ \noexpand\global\noexpand\@titlepageiscoverpagefalse
+ \noexpand\let\noexpand\titlepage@restore\noexpand\relax
+ }%
+ \begingroup
+ \topmargin=\dimexpr \coverpagetopmargin-1in\relax
+ \oddsidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \evensidemargin=\dimexpr \coverpageleftmargin-1in\relax
+ \textwidth=\dimexpr
+ \paperwidth-\coverpageleftmargin-\coverpagerightmargin\relax
+ \textheight=\dimexpr
+ \paperheight-\coverpagetopmargin-\coverpagebottommargin\relax
+ \headheight=0pt
+ \headsep=0pt
+ \footskip=\baselineskip
+ \@colht=\textheight
+ \@colroom=\textheight
+ \vsize=\textheight
+ \columnwidth=\textwidth
+ \hsize=\columnwidth
+ \linewidth=\hsize
+ \else
+ \let\titlepage@restore\relax
+ \fi
\let\footnotesize\small
\let\footnoterule\relax
\let\footnote\thanks
@@ -1568,53 +1973,69 @@
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\ifx\@extratitle\@empty \else
- \noindent\@extratitle\next@tpage\cleardoubleemptypage
- \thispagestyle{empty}%
+ \noindent\@extratitle\next@tdpage
\fi
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}%
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null\vfill
\begin{center}
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}%
+ {\usekomafont{subject}{\@subject\par}}%
\vskip 3em
\fi
- {\titlefont\huge \@title\par}%
+ {\usekomafont{title}{\huge \@title\par}}%
\vskip 1em
- {\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
+ {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
\vskip 2em
- {\Large \lineskip 0.75em
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip 0.75em
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1.5em
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus3fill
- {\Large \@publishers \par}%
+ {\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks
+ \@thanks\let\@thanks\@empty
\vfill\null
- \if@twoside\next@tpage
- \begin{minipage}[t]{\textwidth}
- \@uppertitleback
- \end{minipage}\par
- \vfill
- \begin{minipage}[b]{\textwidth}
- \@lowertitleback
- \end{minipage}
+ \if@twoside
+ \@tempswatrue
+ \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax
+ \else
+ \ifx\@uppertitleback\@empty\ifx\@lowertitleback\@empty
+ \@tempswafalse
+ \fi\fi
+ \fi
+ \if@tempswa
+ \next@tpage
+ \begin{minipage}[t]{\textwidth}
+ \@uppertitleback
+ \end{minipage}\par
+ \vfill
+ \begin{minipage}[b]{\textwidth}
+ \@lowertitleback
+ \end{minipage}\par
+ \@thanks\let\@thanks\@empty
+ \fi
\fi
- \ifx\@dedication\@empty \else
- \next@tpage\null\vfill
- {\centering \Large \@dedication \par}%
+ \ifx\@dedication\@empty
+ \else
+ \next@tdpage\null\vfill
+ {\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \if@twoside \next@tpage\cleardoubleemptypage \fi
+ \@thanks\let\@thanks\@empty
+ \cleardoubleemptypage
\fi
+ \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
\end{titlepage}
\else
\par
@@ -1628,92 +2049,115 @@
}%
\fi
\begingroup
+ \let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
+ \@makeextratitle
+ \next@tdpage
\@maketitle
\else
+ \ifx\@extratitle\@empty\else
+ \twocolumn[\@makeextratitle]\next@tdpage
+ \fi
\twocolumn[\@maketitle]%
\fi
\else
- \newpage
- \global\@topnum\z@
+ \@makeextratitle
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
\endgroup
\fi
\setcounter{footnote}{0}%
- \let\thanks\relax
- \let\maketitle\relax
- \let\@maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@author\@empty
- \global\let\@date\@empty
- \global\let\@title\@empty
- \global\let\@subtitle\@empty
- \global\let\@extratitle\@empty
- \global\let\@titlehead\@empty
- \global\let\@subject\@empty
- \global\let\@publishers\@empty
- \global\let\@uppertitleback\@empty
- \global\let\@lowertitleback\@empty
- \global\let\@dedication\@empty
- \global\let\author\relax
- \global\let\title\relax
- \global\let\extratitle\relax
- \global\let\titlehead\relax
- \global\let\subject\relax
- \global\let\publishers\relax
- \global\let\uppertitleback\relax
- \global\let\lowertitleback\relax
- \global\let\dedication\relax
- \global\let\date\relax
+ \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+ \let\thanks\relax
+ \let\maketitle\relax
+ \let\@maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@author\@empty
+ \global\let\@date\@empty
+ \global\let\@title\@empty
+ \global\let\@subtitle\@empty
+ \global\let\@extratitle\@empty
+ \global\let\@titlehead\@empty
+ \global\let\@subject\@empty
+ \global\let\@publishers\@empty
+ \global\let\@uppertitleback\@empty
+ \global\let\@lowertitleback\@empty
+ \global\let\@dedication\@empty
+ \global\let\author\relax
+ \global\let\title\relax
+ \global\let\extratitle\relax
+ \global\let\titlehead\relax
+ \global\let\subject\relax
+ \global\let\publishers\relax
+ \global\let\uppertitleback\relax
+ \global\let\lowertitleback\relax
+ \global\let\dedication\relax
+ \global\let\date\relax
+ \fi
\global\let\and\relax
}%
-\newcommand*{\@maketitle}{%
- \clearpage
- \let\footnote\thanks
+\newcommand*{\@makeextratitle}{%
+ \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tpage \if@twoside \null\next@tpage \fi
+ \noindent\@extratitle \next@tdpage
\fi
+}
+\newcommand*{\@maketitle}{%
+ \next@tdpage
+ \global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
\begin{minipage}[t]{\textwidth}
- \@titlehead
+ \usekomafont{titlehead}{\@titlehead\par}%
\end{minipage}\par
\fi
\null
\vskip 2em%
\begin{center}%
\ifx\@subject\@empty \else
- {\subject@font \@subject \par}
+ {\usekomafont{subject}{\@subject \par}}%
\vskip 1.5em
\fi
- {\titlefont\huge \@title \par}%
+ {\usekomafont{title}{\huge \@title \par}}%
\vskip .5em
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}\@subtitle\par\fi}%
\vskip 1em
- {\Large
- \lineskip .5em%
- \begin{tabular}[t]{c}
- \@author
- \end{tabular}\par
+ {%
+ \usekomafont{author}{%
+ \lineskip .5em%
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par
+ }%
}%
\vskip 1em%
- {\Large \@date \par}%
+ {\usekomafont{date}{\@date \par}}%
\vskip \z@ \@plus 1em
- {\Large \@publishers \par}
+ {\usekomafont{publishers}{\@publishers \par}}%
\ifx\@dedication\@empty \else
\vskip 2em
- {\Large \@dedication \par}
+ {\usekomafont{dedication}{\@dedication \par}}%
\fi
\end{center}%
\par
\vskip 2em
}%
+\newcommand*{\coverpagetopmargin}{%
+ \dimexpr \topmargin+1in\relax
+}
+\newcommand*{\coverpagebottommargin}{%
+ 2\dimexpr\coverpagetopmargin\relax
+}
+\newcommand*{\coverpageleftmargin}{%
+ \dimexpr \evensidemargin+1in\relax
+}
+\newcommand*{\coverpagerightmargin}{\coverpageleftmargin}
\newenvironment{titlepage}{%
\cleardoublepage
\if@twocolumn
@@ -1731,9 +2175,14 @@
\newcommand*\titlefont{\sectfont}%
\newcommand*{\subject@font}{\normalfont\normalcolor\bfseries\Large}%
\newkomafont{subtitle}{\usekomafont{title}\large}%
+\newkomafont{titlehead}{}%
+\newkomafont{author}{\Large}
+\newkomafont{date}{\Large}
+\newkomafont{publishers}{\Large}
+\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: scrksect.dtx
+%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
\newif\if@mainmatter\@mainmattertrue
\newcommand*\frontmatter{%
\if@twoside\cleardoubleoddpage\else\clearpage\fi
@@ -1754,6 +2203,20 @@
\csname appendixmore\endcsname
}
\newcommand*\chaptermark[1]{}
+\newcommand*\addchapmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=\m@ne
+ \chaptermark{#1}%
+ \endgroup
+}
+\newcommand*\addsecmark[1]{%
+ \begingroup
+ \c@secnumdepth=\m@ne
+ \sectionmark{#1}%
+ \endgroup
+}
\newif\if@altsecnumformat\@altsecnumformatfalse
\newif\if@autodot
\renewcommand*{\@autodottrue}{\global\let\if@autodot\iftrue}
@@ -1906,6 +2369,37 @@
\fi\fi}
\newcommand*\autodot{\if@altsecnumformat.\fi}
\setcounter{secnumdepth}{2}
+\newcommand*{\partnumdepth}{%
+ \m@ne
+}
+\newcommand*{\chapternumdepth}{\z@}
+\newcommand*{\sectionnumdepth}{\@ne}
+\newcommand*{\subsectionnumdepth}{\tw@}
+\newcommand*{\subsubsectionnumdepth}{\thr@@}
+\newcommand*{\paragraphnumdepth}{4}
+\newcommand*{\subparagraphnumdepth}{5}
+\newcommand*{\ifnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@secondoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi
+ }%
+}
+\newcommand*{\ifunnumbered}[1]{%
+ \scr@ifundefinedorrelax{#1numdepth}{%
+ \@firstoftwo
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }%
+}
\newcounter{part}
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
@@ -2014,26 +2508,26 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >-2\relax
+ \ifnumbered{part}{%
\refstepcounter{part}%
\@maybeautodot\thepart%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{\thepart}{\scr@ds@tocentry}%
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addparttocentry{}{\scr@ds@tocentry}%
\fi
- \fi
+ }%
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\interlinepenalty \@M
\normalfont\sectfont\nobreak
- \ifnum \c@secnumdepth >-2\relax
+ \ifnumbered{part}{%
\size@partnumber{\partformat}%
\partheadmidvskip
- \fi
+ }{}%
\size@part{#2}\strut
\ifx\partmark\@gobble
\@mkboth{}{}\par
@@ -2175,87 +2669,24 @@
\setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
\fi
\fi
- \ifnum \c@secnumdepth >\m@ne
+ \ifnumbered{chapter}{%
\if@mainmatter
\refstepcounter{chapter}%
\@maybeautodot\thechapter
\typeout{\@chapapp\space\thechapter.}%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{%
- \protect\numberline{\thechapter}\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
\else
\ifx\scr@ds@tocentry\@empty\else
- \addchaptertocentry{}{#1}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{#1}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{#1}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
+ \addchaptertocentry{}{\scr@ds@tocentry}%
\fi
\fi
- \else
+ }{%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
- \fi
+ }%
\expandafter\chaptermark\expandafter{\scr@ds@head}%
\ifdim \@chapterlistsgap>\z@
\doforeachtocfile{%
@@ -2293,7 +2724,8 @@
\else
\let\@tempa\@hangfrom
\fi
- \@tempa{\ifnum \c@secnumdepth >\m@ne%
+ \@tempa{%
+ \ifnumbered{chapter}{%
\if@mainmatter
\if@chapterprefix
\expandafter\size@chapterprefix
@@ -2305,13 +2737,21 @@
\size@chapterprefix{}\endgraf\nobreak\vskip.5\baselineskip
\fi
\fi
- \fi
+ }{}%
}%
{\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}%
\nobreak\chapterheadendvskip
}
\newcommand*{\addchaptertocentry}[2]{%
\addtocentrydefault{chapter}{#1}{#2}%
+ \if@chaptertolists
+ \doforeachtocfile{%
+ \iftocfeature{\@currext}{chapteratlist}{%
+ \addxcontentsline{\@currext}{chapteratlist}[{#1}]{#2}%
+ }{}%
+ }%
+ \@ifundefined{float@addtolists}{}{\scr@float@addtolists@warning}%
+ \fi
}
\newcommand*{\@schapter}[1]{%
\if@twocolumn
@@ -2367,26 +2807,6 @@
\@schapter{#2}%
\ifx\scr@ds@tocentry\@empty\else
\addchaptertocentry{}{\scr@ds@tocentry}%
- \if@chaptertolists
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addcontentsline{\@currext}{chapteratlist}{\scr@ds@tocentry}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \scr@ifundefinedorrelax{@currentHref}{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}%
- }%
- }{%
- \float@addtolists{%
- \protect\contentsline{chapteratlist}{\scr@ds@tocentry}{\thepage}{%
- \@currentHref}%
- }%
- }%
- }%
- \fi
\fi
\ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax
\ifdim \@chapterlistsgap>\z@
@@ -2401,15 +2821,9 @@
}%
\fi
\fi
- \if@twoside
- \expandafter\@mkboth\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}{}%
- \else
- \expandafter\@mkboth\expandafter{\expandafter}\expandafter{%
- \expandafter\MakeMarkcase\expandafter{\scr@ds@head}}%
- \fi
+ \addchapmark{\scr@ds@head}%
}%
-\newcommand*{\@saddchap}[1]{\@schapter{#1}\@mkboth{}{}}%
+\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
\AfterPackage{hyperref}{%
\@ifpackagelater{hyperref}{2001/02/19}{}{%
\ClassWarningNoLine{\KOMAClassName}{%
@@ -2442,14 +2856,9 @@
\ifx\scr@ds@tocentry\@empty\else
\addsectiontocentry{}{\scr@ds@tocentry}%
\fi
- \if@twoside
- \ifx\@mkboth\markboth
- \expandafter\markright\expandafter{%
- \expandafter\MakeMarkcase{\scr@ds@head}}%
- \fi
- \fi
+ \addsecmark{\scr@ds@head}%
}
-\newcommand*{\@saddsec}[1]{\section*{#1}\@mkboth{}{}}
+\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newcommand*{\addsectiontocentry}[2]{%
\addtocentrydefault{section}{#1}{#2}%
}
@@ -2462,14 +2871,16 @@
\newcommand*{\addsubparagraphtocentry}[2]{%
\addtocentrydefault{subparagraph}{#1}{#2}%
}
-\newcommand\section{\@startsection{section}{1}{\z@}%
+\newcommand\section{%
+ \@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
-\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\newcommand\subsection{%
+ \@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2477,7 +2888,8 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsection
}%
}
-\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\newcommand\subsubsection{%
+ \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2485,12 +2897,14 @@
\raggedsection\normalfont\sectfont\nobreak\size@subsubsection
}%
}
-\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\paragraph{%
+ \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
-\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+\newcommand\subparagraph{%
+ \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
@@ -2508,7 +2922,6 @@
\let\raggedsection\raggedright
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
-\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
\newkomafont{chapterentry}{\usekomafont{disposition}}
@@ -2558,9 +2971,15 @@
\if \@tempa u%
\set@preamble@vpos{0}{#2}%
\fi%
+ \if \@tempa b%
+ \set@preamble@vpox{0}{#2}%
+ \fi
\if \@tempa o%
\set@preamble@vpos{1}{#2}%
\fi%
+ \if \@tempa t%
+ \set@preamble@vpos{1}{#2}%
+ \fi
}%
\@ifundefined{prmbl@hpos}{\def\prmbl@hpos{0}}{}%
\@ifundefined{prmbl@vpos}{\def\prmbl@vpos{0}}{}%
@@ -2598,9 +3017,9 @@
\ClassError{\KOMAClassName}{%
inconsistent hpos options%
}{%
- You said `#2' as position option. But you have
+ You've said `#2' as position option. But you have
to\MessageBreak
- use only one from `l', `r' or `c' not two of
+ use only one of `l', `r', or `c' not two of
these.\MessageBreak
If you'll continue only first hpos option will be
used%
@@ -2616,9 +3035,9 @@
\ClassError{\KOMAClassName}{%
inconsistent vpos options%
}{%
- You said `#2' as position option. But you have
+ You've said `#2' as position option. But you have
to\MessageBreak
- use only one from `o' or `u' not two of
+ use only one of `t', `o', `b', or `u' not two of
these.\MessageBreak
If you'll continue only first vpos option will be
used%
@@ -2724,7 +3143,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: scrkmisc.dtx
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -2801,7 +3220,37 @@
\providecommand*{\@textsubscript}[1]{%
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
-%%% From File: scrkpage.dtx
+\newcommand*{\scr@package@not@recommended}[2]{%
+ \BeforePackage{#1}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of package `#1' together\MessageBreak
+ with a KOMA-Script class is not recommended.\MessageBreak
+ \if\relax\detokenize{#2}\relax\else
+ I'd suggest to use #2.\MessageBreak
+ \fi
+ Nevertheless, using requested\MessageBreak
+ package `#1'%
+ }%
+ }%
+}
+\scr@package@not@recommended{emptypage}{%
+ option\MessageBreak
+ `cleardoublepage' with one of it's\MessageBreak
+ several values}
+\scr@package@not@recommended{parskip}{%
+ option\MessageBreak
+ `parskip' with one of it's several values}
+\scr@package@not@recommended{fancyhdr}{%
+ \MessageBreak
+ package `scrpage2' or `scrlayer-scrpage'}
+\scr@package@not@recommended{titlesec}{%
+ the package only\MessageBreak
+ if you really need it, because it breaks several\MessageBreak
+ KOMA-Script features, i.e., option `headings' and\MessageBreak
+ the extended optional argument of the section\MessageBreak
+ commands
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -2858,17 +3307,16 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\ifnum \c@secnumdepth >\m@ne
+ {\MakeMarkcase{\ifnumbered{chapter}{%
\if@mainmatter
\chaptermarkformat
\fi
- \fi
- ##1}}{}%
+ }{}##1}%
+ }{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside
- \markright{\MakeMarkcase{\ifnum \c@secnumdepth >\z@
- \sectionmarkformat\fi
+ \markright{\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}%
##1}}%
\fi
}%
@@ -2913,7 +3361,7 @@
\else
\onecolumn
\fi
-%%% From File: scrkfloa.dtx
+%%% From File: $Id: scrkernel-floats.dtx 1502 2013-11-06 11:00:12Z mjk $
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
@@ -3246,8 +3694,8 @@
\let\scr@tmp@footnotetext=\@footnotetext
\let\@footnotetext=\@gobble
\sbox\@tempboxa{%
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
#3\unskip\strut}}%
}%
\let\@footnotetext=\scr@tmp@footnotetext
@@ -3263,23 +3711,25 @@
\hb@xt@\hsize{%
\setbox\@tempboxa\vbox{\hsize=\cap@width
\ifdofullc@p
- {\capfont{\@hangfrom{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}}%
+ {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
{#3\unskip\strut\par}}}%
\else%
\ifdim\cap@indent<\z@
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
\else%
\if@capbreak
- {\capfont{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat\par}}}%
+ {\usekomafont{caption}{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
\noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
\else
- {\capfont{\@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+ {\usekomafont{caption}{%
+ \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
{\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
- {{\caplabelfont{#2\captionformat}}}}#3\unskip\strut\par}}}%
+ {{\usekomafont{captionlabel}{%
+ #2\captionformat}}}}#3\unskip\strut\par}}}%
\fi
\fi
\fi
@@ -3296,11 +3746,12 @@
\else
\global \@minipagefalse
\sbox\@tempboxa{%
- {\capfont{\scr@smashdp{\strut\ignorespaces
- #1{{\caplabelfont{#2\captionformat}}}}%
+ {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
+ #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
#3}}%
}%
- {\capfont{\hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
+ {\usesizeofkomafont{caption}{%
+ \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
\fi
\endgroup
}
@@ -3424,14 +3875,14 @@
\newenvironment{figure}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@float{figure}%
+ \@float{figure}%
}{%
\end@float
}
\newenvironment{figure*}{%
\if@figurecaptionabove\let\caption\captionabove
\else\let\caption\captionbelow\fi
- \let\caption\captionbelow\@dblfloat{figure}%
+ \@dblfloat{figure}%
}{%
\end@dblfloat
}
@@ -3466,7 +3917,7 @@
}{%
\end@dblfloat
}
-%%% From File: scrkftn.dtx
+%%% From File: $Id: scrkernel-footnotes.dtx 1380 2013-10-01 15:31:55Z mjk $
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
\kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -3604,7 +4055,7 @@
\endgroup
\@footnotemark
}
-%%% From File: scrkliof.dtx
+%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -3613,12 +4064,14 @@
}
\renewcommand*{\numberline}[1]{%
\numberline@box{%
- \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ \numberline@prefix
+ \ifstr{#1}{}{#1}{\numberline@numberformat{#1}}%
+ \numberline@postfix
}%
}
\newcommand*{\numberline@prefix}{}
\newcommand*{\numberline@postfix}{\hfil}
-\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@numberformat}[1]{\ifstr{#1}{}{}{#1\autodot}}
\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
@@ -3683,11 +4136,7 @@
\begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup
}
\newcommand{\addtocentrydefault}[3]{%
- \ifstr{#2}{}{%
- \addcontentsline{toc}{#1}{#3}%
- }{%
- \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}%
- }%
+ \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}%
}
\newcommand*{\float@listhead}[1]{%
\scr@float@listhead@warning
@@ -3703,21 +4152,34 @@
}
\newcommand*{\scr@float@listhead@warning}{%
\ClassWarning{\KOMAClassName}{%
- Usage of deprecated \string\float@listhead!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@listhead.\MessageBreak
- Definition of \string\float@listhead\space my be removed from\MessageBreak
- `\KOMAClassName' soon, so it should not be used
+ \string\float@listhead\space detected!\MessageBreak
+ Implementation of \string\float@listhead\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Maybe implementation of \string\float@listhead\space will\MessageBreak
+ be removed from KOMA-Script soon.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@listhead\space interface
}%
}
\newcommand*{\scr@float@addtolists@warning}{%
\ClassWarningNoLine{\KOMAClassName}{%
\string\float@addtolists\space detected!\MessageBreak
- You should use the features of package `tocbasic'\MessageBreak
- instead of \string\float@addtolists.\MessageBreak
- Support for \string\float@addtolists\space may be removed
- from\MessageBreak
- `\KOMAClassName' soon
+ Implementation of \string\float@addtolist\space became\MessageBreak
+ deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
+ has been replaced by more several more flexible\MessageBreak
+ features of package `tocbasic`.\MessageBreak
+ Since Version 3.12 support for deprecated\MessageBreak
+ \string\float@addtolist\space interface has been\MessageBreak
+ restricted to only some of the KOMA-Script\MessageBreak
+ features and been removed from others.\MessageBreak
+ Loading of package `scrhack' may help to\MessageBreak
+ avoid this warning, if you are using a\MessageBreak
+ a package that still implements the\MessageBreak
+ deprecated \string\float@addtolist\space interface
}%
\global\let\scr@float@addtolists@warning\relax
}
@@ -3731,7 +4193,7 @@
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
\let\l@table\l@figure
-%%% From File: scrkbib.dtx
+%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -3816,13 +4278,15 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: scrkidx.dtx
+%%% From File: $Id: scrkernel-index.dtx 1380 2013-10-01 15:31:55Z mjk $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
\newcommand*{\idx@heading}{%
\if@openright\cleardoublepage\else\clearpage\fi%
- \twocolumn[\idx@@heading{\indexname}]%
+ \twocolumn[%
+ \@chaptertolistsfalse
+ \idx@@heading{\indexname}]%
\@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
}
\newenvironment{theindex}{%
@@ -3849,7 +4313,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: scrklist.dtx
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 1502 2013-11-06 11:00:12Z mjk $
\if@twocolumn
\setlength{\leftmargini}{2em}
\else
@@ -3954,8 +4418,22 @@
\newenvironment{addmargin*}{%
\@tempswafalse
\if@twoside\ifthispageodd{}{\@tempswatrue}\fi
+ \edef\scr@addmargin@startpage{\csname tpo@\scr@tpo\endcsname}%
\@addmargin
}{%
+ \unskip\nobreak\ifthispageodd{}{}%
+ \expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
+ \ClassWarning{\KOMAClassName}{%
+ page break inside `addmargin*' environment.\MessageBreak
+ A `addmargin*' environment starting on page
+ \scr@addmargin@startpage\MessageBreak
+ ends on page \csname tpo@\scr@tpo\endcsname.\MessageBreak
+ This will result in potential wrong margins on\MessageBreak
+ every other page.\MessageBreak
+ So maybe you should change the `addmargin*'\MessageBreak
+ environment, that ends%
+ }%
+ \fi
\advance\@listdepth\@ne
\endlist
}
@@ -3986,7 +4464,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}