diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx | 93 |
1 files changed, 75 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx index 84ad3dff3ae..270a801e8c8 100644 --- a/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx +++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1261} +% \CheckSum{1338} % \iffalse meta-comment % ====================================================================== % scrkernel-tocstyle.dtx @@ -55,7 +55,7 @@ % Right brace \} Tilde \~} % % \iffalse -%%% 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 $ % The runs of run-time file generation: %<preidentify>%%% (run: preidentify) % - everything that is needed before selfidentification of resulting files @@ -80,7 +80,7 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2016-04-27 12:58:21 +0200 (Wed, 27 Apr 2016) $ + \filedate$Date: 2016-06-09 09:51:01 +0200 (Thu, 09 Jun 2016) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} \filerevision$Revision: 2254 $ \edef\reserved@a{% @@ -894,6 +894,27 @@ \if@tempswa \@nameuse{scr@dte@def@l@#2}{#3}% \expandafter\edef\csname scr@dte@#3@style\endcsname{#2}% +% \end{macrocode} +% \changes{v3.21}{2016/06/09}{\cs{toclevel@\emph{ebene}} wird für +% \textsf{hyperref} neu gesetzt}^^A +% Da verschiedene Pakete davon ausgehen, dass die Ebene +% \textsf{hyperref}-kompatibel gespeichert ist, setzen wir die hier +% zusätzlich. Das \textsf{hyperref} die Einstellungen ggf. überschreibt, +% machen wir das in der Dokumentpräambel auch mehrfach. +% \begin{macrocode} + \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 }% } @@ -1081,32 +1102,50 @@ %<*tocline> %%% (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}% +% \end{macrocode} +% \changes{v3.21}{2016/06/06}{neue Option \texttt{raggedentrytext}}^^A +% Die Option \texttt{raggedentrytext} muss leider etwas umständlich definiert +% werden, damit sie mit der früheren Definition eines Makros +% \cs{raggedchapterentry} halbwegs kompatibel ist. +% \begin{macrocode} + \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}% %</tocline> \DefineTOCEntryLengthOption{indent}% {scr@tso@}{@indent}{entry indent}% @@ -1118,13 +1157,14 @@ % Die Ebene, \texttt{level} bzw. \cs{\dots tocdepth}, kann auf zweierlei Arten % automatisch bestimmt werden. Zum einen wird für Sub-Ebenen die Elternebene % um eins erhöht verwendet, falls die Elternebene bereits definiert ist. +% \changes{v3.21}{2016/06/09}{\cs{the} eingefügt}^^A % \begin{macrocode} %<*tocline> \scr@ifundefinedorrelax{#1tocdepth}{% \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 }% }% }{}% @@ -1661,6 +1701,23 @@ \parindent \@nameuse{scr@tso@#1@indent}\relax \@afterindenttrue \interlinepenalty\@M +% \end{macrocode} +% \changes{v3.21}{2016/06/06}{\cs{ragged\dots entry} wird (wieder) +% ausgewertet}^^A +% \begin{macrocode} + \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}{% |