texlive[60589] Master/texmf-dist: etoc (23sep21)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 23 22:12:59 CEST 2021
Revision: 60589
http://tug.org/svn/texlive?view=revision&revision=60589
Author: karl
Date: 2021-09-23 22:12:59 +0200 (Thu, 23 Sep 2021)
Log Message:
-----------
etoc (23sep21)
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-DE.tex
trunk/Master/texmf-dist/doc/latex/etoc/etoc.pdf
trunk/Master/texmf-dist/doc/latex/etoc/etoc.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex
trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex
trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx
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 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/README.md 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
<!-- -->
- Source: etoc.dtx (v1.09d)
+ Source: etoc.dtx (v1.09e)
Author: Jean-Francois Burnol
Author: Christine Roemer et al. (German tranlation)
Info: Completely customisable TOCs
@@ -107,8 +107,17 @@
RECENT CHANGES
==============
+v1.09e \[2021/09/23\]
+---------------------
+
+Needed (if etoc is used without hyperref) updates to
+internal macros to prepare for the upcoming LaTeX November
+2021 change to `\contentsline`.
+
+Related updates to the user macro `\etoctoccontentsline`.
+
v1.09d \[2021/07/13\]
--------------------------
+---------------------
Some minor synching with tableof 1.4c.
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%%
%% Package: etoc
-%% Version: 1.09d
+%% Version: 1.09e
%% License: LPPL 1.3c
%% Copyright (C) 2012-2021 Jean-Francois Burnol
%% <jfbu at free dot fr>
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etoc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etoc.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etoc.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%%
%% Package: etoc
-%% Version: 1.09d
+%% Version: 1.09e
%% License: LPPL 1.3c
%% Copyright (C) 2012-2021 Jean-Francois Burnol
%% <jfbu at free dot fr>
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-10.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begin{figure}[ht!]
\centering
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-20-A.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\makeatletter
\newcommand{\MyStandardTOC}{%
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-20-B.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocsetstyle{section}{}
{\ifnum\etocthenumber=4
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-21-A.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
% it will be easy to globally shift the TOC horizontally if needed
\def\TOCleftmargin {0pt}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-21-B.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\makeatletter
\newcommand*\TOClocalstyle {%
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-22-A.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocdefaultlines
\begingroup
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-23.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begin{figure}[htbp!]\centering
\colorlet{subsecnum}{black}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-24.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup
\newsavebox{\forsubsections}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-25.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
< in the preamble >
\newcounter{visibletoc}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-26.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocsetnexttocdepth{2} % sections are at level 1 and will show up
\begingroup
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-27.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
% \newtoks\treetok % put this (uncommented) preferably in the preamble
% \newtoks\tmptok % (idem)
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-28.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
% \newtoks\treetok % put this (uncommented) preferably in the preamble
% \newtoks\sectiontok
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-29.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup
% \newtoks\treetok % done in preamble
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-30-A.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup
\etocglobaldefs % necessary for \etocname etc... to survive &
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-30-B.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begin{center}
\etocsetstyle{section}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-31.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\makeatletter
\newcommand*\TOCcompute at numwidths [2]{% #1=empty/"local", #2=minimal indent
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-32.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocsetstyle{section}
{\begin{enumerate}}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-40.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocsettocdepth {subsubsection} % set the initial tocdepth
\etocdefaultlines % use the package default line styles. At this early stage in
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-46.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocruledstyle[2]{\normalfont\normalsize\rmfamily\itshape
\fbox{\parbox{.6\linewidth}{
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-48.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup
\definecolor{subsecnum}{RGB}{13,151,225}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-5.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm
\etocsetstyle {section}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-52-A.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\newsavebox\firstnamei \newsavebox\firstnumberi
\newsavebox\lastnamei \newsavebox\lastnumberi
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-52-B.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\makeatletter
\newcommand*\firstsubname {} \newcommand*\lastsubname {}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-53.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\etocsetnexttocdepth {all}
\begingroup
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-54.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\newtoks\toctabletok
\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-6.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup
\newcommand*{\DotsAndPage}
Modified: trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex 2021-09-23 20:12:59 UTC (rev 60589)
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-7.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2021/07/13.
+%% from source `etoc' on 2021/09/23.
%%
\begingroup % we start a group to keep the style changes local
\newlength{\tocleftmargin} \setlength{\tocleftmargin}{5cm}
Modified: trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/source/latex/etoc/etoc.dtx 2021-09-23 20:12:59 UTC (rev 60589)
@@ -2,12 +2,12 @@
% 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: <13-07-2021 at 10:15:28 CEST>}%
+\def\etocdtxtimestamp {Time-stamp: <23-09-2021 at 19:28:24 CEST>}%
%</none>
%<*!readme>
%%
%% Package: etoc
-%% Version: 1.09d
+%% Version: 1.09e
%% License: LPPL 1.3c
%% Copyright (C) 2012-2021 Jean-Francois Burnol
%% <jfbu at free dot fr>
@@ -16,12 +16,12 @@
%% (translation into German of the documentation)
%</!readme>
%<*none>
-\def\etocpkgdate {2021/07/13}
-\def\etocdocdate {2021/07/13}
-\def\etocpkgversion {v1.09d}
+\def\etocpkgdate {2021/09/23}
+\def\etocdocdate {2021/09/23}
+\def\etocpkgversion {v1.09e}
\def\etocpkgdescription {Completely customisable TOCs (JFB)}
-\def\etocDEpkgdate {13.07.2021}% METTRE À JOUR À CHAQUE BUMP!
-\def\etocDEdocdate {13.07.2021}
+\def\etocDEpkgdate {23.09.2021}% METTRE À JOUR À CHAQUE BUMP!
+\def\etocDEdocdate {23.09.2021}
\def\etocDEDEdocdate {09.04.2015}%
\def\etocDEDEpkgversion {v1.08d}%
% Definition of \etocLicense
@@ -32,7 +32,7 @@
\catcode32=13\catcode`\\=12^^Brelax^^A
^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
{% Package: etoc
-% Version: 1.09d
+% Version: 1.09e
% License: LPPL 1.3c
% Copyright (C) 2012-2021 Jean-Francois Burnol <jfbu at free dot fr>
% Copyright (C) 2014-2015 Christine Roemer and collaborators
@@ -67,7 +67,7 @@
%<*readme>
<!-- -->
- Source: etoc.dtx (v1.09d)
+ Source: etoc.dtx (v1.09e)
Author: Jean-Francois Burnol
Author: Christine Roemer et al. (German tranlation)
Info: Completely customisable TOCs
@@ -174,8 +174,17 @@
RECENT CHANGES
==============
+v1.09e \[2021/09/23\]
+---------------------
+
+Needed (if etoc is used without hyperref) updates to
+internal macros to prepare for the upcoming LaTeX November
+2021 change to `\contentsline`.
+
+Related updates to the user macro `\etoctoccontentsline`.
+
v1.09d \[2021/07/13\]
--------------------------
+---------------------
Some minor synching with tableof 1.4c.
@@ -10631,8 +10640,16 @@
\begin{multicols}{2}
\begin{jfverbatim}
-v1.09d [2021/07/13]^
+v1.09e [2021/09/23]^
+ Needed (if etoc is used without hyperref) updates to
+ internal macros to prepare for the upcoming LaTeX November
+ 2021 change to \contentsline.
+
+ Related updates to the user macro \etoctoccontentsline.
+
+~v1.09d [2021/07/13]^
+
Some minor synching with tableof 1.4c.
Add \etockeeporiginaltableofcontents to provide a work-around to a
@@ -11363,6 +11380,13 @@
% |\Etoc at etoccontentsline|.
%
% |1.08i| as a |fourorthree| rather than as formerly a |sixorfive|.
+%
+% \LaTeX\ of November 2021 will have its |\contentsline| always grab four
+% arguments. So we must adjust |\Etoc at et@hop| et al., else usage of \etoc
+% without hyperref will be broken. Done at |1.09e 2021/09/23|.
+%
+% Side note to myself: I see there is now a |\@gobblethree| in latex.ltx and
+% I wonder since when. No time to lose on checking that.
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackageloaded{parskip}{\Etoc at parskiptrue}{}%
@@ -11371,6 +11395,10 @@
\long\def\Etoc at gobblefourorthree#1#2#3#4{}}
{\def\Etoc at et@hop#1#2#3#4{#2{#3}{#4}#1}%
\long\def\Etoc at gobblefourorthree#1#2#3{}}%
+\@ifl at t@r\fmtversion{2021/11/15}{%
+ \def\Etoc at et@hop#1#2#3#4#5{#2{#3}{#4}{#5}#1}%
+ \let\Etoc at gobblefourorthree\@gobblefour
+ }{}%
}
% \end{macrocode}
% |2015/03/08| One has to be careful about the |Etoc at end@<level>| user
@@ -11709,7 +11737,15 @@
% opt for global definitions of |\etocname| and the like, thus use
% freely |&| and other group closing things. Also, some care has been
% put into doing only expandable things after expansion of the
-% \meta{prefix} and \meta{contents} parts of a sectioning unit style.
+% \meta{prefix} and \meta{contents} parts of a sectioning unit
+% style.
+%
+% |1.09e| prepares for LaTeX November 2021 upcoming release
+% whose |\contentsline| will always grab four arguments whether or
+% not hyperref is loaded. The |\Etoc at et@hop| definition done at
+% begin document must now swap the same number of arguments
+% whether or not hyperref is loaded (else \etoc would be broken in
+% absence of hyperref).
% \begin{macrocode}
\Etoc at et@hop{\Etoc at prefix\Etoc at contents}{\Etoc at savedcontentsline{#1}}%
}
@@ -13465,16 +13501,32 @@
}%
}
% \end{macrocode}
-% placeholder for comments
+% \LaTeX\ 2021 fall release lets |\contentsline| always grab four arguments,
+% so with |1.09e 2021/09/23| we make sure our |\addtocontents| will always
+% provide |\contentsline| with four arguments. This extra |{}| is done
+% without checking LaTeX's version by laziness, as an impact on documents
+% compiled with former LaTeX could be visible only with very special contexts
+% that only the author himself would ever consider.
+%
+% Let's also add |\protected at file@percent| at |1.09e| although this is a
+% priori of no relevance as \etoc reads the toc file with |\endlinechar=-1|
+% regime.
+%
+% When using |\addcontentsline| nothing needs to be done as both things are
+% handled by \LaTeX\ upstream.
% \begin{macrocode}
\def\Etoc at addtocontents #1#2%
{\ifEtoc at hyperref
\addtocontents {toc}{\protect\contentsline
{#1}{#2}%
- {\thepage }{\@currentHref }}%
+ {\thepage }{\@currentHref }%
+ \ifdefined\protected at file@percent\protected at file@percent\fi
+ }%
\else
\addtocontents {toc}{\protect\contentsline
- {#1}{#2}{\thepage }}%
+ {#1}{#2}{\thepage }{}%
+ \ifdefined\protected at file@percent\protected at file@percent\fi
+ }%
\fi}
\def\Etoc at addcontentsline@ #1#2#3%
{\@namedef{toclevel@#1}{#3}%
@@ -13735,7 +13787,7 @@
Grave accent \` Left brace \{ Vertical bar \|
Right brace \} Tilde \~}
-\CheckSum{3513}%
+\CheckSum{3528}%
\csname check at checksum\endcsname
\Finale
Modified: trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty 2021-09-23 20:12:33 UTC (rev 60588)
+++ trunk/Master/texmf-dist/tex/latex/etoc/etoc.sty 2021-09-23 20:12:59 UTC (rev 60589)
@@ -23,10 +23,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{etoc}
- [2021/07/13 v1.09d Completely customisable TOCs (JFB)]
+ [2021/09/23 v1.09e Completely customisable TOCs (JFB)]
%%
%% Package: etoc
-%% Version: 1.09d
+%% Version: 1.09e
%% License: LPPL 1.3c
%% Copyright (C) 2012-2021 Jean-Francois Burnol
%% <jfbu at free dot fr>
@@ -161,6 +161,10 @@
\long\def\Etoc at gobblefourorthree#1#2#3#4{}}
{\def\Etoc at et@hop#1#2#3#4{#2{#3}{#4}#1}%
\long\def\Etoc at gobblefourorthree#1#2#3{}}%
+\@ifl at t@r\fmtversion{2021/11/15}{%
+ \def\Etoc at et@hop#1#2#3#4#5{#2{#3}{#4}{#5}#1}%
+ \let\Etoc at gobblefourorthree\@gobblefour
+ }{}%
}
\def\Etoc at setflags {%
\ifcase \Etoc at level
@@ -1390,10 +1394,14 @@
{\ifEtoc at hyperref
\addtocontents {toc}{\protect\contentsline
{#1}{#2}%
- {\thepage }{\@currentHref }}%
+ {\thepage }{\@currentHref }%
+ \ifdefined\protected at file@percent\protected at file@percent\fi
+ }%
\else
\addtocontents {toc}{\protect\contentsline
- {#1}{#2}{\thepage }}%
+ {#1}{#2}{\thepage }{}%
+ \ifdefined\protected at file@percent\protected at file@percent\fi
+ }%
\fi}
\def\Etoc at addcontentsline@ #1#2#3%
{\@namedef{toclevel@#1}{#3}%
More information about the tex-live-commits
mailing list.