nameauth 1.24 (21apr12)

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

5 files changed, 16 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/nameauth/README b/Master/texmf-dist/doc/latex/nameauth/README
index 687f0991654..ab099e286b9 100644
--- a/Master/texmf-dist/doc/latex/nameauth/README
+++ b/Master/texmf-dist/doc/latex/nameauth/README
@@ -1,7 +1,7 @@
 The nameauth package
 Charles P. Schaum
 charles dot schaum at att dot net
-v1.22 from 2012/04/20
+v1.24 from 2012/04/21
 
 Abstract
 
diff --git a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
index f203cd72c18..847263c1b86 100644
--- a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
+++ b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
diff --git a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
index 81712f58a8b..15389b0f4e8 100644
--- a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
+++ b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
@@ -26,7 +26,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{nameauth}
 %<*package>
-    [2012/04/20 v1.22 name authority macros to aid consistent display and indexing of names]
+    [2012/04/21 v1.24 name authority macros to aid consistent display and indexing of names]
 %</package>
 %
 %<*driver>
@@ -58,7 +58,7 @@
 \usepackage{makeidx}
 \usepackage{multicol}
 \usepackage[toc]{multitoc}
-\usepackage{nameauth}[2012/04/20]
+\usepackage{nameauth}[2012/03/25]
 \usepackage{hypdoc}
 \makeindex
 \frenchspacing
@@ -73,7 +73,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{986}
+% \CheckSum{983}
 %
 % \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
@@ -105,7 +105,8 @@
 % \changes{v1.0}{2012/02/20}{Works fully with \textsf{microtype} and \textsf{memoir}}
 % \changes{v1.1}{2012/03/08}{Fixed errors when emitting warnings}
 % \changes{v1.2}{2012/03/25}{Added tagging features; extensively edited documentation}
-% \changes{v1.22}{2012/04/20}{Also capitalize particles on first use}
+% \changes{v1.22}{2012/04/20}{Attempted first-use particle caps}
+% \changes{v1.24}{2012/04/21}{Reverted functionality and suggested workaround}
 %
 % \DoNotIndex{\@empty, \@gobble, \@period, \@token, \if@nameauth@DoComma, \if@nameauth@DoFormat, \if@nameauth@Punct, \if@nameauth@DoIndex, \if@nameauth@Comma, \if@nameauth@DoCaps, \protected@edef, \zap@space, \bfseries, \bgroup, \csgdef, \csundef,  \DeclareDocumentCommand, \DeclareOption, \def, \detokenize, \edef, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \expandafter, \fi, \Forenames, \futurelet \if, \IfBooleanTF, \ifcsname,\IfValueTF,  \ifx, \index, \itshape, \let, \newcommand, \newenvironment, \newif, \PackageWarning, \ProcessOptions, \relax, \renewcommand, \RequirePackage, \scshape, \space, \Shortnames, \Surnames, \Surnamesi, \Surnamesii, \Test, \TestDot, \TestEnd, \TestPunct, \TestStop, \uppercase}
 %
@@ -409,7 +410,7 @@
 % \subsubsection{Naming Conventions}
 %
 % \DescribeMacro{\CapThis}
-% English names with the particles \emph{de}, \emph{de\ la}, \emph{d'}, \emph{von}, \emph{van}, and \emph{ten} generally keep them with the last name, using varied capitalization. \emph{Le}, \emph{La}, and \emph{L'} are capitalized unless preceded by \emph{de}. In English, these particles go in the \meta{SNN} field of \cmd{\Name}, e.g., \ForgetName[Walter]{de la Mare}\Name[Walter]{de la Mare}. To capitalize the first particle in a subsequent \cmd{\Name} reference at the beginning of a sentence, use |\CapThis\Name[Walter]{de la Mare}|. \CapThis\Name[Walter]{de la Mare} will think it fair.
+% English names with the particles \emph{de}, \emph{de\ la}, \emph{d'}, \emph{von}, \emph{van}, and \emph{ten} generally keep them with the last name, using varied capitalization. \emph{Le}, \emph{La}, and \emph{L'} are capitalized unless preceded by \emph{de}. In English, these particles go in the \meta{SNN} field of \cmd{\Name}, e.g., \ForgetName[Walter]{de la Mare}\Name[Walter]{de la Mare}. To capitalize the first particle in a subsequent \cmd{\Name} reference at the beginning of a sentence, use |\CapThis\Name[Walter]{de la Mare}|. \CapThis\Name[Walter]{de la Mare} will think it fair. \textsc{Du Cange}\IndexName{du Cange}\SubvertName{du Cange} (\AKA{du Cange}[Charles]{du Fresne}) might disagree. For the present, at the start of a sentence, use |\textsc{Du Cange}\IndexName{du Cange}\SubvertName{du Cange}|.
 %
 % Names foreign to English usually put these particles in the \meta{FNN} field of \cmd{\Name}. Yet these particles are not first names. Using \cmd{\FName} with alternate forenames avoids the particles. See the examples on page \pageref{FirstVonLast}.
 
