summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-02 22:11:36 +0000
committerKarl Berry <karl@freefriends.org>2015-07-02 22:11:36 +0000
commit28c9b4ce4d428d1582c35205f79c62da999cf4d0 (patch)
treeebaab8a451d923c648016ddecaf5f9dcdbb043eb /Master/texmf-dist/tex/latex/koma-script/scrbook.cls
parenta55a0c408532e7d4dbeb629215c40b9a29b1f98d (diff)
koma-script (2jul15)
git-svn-id: svn://tug.org/texlive/trunk@37734 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.cls1026
1 files changed, 577 insertions, 449 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 743caeae070..a3bc316743b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -23,6 +23,7 @@
%% scrkernel-bibliography.dtx (with options: `class,book,option')
%% scrkernel-index.dtx (with options: `class,book,option')
%% scrkernel-listsandtabulars.dtx (with options: `class,book,option')
+%% scrkernel-sections.dtx (with options: `class,book,execoption')
%% scrkernel-miscellaneous.dtx (with options: `class,book,execoption')
%% scrkernel-compatibility.dtx (with options: `class,book,body')
%% scrkernel-fonts.dtx (with options: `class,book,body')
@@ -73,7 +74,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 2089 2015-05-06 06:10:29Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,9 +96,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}%
\endgroup
-\providecommand*{\scr@clsextenstion}{\@clsextenstion}
+\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
\let\scr@clsextension\@clsextension
}
@@ -110,21 +111,22 @@
\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2015/05/06 v3.17a KOMA-Script
+ 2015/07/02 v3.18 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $
+%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $
\RequirePackage{tocbasic}[%
- 2015/05/06 v3.17a KOMA-Script
+ 2015/07/02 v3.18 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 2079 2015-04-20 07:12:08Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% (run: prepare)
\newif\if@openright
\@openrighttrue
\newcommand*{\scr@dotchangeatdocument}[1]{%
@@ -155,6 +157,32 @@
}
\newcommand*{\size@part}{}
\newcommand*{\size@partnumber}{}
+\newcommand*{\scr@part@beforeskip}{%
+ \z@ \@plus 1fil + \baselineskip
+}
+\newcommand*{\scr@part@innerskip}{20\p@}
+\newcommand*{\scr@part@afterskip}{%
+ \z@ \@plus 1fil
+}
+\newcommand*{\scr@part@style}{part}
+\newcommand*{\partheadstartvskip}{%
+ \null\vskip-\baselineskip\vskip\@tempskipa
+}
+\newcommand*{\partheadmidvskip}{%
+ \par\nobreak
+ \vskip\@tempskipa
+}
+\newcommand*{\partheadendvskip}{%
+ \vskip\@tempskipa\newpage
+}
+\newcommand*{\partheademptypage}{%
+ \if@twoside\if@openright
+ \null%
+ \thispagestyle{empty}%
+ \newpage
+ \fi\fi
+}
+\newif\if@chapterprefix
\newcommand*{\size@chapter}{}
\newcommand*{\size@chapterprefix}{\size@chapter}
\newcommand*{\scr@chapter@beforeskip}{\z@}
@@ -173,7 +201,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2089 2015-05-06 06:10:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -291,6 +319,8 @@
\@namedef{scr@v@3.16}{14}
\@namedef{scr@v@3.17}{15}
\@namedef{scr@v@3.17a}{15}
+\@namedef{scr@v@3.17c}{15}
+\@namedef{scr@v@3.18}{15}
\@namedef{scr@v@last}{15}
\newcommand*{\scr@v@is@lt}[1]{%
\scr@compatibility<\@nameuse{scr@v@#1}
@@ -394,7 +424,7 @@
\KOMAClassFileName
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-typearea.dtx 2088 2015-05-03 09:09:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -692,7 +722,8 @@
}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
{any}{0},%
@@ -719,8 +750,6 @@
\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}{%
@@ -748,10 +777,8 @@
\fi
\fi
}
-\KOMA@kav@add{.\KOMAClassFileName}{numbers}{autoendperiod}
\KOMA@DeclareDeprecatedOption{pointednumbers}{numbers=enddot}
\KOMA@DeclareDeprecatedOption{pointlessnumbers}{numbers=noenddot}
-\newif\if@chapterprefix
\KOMA@key{chapterprefix}[true]{%
\KOMA@set@ifkey{chapterprefix}{@chapterprefix}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -822,7 +849,7 @@
\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@beforeskip}{-3.3\baselineskip-\parskip}%
\renewcommand*{\scr@chapter@afterskip}{%
1.725\baselineskip \@plus .115\baselineskip \@minus .192\baselineskip
}%
@@ -848,7 +875,7 @@
\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@beforeskip}{-3\baselineskip-\parskip}%
\renewcommand*{\scr@chapter@afterskip}{%
1.5\baselineskip \@plus .1\baselineskip \@minus .167\baselineskip
}%
@@ -874,7 +901,7 @@
\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@beforeskip}{-2.8\baselineskip-\parskip}%
\renewcommand*{\scr@chapter@afterskip}{%
1.35\baselineskip \@plus 0.09\baselineskip \@minus .15\baselineskip
}%
@@ -932,7 +959,7 @@
\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@beforeskip}{-50\p@}%
\renewcommand*{\scr@chapter@afterskip}{40\p@}%
\renewcommand*{\scr@chapter@innerskip}{20\p@}%
\renewcommand*{\chapterheadstartvskip}{\vspace{\@tempskipa}}%
@@ -957,7 +984,7 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -1287,31 +1314,34 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
{noindex}{0},{noidx}{0},%
{index}{1},{idx}{1},%
- {nolistof}{2},%
- {listof}{3},%
- {listofnumbered}{4},{numberedlistof}{4},%
- {nobibliography}{5},{nobib}{5},%
- {bibliography}{6},{bib}{6},%
- {bibliographynumbered}{7},{bibnumbered}{7},{numberedbibliography}{7},%
- {numberedbib}{7},%
- {flat}{8},{left}{8},%
- {graduated}{9},{indent}{9},{indented}{9},%
- {indenttextentries}{10},{indentunnumbered}{10},{numberline}{10},%
- {leftaligntextentries}{11},{leftalignunnumbered}{11},{nonumberline}{11},%
- {chapterentrywithdots}{12},{chapterentrydotfill}{12},
- {chapterentrywithoutdots}{13},{chapterentryfill}{13}%
+ {indexnumbered}{2},%
+ {nolistof}{3},%
+ {listof}{4},%
+ {listofnumbered}{5},{numberedlistof}{5},%
+ {nobibliography}{6},{nobib}{6},%
+ {bibliography}{7},{bib}{7},%
+ {bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},%
+ {numberedbib}{8},%
+ {flat}{9},{left}{9},%
+ {graduated}{10},{indent}{10},{indented}{10},%
+ {indenttextentries}{11},{indentunnumbered}{11},{numberline}{11},%
+ {leftaligntextentries}{12},{leftalignunnumbered}{12},{nonumberline}{12},%
+ {chapterentrywithdots}{13},{chapterentrydotfill}{13},
+ {chapterentrywithoutdots}{14},{chapterentryfill}{14}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
- \ifcase \@tempa\relax % index
+ \ifcase \@tempa\relax % noindex
\KOMAoptions{index=notoc}%
- \or % noindex
+ \or % index
\KOMAoptions{index=totoc}%
+ \or % indexnumbered
+ \KOMAoptions{index=numbered}%
\or % listof
\KOMAoptions{listof=notoc}%
\or % nolistof
@@ -1548,7 +1578,7 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\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 $
+%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1613,10 +1643,18 @@
\newcommand*\bib@heading{%
\ifbib@leveldown
\section*{\bibname}%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
+ \scr@ifundefinedorrelax{@mkright}{%
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{\bibname}}%
+ }%
\else
\chapter*{\bibname}%
- \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ \scr@ifundefinedorrelax{@mkdouble}{%
+ \@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
+ }{%
+ \@mkdouble{\MakeMarkcase{\bibname}}%
+ }%
\fi
}%
\newif\ifbib@leveldown
@@ -1714,46 +1752,101 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $
\newcommand*{\idx@@heading}{%
- \chapter*
+ \ifidx@leveldown
+ \expandafter\section
+ \else
+ \expandafter\chapter
+ \fi*%
}
+\newif\ifidx@leveldown
\KOMA@key{index}{%
\KOMA@set@ncmdkey{index}{@tempa}{%
{notoc}{0},{nottotoc}{0},{default}{0},{plainheading}{0},%
- {totoc}{1},{toc}{1},{notnumbered}{1}%
+ {totoc}{1},{toc}{1},{notnumbered}{1},%
+ {numbered}{2},{totocnumbered}{2},%
+ {leveldown}{3},%
+ {standardlevel}{4}%
}{#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@remove{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}%
\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}%
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}%
\renewcommand*{\idx@@heading}{%
- \chapter*
+ \ifidx@leveldown
+ \expandafter\section
+ \else
+ \expandafter\chapter
+ \fi*%
}%
\or
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}%
\KOMA@kav@add{.\KOMAClassFileName}{toc}{index}%
\KOMA@kav@add{.\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
- \addchap
+ \ifidx@leveldown
+ \expandafter\addsec
+ \else
+ \expandafter\addchap
+ \fi
}%
+ \or
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{noindex}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{toc}{index}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{notoc}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{numbered}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{toc}%
+ \KOMA@kav@add{.\KOMAClassFileName}{toc}{indexnumbered}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{numbered}%
+ \renewcommand*{\idx@@heading}{%
+ \ifidx@leveldown
+ \expandafter\section
+ \else
+ \expandafter\chapter
+ \fi
+ }%
+ \or
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{leveldown}%
+ \idx@leveldowntrue
+ \or
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{leveldown}%
+ \KOMA@kav@remove{.\KOMAClassFileName}{index}{standardlevel}%
+ \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}%
+ \idx@leveldownfalse
\fi
\fi
}
\KOMA@kav@add{.\KOMAClassFileName}{toc}{noindex}
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
+\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% (run: execoption)
+\KOMAExecuteOptions{headings=openright}
+\KOMAExecuteOptions{numbers=autoendperiod}
%%% 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 2089 2015-05-06 06:10:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2204,7 +2297,7 @@
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 2088 2015-05-03 09:09:14Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -2681,7 +2774,8 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 2079 2015-04-20 07:12:08Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
\scr@ifundefinedorrelax{#1numdepth}{%
@@ -2705,6 +2799,10 @@
\fi
}%
}
+\BeforeClosingMainAux{%
+ \if@autodot\if@filesw\immediate\write\@mainaux{%
+ \string\global\string\@altsecnumformattrue}%
+ \fi\fi}
\newcommand{\@maybeautodot}[1]{\if@autodot\else\begingroup%
\expandafter\@@maybeautodot #1\@stop\endgroup\fi
}
@@ -2745,7 +2843,7 @@
\newcommand*{\scr@startsection}[6]{%
\if@noskipsec \leavevmode \fi
\par
- \@tempskipa #4\relax
+ \@tempskipa \glueexpr #4\relax
\@afterindenttrue
\ifdim \@tempskipa <\z@
\@tempskipa -\@tempskipa \@afterindentfalse
@@ -2756,10 +2854,16 @@
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
- \@ifstar
- {\csname scr@preto@ssect@hook\endcsname\@ssect{#3}{#4}{#5}{#6}}%
- {\csname scr@preto@sect@hook\endcsname
- \scr@section@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ \@ifstar {%
+ \csname scr@preto@ssect@hook\endcsname
+ \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
+ }{%
+ \csname scr@preto@sect@hook\endcsname
+ \scr@section@dblarg{%
+ \@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}%
+ {\glueexpr #5\relax}{#6}%
+ }%
+ }%
}
\else
\ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
@@ -2780,9 +2884,14 @@
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
- \@ifstar
- {\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}*}%
- {\scr@section@dblarg{\scr@saved@startsection{#1}{#2}{#3}{#4}{#5}{#6}}}%
+ \@ifstar {%
+ \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
+ {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
+ }{%
+ \scr@section@dblarg{%
+ \scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
+ {\glueexpr #4\relax}{\glueexpr #5\relax}{#6}}%
+ }%
}
\fi
\newcommand*{\At@startsection}[1]{%
@@ -2878,18 +2987,19 @@
\setkeys{KOMAarg.section}{tocentry={#7},head={#7}}%
\fi
\fi
- \ifnum #2>\c@secnumdepth
+ \let\IfUsePrefixLine\@secondoftwo
+ \ifnum \numexpr #2\relax>\c@secnumdepth
\let\@svsec\@empty
\else
\refstepcounter{#1}%
\expandafter\@maybeautodot\csname the#1\endcsname
\protected@edef\@svsec{\@seccntformat{#1}\relax}%
\fi
- \@tempskipa #5\relax
+ \@tempskipa \glueexpr #5\relax\relax
\ifdim \@tempskipa>\z@
\begingroup
#6{%
- \@hangfrom{\hskip #3\relax\@svsec}%
+ \@hangfrom{\hskip \glueexpr #3\relax\@svsec}%
\interlinepenalty \@M #8\@@par}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
@@ -2900,7 +3010,7 @@
\addtocentrydefault{#1}{##1}{##2}%
}%
}{}%
- \ifnum #2>\c@secnumdepth
+ \ifnum \numexpr #2\relax>\c@secnumdepth
\csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
@@ -2909,10 +3019,10 @@
\fi
\else
\def\@svsechd{%
- #6{\hskip #3\relax
+ #6{\hskip \glueexpr #3\relax
\@svsec #8}%
- \expandafter\csname #1mark\expandafter\endcsname\expandafter{%
- \scr@ds@head}%
+ \expandafter\csname #1mark\expandafter\endcsname
+ \expandafter{\scr@ds@head}%
\ifx\scr@ds@tocentry\@empty\else
\scr@ifundefinedorrelax{add#1tocentry}{%
\expandafter\global\expandafter\def
@@ -2920,7 +3030,7 @@
\addtocentrydefault{#1}{####1}{####2}%
}%
}{}%
- \ifnum #2>\c@secnumdepth
+ \ifnum \numexpr #2\relax>\c@secnumdepth
\csname add#1tocentry\endcsname{}{\scr@ds@tocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
@@ -2929,7 +3039,8 @@
\fi
}%
\fi
- \@xsect{#5}%
+ \let\IfUsePrefixLine\scr@IfUsePrefixLineWarning
+ \@xsect{\glueexpr #5\relax}%
}
\DefineFamily{KOMAarg}
\DefineFamilyMember[.section]{KOMAarg}
@@ -2942,10 +3053,23 @@
\ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
}
\newif\if@scr@tempswa
-\BeforeClosingMainAux{%
- \if@autodot\if@filesw\immediate\write\@mainaux{%
- \string\global\string\@altsecnumformattrue}%
- \fi\fi}
+\newcommand*{\scr@IfUsePrefixLineWarning}[2]{%
+ \ClassWarning{\KOMAClassName}{%
+ usage of \string\IfUsePrefixLine\space outside
+ section command\MessageBreak
+ style makes no sense, because the behaviour not only\MessageBreak
+ depends on class options but also on the run-time\MessageBreak
+ section command style.\MessageBreak
+ Neither the then-code nor the else-code will be\MessageBreak
+ executed.\MessageBreak
+ You may change this and avoid the warning by LOCALLY\MessageBreak
+ setting \string\IsUsePrefixLine\space to either
+ \string\@firstoftwo\space or\MessageBreak
+ \string\@secondoftwo\space before using it%
+ }%
+}
+\newcommand*{\IfUsePrefixLine}[2]{}
+\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning
\newcommand*{\raggedsection}{}
\let\raggedsection\raggedright
\DefineFamily{KOMAarg}
@@ -3014,7 +3138,29 @@
\DeclareSectionCommandStyleLengthOption{section}
{afterskip}{scr@}{@afterskip}
\DeclareSectionCommandStyleFontOption{section}{font}{}{}
+\newcommand*{\scr@dsc@def@style@section@command}[1]{%
+ \@namedef{#1}{%
+ \scr@startsection{#1}%
+ {\csname #1numdepth\endcsname}%
+ {\csname scr@#1@sectionindent\endcsname}%
+ {\csname scr@#1@beforeskip\endcsname}%
+ {\csname scr@#1@afterskip\endcsname}%
+ {%
+ \ifdim\glueexpr\csname scr@#1@beforeskip\endcsname <\z@
+ \expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \setlength{\parfillskip}{\z@ plus 1fil}%
+ \fi
+ \fi
+ \raggedsection\normalfont\sectfont\nobreak
+ \usekomafont{#1}%
+ }%
+ }%
+}
\newcommand*{\scr@dsc@style@chapter@options}{}
+\DeclareSectionCommandStyleOption{chapter}{pagestyle}{%
+ \@namedef{\scr@dsc@current pagestyle}{#1}%
+ \FamilyKeyStateProcessed
+}%
\DeclareSectionCommandStyleLengthOption{chapter}
{beforeskip}{scr@}{@beforeskip}
\DeclareSectionCommandStyleLengthOption{chapter}
@@ -3023,7 +3169,21 @@
{afterskip}{scr@}{@afterskip}
\DeclareSectionCommandStyleFontOption{chapter}{font}{}{}
\DeclareSectionCommandStyleFontOption{chapter}{prefixfont}{}{prefix}
+\newcommand*{\scr@dsc@def@style@chapter@command}[1]{%
+ \@namedef{#1}{\scr@startchapter{#1}}%
+ \@namedef{@#1}{\scr@@startchapter{#1}}%
+ \@namedef{@s#1}{\scr@@startschapter{#1}}%
+ \@namedef{@make#1head}{\scr@makechapterhead{#1}}%
+ \@namedef{@makes#1head}{\scr@makeschapterhead{#1}}%
+ \@namedef{@@make#1head}{\scr@@makechapterhead{#1}}%
+ \@namedef{@@makes#1head}{\scr@@makeschapterhead{#1}}%
+ \@namedef{set#1preamble}{\set@preamble{#1}}%
+}
\newcommand*{\scr@dsc@style@part@options}{}
+\DeclareSectionCommandStyleOption{part}{pagestyle}{%
+ \@namedef{\scr@dsc@current pagestyle}{#1}%
+ \FamilyKeyStateProcessed
+}%
\DeclareSectionCommandStyleLengthOption{part}
{beforeskip}{scr@}{@beforeskip}
\DeclareSectionCommandStyleLengthOption{part}
@@ -3031,7 +3191,14 @@
\DeclareSectionCommandStyleLengthOption{part}
{afterskip}{scr@}{@afterskip}
\DeclareSectionCommandStyleFontOption{part}{font}{}{}
-\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{number}
+\DeclareSectionCommandStyleFontOption{part}{prefixfont}{}{prefix}
+\newcommand*{\scr@dsc@def@style@part@command}[1]{%
+ \@namedef{#1}{\scr@startpart{#1}}%
+ \@namedef{@#1}{\scr@@startpart{#1}}%
+ \@namedef{@s#1}{\scr@@startspart{#1}}%
+ \@namedef{@end#1}{\scr@@endpart{#1}}%
+ \@namedef{set#1preamble}{\set@preamble{#1}}%
+}
\newcommand*{\scr@dsc@style@section@neededoptionstest}{%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}%
@@ -3049,6 +3216,10 @@
}{}%
}
\newcommand*{\scr@dsc@style@chapter@neededoptionstest}{%
+ \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style}
+ {pagestyle}%
+ }{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{inner chapter skip}
{innerskip}%
@@ -3070,6 +3241,10 @@
}{}%
}
\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
+ \scr@ifundefinedorrelax{\scr@dsc@current pagestyle}{%
+ \scr@declaresectioncommanderror{\scr@dsc@current}{initial page style}
+ {pagestyle}%
+ }{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @innerskip}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{inner part skip}
{innerskip}%
@@ -3085,7 +3260,7 @@
\IfExistskomafont{\scr@dsc@current}{}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
}{}%
- \IfExistskomafont{\scr@dsc@current number}{}{%
+ \IfExistskomafont{\scr@dsc@current prefix}{}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{number font}
{prefixfont}%
}{}%
@@ -3100,7 +3275,7 @@
\ifscr@dsc@parametersonlytrue
\FamilyKeyStateProcessed
}{%
- \scr@ifundefinedorrelax{scr@start##1}{%
+ \scr@ifundefinedorrelax{scr@dsc@def@style@##1@command}{%
\FamilyKeyStateUnknownValue
}{%
\@namedef{scr@\scr@dsc@current @style}{##1}%
@@ -3176,7 +3351,7 @@
\expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
\the\@tempskipa}%
\else
- \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{
+ \expandafter\edef\csname scr@\scr@dsc@current @tocindent\endcsname{%
##1}%
\fi
\fi
@@ -3232,7 +3407,9 @@
empty section style option%
}%
\else
- \scr@ifundefinedorrelax{scr@start\@nameuse{scr@#2@style}}{%
+ \scr@ifundefinedorrelax{%
+ scr@dsc@def@style@\@nameuse{scr@#2@style}@command%
+ }{%
\ClassWarning{\KOMAClassName}{%
not defining `\expandafter\string\csname #2\endcsname'
due\MessageBreak
@@ -3240,28 +3417,7 @@
`\@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}%
- }%
- }%
- }%
+ \@nameuse{scr@dsc@def@style@\@nameuse{scr@#2@style}@command}{#2}%
}%
\fi
\@ifundefined{DeclareSectionNumberDepth}{%
@@ -3292,6 +3448,7 @@
}{}%
}%
}%
+ \let\scr@dsc@current\relax
}
\newcommand*{\scr@declaresectioncommanderror}[3]{%
\ClassError{\KOMAClassName}{%
@@ -3598,78 +3755,69 @@
\gdef\thechapter{\@Alph\c@chapter}%
\csname appendixmore\endcsname
}
-\newcommand*{\partnumdepth}{%
- \m@ne
-}
-\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\@tempskipa
-}
-\newcommand*{\scr@part@afterskip}{%
- \z@ \@plus 1fil
-}
-\newcommand*{\partheadendvskip}{%
- \vskip\@tempskipa\newpage
-}
-\newcommand*{\scr@part@style}{part}
-\newcommand*{\partheademptypage}{%
- \if@twoside\if@openright
- \null%
- \thispagestyle{empty}%
- \newpage
- \fi\fi
-}
-\newcommand\part{\if@openright\cleardoublepage\else\clearpage\fi
- \thispagestyle{\partpagestyle}%
+\newcommand*{\scr@startpart}[1]{%
+ \if@openright\cleardoublepage\else\clearpage\fi
+ \thispagestyle{\@nameuse{#1pagestyle}}%
\if@twocolumn
\onecolumn
\@tempswatrue
\else
\@tempswafalse
\fi
- \@tempskipa=\glueexpr\scr@part@beforeskip\relax
+ \@tempskipa=\glueexpr\@nameuse{scr@#1@beforeskip}\relax\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
- \vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
- \vskip-\baselineskip\nobreak%
- \SecDef\@part\@spart
+ \vbox to\z@{\vss\use@preamble{#1@o}\strut\par}%
+ \vskip-\baselineskip\nobreak
+ \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname
}
-\newcommand*{\@part}{}
-\def\@part[#1]#2{%
+\newcommand{\scr@@startpart}{}
+\long\def\scr@@startpart#1[#2]#3{%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
- \scr@istest#1=\@nil
+ \scr@istest#2=\@nil
\fi
\if@scr@tempswa
- \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}%
\else
\ifcase \scr@osectarg\relax
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}%
\or
- \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}%
\or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}%
\or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}%
\fi
\fi
- \ifnumbered{part}{%
- \refstepcounter{part}%
+ \ifnumbered{#1}{%
+ \refstepcounter{#1}%
\@maybeautodot\thepart%
+ \expandafter\@maybeautodot\csname the#1\endcsname
+ \typeout{#1 \csname the#1\endcsname.}%
\ifx\scr@ds@tocentry\@empty\else
- \addparttocentry{\thepart}{\scr@ds@tocentry}%
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \addtocentrydefault{#1}%
+ }{%
+ \@nameuse{add#1tocentry}%
+ }{\csname the#1\endcsname}{\scr@ds@tocentry}%
\fi
}{%
+ \expandafter\ifnum\scr@v@is@lt{3.18}\relax\else
+ \begingroup
+ \let\@elt\@stpelt
+ \csname cl@#1\endcsname
+ \endgroup
+ \fi
+ \typeout{#1 without number}%
\ifx\scr@ds@tocentry\@empty\else
- \addparttocentry{}{\scr@ds@tocentry}%
+ \hy@insteadofrefstepcounter{#1}%
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \addtocentrydefault{#1}%
+ }{%
+ \@nameuse{add#1tocentry}%
+ }{}{\scr@ds@tocentry}%
\fi
}%
\begingroup
@@ -3677,32 +3825,38 @@
\raggedpart
\interlinepenalty \@M
\normalfont\sectfont\nobreak
- \ifnumbered{part}{%
- \size@partnumber{\partformat}%
- \setlength{\@tempskipa}{\scr@part@innerskip}%
+ \ifnumbered{#1}{%
+ \usekomafont{#1prefix}{\@nameuse{#1format}}%
+ \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
\partheadmidvskip
}{}%
- \size@part{#2}\strut
- \ifx\partmark\@gobble
- \@mkboth{}{}\par
+ \usekomafont{part}{#3}\strut
+ \expandafter\ifx\csname #1mark\endcsname\@gobble
+ \@mkboth{}{}%
\else
- \expandafter\partmark\expandafter{\scr@ds@head}\par
+ \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
\fi
+ \par
\endgroup
- \@endpart
+ \@nameuse{@end#1}%
}
-\newcommand*{\@spart}[1]{%
+\newcommand{\scr@@startspart}[2]{%
+ \begingroup
+ \let\@mkboth\@gobbletwo
+ \hy@insteadofrefstepcounter{#1}%
+ \endgroup
\begingroup
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\interlinepenalty \@M
\normalfont
- \sectfont\nobreak\size@part{#1}\strut\@mkboth{}{}\par
+ \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par
\endgroup
- \@endpart
+ \@nameuse{@end#1}%
}
-\newcommand*{\@endpart}{\vbox to\z@{\use@preamble{part@u}\vss}%
- \@tempskipa=\glueexpr\scr@part@afterskip\relax
+\newcommand*{\scr@@endpart}[1]{%
+ \vbox to\z@{\use@preamble{#1@u}\vss}%
+ \@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadendvskip
\partheademptypage
@@ -3710,75 +3864,47 @@
\twocolumn
\fi
}
-\newcommand*{\setpartpreamble}{\set@preamble{part}}
-\newcommand*{\part@u@preamble}{}
-\let\part@u@preamble\relax
-\newcommand*{\part@o@preamble}{}
-\let\part@o@preamble\relax
+\newcommand*{\hy@insteadofrefstepcounter}[1]{}
+\let\hy@insteadofrefstepcounter\@gobble
+\BeforePackage{hyperref}{%
+ \let\scr@orig@chapter\@chapter
+ \let\scr@orig@schapter\@schapter
+ \let\scr@orig@addchap\@addchap
+}
+\AfterPackage!{hyperref}{%
+ \let\@chapter\scr@orig@chapter
+ \let\@schapter\scr@orig@schapter
+ \let\@addchap\scr@orig@addchap
+ \ifx\hy@insteadofrefstepcounter\@gobble
+ \renewcommand*{\hy@insteadofrefstepcounter}[1]{%
+ \Hy@MakeCurrentHrefAuto{#1*}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{\@currentHref}\hyper@anchorend
+ }%
+ }%
+ \fi
+}
\newcommand*{\addparttocentry}[2]{%
\addtocentrydefault{part}{#1}{#2}%
}
\newcommand\addpart{%
- \if@openright\cleardoublepage\else\clearpage\fi
- \thispagestyle{\partpagestyle}%
- \if@twocolumn
- \onecolumn
- \@tempswatrue
- \else
- \@tempswafalse
- \fi
- \@tempskipa=\glueexpr\scr@part@beforeskip\relax
- \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
- \partheadstartvskip
- \vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
- \vskip-\baselineskip\nobreak%
\SecDef\@addpart\@saddpart
}
\newcommand*{\@addpart}{}
-\def\@addpart[#1]#2{%
- \ifnum \scr@osectarg=\z@
- \@scr@tempswafalse
- \else
- \scr@istest#1=\@nil
- \fi
- \if@scr@tempswa
- \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
- \else
- \ifcase \scr@osectarg\relax
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \fi
- \fi
- \csname phantomsection\endcsname
- \ifx\scr@ds@tocentry\@empty\else
- \expandafter\addparttocentry\expandafter{\expandafter}\expandafter{%
- \scr@ds@tocentry}%
- \fi
- \@spart{#2}%
- \expandafter\addpartmark\expandafter{\scr@ds@head}%
+\long\def\@addpart[#1]#2{%
+ \edef\reserved@a{%
+ \unexpanded{%
+ \part[{#1}]{#2}%
+ \c@secnumdepth=
+ }\the\c@secnumdepth\relax
+ }%
+ \c@secnumdepth=\numexpr \partnumdepth-1\relax
+ \reserved@a
}
-\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{\@saddpart}[1]{%
+ \part*{#1}%
+ \addpartmark{}%
}
-\newcommand*{\parttocdepth}{\m@ne}
-\let\parttocdepth\m@ne
-\newcommand*{\scr@part@tocindent}{\z@}
-\let\scr@part@tocindent\z@
-\newcommand*{\scr@part@tocnumwidth}{2em}
\newcommand*\l@part[2]{%
\ifnum \c@tocdepth <\parttocdepth \else
\addpenalty{-\@highpenalty}%
@@ -3811,123 +3937,83 @@
\renewcommand*{\thepart}{\@Roman\c@part}
\newcommand*{\partformat}{\partname~\thepart\autodot}
\newcommand*\partname{Part}
+\newcommand*{\partmark}[1]{\@mkboth{}{}}
+\newcommand*\addpartmark[1]{%
+ \begingroup
+ \expandafter\let\csname if@mainmatter\expandafter\endcsname
+ \csname iffalse\endcsname
+ \c@secnumdepth=\numexpr \partnumdepth-1\relax
+ \partmark{#1}%
+ \endgroup
+}
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
\newcommand*{\scr@fnt@part}{\size@part}
\newcommand*{\scr@fnt@partnumber}{\size@partnumber}
+\aliaskomafont{partprefix}{partnumber}
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
-\newcommand*{\chapternumdepth}{\z@}
-\newif\if@at@twocolumn
-\newcommand*\scr@topnewpage{}
-\let\scr@topnewpage\@topnewpage
-\long\def\@topnewpage[#1]{%
- \@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse
-}
-\newcommand*{\use@chapter@o@preamble}{%
- {%
- \settoheight{\@tempdima}{%
- \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
- \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
- \vbox{\chapterheadstartvskip}%
- }%
- \settodepth{\@tempdimb}{%
- \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
- \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
- \vbox{\chapterheadstartvskip}%
- }%
- \addtolength{\@tempdima}{\@tempdimb}%
- \setbox\z@\vbox{%
- \use@preamble{chapter@o}%
- }%
- \setlength{\@tempdimb}{\ht0}%
- \addtolength{\@tempdimb}{\dp0}%
- \vbox to \z@{%
- \vskip-\baselineskip
- \vbox to \@tempdima{%
- \vfill
- \box\z@
- }%
- \vss
- }\vskip-\parskip\vskip-\baselineskip
- \ifdim \@tempdimb>\@tempdima%
- \addtolength{\@tempdimb}{-\@tempdima}%
- \ifdim\@tempdimb<\vfuzz
- \ClassInfo{\KOMAClassName}{%
- preamble before chapter is \the\@tempdimb\space too
- high.\MessageBreak
- Tolerated without warning because of\MessageBreak
- \string\vfuzz\space = \the\vfuzz\space >= \the\@tempdimb
- }%
- \else
- \ClassWarning{\KOMAClassName}{%
- preamble before chapter is \the\@tempdimb\space too
- high.\MessageBreak
- To avoid the overfull \string\vbox\space you may
- redefine\MessageBreak
- \string\chapterheadstartvskip\space at the preamble of
- your\MessageBreak
- document. You may also change
- \string\setchapterpreamble\MessageBreak
- before the command, which generates the message
- about\MessageBreak
- an overfull \string\vbox
- }%
- \fi
- \fi%
- }%
-}
-\newcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi
- \thispagestyle{\chapterpagestyle}%
+\newcommand*{\scr@startchapter}[1]{%
+ \if@openright\cleardoublepage\else\clearpage\fi
+ \thispagestyle{\@nameuse{#1pagestyle}}%
\global\@topnum\z@
\@afterindentfalse
- \SecDef\@chapter\@schapter
+ \expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname
}
-\newcommand*{\@chapter}{}
-\def\@chapter[#1]#2{%
+\newcommand*{\scr@@startchapter}{}
+\def\scr@@startchapter#1[#2]#3{%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
- \scr@istest#1=\@nil
+ \scr@istest#2=\@nil
\fi
\if@scr@tempswa
- \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
+ \setkeys{KOMAarg.section}{tocentry={#3},head={#3},#2}%
\else
\ifcase \scr@osectarg\relax
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}%
\or
- \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
+ \setkeys{KOMAarg.section}{tocentry={#3},head={#2}}%
\or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#3}}%
\or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
+ \setkeys{KOMAarg.section}{tocentry={#2},head={#2}}%
\fi
\fi
- \ifnumbered{chapter}{%
+ \ifnumbered{#1}{%
\if@mainmatter
- \refstepcounter{chapter}%
- \@maybeautodot\thechapter
- \typeout{\@chapapp\space\thechapter.}%
- \ifx\scr@ds@tocentry\@empty\else
- \addchaptertocentry{\thechapter}{\scr@ds@tocentry}%
- \fi
- \else
- \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else
- \begingroup
- \let\@elt\@stpelt
- \csname cl@chapter\endcsname
- \endgroup
- \fi
- \ifx\scr@ds@tocentry\@empty\else
- \addchaptertocentry{}{\scr@ds@tocentry}%
- \fi
+ \@tempswatrue
+ \else\@tempswafalse\fi
+ }{\@tempswafalse}%
+ \if@tempswa
+ \refstepcounter{#1}%
+ \expandafter\@maybeautodot\csname the#1\endcsname
+ \typeout{#1 \csname the#1\endcsname.}%
+ \ifx\scr@ds@tocentry\@empty\else
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \addtocentrydefault{#1}%
+ }{%
+ \@nameuse{add#1tocentry}%
+ }{\csname the#1\endcsname}{\scr@ds@tocentry}%
\fi
- }{%
+ \else
+ \expandafter\ifnum\scr@v@is@lt{3.15}\relax\else
+ \begingroup
+ \let\@elt\@stpelt
+ \csname cl@#1\endcsname
+ \endgroup
+ \fi
+ \typeout{#1 without number}%
\ifx\scr@ds@tocentry\@empty\else
- \addchaptertocentry{}{\scr@ds@tocentry}%
+ \hy@insteadofrefstepcounter{#1}%
+ \scr@ifundefinedorrelax{add#1tocentry}{%
+ \addtocentrydefault{#1}%
+ }{%
+ \@nameuse{add#1tocentry}%
+ }{}{\scr@ds@tocentry}%
\fi
- }%
- \expandafter\chaptermark\expandafter{\scr@ds@head}%
+ \fi
+ \csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
\ifdim \@chapterlistsgap>\z@
\doforeachtocfile{%
\iftocfeature{\@currext}{chapteratlist}{%
@@ -3941,29 +4027,58 @@
\fi
\if@twocolumn
\if@at@twocolumn
- \@makechapterhead{#2}%
+ \@nameuse{@make#1head}{#3}%
\else
- \@topnewpage[\@makechapterhead{#2}]%
+ \@topnewpage[\@nameuse{@make#1head}{#3}]%
\fi
\else
- \@makechapterhead{#2}%
- \@afterheading
+ \@nameuse{@make#1head}{#3}%
\fi
+ \@afterheading
+}
+\newcommand*{\scr@@startschapter}[2]{%
+ \begingroup
+ \let\@mkboth\@gobbletwo
+ \hy@insteadofrefstepcounter{#1}%
+ \endgroup
+ \if@twocolumn
+ \if@at@twocolumn
+ \@nameuse{@makes#1head}{#2}%
+ \else
+ \@topnewpage[\@nameuse{@makes#1head}{#2}]%
+ \fi
+ \else
+ \@nameuse{@makes#1head}{#2}%
+ \fi
+ \@afterheading
+}
+%% \begin{macro}{\if@at@twocolumn}
+\newif\if@at@twocolumn
+\newcommand*\scr@topnewpage{}
+\let\scr@topnewpage\@topnewpage
+\long\def\@topnewpage[#1]{%
+ \@at@twocolumntrue\scr@topnewpage[{#1}]\@at@twocolumnfalse
+}
+\newcommand*{\scr@makechapterhead}[2]{%
+ \use@chapter@o@preamble{#1}%
+ \@nameuse{@@make#1head}{#2}%
+ \use@preamble{#1@u}%
}
-\newcommand*{\@makechapterhead}[1]{%
- \use@chapter@o@preamble
- \@@makechapterhead{#1}%
- \use@preamble{chapter@u}%
+\newcommand*{\scr@makeschapterhead}[2]{%
+ \use@chapter@o@preamble{#1}%
+ \@nameuse{@@makes#1head}{#2}%
+ \use@preamble{#1@u}%
}
-\newcommand*{\@@makechapterhead}[1]{%
- \@tempskipa=\glueexpr \scr@chapter@beforeskip\relax
+\newcommand*{\scr@@makechapterhead}[2]{%
+ \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadstartvskip
{%
\setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
- \normalfont\sectfont\nobreak\nobreak\usefontofkomafont{chapter}%
+ \normalfont\sectfont\nobreak\nobreak
+ \usefontofkomafont{#1}%
\if@mainmatter
- \def\IfUseNumber{\ifnumbered{chapter}}%
+ \def\IfUseNumber{\ifnumbered{#1}}%
\else\let\IfUseNumber\@secondoftwo\fi
\if@chapterprefix
\raggedchapter
@@ -3975,15 +4090,17 @@
\fi
\@tempa{%
\IfUseNumber{%
- \usekomafont{chapter}{%
+ \usekomafont{#1}{%
\IfUsePrefixLine{%
- {\usekomafont{chapterprefix}{%
- \chapterformat
- \setlength{\@tempskipa}{\scr@chapter@innerskip}%
+ {\usekomafont{#1prefix}{%
+ \csname #1format\endcsname
+ \setlength{\@tempskipa}{%
+ \csname scr@#1@innerskip\endcsname
+ }%
\chapterheadmidvskip
}}%
}{%
- \chapterformat
+ \csname #1format\endcsname
}%
}%
}{}%
@@ -3991,19 +4108,79 @@
{%
\IfUsePrefixLine{}{\raggedchapter}%
\interlinepenalty \@M
- \usekomafont{chapter}{#1}\par
+ \usekomafont{#1}{#2}\par
}%
}%
\nobreak\par\nobreak
- \@tempskipa=\glueexpr \scr@chapter@afterskip\relax
+ \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadendvskip
+}
+\newcommand*{\scr@@makeschapterhead}[2]{%
+ \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \chapterheadstartvskip
+ {%
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
+ \normalfont\sectfont\nobreak\nobreak\usekomafont{#1}{}%
+ \raggedchapter \interlinepenalty \@M \usekomafont{#1}{#2}\par
+ }%
+ \nobreak\par\nobreak
+ \@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax
\ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\chapterheadendvskip
}
-\newcommand*{\setchapterpreamble}{\set@preamble{chapter}}
-\newcommand*{\chapter@u@preamble}{}
-\let\chapter@u@preamble\relax
-\newcommand*{\chapter@o@preamble}{}
-\let\chapter@o@preamble\relax
+\newcommand*{\use@chapter@o@preamble}[1]{%
+ {%
+ \settoheight{\@tempdima}{%
+ \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \vbox{\chapterheadstartvskip}%
+ }%
+ \settodepth{\@tempdimb}{%
+ \@tempskipa=\glueexpr \csname scr@#1@beforeskip\endcsname\relax\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
+ \vbox{\chapterheadstartvskip}%
+ }%
+ \addtolength{\@tempdima}{\@tempdimb}%
+ \setbox\z@\vbox{%
+ \use@preamble{#1@o}%
+ }%
+ \setlength{\@tempdimb}{\ht0}%
+ \addtolength{\@tempdimb}{\dp0}%
+ \vbox to \z@{%
+ \vskip-\baselineskip
+ \vbox to \@tempdima{%
+ \vfill
+ \box\z@
+ }%
+ \vss
+ }\vskip-\parskip\vskip-\baselineskip
+ \ifdim \@tempdimb>\@tempdima%
+ \addtolength{\@tempdimb}{-\@tempdima}%
+ \ifdim\@tempdimb<\vfuzz
+ \ClassInfo{\KOMAClassName}{%
+ preamble before #1 is \the\@tempdimb\space to high.\MessageBreak
+ Tolerated without warning because of\MessageBreak
+ \string\vfuzz\space = \the\vfuzz\space >= \the\@tempdimb
+ }%
+ \else
+ \ClassWarning{\KOMAClassName}{%
+ preamble before #1 is \the\@tempdimb\space to high.\MessageBreak
+ To avoid the overfull \string\vbox\space you may
+ change\MessageBreak
+ the `beforeskip' value using
+ \string\RedeclareSectionCommand\MessageBreak
+ at the preamble of your document.\MessageBreak
+ You may also change \string\setchapterpreamble\MessageBreak
+ before the command, which generates the message
+ about\MessageBreak
+ an overfull \string\vbox
+ }%
+ \fi
+ \fi%
+ }%
+}
\newcommand*{\addchaptertocentry}[2]{%
\addtocentrydefault{chapter}{#1}{#2}%
\if@chaptertolists
@@ -4015,84 +4192,24 @@
\@ifundefined{float@addtolists}{}{\scr@float@addtolists@warning}%
\fi
}
-\newcommand*{\@schapter}[1]{%
- \if@twocolumn
- \if@at@twocolumn
- \@makeschapterhead{#1}%
- \else
- \@topnewpage[\@makeschapterhead{#1}]%
- \fi
- \else
- \@makeschapterhead{#1}%
- \@afterheading
- \fi
-}
-\newcommand*{\@@makeschapterhead}[1]{%
- \@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}{}%
- \raggedchapter \interlinepenalty \@M \usekomafont{chapter}{#1}\par
- }%
- \nobreak\par\nobreak
- \@tempskipa=\glueexpr \scr@chapter@afterskip\relax
- \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
- \chapterheadendvskip%
-}
-\newcommand*{\@makeschapterhead}[1]{%
- \use@chapter@o@preamble
- \@@makeschapterhead{#1}%
- \use@preamble{chapter@u}%
-}
\newcommand\addchap{%
- \if@openright\cleardoublepage\else\clearpage\fi
- \thispagestyle{\chapterpagestyle}%
- \global\@topnum\z@
- \@afterindentfalse
- \SecDef\@addchap\@saddchap%
+ \SecDef\@addchap\@saddchap
}%
\newcommand*{\@addchap}{}%
-\def\@addchap[#1]#2{%
- \ifnum \scr@osectarg=\z@
- \@scr@tempswafalse
- \else
- \scr@istest#1=\@nil
- \fi
- \if@scr@tempswa
- \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
- \else
- \ifcase \scr@osectarg\relax
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \fi
- \fi
- \@schapter{#2}%
- \ifx\scr@ds@tocentry\@empty\else
- \addchaptertocentry{}{\scr@ds@tocentry}%
- \fi
- \ifnum \@nameuse{scr@v@2.96}<\scr@compatibility\relax
- \ifdim \@chapterlistsgap>\z@
- \doforeachtocfile{%
- \iftocfeature{\@currext}{chapteratlist}{%
- \addtocontents{\@currext}{\protect\addvspace{\@chapterlistsgap}}%
- }{}%
- }%
- \@ifundefined{float@addtolists}{}{%
- \scr@float@addtolists@warning
- \float@addtolists{\protect\addvspace{\@chapterlistsgap}}%
- }%
- \fi
- \fi
- \expandafter\addchapmark\expandafter{\scr@ds@head}%
+\long\def\@addchap[#1]#2{%
+ \edef\reserved@a{%
+ \unexpanded{%
+ \chapter[{#1}]{#2}%
+ \c@secnumdepth=
+ }\the\c@secnumdepth\relax
+ }%
+ \c@secnumdepth=\numexpr \chapternumdepth-1\relax
+ \reserved@a
+}
+\newcommand{\@saddchap}[1]{%
+ \chapter*{#1}%
+ \addchapmark{}%
}%
-\newcommand*{\@saddchap}[1]{\@schapter{#1}\addchapmark{}}%
\AfterPackage{hyperref}{%
\@ifpackagelater{hyperref}{2001/02/19}{}{%
\ClassWarningNoLine{\KOMAClassName}{%
@@ -4101,11 +4218,6 @@
causing \string\addchap\space to behave strange.\MessageBreak%
Please update hyperref to at least version
6.71b}}}
-\newcommand*{\chaptertocdepth}{\z@}
-\let\chaptertocdepth\z@
-\newcommand*{\scr@chapter@tocindent}{\z@}
-\let\scr@chapter@tocindent\z@
-\newcommand*{\scr@chapter@tocnumwidth}{1.5em}
\newcommand*\l@chapter[2]{%
\ifnum \c@tocdepth <\chaptertocdepth \else
\ifnum \lastpenalty<20010
@@ -4170,10 +4282,13 @@
obligatory instead of an optional argument. Use that\MessageBreak
new command%
}%
- \if@chapterprefix\chapapp#1\fi
+ \chapappifchapterprefix{#1}%
}
\newcommand*{\chapappifchapterprefix}[1]{%
- \if@chapterprefix\chapapp#1\fi
+ \IfChapterUsesPrefixLine{\chapapp#1}{}%
+}
+\newcommand*{\IfChapterUsesPrefixLine}{%
+ \if@chapterprefix\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
}
\newcommand*{\chapapp}{\@chapapp}
\newcommand*\@chapapp{\chaptername}
@@ -4182,7 +4297,7 @@
\begingroup
\expandafter\let\csname if@mainmatter\expandafter\endcsname
\csname iffalse\endcsname
- \c@secnumdepth=\m@ne
+ \c@secnumdepth=\numexpr \chapternumdepth-1\relax
\chaptermark{#1}%
\endgroup
}
@@ -4192,33 +4307,21 @@
\newkomafont{chapterentry}{\usekomafont{disposition}}
\newkomafont{chapterentrypagenumber}{}
\newkomafont{chapterentrydots}{\normalfont}
-\newcommand*\addsec{\SecDef\@addsec\@saddsec}
+\newcommand\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
-\def\@addsec[#1]#2{\section*{#2}%
- \ifnum \scr@osectarg=\z@
- \@scr@tempswafalse
- \else
- \scr@istest#1=\@nil
- \fi
- \if@scr@tempswa
- \setkeys{KOMAarg.section}{tocentry={#2},head={#2},#1}%
- \else
- \ifcase \scr@osectarg\relax
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#2},head={#1}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#2}}%
- \or
- \setkeys{KOMAarg.section}{tocentry={#1},head={#1}}%
- \fi
- \fi
- \ifx\scr@ds@tocentry\@empty\else
- \addsectiontocentry{}{\scr@ds@tocentry}%
- \fi
- \expandafter\addsecmark\expandafter{\scr@ds@head}%
+\def\@addsec[#1]#2{%
+ \edef\reserved@a{%
+ \unexpanded{%
+ \section[{#1}]{#2}%
+ \c@secnumdepth=
+ }\the\c@secnumdepth\relax
+ }%
+ \c@secnumdepth=\numexpr \sectionnumdepth-1\relax
+ \reserved@a
+}
+\newcommand*{\@saddsec}[1]{%
+ \section*{#1}\addsecmark{}%
}
-\newcommand*{\@saddsec}[1]{\section*{#1}\addsecmark{}}
\newkomafont{minisec}{}
\newcommand\minisec[1]{%
\expandafter\ifnum\scr@v@is@lt{3.13a}\relax
@@ -4290,7 +4393,7 @@
}
\newcommand*\addsecmark[1]{%
\begingroup
- \c@secnumdepth=\m@ne
+ \c@secnumdepth=\numexpr \sectionnumdepth-1\relax
\sectionmark{#1}%
\endgroup
}
@@ -4300,6 +4403,21 @@
\newcommand*{\scr@fnt@paragraph}{\size@paragraph}
\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
\DeclareSectionCommand[%
+ style=part,%
+ level=\m@ne,%
+ pagestyle=plain,%
+ toclevel=\m@ne,%
+ tocindent=\z@,%
+ tocnumwidth=2em
+]{part}
+\DeclareSectionCommand[%
+ style=chapter,%
+ level=\z@,%
+ pagestyle=plain,%
+ tocindent=\z@,%
+ tocnumwidth=1.5em
+]{chapter}
+\DeclareSectionCommand[%
style=section,%
level=1,%
indent=\z@,%
@@ -4532,7 +4650,7 @@
\let\scr@ttl@@extract\relax
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2019 2015-03-20 08:35:36Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -4629,8 +4747,6 @@
\renewcommand*{\sectionmark}[1]{}%
}
\newcommand*{\titlepagestyle}{plain}
-\newcommand*{\partpagestyle}{plain}
-\newcommand*{\chapterpagestyle}{plain}
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
@@ -5328,7 +5444,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -5466,7 +5582,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 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax
@@ -5551,7 +5667,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2001 2015-03-12 11:29:57Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -5560,7 +5676,19 @@
\twocolumn[%
\@chaptertolistsfalse
\idx@@heading{\indexname}]%
- \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
+ \ifidx@leveldown
+ \scr@ifundefinedorrelax{@mkright}{%
+ \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\indexname}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{\indexname}}%
+ }%
+ \else
+ \scr@ifundefinedorrelax{@mkdouble}{%
+ \@mkboth{\MakeMarkcase{\indexname}}{\MakeMarkcase{\indexname}}%
+ }{%
+ \@mkdouble{\MakeMarkcase{\indexname}}%
+ }%
+ \fi
}
\newenvironment{theindex}{%
\if@twocolumn