etoc (28apr15)

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

7 files changed, 103 insertions, 96 deletions

diff --git a/Master/texmf-dist/doc/latex/etoc/README b/Master/texmf-dist/doc/latex/etoc/README
index d40c775d4c1..cc0e3d6a7b6 100644
--- a/Master/texmf-dist/doc/latex/etoc/README
+++ b/Master/texmf-dist/doc/latex/etoc/README
@@ -1,4 +1,4 @@
-    Source:  etoc.dtx (v1.08e 2015/04/17)
+    Source:  etoc.dtx (v1.08f 2015/04/28)
     Author:  Jean-Francois Burnol
     Author:  Christine Roemer et al. (German tranlation)
     Info:    Completely customisable TOCs
@@ -131,6 +131,11 @@ etoc.dvi, etoc-DE.dvi.
 RECENT CHANGES
 
 
+v1.08f [2015/04/28]
+
+Minor changes to the documentation. \etocsetlevel more economical.
+
+
 v1.08e [2015/04/17]
 
 The command \etocchecksemptiness tells etoc to not print, from that
diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index 66f00ed4ba4..0e5c8296fd0 100644
--- a/Master/texmf-dist/doc/latex/etoc/README.md
+++ b/Master/texmf-dist/doc/latex/etoc/README.md
@@ -1,6 +1,6 @@
 <!-- -->
 
-    Source:  etoc.dtx (v1.08e 2015/04/17)
+    Source:  etoc.dtx (v1.08f 2015/04/28)
     Author:  Jean-Francois Burnol
     Author:  Christine Roemer et al. (German tranlation)
     Info:    Completely customisable TOCs
@@ -126,6 +126,11 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
 RECENT CHANGES
 ==============
 
+v1.08f \[2015/04/28\]
+---------------------
+
+Minor changes to the documentation. `\etocsetlevel` more economical.
+
 v1.08e \[2015/04/17\]
 ---------------------
 
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
index f08f640499d..be95c49d067 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
+++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 670f5a3b748..b06f9c4a8fb 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc.pdf
+++ b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index 70cda35fe26..2fb70ad6fb8 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -1,13 +1,13 @@
 % -*- coding: utf-8; -*-
 %<*none>
