summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/tocstyle.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty72
1 files changed, 45 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 0ae8915dfde..a38fea1372a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -7,7 +7,7 @@
%% tocstyle.dtx (with options: `package,trace,tocstyle')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2012 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2007-2013 by Markus Kohm <komascript(at)gmx.info>
%%
%% Copyright (c) 1994-2007
%% Markus Kohm and any individual authors listed elsewhere in this file.
@@ -47,10 +47,10 @@
%% EVERYTHING MAY CHANGE IN FUTURE!
%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
%%
-%%% From File: tocstyle.dtx
+%%% From File: $Id: tocstyle.dtx 1562 2013-12-19 07:51:16Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
- [2009/11/09 v0.2d-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
+ [2013/08/11 v0.2e-alpha LaTeX2e KOMA-Script package (versatile toc styles)]
\PackageWarningNoLine{tocstyle}{%
THIS IS AN ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
@@ -748,12 +748,7 @@
\settocfeature[-1]{leaders}{\hfill}%
\settocfeature[0]{entryvskip}{1em\@plus\p@}%
\settocfeature[0]{leaders}{\hfill}%
- \settocfeature[0]{entryhook}{%
- \begingroup
- \edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\bfseries\fi
- \endgroup
- }%
+ \settocfeature[0]{entryhook}{\bfseries}
\iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
@@ -766,27 +761,34 @@
\fi
}
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname sectfont\endcsname\relax
+\expandafter\ifx\csname KOMAClassName\endcsname\relax
\newtocstyle{KOMAlike}{%
\settocfeature{dothook}{\normalfont}%
\settocfeature[-1]{entryhook}{\sffamily\bfseries}%
\settocfeature[-1]{entryvskip}{2.25em\@plus\p@}%
\settocfeature[-1]{leaders}{\hfill}%
+ \settocfeature[-1]{pagenumberhook}{\sffamily\bfseries}%
\settocfeature[0]{entryvskip}{1em\@plus\p@}%
\settocfeature[0]{leaders}{\hfill}%
- \settocfeature[0]{entryhook}{%
- \begingroup
- \edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi
- \endgroup
- }%
+ \settocfeature[0]{entryhook}{\sffamily\bfseries}
+ \settocfeature[0]{pagenumberhook}{\sffamily\bfseries}%
\iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
\begingroup
\edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sffamily\bfseries\fi
+ \ifx\tocstyleAliasTOC\@tempa
+ \aftergroup\sffamily\aftergroup\bfseries
+ \fi
+ \endgroup
+ }%
+ \settocfeature[1]{pagenumberhook}{%
+ \begingroup
+ \edef\@tempa{toc}%
+ \ifx\tocstyleAliasTOC\@tempa
+ \aftergroup\sffamily\aftergroup\bfseries
+ \fi
\endgroup
}%
\fi
@@ -794,31 +796,47 @@
\else
\newtocstyle{KOMAlike}{%
\settocfeature{dothook}{\normalfont}%
- \settocfeature[-1]{entryhook}{\sectfont}%
+ \settocfeature[-1]{entryhook}{\usekomafont{partentry}}%
\settocfeature[-1]{entryvskip}{2.25em\@plus\p@}%
\settocfeature[-1]{leaders}{\hfill}%
+ \settocfeature[-1]{pagenumberhook}{\usekomafont{partentrypagenumber}}%
\settocfeature[0]{entryvskip}{1em\@plus\p@}%
\settocfeature[0]{leaders}{\hfill}%
- \settocfeature[0]{entryhook}{%
- \begingroup
- \edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi
- \endgroup
- }%
+ \settocfeature[0]{entryhook}{\usekomafont{chapterentry}}%
+ \settocfeature[0]{pagenumberhook}{\usekomafont{chapterentrypagenumber}}%
\iftochaschapter\else
\settocfeature[1]{entryvskip}{1em\@plus\p@}%
\settocfeature[1]{leaders}{\hfill}%
\settocfeature[1]{entryhook}{%
\begingroup
\edef\@tempa{toc}%
- \ifx\tocstyleAliasTOC\@tempa\aftergroup\sectfont\fi
- \endgroup
+ \ifx\tocstyleAliasTOC\@tempa
+ \def\@tempa{\endgroup\usekomafont{sectionentry}}%
+ \else
+ \let\@tempa\endgroup
+ \fi
+ \@tempa
+ }%
+ \settocfeature[1]{pagenumberhook}{%
+ \begingroup
+ \edef\@tempa{toc}%
+ \ifx\tocstyleAliasTOC\@tempa
+ \def\@tempa{\endgroup\usekomafont{sectionentrypagenumber}}%
+ \else
+ \let\@tempa\endgroup
+ \fi
+ \@tempa
}%
\fi
}
\fi
\newcommand*{\tocstyle@deprecated@style@KOMAScript}{KOMAlike}%
\newtocstyle[KOMAlike]{classic}{%
+ \settocfeature[-1]{pagenumberhook}{\normalfont\normalcolor}%
+ \settocfeature[0]{pagenumberhook}{\normalfont\normalcolor}%
+ \iftochaschapter\else
+ \settocfeature[1]{pagenumberhook}{\normalfont\normalcolor}%
+ \fi
\settocfeature{pagenumberhook}{\normalfont\normalcolor}%
\settocfeature{raggedhook}{\raggedright}%
}
@@ -836,7 +854,7 @@
}{%
\PackageInfo{tocstyle}{no tocstyle.cfg found}%
}
-%%% From File: scrlogo.dtx
+%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
M\kern.05em A\kern.1em-\kern.1em Script}}}{}