diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx index 5d073d94f24..5a8ba646219 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx @@ -1,8 +1,8 @@ -% \CheckSum{3309} +% \CheckSum{3337} % \iffalse meta-comment % ====================================================================== % scrkernel-sections.dtx -% Copyright (c) Markus Kohm, 2002-2014 +% Copyright (c) Markus Kohm, 2002-2015 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -20,7 +20,7 @@ % This work consists of all files listed in manifest.txt. % ---------------------------------------------------------------------- % scrkernel-sections.dtx -% Copyright (c) Markus Kohm, 2002-2014 +% Copyright (c) Markus Kohm, 2002-2015 % % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz, % Version 1.3c, verteilt und/oder veraendert werden. @@ -55,15 +55,15 @@ % Right brace \} Tilde \~} % % \iffalse -%%% 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 $ %<*driver> % \fi \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2014-12-23 18:19:04 +0100 (Tue, 23 Dec 2014) $ + \filedate$Date: 2015-02-02 11:25:23 +0100 (Mon, 02 Feb 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 1891 $ + \filerevision$Revision: 1919 $ \endgroup \ProvidesFile{scrkernel-sections.dtx}[\filedate\space\filerevision\space KOMA-Script (disposition)] @@ -1033,7 +1033,8 @@ % \begin{macrocode} \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% }% }{% @@ -1088,10 +1089,11 @@ % bei \KOMAScript{} außerdem eine Formatierung des Zählers benötigt. Falls % \textsf{scrlayer} geladen ist, wird das über dessen Befehl % |\DeclareSectionNumberDepth| erledigt, sonst direkt: +% \changes{v3.15a}{2015/01/21}{fix: \cs{endskip} statt \cs{enskip}}^^A % \begin{macrocode} \@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 @@ -2100,6 +2102,8 @@ % \changes{v2.95a}{2006/07/10}{support of preamble added}^^A % \changes{v3.11b}{2012/07/29}{missing negativ \cs{vskip} added}^^A % \changes{v3.13a}{2014/09/11}{Verwendung von \cs{SecDef}}^^A +% \changes{v3.15a}{2015/01/22}{Anpassung an geänderte Abstandsbehandlung bei +% \cs{part} und \cs{@spart}}^^A % \begin{macro}{\@addpart} % \changes{v2.8c}{2001/06/29}{neu (intern)}^^A % \changes{v2.8l}{2001/08/17}{erst eintragen, dann ausgeben}^^A @@ -2128,6 +2132,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% @@ -2598,6 +2604,8 @@ % \end{macro}^^A \if@at@twocolumn % \begin{macro}{\use@chapter@o@preamble} % \changes{v3.15}{2014/12/08}{Anpassung an geänderte Abstandsbehandlung}^^A +% \changes{v3.15a}{2015/02/02}{Korrektur, zur Verhinderung falscher +% \texttt{overfull \cs{vbox}} Meldungen}^^A % Das Makro wird benötigt, weil das Setzen der oberen Präambel etwas % mehr Aufwand bedeutet. Die Anweisung spart Platz, da sie zweimal % verwendet wird. @@ -2616,21 +2624,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 @@ -2643,9 +2658,10 @@ before the command, which generates the message about\MessageBreak an overfull \string\vbox - }% + }% + \fi \fi% - } + }% } % \end{macrocode} % \end{macro}^^A \use@chapter@o@preamble |