summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/etoc
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-29 03:02:22 +0000
committerNorbert Preining <norbert@preining.info>2023-10-29 03:02:22 +0000
commit63d7dc4d66eb8f96c0c480abe8e5d0eefc434269 (patch)
treec9daa49d7ad70a7e790c28afc85db25d97b04170 /macros/latex/contrib/etoc
parent27f547140ee908fb4ce9e4b8297af7d5bf8d7ff9 (diff)
CTAN sync 202310290302
Diffstat (limited to 'macros/latex/contrib/etoc')
-rw-r--r--macros/latex/contrib/etoc/README.md5
-rw-r--r--macros/latex/contrib/etoc/etoc.dtx46
-rw-r--r--macros/latex/contrib/etoc/etoc.pdfbin978780 -> 978250 bytes
3 files changed, 31 insertions, 20 deletions
diff --git a/macros/latex/contrib/etoc/README.md b/macros/latex/contrib/etoc/README.md
index a6f32b7860..b45d22bb03 100644
--- a/macros/latex/contrib/etoc/README.md
+++ b/macros/latex/contrib/etoc/README.md
@@ -1,6 +1,6 @@
<!-- -->
- Source: etoc.dtx (1.2b)
+ Source: etoc.dtx (1.2c)
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.2c 2023/10/28` compatibility hotfix with `hyperref v7.01c`. Thanks
+ to Denis Bitouzé for report.
+
- `1.2b 2023/07/01` fixes a regression from `1.2` regarding concomitant
usage of the package with `tocloft`. Some documentation improvements,
in particular discussion of compatibility with `microtype`.
diff --git a/macros/latex/contrib/etoc/etoc.dtx b/macros/latex/contrib/etoc/etoc.dtx
index 09c808b774..6bc8ebe644 100644
--- a/macros/latex/contrib/etoc/etoc.dtx
+++ b/macros/latex/contrib/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:33:21 CEST>}%
+\def\etocdtxtimestamp {Time-stamp: <04-07-2023 at 22:42:41 CEST>}%
%</none>
%<*!readme>
%%
%% Package: etoc
-%% Version: 1.2b
+%% Version: 1.2c
%% License: LPPL 1.3c
%% Copyright (C) 2012-2023 Jean-Francois Burnol
%% <jfbu at free dot fr>
%</!readme>
%<*none>
-\def\etocpkgdate {2023/07/01}
-\def\etocdocdate {2023/07/01}
-\def\etocpkgversion {1.2b}
+\def\etocpkgdate {2023/10/28}
+\def\etocdocdate {2023/10/28}
+\def\etocpkgversion {1.2c}
\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.2b
+% Version: 1.2c
% 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.2b)
+ Source: etoc.dtx (1.2c)
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.2c 2023/10/28` compatibility hotfix with `hyperref v7.01c`. Thanks
+ to Denis Bitouzé for report.
+
- `1.2b 2023/07/01` fixes a regression from `1.2` regarding concomitant
usage of the package with `tocloft`. Some documentation improvements,
in particular discussion of compatibility with `microtype`.
@@ -7209,6 +7212,13 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
\makeatother
\vskip-\baselineskip
\begin{jfverbatim}
+~1.2c [2023/10/28]^
+
+ Compatibility hotfix with hyperref v7.01c; etoc had copied
+ over a now unneeded internal hyperref test, and since
+ v7.01c the result was that etoc produced empty tables of
+ contents. Thanks to Denis Bitouzé for report.
+
~1.2b [2023/07/01]^
bugfix: a refactoring at 1.2 accidentally removed a needed
@@ -8444,7 +8454,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/07/01 v1.2b Completely customisable TOCs (JFB)]
+\ProvidesPackage{etoc}[2023/10/28 v1.2c 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.
@@ -8457,7 +8467,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.2b) does not *require* it, but has not been\MessageBreak
+ This etoc (1.2c) 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
@@ -9497,17 +9507,15 @@ of real structure in a \LaTeX{} document body).
\global\Etoc@toctoks=\expandafter{\the\Etoc@toctoks}%
\closein\Etoc@tf}}
{\typeout{No file \jobname.toc.}}}
+% \end{macrocode}
+% \etocrelease{1.2c} removes a legacy test it had copied over
+% from \ctanpkg{hyperref} internals, whose purpose was to check
+% if the |.toc| file had been produced in an earlier
+% no-hyperref pass, which in the past would trigger
+% failure. For specifics see
+% \url{https://github.com/latex3/hyperref/issues/305}.
+% \begin{macrocode}
\def\Etoc@openouttoc{%
- \ifEtoc@hyperref
- \ifx\hyper@last\@undefined
- \IfFileExists{\jobname .toc}
- {\Hy@WarningNoLine
- {old toc file detected; run LaTeX again (cheers from `etoc')}%
- \global\Etoc@toctoks={}%
- }
- {}%
- \fi
- \fi
\if@filesw
\newwrite \tf@toc
\immediate \openout \tf@toc \jobname .toc\relax
diff --git a/macros/latex/contrib/etoc/etoc.pdf b/macros/latex/contrib/etoc/etoc.pdf
index 1bfc2c962f..8f6b1a892a 100644
--- a/macros/latex/contrib/etoc/etoc.pdf
+++ b/macros/latex/contrib/etoc/etoc.pdf
Binary files differ