Skip to content

Commit

Permalink
revert to two arguments for \l@XXX
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrike Fischer committed May 25, 2023
1 parent 6788a79 commit a63295f
Showing 1 changed file with 61 additions and 37 deletions.
98 changes: 61 additions & 37 deletions required/latex-lab/latex-lab-toc-kernel-changes.dtx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
\def\contentsline#1#2#3#4%
{%
\@contentsline@cfgpoint@before{#1}{#2}{#3}{#4}%
%\gdef\@contentsline@destination{#4}%
\csname l@#1\endcsname{#2}{#3}{#4}%
\gdef\@contentsline@destination{#4}%
\csname l@#1\endcsname{#2}{#3}%
\@contentsline@cfgpoint@after{#1}{#2}{#3}{#4}%
}
% \end{macrocode}
Expand Down Expand Up @@ -246,7 +246,7 @@
% \begin{macrocode}
\def\@dottedtocline@cfgpoint@leaders#1{#1}

\def\@dottedtocline#1#2#3#4#5#6{%
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip \z@ \@plus.2\p@
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
Expand All @@ -255,19 +255,19 @@
\leavevmode
\@tempdima #3\relax
\advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
\UseHookWithArguments{contentsline/text/before}{4}{#1}{#4}{#5}{#6}%
\UseHookWithArguments{contentsline/text/before}{4}{#1}{#4}{#5}{\@contentsline@destination}%
\csname contentsline@text@#1@format\endcsname{#4}%
\UseHookWithArguments{contentsline/text/after}{4}{#1}{#4}{#5}{#6}%
\UseHookWithArguments{contentsline/text/after}{4}{#1}{#4}{#5}{\@contentsline@destination}%
\nobreak
\@dottedtocline@cfgpoint@leaders{%
\leaders\hbox{$\m@th
\mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill}%
\nobreak
\hb@xt@\@pnumwidth{\hfil\normalfont \normalcolor
\UseHookWithArguments{contentsline/page/before}{4}{#1}{#4}{#5}{#6}%
\UseHookWithArguments{contentsline/page/before}{4}{#1}{#4}{#5}{\@contentsline@destination}%
#5%
\UseHookWithArguments{contentsline/page/after}{4}{#1}{#4}{#5}{#6}%
\UseHookWithArguments{contentsline/page/after}{4}{#1}{#4}{#5}{\@contentsline@destination}%
\kern-\p@\kern\p@}%
\par}%
\fi}
Expand All @@ -292,7 +292,7 @@
% \begin{macrocode}
\AddToHook{class/article/after}
{
\renewcommand*\l@part[3]{% as in contentsline: content, page, target
\renewcommand*\l@part[2]{% as in contentsline: content, page
\ifnum \c@tocdepth >-2\relax
\addpenalty\@secpenalty
\addvspace{2.25em \@plus\p@}%
Expand All @@ -302,19 +302,23 @@
\parfillskip -\@pnumwidth
{\leavevmode
\large \bfseries
\UseHookWithArguments{contentsline/text/before}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/before}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
\csname contentsline@text@-1@format\endcsname{#1}%
\UseHookWithArguments{contentsline/text/after}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/after}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
\hfil
\hb@xt@\@pnumwidth{\hss
\UseHookWithArguments{contentsline/page/before}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/before}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
#2%
\UseHookWithArguments{contentsline/page/after}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/after}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
\kern-\p@\kern\p@}}\par
\nobreak
\endgroup
\fi}
\renewcommand*\l@section[3]{%
\renewcommand*\l@section[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty\@secpenalty
\addvspace{1.0em \@plus\p@}%
Expand All @@ -325,21 +329,25 @@
\leavevmode \bfseries
\advance\leftskip\@tempdima
\hskip -\leftskip
\UseHookWithArguments{contentsline/text/before}{4}{\toclevel@section}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/before}{4}
{\toclevel@section}{#1}{#2}{\@contentsline@destination}%
\csname contentsline@text@1@format\endcsname{#1}%
\UseHookWithArguments{contentsline/text/after}{4}{\toclevel@section}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/after}{4}
{\toclevel@section}{#1}{#2}{\@contentsline@destination}%
\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss
\UseHookWithArguments{contentsline/page/before}{4}{\toclevel@section}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/before}{4}
{\toclevel@section}{#1}{#2}{\@contentsline@destination}%
#2%
\UseHookWithArguments{contentsline/page/after}{4}{\toclevel@section}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/after}{4}
{\toclevel@section}{#1}{#2}{\@contentsline@destination}%
\kern-\p@\kern\p@}\par
\endgroup
\fi}
}
\AddToHook{class/report/after}
{
\renewcommand*\l@part[3]{%
\renewcommand*\l@part[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
\addvspace{2.25em \@plus\p@}%
Expand All @@ -349,19 +357,23 @@
\parfillskip -\@pnumwidth
{\leavevmode
\large \bfseries
\UseHookWithArguments{contentsline/text/before}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/before}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
\csname contentsline@text@-1@format\endcsname{#1}%
\UseHookWithArguments{contentsline/text/after}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/after}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
\hfil
\hb@xt@\@pnumwidth{\hss
\UseHookWithArguments{contentsline/page/before}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/before}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
#2%
\UseHookWithArguments{contentsline/page/after}{4}{\toclevel@part}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/after}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%
\kern-\p@\kern\p@}}\par
\nobreak
\endgroup
\fi}
\renewcommand*\l@chapter[3]{%
\renewcommand*\l@chapter[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
\vskip 1.0em \@plus\p@
Expand All @@ -372,23 +384,27 @@
\leavevmode \bfseries
\advance\leftskip\@tempdima
\hskip -\leftskip
\UseHookWithArguments{contentsline/text/before}{4}{\toclevel@chapter}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/before}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%
\csname contentsline@text@0@format\endcsname
{#1}%
\UseHookWithArguments{contentsline/text/after}{4}{\toclevel@chapter}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/after}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%
\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss
\UseHookWithArguments{contentsline/page/before}{4}{\toclevel@chapter}{#1}{#2}{#3}%%
\UseHookWithArguments{contentsline/page/before}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%%
#2%
\UseHookWithArguments{contentsline/page/after}{4}{\toclevel@chapter}{#1}{#2}{#3}%%
\UseHookWithArguments{contentsline/page/after}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%%
\kern-\p@\kern\p@}\par
\penalty\@highpenalty
\endgroup
\fi}
}
\AddToHook{class/book/after}
{
\renewcommand*\l@part[3]{%
\renewcommand*\l@part[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
\addvspace{2.25em \@plus\p@}%
Expand All @@ -398,19 +414,23 @@
\parfillskip -\@pnumwidth
{\leavevmode
\large \bfseries
\UseHookWithArguments{contentsline/text/before}{4}{\toclevel@part}{#1}{#2}{#3}%%
\UseHookWithArguments{contentsline/text/before}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%%
\csname contentsline@text@-1@format\endcsname{#1}%
\UseHookWithArguments{contentsline/text/after}{4}{\toclevel@part}{#1}{#2}{#3}%%
\UseHookWithArguments{contentsline/text/after}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%%
\hfil
\hb@xt@\@pnumwidth{\hss
\UseHookWithArguments{contentsline/page/before}{4}{\toclevel@part}{#1}{#2}{#3}%%
\UseHookWithArguments{contentsline/page/before}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%%
#2%
\UseHookWithArguments{contentsline/page/after}{4}{\toclevel@part}{#1}{#2}{#3}%%
\UseHookWithArguments{contentsline/page/after}{4}
{\toclevel@part}{#1}{#2}{\@contentsline@destination}%%
\kern-\p@\kern\p@}}\par
\nobreak
\endgroup
\fi}
\renewcommand*\l@chapter[3]{%
\renewcommand*\l@chapter[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
\vskip 1.0em \@plus\p@
Expand All @@ -421,15 +441,19 @@
\leavevmode \bfseries
\advance\leftskip\@tempdima
\hskip -\leftskip
\UseHookWithArguments{contentsline/text/before}{4}{\toclevel@chapter}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/before}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%
\csname contentsline@text@0@format\endcsname
{#1}%
\UseHookWithArguments{contentsline/text/after}{4}{\toclevel@chapter}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/text/after}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%
\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss
\UseHookWithArguments{contentsline/page/before}{4}{\toclevel@chapter}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/before}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%
#2%
\UseHookWithArguments{contentsline/page/after}{4}{\toclevel@chapter}{#1}{#2}{#3}%
\UseHookWithArguments{contentsline/page/after}{4}
{\toclevel@chapter}{#1}{#2}{\@contentsline@destination}%
\kern-\p@\kern\p@}\par
\penalty\@highpenalty
\endgroup
Expand Down

0 comments on commit a63295f

Please sign in to comment.