tocdata (22mar19)

git-svn-id: svn://tug.org/texlive/trunk@50536 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 42 insertions, 34 deletions

diff --git a/Master/texmf-dist/doc/latex/tocdata/README.txt b/Master/texmf-dist/doc/latex/tocdata/README.txt
index fbf53b5f320..9207bb067bd 100644
--- a/Master/texmf-dist/doc/latex/tocdata/README.txt
+++ b/Master/texmf-dist/doc/latex/tocdata/README.txt
@@ -1,7 +1,7 @@
 The tocdata package.
 Adds names to table of contents / list of figures entries.
 
-v2.01 — 2019/03/15
+v2.02 — 2019/03/21
 Copyright 2016–2019 Brian Dunn — www.BDTechConcepts.com
 LaTeX Project Public License, version 1.3
 
diff --git a/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf b/Master/texmf-dist/doc/latex/tocdata/tocdata.pdf
index 35233d5040f..eb8cdbfe99d 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 3857ee5f3d0..2dd937112e0 100644
--- a/Master/texmf-dist/source/latex/tocdata/tocdata.dtx
+++ b/Master/texmf-dist/source/latex/tocdata/tocdata.dtx
@@ -15,7 +15,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{tocdata}
-%<package>    [2019/03/15 v2.01 Adds author/artist to TOC entries.]
+%<package>    [2019/03/21 v2.02 Adds author/artist to TOC entries.]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -186,7 +186,7 @@ Keywords={LaTeX, tocdata, contents}%
 %</driver>
 % \fi
 %
-% \CheckSum{374}
+% \CheckSum{373}
 %
 % \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
@@ -215,6 +215,7 @@ Keywords={LaTeX, tocdata, contents}%
 % \changes{v2.00}{2019/03/15}{Added support for new float types.}
 % \changes{v2.00}{2019/03/15}{\ 2019/03/15}
 % \changes{v2.01}{2019/03/15}{\ 2019/03/15}
+% \changes{v2.02}{2019/03/21}{\ 2019/03/21}
 
 
 
@@ -449,10 +450,10 @@ Keywords={LaTeX, tocdata, contents}%
 %
 %
 % \subsubsection{Adding \acro{LOF} data per figure}
-% Before each \cs{caption} which is to have an artist:
+% Before each \cs{caption} which is to have an artist or author:
 %
 %	\begin{sourceverb}
-%	\tocdata{lof}{Artist's Name}
+%	\tocdata{lof}{Artist's/Author's Name}
 %	\caption{Figure Title}
 %	\end{sourceverb}
 %
@@ -544,6 +545,7 @@ Keywords={LaTeX, tocdata, contents}%
 % \watchout[redefining]
 % depend on \cs{tocdatapartprint}, so if it is redefined the others will
 % have to be redefined as well.
+% Make these macros robust!\watchout[robust]
 %
 % 
 % \DescribeMacro{\tocdataartistprint}
@@ -556,18 +558,19 @@ Keywords={LaTeX, tocdata, contents}%
 %
 % \subsubsection{Text justification}
 %
-% \DescribeMacro{\tdartistnamejustify}
-% \DescribeMacro{\tdartistnamecenter}
-% \DescribeMacro{\tdartistnameleft}
-% \DescribeMacro{\tdartistnameright}
+% \changes{v2.02}{2019/03/20}{Docs: Fix macro names.}
+% \DescribeMacro{\tdartistjustify}
+% \DescribeMacro{\tdartistcenter}
+% \DescribeMacro{\tdartistleft}
+% \DescribeMacro{\tdartistright}
 % \DescribeMacro{\tdartisttextjustify}
 % \DescribeMacro{\tdartisttextcenter}
 % \DescribeMacro{\tdartisttextleft}
 % \DescribeMacro{\tdartisttextright}
-% \DescribeMacro{\tdauthornamejustify}
-% \DescribeMacro{\tdauthornamecenter}
-% \DescribeMacro{\tdauthornameleft}
-% \DescribeMacro{\tdauthornameright}
+% \DescribeMacro{\tdauthorjustify}
+% \DescribeMacro{\tdauthorcenter}
+% \DescribeMacro{\tdauthorleft}
+% \DescribeMacro{\tdauthorright}
 % \DescribeMacro{\tdauthortextjustify}
 % \DescribeMacro{\tdauthortextcenter}
 % \DescribeMacro{\tdauthortextleft}
@@ -763,7 +766,7 @@ Keywords={LaTeX, tocdata, contents}%
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\@dottedtocline.\MessageBreak
-            Authors will not appear in TOC, LOF}
+            Authors may not appear in TOC, LOF}
     }%
 %    \end{macrocode}
 % \end{macro}
