From 4184b0334b6256fcebae11d52aeaf8eaa6226b9d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 May 2020 21:08:45 +0000 Subject: etoc (15may20) git-svn-id: svn://tug.org/texlive/trunk@55156 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/etoc/README.md | 11 ++-- Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf | Bin 565252 -> 566467 bytes Master/texmf-dist/doc/latex/etoc/etoc-DE.tex | 6 +-- Master/texmf-dist/doc/latex/etoc/etoc.pdf | Bin 620437 -> 622143 bytes Master/texmf-dist/doc/latex/etoc/etoc.tex | 6 +-- .../texmf-dist/doc/latex/etoc/etocsnippet-10.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-23.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-24.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-25.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-26.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-27.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-28.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-29.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-31.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-32.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-40.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-46.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-48.tex | 2 +- Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-53.tex | 2 +- .../texmf-dist/doc/latex/etoc/etocsnippet-54.tex | 2 +- Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex | 2 +- Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex | 2 +- Master/texmf-dist/source/latex/etoc/etoc.dtx | 56 +++++++++++++-------- Master/texmf-dist/tex/latex/etoc/etoc.sty | 17 ++++--- 34 files changed, 84 insertions(+), 66 deletions(-) diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md index 9a186ade41b..555755615d1 100644 --- a/Master/texmf-dist/doc/latex/etoc/README.md +++ b/Master/texmf-dist/doc/latex/etoc/README.md @@ -1,12 +1,12 @@ - Source: etoc.dtx (v1.09b-2019/11/17) + Source: etoc.dtx (v1.09c-2020/05/15) Author: Jean-Francois Burnol Author: Christine Roemer et al. (German tranlation) Info: Completely customisable TOCs License: LPPL 1.3c - Copyright (C) 2012-2019 Jean-Francois Burnol. - Copyright (C) 2014-2019 Christine Roemer and collaborators for + Copyright (C) 2012-2020 Jean-Francois Burnol. + Copyright (C) 2014-2020 Christine Roemer and collaborators for the translation into German of the documentation. @@ -107,6 +107,11 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi. RECENT CHANGES ============== +v1.09c \[2020/05/05\] +--------------------- + +Syncs with KOMA-script deprecation of `\iftocfeature`. + v1.09a, v1.09b \[2019/11/17\] ----------------------------- diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf index 6b443b78aee..57f8f970605 100644 Binary files a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf and b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf differ diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex b/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex index e07fa2d9e9d..3ac9f1eefe4 100644 --- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex +++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.tex @@ -1,10 +1,10 @@ %% %% Package: etoc -%% Version: 1.09b-2019/11/17 +%% Version: 1.09c-2020/05/15 %% License: LPPL 1.3c -%% Copyright (C) 2012-2019 Jean-Francois Burnol +%% Copyright (C) 2012-2020 Jean-Francois Burnol %% -%% Copyright (C) 2014-2019 Christine Roemer +%% Copyright (C) 2014-2020 Christine Roemer %% %% and collaborators for the translation into German of the documentation %% diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf index 111b8b2b7e6..929e58aea34 100644 Binary files a/Master/texmf-dist/doc/latex/etoc/etoc.pdf and b/Master/texmf-dist/doc/latex/etoc/etoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.tex b/Master/texmf-dist/doc/latex/etoc/etoc.tex index 24328a1bffb..1f39cfb2d54 100644 --- a/Master/texmf-dist/doc/latex/etoc/etoc.tex +++ b/Master/texmf-dist/doc/latex/etoc/etoc.tex @@ -1,10 +1,10 @@ %% %% Package: etoc -%% Version: 1.09b-2019/11/17 +%% Version: 1.09c-2020/05/15 %% License: LPPL 1.3c -%% Copyright (C) 2012-2019 Jean-Francois Burnol +%% Copyright (C) 2012-2020 Jean-Francois Burnol %% -%% Copyright (C) 2014-2019 Christine Roemer +%% Copyright (C) 2014-2020 Christine Roemer %% %% and collaborators for the translation into German of the documentation %% diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-10.tex index b9b14b5ab23..16621e29229 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 `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begin{figure}[ht!] \centering diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex index bdcf84ad2bd..a893ace5304 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-A.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-20-A.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \makeatletter \newcommand{\MyStandardTOC}{% diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex index e1c09ad23cf..cc89c707098 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-20-B.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-20-B.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \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-21-A.tex index a06ecf784b4..323eb2a1d75 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-A.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-21-A.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% % 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-21-B.tex index be738670f6b..09d55d962fa 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-21-B.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-21-B.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \makeatletter \newcommand*\TOClocalstyle {% diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex index 30133e451ee..6656b0e3498 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-22-A.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-22-A.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \etocdefaultlines \begingroup diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-23.tex index 308ee0f25e5..81da03d1cb4 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 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begin{figure}[htbp!]\centering \colorlet{subsecnum}{black} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex index c08cdf03c85..85d8bd03d54 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-24.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-24.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begingroup \newsavebox{\forsubsections} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-25.tex index 1acb5467f97..b8cf58bbb02 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 2019/11/17. +%% from source `etoc' on 2020/05/15. %% < in the preamble > \newcounter{visibletoc} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex index 723add39618..d711446a53c 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-26.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-26.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \etocsetnexttocdepth{2} % sections are at level 1 and will show up \begingroup diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-27.tex index 1b79b140746..9788583abe8 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 `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% % \newtoks\treetok % put this (uncommented) preferably in the preamble % \newtoks\tmptok % (idem) diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex index 6b4ee58302d..dcbbbdefabe 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-28.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-28.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% % \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-29.tex index 8116d97e27b..c626d42b479 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-29.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-29.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \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-30-A.tex index 682b3e27ebb..ddb8b728f1f 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-A.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-30-A.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \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-30-B.tex index 17f88158d10..2a5a805112e 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-30-B.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-30-B.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begin{center} \etocsetstyle{section} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex index 769e20d18b4..61157b2b6c1 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-31.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-31.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \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-32.tex index 65ed318f255..e5bba86dfe7 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-32.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-32.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \etocsetstyle{section} {\begin{enumerate}} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex index e947c50ea7d..82e4a7e0a56 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-40.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-40.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \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-46.tex index 7e36c0a5923..c25bb227e64 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-46.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-46.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \etocruledstyle[2]{\normalfont\normalsize\rmfamily\itshape \fbox{\parbox{.6\linewidth}{ diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex index 9b4cba5419e..98c024820af 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-48.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-48.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begingroup \definecolor{subsecnum}{RGB}{13,151,225} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex index 59c5f7b206f..8aee7353ed2 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-5.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-5.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begingroup\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm \etocsetstyle {section} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex index 5232020af04..1f6001cbbe9 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-A.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-52-A.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \newsavebox\firstnamei \newsavebox\firstnumberi \newsavebox\lastnamei \newsavebox\lastnumberi diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex index b5d92b6bcb1..28271dc866e 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-52-B.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-52-B.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \makeatletter \newcommand*\firstsubname {} \newcommand*\lastsubname {} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex index 9ee024d81ab..97996da1484 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-53.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-53.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \etocsetnexttocdepth {all} \begingroup diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex index cf042b6f9b5..db0d9438542 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-54.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-54.tex' %% generated by the `filecontentshere' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \newtoks\toctabletok \newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2 diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex index 333e45187a4..fbff3fd03f7 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-6.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-6.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begingroup \newcommand*{\DotsAndPage} diff --git a/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex b/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex index 171301979a3..5ca3e1cf0ac 100644 --- a/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex +++ b/Master/texmf-dist/doc/latex/etoc/etocsnippet-7.tex @@ -1,6 +1,6 @@ %% LaTeX2e file `etocsnippet-7.tex' %% generated by the `filecontentsdef' environment -%% from source `etoc' on 2019/11/17. +%% from source `etoc' on 2020/05/15. %% \begingroup % we start a group to keep the style changes local \newlength{\tocleftmargin} \setlength{\tocleftmargin}{5cm} diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx index a500a3b01de..6809655d298 100644 --- a/Master/texmf-dist/source/latex/etoc/etoc.dtx +++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx @@ -2,27 +2,27 @@ % 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: <17-11-2019 at 13:36:39 CET>}% +\def\etocdtxtimestamp {Time-stamp: <15-05-2020 at 19:18:31 CEST>}% % %<*!readme> %% %% Package: etoc -%% Version: 1.09b-2019/11/17 +%% Version: 1.09c-2020/05/15 %% License: LPPL 1.3c -%% Copyright (C) 2012-2019 Jean-Francois Burnol +%% Copyright (C) 2012-2020 Jean-Francois Burnol %% -%% Copyright (C) 2014-2019 Christine Roemer +%% Copyright (C) 2014-2020 Christine Roemer %% %% and collaborators for the translation into German of the documentation %% % %<*none> -\def\etocpkgdate {2019/11/17} -\def\etocdocdate {2019/11/17} -\def\etocpkgversion {v1.09b} +\def\etocpkgdate {2020/05/15} +\def\etocdocdate {2020/05/15} +\def\etocpkgversion {v1.09c} \def\etocpkgdescription {Completely customisable TOCs (JFB)} -\def\etocDEpkgdate {17.11.2019}% METTRE À JOUR À CHAQUE BUMP! -\def\etocDEdocdate {17.11.2019} +\def\etocDEpkgdate {15.05.2020}% METTRE À JOUR À CHAQUE BUMP! +\def\etocDEdocdate {15.05.2020} \def\etocDEDEdocdate {09.04.2015}% \def\etocDEDEpkgversion {v1.08d}% % Definition of \etocLicense @@ -33,10 +33,10 @@ \catcode32=13\catcode`\\=12^^Brelax^^A ^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A {% Package: etoc -% Version: 1.09b-2019/11/17 +% Version: 1.09c-2020/05/15 % License: LPPL 1.3c -% Copyright (C) 2012-2019 Jean-Francois Burnol -% Copyright (C) 2014-2019 Christine Roemer +% Copyright (C) 2012-2020 Jean-Francois Burnol +% Copyright (C) 2014-2020 Christine Roemer % and collaborators for the translation into German of the documentation % % This Work may be distributed and/or modified under the @@ -67,13 +67,13 @@ %<*readme> - Source: etoc.dtx (v1.09b-2019/11/17) + Source: etoc.dtx (v1.09c-2020/05/15) Author: Jean-Francois Burnol Author: Christine Roemer et al. (German tranlation) Info: Completely customisable TOCs License: LPPL 1.3c - Copyright (C) 2012-2019 Jean-Francois Burnol. - Copyright (C) 2014-2019 Christine Roemer and collaborators for + Copyright (C) 2012-2020 Jean-Francois Burnol. + Copyright (C) 2014-2020 Christine Roemer and collaborators for the translation into German of the documentation. @@ -174,6 +174,11 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi. RECENT CHANGES ============== +v1.09c \[2020/05/05\] +--------------------- + +Syncs with KOMA-script deprecation of `\iftocfeature`. + v1.09a, v1.09b \[2019/11/17\] ----------------------------- @@ -10719,7 +10724,11 @@ Dokumentation erzeugt von der Quelldatei mit dem Stempel \begin{multicols}{2} \begin{jfverbatim} -v1.09a, v1.09b [2019/11/17]^ +v1.09c [2020/05/05]^ + + Syncs with KOMA-script deprecation of \iftocfeature. + +~v1.09a, v1.09b [2019/11/17]^ Sync with memoir v3.7i which has a better location of the TOC hyperref anchor. The \etocaftertitlehook can now freely be @@ -13383,14 +13392,17 @@ v1.09a, v1.09b [2019/11/17]^ \parskip \cftparskip \@nameuse {cfttocbeforelisthook}} {\@nameuse {cfttocafterlisthook}\endgroup\restorefromonecol}} % \end{macrocode} -% placeholder for comments +% |1.09c| (|2020/05/15|) does an update as KOMA-script has deprecated +% |\iftocfeature|. Thanks to Bilel Omrani for report. I did not check +% if cloning of KOMA code required some further updates. % \begin{macrocode} +\ifdefined\Iftocfeature\def\etoc@Iftocfeature{\Iftocfeature}\else\def\etoc@Iftocfeature{\iftocfeature}\fi \def\etocscrartclstyle{% \etocsettocstyle {\let\if@dynlist\if@tocleft \def\@currext{toc}% added 1.07m 2015/01/23 - \iftocfeature {toc}{onecolumn} - {\iftocfeature {toc}{leveldown} + \etoc@Iftocfeature {toc}{onecolumn} + {\etoc@Iftocfeature {toc}{leveldown} {} {\if@twocolumn \aftergroup \twocolumn \onecolumn \fi }} {}% @@ -13398,14 +13410,14 @@ v1.09a, v1.09b [2019/11/17]^ % |1.07k|: next line to do as within current |scrartcl 2013/12/19 v3.12| % KOMA-Script article class. % \begin{macrocode} - \iftocfeature {toc}{numberline}{\def \nonumberline {\numberline {}}}{}% + \etoc@Iftocfeature {toc}{numberline}{\def \nonumberline {\numberline {}}}{}% \tocbasic@listhead {\listoftocname}% \begingroup \expandafter \expandafter \expandafter \endgroup \expandafter \ifx \csname microtypesetup\endcsname \relax \else - \iftocfeature {toc}{noprotrusion}{} + \etoc@Iftocfeature {toc}{noprotrusion}{} {\microtypesetup {protrusion=false}% \PackageInfo {tocbasic}% {character protrusion at toc deactivated}}% @@ -13772,7 +13784,7 @@ v1.09a, v1.09b [2019/11/17]^ Grave accent \` Left brace \{ Vertical bar \| Right brace \} Tilde \~} -\CheckSum{3506}% +\CheckSum{3516}% \csname check@checksum\endcsname \Finale diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty index 9b5e7ed75b1..a03cea08a64 100644 --- a/Master/texmf-dist/tex/latex/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -23,14 +23,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoc} - [2019/11/17 v1.09b Completely customisable TOCs (JFB)] + [2020/05/15 v1.09c Completely customisable TOCs (JFB)] %% %% Package: etoc -%% Version: 1.09b-2019/11/17 +%% Version: 1.09c-2020/05/15 %% License: LPPL 1.3c -%% Copyright (C) 2012-2019 Jean-Francois Burnol +%% Copyright (C) 2012-2020 Jean-Francois Burnol %% -%% Copyright (C) 2014-2019 Christine Roemer +%% Copyright (C) 2014-2020 Christine Roemer %% %% and collaborators for the translation into German of the documentation %% @@ -1285,23 +1285,24 @@ \fi \parskip \cftparskip \@nameuse {cfttocbeforelisthook}} {\@nameuse {cfttocafterlisthook}\endgroup\restorefromonecol}} +\ifdefined\Iftocfeature\def\etoc@Iftocfeature{\Iftocfeature}\else\def\etoc@Iftocfeature{\iftocfeature}\fi \def\etocscrartclstyle{% \etocsettocstyle {\let\if@dynlist\if@tocleft \def\@currext{toc}% added 1.07m 2015/01/23 - \iftocfeature {toc}{onecolumn} - {\iftocfeature {toc}{leveldown} + \etoc@Iftocfeature {toc}{onecolumn} + {\etoc@Iftocfeature {toc}{leveldown} {} {\if@twocolumn \aftergroup \twocolumn \onecolumn \fi }} {}% - \iftocfeature {toc}{numberline}{\def \nonumberline {\numberline {}}}{}% + \etoc@Iftocfeature {toc}{numberline}{\def \nonumberline {\numberline {}}}{}% \tocbasic@listhead {\listoftocname}% \begingroup \expandafter \expandafter \expandafter \endgroup \expandafter \ifx \csname microtypesetup\endcsname \relax \else - \iftocfeature {toc}{noprotrusion}{} + \etoc@Iftocfeature {toc}{noprotrusion}{} {\microtypesetup {protrusion=false}% \PackageInfo {tocbasic}% {character protrusion at toc deactivated}}% -- cgit v1.2.3