From 23916347932fe1f7bae3f1f8c84b8f1cfcfcfa4c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Dec 2012 02:11:18 +0000 Subject: etoc (1dec12) git-svn-id: svn://tug.org/texlive/trunk@28411 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etoc/etoc.sty | 41 +++++++++++++++++-------------- 1 file changed, 23 insertions(+), 18 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 0fbedff0f51..dba9b9d17ae 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} - [2012/11/28 v1.05 easily customizable TOCs (jfB)] + [2012/12/01 v1.05 easily customizable TOCs (jfB)] %% Package `etoc' by Jean-Francois Burnol %% Copyright (C) 2012 by Jean-Francois Burnol \NeedsTeXFormat{LaTeX2e} @@ -465,8 +465,11 @@ \def\Etoc@getref #1{\@ifundefined{r@#1}{0}{\expandafter\expandafter\expandafter \Etoc@getrefno\csname r@#1\endcsname\relax\etoc@}} \def\Etoc@ref#1{\Etoc@localtableofcontents{\Etoc@getref{#1}}} -\def\Etoc@label#1{\label{#1}\ifEtoc@tocwithid\else\addtocontents{toc} - {\string\etoc@startlocaltoc\string{\arabic{etoc@tocid}\string}}\fi +\def\Etoc@label#1{\label{#1}% + \ifEtoc@tocwithid\else + \addtocontents{toc} + {\string\etoc@startlocaltoc\string{\arabic{etoc@tocid}\string}}% + \fi \futurelet\Etoc@nexttoken\Etoc@t@bleofcontents} {\def\1{\Etoc@again}\expandafter \gdef\1 {\futurelet\Etoc@nexttoken\Etoc@t@bleofcontents}} @@ -496,7 +499,7 @@ \def\localtable@fcontents{\par \refstepcounter{etoc@tocid}% \addtocontents{toc} - {\string\etoc@startlocaltoc\string{\arabic{etoc@tocid}\string}}% + {\string\etoc@startlocaltoc\string{\arabic{etoc@tocid}\string}} \Etoc@tocwithidtrue \futurelet\Etoc@nexttoken\Etoc@t@bleofcontents} \def\tableofcontents{\@ifstar @@ -710,7 +713,7 @@ \newcommand\etoc@ruledheading[1]{% \hb@xt@\linewidth{\color@begingroup \hss #1\hss\hskip-\linewidth - \etoctoprulecolorcmd\leaders\etoctoprule\hfil + \etoctoprulecolorcmd\leaders\etoctoprule\hss \phantom{#1}% \leaders\etoctoprule\hss\color@endgroup}% \nointerlineskip\vskip\etocinnertopsep} @@ -786,7 +789,7 @@ \egroup \vskip\etocinnerbottomsep \egroup - \vbox{\hsize\linewidth + \vbox{\hsize\linewidth \ifx\etocbkgcolorcmd\Etoc@relax\else \kern\ht\etoc@framed@titlebox \kern\dp\etoc@framed@titlebox @@ -798,12 +801,11 @@ \@depth\dp\etoc@framed@contentsbox \hss \etocrightrulecolorcmd\etocrightrule - \color@endgroup} - \nointerlineskip - \vskip-\dp\etoc@framed@contentsbox - \vskip-\ht\etoc@framed@contentsbox - \vskip-\dp\etoc@framed@titlebox - \vskip-\ht\etoc@framed@titlebox + \color@endgroup}\nointerlineskip + \vskip-\dp\etoc@framed@contentsbox + \vskip-\ht\etoc@framed@contentsbox + \vskip-\dp\etoc@framed@titlebox + \vskip-\ht\etoc@framed@titlebox \fi \box\etoc@framed@titlebox\nointerlineskip \hb@xt@\linewidth{\color@begingroup @@ -867,17 +869,17 @@ \@ifstar {\etoc@framedtoci} {\etoc@framedtoc}} -\newcommand\localetocmulticol{\begingroup +\newcommand\etoclocalmulticol{\begingroup \Etoc@mustclosegrouptrue \@ifstar {\etoc@local@multicoltoci} {\etoc@local@multicoltoc}} -\newcommand\localetocruled{\begingroup +\newcommand\etoclocalruled{\begingroup \Etoc@mustclosegrouptrue \@ifstar {\etoc@local@ruledtoci} {\etoc@local@ruledtoc}} -\newcommand\localetocframed{\begingroup +\newcommand\etoclocalframed{\begingroup \Etoc@mustclosegrouptrue \@ifstar {\etoc@local@framedtoci} @@ -906,15 +908,18 @@ {\if@restonecol \twocolumn \fi}} \let\etocreportstyle\etocbookstyle \let\etocreportstylenomarks\etocbookstylenomarks +\newcommand\Etoc@addcontentsline{} \newcommand\etocmemoirtoctotocfmt[2]{% - \renewcommand\etocaftertitlehook{\ifmem@em@starred@listof \else - \phantomsection \addcontentsline {toc}{#1}{#2}\fi}} + \renewcommand\Etoc@addcontentsline{\addcontentsline {toc}{#1}{#2}}% + \renewcommand\etocaftertitlehook{% + \ifmem@em@starred@listof + \else\phantomsection\aftergroup\Etoc@addcontentsline\fi}} \newcommand\etocmemoirstyle{% \etocsettocstyle {\ensureonecol \par \begingroup \@nameuse {@tocmaketitle} \Etoc@aftertitlehook\let\Etoc@aftertitlehook\relax \parskip \cftparskip \@nameuse {cfttocbeforelisthook}} - {\@nameuse {cfttocafterlisthook}\endgroup \restorefromonecol}} + {\@nameuse {cfttocafterlisthook}\endgroup\restorefromonecol}} \newcommand\etocscrartclstyle{% \etocsettocstyle {\let\if@dynlist\if@tocleft -- cgit v1.2.3