summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrreprt.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls236
1 files changed, 113 insertions, 123 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index f3caa549ba5..07384c5c051 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2010/06/17 v3.06 KOMA-Script}%
\endgroup
\newcommand*{\KOMAClassName}{%
scrreprt%
@@ -109,7 +109,7 @@
%%% From File: scrkbase.dtx
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2010/01/05 v3.04b}
+\def\tocbasicversion{2010/06/09 v3.06}
\edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
\@tempa
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
@@ -177,8 +177,10 @@
\@namedef{scr@v@3.03a}{10}
\@namedef{scr@v@3.03b}{10}
\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.05}{10}
\@namedef{scr@v@3.04a}{10}
+\@namedef{scr@v@3.05}{10}
+\@namedef{scr@v@3.05a}{10}
+\@namedef{scr@v@3.06}{10}
\@namedef{scr@v@last}{10}
%%% From File: scrkmisc.dtx
\KOMA@key{draft}[true]{%
@@ -827,10 +829,11 @@
{flat}{3},{left}{3},%
{graduated}{4},{indent}{4},{indented}{4},%
{leveldown}{5},
- {chapterentry}{6},{withchapterentry}{6},%
- {nochaptergap}{7},{ignorechapter}{7},%
- {chaptergapsmall}{8},{smallchaptergap}{8},%
- {chaptergapline}{9},{onelinechaptergap}{9}%
+ {entryprefix}{6},
+ {chapterentry}{7},{withchapterentry}{7},%
+ {nochaptergap}{8},{ignorechapter}{8},%
+ {chaptergapsmall}{9},{smallchaptergap}{9},%
+ {chaptergapline}{10},{onelinechaptergap}{10}%
}{#1}%
\ifcase \@tempa\relax
\renewcommand*{\float@@listhead}{%
@@ -840,6 +843,10 @@
\unsettoc{\@currext}{numbered}%
\unsettoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \unsettoc{\@currext}{totoc}%
+ }%
\or% totoc
\renewcommand*{\float@@listhead}{%
\addchap
@@ -848,6 +855,10 @@
\unsettoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \unsettoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% numbered
\renewcommand*{\float@@listhead}{%
\chapter
@@ -856,6 +867,10 @@
\setuptoc{\@currext}{numbered}%
\setuptoc{\@currext}{totoc}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{numbered}%
+ \setuptoc{\@currext}{totoc}%
+ }%
\or% flat
\@dynlisttrue
\or% graduated
@@ -864,6 +879,29 @@
\doforeachtocfile[float]{%
\setuptoc{\@currext}{leveldown}%
}%
+ \AtAddToTocList[float]{%
+ \setuptoc{\@currext}{leveldown}%
+ }%
+ \or% entryprefix
+ \@dynlisttrue
+ \doforeachtocfile[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
+ \AtAddToTocList[float]{%
+ \BeforeStartingTOC[\@currext]{%
+ \scr@ifundefinedorrelax{listof\@currext entryname}{}{%
+ \expandafter\def\expandafter\numberline@prefix
+ \expandafter{\csname listof\@currext entryname\endcsname
+ \nobreakspace}%
+ }%
+ }%
+ }%
\or% chapterentry
\KOMA@options{chapteratlists=entry}{}%
\or% chaptergap
@@ -1280,109 +1318,6 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-\newcommand*{\setkomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be set}{%
- You've told me to redefine the font selection of the
- element,\MessageBreak%
- but either no such element is known by
- KOMA-Script\MessageBreak%
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to redefine the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\setkomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\def\csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\addtokomafont}[2]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be extended%
- }{%
- You've told me to extend the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to extend the font selection of the\MessageBreak
- element `#1' that is an alias of element\MessageBreak
- `\csname scr@fnt@instead@#1\endcsname'%
- }%
- \expandafter\addtokomafont\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}{#2}%
- }%
- }{%
- \expandafter\expandafter\expandafter\l@addto@macro
- \csname scr@fnt@#1\endcsname{#2}%
- }%
- \@ifundefined{scr@fnt@wrn@#1}{}{%
- \ClassWarning{\KOMAClassName}{%
- \csname scr@fnt@wrn@#1\endcsname{#1}%
- }%
- }%
-}
-\newcommand*{\usekomafont}[1]{%
- \@ifundefined{scr@fnt@#1}{%
- \@ifundefined{scr@fnt@instead@#1}{%
- \ClassError{\KOMAClassName}{%
- font of element `#1' can't be used%
- }{%
- You've told me to use the font selection of the
- element,\MessageBreak
- but either no such element is known by
- KOMA-Script\MessageBreak
- or the element does not use a special font selection%
- }%
- }{%
- \ClassInfo{\KOMAClassName}{%
- You've told me to use the font selection of the
- element\MessageBreak
- `#1' that is an alias of element `\csname
- scr@fnt@instead@#1\endcsname'\MessageBreak
- }%
- \expandafter\expandafter\expandafter\usekomafont
- \expandafter\expandafter\expandafter{%
- \csname scr@fnt@instead@#1\endcsname}%
- }%
- }{%
- \@nameuse{scr@fnt@#1}%
- }%
-}
-\newcommand*{\newkomafont}[3][\relax]{%
- \expandafter\newcommand\expandafter*\csname @#2font\endcsname{#3}%
- \expandafter\expandafter\expandafter\newcommand
- \expandafter\expandafter\expandafter*%
- \expandafter\csname scr@fnt@#2\expandafter\endcsname\expandafter{%
- \csname @#2font\endcsname%
- }%
- \ifx\relax#1\relax\else
- \expandafter\newcommand\expandafter*\csname scr@fnt@wrn@#2\endcsname{#1}%
- \fi
-}
-\newcommand*{\aliaskomafont}[2]{%
- \expandafter\newcommand\expandafter*\csname scr@fnt@instead@#1\endcsname{%
- #2%
- }%
-}
%%% From File: scrklang.dtx
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -1979,8 +1914,6 @@
\@afterindentfalse
\secdef\@chapter\@schapter
}
-\setuptoc{lof}{chapteratlist}
-\setuptoc{lot}{chapteratlist}
\newcommand*{\@chapter}{}
\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
\refstepcounter{chapter}%
@@ -2204,9 +2137,9 @@
\newcommand*{\raggedpart}{}
\let\raggedpart\centering
\newcommand*\sectfont{\normalcolor\sffamily\bfseries}
-\newkomafont{partentry}{\usekomafont{sectioning}\large}
+\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
-\newkomafont{chapterentry}{\usekomafont{sectioning}}
+\newkomafont{chapterentry}{\usekomafont{disposition}}
\newkomafont{chapterentrypagenumber}{}
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
@@ -3129,10 +3062,54 @@
}
%%% From File: scrkftn.dtx
\renewcommand*\footnoterule{%
- \kern-3\p@
+ \normalsize\ftn@rule@test@values
+ \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
\ifx\@textbottom\relax\else\vskip \z@ \@plus.05fil\fi
- \hrule\@width.4\columnwidth
+ \hrule \@height\ftn@rule@height \@width\ftn@rule@width
\kern 2.6\p@}
+\newcommand*{\ftn@rule@test@values}{%
+ \ifdim\ftn@rule@height <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ less than 0%
+ }%
+ \else
+ \ifdim\ftn@rule@height >\dimexpr\skip\footins -2.6\p@\relax
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the\MessageBreak
+ height of the footnote rule has a value\MessageBreak
+ greater than \the\dimexpr\skip\footins -2.6\p@\relax
+ }%
+ \fi
+ \fi
+ \ifdim\ftn@rule@width <\z@
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ less than 0pt%
+ }%
+ \else
+ \ifdim\ftn@rule@width >\columnwidth
+ \ClassWarning{\KOMAClassName}{%
+ You might get into trouble, because the width\MessageBreak
+ or length of the footnote rule has a value\MessageBreak
+ greater than \string\columnwidth
+ }%
+ \fi
+ \fi
+}
+\newcommand*{\ftn@rule@width}{.4\columnwidth}
+\newcommand*{\ftn@rule@height}{.4\p@}
+\newcommand*{\setfootnoterule}[2][]{%
+ \ifstr{#1}{}{}{%
+ \renewcommand*{\ftn@rule@height}{#1}%
+ }%
+ \ifstr{#2}{}{}{%
+ \renewcommand*{\ftn@rule@width}{#2}%
+ }%
+ \ftn@rule@test@values
+}
\@addtoreset{footnote}{chapter}
\newcommand\deffootnote[4][]{%
\long\def\@makefntext##1{%
@@ -3210,13 +3187,25 @@
\@footnotemark
}
%%% From File: scrkliof.dtx
+\doforeachtocfile[float]{%
+ \setuptoc{\@currext}{chapteratlist}%
+}
+\AtAddToTocList[float]{%
+ \setuptoc{\@currext}{chapteratlist}%
+}
\renewcommand*{\numberline}[1]{%
- \hb@xt@\@tempdima{#1\autodot\hfil}}
+ \numberline@box{%
+ \numberline@prefix\numberline@numberformat{#1}\numberline@postfix
+ }%
+}
+\newcommand*{\numberline@prefix}{}
+\newcommand*{\numberline@postfix}{\hfil}
+\newcommand*{\numberline@numberformat}[1]{#1\autodot}
+\newcommand*{\numberline@box}[1]{\hb@xt@\@tempdima{#1}}
\newcommand*\@pnumwidth{1.55em}
\newcommand*\@tocrmarg {2.55em}
\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
-\newcommand*{\scr@numberline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
\newcommand*{\set@l@number}[1]{%
@@ -3227,14 +3216,13 @@
\ifdim\@tempdima >\last@l@number \else
\setlength{\@tempdima}{\last@l@number}%
\fi%
- }
+}
\newcommand*{\before@starttoc}[1]{
\let\scr@dottedtocline=\@dottedtocline
\renewcommand*{\@dottedtocline}[3]{%
\scr@dottedtocline{##1}{\z@}{\last@l@number}}%
- \let\scr@numberline=\numberline
- \renewcommand*{\numberline}[1]{%
- \set@l@number{##1}\scr@numberline{##1}}%
+ \renewcommand*{\numberline@box}[1]{%
+ \set@l@number{##1}\hb@xt@\@tempdima{##1}}%
\gdef\@l@number{\z@}%
\@ifundefined{#1@l@number}{%
\def\last@l@number{2em}%
@@ -3310,8 +3298,10 @@
}
\newcommand*\listfigurename{List of Figures}
\newcommand*\listoflofname{\listfigurename}
+\newcommand*\listoflofentryname{\figurename}
\newcommand*\listtablename{List of Tables}
\newcommand*\listoflotname{\listtablename}
+\newcommand*\listoflotentryname{\tablename}
\newcommand*\listoffigures{\listoftoc{lof}}
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand*\listoftables{\listoftoc{lot}}
@@ -3560,7 +3550,7 @@
\setlength{\itemindent}{\z@}%
\setlength{\topsep}{\z@}%
\setlength{\parsep}{\parskip}%
- \setlength{\partopsep}{\parskip}%
+ \setlength{\partopsep}{\z@}%
\let\makelabel\@gobble
\setlength{\labelwidth}{\z@}%
\advance\@listdepth\m@ne