summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-13 00:21:45 +0000
committerKarl Berry <karl@freefriends.org>2015-02-13 00:21:45 +0000
commitf9d097817e93c3e392c2ee3656f7df3d38693c5a (patch)
treefb21090fdab7cb522e03f8c1170eb321c730859b /Master/texmf-dist/tex/latex/koma-script/scrbook.cls
parente70151a9037e528a4aa4ccf9c86868fe745d726f (diff)
koma-script (12feb15)
git-svn-id: svn://tug.org/texlive/trunk@36264 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.cls59
1 files changed, 36 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 448dba47626..a53ff0c3649 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 1900 2015-01-14 07:16:26Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 1926 2015-02-07 13:38:11Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2015/02/07 v3.16 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrbook%
@@ -104,21 +104,21 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2015/01/14 v3.15 KOMA-Script
+ 2015/02/07 v3.16 KOMA-Script
document class (\ClassName)%
]
%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
\RequirePackage{tocbasic}[%
- 2015/01/14 v3.15 KOMA-Script
+ 2015/02/07 v3.16 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 1891 2014-12-23 17:19:04Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
\newif\if@openright
\@openrighttrue
\newcommand*{\scr@dotchangeatdocument}[1]{%
@@ -167,7 +167,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 1929 2015-02-07 14:32:58Z kohm $
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
\let\scr@emulatestandardclassesfalse\relax
@@ -274,8 +274,9 @@
\@namedef{scr@v@3.13a}{13}
\@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 1803 2014-10-09 08:18:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -579,7 +580,7 @@
}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
{any}{0},%
@@ -1317,13 +1318,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 1803 2014-10-09 08:18:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 1870 2014-12-10 09:04:55Z kohm $
+%%% 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 $
\newcommand*\scr@setlength[4]{%
\ifnum\scr@compatibility<\@nameuse{scr@v@3.12}\relax
@@ -2240,7 +2241,7 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 1891 2014-12-23 17:19:04Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 1919 2015-02-02 10:25:23Z kohm $
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
\scr@ifundefinedorrelax{#1numdepth}{%
@@ -2635,7 +2636,8 @@
}{}%
\ifstr{\csname scr@#2@style\endcsname}{}{%
\ClassInfo{\KOMAClassName}{%
- not defining `\string\csname #2\endcsname' due to\MessageBreak
+ not defining `\expandafter\string\csname #2\endcsname' due
+ to\MessageBreak
empty section style%
}%
}{%
@@ -2683,7 +2685,7 @@
}%
\@ifundefined{DeclareSectionNumberDepth}{%
\@ifundefined{#2markformat}{%
- \@namedef{#2markformat}{\csname the#2\endcsname\autodot\endskip}%
+ \@namedef{#2markformat}{\csname the#2\endcsname\autodot\enskip}%
}{}%
\@ifundefined{#2mark}{%
\expandafter\let\csname #2mark\endcsname\@gobble
@@ -3150,6 +3152,8 @@
\else
\@tempswafalse
\fi
+ \@tempskipa=\glueexpr\scr@part@sectionbeforeskip\relax
+ \ifdim\@tempskipa<\z@\@tempskipa-\@tempskipa\fi
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{part@o}\strut\par}%
\vskip-\baselineskip\nobreak%
@@ -3255,21 +3259,28 @@
}%
\addtolength{\@tempdima}{\@tempdimb}%
\setbox0\vbox{%
- \vskip-\ht\strutbox
\use@preamble{chapter@o}%
- \vskip\baselineskip
}%
\setlength{\@tempdimb}{\ht0}%
\addtolength{\@tempdimb}{\dp0}%
\vbox to \z@{%
+ \vskip-\baselineskip
\vbox to \@tempdima{%
\vfill
- \unvbox0
+ \box0
}%
\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
@@ -3282,9 +3293,10 @@
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}%
@@ -3750,7 +3762,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 1803 2014-10-09 08:18:02Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 1906 2015-01-21 07:26:50Z kohm $
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
\begingroup
@@ -3839,7 +3851,7 @@
package `#1'%
}%
}%
-}
+}%
\scr@package@not@recommended{emptypage}{%
option\MessageBreak
`cleardoublepage' with one of it's\MessageBreak
@@ -3849,14 +3861,15 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{fancyhdr}{%
\MessageBreak
- package `scrpage2' or `scrlayer-scrpage'}
+ package `scrlayer-scrpage'}
\scr@package@not@recommended{titlesec}{%
the package only\MessageBreak
if you really need it, because it breaks several\MessageBreak
KOMA-Script features, i.e., option `headings' and\MessageBreak
the extended optional argument of the section\MessageBreak
- commands
-}
+ commands}
+\scr@package@not@recommended{titleps}{%
+ package `scrlayer-scrpage`}
\BeforePackage{titlesec}{%
\let\scr@ttl@saved@section\section
\let\scr@ttl@saved@subsection\subsection