diff options
author | Karl Berry <karl@freefriends.org> | 2018-04-02 21:16:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-04-02 21:16:13 +0000 |
commit | 1610548529befd1cb7d72da00a3a889261436642 (patch) | |
tree | 04d20de3c80be1f24b619689213ebb794979c0ee /Master/texmf-dist/tex/latex/koma-script/tocbasic.sty | |
parent | 635bc4f06033428fe01440c71f242ec9b68fe092 (diff) |
koma-script (2apr18)
git-svn-id: svn://tug.org/texlive/trunk@47249 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.sty | 95 |
1 files changed, 70 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index ef485afa64f..9fe7c231f75 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://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2017/09/07 v3.24 KOMA-Script + 2018/03/30 v3.25 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $ %%% (run: body) \RequirePackage{scrbase} \newcommand*{\tb@listoftocs}{} @@ -400,6 +400,32 @@ \tocbasic@starttoc{#2}% \endgroup } +\@ifpackageloaded{tocbibind}{}{% + \AtBeginDocument{% + \@ifpackageloaded{tocbibind}{% + \PackageInfo{tocbasic}{usage of `tocbibind' detected}% + \newcommand*{\tb@tocbibindpatch}[3]{% + \long\def\reserved@a{\tocfile{#2}{#1} }% + \ifx #3\reserved@a + \PackageWarningNoLine{tocbasic}{% + `tocbibind' redefinition of `\string#3'\MessageBreak + detected.\MessageBreak + Note: Loading `tocbibind' without option `not#1'\MessageBreak + can break several features of `tocbasic'% + \scr@ifundefinedorrelax{KOMAClassName}{% + .\MessageBreak + Loading `tocbibind' before `tocbasic' would avoid\MessageBreak + this warning message% + }{}% + }% + \fi + }% + \tb@tocbibindpatch{toc}{\contentsname}{\tableofcontents}% + \tb@tocbibindpatch{lof}{\listfigurename}{\listoffigures}% + \tb@tocbibindpatch{lot}{\listtablename}{\listoftables}% + }{}% + }% +} \newcommand*{\listofname}{List of} \newcommand*{\listofeachtoc}{% \kernel@ifnextchar [%] @@ -649,11 +675,15 @@ }% }% }% + \DefineFamilyKey[.toc]{KOMAarg}{extension}{% + \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}% + }% \DefineFamilyKey[.toc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}% \FamilyExecuteOptions[.toc]{KOMAarg}{#1}% \RelaxFamilyKey[.toc]{KOMAarg}{@else@}% \DefineFamilyKey[.toc]{KOMAarg}{type}{\FamilyKeyStateProcessed}% \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}% + \DefineFamilyKey[.toc]{KOMAarg}{extension}{\FamilyKeyStateProcessed}% \ifstr{\tb@nt@tocentrystyle}{}{}{% \begingroup \let\scr@dte@current\tb@nt@type @@ -708,9 +738,6 @@ \DefineFamilyKey[.toc]{KOMAarg}{counterwithin}{% \edef\tb@nt@counterwithin{##1}\FamilyKeyStateProcessed }% - \DefineFamilyKey[.toc]{KOMAarg}{extension}{% - \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}% - }% \FamilyBoolKey[.toc]{KOMAarg}{float}{tb@nt@float}% \DefineFamilyKey[.toc]{KOMAarg}{floatpos}{% \tb@ifvalueisnotempty{##1}{\edef\tb@nt@floatpos{##1}}% @@ -789,10 +816,16 @@ \DefineFamilyKey[.toc]{KOMAarg}{types}{% \tb@ifvalueisnotempty{##1}{\edef\tb@nt@types{##1}}% }% + \DefineFamilyKey[.toc]{KOMAarg}{setup}{% + \setuptoc\tb@nt@ext{##1}% + }% + \DefineFamilyKey[.toc]{KOMAarg}{unset}{% + \unsettoc\tb@nt@ext{##1}% + }% \FamilyExecuteOptions[.toc]{KOMAarg}{#1}% \RelaxFamilyKey[.toc]{KOMAarg}{types}% \RelaxFamilyKey[.toc]{KOMAarg}{owner}% - \RelaxFamilyKey[.toc]{KOMAarg}{nonfload}% + \RelaxFamilyKey[.toc]{KOMAarg}{nonfloat}% \RelaxFamilyKey[.toc]{KOMAarg}{name}% \RelaxFamilyKey[.toc]{KOMAarg}{listname}% \RelaxFamilyKey[.toc]{KOMAarg}{level}% @@ -838,7 +871,8 @@ \expandafter{\csname list\tb@nt@type name\endcsname}% \begingroup\edef\@tempa{\endgroup \noexpand\newcommand*\csname listof\tb@nt@types\endcsname{% - \noexpand\listoftoc{\tb@nt@ext}% + \noexpand\listoftoc{% + \expandafter\noexpand\csname ext@\tb@nt@type\endcsname}% }% }\@tempa \ifstr{\tb@nt@tocentrystyle}{}{% @@ -977,7 +1011,7 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% @@ -1362,10 +1396,10 @@ \expandafter\let\csname scr@dte@#2@init\expandafter\endcsname \csname scr@dte@#1@init\endcsname } -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1494,7 +1528,7 @@ \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}% {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1650,7 +1684,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1760,7 +1794,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2031,8 +2065,8 @@ \scr@ifundefinedorrelax{l@chapter}{% \ifstr{#1}{section}{% \@namedef{scr@tso@#1@linefill}{\hfill}% - }{} - }{} + }{}% + }{}% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% }% @@ -2043,9 +2077,20 @@ \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}% }{% - \expandafter\providecommand% - \csname scr@tso@#1@pagenumberformat\endcsname[1]{% - \normalfont\normalcolor ##1}% + \ifstr{#1}{chapter}{% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}% + }{% + \scr@ifundefinedorrelax{l@chapter}{% + \ifstr{#1}{section}{% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}% + }{}% + }{}% + \expandafter\providecommand% + \csname scr@tso@#1@pagenumberformat\endcsname[1]{% + \normalfont\normalcolor ##1}% + }% }% \expandafter\providecommand% \csname scr@tso@#1@pagenumberbox\endcsname[1]{% @@ -2192,10 +2237,10 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2731 2017-11-23 09:04:09Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: tocbasic.dtx 2709 2017-11-21 08:03:52Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% |