-{\def\doctimestamp {Time-stamp: <17-04-2015 22:17:33 CEST>}%
+{\def\doctimestamp {Time-stamp: <28-04-2015 22:27:41 CEST>}%
  \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
  \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}%
 %</none>
 %<*!readme>
 %%
 %% 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 
 %%                         <jfbu at free dot fr>
@@ -17,9 +17,9 @@
 %%
 %</!readme>
 %<*insfile>
-\def\etocpkgdate        {2015/04/17}
-\def\etocdocdate        {2015/04/17}
-\def\etocpkgversion     {v1.08e}
+\def\etocpkgdate        {2015/04/28}
+\def\etocdocdate        {2015/04/28}
+\def\etocpkgversion     {v1.08f}
 \def\etocpkgdescription {Completely customisable TOCs (jfB)}
 %</insfile>
 %<*none>
@@ -36,7 +36,7 @@
     \catcode32=13\catcode`\\=12^^Brelax^^A
 ^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
 {% Package: etoc
-% Version: 1.08e (2015/04/17)
+% Version: 1.08f (2015/04/28)
 % License: LPPL 1.3c or later
 % Copyright (C) 2012-2015 Jean-Francois Burnol <jfbu at free dot fr>
 % Copyright (C) 2014-2015 Christine Roemer <Christine_Roemer at t-online dot de>
@@ -63,7 +63,7 @@
 % etoc.dvi, etoc-DE.dvi, README.md.
 %
 % Running etex (or latex or pdflatex) on etoc.dtx extracts etoc.sty,
-% etoc.ins, etoc.etex, etoc-DE.tex, and README.md. See README.md for
+% etoc.ins, etoc.tex, etoc-DE.tex, and README.md. See README.md for
 % further instructions.
 }}%
 \iffalse
@@ -71,7 +71,7 @@
 %<*readme>
 <!-- -->
 
-    Source:  etoc.dtx (v1.08e 2015/04/17)
+    Source:  etoc.dtx (v1.08f 2015/04/28)
     Author:  Jean-Francois Burnol
     Author:  Christine Roemer et al. (German tranlation)
     Info:    Completely customisable TOCs
@@ -197,6 +197,11 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
 RECENT CHANGES
 ==============
 
+v1.08f \[2015/04/28\]
+---------------------
+
+Minor changes to the documentation. `\etocsetlevel` more economical.
+
 v1.08e \[2015/04/17\]
 ---------------------
 
@@ -3477,7 +3482,7 @@ example was motivated on |2015/03/11| by
     }
 }%
 
-\begin{figure}[th!]
+\begin{figure}[thp!]
 \tableofcontents\label{toc:mindmap}%
 \centeredline{\resizebox{.85\paperwidth}{!}%
 {\begin{tikzpicture}[mindmap,
@@ -3600,7 +3605,7 @@ appears \vpageref{toc:mindmap}.
     }
 }%
 
-\begin{figure}[th!]
+\begin{figure}[thp!]
 \tableofcontents\label{toc:mindmap}%
 \centeredline{\resizebox{.85\paperwidth}{!}%
 {\begin{tikzpicture}[mindmap,
@@ -3856,12 +3861,12 @@ environment or group where they are used.
 
 \section{Not displayed empty TOCs}
 
-\subsection{The command \csbhyp{etocchecksemptiness}}
+\subsection{The \csbhyp{etocchecksemptiness} command}
 \label{etocchecksemptiness}
 
-The user needs to issue \csb{etocchecksemptiness} to tell \etoc to check for
-each local table of contents if it is in fact empty; in that case nothing gets
-printed at all.\footnote{Thanks to Paul Gaborit who asked for
+The user needs to issue \csb{etocchecksemptiness} to tell \etoc to check whether
+local tables of contents are empty and in case of emptiness to print nothing
+at all.\footnote{Thanks to Paul Gaborit who asked for
 such a feature.} This
 can be useful to authors of \LaTeX{} classes who for example wish to have a
 |\chapter| command doing systematically a \csa{localtableofcontents}, or for
@@ -4638,11 +4643,11 @@ class should be obeyed, too.
   \dots}
 
 These are the commands used internally by \etoc in compatibility mode
-depending on the document class. For example \csa{etocarticlestyle} uses
-|\section*{\contentsname}| (and puts marks in the page) whereas
-\csa{etocbookstyle} uses |\chapter*{\contentsname}|. It can prove useful to
-issue \csa{etocarticlestyle} for a \csa{localtableofcontents} inside a
-chapter, in |book| class and compatibility mode for the global TOC display
+depending on the document class. For example \csa{etocarticlestyle} instructs
+\etoc to use |\section*{\contentsname}| (with marks on the page) and
+\csa{etocbookstyle} says to use |\chapter*{\contentsname}|. It can prove
+useful to issue \csa{etocarticlestyle} for a \csa{localtableofcontents} inside
+a chapter, in |book| class and compatibility mode for the global TOC display
 style.
 
 \subsection{The command \csbhyp{etocinline}}
@@ -4734,11 +4739,16 @@ beginning of this \autoref{part:globalcmds}.
 
 We now opt for a ``framed'' style, using the package default
 line styles and some colors added (it has been put in a float which appears
-\vpageref{toc:b}).\footnote{inside the |figure| environment and before the
-  framed toc, which uses |multicols|, we added \csa{normalcolor} as work-around
-  to an interaction bug (related to the \csa{color\{red\}} command we added to
-  the |.toc| file) between |multicols|, |color| and the |figure|
-  environment. This bug has nothing to do with \etoc.}
+\vpageref{toc:b}).
+
+%
+% (13 octobre 2013)
+% \footnote{inside the |figure| environment and before the
+%   framed toc, which uses |multicols|, we added \csa{normalcolor} as work-around
+%   to an interaction bug (related to the \csa{color\{red\}} command we added to
+%   the |.toc| file) between |multicols|, |color| and the |figure|
+%   environment. This bug has nothing to do with \etoc.}
+%  RETIRÉ le 28 avril 2015 pour 1.08f
 
 \begin{verbatim}
 \etocdefaultlines
@@ -4769,7 +4779,6 @@ line styles and some colors added (it has been put in a float which appears
       one page. It has the label |toc:b|.}}}
 \begin{figure}[ht!]
   \centering
-\normalcolor % work-around to a bug involving color and multicols (and figure)
 \tableofcontents \label{toc:b} \ref{toc:globalcmds}
 \end{figure}
 \endgroup
@@ -4804,7 +4813,7 @@ line styles and some colors added (it has been put in a float which appears
       one page. It has the label |toc:b|.}}}
 \begin{figure}[ht!]
   \centering
-\normalcolor % work-around to a bug involving color and multicols (and figure)
+%\normalcolor % work-around to a bug involving color and multicols (and figure)
 \tableofcontents \label{toc:b} \ref{toc:globalcmds}
 \end{figure}
 \endgroup
@@ -4828,8 +4837,8 @@ line styles and some colors added (it has been put in a float which appears
 Let us finally make some crazy inline display of the table of
 contents of this entire document. We will typeset the subsections as
 footnotes... This kind of style is suitable for a hyperlinked
-document, probably not for print! (although I like it, but my personal taste in
-many matters does not seem to be widely shared).
+document, probably not for print! (although I like it, but my personal tastes in
+many matters do not seem to be widely shared).
 
 %%%% Note: 27 april 2014 
 
@@ -5751,7 +5760,7 @@ except perhaps if using the \eTeX{} \csa{unexpanded}).
 The method here is the most powerful because it filters out of the
 |.toc| file only the data we want (the other things are not ignored,
 they are executed but hopefully do not create havoc; typically they are
-language changing instructions, or updates to certain counters, etc...),
+language changing instructions, etc...),
 and we are less susceptible to fall potential victims of various
 external macros inserted in the |.toc| file by other packages.
 
@@ -7858,7 +7867,7 @@ dessen Synonym \csb{etocnopar} besteht.} Das ist der spätere Job einer
 % pour que varioref fonctionne bien, je dois mettre la \tableofcontents
 % au plus près de l'environnement forest
 
-\begin{figure}[th!]\centering
+\begin{figure}[thp!]\centering
  \etocsetnexttocdepth{subsection}
      \tableofcontents \label{toc:forest}\ref{toc:overview}
      \hypersetup{hidelinks}%
@@ -7922,7 +7931,7 @@ Der resultierende Baum wird in einem \hyperref[toc:forest]{Puffer} angelegt, wel
 % TOC yet. So we must give a safe default value to \treetok
 \treetok{[{run latex again}]}
 
-\begin{figure}[th!]\centering
+\begin{figure}[thp!]\centering
      \etocsetnexttocdepth{subsection}
      \tableofcontents \label{toc:forest}\ref{toc:overview}
      \hypersetup{hidelinks}%
@@ -8053,7 +8062,7 @@ Tabelle der Inhalte von diesem (oder einem anderen) Dokumententeil, nur ein
   {\treetok{\node {\hyperref[part:overview]{Überblick}}}}
   {\global\appendtotok\treetok{ ;}}
 
-\begin{figure}[th!]\centering
+\begin{figure}[thp!]\centering
 \etocsetnexttocdepth{subsection}
    \tableofcontents \label{toc:molecule}\ref{toc:overview}
    \hypersetup{hidelinks}%
@@ -8080,7 +8089,7 @@ werden soll). Wir erhalten somit das Inhaltsverzeichnis als
 \vpageref[above]{toc:molecule}. Hier ist der aktuelle, tatsächlich produzierte
 Code:
 \begin{verbatim}
-\begin{figure}[th!]\centering
+\begin{figure}[thp!]\centering
    \etocsetnexttocdepth{subsection}
    \tableofcontents \label{toc:molecule} \ref{toc:overview}
    \hypersetup{hidelinks}%
@@ -8252,7 +8261,7 @@ page}.}
     }
 }%
 
-\begin{figure}[th!]
+\begin{figure}[thp!]
 \tableofcontents\label{toc:mindmap}%
 \centeredline{\resizebox{.85\paperwidth}{!}%
 {\begin{tikzpicture}[mindmap,
@@ -8375,7 +8384,7 @@ hier \vpageref{toc:mindmap}.
     }
 }%
 
-\begin{figure}[th!]
+\begin{figure}[thp!]
 \tableofcontents\label{toc:mindmap}%
 \centeredline{\resizebox{.85\paperwidth}{!}%
 {\begin{tikzpicture}[mindmap,
@@ -8639,12 +8648,12 @@ Umgebung oder Gruppe sind, in der sie verwendet werden.
 \begin{otherlanguage}{english}
 \section{Not displayed empty TOCs}
 
-\subsection{The command \csbhyp{etocchecksemptiness}}
+\subsection{The \csbhyp{etocchecksemptiness} command}
 \label{etocchecksemptiness}
 
-The user needs to issue \csb{etocchecksemptiness} to tell \etoc to check for
-each local table of contents if it is in fact empty; in that case nothing gets
-printed at all.\footnote{Thanks to Paul Gaborit who asked for
+The user needs to issue \csb{etocchecksemptiness} to tell \etoc to check whether
+local tables of contents are empty and in case of emptiness to print nothing
+at all.\footnote{Thanks to Paul Gaborit who asked for
 such a feature.} This
 can be useful to authors of \LaTeX{} classes who for example wish to have a
 |\chapter| command doing systematically a \csa{localtableofcontents}, or for
@@ -9500,12 +9509,14 @@ wobei es mit einem Label versehen wurde.
 Als nächstes wollen wir ein gerahmtes Inhaltsverzeichnis erzeugen, wobei wir den
 vom Paket vorgegebenen Linienstil nutzen und ein paar Farben hinzufügen wollen.
 (Es wurde in eine Float"=Umgebung eingefügt, die man \vpageref{toc:b}
-findet.)\footnote{Innerhalb der |figure|-Umgebung und vor dem gerahmten
-Inhaltsverzeichnis, welches die Option |multicols| nutzt, haben wir den Befehl
-\csa{normalcolor} eingefügt, um einen Bug zu umgehen, der durch die Interaktion
-zwischen |multicols|, |color| und der |figure|-Umgebung entsteht. (Wir brauchen
-den Befehl \csa{color\{red\}} in der |.toc|-Datei.) Der Fehler wird nicht durch
-das \etoc"=Paket verursacht.} 
+findet.)
+
+% \footnote{Innerhalb der |figure|-Umgebung und vor dem gerahmten
+% Inhaltsverzeichnis, welches die Option |multicols| nutzt, haben wir den Befehl
+% \csa{normalcolor} eingefügt, um einen Bug zu umgehen, der durch die Interaktion
+% zwischen |multicols|, |color| und der |figure|-Umgebung entsteht. (Wir brauchen
+% den Befehl \csa{color\{red\}} in der |.toc|-Datei.) Der Fehler wird nicht durch
+% das \etoc"=Paket verursacht.} 
 
 \begin{verbatim}
 \etocdefaultlines
@@ -9536,7 +9547,6 @@ das \etoc"=Paket verursacht.}
       Es hat das Label |toc:b|.}}}
 \begin{figure}[ht!]
   \centering
-\normalcolor % Workaround für einen Bug von color und multicols (und figure)
 \tableofcontents \label{toc:b} \ref{toc:globalcmds}
 \end{figure}
 \endgroup
@@ -9571,24 +9581,11 @@ das \etoc"=Paket verursacht.}
       Es hat das Label |toc:b|.}}}
 \begin{figure}[ht!]
   \centering
-\normalcolor % work-around to a bug involving color and multicols (and figure)
+%\normalcolor % work-around to a bug involving color and multicols (and figure)
 \tableofcontents \label{toc:b} \ref{toc:globalcmds}
 \end{figure}
 \endgroup
 
-% Il y a un color leak du framed mais uniquement lorsqu'il est mis dans le
-% float. 2013/10/13, qui révèle un bug (?? NON) du style framed je vais regarder
-% mais bon. Le leak apparaît avec ruled aussi, et même avec juste multicolstyle
-% MAIS PAS EN UNE SEULE COLONNE (même framed ou ruled). il semble qu'il y aie
-% donc un problème d'interaction avec multicol là. à voir. Pas le temps
-% maintenant.
-
-% 2013/10/14
-% il s'agit en fait d'un bug de color+multicols+figure qui n'a rien à voir avec
-% etoc: 
-% http://tex.stackexchange.com/questions/138783/color-leak-from-multicols-within-a-figure
-% J'ai trouvé le work-around qui consiste simplement à ajouter un \normalcolor
-% _avant_ le multicols à l'intérieur de figure
 
 \subsection{Eine (verrückte) In\-line"=Dar\-stellung}
 
@@ -10531,8 +10528,7 @@ Die Methode hier ist die stärkste, weil sie aus der |.toc|-Datei
 nur die Daten herausfiltert, die wir wollen (die anderen Dinge
 werden nicht ignoriert, sie werden ausgeführt, jedoch ohne
 hoffentlich Chaos zu schaffen; typisch sind dafür die Sprache von
-Anleitungen zu ändern oder Updates von bestimmten Schaltern
-(counters), etc. \ldots ). Und wir sind weniger anfällig,
+Anleitungen zu ändern, etc. \ldots ). Und wir sind weniger anfällig,
 potentielle Opfer von verschiedenen Fallen bei externen Makros
 innerhalb der |.toc|-Datei aus anderen Paketen stammend.
 
@@ -10713,7 +10709,7 @@ Die {\color{niceone}|tableof|}-Befehle \csa{tableof},
 global) nach den Standards der Dokumentklasse setzen, gehorchend
 den \etoc-Tiefenauszeichnungen, wie erklärt in der
 |tableof|-Dokumentation, sie setzen keinen TOC-Titel. Sie sollten
-\emph{nicht} verwendet werden im Fall, wenn \csa{etocglobaldefs} vorher
+\emph{nicht} verwendet werden im Fall, wenn \csb{etocglobaldefs} vorher
 ausgegeben wurde; es sei denn, ihr Skopus wurde da beendet oder
 \csb{etoclocaldefs} hat seine Einflussnahme abgebrochen.
 
@@ -10837,7 +10833,12 @@ Paketversion ist \texttt{\etocDEpkgversion} von \texttt{\etocDEpkgdate}.
 
 \begin{multicols}{2}
 \begin{jfverbatim}
-v1.08e [2015/04/17]^
+v1.08f [2015/04/28]^
+
+   Minor changes to the documentation. \etocsetlevel more economical.
+
+
+~v1.08e [2015/04/17]^
 
    The command \etocchecksemptiness tells etoc to not print, from
    that point on, the headings of the local tables of contents if
@@ -11262,7 +11263,7 @@ v1.08e [2015/04/17]^
 %    \end{macrocode}
 % |\etocglobaldefs| should be used only for special things such as TOC as a
 % table; it should be put in a group to limit its scope. If used in the
-% preamble, it must come \emph{after} |tableof| if the later is loaded too.
+% preamble, it must come \emph{after} |tableof| if the latter is loaded too.
 %    \begin{macrocode}
 \let\Etoc@global\@empty              % 1.08 2015/03/10
 \def\etocglobaldefs{\let\Etoc@global\global\let\tof@global\global}
@@ -11344,14 +11345,15 @@ v1.08e [2015/04/17]^
 %    \end{macrocode}
 % Versions earlier than |1.08| did |\Etoc@newlevel| in a quite
 % embarrassing way with an |\edef|.
+%
+% |1.08f|'s \csa{etocsetlevel} avoids multiple insertion of the the same level
+% in the \csa{Etoc@levellist} list.
 %    \begin{macrocode}
 \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@
@@ -11721,8 +11723,9 @@ v1.08e [2015/04/17]^
 %
 % |1.08a| drops the original constructions of |\etocname| etc... The obvious
 % decision to convert \csa{etocname}, etc ... to be the robust versions of
-% \csa{etocthelinkedname}, etc ... was delayed two years (from |1.07f
-% 2013/03/07| to |1.08a 2015/03/13|) for sentimental reason. But the original
+% \csa{etocthelinkedname}, etc ... was delayed two years 
+% (from |1.07f 2013/03/07| to |1.08a 2015/03/13|) for sentimental reason. But
+% the original
 % versions contained the hyperref destination only in unexpanded form, this
 % forced to use \csa{etocthelinkedname}, etc... in cases when the thing had to
 % be stored for delayed use. Now the user can do this directly with
@@ -12092,7 +12095,7 @@ v1.08e [2015/04/17]^
 % \csa{invisiblelocaltableofcontents} (and then I did \csa{etocsetnexttocdepth}).
 % |1.07h| makes the hook used by \csa{etocsetnexttocdepth} private.
 %
-% |2014/03/14|: |1.08b| suppresses a space token from an unprotected end of
+% |2015/03/14|: |1.08b| suppresses a space token from an unprotected end of
 % line at the end after the replacement text of \csa{etoc@startlocaltoc} (bug
 % dating back to |1.03 2012/11/23|). I didn't see it due to the originally
 % badly formatted source of |\Etoc@next|.
@@ -12117,7 +12120,7 @@ v1.08e [2015/04/17]^
 % \toc|\ref{foo}|; the latter could so far possibly refer to a local or also to
 % a global table of contents but release |1.08e| has deprecated the latter use
 % as it complicated the code, for something truly silly. Thus |\ref{foo}| must
-% be have the |foo| be the label of a local TOC now.
+% now be with |foo| a label of a local TOC.
 %
 % In the case of a |\ref|ed-to toc whose label was just added hence is not yet
 % in the |.aux| file, |\Etoc@tocid| is |0|. \etoc used to issue a warning to
@@ -12226,12 +12229,10 @@ v1.08e [2015/04/17]^
     \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
@@ -12326,10 +12327,10 @@ v1.08e [2015/04/17]^
 {%
     \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 
@@ -13192,7 +13193,7 @@ v1.08e [2015/04/17]^
   Grave accent  \`     Left brace    \{     Vertical bar  \|
   Right brace   \}     Tilde         \~}
 
-\CheckSum{3160}
+\CheckSum{3157}
 
 \csname check@checksum\endcsname
 \Finale
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.ins b/Master/texmf-dist/source/latex/etoc/etoc.ins
index fd0b1a0bf84..a6cd6e73457 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.ins
+++ b/Master/texmf-dist/source/latex/etoc/etoc.ins
@@ -1,6 +1,6 @@
 %%
 %% 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
 %%                         <jfbu at free dot fr>
@@ -8,9 +8,9 @@
 %%                         <Christine_Roemer at t-online dot de>
 %% and collaborators for the translation into German of the documentation
 %%
-\def\etocpkgdate        {2015/04/17}
-\def\etocdocdate        {2015/04/17}
-\def\etocpkgversion     {v1.08e}
+\def\etocpkgdate        {2015/04/28}
+\def\etocdocdate        {2015/04/28}
+\def\etocpkgversion     {v1.08f}
 \def\etocpkgdescription {Completely customisable TOCs (jfB)}
 %% Run etex on this file to extract from etoc.dtx:
 %%        etoc.sty, etoc.tex, etoc-DE.tex and README.md
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
 %%                         <jfbu at free dot fr>
@@ -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