@@ -777,7 +780,7 @@ Keywords={LaTeX, tocdata, contents}%
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\l@part.\MessageBreak
-            Authors will not appear in TOC parts}
+            Authors may not appear in TOC parts}
     }%
 %    \end{macrocode}
 % \end{macro}
@@ -794,7 +797,7 @@ Keywords={LaTeX, tocdata, contents}%
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\l@chapter.\MessageBreak
-            Authors will not appear in TOC chapters}
+            Authors may not appear in TOC chapters}
     }%
 }
 %    \end{macrocode}
@@ -810,7 +813,7 @@ Keywords={LaTeX, tocdata, contents}%
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\l@section.\MessageBreak
-            Authors will not appear in TOC sections}
+            Authors may not appear in TOC sections}
     }%
 %    \end{macrocode}
 % \end{macro}
@@ -976,11 +979,13 @@ Keywords={LaTeX, tocdata, contents}%
 %
 % User-redefinable macro to print the author's name underneath the part title.
 %
+% Make these macros robust.\watchout
+%
 % \changes{v0.12}{2016/11/29}{Improved spacing.}
 % \changes{v2.00}{2019/03/15}{Added.}
 %
 %    \begin{macrocode}
-\newcommand{\tocdatapartprint}[4]
+\newrobustcmd{\tocdatapartprint}[4]
 {%
     \par\unskip\noindent%
     {%
@@ -1060,10 +1065,11 @@ Keywords={LaTeX, tocdata, contents}%
 % \changes{v0.12}{2016/11/29}{Improved spacing.}
 % \changes{v0.12}{2016/11/30}{Added name alignment.}
 % \changes{v2.00}{2019/03/14}{Added.}
+% \changes{v2.02}{2019/03/20}{Improved spacing.}
 %
 %    \begin{macrocode}
 \newcommand{\tocdataartistprint}{%
-    \par\addvspace{\medskipamount}%
+    \par\smallskip%
     \TD@artistauthorprint{artist}%
 }
 %    \end{macrocode}
@@ -1079,10 +1085,11 @@ Keywords={LaTeX, tocdata, contents}%
 % User-redefinable macro to print the author's name underneath the figure.
 %
 % \changes{v2.00}{2019/03/14}{Added.}
+% \changes{v2.02}{2019/03/20}{Improved spacing.}
 %
 %    \begin{macrocode}
 \newcommand{\tocdataauthorprint}{%
-    \par\unskip
+    \par\smallskip%
     \TD@artistauthorprint{author}%
 }
 %    \end{macrocode}
@@ -1146,6 +1153,7 @@ Keywords={LaTeX, tocdata, contents}%
 % \changes{v0.12}{2016/11/28}{Expands first name before index check.}
 % \changes{v2.00}{2019/03/15}{Improved page breaks.}
 % \changes{v2.00}{2019/03/15}{Factored.}
+% \changes{v2.02}{2019/03/21}{Fix for sectioning name formatting.}
 %    \begin{macrocode}
 \NewDocumentCommand{\TD@sectionauthor}{m s o m O{} m m O{}}{%
 %    \end{macrocode}
@@ -1154,7 +1162,7 @@ Keywords={LaTeX, tocdata, contents}%
 %    \begin{macrocode}
     \IfBooleanTF{#2}%
     {% star:
-        \csuse{#1}*{#4\nopagebreak\tocdatasectionprint{#5}{#6}{#7}{#8}}%
+        \csuse{#1}*{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}%
     }%
 %    \end{macrocode}
 % The un-starred version appears in the \acro{TOC}, so add the author's name:
@@ -1165,8 +1173,8 @@ Keywords={LaTeX, tocdata, contents}%
 % Create the section depending on the optional name:
 %    \begin{macrocode}
         \IfValueTF{#3}%
-            {\csuse{#1}[#3]{#4\nopagebreak\tocdatasectionprint{#5}{#6}{#7}{#8}}}%
-            {\csuse{#1}[#4]{#4\nopagebreak\tocdatasectionprint{#5}{#6}{#7}{#8}}}%
+            {\csuse{#1}[#3]{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}}%
+            {\csuse{#1}[#4]{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}}%
     }% no star
 %    \end{macrocode}
 % Create an index entry depending on whether there is a first name:
diff --git a/Master/texmf-dist/tex/latex/tocdata/tocdata.sty b/Master/texmf-dist/tex/latex/tocdata/tocdata.sty
index 6c74de24c37..13314164446 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/03/15 v2.01 Adds author/artist to TOC entries.]
+    [2019/03/21 v2.02 Adds author/artist to TOC entries.]
 
 
 \RequirePackage{xparse}
@@ -79,7 +79,7 @@
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\@dottedtocline.\MessageBreak
-            Authors will not appear in TOC, LOF}
+            Authors may not appear in TOC, LOF}
     }%
 
 \xpatchcmd{\l@part}
@@ -89,7 +89,7 @@
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\l@part.\MessageBreak
-            Authors will not appear in TOC parts}
+            Authors may not appear in TOC parts}
     }%
 
 \@ifundefined{chapter}
@@ -102,7 +102,7 @@
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\l@chapter.\MessageBreak
-            Authors will not appear in TOC chapters}
+            Authors may not appear in TOC chapters}
     }%
 }
 
@@ -113,7 +113,7 @@
     {%
         \PackageWarningNoLine{tocdata}{%
             Could not patch LaTeX core \protect\l@section.\MessageBreak
-            Authors will not appear in TOC sections}
+            Authors may not appear in TOC sections}
     }%
 
 \AtBeginDocument{
@@ -172,7 +172,7 @@
     {}%
     {#1~}%
 }
-\newcommand{\tocdatapartprint}[4]
+\newrobustcmd{\tocdatapartprint}[4]
 {%
     \par\unskip\noindent%
     {%
@@ -200,11 +200,11 @@
     \addvspace{2ex}%
 }
 \newcommand{\tocdataartistprint}{%
-    \par\addvspace{\medskipamount}%
+    \par\smallskip%
     \TD@artistauthorprint{artist}%
 }
 \newcommand{\tocdataauthorprint}{%
-    \par\unskip
+    \par\smallskip%
     \TD@artistauthorprint{author}%
 }
 \newcommand{\TD@artistauthortextprint}[2]{%
@@ -224,13 +224,13 @@
 \NewDocumentCommand{\TD@sectionauthor}{m s o m O{} m m O{}}{%
     \IfBooleanTF{#2}%
     {% star:
-        \csuse{#1}*{#4\nopagebreak\tocdatasectionprint{#5}{#6}{#7}{#8}}%
+        \csuse{#1}*{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}%
     }%
     {% no star:
         \tocdata{toc}{#6 #7}%
         \IfValueTF{#3}%
-            {\csuse{#1}[#3]{#4\nopagebreak\tocdatasectionprint{#5}{#6}{#7}{#8}}}%
-            {\csuse{#1}[#4]{#4\nopagebreak\tocdatasectionprint{#5}{#6}{#7}{#8}}}%
+            {\csuse{#1}[#3]{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}}%
+            {\csuse{#1}[#4]{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}}%
     }% no star
     \ifblank{#6}%
         {\index{#7}}%