summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-23 20:12:59 +0000
committerKarl Berry <karl@freefriends.org>2021-09-23 20:12:59 +0000
commit2ff72e851f8c73db1db4d2bc2d11714779abba5c (patch)
treeedb270cfc7931d3595fae3c85d3a7d2aabf0c555 /Master/texmf-dist
parentc28b3ae9697d36bc8fdf63a4dcf936996f182c8a (diff)
etoc (23sep21)
git-svn-id: svn://tug.org/texlive/trunk@60589 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/etoc/README.md13
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc-DE.pdfbin583023 -> 583401 bytes
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc-DE.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.pdfbin639634 -> 642026 bytes
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex2
-rw-r--r--Master/texmf-dist/source/latex/etoc/etoc.dtx84
-rw-r--r--Master/texmf-dist/tex/latex/etoc/etoc.sty16
34 files changed, 120 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index b6fd46940af..2ac05592595 100644
--- a/Master/texmf-dist/doc/latex/etoc/README.md
+++ b/Master/texmf-dist/doc/latex/etoc/README.md
@@ -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 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
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.
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
index 6a2b623e0fa..a9faaa3b06d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
+++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex b/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
index 24550f4873b..e92678de743 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex
@@ -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>
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 7ed8db08038..7189d96ceab 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc.pdf
+++ b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.tex b/Master/texmf-dist/doc/latex/etoc/etoc.tex
index 4e6d6be59ba..d97b850fa91 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etoc.tex
@@ -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>
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
index 04328e2104a..2f810d70354 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex
index 4b92662b386..5f227f51fb6 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex
@@ -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}{%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex
index b79dd17a988..5f0b864409a 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex
index cfbebf66e4b..a824237fedc 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex
index cf2ed05a17b..06fd429f21e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex
@@ -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 {%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex
index e175091e687..079a06f1f75 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
index 468b13f1c7d..c602198cb84 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
index 335571bd5f9..239382c9291 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
index 417943cd7f6..71bd67fc621 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
index 63601cfd51c..1fbd815b8ce 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
index 21a7d74e167..f00be4074c2 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
@@ -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)
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex
index 3b2735e9308..d0a22b80f8c 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex
index 63212ab15ae..29eb9d1a0ae 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex
index e9a2c1858f5..9a7322bcf4e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex
@@ -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 &
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex
index 4b929ace4f2..f5bef496cf4 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex
index 6fc2e28ad71..d804d59417d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex
@@ -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@numwidths [2]{% #1=empty/"local", #2=minimal indent
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex
index 2ef602d9397..4c5756bc95e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex
@@ -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}}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex
index 3bbd0cdc178..8c705172285 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex
index 6b9d278d776..487a7ca2d23 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex
@@ -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}{
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
index 2c6b4b96e33..f7e3aeb832d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex
index 452495a13b5..593cd85f0e6 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
index 21d982a2cae..2de926d7e69 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
index 2d4f6c7d30f..7e680648b6d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
@@ -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 {}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
index 2c83131dcce..3835877296f 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
index 79cc83e04aa..bfdb03a1a88 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
@@ -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
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex
index 871e462c7a3..31313ca169c 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex
@@ -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}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex
index 1c13c6ccb1a..ca808f0cef7 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex
@@ -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}
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index 9a0fc5716a7..ed175a0bab4 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -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 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
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,7 +10640,15 @@ Dokumentation erzeugt von der Quelldatei mit dem Stempel
\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.
@@ -11363,6 +11380,13 @@ v1.09d [2021/07/13]^
% |\Etoc@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@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@parskiptrue}{}%
@@ -11371,6 +11395,10 @@ v1.09d [2021/07/13]^
\long\def\Etoc@gobblefourorthree#1#2#3#4{}}
{\def\Etoc@et@hop#1#2#3#4{#2{#3}{#4}#1}%
\long\def\Etoc@gobblefourorthree#1#2#3{}}%
+\@ifl@t@r\fmtversion{2021/11/15}{%
+ \def\Etoc@et@hop#1#2#3#4#5{#2{#3}{#4}{#5}#1}%
+ \let\Etoc@gobblefourorthree\@gobblefour
+ }{}%
}
% \end{macrocode}
% |2015/03/08| One has to be careful about the |Etoc@end@<level>| user
@@ -11709,7 +11737,15 @@ v1.09d [2021/07/13]^
% 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@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@et@hop{\Etoc@prefix\Etoc@contents}{\Etoc@savedcontentsline{#1}}%
}
@@ -13465,16 +13501,32 @@ v1.09d [2021/07/13]^
}%
}
% \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@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@addtocontents #1#2%
{\ifEtoc@hyperref
\addtocontents {toc}{\protect\contentsline
{#1}{#2}%
- {\thepage }{\@currentHref }}%
+ {\thepage }{\@currentHref }%
+ \ifdefined\protected@file@percent\protected@file@percent\fi
+ }%
\else
\addtocontents {toc}{\protect\contentsline
- {#1}{#2}{\thepage }}%
+ {#1}{#2}{\thepage }{}%
+ \ifdefined\protected@file@percent\protected@file@percent\fi
+ }%
\fi}
\def\Etoc@addcontentsline@ #1#2#3%
{\@namedef{toclevel@#1}{#3}%
@@ -13735,7 +13787,7 @@ v1.09d [2021/07/13]^
Grave accent \` Left brace \{ Vertical bar \|
Right brace \} Tilde \~}
-\CheckSum{3513}%
+\CheckSum{3528}%
\csname check@checksum\endcsname
\Finale
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index eec03052e22..365b6b148c8 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -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@gobblefourorthree#1#2#3#4{}}
{\def\Etoc@et@hop#1#2#3#4{#2{#3}{#4}#1}%
\long\def\Etoc@gobblefourorthree#1#2#3{}}%
+\@ifl@t@r\fmtversion{2021/11/15}{%
+ \def\Etoc@et@hop#1#2#3#4#5{#2{#3}{#4}{#5}#1}%
+ \let\Etoc@gobblefourorthree\@gobblefour
+ }{}%
}
\def\Etoc@setflags {%
\ifcase \Etoc@level
@@ -1390,10 +1394,14 @@
{\ifEtoc@hyperref
\addtocontents {toc}{\protect\contentsline
{#1}{#2}%
- {\thepage }{\@currentHref }}%
+ {\thepage }{\@currentHref }%
+ \ifdefined\protected@file@percent\protected@file@percent\fi
+ }%
\else
\addtocontents {toc}{\protect\contentsline
- {#1}{#2}{\thepage }}%
+ {#1}{#2}{\thepage }{}%
+ \ifdefined\protected@file@percent\protected@file@percent\fi
+ }%
\fi}
\def\Etoc@addcontentsline@ #1#2#3%
{\@namedef{toclevel@#1}{#3}%