etoc (24jan15)

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

8 files changed, 136 insertions, 82 deletions

diff --git a/Master/texmf-dist/doc/latex/etoc/README b/Master/texmf-dist/doc/latex/etoc/README
index 0067d3859bb..bbf44b08452 100644
--- a/Master/texmf-dist/doc/latex/etoc/README
+++ b/Master/texmf-dist/doc/latex/etoc/README
@@ -1,11 +1,11 @@
 %
 % Package: etoc
-% Version: 1.07l (2014/04/22; doc of 2014/04/29)
+% Version: 1.07m (2015/01/23)
 % Description: Completely customisable TOCs (jfB)
 %
-% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
-%    and collaborators for the translation into German of the documentation
+% 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>
+%    and collaborators for the translation into German of the documentation.
 
 % License: LPPL 1.3c or later
 
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
index f3304a201c9..bcff41cfefe 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-DE.tex b/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
index cbdc4c13af2..dd5b1593464 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
@@ -1,9 +1,9 @@
 %%
 %% Package: etoc
-%% Version: 1.07l (2014/04/22)
-%% License: LPPL 1.3c or later (see etoc.dtx for more information)
-%% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-%% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
+%% Version: 1.07m (2015/01/23)
+%% License: LPPL 1.3c or later (see etoc.dtx)
+%% 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>
 %%    and collaborators for the translation into German of the documentation
 %%
 %% run latex thrice on this file etoc-DE.tex then dvipdfmx on etoc-DE.dvi
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 048273da799..7336d6a8744 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/doc/latex/etoc/etoc.tex b/Master/texmf-dist/doc/latex/etoc/etoc.tex
index cf086055111..c6dbf0c6bdb 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etoc.tex
@@ -1,9 +1,9 @@
 %%
 %% Package: etoc
-%% Version: 1.07l (2014/04/22)
-%% License: LPPL 1.3c or later (see etoc.dtx for more information)
-%% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-%% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
+%% Version: 1.07m (2015/01/23)
+%% License: LPPL 1.3c or later (see etoc.dtx)
+%% 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>
 %%    and collaborators for the translation into German of the documentation
 %%
 %% run latex thrice on this file etoc.tex then dvipdfmx on etoc.dvi
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index c2246a640a1..104e468b4fe 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -1,43 +1,41 @@
-% -*- coding: utf-8; time-stamp-format: "%02d-%02m-%:y %02H:%02M:%02S %Z" -*-
+% -*- coding: utf-8; -*-
+%<*none>
+{\def\doctimestamp {Time-stamp: <23-01-2015 23:01:14 CET>}% 
+ \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
+ \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}%
+%</none>
 %%
 %% Package: etoc
-%% Version: 1.07l (2014/04/22)
-%% License: LPPL 1.3c or later (see etoc.dtx for more information)
-%% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-%% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
+%% Version: 1.07m (2015/01/23)
+%% License: LPPL 1.3c or later (see etoc.dtx)
+%% 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>
 %%    and collaborators for the translation into German of the documentation
 %%
-% (repeated below in \etocLicense macro)
 %<*insfile>
-\def\etocpkgdate        {2014/04/22} 
-\def\etocdocdate        {2014/04/29}% not extracted from Time-stamp anymore
-\def\etocpkgversion     {v1.07l}
+\def\etocpkgdate        {2015/01/23} 
+\def\etocdocdate        {2015/01/23}
+\def\etocpkgversion     {v1.07m}
 \def\etocpkgdescription {Completely customisable TOCs (jfB)}
 %</insfile>
 %<*none>
-{\def\doctimestamp {Time-stamp: <18-05-2014 11:51:45 CEST>}% 
- % This differs from 2014/04/29 only in fixing the misplaced \NeedsTeXFormat,
- % defining manually \etocdocdate and translating the pdf info into German 
- \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
- \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}%
 % Now the date and version which are specific to the German translation.
 % Replace \let by suitable \def's in case this lags behing English version.
