summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-29 20:14:06 +0000
committerKarl Berry <karl@freefriends.org>2023-10-29 20:14:06 +0000
commitb5f6f53563f112462867a8d566e866fed3edfb61 (patch)
treedd092dadeafc99a64b4ee7c7d597f944e026563a
parentf2f34147350143acc449967e7dde72c3d8b53ecb (diff)
etoc (29oct23)
git-svn-id: svn://tug.org/texlive/trunk@68691 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/etoc/README.md5
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.pdfbin978250 -> 979119 bytes
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-22.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/source/latex/etoc/etoc.dtx66
-rw-r--r--Master/texmf-dist/tex/latex/etoc/etoc.sty13
31 files changed, 82 insertions, 56 deletions
diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index b45d22bb038..b44011a15dc 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 (1.2c)
+ Source: etoc.dtx (1.2d)
Author: Jean-Francois Burnol
Info: Completely customisable TOCs
License: LPPL 1.3c
@@ -78,6 +78,9 @@ etoc.sty, etoc.tex, etoc.pdf, etoc.dvi.
RECENT CHANGES
==============
+- `1.2d 2023/10/29` fix crash (since `1.2`) in presence of
+ `\usepackage[nottoc]{tocbibind}`. Thanks to François Jonca for report.
+
- `1.2c 2023/10/28` compatibility hotfix with `hyperref v7.01c`. Thanks
to Denis Bitouzé for report.
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 8f6b1a892a4..e140a7df711 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 1a961677393..548e3a01860 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.2c
+%% Version: 1.2d
%% License: LPPL 1.3c
%% Copyright (C) 2012-2023 Jean-Francois Burnol
%% <jfbu at free dot fr>
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex
index 9bf83fb85ae..b437757bfb6 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-01.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\etocsetstyle{section}
{\begin{enumerate}}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex
index 08db97b2ffb..9479bd6d01f 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-02.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\etocruledstyle[2]{\normalfont\normalsize\rmfamily\itshape
\fbox{\parbox{.6\linewidth}{
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex
index 199a48c5c40..64b077f13f2 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-03.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begin{figure}[ht!]
\centering
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex
index 2c4babc45d3..8eb4f9f8ece 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-04.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begingroup\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm
\etocsetstyle {section}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex
index 0adbfa430e1..cec92e0a114 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-05.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begingroup
\newcommand*{\DotsAndPage}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex
index a69e3896789..c4bbfd8f68a 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-06.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begingroup % we start a group to keep the style changes local
\newlength{\tocleftmargin} \setlength{\tocleftmargin}{4cm}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex
index ebd3a09d335..ff0a8ca6e61 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-07.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\makeatletter
\newcommand{\MyLocalTOC}[1][section]{%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex
index 7923b6350df..404035d1c8d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-08.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
% 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-09.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex
index e4c865792c5..a48211f0224 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-09.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\makeatletter
\newcommand*\TOClocalstyle {%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
index a36f1f1288c..a8e9be2a182 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 `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\etocdefaultlines
\begingroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex
index 72bf490d26d..256d8adf844 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-11.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begin{figure}[htbp!]\centering
\colorlet{subsecnum}{black}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex
index 4ae11190116..67984ecfcd6 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-12.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begingroup
\newsavebox{\forsubsections}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex
index a92e98fe16d..6e2c458b583 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-13.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begingroup
\definecolor{subsecnum}{RGB}{13,151,225}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex
index b5b43347dca..e25ad0ae8b2 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-14.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
< in the preamble >
\newcounter{visibletoc}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex
index d698c4b4b5b..5d0a38fbc30 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-15.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\etocsetnexttocdepth{2} % sections are at level 1 and will show up
\begingroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex
index 54091d8da4e..b4c3ac8bcf9 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-16.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
% \newtoks\treetok % put this (uncommented) preferably in the preamble
% \newtoks\tmptok % (idem)
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex
index 0e0b4a38e31..8effb159661 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-17.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
% \newtoks\treetok % put this (uncommented) preferably in the preamble
% \newtoks\subsectiontok
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex
index 4e5fb963e4a..bf1b58c506b 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-18.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
% \newtoks\treetok % done in preamble
% \newtoks\parttok
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex
index 83144660adf..a5e6fe2bfc1 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-19.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begingroup
\etocglobaldefs % necessary for \etocname etc... to survive &
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex
index ad6798ff4d7..de986db697f 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-20.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\begin{center}
\etocsetstyle{section}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex
index f3fa049bb4a..c698b1924a2 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-21.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\makeatletter
\newcommand*\TOCcompute@numwidths [2]{% #1=empty/"local", #2=minimal indent
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex
index 568ddfae555..ddf7a60ed1c 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex
@@ -1,6 +1,6 @@
%% LaTeX2e file `etocsnippet-22.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\newsavebox\firstnamei \newsavebox\firstnumberi
\newsavebox\lastnamei \newsavebox\lastnumberi
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
index ea4484fce46..911cb05d598 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 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\makeatletter
\newcommand*\firstsubname {} \newcommand*\lastsubname {}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
index d3addda7e93..87377bd1164 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 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\etocsetnexttocdepth {all}
\begingroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
index 291c4ca21b2..48c76cd32ca 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 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\makeatletter
\newcommand*{\MyQuasiStandardTOC}[2][]{%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
index 881a1df59b6..f57a06302af 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 2023/10/28.
+%% from source `etoc' on 2023/10/29.
%%
\newtoks\toctabletok
\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index 6bc8ebe6447..2c014e28c44 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -2,20 +2,20 @@
% N.B.: this dtx file does NOT use \DocInput. It does NOT prefix the user
% manual part with percent characters.
%<*none>
-\def\etocdtxtimestamp {Time-stamp: <04-07-2023 at 22:42:41 CEST>}%
+\def\etocdtxtimestamp {Time-stamp: <29-10-2023 at 10:31:05 CET>}%
%</none>
%<*!readme>
%%
%% Package: etoc
-%% Version: 1.2c
+%% Version: 1.2d
%% License: LPPL 1.3c
%% Copyright (C) 2012-2023 Jean-Francois Burnol
%% <jfbu at free dot fr>
%</!readme>
%<*none>
-\def\etocpkgdate {2023/10/28}
-\def\etocdocdate {2023/10/28}
-\def\etocpkgversion {1.2c}
+\def\etocpkgdate {2023/10/29}
+\def\etocdocdate {2023/10/29}
+\def\etocpkgversion {1.2d}
\def\etocpkgdescription {Completely customisable TOCs (JFB)}
%% Formerly this etoc.dtx also included source for a German translation
%% etoc-DE.pdf. But all additions since April 2015 had been only in English.
@@ -29,7 +29,7 @@
\catcode32=13\catcode`\\=12^^Brelax^^A
^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
{% Package: etoc
-% Version: 1.2c
+% Version: 1.2d
% License: LPPL 1.3c
% Copyright (C) 2012-2023 Jean-Francois Burnol <jfbu at free dot fr>
%
@@ -56,7 +56,7 @@
%<*readme>
<!-- -->
- Source: etoc.dtx (1.2c)
+ Source: etoc.dtx (1.2d)
Author: Jean-Francois Burnol
Info: Completely customisable TOCs
License: LPPL 1.3c
@@ -137,6 +137,9 @@ etoc.sty, etoc.tex, etoc.pdf, etoc.dvi.
RECENT CHANGES
==============
+- `1.2d 2023/10/29` fix crash (since `1.2`) in presence of
+ `\usepackage[nottoc]{tocbibind}`. Thanks to François Jonca for report.
+
- `1.2c 2023/10/28` compatibility hotfix with `hyperref v7.01c`. Thanks
to Denis Bitouzé for report.
@@ -6805,11 +6808,21 @@ should work.
Please inform the author in case of issues: \etoc was from the start designed
to be |100%| compatible with package \ctanpkg{hyperref}.
+\begin{framed}
+ Releases of \etoc prior to \etocrelease{1.2c} copied over some legacy
+ internals of \ctanpkg{hyperref} which got removed there at release
+ |v7.01c| of |2023-10-21|, and this caused \etoc to stop displaying
+ tables of contents. You must use at least \etocrelease{1.2c} to avoid
+ that mishap.
+\end{framed}
+
The macros \csb{etocname}, \csb{etocnumber}, and \csb{etocpage} contain the
\ctanpkg{hyperref} links, if present (note that the \emph{linktoc=all} option of
\ctanpkg{hyperref} tells it to put a link also in the page number corresponding to a
given toc entry). For example, the tables of contents of the present document
-are all fully linked. It doesn't matter whether \etoc or \ctanpkg{hyperref} is loaded
+are all fully linked.
+
+It doesn't matter whether \etoc or \ctanpkg{hyperref} is loaded
first.
\subsection{Compatibility with \ctanpkg{microtype}}
@@ -6968,8 +6981,7 @@ above with some more width for the numbers of subsections.
\subsection{Compatibility with \ctanpkg{tocloft}}\label{subs:tocloft}
-Release \etocrelease{1.07k} added compatibility with package
-\ctanpkg{tocloft}: steps are
+Steps are
taken to prevent the redefinition of |\tableofcontents| done by
\ctanpkg{tocloft} at |\begin{document}|.
%
@@ -6990,10 +7002,8 @@ not possible.
the time of |\begin{document}| and trick \ctanpkg{tocloft} into believing
having been loaded with the |titles| option.
- Sadly, \etocrelease{1.2} and \etocrelease{1.2a} had a bug and loading
- \ctanpkg{tocloft} before \etoc caused \toc to not be the \etoc one. One had
- to use explicitly \csb{etoctableofcontents} (there was no issue with
- \localtoc). The regression was fixed at \etocrelease{1.2b}.
+ Some bugs with \etocrelease{1.2} and \etocrelease{1.2a} were fixed at
+ \etocrelease{1.2b}.
\end{framed}
It is possible to modify midway in the document the macros \csa{l@section},
@@ -7003,9 +7013,10 @@ customizations). It will have no effect on true \etoc TOCs.
\subsection{Compatibility with \ctanpkg{tocbibind}}\label{subs:tocbibind}
-Added at \etocrelease{1.2}. See also \csb{etocsetup} for a discussion of the
- package options which are all related to this (they will achieve the
- \ctanpkg{tocbibind} ``to toc'' features without requiring the package).
+Added at \etocrelease{1.2} (but with a bug fixed only at
+\etocrelease{1.2d}). See also \csb{etocsetup} for a discussion of the
+package options which are all related to this (they will achieve the
+\ctanpkg{tocbibind} ``to toc'' features without requiring the package).
Thanks to Denis Bitouzé for feature request.
@@ -7212,6 +7223,12 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
\makeatother
\vskip-\baselineskip
\begin{jfverbatim}
+~1.2d [2023/10/29]^
+
+ Fix crash (present since 1.2) if used with
+ \usepackage[nottoc]{tocbibind} (the faulty code was avoided if also
+ tocloft was used by document). Thanks to François Jonca for report.
+
~1.2c [2023/10/28]^
Compatibility hotfix with hyperref v7.01c; etoc had copied
@@ -8454,7 +8471,7 @@ of real structure in a \LaTeX{} document body).
% \csa{numexpr} or \csa{unexpanded} or maybe others yet that we use).
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[2003/12/01]
-\ProvidesPackage{etoc}[2023/10/28 v1.2c Completely customisable TOCs (JFB)]
+\ProvidesPackage{etoc}[2023/10/29 v1.2d Completely customisable TOCs (JFB)]
% \end{macrocode}
% Gentle Info message in the log to mention no testing is done of current
% \etoc on old \LaTeX{} installations.
@@ -8467,7 +8484,7 @@ of real structure in a \LaTeX{} document body).
Since 1.1a (2023/01/14), etoc prefers LaTeX at least\MessageBreak
as recent as 2020-10-01, for reasons of the .toc file,\MessageBreak
and used to require it (from 1.1a to 1.2).\MessageBreak
- This etoc (1.2c) does not *require* it, but has not been\MessageBreak
+ This etoc (1.2d) does not *require* it, but has not been\MessageBreak
tested thoroughly on old LaTeX (especially if document\MessageBreak
does not use hyperref) and retrofitting was done only\MessageBreak
on basis of author partial remembrances of old context.\MessageBreak
@@ -11793,6 +11810,10 @@ of real structure in a \LaTeX{} document body).
}%
{% no tocloft
\@ifpackageloaded {tocbibind}
+% \end{macrocode}
+% For some reason this \etocrelease{1.2} code had no |\fi| matching the
+% |\if@dotoctoc|. Fixed at \etocrelease{1.2d}.
+% \begin{macrocode}
{\if@dotoctoc
\def\etocclasstocstyle{%
\etoctocbibindstyle
@@ -11817,9 +11838,10 @@ of real structure in a \LaTeX{} document body).
\else
\let\tableofcontents\etoctableofcontents
\fi
- }%
- {}%
- }%
+ \fi
+ }% end of tocbibind without tocloft at begin document code
+ {}% empty false branch
+ }% end of no tocloft at begin document code
% \end{macrocode}
% Maybe I should check if the options were already set. I will simply
% make the message more generic.
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index a58b5445d35..25f099242f8 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -22,12 +22,12 @@
%% in the same archive or directory.)
%%
%% Package: etoc
-%% Version: 1.2c
+%% Version: 1.2d
%% License: LPPL 1.3c
%% Copyright (C) 2012-2023 Jean-Francois Burnol
%% <jfbu at free dot fr>
\NeedsTeXFormat{LaTeX2e}[2003/12/01]
-\ProvidesPackage{etoc}[2023/10/28 v1.2c Completely customisable TOCs (JFB)]
+\ProvidesPackage{etoc}[2023/10/29 v1.2d Completely customisable TOCs (JFB)]
\newif\ifEtoc@oldLaTeX
\@ifl@t@r\fmtversion{2020/10/01}
{}
@@ -36,7 +36,7 @@
Since 1.1a (2023/01/14), etoc prefers LaTeX at least\MessageBreak
as recent as 2020-10-01, for reasons of the .toc file,\MessageBreak
and used to require it (from 1.1a to 1.2).\MessageBreak
- This etoc (1.2c) does not *require* it, but has not been\MessageBreak
+ This etoc (1.2d) does not *require* it, but has not been\MessageBreak
tested thoroughly on old LaTeX (especially if document\MessageBreak
does not use hyperref) and retrofitting was done only\MessageBreak
on basis of author partial remembrances of old context.\MessageBreak
@@ -1887,9 +1887,10 @@
\else
\let\tableofcontents\etoctableofcontents
\fi
- }%
- {}%
- }%
+ \fi
+ }% end of tocbibind without tocloft at begin document code
+ {}% empty false branch
+ }% end of no tocloft at begin document code
\@ifpackageloaded{tocbibind}
{% tocbibind, perhaps with tocloft
\if@dotoctoc