summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-01-16 21:10:42 +0000
committerKarl Berry <karl@freefriends.org>2023-01-16 21:10:42 +0000
commit33049a8849499b98adcedcf4400839c4052beb00 (patch)
tree70fccc2c5733f5462368cccbeebbb1a5bf674751
parent1ab45cfa9a8a257edc4a1678d187de97c3f9ce6a (diff)
etoc (16jan23)
git-svn-id: svn://tug.org/texlive/trunk@65558 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/etoc/README.md11
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.pdfbin850065 -> 851744 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/doc/latex/etoc/etocsnippet-27.tex2
-rw-r--r--Master/texmf-dist/source/latex/etoc/etoc.dtx93
-rw-r--r--Master/texmf-dist/tex/latex/etoc/etoc.sty4
32 files changed, 101 insertions, 63 deletions
diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index e431588369f..d0d1f1ea320 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.1a)
+ Source: etoc.dtx (1.1b)
Author: Jean-Francois Burnol
Info: Completely customisable TOCs
License: LPPL 1.3c
@@ -97,8 +97,15 @@ etoc.sty, etoc.tex, etoc.pdf, etoc.dvi.
RECENT CHANGES
==============
+1.1b \[2023/01/15\]
+-------------------
+
+Documentation fix, 1.1a forgot to mention the following change:
+`\etocthelinkedname`, `\etocthelinkednumber`, `\etocthelinkedpage`
+are now always hyperlinks independently of linktoc status.
+
1.1a \[2023/01/14\]
-----------------------
+-------------------
This version brings no new functionality, despite the number bump.
It implements a complete rewrite of old legacy core internals.
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 545546bd53d..e6bca78501a 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 bd2cea0697c..54e57bdd2ae 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.1a
+%% Version: 1.1b
%% 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 ab58f48000e..53a498bf046 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 `filecontentsdef' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm
\etocsetstyle {section}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex
index 5c3e1c5c4e5..90362aa1767 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 `filecontentsdef' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup
\newcommand*{\DotsAndPage}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex
index 6045d69f5af..10580f89c01 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup % we start a group to keep the style changes local
\newlength{\tocleftmargin} \setlength{\tocleftmargin}{5cm}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex
index 647483f9ead..5cfee48a88b 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begin{figure}[ht!]
\centering
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex
index d4306062564..8d7b0932472 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\makeatletter
\newcommand{\MyStandardTOC}{%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex
index a69f8ef6b20..cfc604b7d2c 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\makeatletter
\newcommand*{\MyQuasiStandardTOC}[1]{%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex
index 7e225720dc7..41ec6f1f2f9 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
% 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-08.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex
index cf868e4c32d..ba86d24b1d1 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\makeatletter
\newcommand*\TOClocalstyle {%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex
index 77fd524d447..10fe39026ac 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\etocdefaultlines
\begingroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
index a213cba7563..70f97f734e5 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begin{figure}[htbp!]\centering
\colorlet{subsecnum}{black}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex
index 6d5da122694..584c57cb171 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 `filecontentsdef' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup
\newsavebox{\forsubsections}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex
index 9cdc6578f52..c13553b914b 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
< in the preamble >
\newcounter{visibletoc}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex
index 3404a0223fa..1b6b598da60 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\etocsetnexttocdepth{2} % sections are at level 1 and will show up
\begingroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex
index 60015e2502c..7ad32459670 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 `filecontentsdef' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
% \newtoks\treetok % put this (uncommented) preferably in the preamble
% \newtoks\tmptok % (idem)
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex
index 8862554649b..03671957db0 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
% \newtoks\treetok % put this (uncommented) preferably in the preamble
% \newtoks\sectiontok
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex
index 803100084d5..6909341f3eb 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup
% \newtoks\treetok % done in preamble
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex
index a359f64eee7..424c74d7601 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 `filecontentsdef' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup
\etocglobaldefs % necessary for \etocname etc... to survive &
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex
index 891f4233544..6ab1ba41faf 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begin{center}
\etocsetstyle{section}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex
index 384008bae12..8847e6515be 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\makeatletter
\newcommand*\TOCcompute@numwidths [2]{% #1=empty/"local", #2=minimal indent
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex
index 399f614b93d..07e04920931 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\etocsetstyle{section}
{\begin{enumerate}}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex
index 7b01d2f1821..451faf776a9 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\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-22.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex
index bbf0bf16ba4..b8a760beb97 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\etocruledstyle[2]{\normalfont\normalsize\rmfamily\itshape
\fbox{\parbox{.6\linewidth}{
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
index 9f32d24f846..4cdd6973d2c 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\begingroup
\definecolor{subsecnum}{RGB}{13,151,225}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
index 46b9a3e6d57..f52d6a013ef 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\newsavebox\firstnamei \newsavebox\firstnumberi
\newsavebox\lastnamei \newsavebox\lastnumberi
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
index cc6f33650f5..4b780b60e59 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/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\makeatletter
\newcommand*\firstsubname {} \newcommand*\lastsubname {}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
index fa3fe7a53bb..8565761f2c5 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 `filecontentsdef' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\etocsetnexttocdepth {all}
\begingroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
index 3ed92f7fb38..1135a6a0e4d 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 `filecontentshere' environment
-%% from source `etoc' on 2023/01/15.
+%% from source `etoc' on 2023/01/16.
%%
\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 89e7b3a109e..9512121efbe 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 is NOT for use with \DocInput. The latex source of the
% user manual is not prefixed with percent signs.
%<*none>
-\def\etocdtxtimestamp {Time-stamp: <14-01-2023 at 21:26:57 CET>}%
+\def\etocdtxtimestamp {Time-stamp: <15-01-2023 at 11:56:19 CET>}%
%</none>
%<*!readme>
%%
%% Package: etoc
-%% Version: 1.1a
+%% Version: 1.1b
%% License: LPPL 1.3c
%% Copyright (C) 2012-2023 Jean-Francois Burnol
%% <jfbu at free dot fr>
%</!readme>
%<*none>
-\def\etocpkgdate {2023/01/14}
-\def\etocdocdate {2023/01/14}
-\def\etocpkgversion {1.1a}
+\def\etocpkgdate {2023/01/15}
+\def\etocdocdate {2023/01/15}
+\def\etocpkgversion {1.1b}
\def\etocpkgdescription {Completely customisable TOCs (JFB)}
%% German translation was last udpated on April 2015 and all new material
%% was included since in English. During 2020/2021/2022 emerged a still
@@ -33,7 +33,7 @@
\catcode32=13\catcode`\\=12^^Brelax^^A
^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
{% Package: etoc
-% Version: 1.1a
+% Version: 1.1b
% License: LPPL 1.3c
% Copyright (C) 2012-2023 Jean-Francois Burnol <jfbu at free dot fr>
%
@@ -60,7 +60,7 @@
%<*readme>
<!-- -->
- Source: etoc.dtx (1.1a)
+ Source: etoc.dtx (1.1b)
Author: Jean-Francois Burnol
Info: Completely customisable TOCs
License: LPPL 1.3c
@@ -157,8 +157,15 @@ etoc.sty, etoc.tex, etoc.pdf, etoc.dvi.
RECENT CHANGES
==============
+1.1b \[2023/01/15\]
+-------------------
+
+Documentation fix, 1.1a forgot to mention the following change:
+`\etocthelinkedname`, `\etocthelinkednumber`, `\etocthelinkedpage`
+are now always hyperlinks independently of linktoc status.
+
1.1a \[2023/01/14\]
-----------------------
+-------------------
This version brings no new functionality, despite the number bump.
It implements a complete rewrite of old legacy core internals.
@@ -3668,7 +3675,9 @@ hyperlinks. No such problem arises either when using |forest| or the native
|tikz| syntax for trees (which will be illustrated in the next section).} The
commands \csb{etocname}, etc\dots, are robust, it is easier to work with
\csb{etocthelinkednumber}, \csb{etocthelinkedname}, and \csb{etocthelinkedpage}
-which contain the same information in an easier accessible form.
+which contain the same information in an easier accessible form.%
+%
+\normalmarginpar\marginpar{\footnotesize\rmfamily\itshape\RaggedRight At \texttt{1.1a} the commands \csa{etocthelinkedname}, etc\dots, are always providing an hyperlink, so it is not true that \csb{etocname}, etc\dots, are always simply their robust variants.}
For this |forest| tree we have designed very special \etoc styles for sections
and subsections. They use a token list register called |\treetok| and a
@@ -4659,21 +4668,31 @@ The meanings of these commands
can be stored for delayed usage. For example this is
done in the \hyperref[tocastree]{examples with trees}.
-Notice though the following facts:
+There has been a \textbf{breaking change} at |1.1a|. Here is the behavior
+\emph{prior} to this release:
\begin{itemize}[noitemsep]
-\item \csb{etocthelinkednumber} and \csb{etocthelinkedname} are hyperlinks
+\item \csb{etocthelinkedname} and \csb{etocthelinkednumber} were hyperlinks
only if \ctanpkg{hyperref} was configured via |linktoc=all| or
|linktoc=section| (the default),
-\item \csb{etocthelinkedpage} is an hyperlink only if \ctanpkg{hyperref} was
- configured via |linktoc=all| or |linktoc=page|. \emph{Furthermore}, the
- page number must not be empty: if it is empty no hyperlink is added (this
- matches the \ctanpkg{hyperref} behavior when \etoc is not loaded).
+\item \csb{etocthelinkedpage} was an hyperlink only if \ctanpkg{hyperref} was
+ configured via |linktoc=all| or |linktoc=page| and the page number was not empty.
\end{itemize}
+This behavior was coherent with the commands \csb{etocname}, \csb{etocnumber},
+and \csb{etocpage} being the robust variants of \csb{etocthelinkedname},
+\csb{etocthelinkednumber}, and \csb{etocthelinkedpage}.
-It may be a bit strange that the link is not sytematically added despite the
-command names, but this is legacy behavior of the package. It is coherent
-with the commands \csb{etocname}, \csb{etocnumber}, and \csb{etocpage} being
-their robust variants.
+At |1.1a| it was decided that the commands should match their denominations.%
+%
+\footnote{To tell the whole truth, the author in refactoring the code completely at \texttt{1.1a} was tricked by the names and forgot to read the old documentation so the new behavior was implemented and it was decided to keep the change.}
+%
+So they are now \emph{always} hyperlinks independently of |linktoc| \ctanpkg{hyperref}
+option (\csb{etocthelinkedpage} has no hyperlink if the page number is empty,
+to match \ctanpkg{hyperref} behavior):
+\begin{itemize}[noitemsep]
+\item \csb{etocthelinkedname} and \csb{etocthelinkednumber} and
+ \csb{etocthelinkedpage} are always (in presence of \ctanpkg{hyperref})
+ hyperlinks (for \csb{etocthelinkedpage} the page number must not be empty).
+\end{itemize}
A further command is provided: \csb{etocthelink}, which wraps%
@@ -4684,11 +4703,6 @@ an hyperlink around its argument: |\etocthelink|\marg{foo} hyperlinks an
arbitrary text \meta{foo} to the target sectioning unit in the document.
The command \csb{etoclink} is its robust variant.
-Thus, \csb{etocthelinkednumber} is essentially
-\csb{etocthelink}|{|\csb{etocthenumber}|}| if |linktoc| is |all| or the
-default |section|, else it is an alias to \csb{etocthenumber}. Similarly for
-the other two.
-
% They too
% contain the hyperlink destination in already expanded form since |1.08a| for
% the first three, since |1.08j| for \csb{etoclink}.
@@ -6510,11 +6524,9 @@ number.
On the other hand \csb{etocthename}, \csb{etocthenumber}, \csb{etocthepage}
are \emph{not} protected against expansion. And neither are
\csb{etocthelinkedname}, \csb{etocthelinkednumber}, \csb{etocthelinkedpage}.
-The latter three are hyperlinks only if \ctanpkg{hyperref} |linktoc| option
-has the suitable value: |section| (which is default) or |all| for name and
-number to be hyperlinks, |page| or |all| for the page number (which must not
-be empty). The commands \csb{etocname}, \csb{etocnumber}, and \csb{etocpage}
-are their robust variants.
+They were modified at |1.1a| and now are always hyperlinks (except for the
+latter if the page number is empty), if
+\ctanpkg{hyperref} is present, independently of |linktoc| status.
The commands \csb{etoclink} and \csb{etocifnumbered} are also
protected against premature expansion. Also \csb{etociffirst} and
@@ -6677,7 +6689,13 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
\def {\ifvmode\advance\jfverbadim.5em\relax\else\expandafter\jfverbaspace\fi}}\x
\makeatother
\begin{jfverbatim}
-1.1a [2023/01/14]^
+1.1b [2023/01/15]^
+
+ Documentation fix, 1.1a forgot to mention the following change:
+ \etocthelinkedname, \etocthelinkednumber, \etocthelinkedpage
+ are now always hyperlinks independently of linktoc status.
+
+~1.1a [2023/01/14]^
This version brings no new functionality, despite the number bump.
It implements a complete rewrite of old legacy core internals.
@@ -7670,7 +7688,7 @@ of real structure in a \LaTeX{} document body).
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\ProvidesPackage{etoc}
-[2023/01/14 v1.1a Completely customisable TOCs (JFB)]
+[2023/01/15 v1.1b Completely customisable TOCs (JFB)]
\RequirePackage{multicol}
\DeclareOption*{\PackageWarning{etoc}{Option `\CurrentOption' is unknown.}}
\ProcessOptions\relax
@@ -8071,6 +8089,19 @@ of real structure in a \LaTeX{} document body).
% target from
% the \ctanpkg{hyperref} hacked arguments of \csa{l@section} et al, rather
% than picking it from the fourth argument of \csa{contentsline}.
+%
+% Another \textbf{breaking change} (documented only at |1.1b|): all three
+% of \csbc{etocthelinkedname}, \csbc{etocthelinkednumber}, and
+% \csbc{etocthelinkedpage} are always hyperlinks (for the latter, only if
+% page number is not empty to match \ctanpkg{hyperref} ways).
+% Formerly they obeyed the |linktoc| status,
+% somewhat counterintuitively, but this meant that \csbc{etocname} etc...
+% were their robust variants, which meant one could store easily for later
+% usage (see the documentation examples with ``treetoks'') their precise
+% meaning. The breaking change happened in part because I was fooled myself
+% by the macro names, and refactored the code in two steps separated by months
+% so in second step I forgot I had only provisory code. And I decided finally
+% to keep the breaking change.
% \begin{macrocode}
\def\Etoc@lxyz #1#2#3{%
\ifEtoc@hyperref
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index 51a49cd2ada..501228b21f8 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -22,13 +22,13 @@
%% in the same archive or directory.)
%%
%% Package: etoc
-%% Version: 1.1a
+%% Version: 1.1b
%% License: LPPL 1.3c
%% Copyright (C) 2012-2023 Jean-Francois Burnol
%% <jfbu at free dot fr>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\ProvidesPackage{etoc}
-[2023/01/14 v1.1a Completely customisable TOCs (JFB)]
+[2023/01/15 v1.1b Completely customisable TOCs (JFB)]
\RequirePackage{multicol}
\DeclareOption*{\PackageWarning{etoc}{Option `\CurrentOption' is unknown.}}
\ProcessOptions\relax