-\let\etocDEpkgdate   \etocpkgdate    % currently 2014/04/22
-\let\etocDEdocdate   \etocdocdate    % currently 2014/04/29
-\let\etocDEpkgversion\etocpkgversion % currently 1.07l
-% Definition of \etocLicense, in order to have it here and not have to maintain 
-% a copy elsewhere. Must be compatible with all manners of compiling etoc.dtx.
-%   (copyright lines from top of file must be repeated here)
+\let\etocDEpkgdate   \etocpkgdate    %
+\let\etocDEdocdate   \etocdocdate    %
+\let\etocDEpkgversion\etocpkgversion %
+% Definition of \etocLicense
+% --------------------------
 \begingroup
     \long\def\firstofone #1{#1}\catcode1=14\catcode2=0
     \catcode`\%=12\catcode`\_=12\endlinechar13\catcode13=13 ^^A
     \catcode32=13\catcode`\\=12^^Brelax^^A
 ^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
 {% Package: etoc
-% Version: 1.07l (2014/04/22)
+% Version: 1.07m (2015/01/23)
 % License: LPPL 1.3c or later
-% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
+% 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>
 %    and collaborators for the translation into German of the documentation
 %
 %     This Work may be distributed and/or modified under the
@@ -392,8 +390,8 @@
 \endgroup
 \def\makestarlowast {\catcode`\*\active\let~\lowast}}%
 \makeatother
-%----
-\usepackage{txfonts} 
+%
+\usepackage{txfonts}
 
 % m'occuper de la taille de txtt:
 % au passage je supprime le \hyphenchar \font\m@ne
@@ -3635,6 +3633,7 @@ class should be obeyed, too.
 \subsection{The command \csbhyp{etoc\-inline}}
 \label{etocinline}
 \label{etocnopar}
+\label{etocdisplay}
 
 With \csb{etocinline}, or its synonym |\etocnopar|, the
 |\tableofcontents| command and its variants do \emph{not} first issue a
@@ -3642,9 +3641,14 @@ With \csb{etocinline}, or its synonym |\etocnopar|, the
 be printed in an inline style; or, if used only for preparing some token
 list or macro, it will leave nothing in the token stream on execution.
 
+Issue \csb{etocdisplay} to return to the default situation that
+|\tableofcontents| and variants issue a |\par| to switch to vertical
+mode before typesetting the TOC title and contents.
+
 \section{Starred variants of the \csbhyp{tableofcontents}  etc... commands}
 \label{tableofcontents*}
 \label{localtableofcontents*}
+\label{etocbeforetitlehook}
 \label{etocaftertitlehook}
 \label{etocaftercontentshook}
 \label{etocmemoirtoctotocfmt}
@@ -3684,9 +3688,10 @@ generally speaking a hook macro called
 \csb{etocaftertitlehook} which is inhibited by using the
 starred variants of the displaying commands. Except for the
 |memoir| class, this hook is initially defined to do nothing.
-There is also \csb{etocaftercontentshook},  similarly
-defined to do nothing. They can be used for some special
-effects.
+
+There is \csb{etocaftercontentshook}, similarly defined to do
+nothing. And \csb{etocbeforetitlehook} is also initially defined to do
+nothing. They can be used for some special effects.
 
 \section{Table of contents for this part}
 
@@ -4781,7 +4786,7 @@ a fully hyperlinked table of contents. The code follows, after the table.
   \toks2 \expandafter{\etocthelinkedname}%
   \toks4 \expandafter{\etocthelinkedpage}%
   \edef\toctablepiece {\noexpand\hline
-                      \strut\the\toks0 &\noexpand\bfseries\the\toks2 
+                      \noexpand\strut\the\toks0 &\noexpand\bfseries\the\toks2 
                                  &\the\toks4 \noexpand\\ 
                       \noexpand\hline}% 
 }
@@ -4822,6 +4827,23 @@ a fully hyperlinked table of contents. The code follows, after the table.
 \subsection{Compatibility with other packages}
 \label{etocaftertochook}
 
