summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-20 22:41:14 +0000
committerKarl Berry <karl@freefriends.org>2016-06-20 22:41:14 +0000
commitdd8cd465b253cee19fa61fc89383c0c61a0791e4 (patch)
tree879b137590b9ae1dc87a49a741cbb9a1390dad25 /Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
parent84f03266593d0aeb4f714b3f4b76f2d1ea4f4bd6 (diff)
koma-script (20jun16)
git-svn-id: svn://tug.org/texlive/trunk@41508 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/tocbasic.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty119
1 files changed, 86 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 390d986e9af..0012ad1269a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -52,24 +52,24 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2016/05/10 v3.20 KOMA-Script
+ 2016/06/14 v3.21 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: body)
\RequirePackage{scrbase}
\newcommand*{\tb@listoftocs}{}
@@ -636,6 +636,7 @@
\l@addto@macro\do@endgroup{%
\l@addto@macro\tb@nt@extra@relax@opts{%
\RelaxFamilyKey[.toc]{KOMAarg}{toc##1}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{tocentry##1}%
}%
}%
\kernel@ifnextchar[%]
@@ -645,6 +646,13 @@
\def\@donodefault##1{%
\l@addto@macro\do@endgroup{%
\DefineFamilyKey[.toc]{KOMAarg}{toc##1}{%
+ \PackageWarning{tocbasic}{you should use `tocentry##1'
+ instead\MessageBreak
+ of `toc##1'}%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1}{%
\l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
\FamilyKeyStateProcessed
}%
@@ -653,6 +661,13 @@
\def\@dodefault##1[##2]{%
\l@addto@macro\do@endgroup{%
\DefineFamilyKey[.toc]{KOMAarg}{toc##1}[##2]{%
+ \PackageWarning{tocbasic}{you should use `tocentry##1'
+ instead\MessageBreak
+ of `toc##1'}%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+ \FamilyKeyStateProcessed
+ }%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1}[##2]{%
\l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
\FamilyKeyStateProcessed
}%
@@ -696,7 +711,7 @@
\PackageWarning{tocbasic}{%
deprecated option `hang'.\MessageBreak
You should replace option `hang' by option\MessageBreak
- `tocnumwidth'%
+ `tocentrynumwidth'%
}%
\l@addto@macro\tb@nt@tocstyle@options{,numwidth={##1}}%
}%
@@ -716,7 +731,7 @@
\PackageWarning{tocbasic}{%
deprecated option `indent'.\MessageBreak
You should replace option `indent' by option\MessageBreak
- `tocindent'%
+ `tocentryindent'%
}%
\l@addto@macro\tb@nt@tocstyle@options{,indent={##1}}%
}%
@@ -729,7 +744,7 @@
\PackageWarning{tocbasic}{%
deprecated option `level'.\MessageBreak
You should replace option `level' by option\MessageBreak
- `toclevel'
+ `tocentrylevel'
}%
\l@addto@macro\tb@nt@tocstyle@options{,level={##1}}%
\FamilyKeyStateProcessed
@@ -934,7 +949,7 @@
}%
}
\newcommand*{\tb@nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: body)
\newcommand*{\scr@numberline}[1]{%
\numberline@box{%
@@ -1276,6 +1291,19 @@
\if@tempswa
\@nameuse{scr@dte@def@l@#2}{#3}%
\expandafter\edef\csname scr@dte@#3@style\endcsname{#2}%
+ \expandafter\let\csname toclevel@#3\expandafter\endcsname
+ \csname #3tocdepth\endcsname
+ \if@atdocument\else
+ \scr@ifundefinedorrelax{AfterPackage}{%
+ \AtBeginDocument
+ }{%
+ \AfterPackage*{hyperref}%
+ }%
+ {%
+ \expandafter\let\csname toclevel@#3\expandafter\endcsname
+ \csname #3tocdepth\endcsname
+ }%
+ \fi
\fi
}%
}
@@ -1306,10 +1334,10 @@
\expandafter\let\csname scr@dte@#2@init\expandafter\endcsname
\csname scr@dte@#1@init\endcsname
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1438,7 +1466,7 @@
\@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
{\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1594,7 +1622,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1704,35 +1732,47 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
- \DefineTOCEntryIfOption{raggedpagenumber}%
- {scr@tso@}{@raggedpage}{page number ragged flag}%
+ \DefineTOCEntryLengthOption{beforeskip}%
+ {scr@tso@}{@beforeskip}{vertical skip before the entry}%
\DefineTOCEntryIfOption{breakafternumber}%
{scr@tso@}{@breakafternumber}{line break after number flag}%
\DefineTOCEntryIfOption{dynnumwidth}%
{scr@tso@}{@dynnumwidth}{dynamic number width flag}%
- \DefineTOCEntryCommandOption{onstarthigherlevel}%
- {scr@tso@}{@LastTOCLevelWasLower}{start higher level entry hook}%
- \DefineTOCEntryCommandOption{onstartsamelevel}%
- {scr@tso@}{@LastTOCLevelWasSame}{start same level entry hook}%
- \DefineTOCEntryCommandOption{onstartlowerlevel}%
- {scr@tso@}{@LastTOCLevelWasHigher}{start lower level entry hook}%
\DefineTOCEntryCommandOption{entryformat}%
{scr@tso@}{@entryformat}[1]{entry format}%
\DefineTOCEntryCommandOption{entrynumberformat}%
{scr@tso@}{@numberformat}[1]{entry number format}%
- \DefineTOCEntryCommandOption{pagenumberformat}%
- {scr@tso@}{@pagenumberformat}[1]{page number format}%
- \DefineTOCEntryCommandOption{pagenumberbox}%
- {scr@tso@}{@pagenumberbox}[1]{page number box}%
\DefineTOCEntryCommandOption{linefill}[\TOCLineLeaderFill]%
{scr@tso@}{@linefill}{filling between text and page number}%
- \DefineTOCEntryLengthOption{beforeskip}%
- {scr@tso@}{@beforeskip}{vertical skip before the entry}%
\DefineTOCEntryLengthOption{numsep}%
{scr@tso@}{@numsep}{entry number separation}%
+ \DefineTOCEntryCommandOption{onstarthigherlevel}%
+ {scr@tso@}{@LastTOCLevelWasLower}{start higher level entry hook}%
+ \DefineTOCEntryCommandOption{onstartlowerlevel}%
+ {scr@tso@}{@LastTOCLevelWasHigher}{start lower level entry hook}%
+ \DefineTOCEntryCommandOption{onstartsamelevel}%
+ {scr@tso@}{@LastTOCLevelWasSame}{start same level entry hook}%
+ \DefineTOCEntryCommandOption{pagenumberbox}%
+ {scr@tso@}{@pagenumberbox}[1]{page number box}%
+ \DefineTOCEntryCommandOption{pagenumberformat}%
+ {scr@tso@}{@pagenumberformat}[1]{page number format}%
+ \DefineTOCEntryOption{raggedentrytext}[true]{%
+ \FamilySetBool{KOMAarg}{raggedentrytext}{@tempswa}{##1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \expandafter\let\csname ragged\scr@dte@current entry\endcsname
+ \raggedright
+ \else
+ \expandafter\let\csname ragged\scr@dte@current entry\endcsname
+ \relax
+ \fi
+ \fi
+ }%
+ \DefineTOCEntryIfOption{raggedpagenumber}%
+ {scr@tso@}{@raggedpage}{page number ragged flag}%
\DefineTOCEntryLengthOption{indent}%
{scr@tso@}{@indent}{entry indent}%
\DefineTOCEntryLengthOption{numwidth}%
@@ -1741,7 +1781,7 @@
\ifstrstart{#1}{sub}{%
\scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{%
\expandafter\edef\csname #1tocdepth\endcsname{%
- \numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax
+ \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax
}%
}%
}{}%
@@ -2026,6 +2066,19 @@
\parindent \@nameuse{scr@tso@#1@indent}\relax
\@afterindenttrue
\interlinepenalty\@M
+ \expandafter\ifx\csname ragged#1entry\endcsname\raggedright
+ \addtolength\rightskip\@flushglue
+ \else
+ \def\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \else
+ \renewcommand\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \fi
+ \fi
+ \fi
\leavevmode
\@tempdima \@nameuse{scr@tso@#1@numwidth}\relax
\@nameuse{Ifscr@tso@#1@dynnumwidth}{%
@@ -2110,10 +2163,10 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
%%% (run: exit)
\AtBeginDocument{%
\@ifundefined{MakeMarkcase}{%