diff options
author | Karl Berry <karl@freefriends.org> | 2019-12-30 22:17:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-12-30 22:17:03 +0000 |
commit | aab00778035c28a028f94e501e3c13f6b4081f87 (patch) | |
tree | e5dd29eebc30d1b86ec710496c42250384425061 /Master/texmf-dist/tex/latex/koma-script/tocbasic.sty | |
parent | f56dddc3f3fce9850405369b12615d3544254bee (diff) |
koma-script (30dec19)
git-svn-id: svn://tug.org/texlive/trunk@53270 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 | 474 |
1 files changed, 246 insertions, 228 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty index a081d5e3f6c..546f7e6b693 100644 --- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty +++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty @@ -53,24 +53,24 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: identify) \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{tocbasic}[% - 2019/10/12 v3.27 KOMA-Script + 2019/12/23 v3.28 KOMA-Script package (handling toc-files)% ] -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: prepare) -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: option) \ProcessOptions\relax -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: option) -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: body) \RequirePackage{scrbase} \AfterPackage*{multitoc}{% @@ -97,7 +97,16 @@ }% } \newcommand*{\tb@listoftocs}{} -\newcommand{\ifattoclist}[1]{% +\providecommand*{\ifattoclist}{% + \PackageWarning{tocbasic}{Usage of deprecated command + `\string\ifattoclist'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\ifattoclist' by `\string\Ifattoclist'% + }% + \Ifattoclist +} +\newcommand{\Ifattoclist}[1]{% \begingroup \def\do##1##2{% \edef\reserved@a{##1}% @@ -120,7 +129,7 @@ \reserved@a } \newcommand*{\scr@@addtotoclist}[2][]{% - \ifattoclist{#2}{% + \Ifattoclist{#2}{% \PackageError{tocbasic}{% file extension `#2' cannot be used twice }{% @@ -156,7 +165,7 @@ \newcommand*{\owneroftoc}[2][\@firstofone]{% \begingroup \let\reserved@a\endgroup - \def\do##1##2{\ifstr{#2}{##1}{\def\reserved@a{\endgroup#1{##2}}}{}}% + \def\do##1##2{\Ifstr{#2}{##1}{\def\reserved@a{\endgroup#1{##2}}}{}}% \tb@listoftocs \reserved@a } @@ -182,7 +191,7 @@ \PackageInfo{tocbasic}{babel extension for `#1' omitted\MessageBreak because of missing \string\bbl@set@language}% }{% - \iftocfeature{#1}{nobabel}{% + \Iftocfeature{#1}{nobabel}{% \PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak because of feature `nobabel' available\MessageBreak for `#1'}% @@ -212,9 +221,9 @@ \AtAddToTocList[]{\expandafter\tocbasic@extend@babel\expandafter{\@currext}} \newcommand*{\removefromtoclist}{% \kernel@ifnextchar [%] - \@removefromtoclist\@@removefromtoclist + \scr@removefromtoclist\scr@@removefromtoclist } -\newcommand*{\@removefromtoclist}[2][]{% +\newcommand*{\scr@removefromtoclist}[2][]{% \begingroup \let\tb@oldlist\tb@listoftocs \def\do##1##2{% @@ -236,7 +245,7 @@ \tb@oldlist \endgroup } -\newcommand*{\@@removefromtoclist}[1]{% +\newcommand*{\scr@@removefromtoclist}[1]{% \begingroup \let\tb@oldlist\tb@listoftocs \def\do##1##2{% @@ -342,7 +351,7 @@ \newcommand*{\tocbasic@starttoc}[1]{% \begingroup \edef\@currext{#1}% - \iftocfeature{\@currext}{noparskipfake}{}{% + \Iftocfeature{\@currext}{noparskipfake}{}{% \ifvmode \@tempskipa\lastskip \vskip-\lastskip @@ -408,17 +417,17 @@ \expandafter\let\expandafter\list@fname\csname listof#2name\endcsname }% \edef\@currext{#2}% - \iftocfeature{\@currext}{onecolumn}{% - \iftocfeature{\@currext}{leveldown}{}{% + \Iftocfeature{\@currext}{onecolumn}{% + \Iftocfeature{\@currext}{leveldown}{}{% \if@twocolumn \aftergroup\twocolumn\onecolumn \fi }% }{}% - \iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}% + \Iftocfeature{\@currext}{numberline}{\def\nonumberline{\numberline{}}}{}% \tocbasic@listhead{#1}% \scr@ifundefinedorrelax{microtypesetup}{}{% - \iftocfeature{\@currext}{noprotrusion}{}{% + \Iftocfeature{\@currext}{noprotrusion}{}{% \microtypesetup{protrusion=false}% \PackageInfo{tocbasic}{% character protrusion at \@currext\space deactivated}% @@ -469,14 +478,14 @@ \@ifundefined{tocbasic@listhead@\@currext}{% \scr@ifundefinedorrelax{chapter}{% \expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{% - \iftocfeature{\@currext}{leveldown}{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{leveldown}{% + \Iftocfeature{\@currext}{numbered}{% \subsection[##1]{##1}% }{% \subsection*{##1}% \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi \begingroup - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \expandafter\addxcontentsline\expandafter{\ext@toc}% {subsection}{##1}% }{}% @@ -486,13 +495,13 @@ \ifvmode\penalty\@tempcnta\vskip\@tempskipa\fi }% }{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{numbered}{% \section[##1]{##1}% }{% \section*{##1}% \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi \begingroup - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \expandafter\addxcontentsline\expandafter{\ext@toc}% {section}{##1}% }{}% @@ -508,11 +517,11 @@ }% }{% \expandafter\def\csname tocbasic@listhead@\@currext\endcsname##1{% - \iftocfeature{\@currext}{leveldown}{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{leveldown}{% + \Iftocfeature{\@currext}{numbered}{% \section{##1}% }{% - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \@ifundefined{addsec}{% \section*{##1}% \ifvmode\@tempcnta\lastpenalty\@tempskipa\lastskip\unskip\fi @@ -544,7 +553,7 @@ }% }% }{% - \iftocfeature{\@currext}{numbered}{% + \Iftocfeature{\@currext}{numbered}{% \chapter[##1]{##1}% }{% \chapter*{##1}% @@ -555,7 +564,7 @@ }{% \@mkdouble{\MakeMarkcase{##1}}% }% - \iftocfeature{\@currext}{totoc}{% + \Iftocfeature{\@currext}{totoc}{% \expandafter\addxcontentsline\expandafter{\ext@toc}% {chapter}{##1}% }{}% @@ -603,7 +612,16 @@ \setuptoc{toc}{nobabel} \setuptoc{lof}{nobabel} \setuptoc{lot}{nobabel} -\newcommand*{\iftocfeature}[2]{% +\providecommand*{\iftocfeature}{% + \PackageWarning{tocbasic}{Usage of deprecated command + `\string\iftocfeature'.\MessageBreak + The command has been renamed because of a\MessageBreak + recommendation of The LaTeX Project Team.\MessageBreak + Please replace `\string\iftocfeature' by `\string\Iftocfeature'% + }% + \Iftocfeature +} +\newcommand*{\Iftocfeature}[2]{% \scr@ifundefinedorrelax{tocbasic@#1@feature@#2}{% \expandafter\@secondoftwo }{% @@ -615,7 +633,7 @@ \let\@starttoc\tocbasic@starttoc \BeforeStartingTOC{% \let\@starttoc\tb@saved@starttoc - \expandafter\ifattoclist\expandafter{\@currext}{}{% + \expandafter\Ifattoclist\expandafter{\@currext}{}{% \addtotoclist[tocbasicautomode]{\@currext}% }% }% @@ -645,12 +663,12 @@ \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}% \def\do@endgroup{\endgroup}% \def\do##1{% - \ifstr{##1}{numwidth}{% + \Ifstr{##1}{numwidth}{% \l@addto@macro\do@endgroup{% \l@addto@macro{\tb@nt@tocstyle@options}{,numwidth=1.5em}% }% }{% - \ifstr{##1}{indent}{% + \Ifstr{##1}{indent}{% \l@addto@macro\do@endgroup{% \l@addto@macro{\tb@nt@tocstyle@options}{,indent=1em}% }% @@ -702,7 +720,7 @@ \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}% \DefineFamilyKey[.toc]{KOMAarg}{extension}{\FamilyKeyStateProcessed}% \DefineFamilyKey[.toc]{KOMAarg}{category}{\FamilyKeyStateProcessed}% - \ifstr{\tb@nt@tocentrystyle}{}{}{% + \Ifstr{\tb@nt@tocentrystyle}{}{}{% \begingroup \let\scr@dte@current\tb@nt@type \@ExecuteTOCEntryStyleInitCode{\tb@nt@tocentrystyle}{\tb@nt@type}% @@ -897,14 +915,14 @@ \expandafter\noexpand\csname ext@\tb@nt@type\endcsname}% }% }\@tempa - \ifstr{\tb@nt@tocentrystyle}{}{% + \Ifstr{\tb@nt@tocentrystyle}{}{% \@ifundefined{l@\tb@nt@type}{% \PackageWarning{tocbasic}{% \expandafter\string\csname l@\tb@nt@type\endcsname\space undefined!\MessageBreak I hope you know, what you are doing, but\MessageBreak maybe it would be better to use proper\MessageBreak - `tocentrystyle` settings% + `tocentrystyle' settings% }% }{}% }{% @@ -1024,7 +1042,7 @@ \csname #2@atbegin\endcsname } \newcommand*{\tb@ifvalueisnotempty}[1]{% - \ifstr{#1}{}{% + \Ifstr{#1}{}{% \FamilyKeyStateUnknownValue \expandafter\@gobble }{% @@ -1033,12 +1051,12 @@ }% } \newcommand*{\tb@nt@autofloattype}{16} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: body) \newcommand*{\scr@numberline}[1]{% \numberline@box{% \numberline@prefix - \ifstr{#1}{}{#1}{% + \Ifstr{#1}{}{#1}{% \numberline@numberformat{#1}% }% \numberline@postfix @@ -1058,7 +1076,7 @@ \newcommand*{\numberline@prefix}{} \newcommand*{\numberline@postfix}{\hfil} \newcommand*{\numberline@numberformat}[1]{% - \ifstr{#1}{}{}{\numberline@numberprefix#1\numberline@numberpostfix}% + \Ifstr{#1}{}{}{\numberline@numberprefix#1\numberline@numberpostfix}% } \newcommand*{\numberline@numberprefix}{} \newcommand*{\numberline@numberpostfix}{} @@ -1634,10 +1652,10 @@ \providecommand*\@pnumwidth{1.55em} \providecommand*\@tocrmarg {2.55em} \providecommand*\@dotsep {4.5} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,gobble) \DeclareTOCEntryStyle{gobble}{}% -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,dottedtocline) \DeclareTOCEntryStyle{dottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1645,15 +1663,15 @@ \DefineTOCEntryLengthOption{numwidth}% {scr@tso@}{@numwidth}{entry number width}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -1668,20 +1686,20 @@ }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -1690,15 +1708,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -1717,19 +1735,19 @@ }{}% \@ifundefined{scr@tso@#1@numwidth}{% \@ifundefined{scr@#1@tocnumwidth}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% \scr@ifundefinedorrelax{chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{5m}% }{% }% @@ -1738,15 +1756,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{5em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{6em}% }{% }% @@ -1763,7 +1781,7 @@ }% }{}% }]{% - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \@dottedtocline{\@nameuse{#1tocdepth}}{\z@}% {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }{% @@ -1771,7 +1789,7 @@ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}% }% } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,undottedtocline) \DeclareTOCEntryStyle{undottedtocline}[{% \DefineTOCEntryLengthOption{indent}% @@ -1779,15 +1797,15 @@ \DefineTOCEntryLengthOption{numwidth}% {scr@tso@}{@numwidth}{entry number width}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -1802,20 +1820,20 @@ }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -1824,15 +1842,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -1851,19 +1869,19 @@ }{}% \@ifundefined{scr@tso@#1@numwidth}{% \@ifundefined{scr@#1@tocnumwidth}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% \scr@ifundefinedorrelax{chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{5m}% }{% }% @@ -1872,15 +1890,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{5em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{6em}% }{% }% @@ -1917,7 +1935,7 @@ \leavevmode \bfseries \advance\leftskip\@tempdima - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \hskip -\leftskip }{% \advance\leftskip\@nameuse{scr@tso@#1@indent}% @@ -1931,21 +1949,21 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style, largetocline) \DeclareTOCEntryStyle{largetocline}[{% \DefineTOCEntryLengthOption{indent}% {scr@tso@}{@indent}{entry indent}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -1960,20 +1978,20 @@ }{}% \@ifundefined{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -1982,15 +2000,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -2028,7 +2046,7 @@ \leavevmode \large \bfseries - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% }{% \advance\leftskip\@nameuse{scr@tso@#1@indent}% }% @@ -2044,7 +2062,7 @@ \endgroup \fi } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,tocline) \DeclareTOCEntryStyle{tocline}[{% \DefineTOCEntryLengthOption{beforeskip}% @@ -2094,7 +2112,7 @@ \DefineTOCEntryLengthOption{numwidth}% {scr@tso@}{@numwidth}{entry number width}% \scr@ifundefinedorrelax{#1tocdepth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{% \expandafter\edef\csname #1tocdepth\endcsname{% \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax @@ -2103,15 +2121,15 @@ }{}% }{}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -2126,7 +2144,7 @@ }{}% \scr@ifundefinedorrelax{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% \expandafter\edef\csname scr@tso@#1@indent\endcsname{% @@ -2154,7 +2172,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@tso@#1@pagenumberwidth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@pagenumberwidth}{% \@namedef{scr@tso@#1@pagenumberwidth}{\@pnumwidth}% }{% @@ -2167,7 +2185,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@tso@#1@rightindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@rightindent}{% \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}% }{% @@ -2180,20 +2198,20 @@ }% }{}% \@ifundefined{scr@tso@#1@indent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -2202,15 +2220,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -2226,7 +2244,7 @@ }{}% \scr@ifundefinedorrelax{scr@tso@#1@numwidth}{% \scr@ifundefinedorrelax{scr@#1@tocnumwidth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% \expandafter\edef\csname scr@tso@#1@numwidth\endcsname{% \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}% @@ -2240,19 +2258,19 @@ }% }{}% \@ifundefined{scr@tso@#1@numwidth}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% \scr@ifundefinedorrelax{chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.2em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{4.1em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{5m}% }{% }% @@ -2261,15 +2279,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@numwidth}{2.3em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@numwidth}{3.2em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@numwidth}{3.1em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@numwidth}{5em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@numwidth}{6em}% }{% }% @@ -2289,13 +2307,13 @@ \expandafter\providecommand% \csname scr@tso@#1@LastTOCLevelWasHigher\endcsname{\LastTOCLevelWasHigher}% \@ifundefined{scr@tso@#1@beforeskip}{% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \@namedef{scr@tso@#1@beforeskip}{\glueexpr 2.25em \@plus\p@\relax}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}% }{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \scr@ifundefinedorrelax{l@chapter}{% \@namedef{scr@tso@#1@beforeskip}{\glueexpr 1.0em \@plus\p@\relax}% }{}% @@ -2315,16 +2333,16 @@ \csname scr@tso@#1@numsep\endcsname{.4em}% \expandafter\providecommand% \csname scr@tso@#1@numberformat\endcsname[1]{##1}% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname[1]{\large\bfseries ##1}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}% }{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \expandafter\providecommand% \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}% }{}% @@ -2336,14 +2354,14 @@ \expandafter\providecommand \csname Ifscr@tso@#1@breakafternumber\endcsname[2]{##2}% \@ifundefined{scr@tso@#1@linefill}{% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \@namedef{scr@tso@#1@linefill}{\hfill}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \@namedef{scr@tso@#1@linefill}{\hfill}% }{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \@namedef{scr@tso@#1@linefill}{\hfill}% }{}% }{}% @@ -2353,16 +2371,16 @@ }% }{}% \expandafter\providecommand\csname Ifscr@tso@#1@raggedpage\endcsname[2]{##2}% - \ifstr{#1}{part}{% + \Ifstr{#1}{part}{% \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}% }{% - \ifstr{#1}{chapter}{% + \Ifstr{#1}{chapter}{% \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}% }{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{% + \Ifstr{#1}{section}{% \expandafter\providecommand% \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}% }{}% @@ -2410,7 +2428,7 @@ \tocbasic@DependOnPenaltyAndTOCLevel{#1}% \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax {% - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \leftskip \z@ }{% \leftskip \@nameuse{scr@tso@#1@indent}\relax @@ -2420,7 +2438,7 @@ \@nameuse{Ifscr@tso@#1@raggedpage}{% \addtolength{\parfillskip}{\z@ \@plus 1fil}% }{}% - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \parindent \z@ }{% \parindent \@nameuse{scr@tso@#1@indent}\relax @@ -2527,7 +2545,7 @@ \mkern \@dotsep mu\hbox{#1}\mkern \@dotsep mu$}\hfill } -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,toctext) \DeclareTOCEntryStyle{toctext}[{% \DefineTOCEntryCommandOption{entryformat}% @@ -2557,7 +2575,7 @@ \DefineTOCEntryLengthOption{indent}% {scr@tso@}{@indent}{entry indent}% \scr@ifundefinedorrelax{#1tocdepth}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{% \expandafter\edef\csname #1tocdepth\endcsname{% \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax @@ -2566,15 +2584,15 @@ }{}% }{}% \@ifundefined{#1tocdepth}{% - \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% - \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% - \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% - \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% - \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% - \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% - \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% - \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{% + \Ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{% + \Ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{% + \Ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{% + \Ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{% + \Ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{% + \Ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{% + \Ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{% \expandafter\let\csname #1tocdepth\expandafter\endcsname \csname #1numdepth\endcsname }% @@ -2589,7 +2607,7 @@ }{}% \scr@ifundefinedorrelax{scr@tso@#1@indent}{% \@ifundefined{scr@#1@tocindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{% \expandafter\edef\csname scr@tso@#1@indent\endcsname{% @@ -2617,7 +2635,7 @@ }% }{}% \scr@ifundefinedorrelax{scr@tso@#1@rightindent}{% - \ifstrstart{#1}{sub}{% + \Ifstrstart{#1}{sub}{% \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@rightindent}{% \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}% }{% @@ -2630,20 +2648,20 @@ }% }{}% \@ifundefined{scr@tso@#1@indent}{% - \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% - \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{% + \Ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{% \scr@ifundefinedorrelax{l@chapter}{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{3.8em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{7em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% }% @@ -2652,15 +2670,15 @@ }% }% }{% - \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% - \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% - \ifstr{#1}{subsubsection}{% + \Ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{% + \Ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{% + \Ifstr{#1}{subsubsection}{% \@namedef{scr@tso@#1@indent}{7.0em}% }{% - \ifstr{#1}{paragraph}{% + \Ifstr{#1}{paragraph}{% \@namedef{scr@tso@#1@indent}{10em}% }{% - \ifstr{#1}{subparagraph}{% + \Ifstr{#1}{subparagraph}{% \@namedef{scr@tso@#1@indent}{12em}% }{% }% @@ -2715,7 +2733,7 @@ \global\let\scr@dte@toctext@raggedright\relax }% \global\let\scr@dte@toctext@afterpar\@empty - \iftocfeature{\@currext}{noindent}{% + \Iftocfeature{\@currext}{noindent}{% \leftskip \z@ }{% \leftskip \@nameuse{scr@tso@#1@indent}\relax @@ -2757,10 +2775,10 @@ \newcommand*{\scr@dte@toctext@raggedright}{} \newcommand*{\scr@dte@toctext@parend}{} \newcommand*{\scr@dte@toctext@lastend}{} -%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $ %%% (run: style,dottedtocline) \CloneTOCEntryStyle{dottedtocline}{default} -%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $ +%%% From File: $Id: tocbasic.dtx 3401 2019-11-22 07:30:48Z kohm $ %%% (run: exit) \AtBeginDocument{% \@ifundefined{MakeMarkcase}{% |