+The contents of the |.toc| file (if it already exists) are read into memory by
+\etoc once, at the time of |\begin{document}|.\footnote{New with |1.07m|.
+    Earlier versions read the |.toc| file at the time of
+    \csa{usepackage\{etoc\}}. Thanks to Denis Bitouzé who signaled a Babel
+    related problem, which turned out to be caused by this.}
+
+\begin{framed}
+  One should load \etoc \emph{after} \texttt{babel}. This is in order for
+  |babel|'s shorthands to be active at the time when \etoc loads the |.toc|
+  file.
+\end{framed}
+
+The |.toc| file remains available
+  to other packages for read operations until the location of the first table
+  of contents at which time a write stream is opened by \etoc and from that
+  point the file is erased until its contents are again written to the disk by
+  \LaTeX{} at the end of the compilation.
 
 \etoc loads the package |multicol|. It is
 |hyperref| aware and hopefully |hyperref| compatible! It
@@ -4855,13 +4877,6 @@ defined boolean whose activation may be added to the |.toc| file at the suitable
 location via |\addtocontents{toc}{..}|, if one needs to distinguish the two
 kinds of divisions.
 
-The contents of the |.toc| file (if it already exists) are read into memory by
-\etoc once, at the time of \csa{usepackage\{etoc\}}. The |.toc| file remains
-available to other packages for read operations until the location of the first
-table of contents at which time a write stream is opened by \etoc and from that
-point the file is erased until its contents are again written to the disk by
-\LaTeX{} at the end of the compilation.
-
 \etoc can not really cohabit with packages modifying the \csa{tableofcontents}
   command: some sort of truce can be achieved if \etoc is loaded last, hence is
   the winner. 
@@ -7701,17 +7716,23 @@ berücksichtigt werden.
 \subsection{Der Befehl \csbhyp{etoc\-inline}}
 \label{etocinline}
 \label{etocnopar}
+\label{etocdisplay}
 
-Mit \csb{etocinline} oder seinem Synonym |\etocnopar|, dem
-|\tableofcontents|-Befehl und seinen Varianten wird \emph{nicht} zuerst ein
+Mit \csb{etocinline} oder seinem Synonym |\etocnopar|, von dem
+|\tableofcontents|-Befehl und seinen Varianten werden \emph{nicht} zuerst ein
 |\par| erstellt, um den vorherigen |paragraph| zu schließen. Von daher kann man
 das Inhaltsverzeichnis in einem Inline-Stil darstellen; oder, wenn nur gebraucht
 um eine Token-Liste bzw. ein Makro vorzubereiten, wird es bei der Ausführung
 nichts im Token-Stream hinterlassen.
 
+% JFBU:
+Mit \csb{etocdisplay} werden (nochmal) von dem |\tableofcontents|-Befehl und
+seinen Varianten zuerst ein |\par| erstellt.
+
 \section{Gesternde Varianten des \csbhyp{tableofcontents}  etc. Befehls}
 \label{tableofcontents*}
 \label{localtableofcontents*}
+\label{etocbeforetitlehook}
 \label{etocaftertitlehook}
 \label{etocaftercontentshook}
 \label{etocmemoirtoctotocfmt}
@@ -7748,9 +7769,13 @@ dieses Problem ist es, das zweite als Klon des ersten zu definieren.
 Unabhängig von der Situation hat man bei der |memoir|-Klasse immer ein
 Hook-Makro namens \csb{etocaftertitlehook}, welches man unterdrückt, indem man
 die Stern-Varianten der Darstellungsbefehle nutzt. Außer für die |memoir|-Klasse
-ist dieser Hook dazu gedacht, überhaupt nichts zu tun. Außerdem gibt es noch
-\csb{etocaftercontentshook}, ähnlich definiert, um nichts zu tun. Sie können für
-einige spezielle Effekte genutzt werden.
+ist dieser Hook dazu gedacht, überhaupt nichts zu tun. 
+
+Außerdem gibt es noch \csb{etocaftercontentshook}, ähnlich definiert, um
+nichts zu tun. Es gibt auch \csb{etocbeforetitlehook}: es ist definiert
+um nichts zu tun. Beide können für einige spezielle Effekte genutzt
+werden.
+
 
 \section{Das In\-halts\-ver\-zeic\-hnis von die\-sem Teil}
 
