From 4abd94a3d5c1416292c8e8a7ba4121173b2410da Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Feb 2013 22:56:51 +0000 Subject: etoc (22feb13) git-svn-id: svn://tug.org/texlive/trunk@29203 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etoc/etoc.sty | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/etoc') diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty index 8cd106db3a8..f5ece10416c 100644 --- a/Master/texmf-dist/tex/latex/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) %% \ProvidesPackage{etoc} - [2013/02/02 v1.07b easily customizable TOCs (jfB)] + [2013/02/22 v1.07c easily customizable TOCs (jfB)] %% %% Package `etoc' by Jean-Francois Burnol %% Copyright (C) 2012, 2013 by Jean-Francois Burnol @@ -172,14 +172,17 @@ \fi} \AtBeginDocument{% \@ifpackageloaded{hyperref}{\Etoc@hyperreftrue - \def\Etoc@et@hop#1#2#3#4#5{#1{#3}{#4}{#5}#2}} + \def\Etoc@et@hop#1#2#3#4#5{#1{#3}{#4}{#5}#2}% + \long\def\Etoc@gobblesixorfive#1#2#3#4#5#6{}} {\Etoc@hyperreffalse - \def\Etoc@et@hop#1#2#3#4{#1{#3}{#4}#2}}} - \def\Etoc@swa#1{% + \def\Etoc@et@hop#1#2#3#4{#1{#3}{#4}#2}% + \long\def\Etoc@gobblesixorfive#1#2#3#4#5{}}% +} +\def\Etoc@swa#1{% \Etoc@et@hop {\Etoc@savedcontentsline{#1}} {\Etoc@prefix\Etoc@contents}} - \def\Etoc@swb#1{% +\def\Etoc@swb#1{% \Etoc@et@hop {\Etoc@savedcontentsline{#1}} {\Etoc@contents}} @@ -187,11 +190,7 @@ \def\Etoc@etoccontentsline#1{% \global\expandafter\let\expandafter\Etoc@tmp\csname Etoc@#1@@\endcsname \Etoc@skipthisonefalse - \ifEtoc@hyperref - \def\Etoc@next{\expandafter\@gobbletwo\@gobblefour}% - \else - \def\Etoc@next{\expandafter\@gobble\@gobblefour}% - \fi + \let\Etoc@next\Etoc@gobblesixorfive \ifnum\Etoc@tmp=\Etoc@@six@@ \Etoc@skipthisonetrue \else @@ -656,11 +655,11 @@ {\setbox\tw@\hbox{\etocabbrevpagename\etocpage}}% \advance\dimen\z@\wd\tw@ \ifdim\dimen\z@ < \linewidth - \vbox{\etocname~% modified in 1.07b (after removal of \xspace) + \vbox{\etocname~% \leaders\box\z@\hfil\box\tw@ \baselineskip\etocbaselinespreadone\baselineskip\par} \else - \vbox{\etocname~% modified in 1.07b + \vbox{\etocname~% \leaders\copy\z@\hfil\break \hbox{}\leaders\box\z@\hfil\box\tw@ \baselineskip\etocbaselinespreadone\baselineskip\par} -- cgit v1.2.3