diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/tocdata/tocdata.pdf | bin | 919235 -> 922715 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/tocdata/tocdata.dtx | 137 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/tocdata/tocdata.sty | 121 |
3 files changed, 61 insertions, 197 deletions
diff --git a/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf b/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf Binary files differindex 4f0498a95fe..d43b057eed5 100644 --- a/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf +++ b/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf diff --git a/Master/texmf-dist/source/latex/tocdata/tocdata.dtx b/Master/texmf-dist/source/latex/tocdata/tocdata.dtx index cfe157698bc..ebdbf21c518 100644 --- a/Master/texmf-dist/source/latex/tocdata/tocdata.dtx +++ b/Master/texmf-dist/source/latex/tocdata/tocdata.dtx @@ -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 @@ Keywords={LaTeX, tocdata, contents}% %</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 @@ Keywords={LaTeX, tocdata, contents}% % \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 @@ Keywords={LaTeX, tocdata, contents}% % % \bigskip % -% {\small\textcopyright{} 2016--2019} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com} +% {\small\textcopyright{} 2016--2020} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com} % % \vspace{.5in} % @@ -405,9 +406,9 @@ Keywords={LaTeX, tocdata, contents}% % % 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 @@ Keywords={LaTeX, tocdata, contents}% {\nobreak\hfil\nobreak} {\nobreak\hfil\TD@usetocdata\nobreak} {} - {} + {% + \PackageWarningNoLine{tocdata}{% + Could not patch titletoc ttl@savel@#1.\MessageBreak + Authors may not appear in TOC, LOF} + } \expandafter\xpatchcmd\csname l@#1\endcsname {\contentspage} {\TD@usetocdata\contentspage} {} - {} + {% + \PackageWarningNoLine{tocdata}{% + Could not patch titletoc l@#1.\MessageBreak + Authors may not appear in TOC, LOF} + } } \TD@titletoc@patch{part} @@ -1020,108 +1029,32 @@ Keywords={LaTeX, tocdata, contents}% % % \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@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@dte@tocline}[3]{% - \ifnum \@nameuse{#1tocdepth}>\c@tocdepth - \else - \tocbasic@DependOnPenaltyAndTOCLevel{#1}% - \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax +\xpatchcmd{\scr@dte@tocline} {% - \leftskip \@nameuse{scr@tso@#1@indent}\relax - \rightskip \@tocrmarg - \parfillskip -\rightskip - \@nameuse{Ifscr@tso@#1@raggedpage}{% - \addtolength{\parfillskip}{\z@ \@plus 1fil}% - }{}% - \parindent \@nameuse{scr@tso@#1@indent}\relax - \@afterindenttrue - \interlinepenalty\@M - \expandafter\ifx\csname ragged#1entry\endcsname\raggedright - \addtolength\rightskip\@flushglue - \else - \def\reserved@a{\raggedright}% - \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a - \addtolength\rightskip\@flushglue - \else - \renewcommand\reserved@a{\raggedright}% - \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a - \addtolength\rightskip\@flushglue - \fi - \fi - \fi - \leavevmode - \@tempdima \@nameuse{scr@tso@#1@numwidth}\relax - \@nameuse{Ifscr@tso@#1@dynnumwidth}{% - \scr@ifundefinedorrelax{scr@dte@#1@lastmaxnumwidth}{}{% - \ifdim \@nameuse{scr@dte@#1@lastmaxnumwidth}>\@tempdima - \@tempdima\@nameuse{scr@dte@#1@lastmaxnumwidth}\relax - \fi - }% - }{}% - \advance\leftskip \@tempdima - \null\nobreak\hskip -\leftskip - {% - \usetocbasicnumberline - \let\scr@dte@numberline@box\numberline@box - \def\numberline@box##1{% - \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}% - \global\scr@dte@tocline@numberwidth - \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax - \relax - \ifdim \scr@dte@tocline@numberwidth - >\@nameuse{scr@dte@#1@maxnumwidth}\relax - \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth - \fi - \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{% - \ifdim \scr@dte@tocline@numberwidth - >\dimexpr \@nameuse{scr@tso@#1@numwidth}% - +\@nameuse{scr@tso@#1@numsep}\relax\relax - \PackageWarning{tocbasic% - }{% - number width of #1 toc entries should be - increased!\MessageBreak - Currently used number width = - \the\wd\scr@dte@tocline@numbox,\MessageBreak - Wanted number separation - \space\space\space = - \the\dimexpr\@nameuse{scr@tso@#1@numsep}\relax,\MessageBreak - Reserved number width \space\space\space\space\space\space = - \the\dimexpr\@nameuse{scr@tso@#1@numwidth}\relax% - }% - \fi - }% - \scr@dte@numberline@box{\@nameuse{scr@tso@#1@numberformat}{##1}}% - \@nameuse{Ifscr@tso@#1@breakafternumber}{% - {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip - }{}% - }% - \@nameuse{scr@tso@#1@entryformat}{% - #2% - \nobreak - {% - \normalfont\normalsize\@nameuse{scr@tso@#1@linefill}% - \TD@usetocdata% lwarp - \nobreak - \@nameuse{scr@tso@#1@pagenumberbox}{% - \@nameuse{scr@tso@#1@pagenumberformat}{#3}% - }% - }% - \@par - }% - }% - }% - \tocbasic@SetPenaltyByTOCLevel{#1}% - \fi -} - + \nobreak + \expandafter\let\expandafter\scr@dte@pagenumberwidth + } + {% + \TD@usetocdata% tocdata + \nobreak + \expandafter\let\expandafter\scr@dte@pagenumberwidth + } + {} + {% + \PackageWarningNoLine{tocdata}{% + Could not patch tocbasic \protect\scr@dte@tocline.\MessageBreak + Authors may not appear in TOC, LOF} + } }{} } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/tocdata/tocdata.sty b/Master/texmf-dist/tex/latex/tocdata/tocdata.sty index ae4dfa715bf..4cd4b2256bd 100644 --- a/Master/texmf-dist/tex/latex/tocdata/tocdata.sty +++ b/Master/texmf-dist/tex/latex/tocdata/tocdata.sty @@ -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@usetocdata\nobreak} {} - {} + {% + \PackageWarningNoLine{tocdata}{% + Could not patch titletoc ttl@savel@#1.\MessageBreak + Authors may not appear in TOC, LOF} + } \expandafter\xpatchcmd\csname l@#1\endcsname {\contentspage} {\TD@usetocdata\contentspage} {} - {} + {% + \PackageWarningNoLine{tocdata}{% + Could not patch titletoc l@#1.\MessageBreak + Authors may not appear in TOC, LOF} + } } \TD@titletoc@patch{part} @@ -218,99 +226,22 @@ \AtBeginDocument{ \@ifpackageloaded{tocbasic}{ -\renewcommand*{\scr@dte@tocline}[3]{% - \ifnum \@nameuse{#1tocdepth}>\c@tocdepth - \else - \tocbasic@DependOnPenaltyAndTOCLevel{#1}% - \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax +\xpatchcmd{\scr@dte@tocline} {% - \leftskip \@nameuse{scr@tso@#1@indent}\relax - \rightskip \@tocrmarg - \parfillskip -\rightskip - \@nameuse{Ifscr@tso@#1@raggedpage}{% - \addtolength{\parfillskip}{\z@ \@plus 1fil}% - }{}% - \parindent \@nameuse{scr@tso@#1@indent}\relax - \@afterindenttrue - \interlinepenalty\@M - \expandafter\ifx\csname ragged#1entry\endcsname\raggedright - \addtolength\rightskip\@flushglue - \else - \def\reserved@a{\raggedright}% - \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a - \addtolength\rightskip\@flushglue - \else - \renewcommand\reserved@a{\raggedright}% - \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a - \addtolength\rightskip\@flushglue - \fi - \fi - \fi - \leavevmode - \@tempdima \@nameuse{scr@tso@#1@numwidth}\relax - \@nameuse{Ifscr@tso@#1@dynnumwidth}{% - \scr@ifundefinedorrelax{scr@dte@#1@lastmaxnumwidth}{}{% - \ifdim \@nameuse{scr@dte@#1@lastmaxnumwidth}>\@tempdima - \@tempdima\@nameuse{scr@dte@#1@lastmaxnumwidth}\relax - \fi - }% - }{}% - \advance\leftskip \@tempdima - \null\nobreak\hskip -\leftskip - {% - \usetocbasicnumberline - \let\scr@dte@numberline@box\numberline@box - \def\numberline@box##1{% - \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}% - \global\scr@dte@tocline@numberwidth - \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax - \relax - \ifdim \scr@dte@tocline@numberwidth - >\@nameuse{scr@dte@#1@maxnumwidth}\relax - \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth - \fi - \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{% - \ifdim \scr@dte@tocline@numberwidth - >\dimexpr \@nameuse{scr@tso@#1@numwidth}% - +\@nameuse{scr@tso@#1@numsep}\relax\relax - \PackageWarning{tocbasic% - }{% - number width of #1 toc entries should be - increased!\MessageBreak - Currently used number width = - \the\wd\scr@dte@tocline@numbox,\MessageBreak - Wanted number separation - \space\space\space = - \the\dimexpr\@nameuse{scr@tso@#1@numsep}\relax,\MessageBreak - Reserved number width \space\space\space\space\space\space = - \the\dimexpr\@nameuse{scr@tso@#1@numwidth}\relax% - }% - \fi - }% - \scr@dte@numberline@box{\@nameuse{scr@tso@#1@numberformat}{##1}}% - \@nameuse{Ifscr@tso@#1@breakafternumber}{% - {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip - }{}% - }% - \@nameuse{scr@tso@#1@entryformat}{% - #2% - \nobreak - {% - \normalfont\normalsize\@nameuse{scr@tso@#1@linefill}% - \TD@usetocdata% lwarp - \nobreak - \@nameuse{scr@tso@#1@pagenumberbox}{% - \@nameuse{scr@tso@#1@pagenumberformat}{#3}% - }% - }% - \@par - }% - }% - }% - \tocbasic@SetPenaltyByTOCLevel{#1}% - \fi -} - + \nobreak + \expandafter\let\expandafter\scr@dte@pagenumberwidth + } + {% + \TD@usetocdata% tocdata + \nobreak + \expandafter\let\expandafter\scr@dte@pagenumberwidth + } + {} + {% + \PackageWarningNoLine{tocdata}{% + Could not patch tocbasic \protect\scr@dte@tocline.\MessageBreak + Authors may not appear in TOC, LOF} + } }{} } \AtBeginDocument{ |