summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-21 20:49:15 +0000
committerKarl Berry <karl@freefriends.org>2022-11-21 20:49:15 +0000
commit892f08858ea479c41b3b3625ac29fad3ff06e1b4 (patch)
treec0bcd52a85215ae775549923ca0f2cbb7d86c963 /Master/texmf-dist/doc/latex
parentd91b560e0d5e8a0cb1a7088eac64f19a22669926 (diff)
etoc (21nov22)
git-svn-id: svn://tug.org/texlive/trunk@65068 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r--Master/texmf-dist/doc/latex/etoc/README.md46
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.pdfbin819311 -> 890715 bytes
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.tex2
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex16
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex90
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex27
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex25
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex20
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex62
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex (renamed from Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex76
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex71
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex50
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex79
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex94
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex74
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex47
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex31
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex67
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex50
35 files changed, 491 insertions, 500 deletions
diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index b58480ffb9e..96322539d80 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.09g)
+ Source: etoc.dtx (1.09i)
Author: Jean-Francois Burnol
Info: Completely customisable TOCs
License: LPPL 1.3c
@@ -97,6 +97,23 @@ etoc.sty, etoc.tex, etoc.pdf, etoc.dvi.
RECENT CHANGES
==============
+1.09i \[2022/11/21\]
+--------------------
+
+Fix bug showing when a document uses both `\etocchecksemptiness` and
+`\etocsetlocaltop.toc`: the `start` and `finish` parts of some levels
+were executed possibly causing extra printed output.
+
+More hyperlinking in the implementation part of the documentation.
+
+1.09h \[2022/11/20\]
+--------------------
+
+Documentation improvements. In particular, attached code snippets
+are now visible via their filenames in the page margins. Also,
+command names are doubly hyperlinked: first half links to the devoted
+part of the user manual, second half links to the implementation part.
+
1.09g \[2022/11/17\]
--------------------
@@ -138,30 +155,3 @@ Also add `\etocimmediatesetlocaltop.toc`.
Fix an obscure bug (see source code comments) in the `\etocsetlocaltop.toc`
mechanism.
-
-1.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`.
-
-1.09d \[2021/07/13\]
---------------------
-
-Some minor synching with tableof 1.4c.
-
-Add `\etockeeporiginaltableofcontents` to provide a work-around to a
-compatibility issue with listings's `\lstlistoflistings`, which abuses
-`\tableofcontents` for doing something unrelated to the actual contents.
-Thanks to Denis Bitouzé for report.
-
-Usage: `\usepackage{etoc}\etockeeporiginaltableofcontents`, then
-however you must employ `\etoctableofcontents`, not `\tableofcontents`.
-
-1.09c \[2020/05/15\]
---------------------
-
-Syncs with KOMA-script deprecation of `\iftocfeature`.
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 1cf82dd4741..1b24ab3fc63 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 75ac30e800e..d719ee65fec 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.09g (DEVELOPMENT)
+%% Version: 1.09i
%% License: LPPL 1.3c
%% Copyright (C) 2012-2022 Jean-Francois Burnol
%% <jfbu at free dot fr>
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex
index d56a57986d7..405ce84eea6 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-01.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-5.tex'
+%% LaTeX2e file `etocsnippet-01.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\begingroup\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm
\etocsetstyle {section}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex
index 622dc90723b..919cbe51c0e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-02.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-6.tex'
+%% LaTeX2e file `etocsnippet-02.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\begingroup
\newcommand*{\DotsAndPage}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex
index 772e5827896..604e7a6bf32 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-03.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-7.tex'
+%% LaTeX2e file `etocsnippet-03.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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
new file mode 100644
index 00000000000..aeebe8259b9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-04.tex
@@ -0,0 +1,16 @@
+%% LaTeX2e file `etocsnippet-04.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2022/11/21.
+%%
+\begin{figure}[ht!]
+ \centering
+ \begingroup
+ \etocstandardlines
+ \renewcommand{\etocbkgcolorcmd}{\color{green!5}}
+ \renewcommand{\etocbelowtocskip}{0pt\relax}
+ \fboxsep1ex
+ \etocframedstyle [1]{\fbox{\makebox[.5\linewidth]{\etocfontminusone
+ \hyperref[toc:c]{I am from far away}}}}
+ \tableofcontents \label{toc:d} \ref{toc:c}
+ \endgroup
+\end{figure}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex
index bec3d0f9feb..5837cb9c717 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-05.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-20-A.tex'
+%% LaTeX2e file `etocsnippet-05.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\makeatletter
\newcommand{\MyStandardTOC}{%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex
index 7122dcc6eb0..f2864ff9676 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-06.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-20-B.tex'
+%% LaTeX2e file `etocsnippet-06.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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-07.tex
index f2343282233..9e25d02804e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-07.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-21-A.tex'
+%% LaTeX2e file `etocsnippet-07.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
% 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-08.tex
index e5c18133b29..883664e559b 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-08.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-21-B.tex'
+%% LaTeX2e file `etocsnippet-08.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\makeatletter
\newcommand*\TOClocalstyle {%
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex
index a8d163e2269..8982e5513de 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-09.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-22-A.tex'
+%% LaTeX2e file `etocsnippet-09.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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 543079b760c..a325452497d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex
@@ -1,16 +1,80 @@
%% LaTeX2e file `etocsnippet-10.tex'
-%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2022/11/21.
%%
-\begin{figure}[ht!]
- \centering
- \begingroup
- \etocstandardlines
- \renewcommand{\etocbkgcolorcmd}{\color{green!5}}
- \renewcommand{\etocbelowtocskip}{0pt\relax}
- \fboxsep1ex
- \etocframedstyle [1]{\fbox{\makebox[.5\linewidth]{\etocfontminusone
- \hyperref[toc:c]{I am from far away}}}}
- \tableofcontents \label{toc:d} \ref{toc:c}
- \endgroup
+\begin{figure}[htbp!]\centering
+\colorlet{subsecnum}{black}
+\colorlet{secbackground}{green!30}
+\colorlet{tocbackground}{red!20!green!20}
+
+\renewcommand{\etocbkgcolorcmd}{\color{tocbackground}}
+\renewcommand{\etocleftrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etocrightrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etocbottomrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etoctoprulecolorcmd}{\color{tocbackground}}
+
+\renewcommand{\etocleftrule}{\vrule width 3cm}
+\renewcommand{\etocrightrule}{\vrule width 1cm}
+\renewcommand{\etocbottomrule}{\hrule height 12pt}
+\renewcommand{\etoctoprule}{\hrule height 12pt}
+
+\renewcommand{\etocinnertopsep}{0pt}
+\renewcommand{\etocinnerbottomsep}{0pt}
+\renewcommand{\etocinnerleftsep}{0pt}
+\renewcommand{\etocinnerrightsep}{0pt}
+
+\newcommand\shiftedwhiterule[2]{%
+ \hbox to \linewidth{\color{white}%
+ \hskip#1\leaders\vrule height1pt\hfil}\nointerlineskip
+ \vskip#2}
+
+\etocsetstyle{subsubsection}
+{\etocskipfirstprefix}
+{\shiftedwhiterule{\leftskip}{6pt}}
+{\sffamily\footnotesize
+ \leftskip2.3cm\hangindent1cm\rightskip.5cm\relax
+ \makebox[1cm][l]{\color{subsecnum}\etocnumber}%
+ \color{black}\etocname
+ \nobreak\leaders\hbox to.2cm{\hss.}\hfill
+ \rlap{\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}\par
+ \nointerlineskip\vskip3pt}
+{}
+
+\etocsetstyle{subsection}
+{\etocskipfirstprefix}
+{\shiftedwhiterule{1.5cm}{6pt}}
+{\sffamily\small
+ \leftskip1.5cm\hangindent.8cm\rightskip.5cm\relax
+ \makebox[.75cm][l]{\color{subsecnum}\etocnumber}%
+ \color{black}\etocname
+ \nobreak\leaders\hbox to.2cm{\hss.}\hfill
+ \rlap{\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}\par
+ \nointerlineskip\vskip3pt}
+{}
+
+\newcommand{\coloredstuff}[2]{%
+ \leftskip0pt\rightskip0pt\parskip0pt
+ \fboxsep0pt % \colorbox uses \fboxsep also when no frame!
+ \noindent\colorbox{secbackground}
+ {\parbox{\linewidth}{%
+ \vskip5pt
+ {\noindent\color{#1}#2\par}\nointerlineskip
+ \vskip3pt}}%
+ \par\nointerlineskip}
+
+\etocsetstyle{section}
+{\coloredstuff{blue}{\hfil \bfseries\large Contents of Part One\hfil}}
+{\vskip3pt\sffamily\small}
+{\coloredstuff{blue}
+ {\leftskip1.5cm\rightskip.5cm\parfillskip-\rightskip
+ \makebox[0pt][r]{\makebox[.5cm][l]{\etocnumber}}%
+ \etocname\nobreak\hfill\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}%
+ \vskip6pt}
+{}
+
+\etocframedstyle[1]{}
+\tableofcontents \label{toc:floating} \ref{toc:overview}
+\vspace{-\baselineskip}
+\centeredline{|\tableofcontents \ref{toc:overview}|
+(\emph{cf.} \hyperref[toc:clone]{this other toc})}
\end{figure}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex
new file mode 100644
index 00000000000..597ee7a3b90
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-11.tex
@@ -0,0 +1,27 @@
+%% LaTeX2e file `etocsnippet-11.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2022/11/21.
+%%
+\begingroup
+\newsavebox{\forsubsections}
+\etocsetstyle{part}{\upshape. \etocskipfirstprefix}
+ {. \upshape}
+ {\bfseries\etocname:~~}
+ {}
+\etocsetstyle{section}{\itshape\etocskipfirstprefix}
+ {, }
+ {\mdseries\etocname}
+ {}
+\etocsetstyle{subsection}
+ {\begin{lrbox}{\forsubsections}\footnotesize\upshape\etocskipfirstprefix}
+ {; }
+ {\etocname}
+ {.\end{lrbox}\footnote{\unhbox\forsubsections}}
+\etocsetstyle{subsubsection}
+ { (\itshape\etocskipfirstprefix}
+ {, }
+ {\etocname}
+ {\/\upshape)}
+\etocsettocstyle{Here is the inline table of contents. }{.\par}
+\tableofcontents \label{toc:crazyinline}
+\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex
new file mode 100644
index 00000000000..83c2f15477e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-12.tex
@@ -0,0 +1,25 @@
+%% LaTeX2e file `etocsnippet-12.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2022/11/21.
+%%
+ < in the preamble >
+\newcounter{visibletoc}
+\renewcommand{\etocaftertitlehook}
+ {\stepcounter{visibletoc}\etoctoccontentsline{visibletoc}{\thevisibletoc}}
+\etocsetlevel{visibletoc}{6}
+\begin{document}
+ < document body >
+\subsection{Surprising uses of etoc}
+\begingroup
+ \etocinline
+ \etocsetlevel{part}{1}
+ % \etocsetlevel{chapter}{1} % (no chapters in scrartcl class)
+ \etocsetlevel{visibletoc}{0}
+ \etocsetstyle{visibletoc}
+ {\etocskipfirstprefix}{, }{{\color{niceone}\etocname}}{}
+ \etocsettocstyle{}{} % don't set any title, rules or frame or multicol!
+ \etocsetnexttocdepth{visibletoc} % display only the `visibletoc' entries from .toc
+
+Here is the numbered and linked list of all tables of contents which are
+displayed within this document: \tableofcontents.
+\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex
new file mode 100644
index 00000000000..a52e1fc8534
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-13.tex
@@ -0,0 +1,20 @@
+%% LaTeX2e file `etocsnippet-13.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2022/11/21.
+%%
+ \etocsetnexttocdepth{2} % sections are at level 1 and will show up
+\begingroup
+ \etocsetlevel{exercise}{2} % but:
+ \etocsetlevel{chapter}{3} % no chapters
+ \etocsetlevel{subsection}{3} % no subsections
+ \etocsetlevel{part}{3} % no parts
+ \etocsetstyle{exercise}{}{} % \etocname = exercise number
+ {\noindent\etocname\strut\leaders\etoctoclineleaders\hfill\etocpage\par}
+ {\pagebreak[2]\vskip\baselineskip}
+ \etocsetstyle{section}{}{}
+ {\noindent\strut{\bfseries\large\etocnumber\hskip.5em\etocname}\par
+ \nopagebreak[3]}{}
+ \etocruledstyle[4]{\Large\bfseries List of the exercises}
+ \setlength{\columnseprule}{.4pt}
+ \tableofcontents
+\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex
new file mode 100644
index 00000000000..fa6af45363b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-14.tex
@@ -0,0 +1,62 @@
+%% LaTeX2e file `etocsnippet-14.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2022/11/21.
+%%
+% \newtoks\treetok % put this (uncommented) preferably in the preamble
+% \newtoks\tmptok % (idem)
+
+\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
+ #1\expandafter\expandafter\expandafter
+ {\expandafter\the\expandafter #1#2}}
+
+\newcommand*\PrepareSectionNode{%
+ \tmptok {\centering\bfseries}%
+ \appendtotok\tmptok\etocthelinkedname
+ \edef\foresttreenode{ [{\noexpand\parbox{2cm}{\the\tmptok}}}%
+}
+
+\newcommand*{\PrepareSubsectionNode}{%
+ \tmptok {\raggedright}%
+ \appendtotok\tmptok\etocthelinkedname
+ \edef\foresttreenode{ [{\noexpand\parbox{6cm}{\the\tmptok}}}%
+}
+
+\etocsetstyle{section}
+ {\etocskipfirstprefix}
+ {\appendtotok\treetok{ ]}}
+ {\PrepareSectionNode \appendtotok\treetok\foresttreenode}
+ {\appendtotok\treetok{ ]}}
+
+\etocsetstyle{subsection}
+ {\etocskipfirstprefix}
+ {\appendtotok\treetok{ ]}}
+ {\PrepareSubsectionNode \appendtotok\treetok\foresttreenode}
+ {\appendtotok\treetok{ ]}}
+
+\etocsettocstyle
+ {\treetok{[{\hyperref[part:overview]{Overview}}}}
+ {\global\appendtotok\treetok{ ]}}
+
+% forest does not like @\the\treetok if \treetok is empty. On first latex
+% run, this will be the case because the TOC style defined above will not
+% have been executed, as the label {toc:overview} does not refer to a valid
+% TOC yet. So we must give a safe default value to \treetok
+\treetok{[{run latex again}]}
+
+\begin{figure}[th!]\centering
+ \etocsetnexttocdepth{subsection}
+ \tableofcontents \label{toc:forest}\ref{toc:overview}
+ \hypersetup{hidelinks}%
+ \bracketset{action character=@}
+ \begin{forest}
+ for tree={anchor=center,child anchor=west,
+ grow'=east,draw,thick,
+ edge={draw,thick,dashed,color=teal}},
+ where={level()==1}{circle,thick,fill=blue!5,
+ before computing xy={l=3cm}}{},
+ where={level()==2}{fill=red!5,
+ before computing xy={l=6cm}}{},
+ rectangle, thick, fill=cyan!5, inner sep=6pt,
+ @\the\treetok
+ \end{forest}
+\end{figure}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex
index 25d6c3fca1d..a03e35c1318 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-15.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-28.tex'
+%% LaTeX2e file `etocsnippet-15.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
% \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-16.tex
index 2b74297a927..a5adf6d4aa7 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-16.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-29.tex'
+%% LaTeX2e file `etocsnippet-16.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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-17.tex
index f595beff21e..45e48497685 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-17.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-30-A.tex'
+%% LaTeX2e file `etocsnippet-17.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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-18.tex
index c4b11e3404f..3be30b4d1ee 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-18.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-30-B.tex'
+%% LaTeX2e file `etocsnippet-18.tex'
%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\begin{center}
\etocsetstyle{section}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex
index 6bc38ea7e93..f4a6baa380e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-19.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-31.tex'
+%% LaTeX2e file `etocsnippet-19.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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-20.tex
index 72e3afd3eee..3c225162cc6 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-32.tex'
+%% LaTeX2e file `etocsnippet-20.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\etocsetstyle{section}
{\begin{enumerate}}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex
index a9f07c802c0..099c6217670 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-40.tex'
+%% LaTeX2e file `etocsnippet-21.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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-22.tex
index 39554d854ec..bc391b9a60f 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22.tex
@@ -1,6 +1,6 @@
-%% LaTeX2e file `etocsnippet-46.tex'
+%% LaTeX2e file `etocsnippet-22.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
\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 f631bfba37d..2fbde23154e 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex
@@ -1,11 +1,11 @@
%% LaTeX2e file `etocsnippet-23.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
-\begin{figure}[htbp!]\centering
-\colorlet{subsecnum}{black}
-\colorlet{secbackground}{green!30}
-\colorlet{tocbackground}{red!20!green!20}
+\begingroup
+\definecolor{subsecnum}{RGB}{13,151,225}
+\definecolor{secbackground}{RGB}{0,177,235}
+\definecolor{tocbackground}{RGB}{212,237,252}
\renewcommand{\etocbkgcolorcmd}{\color{tocbackground}}
\renewcommand{\etocleftrulecolorcmd}{\color{tocbackground}}
@@ -13,8 +13,8 @@
\renewcommand{\etocbottomrulecolorcmd}{\color{tocbackground}}
\renewcommand{\etoctoprulecolorcmd}{\color{tocbackground}}
-\renewcommand{\etocleftrule}{\vrule width 3cm}
-\renewcommand{\etocrightrule}{\vrule width 1cm}
+\renewcommand{\etocleftrule}{\vrule width 1cm}
+\renewcommand{\etocrightrule}{\vrule width .5cm}
\renewcommand{\etocbottomrule}{\hrule height 12pt}
\renewcommand{\etoctoprule}{\hrule height 12pt}
@@ -25,32 +25,27 @@
\newcommand\shiftedwhiterule[2]{%
\hbox to \linewidth{\color{white}%
- \hskip#1\leaders\vrule height1pt\hfil}\nointerlineskip
- \vskip#2}
+ \hskip#1\leaders\vrule height1pt\hfil}\nointerlineskip\vskip#2}
-\etocsetstyle{subsubsection}
-{\etocskipfirstprefix}
-{\shiftedwhiterule{\leftskip}{6pt}}
-{\sffamily\footnotesize
- \leftskip2.3cm\hangindent1cm\rightskip.5cm\relax
- \makebox[1cm][l]{\color{subsecnum}\etocnumber}%
- \color{black}\etocname
- \nobreak\leaders\hbox to.2cm{\hss.}\hfill
- \rlap{\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}\par
- \nointerlineskip\vskip3pt}
-{}
+\etocsetstyle{subsubsection}{\etocskipfirstprefix}
+ {\shiftedwhiterule{\leftskip}{6pt}}
+ {\sffamily\footnotesize
+ \leftskip2.5cm\hangindent1cm\rightskip1cm\noindent
+ \hbox to 1cm{\color{subsecnum}\etocnumber\hss}%
+ \color{black}\etocname\leaders\hbox to .2cm{\hss.}\hfill
+ \rlap{\hbox to 1cm{\hss\etocpage\hskip.2cm}}\par
+ \nointerlineskip\vskip3pt}
+ {}
-\etocsetstyle{subsection}
-{\etocskipfirstprefix}
-{\shiftedwhiterule{1.5cm}{6pt}}
-{\sffamily\small
- \leftskip1.5cm\hangindent.8cm\rightskip.5cm\relax
- \makebox[.75cm][l]{\color{subsecnum}\etocnumber}%
- \color{black}\etocname
- \nobreak\leaders\hbox to.2cm{\hss.}\hfill
- \rlap{\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}\par
- \nointerlineskip\vskip3pt}
-{}
+\etocsetstyle{subsection}{\etocskipfirstprefix}
+ {\shiftedwhiterule{1.5cm}{6pt}}
+ {\sffamily\small
+ \leftskip1.5cm\hangindent1cm\rightskip1cm\noindent
+ \hbox to 1cm{\color{subsecnum}\etocnumber\hss}%
+ \color{black}\etocname\leaders\hbox to .2cm{\hss.}\hfill
+ \rlap{\hbox to 1cm{\hss\etocpage\hskip.2cm}}\par
+ \nointerlineskip\vskip6pt}
+ {}
\newcommand{\coloredstuff}[2]{%
\leftskip0pt\rightskip0pt\parskip0pt
@@ -63,18 +58,17 @@
\par\nointerlineskip}
\etocsetstyle{section}
-{\coloredstuff{blue}{\hfil \bfseries\large Contents of Part One\hfil}}
+{\coloredstuff{white}
+ {\hfil \hyperref[toc:b]{\bfseries\large I am a twin of
+ that other TOC (click me!)}\hfil}}
{\vskip3pt\sffamily\small}
-{\coloredstuff{blue}
+{\coloredstuff{white}
{\leftskip1.5cm\rightskip.5cm\parfillskip-\rightskip
- \makebox[0pt][r]{\makebox[.5cm][l]{\etocnumber}}%
- \etocname\nobreak\hfill\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}%
- \vskip6pt}
+ \makebox[0pt][r]{\makebox[.5cm][r]{\etocnumber\hspace{.2cm}}}%
+ \etocname\hfill\makebox[.5cm][r]{\etocpage\hspace{.2cm}}}%
+ \vskip6pt }
{}
\etocframedstyle[1]{}
-\tableofcontents \label{toc:floating} \ref{toc:overview}
-\vspace{-\baselineskip}
-\centeredline{|\tableofcontents \ref{toc:overview}|
-(\emph{cf.} \hyperref[toc:clone]{this other toc})}
-\end{figure}
+\tableofcontents \label{toc:clone} \ref{toc:globalcmds}
+\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
index a07fea86498..a3535259304 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex
@@ -1,27 +1,48 @@
%% LaTeX2e file `etocsnippet-24.tex'
-%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2022/11/21.
%%
-\begingroup
-\newsavebox{\forsubsections}
-\etocsetstyle{part}{\upshape. \etocskipfirstprefix}
- {. \upshape}
- {\bfseries\etocname:~~}
- {}
-\etocsetstyle{section}{\itshape\etocskipfirstprefix}
- {, }
- {\mdseries\etocname}
- {}
-\etocsetstyle{subsection}
- {\begin{lrbox}{\forsubsections}\footnotesize\upshape\etocskipfirstprefix}
- {; }
- {\etocname}
- {.\end{lrbox}\footnote{\unhbox\forsubsections}}
-\etocsetstyle{subsubsection}
- { (\itshape\etocskipfirstprefix}
- {, }
- {\etocname}
- {\/\upshape)}
-\etocsettocstyle{Here is the inline table of contents. }{.\par}
-\tableofcontents \label{toc:crazyinline}
-\endgroup
+\newsavebox\firstnamei \newsavebox\firstnumberi
+\newsavebox\lastnamei \newsavebox\lastnumberi
+\newsavebox\firstnameii \newsavebox\firstnumberii
+\newsavebox\lastnameii \newsavebox\lastnumberii
+\newcounter{mycounti} \newcounter{mycountii}
+\newcommand*{\thispartstatsauxi}{} \newcommand*{\thispartstatsauxii}{}
+\newcommand*{\oldtocdepth}{}
+\newcommand*{\thispartstats}{%
+ \setcounter{mycounti}{0}%
+ \setcounter{mycountii}{0}%
+ \def\thispartstatsauxi{%
+ \sbox{\firstnamei}{\footnotesize\etocname}%
+ \sbox{\firstnumberi}{\footnotesize\etocnumber}%
+ \def\thispartstatsauxi{}}%
+ \def\thispartstatsauxii{%
+ \sbox{\firstnameii}{\footnotesize\etocname}%
+ \sbox{\firstnumberii}{\footnotesize\etocnumber}%
+ \def\thispartstatsauxii{}}%
+ \begingroup
+ \etocsetstyle{subsection} {} {}
+ {\thispartstatsauxii
+ \stepcounter{mycountii}%
+ \sbox{\lastnameii}{\footnotesize\etocname}%
+ \sbox{\lastnumberii}{\footnotesize\etocnumber}} {}%
+ \etocsetstyle{section} {} {}
+ {\thispartstatsauxi
+ \stepcounter{mycounti}%
+ \sbox{\lastnamei}{\footnotesize\etocname}%
+ \sbox{\lastnumberi}{\footnotesize\etocnumber}}
+ {{\footnotesize\itshape
+ Here are some statistics for this part: it contains \arabic{mycounti}
+ section\ifnum\value{mycounti}>1 s\fi{} and \arabic{mycountii}
+ subsection\ifnum\value{mycountii}>1 s\fi. The name of the first section is
+ \unhbox\firstnamei{} and the corresponding number is \unhbox\firstnumberi.
+ The name of the last section is \unhbox\lastnamei{} and its number is
+ \unhbox\lastnumberi. The name of the first subsection is \unhbox\firstnameii{}
+ and the corresponding number is \unhbox\firstnumberii. The name of the last
+ subsection is \unhbox\lastnameii{} and its number is \unhbox\lastnumberii.\par}}%
+ \etocinline % cancels the automatic \par automatically before the TOC
+ \etocsettocstyle {}{}
+ \etocsetnexttocdepth{2}%
+ \localtableofcontents % to be used at the top level of a Part.
+ \endgroup
+}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
index 1ac3de3b69a..e820fbfd1c4 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex
@@ -1,25 +1,31 @@
%% LaTeX2e file `etocsnippet-25.tex'
%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% from source `etoc' on 2022/11/21.
%%
- < in the preamble >
-\newcounter{visibletoc}
-\renewcommand{\etocaftertitlehook}
- {\stepcounter{visibletoc}\etoctoccontentsline{visibletoc}{\thevisibletoc}}
-\etocsetlevel{visibletoc}{6}
-\begin{document}
- < document body >
-\subsection{Surprising uses of etoc}
-\begingroup
- \etocinline
- \etocsetlevel{part}{1}
- % \etocsetlevel{chapter}{1} % (no chapters in scrartcl class)
- \etocsetlevel{visibletoc}{0}
- \etocsetstyle{visibletoc}
- {\etocskipfirstprefix}{, }{{\color{niceone}\etocname}}{}
- \etocsettocstyle{}{} % don't set any title, rules or frame or multicol!
- \etocsetnexttocdepth{visibletoc} % display only the `visibletoc' entries from .toc
-
-Here is the numbered and linked list of all tables of contents which are
-displayed within this document: \tableofcontents.
-\endgroup
+\makeatletter
+\newcommand*\firstsubname {} \newcommand*\lastsubname {}
+\newcommand*\firstsubnumber {} \newcommand*\lastsubnumber {}
+\newcommand*\thisspecialstatsaux{}
+\newcommand*{\thisspecialstats}{%
+ \setcounter{mycounti}{0}%
+ \def\thisspecialstatsaux{%
+ \let\firstsubname\etocthelinkedname
+ \let\firstsubnumber\etocthelinkednumber
+ \def\thisspecialstatsaux{}}
+ \begingroup
+ \etocsetstyle{subsection} {} {}
+ {\thisspecialstatsaux
+ \stepcounter{mycounti}%
+ \let\lastsubname\etocthelinkedname
+ \let\lastsubnumber\etocthelinkednumber }
+ {Here are some statistics for this section. It contains \arabic{mycounti}
+ subsections. The name of its first is \emph{\firstsubname{}} and the
+ corresponding number is {\firstsubnumber}. The name of the last
+ subsection is \emph{\lastsubname{}} and its number is {\lastsubnumber}.}%
+ \etocsettocstyle {}{}
+ \etocinline
+ \etocsetnexttocdepth {1}%
+ \localtableofcontents % to be used within a section
+ \endgroup
+}
+\makeatother
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
index 756547769f6..e2c59ea86b4 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex
@@ -1,20 +1,67 @@
%% LaTeX2e file `etocsnippet-26.tex'
-%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2022/11/21.
%%
- \etocsetnexttocdepth{2} % sections are at level 1 and will show up
+\etocsetnexttocdepth {all}
\begingroup
- \etocsetlevel{exercise}{2} % but:
- \etocsetlevel{chapter}{3} % no chapters
- \etocsetlevel{subsection}{3} % no subsections
- \etocsetlevel{part}{3} % no parts
- \etocsetstyle{exercise}{}{} % \etocname = exercise number
- {\noindent\etocname\strut\leaders\etoctoclineleaders\hfill\etocpage\par}
- {\pagebreak[2]\vskip\baselineskip}
- \etocsetstyle{section}{}{}
- {\noindent\strut{\bfseries\large\etocnumber\hskip.5em\etocname}\par
- \nopagebreak[3]}{}
- \etocruledstyle[4]{\Large\bfseries List of the exercises}
- \setlength{\columnseprule}{.4pt}
- \tableofcontents
+\parindent 0pt \leftskip 0cm \rightskip .75cm \parfillskip -\rightskip
+\newcommand*{\EndParWithPagenoInMargin}
+ {\nobreak\hfill
+ \makebox[0.75cm][r]{\mdseries\normalsize\etocpage}%
+ \par}
+\renewcommand*\etoctoclineleaders
+ {\hbox{\normalfont\normalsize\hbox to .75ex {\hss.\hss}}}
+\newcommand*{\EndParWithPagenoInMarginAndLeaders}
+ {\nobreak\leaders\etoctoclineleaders\hfill
+ \makebox[0.75cm][r]{\mdseries\normalsize\etocpage}%
+ \par }
+\etocsetstyle {part}
+ {}
+ {\leavevmode\leftskip 1cm\relax}
+ {\bfseries\large\llap{\makebox[1cm][r]{\etocnumber\ \ }}%
+ \etocname\EndParWithPagenoInMargin\smallskip}
+ {}
+\etocsetstyle {section}
+ {}
+ {\leavevmode\leftskip 1.75cm\relax}
+ {\bfseries\normalsize\llap{\makebox[.75cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsetstyle {subsection}
+ {}
+ {\leavevmode\leftskip 2.75cm\relax }
+ {\mdseries\normalsize\llap{\makebox[1cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsetstyle {subsubsection}
+ {}
+ {\leavevmode\leftskip 4cm\relax }
+ {\mdseries\normalsize\llap{\makebox[1.25cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsetstyle {paragraph}
+ {}
+ {\leavevmode\leftskip 5.5cm\relax }
+ {\mdseries\normalsize\llap{\makebox[1.5cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsettagdepth {preamble} {none}
+\etocsettagdepth {overview} {part}
+%\etocsettagdepth {arbitrarily}{part}% not needed explicitely, keeps value
+%\etocsettagdepth {examples} {part}
+%\etocsettagdepth {surprising} {part}
+%\etocsettagdepth {linestyles} {part}
+\etocsettagdepth {globalcmds} {paragraph}
+\etocsettagdepth {custom} {part}
+%\etocsettagdepth {tips} {part}
+%\etocsettagdepth {etocandworld}{part}
+\etocsettagdepth {code} {none}
+\renewcommand\etoctoprule {\hrule height 3pt\relax }
+\renewcommand\etoctoprulecolorcmd {\color{blue}}
+\renewcommand\etocaftercontentshook
+ {\medskip\begingroup \color{blue}\hrule height 3pt \endgroup }
+\etocruledstyle [1]{\Large\bfseries
+ \fbox{\makebox[8cm]{A TOC using depth tags}}}
+\sloppy
+\tableofcontents
\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
index 4bb9e6d11e4..e4340697d6d 100644
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
+++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex
@@ -1,62 +1,50 @@
%% LaTeX2e file `etocsnippet-27.tex'
-%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2022/11/21.
%%
-% \newtoks\treetok % put this (uncommented) preferably in the preamble
-% \newtoks\tmptok % (idem)
-
+\newtoks\toctabletok
\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
- #1\expandafter\expandafter\expandafter
- {\expandafter\the\expandafter #1#2}}
-
-\newcommand*\PrepareSectionNode{%
- \tmptok {\centering\bfseries}%
- \appendtotok\tmptok\etocthelinkedname
- \edef\foresttreenode{ [{\noexpand\parbox{2cm}{\the\tmptok}}}%
+ #1\expandafter\expandafter\expandafter {\expandafter\the\expandafter #1#2}}
+
+\newcommand*\PreparePart{%
+ \toks0 \expandafter{\etocthelinkednumber}%
+ \toks2 \expandafter{\etocthelinkedname}%
+ \toks4 \expandafter{\etocthelinkedpage}%
+ \edef\toctablepiece {\noexpand\hline
+ \noexpand\strut\the\toks0 &\noexpand\bfseries\the\toks2
+ &\the\toks4 \noexpand\\\noexpand\hline}%
}
-
-\newcommand*{\PrepareSubsectionNode}{%
- \tmptok {\raggedright}%
- \appendtotok\tmptok\etocthelinkedname
- \edef\foresttreenode{ [{\noexpand\parbox{6cm}{\the\tmptok}}}%
+\newcommand*\PrepareSection{%
+ \toks0 \expandafter{\etocthelinkednumber}%
+ \toks2 \expandafter{\etocthelinkedname}%
+ \toks4 \expandafter{\etocthelinkedpage}%
+ \edef\toctablepiece {\the\toks0 &\the\toks2 &\the\toks4 \noexpand\\}%
+}
+% new version for 1.07k, 2014/03/06
+\newcommand*{\PrepareSubsection}{%
+ \toks0 \expandafter{\etocthelinkednumber}%
+ \toks2 \expandafter{\expandafter\itshape\etocthelinkedname\strut}%
+ \toks4 \expandafter{\expandafter\itshape\etocthelinkedpage}%
+ \edef\toctablepiece{&\noexpand\makebox[1cm][c]{\the\toks0}%
+ \noexpand\parbox[t]{\dimexpr6cm-\tabcolsep\relax}
+ {\noexpand\sloppy\the\toks2}%
+ &\the\toks4 \noexpand\\}%
}
-\etocsetstyle{section}
- {\etocskipfirstprefix}
- {\appendtotok\treetok{ ]}}
- {\PrepareSectionNode \appendtotok\treetok\foresttreenode}
- {\appendtotok\treetok{ ]}}
-
-\etocsetstyle{subsection}
- {\etocskipfirstprefix}
- {\appendtotok\treetok{ ]}}
- {\PrepareSubsectionNode \appendtotok\treetok\foresttreenode}
- {\appendtotok\treetok{ ]}}
+\begingroup
+\etocsetstyle{part}{}{}{\PreparePart \appendtotok\toctabletok\toctablepiece}{}
-\etocsettocstyle
- {\treetok{[{\hyperref[part:overview]{Overview}}}}
- {\global\appendtotok\treetok{ ]}}
+\etocsetstyle{section}{}{}{\PrepareSection \appendtotok\toctabletok\toctablepiece}{}
-% forest does not like @\the\treetok if \treetok is empty. On first latex
-% run, this will be the case because the TOC style defined above will not
-% have been executed, as the label {toc:overview} does not refer to a valid
-% TOC yet. So we must give a safe default value to \treetok
-\treetok{[{run latex again}]}
+\etocsetstyle{subsection}{}{}{\PrepareSubsection\appendtotok\toctabletok\toctablepiece}{}
-\begin{figure}[th!]\centering
- \etocsetnexttocdepth{subsection}
- \tableofcontents \label{toc:forest}\ref{toc:overview}
- \hypersetup{hidelinks}%
- \bracketset{action character=@}
- \begin{forest}
- for tree={anchor=center,child anchor=west,
- grow'=east,draw,thick,
- edge={draw,thick,dashed,color=teal}},
- where={level()==1}{circle,thick,fill=blue!5,
- before computing xy={l=3cm}}{},
- where={level()==2}{fill=red!5,
- before computing xy={l=6cm}}{},
- rectangle, thick, fill=cyan!5, inner sep=6pt,
- @\the\treetok
- \end{forest}
-\end{figure}
+\etocsettocstyle
+ {\toctabletok{\hypersetup{hidelinks}%
+ \begin{longtable}{|>{\bfseries}c|p{7cm}|r|}\hline
+ \multicolumn{3}{|c|}{\Large\bfseries\strut TABLE OF CONTENTS}%
+ \\\hline\hline}}
+ {\global\toctabletok\expandafter{\the\toctabletok\hline\end{longtable}}}
+\etocsettocdepth {subsection}
+\tableofcontents
+\the\toctabletok
+\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
deleted file mode 100644
index 0e5129ec7cb..00000000000
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex
+++ /dev/null
@@ -1,74 +0,0 @@
-%% LaTeX2e file `etocsnippet-48.tex'
-%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
-%%
-\begingroup
-\definecolor{subsecnum}{RGB}{13,151,225}
-\definecolor{secbackground}{RGB}{0,177,235}
-\definecolor{tocbackground}{RGB}{212,237,252}
-
-\renewcommand{\etocbkgcolorcmd}{\color{tocbackground}}
-\renewcommand{\etocleftrulecolorcmd}{\color{tocbackground}}
-\renewcommand{\etocrightrulecolorcmd}{\color{tocbackground}}
-\renewcommand{\etocbottomrulecolorcmd}{\color{tocbackground}}
-\renewcommand{\etoctoprulecolorcmd}{\color{tocbackground}}
-
-\renewcommand{\etocleftrule}{\vrule width 1cm}
-\renewcommand{\etocrightrule}{\vrule width .5cm}
-\renewcommand{\etocbottomrule}{\hrule height 12pt}
-\renewcommand{\etoctoprule}{\hrule height 12pt}
-
-\renewcommand{\etocinnertopsep}{0pt}
-\renewcommand{\etocinnerbottomsep}{0pt}
-\renewcommand{\etocinnerleftsep}{0pt}
-\renewcommand{\etocinnerrightsep}{0pt}
-
-\newcommand\shiftedwhiterule[2]{%
- \hbox to \linewidth{\color{white}%
- \hskip#1\leaders\vrule height1pt\hfil}\nointerlineskip\vskip#2}
-
-\etocsetstyle{subsubsection}{\etocskipfirstprefix}
- {\shiftedwhiterule{\leftskip}{6pt}}
- {\sffamily\footnotesize
- \leftskip2.5cm\hangindent1cm\rightskip1cm\noindent
- \hbox to 1cm{\color{subsecnum}\etocnumber\hss}%
- \color{black}\etocname\leaders\hbox to .2cm{\hss.}\hfill
- \rlap{\hbox to 1cm{\hss\etocpage\hskip.2cm}}\par
- \nointerlineskip\vskip3pt}
- {}
-
-\etocsetstyle{subsection}{\etocskipfirstprefix}
- {\shiftedwhiterule{1.5cm}{6pt}}
- {\sffamily\small
- \leftskip1.5cm\hangindent1cm\rightskip1cm\noindent
- \hbox to 1cm{\color{subsecnum}\etocnumber\hss}%
- \color{black}\etocname\leaders\hbox to .2cm{\hss.}\hfill
- \rlap{\hbox to 1cm{\hss\etocpage\hskip.2cm}}\par
- \nointerlineskip\vskip6pt}
- {}
-
-\newcommand{\coloredstuff}[2]{%
- \leftskip0pt\rightskip0pt\parskip0pt
- \fboxsep0pt % \colorbox uses \fboxsep also when no frame!
- \noindent\colorbox{secbackground}
- {\parbox{\linewidth}{%
- \vskip5pt
- {\noindent\color{#1}#2\par}\nointerlineskip
- \vskip3pt}}%
- \par\nointerlineskip}
-
-\etocsetstyle{section}
-{\coloredstuff{white}
- {\hfil \hyperref[toc:b]{\bfseries\large I am a twin of
- that other TOC (click me!)}\hfil}}
-{\vskip3pt\sffamily\small}
-{\coloredstuff{white}
- {\leftskip1.5cm\rightskip.5cm\parfillskip-\rightskip
- \makebox[0pt][r]{\makebox[.5cm][r]{\etocnumber\hspace{.2cm}}}%
- \etocname\hfill\makebox[.5cm][r]{\etocpage\hspace{.2cm}}}%
- \vskip6pt }
-{}
-
-\etocframedstyle[1]{}
-\tableofcontents \label{toc:clone} \ref{toc:globalcmds}
-\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
deleted file mode 100644
index 7c24c49f57b..00000000000
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-%% LaTeX2e file `etocsnippet-52-A.tex'
-%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
-%%
-\newsavebox\firstnamei \newsavebox\firstnumberi
-\newsavebox\lastnamei \newsavebox\lastnumberi
-\newsavebox\firstnameii \newsavebox\firstnumberii
-\newsavebox\lastnameii \newsavebox\lastnumberii
-\newcounter{mycounti} \newcounter{mycountii}
-\newcommand*{\thispartstatsauxi}{} \newcommand*{\thispartstatsauxii}{}
-\newcommand*{\oldtocdepth}{}
-\newcommand*{\thispartstats}{%
- \setcounter{mycounti}{0}%
- \setcounter{mycountii}{0}%
- \def\thispartstatsauxi{%
- \sbox{\firstnamei}{\etocname}%
- \sbox{\firstnumberi}{\etocnumber}%
- \def\thispartstatsauxi{}}%
- \def\thispartstatsauxii{%
- \sbox{\firstnameii}{\etocname}%
- \sbox{\firstnumberii}{\etocnumber}%
- \def\thispartstatsauxii{}}%
- \begingroup
- \etocsetstyle{subsection} {} {}
- {\thispartstatsauxii
- \stepcounter{mycountii}%
- \sbox{\lastnameii}{\etocname}%
- \sbox{\lastnumberii}{\etocnumber}} {}%
- \etocsetstyle{section} {} {}
- {\thispartstatsauxi
- \stepcounter{mycounti}%
- \sbox{\lastnamei}{\etocname}%
- \sbox{\lastnumberi}{\etocnumber}}
- {Here are some statistics for this part: it contains \arabic{mycounti}
- section\ifnum\value{mycounti}>1 s\fi{} and \arabic{mycountii}
- subsection\ifnum\value{mycountii}>1 s\fi. The name of the first section is
- \unhbox\firstnamei{} and the corresponding number is \unhbox\firstnumberi.
- The name of the last section is \unhbox\lastnamei{} and its number is
- \unhbox\lastnumberi. The name of the first subsection is \unhbox\firstnameii{}
- and the corresponding number is \unhbox\firstnumberii. The name of the last
- subsection is \unhbox\lastnameii{} and its number is \unhbox\lastnumberii.}%
- \etocinline % cancels the automatic \par automatically before the TOC
- \etocsettocstyle {}{}
- \etocsetnexttocdepth{2}%
- \localtableofcontents % to be used at the top level of a Part.
- \endgroup
-}
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
deleted file mode 100644
index 2f81ab6e84f..00000000000
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-%% LaTeX2e file `etocsnippet-52-B.tex'
-%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
-%%
-\makeatletter
-\newcommand*\firstsubname {} \newcommand*\lastsubname {}
-\newcommand*\firstsubnumber {} \newcommand*\lastsubnumber {}
-\newcommand*\thisspecialstatsaux{}
-\newcommand*{\thisspecialstats}{%
- \setcounter{mycounti}{0}%
- \def\thisspecialstatsaux{%
- \let\firstsubname\etocthelinkedname
- \let\firstsubnumber\etocthelinkednumber
- \def\thisspecialstatsaux{}}
- \begingroup
- \etocsetstyle{subsection} {} {}
- {\thisspecialstatsaux
- \stepcounter{mycounti}%
- \let\lastsubname\etocthelinkedname
- \let\lastsubnumber\etocthelinkednumber }
- {Here are some statistics for this section. It contains \arabic{mycounti}
- subsections. The name of its first is \emph{\firstsubname{}} and the
- corresponding number is {\firstsubnumber}. The name of the last
- subsection is \emph{\lastsubname{}} and its number is {\lastsubnumber}.}%
- \etocsettocstyle {}{}
- \etocinline
- \etocsetnexttocdepth {1}%
- \localtableofcontents % to be used within a section
- \endgroup
-}
-\makeatother
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
deleted file mode 100644
index f00f1f5ed86..00000000000
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex
+++ /dev/null
@@ -1,67 +0,0 @@
-%% LaTeX2e file `etocsnippet-53.tex'
-%% generated by the `filecontentsdef' environment
-%% from source `etoc' on 2022/11/18.
-%%
-\etocsetnexttocdepth {all}
-\begingroup
-\parindent 0pt \leftskip 0cm \rightskip .75cm \parfillskip -\rightskip
-\newcommand*{\EndParWithPagenoInMargin}
- {\nobreak\hfill
- \makebox[0.75cm][r]{\mdseries\normalsize\etocpage}%
- \par}
-\renewcommand*\etoctoclineleaders
- {\hbox{\normalfont\normalsize\hbox to .75ex {\hss.\hss}}}
-\newcommand*{\EndParWithPagenoInMarginAndLeaders}
- {\nobreak\leaders\etoctoclineleaders\hfill
- \makebox[0.75cm][r]{\mdseries\normalsize\etocpage}%
- \par }
-\etocsetstyle {part}
- {}
- {\leavevmode\leftskip 1cm\relax}
- {\bfseries\large\llap{\makebox[1cm][r]{\etocnumber\ \ }}%
- \etocname\EndParWithPagenoInMargin\smallskip}
- {}
-\etocsetstyle {section}
- {}
- {\leavevmode\leftskip 1.75cm\relax}
- {\bfseries\normalsize\llap{\makebox[.75cm][l]{\etocnumber}}%
- \etocname\EndParWithPagenoInMarginAndLeaders}
- {}
-\etocsetstyle {subsection}
- {}
- {\leavevmode\leftskip 2.75cm\relax }
- {\mdseries\normalsize\llap{\makebox[1cm][l]{\etocnumber}}%
- \etocname\EndParWithPagenoInMarginAndLeaders}
- {}
-\etocsetstyle {subsubsection}
- {}
- {\leavevmode\leftskip 4cm\relax }
- {\mdseries\normalsize\llap{\makebox[1.25cm][l]{\etocnumber}}%
- \etocname\EndParWithPagenoInMarginAndLeaders}
- {}
-\etocsetstyle {paragraph}
- {}
- {\leavevmode\leftskip 5.5cm\relax }
- {\mdseries\normalsize\llap{\makebox[1.5cm][l]{\etocnumber}}%
- \etocname\EndParWithPagenoInMarginAndLeaders}
- {}
-\etocsettagdepth {preamble} {none}
-\etocsettagdepth {overview} {part}
-%\etocsettagdepth {arbitrarily}{part}% not needed explicitely, keeps value
-%\etocsettagdepth {examples} {part}
-%\etocsettagdepth {surprising} {part}
-%\etocsettagdepth {linestyles} {part}
-\etocsettagdepth {globalcmds} {paragraph}
-\etocsettagdepth {custom} {part}
-%\etocsettagdepth {tips} {part}
-%\etocsettagdepth {etocandworld}{part}
-\etocsettagdepth {code} {none}
-\renewcommand\etoctoprule {\hrule height 3pt\relax }
-\renewcommand\etoctoprulecolorcmd {\color{blue}}
-\renewcommand\etocaftercontentshook
- {\medskip\begingroup \color{blue}\hrule height 3pt \endgroup }
-\etocruledstyle [1]{\Large\bfseries
- \fbox{\makebox[8cm]{A TOC using depth tags}}}
-\sloppy
-\tableofcontents
-\endgroup
diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
deleted file mode 100644
index e67eb2196a9..00000000000
--- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-%% LaTeX2e file `etocsnippet-54.tex'
-%% generated by the `filecontentshere' environment
-%% from source `etoc' on 2022/11/18.
-%%
-\newtoks\toctabletok
-\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
- #1\expandafter\expandafter\expandafter {\expandafter\the\expandafter #1#2}}
-
-\newcommand*\PreparePart{%
- \toks0 \expandafter{\etocthelinkednumber}%
- \toks2 \expandafter{\etocthelinkedname}%
- \toks4 \expandafter{\etocthelinkedpage}%
- \edef\toctablepiece {\noexpand\hline
- \noexpand\strut\the\toks0 &\noexpand\bfseries\the\toks2
- &\the\toks4 \noexpand\\\noexpand\hline}%
-}
-\newcommand*\PrepareSection{%
- \toks0 \expandafter{\etocthelinkednumber}%
- \toks2 \expandafter{\etocthelinkedname}%
- \toks4 \expandafter{\etocthelinkedpage}%
- \edef\toctablepiece {\the\toks0 &\the\toks2 &\the\toks4 \noexpand\\}%
-}
-% new version for 1.07k, 2014/03/06
-\newcommand*{\PrepareSubsection}{%
- \toks0 \expandafter{\etocthelinkednumber}%
- \toks2 \expandafter{\expandafter\itshape\etocthelinkedname\strut}%
- \toks4 \expandafter{\expandafter\itshape\etocthelinkedpage}%
- \edef\toctablepiece{&\noexpand\makebox[1cm][c]{\the\toks0}%
- \noexpand\parbox[t]{\dimexpr6cm-\tabcolsep\relax}
- {\noexpand\sloppy\the\toks2}%
- &\the\toks4 \noexpand\\}%
-}
-
-\begingroup
-\etocsetstyle{part}{}{}{\PreparePart \appendtotok\toctabletok\toctablepiece}{}
-
-\etocsetstyle{section}{}{}{\PrepareSection \appendtotok\toctabletok\toctablepiece}{}
-
-\etocsetstyle{subsection}{}{}{\PrepareSubsection\appendtotok\toctabletok\toctablepiece}{}
-
-\etocsettocstyle
- {\toctabletok{\hypersetup{hidelinks}%
- \begin{longtable}{|>{\bfseries}c|p{7cm}|r|}\hline
- \multicolumn{3}{|c|}{\Large\bfseries\strut TABLE OF CONTENTS}%
- \\\hline\hline}}
- {\global\toctabletok\expandafter{\the\toctabletok\hline\end{longtable}}}
-\etocsettocdepth {subsection}
-\tableofcontents
-\the\toctabletok
-\endgroup