etoc (8feb18)

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

6 files changed, 58 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index fe9c3a69eed..c4b007a013c 100644
--- a/Master/texmf-dist/doc/latex/etoc/README.md
+++ b/Master/texmf-dist/doc/latex/etoc/README.md
@@ -1,12 +1,12 @@
 <!-- -->
 
-    Source:  etoc.dtx (v1.08l-2017/10/23)
+    Source:  etoc.dtx (v1.08m-2018/02/07)
     Author:  Jean-Francois Burnol
     Author:  Christine Roemer et al. (German tranlation)
     Info:    Completely customisable TOCs
     License: LPPL 1.3c
-    Copyright (C) 2012-2017 Jean-Francois Burnol.
-    Copyright (C) 2014-2017 Christine Roemer and collaborators for
+    Copyright (C) 2012-2018 Jean-Francois Burnol.
+    Copyright (C) 2014-2018 Christine Roemer and collaborators for
     the translation into German of the documentation.
     <jfbu at free dot fr>    <Christine_Roemer at t-online dot de>
 
@@ -116,6 +116,12 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
 RECENT CHANGES
 ==============
 
+v1.08m \[2018/02/07\]
+---------------------
+
+Fix to `1.08k`'s introduced incompatibility with KOMA-script
+and tocbasic's `\nonumberline`.
+
 v1.08l \[2017/10/23\]
 ---------------------
 
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
index 39395caa6f8..06580b98695 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.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index e24ce5f0baf..c79add291c7 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/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index faf51197861..9758bea510d 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -2,24 +2,24 @@
 % N.B.: this dtx file is NOT for use with \DocInput. The latex source of the
 % user manual is not prefixed with percent signs.
 %<*none>
-\def\etocdtxtimestamp {Time-stamp: <23-10-2017 at 12:03:59 CEST>}%
+\def\etocdtxtimestamp {Time-stamp: <07-02-2018 at 23:54:39 CET>}%
 %</none>
 %<*!readme>
 %%
 %% Package: etoc
-%% Version: 1.08l-2017/10/23
+%% Version: 1.08m-2018/02/07
 %% License: LPPL 1.3c
-%% Copyright (C) 2012-2017 Jean-Francois Burnol
+%% Copyright (C) 2012-2018 Jean-Francois Burnol
 %%                         <jfbu at free dot fr>
-%% Copyright (C) 2014-2017 Christine Roemer
+%% Copyright (C) 2014-2018 Christine Roemer
 %%                         <Christine_Roemer at t-online dot de>
 %% and collaborators for the translation into German of the documentation
 %%
 %</!readme>
 %<*insfile>
-\def\etocpkgdate        {2017/10/23}
-\def\etocdocdate        {2017/10/23}
-\def\etocpkgversion     {v1.08l}
+\def\etocpkgdate        {2018/02/07}
+\def\etocdocdate        {2018/02/07}
+\def\etocpkgversion     {v1.08m}
 \def\etocpkgdescription {Completely customisable TOCs (JFB)}
 %</insfile>
 %<*none>
