summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
committerKarl Berry <karl@freefriends.org>2014-12-06 23:18:10 +0000
commit4832d732052d6e2b43b5e3ff45aa31bfbc0cbdc2 (patch)
tree968a3b4cdf4631c0272fc725330ea28a554c8471 /Master/texmf-dist/tex/latex/koma-script/scrbook.cls
parent59d9a998c6236de39603cb2ea077c5371e06b842 (diff)
koma-script (6dec14)
git-svn-id: svn://tug.org/texlive/trunk@35754 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.cls346
1 files changed, 271 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 010e693f9c2..dac9d2fd0a2 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -40,7 +40,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2013 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2014 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -72,7 +72,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 1560 2013-12-19 07:13:30Z mjk $
+%%% From File: $Id: scrkernel-version.dtx 1815 2014-10-28 10:15:59Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -94,7 +94,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2013/12/19 v3.12 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -103,21 +103,21 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 1502 2013-11-06 11:00:12Z mjk $
+%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 1533 2013-12-10 18:06:14Z mjk $
+%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
\RequirePackage{tocbasic}[%
- 2013/12/19 v3.12 KOMA-Script
+ 2014/10/28 v3.14 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-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -220,8 +220,11 @@
\@namedef{scr@v@3.11a}{10}
\@namedef{scr@v@3.11b}{10}
\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@last}{11}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+\@namedef{scr@v@3.13}{12}
+\@namedef{scr@v@3.13a}{13}
+\@namedef{scr@v@3.14}{13}
+\@namedef{scr@v@last}{14}
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -236,7 +239,7 @@
{final}{draft=false}
\DeclareOption{leqno}{\input{leqno.clo}}
\DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\@ptsize{%
11%
@@ -301,7 +304,7 @@
}%
\FamilyKeyStateProcessed
}
-%%% From File: $Id: scrkernel-typearea.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -361,17 +364,19 @@
}
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{oneside}{twoside=false}
\KOMA@key{twocolumn}[true]{%
\if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi%
+ \FamilyKeyStateProcessed
}
\KOMA@DeclareStandardOption%
{onecolumn}{twocolumn=false}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
\edef\f@parskip{\the\parskip}%
@@ -504,7 +509,7 @@
\KOMA@DeclareDeprecatedOption{halfparskip+}{parskip=half+}
\KOMA@DeclareDeprecatedOption{halfparskip*}{parskip=half*}
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newif\if@titlepage
\@titlepagetrue
\newif\if@titlepageiscoverpage
@@ -523,7 +528,7 @@
}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newif\if@openright
\@openrighttrue
\KOMA@key{open}{%
@@ -547,7 +552,6 @@
}
\KOMA@DeclareStandardOption{openright}{open=right}
\KOMA@DeclareStandardOption{openany}{open=any}
-%% \fi
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
change of end dot feature after \string\begin{document}%
@@ -738,7 +742,7 @@
\newcommand*{\scr@activate@xsection}[1]{%
\renewcommand*{\scr@osectarg}{#1}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newif\if@hsl
\KOMA@key{headsepline}[true]{%
\KOMA@set@ifkey{headsepline}{@hsl}{#1}%
@@ -756,9 +760,9 @@
\KOMA@set@ifkey{footsepline}{@fsl}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\@ifundefined{typearea}{%
- \PassOptionsToPackage{typearea}{headinclude=#1}%
+ \PassOptionsToPackage{typearea}{footinclude=#1}%
}{%
- \KOMAoptions{footinclude=#1,DIV=current}%
+ \KOMAoptions{footinclude=#1}%
}%
\fi
}
@@ -769,7 +773,7 @@
\def\@tempc{%
\endgroup%
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
- 'current' or any defined pagestyle e.g. 'empty','plain'}%
+ 'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
\ifstr{#1}{current}{%
\def\@tempc{\endgroup%
@@ -786,7 +790,20 @@
\def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
\FamilyKeyStateProcessed
}%
- }{}%
+ }{%
+ \ifx\@currname\KOMAClassName
+ \ifx\@currext\@clsextension
+ \ifstr{#1}{headings}{%
+ \def\@tempc{\endgroup%
+ \def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
+ \def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
+ \def\cleardoubleevenpage{\cleardoubleevenpageusingstyle{#1}}%
+ \FamilyKeyStateProcessed
+ }%
+ }{}%
+ \fi
+ \fi
+ }%
}%
\@tempc
}
@@ -940,7 +957,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -960,21 +977,21 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\ifcase \@tempa\relax
- \KOMAExecuteOptions{index=notoc}%
+ \KOMAoptions{index=notoc}%
\or
- \KOMAExecuteOptions{index=totoc}%
+ \KOMAoptions{index=totoc}%
\or
- \KOMAExecuteOptions{listof=notoc}%
+ \KOMAoptions{listof=notoc}%
\or
- \KOMAExecuteOptions{listof=totoc}%
+ \KOMAoptions{listof=totoc}%
\or
- \KOMAExecuteOptions{listof=numbered}%
+ \KOMAoptions{listof=numbered}%
\or
- \KOMAExecuteOptions{bibliography=nottotoc}%
+ \KOMAoptions{bibliography=nottotoc}%
\or
- \KOMAExecuteOptions{bibliography=totoc}%
+ \KOMAoptions{bibliography=totoc}%
\or
- \KOMAExecuteOptions{bibliography=totocnumbered}%
+ \KOMAoptions{bibliography=totocnumbered}%
\or
\@toclefttrue
\or
@@ -1092,13 +1109,13 @@
\unsettoc{\@currext}{numberline}%
}
\or% chapterentry
- \KOMAExecuteOptions{chapteratlists=entry}%
+ \KOMAoptions{chapteratlists=entry}%
\or% chaptergap
- \KOMAExecuteOptions{chapteratlists=\z@}%
+ \KOMAoptions{chapteratlists=\z@}%
\or% chaptergapsmall
- \KOMAExecuteOptions{chapteratlists=10\p@}%
+ \KOMAoptions{chapteratlists=10\p@}%
\or% chaptergapline
- \KOMAExecuteOptions{chapteratlists=\baselineskip}%
+ \KOMAoptions{chapteratlists=\baselineskip}%
\fi
\fi
}
@@ -1114,9 +1131,10 @@
}{%
\@chaptertolistsfalse\renewcommand*{\@chapterlistsgap}{#1}%
}%
+ \FamilyKeyStateProcessed
}
\BeforeTOCHead{\@chaptertolistsfalse}
-%%% From File: $Id: scrkernel-bibliography.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
\scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1171,7 +1189,7 @@
\newcommand*\bib@heading{%
\ifbib@leveldown
\section*{\bibname}%
- \ifx\@mkboth\@gobble\else\markright{\MakeMarkcase{\bibname}}\fi
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{\bibname}}\fi
\else
\chapter*{\bibname}%
\@mkboth{\MakeMarkcase{\bibname}}{\MakeMarkcase{\bibname}}%
@@ -1261,13 +1279,13 @@
}
\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 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-compatibility.dtx 1814 2014-10-28 10:06:00Z kohm $
%%% From File: $Id: scrkernel-fonts.dtx 1483 2013-10-31 15:12:30Z mjk $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -1702,12 +1720,12 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 1503 2013-11-06 11:44:59Z mjk $
+%%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z 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 1512 2013-11-11 10:35:04Z mjk $
+%%% From File: $Id: scrkernel-typearea.dtx 1770 2014-06-30 06:48:19Z kohm $
\let\@BCOR =\relax
\let\@@BCOR =\relax
\let\@DIV =\relax
@@ -1751,7 +1769,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-paragraphs.dtx 1767 2014-06-26 09:20:18Z kohm $
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
\setlength{\columnsep}{10\p@}
@@ -1879,7 +1897,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 1517 2013-11-21 13:02:39Z mjk $
+%%% From File: $Id: scrkernel-title.dtx 1675 2014-02-03 07:37:48Z mjk $
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
#1%
@@ -2052,12 +2070,14 @@
\let\titlepage@restore\relax
\renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
\let\@oldmakefnmark\@makefnmark
- \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}
+ \renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
\next@tdpage
\if@twocolumn
\ifnum \col@number=\@ne
- \@makeextratitle
- \next@tdpage
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle
+ \next@tdpage
+ \fi
\@maketitle
\else
\ifx\@extratitle\@empty\else
@@ -2066,7 +2086,9 @@
\twocolumn[\@maketitle]%
\fi
\else
- \@makeextratitle
+ \ifx\@extratitle\@empty\else
+ \@makeextratitle\next@tdpage
+ \fi
\@maketitle
\fi
\thispagestyle{\titlepagestyle}\@thanks
@@ -2103,13 +2125,11 @@
\global\let\and\relax
}%
\newcommand*{\@makeextratitle}{%
- \next@tdpage
\ifx\@extratitle\@empty \else
- \noindent\@extratitle \next@tdpage
+ \noindent\@extratitle\par
\fi
}
\newcommand*{\@maketitle}{%
- \next@tdpage
\global\@topnum=\z@
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\ifx\@titlehead\@empty \else
@@ -2182,7 +2202,7 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1552 2013-12-16 16:51:32Z mjk $
+%%% From File: $Id: scrkernel-sections.dtx 1788 2014-09-11 13:41:04Z kohm $
\newif\if@mainmatter\@mainmattertrue
\newcommand*\frontmatter{%
\if@twoside\cleardoubleoddpage\else\clearpage\fi
@@ -2240,6 +2260,101 @@
\fi
\@@maybeautodot
}
+\newcommand*{\scr@saved@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace\@tempskipa
+ \fi
+ \@ifstar
+ {\@ssect{#3}{#4}{#5}{#6}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}%
+}
+\ifx\@startsection\scr@saved@startsection
+ \newcommand*{\scr@startsection}[6]{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \@afterindenttrue
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \csname scr@startsection@hook\endcsname
+ \if@nobreak
+ \everypar{}%
+ \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}}}%
+ }
+\else
+ \ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
+ changed.\MessageBreak
+ \KOMAClassName\space needs it's own Definition of
+ `\string\@startsection'\MessageBreak
+ to provide extended features for the optional argument\MessageBreak
+ of `\string\section` etc.\MessageBreak
+ Generally it defines `\string\@startsection` completely new\MessageBreak
+ to achieve this. Because of the unexpected definition\MessageBreak
+ an alternative approach will be used.\MessageBreak
+ If this fails and if there isn't a new release of\MessageBreak
+ KOMA-Scriptt that fixes the problem, please\MessageBreak
+ send a report to the KOMA-Script author.\MessageBreak
+ Note, that this alternative approach does not\MessageBreak
+ execute `\string\scr@startsection@hook', \MessageBreak
+ `\string\scr@preto@ssect@hook', or `\string\scr@preto@sect@hook'%
+ }%
+ \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}}}%
+ }
+\fi
+\newcommand*{\At@startsection}[1]{%
+ \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
+ \l@addto@macro{\scr@startsection@hook}{#1}%
+}
+\newcommand*{\Before@ssect}[1]{%
+ \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+}
+\newcommand*{\Before@sect}[1]{%
+ \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
+ \l@addto@macro{\scr@preto@sect@hook}{#1}%
+}
+\newcommand{\scr@section@dblarg}[1]{%
+ \kernel@ifnextchar[%]
+ {#1}%
+ {\scr@section@xdblarg{#1}}%
+}
+\newcommand{\scr@section@xdblarg}[2]{%
+ \begingroup
+ \edef\reserved@a{%
+ \unexpanded{\endgroup\let\scr@osectarg\z@#1[{#2}]{#2}\def\scr@osectarg}%
+ {\scr@osectarg}}%
+ \reserved@a
+}
+\renewcommand*{\@startsection}{%
+ \ifnum \scr@osectarg=\z@
+ \expandafter\scr@saved@startsection
+ \else
+ \expandafter\scr@startsection
+ \fi
+}
+\newcommand*{\SecDef}[2]{\@ifstar{#2}{\scr@section@dblarg{#1}}}
+\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
+\let\secdef\SecDef
\def\@tempa#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
@@ -2486,7 +2601,7 @@
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
- \secdef\@part\@spart
+ \SecDef\@part\@spart
}
\newcommand*{\@part}{}
\def\@part[#1]#2{%
@@ -2569,7 +2684,7 @@
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
- \secdef\@addpart\@saddpart
+ \SecDef\@addpart\@saddpart
}
\newcommand*{\@addpart}{}
\def\@addpart[#1]#2{%
@@ -2647,7 +2762,7 @@
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter
+ \SecDef\@chapter\@schapter
}
\newcommand*{\@chapter}{}
\def\@chapter[#1]#2{%
@@ -2782,7 +2897,7 @@
\thispagestyle{\chapterpagestyle}%
\global\@topnum\z@
\@afterindentfalse
- \secdef\@addchap\@saddchap%
+ \SecDef\@addchap\@saddchap%
}%
\newcommand*{\@addchap}{}%
\def\@addchap[#1]#2{%
@@ -2832,7 +2947,7 @@
causing \string\addchap\space to behave strange.\MessageBreak%
Please update hyperref to at least version
6.71b}}}
-\newcommand*\addsec{\secdef\@addsec\@saddsec}
+\newcommand*\addsec{\SecDef\@addsec\@saddsec}
\newcommand*{\@addsec}{}
\def\@addsec[#1]#2{\section*{#2}%
\ifnum \scr@osectarg=\z@
@@ -2872,7 +2987,7 @@
\addtocentrydefault{subparagraph}{#1}{#2}%
}
\newcommand\section{%
- \@startsection{section}{\sectionnumdepth}{\z@}%
+ \scr@startsection{section}{\sectionnumdepth}{\z@}%
{-3.5ex \@plus -1ex \@minus -.2ex}%
{2.3ex \@plus.2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2880,7 +2995,7 @@
\raggedsection\normalfont\sectfont\nobreak\size@section}%
}
\newcommand\subsection{%
- \@startsection{subsection}{\subsectionnumdepth}{\z@}%
+ \scr@startsection{subsection}{\subsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2889,7 +3004,7 @@
}%
}
\newcommand\subsubsection{%
- \@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
+ \scr@startsection{subsubsection}{\subsubsectionnumdepth}{\z@}%
{-3.25ex\@plus -1ex \@minus -.2ex}%
{1.5ex \@plus .2ex}%
{\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
@@ -2898,19 +3013,31 @@
}%
}
\newcommand\paragraph{%
- \@startsection{paragraph}{\paragraphnumdepth}{\z@}%
+ \scr@startsection{paragraph}{\paragraphnumdepth}{\z@}%
{3.25ex \@plus1ex \@minus.2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@paragraph}%
}
\newcommand\subparagraph{%
- \@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
+ \scr@startsection{subparagraph}{\subparagraphnumdepth}{\parindent}%
{3.25ex \@plus1ex \@minus .2ex}%
{-1em}%
{\raggedsection\normalfont\sectfont\nobreak\size@subparagraph}%
}
\newkomafont{minisec}{}
-\newcommand\minisec[1]{\@afterindentfalse \vskip 1.5ex
+\newcommand\minisec[1]{%
+ \ifnum \scr@compatibility<\@nameuse{scr@v@3.13a}\relax
+ \@afterindentfalse \vskip 1.5ex
+ \else
+ \if@noskipsec \leavevmode \fi
+ \par
+ \@afterindentfalse
+ \if@nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty\addvspace{1.5ex}%
+ \fi
+ \fi
{\parindent \z@
\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
\setlength{\parfillskip}{\z@ plus 1fil}\fi
@@ -2972,7 +3099,7 @@
\set@preamble@vpos{0}{#2}%
\fi%
\if \@tempa b%
- \set@preamble@vpox{0}{#2}%
+ \set@preamble@vpos{0}{#2}%
\fi
\if \@tempa o%
\set@preamble@vpos{1}{#2}%
@@ -3051,10 +3178,10 @@
\newcommand*{\chapter@o@preamble}{}
\let\chapter@o@preamble\relax
\newcommand*{\setpartpreamble}{\set@preamble{part}}
-\newcommand*{\part@preamble@u}{}
-\let\part@preamble@u\relax
-\newcommand*{\part@preamble@o}{}
-\let\part@preamble@o\relax
+\newcommand*{\part@u@preamble}{}
+\let\part@u@preamble\relax
+\newcommand*{\part@o@preamble}{}
+\let\part@o@preamble\relax
\newcommand*\l@part[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
@@ -3143,7 +3270,7 @@
\@dottedtocline{#1}{#2}{#3}{#4}{#5}%
\fi
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1529 2013-12-03 07:36:57Z mjk $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3250,7 +3377,75 @@
the extended optional argument of the section\MessageBreak
commands
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 1551 2013-12-16 14:02:13Z mjk $
+\BeforePackage{titlesec}{%
+ \let\scr@ttl@saved@section\section
+ \let\scr@ttl@saved@subsection\subsection
+ \let\scr@ttl@saved@subsubsection\subsubsection
+ \let\scr@ttl@saved@paragraph\paragraph
+ \let\scr@ttl@saved@subparagraph\subparagraph
+}
+\AfterPackage{titlesec}{%
+ \@ifpackagelater{titlesec}{2014/10/09}{%
+ \ClassInfo{\KOMAClassName}{%
+ Deactivating the `titlesec` workaround,\MessageBreak
+ because package is newer than expected%
+ }%
+ }{%
+ \PackageWarning{\KOMAClassName}{%
+ Activating an ugly workaround for a missing\MessageBreak
+ feature of package `titlesec`%
+ }%
+ \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
+ \@tempskipa=#5
+ \@tempskipb=#6
+ \ifdim\@tempskipa<\z@
+ \toks@{\titlespacing*#8{#4}}%
+ \@tempskipa-\@tempskipa
+ \else
+ \toks@{\titlespacing#8{#4}}%
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
+ \ifdim\@tempskipb<\z@
+ \if@tempswa
+ \titleformat#8[runin]%
+ {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8[runin]%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@tempskipb-\@tempskipb
+ \else
+ \if@tempswa
+ \titleformat#8%
+ {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \else
+ \titleformat#8%
+ {#7}{\@seccntformat{#2}}%
+ {\z@}\ttl@passexplicit
+ \fi
+ \@ifundefined{ttl@space}{}{%
+ \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
+ \fi
+ \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
+ \ttl@a}%
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
+ \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
+ \let\scr@ttl@saved@section\relax
+ \let\scr@ttl@saved@subsection\relax
+ \let\scr@ttl@saved@subsubsection\relax
+ \let\scr@ttl@saved@paragraph\relax
+ \let\scr@ttl@saved@subparagraph\relax
+ \let\scr@ttl@@extract\relax
+ }%
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 1774 2014-07-07 07:15:22Z kohm $
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
\if@mincl
@@ -3268,10 +3463,11 @@
\newcommand*{\scr@fnt@pagefoot}{\footfont}
\newcommand*{\scr@fnt@wrn@pagefoot}[1]{%
This class does not use font element `pagefoot'!\MessageBreak
- Maybe you should load package `scrpage2', before\MessageBreak
- using this element%
+ 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}{}%
@@ -4055,7 +4251,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 1522 2013-11-22 08:11:42Z mjk $
+%%% From File: $Id: scrkernel-listsof.dtx 1720 2014-03-05 08:03:10Z kohm $
\doforeachtocfile[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
@@ -4155,7 +4351,7 @@
\string\float@listhead\space detected!\MessageBreak
Implementation of \string\float@listhead\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Maybe implementation of \string\float@listhead\space will\MessageBreak
be removed from KOMA-Script soon.\MessageBreak
@@ -4170,7 +4366,7 @@
\string\float@addtolists\space detected!\MessageBreak
Implementation of \string\float@addtolist\space became\MessageBreak
deprecated in KOMA-Script v3.01 2008/11/14 and\MessageBreak
- has been replaced by more several more flexible\MessageBreak
+ has been replaced by several more flexible\MessageBreak
features of package `tocbasic`.\MessageBreak
Since Version 3.12 support for deprecated\MessageBreak
\string\float@addtolist\space interface has been\MessageBreak
@@ -4193,7 +4389,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 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrkernel-bibliography.dtx 1804 2014-10-10 06:44:55Z kohm $
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
\let\bibpreamble\relax