etoc (24jan15)

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

1 files changed, 12 insertions, 8 deletions

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'.