@@ -35,10 +35,10 @@
     \catcode32=13\catcode`\\=12^^Brelax^^A
 ^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
 {% Package: etoc
-% Version: 1.08l-2017/10/23
+% Version: 1.08m-2018/02/07
 % License: LPPL 1.3c
-% Copyright (C) 2012-2017 Jean-Francois Burnol <jfbu at free dot fr>
-% Copyright (C) 2014-2017 Christine Roemer <Christine_Roemer at t-online dot de>
+% Copyright (C) 2012-2018 Jean-Francois Burnol <jfbu at free dot fr>
+% Copyright (C) 2014-2018 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
@@ -69,13 +69,13 @@
 %<*readme>
 <!-- -->
 
-    Source:  etoc.dtx (v1.08l-2017/10/23)
+    Source:  etoc.dtx (v1.08m-2018/02/07)
     Author:  Jean-Francois Burnol
     Author:  Christine Roemer et al. (German tranlation)
     Info:    Completely customisable TOCs
     License: LPPL 1.3c
-    Copyright (C) 2012-2017 Jean-Francois Burnol.
-    Copyright (C) 2014-2017 Christine Roemer and collaborators for
+    Copyright (C) 2012-2018 Jean-Francois Burnol.
+    Copyright (C) 2014-2018 Christine Roemer and collaborators for
     the translation into German of the documentation.
     <jfbu at free dot fr>    <Christine_Roemer at t-online dot de>
 
@@ -185,6 +185,13 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
 RECENT CHANGES
 ==============
 
+v1.08m \[2018/02/07\]
+---------------------
+
+Fix to `1.08k`'s introduced incompatibility with KOMA-script
+and tocbasic's `\nonumberline`.
+
+
 v1.08l \[2017/10/23\]
 ---------------------
 
@@ -10900,7 +10907,13 @@ Dokumentation erzeugt von der Quelldatei mit dem Stempel
 
 \begin{multicols}{2}
 \begin{jfverbatim}
-v1.08l [2017/10/23]^
+v1.08m [2018/02/07]^
+
+   Fix to 1.08k's introduced incompatibility with KOMA-script
+   and tocbasic's \nonumberline.
+
+
+~v1.08l [2017/10/23]^
 
    Workaround an issue with Emacs/AUCTeX wrongly reporting about
    actually non-existent LaTeX errors, which was triggered by some
@@ -12062,18 +12075,21 @@ v1.08l [2017/10/23]^
 % \csa{chapternumberline} etc... in one go, avoiding
 % the |\let\chapternumberline\numberline| etc... which were done formerly
 % in \csa{Etoc@tableofcontents}. Currently \etoc does not yet use \eTeX.
+%
+% |1.08m| fixes incompatibility of |1.08k|'s delimited macro method with KOMA's
+% \csa{nonumberline}.
 %    \begin{macrocode}
 \begingroup\@tfor\x:=NUMBZRLINZ\do{\catcode\expandafter`\x=12 }\lccode`Z `e
 \lowercase{\endgroup
-\long\def\Etoc@oneifnumberline #1NUMBZRLINZ#2#3\Etoc@next{%
-   \ifx\etoc@#20\else1\fi
+\long\def\Etoc@oneifnumberline #1NUMBZRLINZ#2#3\Etoc@next#4{%
+   \ifx\etoc@#20\else\ifx\nonumberline#40\else1\fi\fi
 }%
 \def\Etoc@getnb@nohyp #1#2#3\etoc@ {%
     \def\Etoc@getname ##1\relax\relax\etoc@ {%
       \Etoc@global\def\etocthename       {##1}%
       \Etoc@global\def\etocthelinkedname {##1}%
      }%
-  \if1\expandafter\Etoc@oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc@next
+  \if1\expandafter\Etoc@oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc@next{#1}%
     \Etoc@global\def\etocthenumber       {#2}%
     \Etoc@global\def\etocthelinkednumber {#2}%
     \Etoc@global\Etoc@numbertrue
@@ -12101,7 +12117,7 @@ v1.08l [2017/10/23]^
                               {\expandafter\hyperlink \Etoc@tmp{##1}}%
          }%
          \def\Etoc@getnbr ##1##2##3\etoc@ {%
-          \if1\expandafter\Etoc@oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc@next
+          \if1\expandafter\Etoc@oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc@next{##1}%
             \Etoc@global\def\etocthenumber {##2}%
             \edef\Etoc@tmp   {{#3}}%
             \Etoc@global\expandafter\def\expandafter\etocthelinkednumber
@@ -13658,7 +13674,7 @@ v1.08l [2017/10/23]^
   Grave accent  \`     Left brace    \{     Vertical bar  \|
   Right brace   \}     Tilde         \~}
 
-\CheckSum{3309}%
+\CheckSum{3313}%
 
 \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 080b845ee24..c715eadcfde 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.ins
+++ b/Master/texmf-dist/source/latex/etoc/etoc.ins
@@ -1,16 +1,16 @@
 %%
 %% Package: etoc
-%% Version: 1.08l-2017/10/23
+%% Version: 1.08m-2018/02/07
 %% License: LPPL 1.3c
-%% Copyright (C) 2012-2017 Jean-Francois Burnol
+%% Copyright (C) 2012-2018 Jean-Francois Burnol
 %%                         <jfbu at free dot fr>
-%% Copyright (C) 2014-2017 Christine Roemer
+%% Copyright (C) 2014-2018 Christine Roemer
 %%                         <Christine_Roemer at t-online dot de>
 %% and collaborators for the translation into German of the documentation
 %%
-\def\etocpkgdate        {2017/10/23}
-\def\etocdocdate        {2017/10/23}
-\def\etocpkgversion     {v1.08l}
+\def\etocpkgdate        {2018/02/07}
+\def\etocdocdate        {2018/02/07}
+\def\etocpkgversion     {v1.08m}
 \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
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index 48a8a986c45..1a1f7ab901d 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -23,14 +23,14 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoc}
- [2017/10/23 v1.08l Completely customisable TOCs (JFB)]
+ [2018/02/07 v1.08m Completely customisable TOCs (JFB)]
 %%
 %% Package: etoc
-%% Version: 1.08l-2017/10/23
+%% Version: 1.08m-2018/02/07
 %% License: LPPL 1.3c
-%% Copyright (C) 2012-2017 Jean-Francois Burnol
+%% Copyright (C) 2012-2018 Jean-Francois Burnol
 %%                         <jfbu at free dot fr>
-%% Copyright (C) 2014-2017 Christine Roemer
+%% Copyright (C) 2014-2018 Christine Roemer
 %%                         <Christine_Roemer at t-online dot de>
 %% and collaborators for the translation into German of the documentation
 %%
@@ -393,15 +393,15 @@
 }
 \begingroup\@tfor\x:=NUMBZRLINZ\do{\catcode\expandafter`\x=12 }\lccode`Z `e
 \lowercase{\endgroup
-\long\def\Etoc@oneifnumberline #1NUMBZRLINZ#2#3\Etoc@next{%
-   \ifx\etoc@#20\else1\fi
+\long\def\Etoc@oneifnumberline #1NUMBZRLINZ#2#3\Etoc@next#4{%
+   \ifx\etoc@#20\else\ifx\nonumberline#40\else1\fi\fi
 }%
 \def\Etoc@getnb@nohyp #1#2#3\etoc@ {%
     \def\Etoc@getname ##1\relax\relax\etoc@ {%
       \Etoc@global\def\etocthename       {##1}%
       \Etoc@global\def\etocthelinkedname {##1}%
      }%
-  \if1\expandafter\Etoc@oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc@next
+  \if1\expandafter\Etoc@oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc@next{#1}%
     \Etoc@global\def\etocthenumber       {#2}%
     \Etoc@global\def\etocthelinkednumber {#2}%
     \Etoc@global\Etoc@numbertrue
@@ -420,7 +420,7 @@
                               {\expandafter\hyperlink \Etoc@tmp{##1}}%
          }%
          \def\Etoc@getnbr ##1##2##3\etoc@ {%
-          \if1\expandafter\Etoc@oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc@next
+          \if1\expandafter\Etoc@oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc@next{##1}%
             \Etoc@global\def\etocthenumber {##2}%
             \edef\Etoc@tmp   {{#3}}%
             \Etoc@global\expandafter\def\expandafter\etocthelinkednumber