diff options
author | Karl Berry <karl@freefriends.org> | 2017-01-29 22:32:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-01-29 22:32:58 +0000 |
commit | e02235dda0e68d2131b9cf111af5448fa125ad58 (patch) | |
tree | 37ea12425820b8b346764911b170eefcc0a68b44 /Master/texmf-dist/tex/latex/koma-script/tocbasic.sty | |
parent | 687ffbc778abf7b367ab1c6ed91c016e8138c2ad (diff) |
koma-script (29jan17)
git-svn-id: svn://tug.org/texlive/trunk@43084 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 | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index 0012ad1269a..e1414a045f3 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 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2016/06/14 v3.21 KOMA-Script + 2017/01/03 v3.22 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: body) \RequirePackage{scrbase} \newcommand*{\tb@listoftocs}{} @@ -129,6 +129,13 @@ }\reserved@a }% } +\newcommand*{\owneroftoc}[2][\@firstofone]{% + \begingroup + \let\reserved@a\endgroup + \def\do##1##2{\ifstr{#2}{##1}{\def\reserved@a{\endgroup#1{##2}}}{}}% + \tb@listoftocs + \reserved@a +} \newcommand*{\AtAddToTocList}{% \kernel@ifnextchar [%] \@@AtAddToTocList\@AtAddToTocList @@ -176,9 +183,10 @@ \edef\reserved@a{##1}% \ifx\reserved@a\reserved@b \begingroup - \edef\reserved@a{##2}% + \edef\@currext{##2}% \edef\reserved@b{#1}% - \ifx\reserved@a\reserved@b\else + \ifx\@currext\reserved@b + \else \g@addto@macro\tb@listoftocs{\do{##1}{##2}}% \fi \endgroup @@ -186,7 +194,7 @@ \g@addto@macro\tb@listoftocs{\do{##1}{##2}}% \fi }% - \edef\reserved@b{#2}\let\tb@listoftocs\@empty + \edef\reserved@b{#2}\global\let\tb@listoftocs\@empty \tb@oldlist \endgroup } @@ -195,11 +203,12 @@ \let\tb@oldlist\tb@listoftocs \def\do##1##2{% \edef\reserved@a{##1}% - \ifx\reserved@a\reserved@b\else + \ifx\reserved@a\reserved@b + \else \g@addto@macro\tb@listoftocs{\do{##1}{##2}}% \fi }% - \edef\reserved@b{#1}\let\tb@listoftocs\@empty + \edef\reserved@b{#1}\global\let\tb@listoftocs\@empty \tb@oldlist \endgroup } @@ -785,6 +794,7 @@ \expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}% \expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext \addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}% + \expandafter\let\csname tb@nt@type@\tb@nt@ext\endcsname\tb@nt@type \scr@ifundefinedorrelax{tb@nt@types}{% \edef\tb@nt@types{\tb@nt@type s}% }{}% @@ -949,7 +959,7 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% @@ -1334,10 +1344,10 @@ \expandafter\let\csname scr@dte@#2@init\expandafter\endcsname \csname scr@dte@#1@init\endcsname } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1466,7 +1476,7 @@ \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}% {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1622,7 +1632,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1732,7 +1742,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2097,6 +2107,7 @@ \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}% \global\scr@dte@tocline@numberwidth \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax + \relax \ifdim \scr@dte@tocline@numberwidth >\@nameuse{scr@dte@#1@maxnumwidth}\relax \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth @@ -2104,7 +2115,7 @@ \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{% \ifdim \scr@dte@tocline@numberwidth >\dimexpr \@nameuse{scr@tso@#1@numwidth}% - +\@nameuse{scr@tso@#1@numsep}\relax + +\@nameuse{scr@tso@#1@numsep}\relax\relax \PackageWarning{tocbasic% }{% number width of #1 toc entries should be @@ -2163,10 +2174,10 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $ +%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% |