@@ -8879,6 +8904,22 @@ Tabelle.
 \subsection{Kompatibilität mit anderen Paketen}
 \label{etocaftertochook}
 
+% JFBU modifiziert Januar 23, 2015
+Die Inhalte der |.toc|-Datei (falls bereits vorhanden) werden einmal in den
+Speicher von \etoc getan, bei |\begin{document}|. \footnote{Neu mit |1.07m|.
+    Früherer Versionen benutzten die |.toc|-Datei bei
+    \csa{usepackage\{etoc\}}. Danke an Denis Bitouzé für ein Babel-etoc
+    Problem entdecken zu haben.} 
+
+\begin{framed}
+  Man sollte \etoc \emph{nach} \texttt{babel} laden.
+\end{framed}
+
+  Die |.toc|-Datei bleibt für andere Pakete nutzbar für
+  Lesevorgänge bis zum Ort des ersten Inhaltsverzeichnisses, zu diesem
+  Zeitpunkt wird ein Schreib-stream durch \etoc geöffnet und von diesem Punkt
+  aus wird die Datei gelöscht bis ihr Inhalt wieder auf die Platte von
+  \LaTeX{} am Ende der Kompilierung geschrieben wurde.
 
 \etoc lädt das Paket |multicol|. Es ist
 |hyperref| bekannt und hoffentlich kompatibel mit ihm! Es ist kein Thema, ob
@@ -8900,7 +8941,7 @@ Kompatibiltätsmodus |\etocsetlevel{division unit}{6}| wird die gewählte
 Bereichsebene gerendert, aber der Austausch von Ebenen ist andererseits nicht
 möglich.
 \begin{framed}
-  Man sollte \etoc \emph{nach} \texttt{tocloft laden}. Sonst wird eine Warnung
+  Man sollte \etoc \emph{nach} \texttt{tocloft} laden. Sonst wird eine Warnung
   ausgegeben.
 \end{framed}
 
@@ -8911,13 +8952,6 @@ Test für einige boolesche-Ausdrücke sein, die aktiviert sein können via einer
 Instruktion an die |.toc|-Datei aufgenommen werden, wenn man zwei Arten von
 Unterteilungen unterscheidet.
 
-Die Inhalte der |.toc|-Datei (falls bereits vorhanden) werden einmal in den
-Speicher von \etoc getan, bei \csa{usepackage\{etoc\}}. Die |.toc|-Datei bleibt
-für andere Pakete nutzbar für Lesevorgänge bis zum Ort des ersten
-Inhaltsverzeichnisses, zu diesem Zeitpunkt wird ein Schreib-stream durch \etoc
-geöffnet und von diesem Punkt aus wird die Datei gelöscht bis ihr Inhalt wieder
-auf die Platte von \LaTeX{} am Ende der Kompilierung geschrieben wurde.
-
 \etoc kann nicht wirklich mit Paketen zusammensein, die
 \csa{tableofcontents}-Befehle ändern: Eine Art Waffenstilstand kann erreicht
 werden, wenn \etoc zuletzt geladen wird, daher ist es der Gewinner.
@@ -9101,6 +9135,16 @@ Paketversion ist \texttt{\etocDEpkgversion} von \texttt{\etocDEpkgdate}.
 
 \begin{multicols}{2}
 \begin{jfverbatim}
+v1.07m [2015/05/23]>
+
+   Reading of .toc file is delayed to \begin{document} to account for
+   possible Babel active characters used therein. Thanks to Denis
+   Bitouzé who reported a Babel related problem.
+
+   Improved global toc display emulation under KOMA-script classes.
+
+   New hook \etocbeforetitlehook.
+
 v1.07l [doc of 2014/04/29]>
 
    added to the documentation an example of use of \etocthelinkedname together
