From d371156527e25068a4c4fe4d0dc48c33765727fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Apr 2015 21:18:07 +0000 Subject: etoc (28apr15) git-svn-id: svn://tug.org/texlive/trunk@37121 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etoc/etoc.sty | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty index 92f87fb28f4..6052838739a 100644 --- a/Master/texmf-dist/tex/latex/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -23,10 +23,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoc} - [2015/04/17 v1.08e Completely customisable TOCs (jfB)] + [2015/04/28 v1.08f Completely customisable TOCs (jfB)] %% %% Package: etoc -%% Version: 1.08e (2015/04/17) +%% Version: 1.08f (2015/04/28) %% License: LPPL 1.3c or later (see etoc.dtx) %% Copyright (C) 2012-2015 Jean-Francois Burnol %% @@ -105,12 +105,10 @@ \let\Etoc@all@@ \Etoc@@five@@ \let\Etoc@none@@ \Etoc@minf \let\Etoc@levellist\@empty -\def\Etoc@newlevel #1% -{\expandafter\def\expandafter\Etoc@levellist\expandafter - {\Etoc@levellist\Etoc@levellist@elt #1}% -} +\def\Etoc@newlevel #1{\expandafter\def\expandafter\Etoc@levellist\expandafter + {\Etoc@levellist\Etoc@levellist@elt #1}} \def\etocsetlevel#1#2{% - \expandafter\Etoc@newlevel\csname l@#1\endcsname + \@ifundefined{Etoc@#1@@}{\expandafter\Etoc@newlevel\csname l@#1\endcsname}{}% \ifcase#2\relax \expandafter\let \csname Etoc@#1@@\endcsname\Etoc@@zero@@ \expandafter\let \csname Etoc@#1@\endcsname\Etoc@@zero@ @@ -628,12 +626,10 @@ \ifEtoc@emptytoc \ifEtoc@notocifnotoc\else \Etoc@localtocfalse - \global\Etoc@stoptocfalse \Etoc@tableofcontents \fi \else \Etoc@localtocfalse - \global\Etoc@stoptocfalse \Etoc@tableofcontents \fi \endgroup\ifEtoc@mustclosegroup\endgroup\fi @@ -676,10 +672,10 @@ {% \ifnum\c@tocdepth>\Etoc@minf \else\expandafter - \Etoc@gobbletoetoc@ % skip all + \Etoc@gobbletoetoc@ \fi - \Etoc@par % moved here 1.08e for matters of emptiness test \etocbeforetitlehook % 1.07m + \Etoc@par % here 1.08e/1.08f \Etoc@storetocdepth % 1.07g \let\Etoc@savedcontentsline\contentsline % moved up here 1.08 \let\contentsline\Etoc@etoccontentsline -- cgit v1.2.3