texlive[46571] Master/texmf-dist: etoc (8feb18)
commits+karl at tug.org
commits+karl at tug.org
Fri Feb 9 01:16:27 CET 2018
Revision: 46571
http://tug.org/svn/texlive?view=revision&revision=46571
Author: karl
Date: 2018-02-09 01:16:26 +0100 (Fri, 09 Feb 2018)
Log Message:
-----------
etoc (8feb18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/etoc/README.md
trunk/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
trunk/Master/texmf-dist/doc/latex/etoc/etoc.pdf
trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx
trunk/Master/texmf-dist/source/latex/etoc/etoc.ins
trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty
Modified: trunk/Master/texmf-dist/doc/latex/etoc/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/README.md 2018-02-09 00:16:06 UTC (rev 46570)
+++ trunk/Master/texmf-dist/doc/latex/etoc/README.md 2018-02-09 00:16:26 UTC (rev 46571)
@@ -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 @@
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\]
---------------------
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx 2018-02-09 00:16:06 UTC (rev 46570)
+++ trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx 2018-02-09 00:16:26 UTC (rev 46571)
@@ -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 @@
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,8 +10907,14 @@
\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
strings written (indirectly) to log file by etoc under some
@@ -12062,11 +12075,14 @@
% \csa{chapternumberline} etc... in one go, avoiding
% the |\let\chapternumberline\numberline| etc... which were done formerly
% in \csa{Etoc at 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 at oneifnumberline #1NUMBZRLINZ#2#3\Etoc at next{%
- \ifx\etoc@#20\else1\fi
+\long\def\Etoc at oneifnumberline #1NUMBZRLINZ#2#3\Etoc at next#4{%
+ \ifx\etoc@#20\else\ifx\nonumberline#40\else1\fi\fi
}%
\def\Etoc at getnb@nohyp #1#2#3\etoc@ {%
\def\Etoc at getname ##1\relax\relax\etoc@ {%
@@ -12073,7 +12089,7 @@
\Etoc at global\def\etocthename {##1}%
\Etoc at global\def\etocthelinkedname {##1}%
}%
- \if1\expandafter\Etoc at oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc at next
+ \if1\expandafter\Etoc at oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc at next{#1}%
\Etoc at global\def\etocthenumber {#2}%
\Etoc at global\def\etocthelinkednumber {#2}%
\Etoc at global\Etoc at numbertrue
@@ -12101,7 +12117,7 @@
{\expandafter\hyperlink \Etoc at tmp{##1}}%
}%
\def\Etoc at getnbr ##1##2##3\etoc@ {%
- \if1\expandafter\Etoc at oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc at next
+ \if1\expandafter\Etoc at oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc at next{##1}%
\Etoc at global\def\etocthenumber {##2}%
\edef\Etoc at tmp {{#3}}%
\Etoc at global\expandafter\def\expandafter\etocthelinkednumber
@@ -13658,7 +13674,7 @@
Grave accent \` Left brace \{ Vertical bar \|
Right brace \} Tilde \~}
-\CheckSum{3309}%
+\CheckSum{3313}%
\csname check at checksum\endcsname
\Finale
Modified: trunk/Master/texmf-dist/source/latex/etoc/etoc.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/etoc/etoc.ins 2018-02-09 00:16:06 UTC (rev 46570)
+++ trunk/Master/texmf-dist/source/latex/etoc/etoc.ins 2018-02-09 00:16:26 UTC (rev 46571)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty 2018-02-09 00:16:06 UTC (rev 46570)
+++ trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty 2018-02-09 00:16:26 UTC (rev 46571)
@@ -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,8 +393,8 @@
}
\begingroup\@tfor\x:=NUMBZRLINZ\do{\catcode\expandafter`\x=12 }\lccode`Z `e
\lowercase{\endgroup
-\long\def\Etoc at oneifnumberline #1NUMBZRLINZ#2#3\Etoc at next{%
- \ifx\etoc@#20\else1\fi
+\long\def\Etoc at oneifnumberline #1NUMBZRLINZ#2#3\Etoc at next#4{%
+ \ifx\etoc@#20\else\ifx\nonumberline#40\else1\fi\fi
}%
\def\Etoc at getnb@nohyp #1#2#3\etoc@ {%
\def\Etoc at getname ##1\relax\relax\etoc@ {%
@@ -401,7 +401,7 @@
\Etoc at global\def\etocthename {##1}%
\Etoc at global\def\etocthelinkedname {##1}%
}%
- \if1\expandafter\Etoc at oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc at next
+ \if1\expandafter\Etoc at oneifnumberline\string#1NUMBZRLINZ\etoc@\Etoc at next{#1}%
\Etoc at global\def\etocthenumber {#2}%
\Etoc at global\def\etocthelinkednumber {#2}%
\Etoc at global\Etoc at numbertrue
@@ -420,7 +420,7 @@
{\expandafter\hyperlink \Etoc at tmp{##1}}%
}%
\def\Etoc at getnbr ##1##2##3\etoc@ {%
- \if1\expandafter\Etoc at oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc at next
+ \if1\expandafter\Etoc at oneifnumberline\string##1NUMBZRLINZ\etoc@\Etoc at next{##1}%
\Etoc at global\def\etocthenumber {##2}%
\edef\Etoc at tmp {{#3}}%
\Etoc at global\expandafter\def\expandafter\etocthelinkednumber
More information about the tex-live-commits
mailing list