From 01ad29db02bf6feea44fbbe6cce1bb52c4dc4e93 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Apr 2014 21:37:43 +0000 Subject: etoc (23apr14) git-svn-id: svn://tug.org/texlive/trunk@33644 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etoc/etoc.sty | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 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 6fe98ce69f2..5cf8ba3842d 100644 --- a/Master/texmf-dist/tex/latex/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -22,10 +22,10 @@ %% in the same archive or directory.) %% \ProvidesPackage{etoc} - [2014/03/06 v1.07k Completely customisable TOCs (jfB)] + [2014/04/22 v1.07l Completely customisable TOCs (jfB)] %% %% Package: etoc -%% Version: 2014/03/06 v1.07k +%% Version: 2014/04/22 v1.07l %% Copyright (C) 2012-2013-2014 by Jean-Francois Burnol %% \NeedsTeXFormat{LaTeX2e} @@ -1129,7 +1129,8 @@ \if@cfttocbibind\@cftdobibtoc\fi }% {\endgroup\@cfttocfinish }% } -\@ifpackageloaded{tocloft} +\@ifclassloaded{memoir}{} +{\@ifpackageloaded{tocloft} {\if@cftnctoc\else \renewcommand*\etocstandarddisplaystyle{\etoctocloftstyle} \AtBeginDocument{\let\tableofcontents\etoctableofcontents} @@ -1147,7 +1148,8 @@ \@cftnctoctrue }% {}% }% - } + }% +} \def\Etoc@addtocontents #1#2% {\ifEtoc@hyperref \addtocontents {toc}{\protect\contentsline @@ -1206,7 +1208,16 @@ {use \protect\etocsettocdepth.toc as replacement (check the manual)}% }% \AtBeginDocument {% - \@ifpackageloaded {tocvsec2} + \@ifclassloaded{memoir} + {\PackageWarning{etoc}{You may consider using \protect\etocsettocdepth.toc + as a drop-in^^J + replacement to the memoir own \protect\settocdepth\space + if you wish to exploit etoc to its^^J + fullest. Similarly consider using + \protect\etocsettocdepth\space and + \protect\etocsetnexttocdepth^^J rather + than memoir's \protect\maxtocdepth.}} + {\@ifpackageloaded {tocvsec2} {\def\maxtocdepth #1{\Etoc@tocvsec@err \maxtocdepth }% \def\settocdepth #1{\Etoc@tocvsec@err \settocdepth }% \def\resettocdepth {\@ifstar {\Etoc@tocvsec@err \resettocdepth }% @@ -1221,6 +1232,7 @@ \protect\tableofcontents\space reverted. Use \protect\etocsettocdepth.toc as a replacement^^J for the tocvsec2 toc-related commands}}{}% + }% }% \def\invisibletableofcontents {\etocsetnexttocdepth {-3}\tableofcontents }% \def\invisiblelocaltableofcontents -- cgit v1.2.3