etoc (3dec13)

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

1 files changed, 10 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index 7e721d6fce2..30046411ff6 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -22,10 +22,10 @@
 %% in the same archive or directory.)
 %%
 \ProvidesPackage{etoc}
- [2013/10/21 v1.07i Completely customisable TOCs (jfB)]
+ [2013/12/03 v1.07j Completely customisable TOCs (jfB)]
 %%
 %% Package: etoc
-%% Version: 2013/10/16 v1.07h
+%% Version: 2013/12/03 v1.07j
 %% Copyright (C) 2012-2013 by Jean-Francois Burnol <jfbu at free dot fr>
 %%
 \NeedsTeXFormat{LaTeX2e}
@@ -436,24 +436,23 @@
 \DeclareRobustCommand*{\etoclink}  {}
 \DeclareRobustCommand*{\etocifnumbered}
    {\ifEtoc@number\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\def\Etoc@readtoc#1{%
-  \ifeof #1
-     \let\Etoc@nextread\@gobble
-     \global\Etoc@toctoks=\expandafter{\the\Etoc@toctoks}%
+\def\Etoc@readtoc {%
+  \ifeof \Etoc@tf
   \else
-     \let\Etoc@nextread\Etoc@readtoc
-     \read #1 to \Etoc@buffer
+     \read \Etoc@tf to \Etoc@buffer
      \Etoc@toctoks=\expandafter\expandafter\expandafter
        {\expandafter\the\expandafter\Etoc@toctoks\Etoc@buffer}%
+     \expandafter\Etoc@readtoc
   \fi
-  \Etoc@nextread{#1}%
 }
+\Etoc@toctoks {}% (superfluous, but for clarity)
 \IfFileExists{\jobname .toc}
     {{\endlinechar=-1
       \makeatletter
       \newread\Etoc@tf
       \openin\Etoc@tf\@filef@und
-      \Etoc@readtoc\Etoc@tf
+      \Etoc@readtoc
+      \global\Etoc@toctoks=\expandafter{\the\Etoc@toctoks}%
       \closein\Etoc@tf}}
     {\typeout{No file \jobname .toc.}}
 \def\Etoc@openouttoc{%
@@ -471,7 +470,7 @@
    \newwrite \tf@toc
    \immediate \openout \tf@toc \jobname .toc\relax
   \fi
-  \gdef\Etoc@openouttoc{}%
+  \global\let\Etoc@openouttoc\empty
 }
 \def\Etoc@toctoc{%
    \global\Etoc@vfalse