summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-06-18 21:01:58 +0000
committerKarl Berry <karl@freefriends.org>2018-06-18 21:01:58 +0000
commite75464c8b494eadc590fc7472c99ce4ef040e88d (patch)
tree9ed816f794887eea943719cba36ee6bfa3b69d77
parent1011cbf2d4d612c1af27e0b40507dac7cb40308c (diff)
etoc (18jun18)
git-svn-id: svn://tug.org/texlive/trunk@48047 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/etoc/README.md9
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc-DE.pdfbin580068 -> 580289 bytes
-rw-r--r--Master/texmf-dist/doc/latex/etoc/etoc.pdfbin624860 -> 625300 bytes
-rw-r--r--Master/texmf-dist/source/latex/etoc/etoc.dtx59
-rw-r--r--Master/texmf-dist/source/latex/etoc/etoc.ins8
-rw-r--r--Master/texmf-dist/tex/latex/etoc/etoc.sty18
6 files changed, 61 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md
index 7e6e3f32667..30ffd60ddc0 100644
--- a/Master/texmf-dist/doc/latex/etoc/README.md
+++ b/Master/texmf-dist/doc/latex/etoc/README.md
@@ -1,6 +1,6 @@
<!-- -->
- Source: etoc.dtx (v1.08n-2018/02/23)
+ Source: etoc.dtx (v1.08o-2018/06/15)
Author: Jean-Francois Burnol
Author: Christine Roemer et al. (German tranlation)
Info: Completely customisable TOCs
@@ -116,6 +116,13 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
RECENT CHANGES
==============
+v1.08o \[2018/06/15\]
+---------------------
+
+Fixed bug showing up if an unnumbered TOC entry starts with a brace,
+and document uses hyperref. Caused by a typo in a macro name at
+previous release.
+
v1.08n \[2018/02/23\]
---------------------
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
index 6b49a2096e8..d0863eae68a 100644
--- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
+++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf
index 51ac2eb3aaa..7bc5d06d285 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/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx
index ecc72095dad..d35b93c40e7 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -2,12 +2,12 @@
% N.B.: this dtx file is NOT for use with \DocInput. The latex source of the
% user manual is not prefixed with percent signs.
%<*none>
-\def\etocdtxtimestamp {Time-stamp: <23-02-2018 at 22:07:11 CET>}%
+\def\etocdtxtimestamp {Time-stamp: <17-06-2018 at 22:53:11 CEST>}%
%</none>
%<*!readme>
%%
%% Package: etoc
-%% Version: 1.08n-2018/02/23
+%% Version: 1.08o-2018/06/15
%% License: LPPL 1.3c
%% Copyright (C) 2012-2018 Jean-Francois Burnol
%% <jfbu at free dot fr>
@@ -17,14 +17,14 @@
%%
%</!readme>
%<*insfile>
-\def\etocpkgdate {2018/02/23}
-\def\etocdocdate {2018/02/23}
-\def\etocpkgversion {v1.08n}
+\def\etocpkgdate {2018/06/15}
+\def\etocdocdate {2018/06/15}
+\def\etocpkgversion {v1.08o}
\def\etocpkgdescription {Completely customisable TOCs (JFB)}
%</insfile>
%<*none>
-\def\etocDEpkgdate {23.02.2018}% METTRE À JOUR À CHAQUE BUMP!
-\def\etocDEdocdate {23.02.2018}
+\def\etocDEpkgdate {15.06.2018}% METTRE À JOUR À CHAQUE BUMP!
+\def\etocDEdocdate {15.06.2018}
\def\etocDEDEdocdate {09.04.2015}%
\def\etocDEDEpkgversion {v1.08d}%
% Definition of \etocLicense
@@ -35,7 +35,7 @@
\catcode32=13\catcode`\\=12^^Brelax^^A
^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A
{% Package: etoc
-% Version: 1.08n-2018/02/23
+% Version: 1.08o-2018/06/15
% License: LPPL 1.3c
% Copyright (C) 2012-2018 Jean-Francois Burnol <jfbu at free dot fr>
% Copyright (C) 2014-2018 Christine Roemer <Christine_Roemer at t-online dot de>
@@ -69,7 +69,7 @@
%<*readme>
<!-- -->
- Source: etoc.dtx (v1.08n-2018/02/23)
+ Source: etoc.dtx (v1.08o-2018/06/15)
Author: Jean-Francois Burnol
Author: Christine Roemer et al. (German tranlation)
Info: Completely customisable TOCs
@@ -185,6 +185,13 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
RECENT CHANGES
==============
+v1.08o \[2018/06/15\]
+---------------------
+
+Fixed bug showing up if an unnumbered TOC entry starts with a brace,
+and document uses hyperref. Caused by a typo in a macro name at
+previous release.
+
v1.08n \[2018/02/23\]
---------------------
@@ -10912,10 +10919,18 @@ Dokumentation erzeugt von der Quelldatei mit dem Stempel
\begin{multicols}{2}
\begin{jfverbatim}
-v1.08n [2018/02/23]^
+v1.08o [2018/06/15]^
+
+ Fixed bug showing up if an unnumbered TOC entry starts with a brace,
+ and document uses hyperref. Caused by a typo in a macro name at
+ previous release.
+
+
+~v1.08n [2018/02/23]^
Refactoring of core macros detecting \numberline and its variants.
+
~v1.08m [2018/02/07]^
Fix to 1.08k's introduced incompatibility with KOMA-script
@@ -10929,6 +10944,7 @@ v1.08n [2018/02/23]^
strings written (indirectly) to log file by etoc under some
circumstances.
+
~v1.08k [2017/09/28]^
Adds \etocsetlocaltop.toc. See corresponding manual section for
@@ -10947,6 +10963,7 @@ v1.08n [2018/02/23]^
any change to originals; they can thus be used as is when applying
the approach of "Another compatibility mode" section from manual.
+
~v1.08j [2017/09/21]^
Since 1.08a-2015/03/13 \etocname, \etocnumber, \etocpage
@@ -10967,6 +10984,7 @@ v1.08n [2018/02/23]^
surfacing only under relatively rare conditions such as usage
of hyperref with its option "linktoc=page" got fixed.
+
~v1.08i [2016/09/29]^
This fixes an issue dating back to 1.08e-2015/04/17: under
@@ -12138,7 +12156,10 @@ v1.08n [2018/02/23]^
% |1.08k| uses a delimited macro to identify \csa{numberline},
% \csa{chapternumberline} etc... in one go.
%
-% But anyway this was completely refactored at |1.08n|.
+% But anyway this was completely refactored at |1.08n|. Unfortunately
+% bad macro naming scheme caused a typo in a macro name, and it was
+% left undefined.
+% Fixed at |1.08o|.
% \begin{macrocode}
\def\Etoc@getnb@hyp #1#2#3#4#5#6\etoc@ {%
\edef\Etoc@tmp {{#3}}%
@@ -12146,16 +12167,16 @@ v1.08n [2018/02/23]^
\Etoc@global\def\etocthename {#4}% temporary definition
\Etoc@global\expandafter\def\expandafter\etocthelinkedname
\expandafter {\expandafter\hyperlink \Etoc@tmp{#4}}%
- \futurelet\Etoc@hyp@getnb@token\Etoc@hyp@getnb #4\relax\relax\etoc@
+ \futurelet\Etoc@hyp@getnb@token\Etoc@getnb@hyp@a #4\relax\relax\etoc@
}
-\def\Etoc@hyp@getnb {%
+\def\Etoc@getnb@hyp@a {%
\ifx\Etoc@hyp@getnb@token\bgroup
- \expandafter\Etoc@hyp@getnb@nonbr
+ \expandafter\Etoc@getnb@hyp@nonbr
\else
- \expandafter\Etoc@getnb@hyp@a
+ \expandafter\Etoc@getnb@hyp@b
\fi
}
-\def\Etoc@getnb@hyp@a #1{%
+\def\Etoc@getnb@hyp@b #1{%
\in@{#1}{\numberline\chapternumberline\partnumberline\booknumberline}%
\ifin@
\let\Etoc@next\Etoc@getnb@hyp@nmbrd
@@ -12218,7 +12239,7 @@ v1.08n [2018/02/23]^
% overshadowed this one by a real compilation error rather than a missing link
% in the procuced PDF.
%
-% |1.08n| refactors the whole thing.
+% |1.08n| refactors the whole thing. |1.08o| chooses better names for macros.
% \begin{macrocode}
\def\Etoc@getit@hyp #1#2#3#4#5#6\etoc@ {%
\edef\Etoc@tmp {{#3}}%
@@ -12226,9 +12247,9 @@ v1.08n [2018/02/23]^
\Etoc@global\def\etocthename {#4}% temporary definition
\Etoc@global\expandafter\def\expandafter\etocthelinkedname
\expandafter{\expandafter\hyperlink \Etoc@tmp{#4}}%
- \Etoc@hyp@getit #4\hspace\relax\etoc@
+ \Etoc@getit@hyp@a #4\hspace\relax\etoc@
}
-\def\Etoc@hyp@getit #1\hspace#2#3\etoc@ {%
+\def\Etoc@getit@hyp@a #1\hspace#2#3\etoc@ {%
\ifx\relax#2% not extremely safe
\else
\Etoc@global\Etoc@numbertrue
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.ins b/Master/texmf-dist/source/latex/etoc/etoc.ins
index a8c5f6da0f3..31511e8b14f 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.ins
+++ b/Master/texmf-dist/source/latex/etoc/etoc.ins
@@ -1,6 +1,6 @@
%%
%% Package: etoc
-%% Version: 1.08n-2018/02/23
+%% Version: 1.08o-2018/06/15
%% License: LPPL 1.3c
%% Copyright (C) 2012-2018 Jean-Francois Burnol
%% <jfbu at free dot fr>
@@ -8,9 +8,9 @@
%% <Christine_Roemer at t-online dot de>
%% and collaborators for the translation into German of the documentation
%%
-\def\etocpkgdate {2018/02/23}
-\def\etocdocdate {2018/02/23}
-\def\etocpkgversion {v1.08n}
+\def\etocpkgdate {2018/06/15}
+\def\etocdocdate {2018/06/15}
+\def\etocpkgversion {v1.08o}
\def\etocpkgdescription {Completely customisable TOCs (JFB)}
%% Run etex on this file to extract from etoc.dtx:
%% etoc.sty, etoc.tex, etoc-DE.tex and README.md
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index 1dec7ee47be..9b6277c8b90 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -23,10 +23,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{etoc}
- [2018/02/23 v1.08n Completely customisable TOCs (JFB)]
+ [2018/06/15 v1.08o Completely customisable TOCs (JFB)]
%%
%% Package: etoc
-%% Version: 1.08n-2018/02/23
+%% Version: 1.08o-2018/06/15
%% License: LPPL 1.3c
%% Copyright (C) 2012-2018 Jean-Francois Burnol
%% <jfbu at free dot fr>
@@ -422,16 +422,16 @@
\Etoc@global\def\etocthename {#4}% temporary definition
\Etoc@global\expandafter\def\expandafter\etocthelinkedname
\expandafter {\expandafter\hyperlink \Etoc@tmp{#4}}%
- \futurelet\Etoc@hyp@getnb@token\Etoc@hyp@getnb #4\relax\relax\etoc@
+ \futurelet\Etoc@hyp@getnb@token\Etoc@getnb@hyp@a #4\relax\relax\etoc@
}
-\def\Etoc@hyp@getnb {%
+\def\Etoc@getnb@hyp@a {%
\ifx\Etoc@hyp@getnb@token\bgroup
- \expandafter\Etoc@hyp@getnb@nonbr
+ \expandafter\Etoc@getnb@hyp@nonbr
\else
- \expandafter\Etoc@getnb@hyp@a
+ \expandafter\Etoc@getnb@hyp@b
\fi
}
-\def\Etoc@getnb@hyp@a #1{%
+\def\Etoc@getnb@hyp@b #1{%
\in@{#1}{\numberline\chapternumberline\partnumberline\booknumberline}%
\ifin@
\let\Etoc@next\Etoc@getnb@hyp@nmbrd
@@ -483,9 +483,9 @@
\Etoc@global\def\etocthename {#4}% temporary definition
\Etoc@global\expandafter\def\expandafter\etocthelinkedname
\expandafter{\expandafter\hyperlink \Etoc@tmp{#4}}%
- \Etoc@hyp@getit #4\hspace\relax\etoc@
+ \Etoc@getit@hyp@a #4\hspace\relax\etoc@
}
-\def\Etoc@hyp@getit #1\hspace#2#3\etoc@ {%
+\def\Etoc@getit@hyp@a #1\hspace#2#3\etoc@ {%
\ifx\relax#2% not extremely safe
\else
\Etoc@global\Etoc@numbertrue