diff options
author | Karl Berry <karl@freefriends.org> | 2015-04-24 23:19:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-04-24 23:19:31 +0000 |
commit | 0a00b3b492fd27dc12cddae602b2c43206a17d74 (patch) | |
tree | 40a09bf2208cc13bcd727626e1ee058e2caa68b1 /Master/texmf-dist/tex/latex/koma-script/scrbook.cls | |
parent | 77b150bbd42aa48ba71627e09763785b26adfcfd (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/scrbook.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrbook.cls | 1979 |
1 files changed, 1281 insertions, 698 deletions
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} |