etoc (26sep16)

git-svn-id: svn://tug.org/texlive/trunk@42150 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 20 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index cb5b3fe7190..cb369569476 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -23,14 +23,14 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoc}
- [2015/08/29 v1.08g Completely customisable TOCs (JFB)]
+ [2016/09/25 v1.08h Completely customisable TOCs (JFB)]
 %%
 %% Package: etoc
-%% Version: 1.08g (2015/08/29 -- doc 2016/09/09)
-%% License: LPPL 1.3c or later (see etoc.dtx)
-%% Copyright (C) 2012-2015 Jean-Francois Burnol
+%% Version: 1.08h-2016/09/25
+%% License: LPPL 1.3c
+%% Copyright (C) 2012-2016 Jean-Francois Burnol
 %%                         <jfbu at free dot fr>
-%% Copyright (C) 2014-2015 Christine Roemer
+%% Copyright (C) 2014-2016 Christine Roemer
 %%                         <Christine_Roemer at t-online dot de>
 %% and collaborators for the translation into German of the documentation
 %%
@@ -593,8 +593,8 @@
     \fi
     \@gobble\etoc@
     \endgroup\ifEtoc@mustclosegroup\endgroup\fi
-    \Etoc@aftertochook % 1.07h
-    \etocaftertochook % 1.07g
+    \Etoc@tocdepthreset % 1.07h, renamed 1.08h
+    \etocaftertochook   % 1.07g
 }
 \def\Etoc@getrefno #1#2\etoc@ {#1}
 \def\Etoc@getref #1{\@ifundefined{r@#1}{0}{\expandafter\expandafter\expandafter
@@ -633,8 +633,8 @@
         \Etoc@tableofcontents
     \fi
     \endgroup\ifEtoc@mustclosegroup\endgroup\fi
-    \Etoc@aftertochook % 1.07h
-    \etocaftertochook % 1.07g
+    \Etoc@tocdepthreset % 1.07h, renamed 1.08h
+    \etocaftertochook   % 1.07g
     \@gobble\etoc@
     }
 \def\Etoc@table@fcontents{%
@@ -650,6 +650,7 @@
 \let\etocaftercontentshook \@empty
 \def\etoctableofcontents{%
    \Etoc@openouttoc
+   \Etoc@tocdepthset % new with 1.08h
    \begingroup % closed in \Etoc@t@bleofcontents or \Etoc@localtableofcontents
       \let\tof@begingroup\@empty
       \let\tof@endgroup  \@empty
@@ -660,6 +661,7 @@
 \let\tableofcontents\etoctableofcontents
 \newcommand*\localtableofcontents{%
    \Etoc@openouttoc
+   \Etoc@tocdepthset % new with 1.08h
    \begingroup % closed in \Etoc@t@bleofcontents or \Etoc@localtableofcontents
       \let\tof@begingroup\@empty
       \let\tof@endgroup  \@empty
@@ -1318,9 +1320,12 @@
     \@ifundefined{Etoc@#1@@}
      {\PackageWarning{etoc}
        {Unknown sectioning unit #1, \protect\etocsetnextocdepth\space ignored}}
-     {\edef\Etoc@aftertochook {\global\c@tocdepth\the\c@tocdepth\space
-                              \let\noexpand\Etoc@aftertochook\noexpand\@empty }%
-      \global\c@tocdepth\csname Etoc@#1@@\endcsname}%
+     {\def\Etoc@tocdepthset
+          {\edef\Etoc@tocdepthreset {%
+                   \global\c@tocdepth\the\c@tocdepth\space
+                   \global\let\noexpand\Etoc@tocdepthreset\noexpand\@empty }%
+           \global\c@tocdepth\csname Etoc@#1@@\endcsname
+           \global\let\Etoc@tocdepthset\@empty}}%
 }%
 \addtocontents {toc}{\protect\@ifundefined{etoctocstyle}%
            {\let\protect\etoc@startlocaltoc\protect\@gobble
@@ -1333,8 +1338,9 @@
 \etocstandarddisplaystyle
 \etocobeytoctocdepth
 \etocobeydepthtags
-\let\Etoc@aftertochook\@empty % private for \etocsetnexttocdepth
-\let\etocaftertochook \@empty % public for end user.
+\let\Etoc@tocdepthreset\@empty % new 1.08h functioning of \etocsetnexttocdepth
+\let\Etoc@tocdepthset  \@empty %
+\let\etocaftertochook    \@empty % public for end user.
 \let\etocbeforetitlehook \@empty % new with 1.07m
 \endinput
 %%