etoc (29aug15)

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

2 files changed, 172 insertions, 103 deletions

diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index 2fb70ad6fb8..97e5ef0987d 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: <28-04-2015 22:27:41 CEST>}%
+{\def\doctimestamp {Time-stamp: <29-08-2015 12:09:59 CEST>}%
  \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
  \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}%
 %</none>
 %<*!readme>
 %%
 %% Package: etoc
-%% Version: 1.08f (2015/04/28)
+%% Version: 1.08g (2015/08/29)
 %% 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/28}
-\def\etocdocdate        {2015/04/28}
-\def\etocpkgversion     {v1.08f}
+\def\etocpkgdate        {2015/08/29}
+\def\etocdocdate        {2015/08/29}
+\def\etocpkgversion     {v1.08g}
 \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.08f (2015/04/28)
+% Version: 1.08g (2015/08/29)
 % 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>
@@ -71,7 +71,7 @@
 %<*readme>
 <!-- -->
 
-    Source:  etoc.dtx (v1.08f 2015/04/28)
+    Source:  etoc.dtx (v1.08g 2015/08/29)
     Author:  Jean-Francois Burnol
     Author:  Christine Roemer et al. (German tranlation)
     Info:    Completely customisable TOCs
@@ -197,6 +197,13 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
 RECENT CHANGES
 ==============
 
+v1.08g \[2015/08/29\]
+---------------------
+
+Downgraded to a mere info message the etoc-issued warning
+(relative to `\settocdepth/\maxtocdepth`) under class `memoir`.
+
+
 v1.08f \[2015/04/28\]
 ---------------------
 
@@ -263,9 +270,9 @@ v1.08a \[2015/03/13\]
 `\etocname`, `\etocnumber` and `\etocpage` are now the robust
 variants of `\etocthelinkedname`, `\etocthelinkednumber` and
 `\etocthelinkedpage`. This should arguably have been done since
-the addition of the latter to etoc with v1.07f \[2013/03/07\]. The
-earlier `\etocname` etc... contained the hyperlink destination
-only in an unexpanded form.
+the addition of the latter to etoc with v1.07f \[2013/03/07\].
+The earlier robust commands `\etocname` etc... contained the 
+hyperlink destination only in an unexpanded form.
 
 The documentation has a brand new title page and a new section
 *The TOC as a TikZ mind map* both illustrating further uses of
@@ -747,19 +754,27 @@ Jena). My grateful thanks to all!
   \addto\captionsngerman {\renewcommand\partname{Teil}}
 }
 
-% TEMPORARY 2015/04/16
-\usepackage{etex}
-% With the new LaTeX format (dated 2015/01/01) but released to CTAN
-% around 2015/03/31, and which will be in TL2015, package etoolbox
-% Package: etoolbox 2015/03/19 v2.1d e-TeX tools for LaTeX (JAW)
-% does not load etex.sty, but this currently breaks package forest
-% Package: forest 2014/03/07 v1.05 Drawing (linguistic) trees
-% because of the missing \locbox macro
-% END
-
 \usepackage{tikz}
 \usetikzlibrary{trees}    % added for "cyclic" grow function 2013/03/02
-\usepackage{forest}       % switched from tikz-qtree to forest 2013/09/09
+
+% Temporaire 16 avril 2015 pour release etoc 1.08e :
+%
+% \usepackage{etex}
+%
+% car erreur de compilation avec la pre-release 2015 de TeXLive à cause d'un
+% missing \locbox avec forest 2014/03/07 v1.05.
+%
+% Dû au fait que etoolbox 2015/03/19 v2.1d ne charge plus etex lorsqu'il
+% détecte le nouveau format LaTeX 2015/01/01 qui a été diffusé sur CTAN aux
+% alentours de 2015/03/31 et qui est intégré à TeXLive 2015.
+%
+% Note 12 mai 2015: la version 2015/05/04 v1.06 de forest fait maintenant
+% explicitement \RequirePackage {etex}. Il y a un nouveau package elocalloc de
+% David Carlisle, donc forest devrait plutôt tester si \locbox est défini
+% après avoir chargé etoolbox et sinon faire \RequirePackage {elocalloc}.
+\usepackage{forest}[2015/05/04]
+%
+% switched from tikz-qtree to forest 2013/09/09
 % No problem with hyperlinks then, contrarily to tikz-qtree.
 
 % NOTE: (12 octobre 2013)