@@ -478,8 +479,8 @@
 % Ś Ş ş Š š Ţ ţ Ť ť & Ů ů Ű ű & Ź ź Ż ż Ž ž &  second use \\
 % \end{tabular}
 % \end{quote}
-% 
-% \noindent One may add control sequences to names, thanks to the help of \Name*[Robert]{Schlicht}. The next example adds more accented characters under \textsf{inputenc}/\textsf{fontenc}:
+% \clearpage
+% One may add control sequences to names, thanks to the help of \Name*[Robert]{Schlicht}. The next example adds more accented characters under \textsf{inputenc}/\textsf{fontenc}:
 %  \begin{quote}\small
 % |\usepackage{newunicodechar}|\\
 % |\DeclareTextSymbolDefault{\textlongs}{TS1}|\\
@@ -513,9 +514,9 @@
 % \hbox{\quad}|\fi|\\
 % |\fi|
 % \end{tabular}\\
-% \medskip
+% \clearpage
 %
-% \noindent I used the following in the text itself to allow for conditional processing that helps one document work under multiple engines:\\
+% I used the following in the text itself to allow for conditional processing that helps one document work under multiple engines:\\
 %
 % \begin{tabular}{l}
 % |\ifxetex |\meta{xelatex text}|%|\\
@@ -839,7 +840,8 @@
 % \item Using \cmd{\TagName} to tag a cross-reference.
 % \item Using \cmd{\ExcludeName} to exclude a name that has already been used.
 % \end{enumerate}
-% 
+% \clearpage
+%
 % \StopEventually{\PrintChanges\clearpage\PrintIndex}
 %
 % \section{Implementation}
@@ -1076,14 +1078,12 @@
 % \changes{v0.95}{2012/02/17}{Fixed incompatibility with \textsf{microtype}}
 % \changes{v0.96}{2012/02/19}{Fixed occasional incompatibility with \textsf{memoir}.}
 % \changes{v1.0}{2012/02/20}{Fixed compatibility issues.}
-% \changes{v1.22}{2012/04/20}{Capitalize particles on first use.}
 %    \begin{macrocode}
 \DeclareDocumentCommand\Name{s o m o}%
 {%
   \protected@edef\Surnames{#3}%
   \if@nameauth@DoCaps%
     \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
-    \protected@edef\Surnames{\@nameauth@CapRoot{#3,}}%
   \else%
     \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
   \fi%
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 8d0cf9963df..ce7022ec3f0 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{nameauth}
-    [2012/04/20 v1.22 name authority macros to aid consistent display and indexing of names]
+    [2012/04/21 v1.24 name authority macros to aid consistent display and indexing of names]
 
 \newif\if@nameauth@DoFormat
 \newif\if@nameauth@DoIndex
@@ -112,7 +112,6 @@
   \protected@edef\Surnames{#3}%
   \if@nameauth@DoCaps%
     \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
-    \protected@edef\Surnames{\@nameauth@CapRoot{#3,}}%
   \else%
     \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
   \fi%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8c1dc5ed0c6..5059ad503a1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -176,6 +176,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'cachepic',	"&MAKEcopy",
  'calxxxx',	"die 'skipping, nomodify license'",
  'calendar',	"die 'skipping, nosell license'",
+ 'calendar_barr',	"die 'skipping, ca.2001, noinfo license'",
  'cantarell',	"&MAKEcopy",
  'cascover',	"die 'skipping, license unclear, ancient'",
  'camel',	"die 'skipping, nosell license'",
@@ -274,6 +275,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'ctantools',	"die 'skipping, not sure we should usurp the cmd name ctan'",
  'ctib',	"&MAKEflatten",
  'cursor',	"die 'skipping, no known license, very old and small'",
+ 'cvsty',	"die 'skipping, ca.2004, noinfo license'",
  'cweb',	"die 'skipping, programs'",
  'cwpuzzle',	"die 'skipping, in crossword package'",
  'cyklop',      "&MAKEcopy",