etoc (21oct13)

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

1 files changed, 9 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index b14c7e82397..7e721d6fce2 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 \ProvidesPackage{etoc}
- [2013/10/16 v1.07h Completely customisable TOCs (jfB)]
+ [2013/10/21 v1.07i Completely customisable TOCs (jfB)]
 %%
 %% Package: etoc
 %% Version: 2013/10/16 v1.07h
@@ -821,7 +821,10 @@
     \setlength{\columnsep}{\etoccolumnsep}%
     \setlength{\multicolsep}{\etocmulticolsep}%
     \begin{multicols}{#1}[#2\etocoldpar\addvspace{\etocinnertopsep}]}
-    {#2\par\addvspace{\etocinnertopsep}%
+    {#2\ifvmode\else\begingroup\interlinepenalty\@M\parskip\z@skip
+                    \@@par\endgroup
+       \fi
+       \nobreak\addvspace{\etocinnertopsep}%
        \pretolerance\etocmulticolpretolerance
        \tolerance\etocmulticoltolerance}}
    {\ifnum #1>\@ne\let\Etoc@next\@firstofone
@@ -845,7 +848,7 @@
           \etoctoprulecolorcmd\leaders\etoctoprule\hss
           \phantom{#1}%
           \leaders\etoctoprule\hss\color@endgroup}%
-          \nointerlineskip\vskip\etocinnertopsep}
+          \nointerlineskip\nobreak\vskip\etocinnertopsep}
 \newcommand*\etocruledstyle[2][\etocdefaultnbcol]{%
 \etocsettocstyle
    {\addvspace{\etocabovetocskip}%
@@ -857,7 +860,7 @@
         \setlength{\columnsep}{\etoccolumnsep}%
         \setlength{\multicolsep}{\etocmulticolsep}%
         \begin{multicols}{#1}[\etoc@ruledheading{#2}]}
-       {\etoc@ruledheading{#2}\nobreak
+       {\etoc@ruledheading{#2}%
          \pretolerance\etocmulticolpretolerance
          \tolerance\etocmulticoltolerance}}
    {\ifnum #1>\@ne\let\Etoc@next\@firstofone
@@ -1132,14 +1135,13 @@
      \addcontentsline {toc}{#1}{#2}}
 \DeclareRobustCommand*{\etoctoccontentsline}
     {\@ifstar{\Etoc@addcontentsline@}{\Etoc@addtocontents}}
-\def\Etoc@settocdepth   {\etoc@settocdepth }% for 1.07g->h, to be removed later.
 \def\Etoc@storetocdepth {\global\c@etoc@tocdepth\c@tocdepth }
 \def\Etoc@resettocdepth {\global\c@tocdepth\c@etoc@tocdepth }
 \def\etocobeytoctocdepth {\def\etoc@settocdepth
         {\afterassignment\Etoc@@nottoodeep \global\c@tocdepth}}
 \def\Etoc@@nottoodeep {\ifnum\c@tocdepth>\c@etoc@tocdepth
                           \global\c@tocdepth\c@etoc@tocdepth\fi }
-\def\etocignoretoctocdepth {\let\etoc@settocdepth\count@ }
+\def\etocignoretoctocdepth {\let\etoc@settocdepth\@gobble }
 \def\etocsettocdepth   {\futurelet\Etoc@nexttoken\Etoc@set@tocdepth }
 \def\Etoc@set@tocdepth {\ifx\Etoc@nexttoken\bgroup
                             \expandafter\Etoc@set@tocdepth@
@@ -1206,7 +1208,7 @@
 }%
 \addtocontents {toc}{\protect\@ifundefined{etoctocstyle}%
            {\let\protect\etoc@startlocaltoc\protect\@gobble
-            \let\protect\etoc@settocdepth\count@
+            \let\protect\etoc@settocdepth\protect\@gobble
             \let\protect\etoc@depthtag\protect\@gobble }{}}%
 \def\etocstandardlines {\Etoc@standardtrue}
 \def\etoctoclines      {\Etoc@standardfalse}