texlive[55852] Master/texmf-dist: tocdata (16jul20)
commits+karl at tug.org
commits+karl at tug.org
Fri Jul 17 00:03:21 CEST 2020
Revision: 55852
http://tug.org/svn/texlive?view=revision&revision=55852
Author: karl
Date: 2020-07-17 00:03:21 +0200 (Fri, 17 Jul 2020)
Log Message:
-----------
tocdata (16jul20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf
trunk/Master/texmf-dist/source/latex/tocdata/tocdata.dtx
trunk/Master/texmf-dist/tex/latex/tocdata/tocdata.sty
Modified: trunk/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/tocdata/tocdata.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tocdata/tocdata.dtx 2020-07-16 22:02:56 UTC (rev 55851)
+++ trunk/Master/texmf-dist/source/latex/tocdata/tocdata.dtx 2020-07-16 22:03:21 UTC (rev 55852)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 2016--2019 Brian Dunn
+% Copyright 2016--2020 Brian Dunn
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{tocdata}
-%<package> [2019/07/06 v2.03 Adds author/artist to TOC entries.]
+%<package> [2020/07/15 v2.04 Adds author/artist to TOC entries.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -186,7 +186,7 @@
%</driver>
% \fi
%
-% \CheckSum{662}
+% \CheckSum{521}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -217,6 +217,7 @@
% \changes{v2.01}{2019/03/15}{\ 2019/03/15}
% \changes{v2.02}{2019/03/21}{\ 2019/03/21}
% \changes{v2.03}{2019/07/06}{\ 2019/07/06}
+% \changes{v2.04}{2020/07/15}{\ 2020/07/15}
@@ -240,7 +241,7 @@
%
% \bigskip
%
-% {\small\textcopyright{} 2016--2019} Brian Dunn\\ \small \texttt{bd at BDTechConcepts.com}
+% {\small\textcopyright{} 2016--2020} Brian Dunn\\ \small \texttt{bd at BDTechConcepts.com}
%
% \vspace{.5in}
%
@@ -405,9 +406,9 @@
%
% In the preamble, use:
% \begin{sourceverb}
-% \usepackage{tocdata}% optional
+% \usepackage{tocdata}
% \usepackage{titletoc}% optional
-% \usepackage{tocloft}
+% \usepackage{tocloft}% optional
% \end{sourceverb}
%
%
@@ -937,12 +938,20 @@
{\nobreak\hfil\nobreak}
{\nobreak\hfil\TD at usetocdata\nobreak}
{}
- {}
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch titletoc ttl at savel@#1.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }
\expandafter\xpatchcmd\csname l@#1\endcsname
{\contentspage}
{\TD at usetocdata\contentspage}
{}
- {}
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch titletoc l@#1.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }
}
\TD at titletoc@patch{part}
@@ -1020,108 +1029,32 @@
%
% \subsection{Koma-script \pkg{tocbasic} support}
%
-% \changes{v2.03}{2019/07/06}{Added support for \pkg{tocbasic}.}
-%
% There is no easy way to patch this\dots
% \cs{TD at usetocdata} is inserted near the end of the following:
%
+% \changes{v2.03}{2019/07/06}{Added support for \pkg{tocbasic}.}
+% \changes{v2.04}{2020/07/15}{Updated for \pkg{tocbasic} v3.30.}
+%
% \begin{macrocode}
\AtBeginDocument{
\@ifpackageloaded{tocbasic}{
-\renewcommand*{\scr at dte@tocline}[3]{%
- \ifnum \@nameuse{#1tocdepth}>\c at tocdepth
- \else
- \tocbasic at DependOnPenaltyAndTOCLevel{#1}%
- \addvspace{\@nameuse{scr at tso@#1 at beforeskip}}\relax
+\xpatchcmd{\scr at dte@tocline}
{%
- \leftskip \@nameuse{scr at tso@#1 at indent}\relax
- \rightskip \@tocrmarg
- \parfillskip -\rightskip
- \@nameuse{Ifscr at tso@#1 at raggedpage}{%
- \addtolength{\parfillskip}{\z@ \@plus 1fil}%
- }{}%
- \parindent \@nameuse{scr at tso@#1 at indent}\relax
- \@afterindenttrue
- \interlinepenalty\@M
- \expandafter\ifx\csname ragged#1entry\endcsname\raggedright
- \addtolength\rightskip\@flushglue
- \else
- \def\reserved at a{\raggedright}%
- \expandafter\ifx\csname ragged#1entry\endcsname\reserved at a
- \addtolength\rightskip\@flushglue
- \else
- \renewcommand\reserved at a{\raggedright}%
- \expandafter\ifx\csname ragged#1entry\endcsname\reserved at a
- \addtolength\rightskip\@flushglue
- \fi
- \fi
- \fi
- \leavevmode
- \@tempdima \@nameuse{scr at tso@#1 at numwidth}\relax
- \@nameuse{Ifscr at tso@#1 at dynnumwidth}{%
- \scr at ifundefinedorrelax{scr at dte@#1 at lastmaxnumwidth}{}{%
- \ifdim \@nameuse{scr at dte@#1 at lastmaxnumwidth}>\@tempdima
- \@tempdima\@nameuse{scr at dte@#1 at lastmaxnumwidth}\relax
- \fi
- }%
- }{}%
- \advance\leftskip \@tempdima
- \null\nobreak\hskip -\leftskip
- {%
- \usetocbasicnumberline
- \let\scr at dte@numberline at box\numberline at box
- \def\numberline at box##1{%
- \sbox\scr at dte@tocline at numbox{\@nameuse{scr at tso@#1 at numberformat}{##1}}%
- \global\scr at dte@tocline at numberwidth
- \dimexpr\wd\scr at dte@tocline at numbox+\@nameuse{scr at tso@#1 at numsep}\relax
- \relax
- \ifdim \scr at dte@tocline at numberwidth
- >\@nameuse{scr at dte@#1 at maxnumwidth}\relax
- \global\@nameuse{scr at dte@#1 at maxnumwidth}\scr at dte@tocline at numberwidth
- \fi
- \@nameuse{Ifscr at tso@#1 at dynnumwidth}{}{%
- \ifdim \scr at dte@tocline at numberwidth
- >\dimexpr \@nameuse{scr at tso@#1 at numwidth}%
- +\@nameuse{scr at tso@#1 at numsep}\relax\relax
- \PackageWarning{tocbasic%
- }{%
- number width of #1 toc entries should be
- increased!\MessageBreak
- Currently used number width =
- \the\wd\scr at dte@tocline at numbox,\MessageBreak
- Wanted number separation
- \space\space\space =
- \the\dimexpr\@nameuse{scr at tso@#1 at numsep}\relax,\MessageBreak
- Reserved number width \space\space\space\space\space\space =
- \the\dimexpr\@nameuse{scr at tso@#1 at numwidth}\relax%
- }%
- \fi
- }%
- \scr at dte@numberline at box{\@nameuse{scr at tso@#1 at numberformat}{##1}}%
- \@nameuse{Ifscr at tso@#1 at breakafternumber}{%
- {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip
- }{}%
- }%
- \@nameuse{scr at tso@#1 at entryformat}{%
- #2%
- \nobreak
- {%
- \normalfont\normalsize\@nameuse{scr at tso@#1 at linefill}%
- \TD at usetocdata% lwarp
- \nobreak
- \@nameuse{scr at tso@#1 at pagenumberbox}{%
- \@nameuse{scr at tso@#1 at pagenumberformat}{#3}%
- }%
- }%
- \@par
- }%
- }%
- }%
- \tocbasic at SetPenaltyByTOCLevel{#1}%
- \fi
-}
-
+ \nobreak
+ \expandafter\let\expandafter\scr at dte@pagenumberwidth
+ }
+ {%
+ \TD at usetocdata% tocdata
+ \nobreak
+ \expandafter\let\expandafter\scr at dte@pagenumberwidth
+ }
+ {}
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch tocbasic \protect\scr at dte@tocline.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }
}{}
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/tocdata/tocdata.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tocdata/tocdata.sty 2020-07-16 22:02:56 UTC (rev 55851)
+++ trunk/Master/texmf-dist/tex/latex/tocdata/tocdata.sty 2020-07-16 22:03:21 UTC (rev 55852)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{tocdata}
- [2019/07/06 v2.03 Adds author/artist to TOC entries.]
+ [2020/07/15 v2.04 Adds author/artist to TOC entries.]
\RequirePackage{xparse}
@@ -157,12 +157,20 @@
{\nobreak\hfil\nobreak}
{\nobreak\hfil\TD at usetocdata\nobreak}
{}
- {}
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch titletoc ttl at savel@#1.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }
\expandafter\xpatchcmd\csname l@#1\endcsname
{\contentspage}
{\TD at usetocdata\contentspage}
{}
- {}
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch titletoc l@#1.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }
}
\TD at titletoc@patch{part}
@@ -218,99 +226,22 @@
\AtBeginDocument{
\@ifpackageloaded{tocbasic}{
-\renewcommand*{\scr at dte@tocline}[3]{%
- \ifnum \@nameuse{#1tocdepth}>\c at tocdepth
- \else
- \tocbasic at DependOnPenaltyAndTOCLevel{#1}%
- \addvspace{\@nameuse{scr at tso@#1 at beforeskip}}\relax
+\xpatchcmd{\scr at dte@tocline}
{%
- \leftskip \@nameuse{scr at tso@#1 at indent}\relax
- \rightskip \@tocrmarg
- \parfillskip -\rightskip
- \@nameuse{Ifscr at tso@#1 at raggedpage}{%
- \addtolength{\parfillskip}{\z@ \@plus 1fil}%
- }{}%
- \parindent \@nameuse{scr at tso@#1 at indent}\relax
- \@afterindenttrue
- \interlinepenalty\@M
- \expandafter\ifx\csname ragged#1entry\endcsname\raggedright
- \addtolength\rightskip\@flushglue
- \else
- \def\reserved at a{\raggedright}%
- \expandafter\ifx\csname ragged#1entry\endcsname\reserved at a
- \addtolength\rightskip\@flushglue
- \else
- \renewcommand\reserved at a{\raggedright}%
- \expandafter\ifx\csname ragged#1entry\endcsname\reserved at a
- \addtolength\rightskip\@flushglue
- \fi
- \fi
- \fi
- \leavevmode
- \@tempdima \@nameuse{scr at tso@#1 at numwidth}\relax
- \@nameuse{Ifscr at tso@#1 at dynnumwidth}{%
- \scr at ifundefinedorrelax{scr at dte@#1 at lastmaxnumwidth}{}{%
- \ifdim \@nameuse{scr at dte@#1 at lastmaxnumwidth}>\@tempdima
- \@tempdima\@nameuse{scr at dte@#1 at lastmaxnumwidth}\relax
- \fi
- }%
- }{}%
- \advance\leftskip \@tempdima
- \null\nobreak\hskip -\leftskip
- {%
- \usetocbasicnumberline
- \let\scr at dte@numberline at box\numberline at box
- \def\numberline at box##1{%
- \sbox\scr at dte@tocline at numbox{\@nameuse{scr at tso@#1 at numberformat}{##1}}%
- \global\scr at dte@tocline at numberwidth
- \dimexpr\wd\scr at dte@tocline at numbox+\@nameuse{scr at tso@#1 at numsep}\relax
- \relax
- \ifdim \scr at dte@tocline at numberwidth
- >\@nameuse{scr at dte@#1 at maxnumwidth}\relax
- \global\@nameuse{scr at dte@#1 at maxnumwidth}\scr at dte@tocline at numberwidth
- \fi
- \@nameuse{Ifscr at tso@#1 at dynnumwidth}{}{%
- \ifdim \scr at dte@tocline at numberwidth
- >\dimexpr \@nameuse{scr at tso@#1 at numwidth}%
- +\@nameuse{scr at tso@#1 at numsep}\relax\relax
- \PackageWarning{tocbasic%
- }{%
- number width of #1 toc entries should be
- increased!\MessageBreak
- Currently used number width =
- \the\wd\scr at dte@tocline at numbox,\MessageBreak
- Wanted number separation
- \space\space\space =
- \the\dimexpr\@nameuse{scr at tso@#1 at numsep}\relax,\MessageBreak
- Reserved number width \space\space\space\space\space\space =
- \the\dimexpr\@nameuse{scr at tso@#1 at numwidth}\relax%
- }%
- \fi
- }%
- \scr at dte@numberline at box{\@nameuse{scr at tso@#1 at numberformat}{##1}}%
- \@nameuse{Ifscr at tso@#1 at breakafternumber}{%
- {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip
- }{}%
- }%
- \@nameuse{scr at tso@#1 at entryformat}{%
- #2%
- \nobreak
- {%
- \normalfont\normalsize\@nameuse{scr at tso@#1 at linefill}%
- \TD at usetocdata% lwarp
- \nobreak
- \@nameuse{scr at tso@#1 at pagenumberbox}{%
- \@nameuse{scr at tso@#1 at pagenumberformat}{#3}%
- }%
- }%
- \@par
- }%
- }%
- }%
- \tocbasic at SetPenaltyByTOCLevel{#1}%
- \fi
-}
-
+ \nobreak
+ \expandafter\let\expandafter\scr at dte@pagenumberwidth
+ }
+ {%
+ \TD at usetocdata% tocdata
+ \nobreak
+ \expandafter\let\expandafter\scr at dte@pagenumberwidth
+ }
+ {}
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch tocbasic \protect\scr at dte@tocline.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }
}{}
}
\AtBeginDocument{
More information about the tex-live-commits
mailing list.