diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrreprt.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrreprt.cls | 102 |
1 files changed, 67 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls index 759238d20b5..42fc0931d5f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls @@ -6,7 +6,7 @@ %% %% scrkvers.dtx (with options: `class,report') %% scrkbase.dtx (with options: `load') -%% tocbasic.dtx (with options: `load,chapter') +%% tocbasic.dtx (with options: `class,load,chapter') %% scrkcomp.dtx (with options: `class,report,option') %% scrkmisc.dtx (with options: `class,report,option') %% scrklang.dtx (with options: `class,report,option') @@ -40,7 +40,7 @@ %% scrklist.dtx (with options: `class,report,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2010 +%% Copyright (c) 1994-2011 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -95,7 +95,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2010/09/17 v3.07 KOMA-Script}% + \@CheckKOMAScriptVersion{2011/01/25 v3.08 KOMA-Script}% \endgroup \newcommand*{\KOMAClassName}{% scrreprt% @@ -109,7 +109,7 @@ %%% From File: scrkbase.dtx \RequirePackage{scrkbase}[\KOMAScriptVersion] %%% From File: tocbasic.dtx -\def\tocbasicversion{2010/09/14 v3.06a} +\def\tocbasicversion{2010/10/01 v3.07a} \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]} \@tempa \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}% @@ -182,6 +182,7 @@ \@namedef{scr@v@3.05a}{10} \@namedef{scr@v@3.06}{10} \@namedef{scr@v@3.07}{10} +\@namedef{scr@v@3.08}{10} \@namedef{scr@v@last}{10} %%% From File: scrkmisc.dtx \KOMA@key{draft}[true]{% @@ -343,54 +344,68 @@ \KOMA@key{parskip}[true]{% \begingroup \KOMA@set@ncmdkey{parskip}{@tempa}{% - {false}{0},{off}{0},{no}{0},% - {full-}{1},% - {half-}{2},% - {full}{3},{true}{3},{on}{3},{yes}{3},% - {half}{4},% - {full+}{5},% - {half+}{6},% - {full*}{7},% - {half*}{8},% - {relative}{9},% - {absolute}{10},% + {never}{0},% + {false}{1},{off}{1},{no}{1},% + {full-}{2},% + {half-}{3},% + {full}{4},{true}{4},{on}{4},{yes}{4},% + {half}{5},% + {full+}{6},% + {half+}{7},% + {full*}{8},% + {half*}{9},% + {relative}{10},% + {absolute}{11}% }{#1}% \ifcase\number\@tempa% 0 \endgroup - \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \setparsizes{1em}{\z@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi \or% 1 \endgroup + \setparsizes{1em}{\z@ \@plus \p@}{\z@ \@plus 1fil}% + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 2 + \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% \z@ \@plus 1fil}% - \or% 2 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 3 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% \z@ \@plus 1fil}% - \or%3 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 4 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% 1em \@plus 1fil}% - \or%4 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 5 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% 1em \@plus 1fil}% - \or%5 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 6 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .3333\linewidth\@plus 1fil}% - \or%6 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 7 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .3333\linewidth \@plus 1fil}% - \or%7 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 8 \endgroup \setparsizes{\z@}{\baselineskip \@plus .1\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%8 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 9 \endgroup \setparsizes{\z@}{.5\baselineskip \@plus .5\baselineskip}{% .25\linewidth \@plus 1fil}% - \or%9 + \if@atdocument\AfterKOMAoptions{\selectfont}\fi + \or% 10 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -403,7 +418,7 @@ \fi \let\default@par@update=\par@updaterelative }% - \or%10 + \or%11 \endgroup \ifx\par@updaterelative\undefined \expandafter\AtEndOfClass @@ -1816,9 +1831,9 @@ \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% \@maybeautodot\thepart% - \addcontentsline{toc}{part}{\protect\numberline{\thepart}#1}% + \addparttocentry{\thepart}{#1}% \else - \addcontentsline{toc}{part}{#1}% + \addparttocentry{}{#1}% \fi \begingroup \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative @@ -1851,6 +1866,9 @@ \twocolumn \fi } +\newcommand*{\addparttocentry}[2]{% + \addtocentrydefault{part}{#1}{#2}% +} \newcommand\addpart{% \if@openright\cleardoublepage\else\clearpage\fi \thispagestyle{\partpagestyle}% @@ -1867,7 +1885,8 @@ \newcommand*{\@addpart}{} \def\@addpart[#1]#2{% \csname phantomsection\endcsname - \addcontentsline{toc}{part}{#1}\@spart{#2}% + \addparttocentry{}{#1}% + \@spart{#2}% \ifx\partmark\@gobble\else\@mkboth{#1}{}\fi } \newcommand*{\@saddpart}{\@spart} @@ -1920,7 +1939,7 @@ \refstepcounter{chapter}% \@maybeautodot\thechapter \typeout{\@chapapp\space\thechapter.}% - \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}% + \addchaptertocentry{\thechapter}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -1944,7 +1963,7 @@ }% \fi \else - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -2017,6 +2036,9 @@ {\raggedsection \interlinepenalty \@M \size@chapter{#1}\par}}% \nobreak\chapterheadendvskip } +\newcommand*{\addchaptertocentry}[2]{% + \addtocentrydefault{chapter}{#1}{#2}% +} \newcommand*{\@schapter}[1]{% \if@twocolumn \if@at@twocolumn @@ -2049,7 +2071,7 @@ }% \newcommand*{\@addchap}{}% \def\@addchap[#1]#2{\@schapter{#2}% - \addcontentsline{toc}{chapter}{#1}% + \addchaptertocentry{}{#1}% \if@chaptertolists \doforeachtocfile{% \iftocfeature{\@currext}{chapteratlist}{% @@ -2591,11 +2613,14 @@ \def\scap@caption{% \if c\scap@valign \setlength{\abovecaptionskip}{\z@}% - \setlength{\belowcaptionskip}{\z@}% - \else - \setlength{\abovecaptionskip}{-\ht\strutbox}% - \setlength{\belowcaptionskip}{-\dp\strutbox}% + \else \if t\scap@valign + \setlength{\abovecaptionskip}{-\ht\strutbox}% + \else \if b\scap@valign + \setlength{\abovecaptionskip}{\z@}% + \fi + \fi \fi + \setlength{\belowcaptionskip}{-\dp\strutbox}% \captionbelow[{#1}]{#2}% }% \begin{lrbox}{\c@pti@nb@sid@b@x}% @@ -3267,6 +3292,13 @@ \newcommand*{\tableofcontents}{% \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup } +\newcommand{\addtocentrydefault}[3]{% + \ifstr{#2}{}{% + \addcontentsline{toc}{#1}{#3}% + }{% + \addcontentsline{toc}{#1}{\protect\numberline{#2}#3}% + }% +} \newcommand*{\float@listhead}[1]{% \scr@float@listhead@warning \float@@listhead{#1}% |