@@ -1013,18 +1028,51 @@ pdfpagemode=UseOutlines}
 
 \newcount\tikznumberofcurrentgrandchild
 
+% copié de http://tex.stackexchange.com/a/232914
 \def\tikzmycustomgrowth {%
-  \pgftransformreset
-  \ifnum\tikztreelevel=1
-    \pgftransformrotate {(\pgfkeysvalueof{/tikz/sibling angle})*(\tikznumberofcurrentchild-1)}%
-  \fi
-  \ifnum\tikztreelevel=2
-    \pgftransformrotate {(\pgfkeysvalueof{/tikz/sibling angle})*(\tikznumberofcurrentgrandchild-4)}%
-    \global\advance\tikznumberofcurrentgrandchild by 1
- \fi
- \pgftransformxshift {\the\tikzleveldistance}%
+    \pgftransformreset
+    \ifnum\tikztreelevel=1
+        \pgftransformrotate{55+((\pgfkeysvalueof{/tikz/sibling angle})*(\tikznumberofcurrentchild)}%
+        \pgftransformxshift{\the\tikzleveldistance}%
+    \fi
+    \ifnum\tikztreelevel=2
+        \pgfmathsetmacro\tikzoffsetofcurrentchild{(\tikzsiblingdistance)*(\tikznumberofcurrentgrandchild)}%
+        \ifdim\tikzoffsetofcurrentchild pt<\tikzlevelwidth pt
+            \pgftransformxshift{\tikzlevelwidth/2-\tikzoffsetofcurrentchild}
+            \pgftransformyshift{\tikzlevelheight/2}
+        \else
+        \pgfmathsetmacro\tikzoffsetofcurrentchild{\tikzoffsetofcurrentchild-\tikzlevelwidth}%
+        \ifdim\tikzoffsetofcurrentchild pt<\tikzlevelheight pt
+            \pgftransformxshift{-\tikzlevelwidth/2}
+            \pgftransformyshift{\tikzlevelheight/2-\tikzoffsetofcurrentchild}
+        \else
+        \pgfmathsetmacro\tikzoffsetofcurrentchild{\tikzoffsetofcurrentchild-\tikzlevelheight}%
+        \ifdim\tikzoffsetofcurrentchild pt<\tikzlevelwidth pt
+            \pgftransformxshift{-\tikzlevelwidth/2+\tikzoffsetofcurrentchild}
+            \pgftransformyshift{-\tikzlevelheight/2}
+        \else
+        \pgfmathsetmacro\tikzoffsetofcurrentchild{\tikzoffsetofcurrentchild-\tikzlevelwidth}%
+        \ifdim\tikzoffsetofcurrentchild pt<\tikzlevelheight pt
+            \pgftransformxshift{\tikzlevelwidth/2}
+            \pgftransformyshift{-\tikzlevelheight/2+\tikzoffsetofcurrentchild}
+        \fi\fi\fi\fi
+        \global\advance\tikznumberofcurrentgrandchild by1
+    \fi
 }
 
+% version circulaire utilisée avec les version 1.08a--1.08f du manuel.
+% \def\tikzmycustomgrowth {%
+%   \pgftransformreset
+%   \ifnum\tikztreelevel=1
+%     \pgftransformrotate {(\pgfkeysvalueof{/tikz/sibling angle})*(\tikznumberofcurrentchild-1)}%
+%   \fi
+%   \ifnum\tikztreelevel=2
+%     \pgftransformrotate {(\pgfkeysvalueof{/tikz/sibling angle})*(\tikznumberofcurrentgrandchild-4)}%
+%     \global\advance\tikznumberofcurrentgrandchild by 1
+%  \fi
+%  \pgftransformxshift {\the\tikzleveldistance}%
+% }
+
 \newcounter{partco}
 % 1,2,3,4,5,... -> 1,2,3,1,2,3,1,2,3
 \def\pseudomodthree #1{\numexpr #1 + 3 - 3*((#1+1)/3)\relax}
@@ -1235,12 +1283,15 @@ etoc-framed-mp-hook
 % \immediate\write\TOCasTree{\the\treetok}%
 
 \tikzset {branch color/.style={concept color=#1!white,
-             every child/.append style={concept color=#1!white!30!white}}%
+             every child/.append style={concept color=#1!white!30!white}},
+% ajout pour version de 1.08g
+    level width/.store in=\tikzlevelwidth,
+    level height/.store in=\tikzlevelheight
          }%
 
 \global
 \setbox\TitlePageMindmapTOC\hbox {\begingroup
-\resizebox{.9\paperwidth}{!}{%
+\resizebox!{\dimexpr\paperheight-1cm\relax}{%
 \begin{tikzpicture}[mindmap,
                     text width=2cm,
                     align = flush center,
@@ -1248,24 +1299,24 @@ etoc-framed-mp-hook
                     nodes={concept},
                     concept color=orange!60,
                     root concept/.append style={font=\huge, text width = 6cm},
-                    level 1/.append style={level distance=7cm, sibling angle=360/9},% 9 hard-coded mais je pourrais aussi le calculer
-                    level 1 concept/.append style={font=\Large, text width = 3cm},
-                    level 2/.append style={level distance=12.5cm, sibling angle=360/39},% 39 hard coded mais je pourrais aussi le calculer
-                    % distance par rapport au CENTRE ! (avec le code tel qu'en ce moment)
+                    % level 1/.append style={level distance=7cm, sibling angle=360/9},% 9 hard-coded mais je pourrais aussi le calculer
+                    level 1/.append style={level distance=6cm, sibling angle=360/9},% 9 hard-coded mais je pourrais aussi le calculer
+                    level 1 concept/.append style={font=\Large, text width =
+                      3cm},
+% ancienne version circulaire
+% level 2/.append style={level distance=12.5cm, sibling angle=360/39},% 
+% % distance par rapport au CENTRE ! (avec le code tel qu'en ce moment)
+% 39 hard coded mais je pourrais aussi le calculer
+% pour version rectangulaire, par tâtonnements:
+        level 2/.append style={level width=20cm,level height=30cm, sibling distance=2.57cm},
                    ]
 \the\treetok
 \end{tikzpicture}}\endgroup }
 \endgroup
 
-\indent\null
-\begingroup
- \let\thefootnote\empty
- \footnote{Documentation (\etocdocdate) generated from the source file
-  with timestamp ``\etocdtxtimestamp''.}
-\endgroup
-\setcounter{footnote}{0}
+\noindent\null
 
-\AddToShipoutPictureFG*{\put(10.5cm,16.85cm)
+\AddToShipoutPictureFG*{\put(.5\paperwidth,.5\paperheight)
                         {\makebox(0,0){\box\TitlePageMindmapTOC}}}
 
 \clearpage
@@ -1280,9 +1331,13 @@ etoc-framed-mp-hook
 \etocmarkboth\contentsname
 \etocmulticolstyle[1]
      {\pdfbookmark[1]{Table of contents}{MAINTOC}%
-      \noindent\bfseries\Large
+      \noindent 
+      \bfseries\Large
       \leaders\hrule height1pt\hfill
-      \MakeUppercase{Table of Contents}}
+      \MakeUppercase{Table of Contents}\let\thefootnote\empty
+ \footnote{Documentation (\etocdocdate) generated from the source file
+  with timestamp ``\etocdtxtimestamp''.}\setcounter{footnote}{0}%
+}
 
 \begingroup
   \etocsetlevel{subsection}{3}
@@ -3522,7 +3577,7 @@ appears \vpageref{toc:mindmap}.
 \newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
    #1\expandafter\expandafter\expandafter{\expandafter\the\expandafter #1#2}}
 
-\renewcommand*{\appendchildtree}[3]{% 
+\newcommand*{\appendchildtree}[3]{% 
 % this is to construct "t1 child [#3]{t2}" from #1=t1 and #2=t2
 % t1 and t2 are two toks variable (not macros)
 % #3 = for example teal!60
@@ -4981,8 +5036,9 @@ can be followed with optional labels or references:\par
 New with |1.08e|: \localtoc \csa{ref}|{toc:far}| as synonym for \toc
 \csa{ref}|{toc:far}|.
 
-The commands for local tables of
-contents do \emph{not} react to a \csa{ref} following them. 
+% (obsolète depuis 1.08e)
+% The commands for local tables of
+% contents do \emph{not} react to a \csa{ref} following them. 
 
 When re-displaying another toc, only its contents are transferred:
 both the line styles and the toc display style are the ones
@@ -5490,9 +5546,11 @@ table of contents! We designed a macro \csa{thispartstats} to do that.
 It uses ``storage'' boxes to keep the information about the first and
 last section or subsection. Using boxes is the simplest manner to
 encapsulate the |hyperref| link for later use (whether there is one or
-none). However, one cannot modify then the font or the color (using the
-\TeX{} primitive \csa{setbox} rather than the \LaTeX{} \csa{sbox} would
-allow to change the color of the un-boxed saved box). If such a need
+none). However, one cannot modify then the font or the color.
+%  (using the
+% \TeX{} primitive \csa{setbox} rather than the \LaTeX{} \csa{sbox} would
+% allow to change the color of the un-boxed saved box)
+If such a need
 arises, one must switch from using boxes to using macros, and store the
 |hyperref| data for later use as was done in the code presented in
 \autoref{sec:molecule}. We present also this second method.
@@ -6050,12 +6108,15 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
 \etocinline\tableofcontents\label{toc:mindmaptitlepage}
 
 \tikzset {branch color/.style={concept color=#1!white,
-             every child/.append style={concept color=#1!white!30!white}}%
+             every child/.append style={concept color=#1!white!30!white}},
+% ajout pour version de 1.08g
+    level width/.store in=\tikzlevelwidth,
+    level height/.store in=\tikzlevelheight
          }%
 
 \global
 \setbox\TitlePageMindmapTOC\hbox {\begingroup
-\resizebox{.9\paperwidth}{!}{%
+\resizebox!{\dimexpr\paperheight-1cm\relax}{%
 \begin{tikzpicture}[mindmap,
                     text width=2cm,
                     align = flush center,
@@ -6063,32 +6124,24 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
                     nodes={concept},
                     concept color=orange!60,
                     root concept/.append style={font=\huge, text width = 6cm},
-                    level 1/.append style={level distance=7cm, sibling angle=360/9},% 8 hard-coded mais je pourrais aussi le calculer
-                    level 1 concept/.append style={font=\Large, text width = 3cm},
-                    level 2/.append style={level distance=12.5cm, sibling angle=360/39},% 39 hard coded mais je pourrais aussi le calculer
-                    % distance par rapport au CENTRE ! (avec le code tel qu'en ce moment)
+                    level 1/.append style={level distance=6cm, sibling angle=360/9},
+                    level 1 concept/.append style={font=\Large, text width =
+                      3cm},
+        level 2/.append style={level width=20cm,level height=30cm, sibling distance=2.57cm},
                    ]
 \the\treetok
 \end{tikzpicture}}\endgroup }
-
 \endgroup
 
-\indent\null
-\begingroup
- \let\thefootnote\empty
-\footnote{Erzeugt von der Quelldatei mit Zeitstempel ``\etocdtxtimestamp''.\par
-    Übersetzt ins Deutsche von Felix Baral-Weber, Jenny Rothkrämer-Vogt, Daniel
-    Büttner, Claudia Dahl, Christian Otto und Christine Römer (FSU Jena).
-    Hinweise zur Übersetzung an Christine\_Roemer at t-online dot de.}
-\endgroup
-\setcounter{footnote}{0}
+\noindent\null
 
-\AddToShipoutPictureFG*{\put(10.5cm,16.85cm)
+\AddToShipoutPictureFG*{\put(.5\paperwidth,.5\paperheight)
                         {\makebox(0,0){\box\TitlePageMindmapTOC}}}
 
-
 \clearpage
 
+\indent\null
+
 \etocdepthtag.toc {preamble}
 %----
 % MAIN TOC
@@ -6100,7 +6153,11 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
      {\pdfbookmark[1]{Inhaltsverzeichnis}{MAINTOC}%
       \noindent\bfseries\Large
       \leaders\hrule height1pt\hfill
-      \MakeUppercase{Inhaltsverzeichnis}}
+      \MakeUppercase{Inhaltsverzeichnis}\let\thefootnote\empty
+\footnote{Erzeugt von der Quelldatei mit Zeitstempel ``\etocdtxtimestamp''.\par
+    Übersetzt ins Deutsche von Felix Baral-Weber, Jenny Rothkrämer-Vogt, Daniel
+    Büttner, Claudia Dahl, Christian Otto und Christine Römer (FSU Jena).
+    Hinweise zur Übersetzung an Christine\_Roemer at t-online dot de.}\setcounter{footnote}{0}}
 \begingroup
   \etocsetlevel{subsection}{3}
   \etocsetlevel{subsubsection}{6}
@@ -8301,7 +8358,7 @@ hier \vpageref{toc:mindmap}.
 \newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
    #1\expandafter\expandafter\expandafter{\expandafter\the\expandafter #1#2}}
 
-\renewcommand*{\appendchildtree}[3]{% 
+\newcommand*{\appendchildtree}[3]{% 
 % this is to construct "t1 child [#3]{t2}" from #1=t1 and #2=t2
 % t1 and t2 are two toks variable (not macros)
 % #3 = for example teal!60
@@ -9727,11 +9784,14 @@ unwichtig, ob letztere mit Sternchen versehen sind oder nicht.\par
 
 \medskip
 
-Neu mit |1.08b|: \localtoc\csa{ref}|{toc:far}| als Synonym für
+Neu mit |1.08e|: \localtoc\csa{ref}|{toc:far}| als Synonym für
 \toc\csa{ref}|{toc:far}|.
 
-Ein \csa{ref}"=Befehl, der auf einen Befehl zur Erzeugung eines lokalen
-Inhaltsverzeichnisses folgt, hat \emph{keinen} Einfluss auf diesen. Wird ein
+% obsolète depuis 1.08e
+% Ein \csa{ref}"=Befehl, der auf einen Befehl zur Erzeugung eines lokalen
+% Inhaltsverzeichnisses folgt, hat \emph{keinen} Einfluss auf diesen.
+
+Wird ein
 anderes Inhaltsverzeichnis erneut dargestellt, so wird nur dessen Inhalt
 angepasst. Sowohl das Aussehen des Inhaltsverzeichnisses als auch die
 Darstellung seiner Linien orientieren sich an dem, das gerade definiert wurde
@@ -9808,6 +9868,8 @@ weniger Platz einnimmt als der Paketstandard.
 \endgroup
 \end{verbatim}
 
+% pour un problème avec multicol (doc de 1.08g, Samedi 29 août 2015 à 12:06:08)
+\clearpage
 \etocruledstyle[2]{\normalfont\normalsize\rmfamily\itshape
   \fbox{\parbox{.6\linewidth}{
       \leftskip 0pt plus .5fil
@@ -10238,8 +10300,9 @@ zu tun. Es nutzt "`Speicher"'"=Boxen, um die Informationen über die ersten und
 späteren Kapitel und Unterkapitel zu halten. Boxen zu nehmen, ist die einfachste
 Art und Weise |hyperref|-Links für spätere Verwendungen zu kapseln (ob es einer
 ist oder keiner). Allerdings kann man dann nichts an der Schriftart oder Farbe
-ändern (die \TeX -Primitive \csa{setbox} eher nehmend als von \LaTeX{}
-\csa{sbox} würde die Farbe Farbe um das ohne Boxen gespeicherte Feld verändern).
+ändern. 
+% (die \TeX -Primitive \csa{setbox} eher nehmend als von \LaTeX{}
+% \csa{sbox} würde die Farbe Farbe um das ohne Boxen gespeicherte Feld verändern).
 Wenn eine solche Notwendigkeit entsteht, muss man von der Boxenverwendung zum
 Makro nehmen wechseln und die |hyperref|-Daten für später speichern, wie im oben
 im Code von \autoref{sec:molecule} vorgestellt. Wir präsentieren auch diese
@@ -10833,7 +10896,13 @@ Paketversion ist \texttt{\etocDEpkgversion} von \texttt{\etocDEpkgdate}.
 
 \begin{multicols}{2}
 \begin{jfverbatim}
-v1.08f [2015/04/28]^
+v1.08g [2015/08/29]^
+
+   Downgraded to a mere info message the etoc-issued warning
+   (relative to \settocdepth/\maxtocdepth) under class memoir.
+
+
+~v1.08f [2015/04/28]^
 
    Minor changes to the documentation. \etocsetlevel more economical.
 
@@ -10903,8 +10972,8 @@ v1.08f [2015/04/28]^
    variants of \etocthelinkedname, \etocthelinkednumber and
    \etocthelinkedpage. This should arguably have been done since
    the addition of the latter to etoc with v1.07f [2013/03/07].
-   The earlier \etocname etc... contained the hyperlink
-   destination only in an unexpanded form.
+   The earlier robust commands \etocname etc... contained
+   the hyperlink destination only in an unexpanded form.
 
    The documentation has a brand new title page and a new section
    The TOC as a TikZ mind map both illustrating further uses of
@@ -11346,7 +11415,7 @@ v1.08f [2015/04/28]^
 % 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
+% |1.08f|'s \csa{etocsetlevel} avoids multiple insertions of the same level
 % in the \csa{Etoc@levellist} list.
 %    \begin{macrocode}
 \let\Etoc@levellist\@empty
@@ -12310,16 +12379,16 @@ v1.08f [2015/04/28]^
 % |\Etoc@toctoc| after the |\fi\fi\fi|. I could define an |\afterfififi|
 % macro, but it should be ok as it is done here.
 %
-% Let's note for the record that |1.08e| moved the |\Etoc@par| to
-% \csa{Etoc@tableofcontents}. This was needed for the implementation of the
-% emptiness test. It might change some things as the \csa{refstepcounter} is
-% now done before the (possible) |\par|. These must be fringe cases though.
-% Most sane people will have left an empty line above their
-% \csa{tableofcontents} anyhow in the source. And inline toc have a no-op
-% |\Etoc@par|.
+% |1.08e| moved the |\Etoc@par| to \csa{Etoc@tableofcontents}. This was needed
+% for the implementation of the emptiness test. It might have some impact in
+% fringe cases as the \csa{refstepcounter} is now done before the |\par| is
+% issued.
 %
 % |1.08e| suppresses the possibility to do a \csa{tableofcontents}|\ref{foo}|
-% with |foo| the label of a global TOC. Just do \csa{tableofcontents}.
+% with |foo| the label of a global TOC: issueing \csa{tableofcontents} alone
+% suffices. Allowed to simplify some code.
+%
+% |1.08g| moves |\Etoc@par| to before |\etocbeforetitlehook|, not after.
 %    \begin{macrocode}
 \long\def\Etoc@gobbletoetoc@ #1\etoc@ {}
 \newcommand\etocsettocstyle[2]{%
@@ -12329,8 +12398,8 @@ v1.08f [2015/04/28]^
     \else\expandafter
      \Etoc@gobbletoetoc@
     \fi
+    \Etoc@par
     \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 
@@ -13106,22 +13175,22 @@ v1.08f [2015/04/28]^
 % We must cancel all |tocvsec2| toc-related actions. But a check must be done
 % for the memoir class, as its |tocvsec2| emulation does not have the
 % incompatible things etoc needs to revert. This extra check added with etoc
-% |1.07l|.
+% |1.07l|. Release |1.08g| modifies the info message under class memoir (and
+% downgrades it from warning to info).
 %    \begin{macrocode}
 \def\Etoc@tocvsec@err #1{\PackageError {etoc}
         {the command \protect#1\space is incompatible with etoc} 
-        {use \protect\etocsettocdepth.toc as replacement (check the manual)}%
+        {use \protect\etocsettocdepth.toc as replacement (see etoc manual)}%
 }%
 \AtBeginDocument {%
    \@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
+    {\PackageInfo {etoc}
+     {Regarding memoir class command \protect\settocdepth, consider^^J
+     \protect\etocsettocdepth.toc as a drop-in replacement with
+     more capabilities^^J (see etoc manual). Similarly
      \protect\etocsettocdepth\space and 
-     \protect\etocsetnexttocdepth^^J rather 
-     than memoir's \protect\maxtocdepth.}}
+     \protect\etocsetnexttocdepth^^J should replace
+     use of memoir's \protect\maxtocdepth\space command.}}
     {\@ifpackageloaded {tocvsec2}
      {\def\maxtocdepth  #1{\Etoc@tocvsec@err \maxtocdepth   }%
       \def\settocdepth  #1{\Etoc@tocvsec@err \settocdepth   }%
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.ins b/Master/texmf-dist/source/latex/etoc/etoc.ins
index a6cd6e73457..7b14942b050 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.08f (2015/04/28)
+%% Version: 1.08g (2015/08/29)
 %% 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/28}
-\def\etocdocdate        {2015/04/28}
-\def\etocpkgversion     {v1.08f}
+\def\etocpkgdate        {2015/08/29}
+\def\etocdocdate        {2015/08/29}
+\def\etocpkgversion     {v1.08g}
 \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