@@ -9321,8 +9365,6 @@ v1.02 [2012/11/18]>
 % date, name, or version. So I extracted this from the real macrocode
 % environment (leaving out the \init@crossref.)
 
-% 2014/05/18: I fix only now this very strange bug that this (presumably
-% from 2012) left  \NeedsTeXFormat{LaTeX2e} to after \ProvidesPackage...
 \makeatletter
 \begingroup
 \topsep\MacrocodeTopsep
@@ -9368,6 +9410,7 @@ v1.02 [2012/11/18]>
 \def\Etoc@par{\par}
 \def\etocinline{\def\Etoc@par{}}
 \let\etocnopar\etocinline
+\def\etocdisplay{\def\Etoc@par{\par}}% 1.07m 2015/01/23
 \newif\ifEtoc@jj  % book
 \newif\ifEtoc@j   % part  
 \newif\ifEtoc@    % chapter
@@ -9866,8 +9909,12 @@ v1.02 [2012/11/18]>
      \expandafter\Etoc@readtoc
   \fi
 }
+%    \end{macrocode}
+% |1.07m| moves the reading of the toc file At Begin Document. Needed for
+% Babel activated characters.
+%    \begin{macrocode}
 \Etoc@toctoks {}% (superfluous, but for clarity)
-\IfFileExists{\jobname .toc}
+\AtBeginDocument{\IfFileExists{\jobname.toc}
     {{\endlinechar=-1 
       \makeatletter
       \newread\Etoc@tf
@@ -9875,7 +9922,7 @@ v1.02 [2012/11/18]>
       \Etoc@readtoc
       \global\Etoc@toctoks=\expandafter{\the\Etoc@toctoks}%
       \closein\Etoc@tf}}
-    {\typeout{No file \jobname .toc.}}
+    {\typeout{No file \jobname.toc.}}}
 %    \end{macrocode}
 % 1.07d: parskip and |\@nobreakfalse| stuff moved to |\Etoc@tableofcontents|
 %    \begin{macrocode}
@@ -10073,7 +10120,8 @@ v1.02 [2012/11/18]>
    \let\Etoc@@next\@firstofone\else
    \let\Etoc@@next\@gobble
 \fi
