summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/etoc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-23 21:37:43 +0000
committerKarl Berry <karl@freefriends.org>2014-04-23 21:37:43 +0000
commit01ad29db02bf6feea44fbbe6cce1bb52c4dc4e93 (patch)
tree5fc0c40b095cc7e469554537d3d943e1ae7c6516 /Master/texmf-dist/tex/latex/etoc
parent1421f3557eb7d3fbb2baea644579434d290bb587 (diff)
etoc (23apr14)
git-svn-id: svn://tug.org/texlive/trunk@33644 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/etoc')
-rw-r--r--Master/texmf-dist/tex/latex/etoc/etoc.sty22
1 files changed, 17 insertions, 5 deletions
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 <jfbu at free dot fr>
%%
\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