-\Etoc@@next{\Etoc@storetocdepth % 1.07g
+\Etoc@@next{\etocbeforetitlehook % 1.07m
+            \Etoc@storetocdepth % 1.07g
             #1\ifEtoc@parskip\parskip\z@skip\fi %1.07d
               \Etoc@aftertitlehook
               \let\Etoc@savedcontentsline\contentsline
@@ -10590,6 +10638,7 @@ v1.02 [2012/11/18]>
 \def\etocscrartclstyle{%
     \etocsettocstyle
         {\let\if@dynlist\if@tocleft
+         \def\@currext{toc}% added 1.07m 2015/01/23
          \iftocfeature {toc}{onecolumn}
              {\iftocfeature {toc}{leveldown}
               {}
@@ -10874,6 +10923,7 @@ v1.02 [2012/11/18]>
 \etocobeydepthtags
 \let\Etoc@aftertochook\@empty % private for \etocsetnexttocdepth
 \let\etocaftertochook \@empty % public for end user.
+\let\etocbeforetitlehook \@empty % new with 1.07m
 \endinput
 %    \end{macrocode}
 % \MakePercentComment
@@ -10893,7 +10943,7 @@ v1.02 [2012/11/18]>
   Grave accent  \`     Left brace    \{     Vertical bar  \|
   Right brace   \}     Tilde         \~}
 
-\CheckSum{2967}
+\CheckSum{2979}
 
 \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 3d28a98f5cd..facd9d885b1 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.ins
+++ b/Master/texmf-dist/source/latex/etoc/etoc.ins
@@ -1,14 +1,14 @@
 %%
 %% Package: etoc
-%% Version: 1.07l (2014/04/22)
-%% License: LPPL 1.3c or later (see etoc.dtx for more information)
-%% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-%% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
+%% Version: 1.07m (2015/01/23)
+%% License: LPPL 1.3c or later (see etoc.dtx)
+%% 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>
 %%    and collaborators for the translation into German of the documentation
 %%
-\def\etocpkgdate        {2014/04/22}
-\def\etocdocdate        {2014/04/29}% not extracted from Time-stamp anymore
-\def\etocpkgversion     {v1.07l}
+\def\etocpkgdate        {2015/01/23}
+\def\etocdocdate        {2015/01/23}
+\def\etocpkgversion     {v1.07m}
 \def\etocpkgdescription {Completely customisable TOCs (jfB)}
 %% Run tex on this file to extract from etoc.dtx:
 %%        etoc.sty, etoc.tex, etoc-DE.tex
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index 8a5e4446d34..ee4347bfd00 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -23,13 +23,13 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoc}
- [2014/04/22 v1.07l Completely customisable TOCs (jfB)]
+ [2015/01/23 v1.07m Completely customisable TOCs (jfB)]
 %%
 %% Package: etoc
-%% Version: 1.07l (2014/04/22)
-%% License: LPPL 1.3c or later (see etoc.dtx for more information)
-%% Copyright (C) 2012-2013-2014 Jean-Francois Burnol <jfbu at free dot fr>
-%% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
+%% Version: 1.07m (2015/01/23)
+%% License: LPPL 1.3c or later (see etoc.dtx)
+%% 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>
 %%    and collaborators for the translation into German of the documentation
 %%
 \RequirePackage{multicol}
@@ -39,6 +39,7 @@
 \def\Etoc@par{\par}
 \def\etocinline{\def\Etoc@par{}}
 \let\etocnopar\etocinline
+\def\etocdisplay{\def\Etoc@par{\par}}% 1.07m 2015/01/23
 \newif\ifEtoc@jj  % book
 \newif\ifEtoc@j   % part
 \newif\ifEtoc@    % chapter
@@ -449,7 +450,7 @@
   \fi
 }
 \Etoc@toctoks {}% (superfluous, but for clarity)
-\IfFileExists{\jobname .toc}
+\AtBeginDocument{\IfFileExists{\jobname.toc}
     {{\endlinechar=-1
       \makeatletter
       \newread\Etoc@tf
@@ -457,7 +458,7 @@
       \Etoc@readtoc
       \global\Etoc@toctoks=\expandafter{\the\Etoc@toctoks}%
       \closein\Etoc@tf}}
-    {\typeout{No file \jobname .toc.}}
+    {\typeout{No file \jobname.toc.}}}
 \def\Etoc@openouttoc{%
   \ifEtoc@hyperref
     \ifx\hyper@last\@undefined
@@ -616,7 +617,8 @@
    \let\Etoc@@next\@firstofone\else
    \let\Etoc@@next\@gobble
 \fi
-\Etoc@@next{\Etoc@storetocdepth % 1.07g
+\Etoc@@next{\etocbeforetitlehook % 1.07m
+            \Etoc@storetocdepth % 1.07g
             #1\ifEtoc@parskip\parskip\z@skip\fi %1.07d
               \Etoc@aftertitlehook
               \let\Etoc@savedcontentsline\contentsline
@@ -1056,6 +1058,7 @@
 \def\etocscrartclstyle{%
     \etocsettocstyle
         {\let\if@dynlist\if@tocleft
+         \def\@currext{toc}% added 1.07m 2015/01/23
          \iftocfeature {toc}{onecolumn}
              {\iftocfeature {toc}{leveldown}
               {}
@@ -1261,6 +1264,7 @@
 \etocobeydepthtags
 \let\Etoc@aftertochook\@empty % private for \etocsetnexttocdepth
 \let\etocaftertochook \@empty % public for end user.
+\let\etocbeforetitlehook \@empty % new with 1.07m
 \endinput
 %%
 %% End of file `etoc.sty'.