nameauth 0.86 (6feb12)

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

4 files changed, 470 insertions, 272 deletions

diff --git a/Master/texmf-dist/doc/latex/nameauth/README b/Master/texmf-dist/doc/latex/nameauth/README
index 59e40f738a2..f69a6b3a77d 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
-v0.75 from 2012/01/19
+v0.86 from 2012/02/06
 
 Abstract
 
diff --git a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
index 55d472a3c78..42c52f58640 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 4ab17d642f6..07caea8592a 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/01/29 v0.8 name authority macros to aid consistent display and indexing of names]
+    [2012/02/06 v0.86 name authority macros to aid consistent display and indexing of names]
 %</package>
 %
 %<*driver>
@@ -37,7 +37,7 @@
 \usepackage{lmodern}
 \usepackage{makeidx}
 \usepackage{newunicodechar}
-\usepackage{nameauth}[2012/01/29]
+\usepackage{nameauth}[2012/02/06]
 \begingroup\lccode`!=`\\\lowercase{\endgroup\def\bsc{!}}
 \makeindex
 \frenchspacing
@@ -57,7 +57,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{318}
+% \CheckSum{520}
 %
 % \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
@@ -79,15 +79,16 @@
 % \changes{v0.7}{2011/12/26}{Initial version}
 % \changes{v0.75}{2012/01/19}{New features described; documentation clarified}
 % \changes{v0.8}{2012/01/29}{Refactoring to improve functionality and compatibility; documentation expanded}
+% \changes{v0.85}{2012/02/05}{Added comma suppression and additional functionality; revised documentation}
+% \changes{v0.86}{2012/02/06}{Fixed some regressions}
 %
-% \DoNotIndex{\newcommand, \newenvironment, \@empty, \@gobble, \bfseries, \bgroup, \def, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \fi, \if, \ifx, \IfBooleanTF, \IfValueTF, \itshape, \let, \newif, \relax, \renewcommand, \RequirePackage, \scshape, \space, \DeclareDocumentCommand, \DeclareOption, \ProcessOptions}
+% \DoNotIndex{\newcommand, \newenvironment, \@empty, \@gobble, \bfseries, \bgroup, \def, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \fi, \if, \ifx, \IfBooleanTF, \IfValueTF, \itshape, \let, \newif, \relax, \renewcommand, \RequirePackage, \scshape, \space, \DeclareDocumentCommand, \DeclareOption, \ProcessOptions, \@ifclassloaded, \@token,  \@period, \csgdef, \csundef, \detokenize, \expandafter, \Forenames, \futurelet, \if@nameauth@DoComma, \if@nameauth@DoFormat, \if@nameauth@dtx, \if@nameauth@Punct, \ifcsname, \index, \PackageWarning, \Surnames, \Surnamesi, \Surnamesii, \TestDot, \TestEnd, \TestPunct, \TestStop, \zap@space, \edef}
 %
 % \providecommand*{\url}{\texttt}
 % \GetFileInfo{nameauth.dtx}
 % \title{The \textsf{nameauth} package}
 % \author{Charles P. Schaum \\ \texttt{charles dot schaum at att dot net}}
 % \date{\fileversion~from \filedate}
-%
 % \maketitle
 %
 % \begin{abstract}
@@ -110,92 +111,96 @@
 %
 % \subsection{Package Options}
 % If the default behavior is not desired, the following options easily alter it. They are, as follows:
+% \changes{v0.85}{2012/02/05}{Added new class options}
 %
 % \begin{quote}
 % \begin{tabular}{lp{3in}}
 % \texttt{mainmatter} & The default behavior triggers special typesetting of the first occurrence of a name, starting at the beginning of a document.\\[1ex]
-% \texttt{frontmatter} & This option suppresses the special typesetting of the first occurrence of a name before the invocation of \texttt{\bsc NamesActive}. This option fits well with front matter from a contributor who may not intend the same formatting and emphasis found in the main matter. The indexing and aliasing features of the package remain operative. \emph{Note}: One can switch at will between formatted and non-formatted sections; see Section \ref{sec:SectionFormat}.\\[2ex]
+% \texttt{frontmatter} & This option suppresses the special typesetting of the first occurrence of a name before the invocation of \cmd{\NamesActive}. This option fits well with front matter from a contributor who may not intend the same formatting and emphasis found in the main matter. The indexing and aliasing features of the package remain operative. \emph{Note}: One can switch at will between formatted and non-formatted sections; see Section \ref{sec:SectionFormat}.\\[2ex]
 % \texttt{smallcaps} & The default behavior when a name is first encountered is to print it in small caps.\\[1ex]
 % \texttt{italic} & This option causes the first occurrence of the name to be italicized.\\[1ex]
 % \texttt{boldface} & This option causes the first occurrence of the name to be set in boldface.\\[1ex]
-% \texttt{noformat} & This option suppresses document formatting after the invocation of \texttt{\bsc NamesActive}. If an author wants the indexing and aliasing functions without any special typesetting, this option accomplishes that easily. \emph{Note}: One can override the name typesetting options manually; see Section \ref{sec:FontAttributes}. This option is \emph{not} equivalent to \texttt{frontmatter}. The latter functions independently and never produces any formatting. This approach allows one to toggle formatting on and off without retyping the document. It anticipates variation among publishers' house styles.
+% \texttt{noformat} & This option suppresses document formatting after the invocation of \cmd{\NamesActive}. If an author wants the indexing and aliasing functions without any special typesetting, this option accomplishes that easily. \emph{Note}: One can override the name typesetting options manually; see Subsection \ref{sec:FontAttributes}. This option is \emph{not} equivalent to \texttt{frontmatter}. The latter functions independently and never produces any formatting. This approach allows one to toggle formatting on and off without retyping the document. With \cmd{\NamesFormat} It anticipates variation among publishers' house styles.\\[1ex]
+% \texttt{nocomma} & The default behavior suppresses printing of commas between surnames and suffixes, following modern styles like \emph{Chicago Manual of Style}. See Subsection \ref{sec:suffix} for implications of this behavior.\\[1ex]
+% \texttt{comma} &Print commas between surnames and suffixes, following older styles. See Subsection \ref{sec:suffix}.\\[1ex]
 % \end{tabular}
 % \end{quote}
 % \clearpage
 %
 % \subsection{Quick Start Guide}
 % \changes{v0.8}{2012/01/29}{Added quick start guide for the impatient}
+% \changes{v0.85}{2012/02/05}{Updated quick start guide}
 %
 % This page and the next comprise a ``cheat sheet'' for the impatient. None of the examples in this subsection generate index entries. These examples simply help you get used to the package:
 %
 % \begin{enumerate}\setlength\itemsep{0pt}\small
 % \item The indexed forms of the names always remain the same.
-% \item Always use the same form of reference for, e.g., \texttt{\bsc Name[John]\{Smith\}} or\newline \texttt{\bsc Name\{Louis\}[XIV]}, otherwise point 1 will become false.
-% \item Typing longer name references allows you to rearrange text and let \LaTeX{} figure out first references and name forms. This package trades some work for consistency.
-% \item Checking against the index will help you debug your \texttt{\bsc Name} references, \emph{inter alia}.
+% \item Always use the same form of reference, e.g., |\Name[John]{Smith}| or\newline |\Name{Louis}[XIV]|, otherwise point 1 will become false.
+% \item Trade work for consistency. For example, |\Name[J.Q.]{Public}[Jane Q.]| can be moved around  anywhere when you rearrange text and the first reference will always be the longer, optional form. |\Name[J.Q.]{Public}| might not do that.
+% \item Checking against the index will help you debug your \cmd{\Name} references, \emph{inter alia}.
 % \item Start using the macros you \emph{need}, then work from there.
 % \end{enumerate}
 %
 % \bgroup\small
 % \begin{tabular}{p{1.8in}p{2.3in}}
 % \normalsize\strut\textbf{I want to\dots} & \normalsize\textbf{I need to use} (for example)\dots \\\hline
-% Print a full Western name (first reference) & \texttt{\bsc Name*[John]\{Smith\}} or\newline \texttt{\bsc Name[John]\{Smith\}}\\\hline
-% Print a full Western name (subsequent reference) & \texttt{\bsc Name*[John]\{Smith\}}\\\hline
-% Print a short Western name (subsequent reference) & \texttt{\bsc Name[John]\{Smith\}}\\\hline
-% Print a Western name that has a longer form in the text than in the index (first reference) & \texttt{\bsc Name*[J.Q.]\{Public\}[Jane Q.]} or\newline  \texttt{\bsc Name[J.Q.]\{Public\}[Jane Q.]}\\\hline
-% Now the full name without the longer form & \texttt{\bsc Name*[J.Q.]\{Public\}}\\\hline
-% Same person, last name only (subsequent reference) & \dag\texttt{\bsc Name[J.Q.]\{Public\}} or\newline  \texttt{\bsc Name[J.Q.]\{Public\}[Jane Q.]}\\\hline
-% Print an ancient name & \texttt{\bsc Name\{Plato\}} or \texttt{\bsc Name*\{Plato\}}\\\hline
-% Print a full Eastern name (first reference) & \texttt{\bsc Name*\{Mao\}[Tse-tung]} or\newline \texttt{\bsc Name\{Mao\}[Tse-tung]}\\\hline
-% Print a full Eastern name (subsequent reference) & \texttt{\bsc Name*\{Mao\}[Tse-tung]}\\\hline
-% Print a short Eastern name (subsequent reference) & \texttt{\bsc Name\{Mao\}[Tse-tung]}\\\hline
-% Print a full enumerated name (first reference) & \texttt{\bsc Name*\{Louis\}[XIV]} or\newline \texttt{\bsc Name\{Louis\}[XIV]}\\\hline
-% Shorter subsequent reference & \texttt{\bsc Name\{Louis\}[XIV]}\\\hline
-% Print an ancient name and sobriquet & \texttt{\bsc Name*\{Antiochus V\}[Eupator]} or\newline \texttt{\bsc Name\{Antiochus V\}[Eupator]}\\\hline
-% Shorter subsequent reference to ``Antiochus V''; for name only, \emph{consistently} use ``V Eupator'' & \texttt{\bsc Name\{Antiochus V\}[Eupator]}\\\hline
+% Print a full Western name (first reference) & |\Name*[John]{Smith}| or\newline |\Name[John]{Smith}|\\\hline
+% Full Western name & |\Name*[John]{Smith}|\\\hline
+% Short Western name (subsequent reference) & |\Name[John]{Smith}|\\\hline
+% Print a Western name that has a longer form in the text than in the index (first reference) & |\Name*[J.Q.]{Public}[Jane Q.]| or\newline  |\Name[J.Q.]{Public}[Jane Q.]|\\\hline
+% Full name without longer form & |\Name*[J.Q.]{Public}|\\\hline
+% Same person, last name only (subsequent reference) & |\Name[J.Q.]{Public}[Jane Q.]| or\newline \dag|\Name[J.Q.]{Public}|\\\hline
+% Print an ancient name & |\Name{Plato}| or |\Name*{Plato}|\\\hline
+% Print a full Eastern name (first reference) & |\Name*{Mao}[Tse-tung]| or\newline |\Name{Mao}[Tse-tung]|\\\hline
+% Full Eastern name & |\Name*{Mao}[Tse-tung]|\\\hline
+% Short Eastern name (subsequent reference) & |\Name{Mao}[Tse-tung]|\\\hline
+% Print a full ``royal'' name (first reference) & |\Name*{Louis}[XIV]| or\newline |\Name{Louis}[XIV]|\\\hline
+% Full ``royal'' name & |\Name*{Louis}[XIV]|\\\hline
+% Shorter subsequent reference & |\Name{Louis}[XIV]|\\\hline
+% Ancient name and sobriquet & |\Name*{Antiochus V}[Eupator]| or\newline |\Name{Antiochus V}[Eupator]|\\\hline
+% Shorter subsequent reference & |\Name{Antiochus V}[Eupator]|\\\hline
 % \end{tabular}
 %
-% \smallskip\dag{} Using this form can cause unwanted results if you rearrange text.
+% \smallskip\dag{} This form is OK, but can cause unwanted results if you rearrange text.\medskip
 % \egroup
+%
+% \noindent I strongly suggest Subsection \ref{sec:suffix}  for more on the interaction between suffixes and sobriquets. Especially these features create useful, yet ambiguous forms that may be hard to debug. Also, mind leading spaces in the macro arguments.
 % \clearpage
 %
 % \bgroup\small
 % \begin{tabular}{p{1.6in}p{2.5in}}
 % \normalsize\strut\textbf{I want to\dots} & \normalsize\textbf{I need to use} (for example)\dots \\\hline
-% Index, but do not print a reference to ``Public, J.Q.'' & \texttt{\bsc IndexName[J.Q.]\{Public\}} or\newline \ddag\texttt{\bsc IndexName[J.Q.]\{Public\}[Jane Q.]}\\\hline
-% Index, but do not print a reference to ``Plato'' & \texttt{\bsc IndexName\{Plato\}}\\\hline
-% Index, but do not print a reference to ``Mao Tse-tung'' & \P\texttt{\bsc IndexName\{Mao\}[Tse-tung]}\\\hline
-% Index, but do not print a reference to ``Louis XIV'' & \P\texttt{\bsc IndexName\{Louis\}[XIV]}\\\hline
-% Index, but do not print a reference to ``Antiochus V Eupator'' & \P\texttt{\bsc IndexName\{Antiochus V\}[Eupator]}\\\hline
+% Only index, not print a reference to ``Public, J.Q.'' & |\IndexName[J.Q.]{Public}| or\newline \dag|\IndexName[J.Q.]{Public}[Jane Q.]|\\\hline
+% Only index, not print a reference to ``Plato'' & |\IndexName{Plato}|\\\hline
+% Only index, not print a reference to ``Mao Tse-tung'' & \ddag|\IndexName{Mao}[Tse-tung]|\\\hline
+% Only index, not print a reference to ``Louis XIV'' & \ddag|\IndexName{Louis}[XIV]|\\\hline
+% Only index, a reference to ``Antiochus V Eupator'' & \ddag|\IndexName{Antiochus V}[Eupator]|\\\hline
 % \end{tabular}
 %
-% \smallskip\ddag{} The alternate names are ignored in this case.\\
-% \indent\P{} ``Unofficial'' variants are neither shown nor encouraged.
+% \smallskip\dag{} The alternate names are ignored in this case.\\
+% \indent\ddag{} Ambiguous variants are not shown. \emph{Caveat auctor}.
 % \egroup
 %
 %\bigskip
 % \bgroup\small
 % \begin{tabular}{p{1.5in}p{2.6in}}
 % \normalsize\strut\textbf{I want to\dots} & \normalsize\textbf{I need to use} (for example)\dots \\\hline
-% Print a full Western name followed by a lesser-known name in parentheses (first reference) & \texttt{\bsc PName*[Bob]\{Hope\}[Leslie Townes]\{Hope\}} or\newline \texttt{\bsc PName[Bob]\{Hope\}[Leslie Townes]\{Hope\}}\\\hline
-% Print a full Western name followed by a lesser-known name in parentheses (subsequent reference) & \texttt{\bsc PName*[Bob]\{Hope\}[Leslie Townes]\{Hope\}}\\\hline
-% Print a surname only, followed by a full lesser-known name in parentheses (subsequent reference) & \texttt{\bsc PName[Bob]\{Hope\}[Leslie Townes]\{Hope\}}\\\hline
-% Print a mononym followed by a lesser-known name in parentheses & \texttt{\bsc PName*\{Prince\}[Prince Rogers]\{Nelson\}} or\newline \texttt{\bsc PName\{Prince\}[Prince Rogers]\{Nelson\}}\\\hline
-% Print a name, then another name that only cross-references it in the index & a tribute to \texttt{\bsc Name\{Ari Up\}, born \newline \bsc AKA\{Ari Up\}[Arianne]\{Forster\}\dots}\\\hline
+% Print a full Western name followed by a lesser-known name in parentheses (first reference) & |\PName*[Bob]{Hope}[Leslie Townes]{Hope}|\newline |\PName[Bob]{Hope}[Leslie Townes]{Hope}|\\\hline
+% Full name, lesser-known name in parentheses & |\PName*[Bob]{Hope}[Leslie Townes]{Hope}|\\\hline
+% Surname only, followed by a full lesser-known name (subsequent reference) & |\PName[Bob]{Hope}[Leslie Townes]{Hope}|\\\hline
+% Mononym followed by a lesser-known name & |\PName*{Prince}[Prince Rogers]{Nelson}|\newline |\PName{Prince}[Prince Rogers]{Nelson}|\\\hline
+% Flexibly associate a name with a lesser-known name & \dots a tribute to |\Name{Ari Up}|, born \newline |\AKA{Ari Up}[Arianne]{Forster}|\dots One would not index \emph{Ari Up} as ``Up, Ari''.\\\hline
 % \end{tabular}
 % \egroup
 %
 % \bigskip
-% These (and possibly other combinations) will likely fail:
+% \noindent Avoiding the following pitfalls will save time and frustration:
 % \begin{enumerate}\setlength\itemsep{0pt}\small
-% \item \texttt{\bsc Name[First]\{Ancient\}[Sobriquet]} and \texttt{\bsc Name[King]\{Number\}[Sobriquet]}
-% \item \texttt{\bsc Name\{Ancient\}[Sobriquet] \bsc AKA\{Ancient Sobriquet\}[OtherFirst]\{OtherLast\}}
-% \item \texttt{\bsc Name\{Queen\}[Number] \bsc AKA\{Queen Number\}[OtherFirst]\{OtherLast\}}
-% \item \texttt{\bsc Name\{EastFamily\}[EastFirst] \bsc AKA\{EastFamily EastFirst\}[OtherFirst]\{OtherLast\}}
-% \item E.g. \texttt{\bsc Name[]\{Kreskin\}[The Amazing] (\bsc AKA\{Kreskin\}[Joseph]\{Kresge\})}
-% \item Using \texttt{\bsc PName} in the same way as \texttt{\bsc AKA} above.
-% \item Using \texttt{\bsc Name} with a lot of people having the same surname or mononym and different numbers without disambiguation in the text.
-% \item Getting the pairing of \texttt{\{} and \texttt{\}} or \texttt{[} and \texttt{]} messed up.
+% \item Mixing sobriquets with modern forms fails due to the ``longer name'' feature, e.g., |\Name[First]{Ancient}[Sobriquet]| and |\Name[King]{Number}[Sobriquet]|.
+% \item Using \cmd{\AKA} and \cmd{\PName} with ``ancient,'' ``royal,'' and ``Eastern'' forms will fail, but see Subsection \ref{sec:suffix} for a workaround:\newline |\Name{Ancient}[Sobriquet] \AKA{Ancient Sobriquet}[First]{Last}|\newline |\Name{Queen}[Number] \AKA{Queen Number}[First]{Last}|\newline |\Name{EastFamily}[EastFirst] \AKA{EastFamily EastFirst}[First]{Last}|
+% \item Using a forename or first initials can prevent failure in some cases:\newline OK: |\Name[J.]{Kreskin}[The Amazing] (\AKA[J.]{Kreskin}[Joseph]{Kresge})|\newline FAIL: |\Name[]{Kreskin}[The Amazing] (\AKA{Kreskin}[Joseph]{Kresge})|\newline FAIL: |\Name{Kreskin}[The Amazing] (\AKA{Kreskin}[Joseph]{Kresge})|
+% \item Keep track of how name references are disambiguated in the text. Since one must put the full indexed name in a \cmd{\Name} reference it is easy to forget that the reference will be shortened if it is subsequent. \cmd{\Name*} comes to the rescue here.
+% \item Mistyping the pairs of \texttt{\{} braces \texttt{\}} and \texttt{[} brackets \texttt{]} creates contextually-dependent errors that can be difficult to track. Leading spaces may be hard to spot in the text, but will be apparent in the index with incorrectly sorted names.
 % \end{enumerate}
 %
 % \subsection{Basic Macros}
@@ -204,14 +209,14 @@
 % 
 % \DescribeMacro{\Name}
 % \DescribeMacro{\Name*}
-% This macro generates two forms of the name: a printed form in the text and a form of the name that occurs in the index.\index{name forms|usage}
+% This macro generates two forms of the name: a printed form in the text and a form of the name that occurs in the index.
 % The general syntax is:
 % \begin{quote}
-% \texttt{\bsc Name}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}\\
-% \texttt{\bsc Name*}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}
+% \cmd{\Name}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}\\
+% \cmd{\Name*}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}
 % \end{quote}
 %
-% From now on we will abbreviate \emph{forename(s)} with \emph{FNN} and \emph{surname(s)} with \emph{SNN} at various points. The syntax descriptions above do not capture exactly how the \texttt{\bsc Name} macro behaves. The following table should help:
+% \noindent From now on we will abbreviate \emph{forename(s)} with \emph{FNN} and \emph{surname(s)} with \emph{SNN} at various points. The syntax descriptions above do not capture exactly how the \cmd{\Name} macro behaves. The following table should help:
 %
 % \begin{quote}\small
 % \begin{tabular}{llll}\hline
@@ -223,56 +228,39 @@
 % \end{tabular}
 % \end{quote}
 %
-% Basically,\texttt{\bsc Name} connects the \emph{FNN} to the \emph{SNN} to create both a printed form and an indexed form, respectively, \textbf{\emph{FNN}\,\emph{SNN}} and \textbf{\emph{SNN},\,\emph{FNN}}. This takes care of most modern Western names. For those with one name, such as ancient figures or those with stage names, one can drop the \emph{FNN} so that \texttt{\bsc Name} produces the result \textbf{\emph{SNN}} for both text and index.
+% \noindent Basically, \cmd{\Name} connects the \emph{FNN} to the \emph{SNN} to create both a printed form and an indexed form, usually \textbf{\emph{FNN}\,\emph{SNN}} and \textbf{\emph{SNN},\,\emph{FNN}}. This takes care of most modern Western names. For those with one name, such as ancient figures or those with stage names, one can drop the \emph{FNN} so that \cmd{\Name} produces the result \textbf{\emph{SNN}} for both text and index.
 %
-% A newer feature added to \texttt{\bsc Name} avoids a complicated workaround. Sometimes you might want to have the option of using either an alternate set of forenames or a sobriquet that functions as a surname for ancient figures. These two alternatives are handled by the final, optional field of \texttt{\bsc Name}. If ``regular'' \emph{FNN} are present, then the alternate names conditionally will replace the \emph{FNN} in the printed form, but not in the indexed form. If no regular \emph{FNN} are present, then the alternate names will be appended to the \emph{SNN} in the printed form \emph{and} in the indexed form. You must use the sobriquet form of a name consistently or risk confusion.
+% A newer feature added to \cmd{\Name} avoids a complicated workaround. Sometimes you might want to have the option of using either an alternate set of forenames or a sobriquet that functions as a surname for ancient figures. These two alternatives are handled by the final, optional field of \cmd{\Name}. If ``regular'' \emph{FNN} are present, then the alternate names conditionally will replace the \emph{FNN} in the printed form, but not in the indexed form. If no regular \emph{FNN} are present, then the alternate names will be appended to the \emph{SNN} in the printed form \emph{and} in the indexed form. You must use the sobriquet form of a name consistently or risk confusion.
 %
 % I mentioned conditional use. The unstarred form prints the ``full name'' at the first occurrence, then only the partial form thereafter. The starred form always prints the full name. Both macros usually apply a different ``font  attribute'' to the name when it first appears in the running text.
 %
 % Here are some more examples of use:
 %
 % \begin{quote}\small
-% \texttt{\bsc Name*[Johann Wolfgang von]\{Goethe\}}\\
+% |\Name*[Johann Wolfgang von]{Goethe}|\\
 % Print \Name*[Johann Wolfgang von]{Goethe} the first time it appears.\\
 % Later, print the full name \Name*[Johann Wolfgang von]{Goethe}.\\[1ex]
-% \texttt{\bsc Name[Johann Wolfgang von]\{Goethe\}}\\
+% |\Name[Johann Wolfgang von]{Goethe}|\\
 % \ForgetName[Johann Wolfgang von]{Goethe}%
 % Print \Name[Johann Wolfgang von]{Goethe} the first time it appears.\\
 % Later, print only the last name \Name[Johann Wolfgang von]{Goethe}.\\[1ex]
-% \texttt{\bsc Name\{Boethius\}} and \texttt{\bsc Name*\{Boethius\}}
+% |\Name{Boethius}| and |\Name*{Boethius}|
 % Print \Name{Boethius} the first time it appears. Later, print \Name{Boethius}.
 % \end{quote}
 %
 % \begin{quote}\small
-% \texttt{\bsc Name*\{Antiochus IV\}[Epiphanes]}\\
+% |\Name*{Antiochus IV}[Epiphanes]|\\
 % Print \Name*{Antiochus IV}[Epiphanes] the first time it appears. Later, print the name and sobriquet \Name*{Antiochus IV}[Epiphanes].\\[1ex]
 % \ForgetName{Antiochus IV}[Epiphanes]%
-% \texttt{\bsc Name\{Antiochus IV\}[Epiphanes]}\\
+% |\Name{Antiochus IV}[Epiphanes]|\\
 % Print \Name{Antiochus IV}[Epiphanes] the first time it appears. Later, print just the name \Name{Antiochus IV}[Epiphanes].
 % \end{quote}
 % 
-% \emph{Note}: Here I am playing a ``dirty trick'' by making each line begin as if the name had not yet occurred. See Section \ref{sec:Tweaks} for more.
-%
-% \subsubsection{Suffix Removal}
-% 
-% \texttt{\bsc Name} and \texttt{\bsc Name*} have an additional difference. \texttt{\bsc Name} will truncate the comma and suffizes from subsquent occurrences of last names. For example, it prints the name \Name[Oskar]{Hammerstein, II} the first time and \Name[Oskar]{Hammerstein, II} thereafter.
-% 
-% These macros keep track of whether the name ends with the period of an abbreviation like ``Jr.'' and ``Sr.'' That should also work with abbreviations like ``d.~\"{A}.'' (\textit{der \"{A}ltere}). Two periods are not printed when the full name is printed at the end of a sentence. The following example shows the possible combinations:
-% 
-% \ForgetName[Martin Luther]{King, Jr.}%
-% \begin{quote}\small
-% \begin{tabular}{ll}
-% \texttt{\bsc Name[Martin Luther]\{King, Jr.\}.} & \Name[Martin Luther]{King, Jr.}.\\
-% \texttt{\bsc Name[Martin Luther]\{King, Jr.\}.} & \Name[Martin Luther]{King, Jr.}.\\
-% \texttt{\bsc Name[Martin Luther]\{King, Jr.\}} & \Name[Martin Luther]{King, Jr.} (e.g., in a sentence)\\
-% \texttt{\bsc Name*[Martin Luther]\{King, Jr.\}.} & \Name*[Martin Luther]{King, Jr.}.\\
-% \texttt{\bsc Name*[Martin Luther]\{King, Jr.\}} & \Name*[Martin Luther]{King, Jr.}
-% \end{tabular}
-% \end{quote}
+% \noindent\emph{Note}: Here I am playing a ``dirty trick'' by making each line begin as if the name had not yet occurred. See Section \ref{sec:Tweaks} for more.
 %
 % \subsubsection{Tabular Summary of \texttt{\bsc Name}}
 %
-% We begin by recapitulating the original uses: Usual Western forenames and surnames, persons with a mononym, an abbreviated name in the index and a fuller name in the text, and a mononym plus sobriquet option:
+% Again, the common uses of \cmd{\Name} include:
 %
 % \begin{quote}\small
 % \begin{tabular}{llll}\hline
@@ -284,46 +272,67 @@
 % \end{tabular}
 % \end{quote}
 %
-% Different results can be achieved when the options are applied creatively. In some cases, the sobriquet option can serve for lists of royalty and references to them. In others, this use will fail:
+% \noindent Another option employs the sobriquet feature for royal names. The forms that work include:
 %
 % \begin{quote}\small
 % \begin{tabular}{llp{1.2cm}ll}\hline
 % \emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
-% (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & \texttt{\bsc Name\{Henry\}[VIII]}\\
-% (none) & \texttt{Henry} & \texttt{VIII} & \Name*{Henry}[VIII] & \texttt{\bsc Name*\{Henry\}[VIII]}\\
-% (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & \texttt{\bsc Name\{Henry\}[VIII]}\\
-% \texttt{Henry} & \texttt{Tudor} & \texttt{VIII} & \textsc{VIII Tudor} & \texttt{\bsc Name[Henry]\{Tudor\}[VIII]}\\\hline
+% (none) & \texttt{Henry} & \texttt{VIII} & \Name*{Henry}[VIII] & |\Name*{Henry}[VIII]|\\
+% (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & |\Name{Henry}[VIII]|\\\hline
 % \end{tabular}
 % \end{quote}
 %
-% Very rudimentary references to Eastern names (I plead ignorance on this point) can be achieved via the sobriquet feature:
+% \noindent Other options are possible and are discussed in Subsection \ref{sec:suffix}. They are ambiguous and may not work in all circumstances, but they do afford compatibility with \texttt{\bsc AKA} and \texttt{\bsc PName}.
+%
+% Rudimentary references to Eastern names (I plead ignorance on this point) can be achieved via the sobriquet feature:
 %
 % \begin{quote}\small
-% \begin{tabular}{llp{1.2cm}ll}\hline
+% \begin{tabular}{p{0.7cm}p{0.8cm}p{1.1cm}p{2.7cm}p{3.7cm}}\hline
 % \emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
-% (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & \texttt{\bsc Name\{Chiang\}[Kai-shek]}\\
-% (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & \texttt{\bsc Name\{Chiang\}[Kai-shek]}\\
-% (none) & \texttt{Sun} & \texttt{Yat-sen} & \Name{Sun}[Yat-sen] & \texttt{\bsc Name\{Sun\}[Yat-sen]}\\
-% (none) & \texttt{Sun} & \texttt{Yat-sen} & \Name{Sun}[Yat-sen] & \texttt{\bsc Name\{Sun\}[Yat-sen]}\\\hline
+% (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & |\Name{Chiang}[Kai-shek]|\\
+% (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & |\Name{Chiang}[Kai-shek]|\\\hline
+% \end{tabular}
+% \end{quote}
+%
+% \subsection{Advanced Topics}
+% 
+% \subsubsection{Suffix Removal}
+% \label{sec:suffix}
+% \changes{v0.85}{2012/02/05}{New suffix removal features}
+% 
+% \texttt{\bsc Name} and \texttt{\bsc Name*} have an additional difference. \texttt{\bsc Name} will truncate the suffixes from subsequent occurrences of last names. For example, it prints the name \Name[Oskar]{Hammerstein, II} the first time and \Name[Oskar]{Hammerstein, II} thereafter. \emph{The typed form always uses a comma}, e.g.,  \texttt{\bsc Name[Oskar]\{Hammerstein, II\}}. Moreover, the space after the comma is literal, but not manipulated by the package in case one wants to use a thin space instead. That is left to the author.
+%
+% Again, \textbf{the comma is not optional with suffixes}. It is how this feature works. More than one comma in the arguments of \cmd{\Name} and all similar user interface macros will cause unwanted results.
+%
+%  \cmd{\Name} and friends keep track of whether the name ends with the period of an abbreviation like ``Jr.'' and ``Sr.'' That should also work with abbreviations like ``d.~\"{A}.'' (\textit{der \"{A}ltere}). Two periods are not printed when the full name is printed at the end of a sentence. The following example shows the possible combinations:
+% 
+% \ForgetName[Martin Luther]{King, Jr.}%
+% \begin{quote}\small
+% \begin{tabular}{ll}
+% |\Name[Martin Luther]{King, Jr.}.| & \Name[Martin Luther]{King, Jr.}.\\
+% |\Name[Martin Luther]{King, Jr.}.| & \Name[Martin Luther]{King, Jr.}.\\
+% |\Name[Martin Luther]{King, Jr.}| & \Name[Martin Luther]{King, Jr.} (e.g., in a sentence)\\
+% |\Name*[Martin Luther]{King, Jr.}.| & \Name*[Martin Luther]{King, Jr.}.\\
+% |\Name*[Martin Luther]{King, Jr.}| & \Name*[Martin Luther]{King, Jr.}
 % \end{tabular}
 % \end{quote}
 %
-% Here is a general table of options. Sobriquets and suffixes do mix, but not well. Therefore their use together is not shown.
+% \noindent Using the default class option \texttt{nocomma}, one can take advantage of the suffix feature to tweak more options out of \cmd{\Name}. Instead of the sobriquet feature, one could use the following variants:
 %
 % \begin{quote}\small
-% \begin{tabular}{llp{1.4cm}p{4cm}}\hline
-% \emph{FNN} & \emph{SNN} & Alternate Names & Result\\\hline
-% \texttt{Forename} & \texttt{SurnameA, Suffix} & \texttt{Othername} & \Name[Forename]{SurnameA, Suffix}[Othername] (\texttt{\bsc Name})\\
-% \texttt{Forename} & \texttt{SurnameA, Suffix} & \texttt{Othername} & \Name*[Forename]{SurnameA, Suffix}[Othername] (\texttt{\bsc Name*})\\
-% \texttt{Forename} & \texttt{SurnameA, Suffix} & \texttt{Othername} & \Name[Forename]{SurnameA, Suffix}[Othername] (\texttt{\bsc Name})\\\hline
-% \texttt{Forename} & \texttt{SurnameB, Suffix} & (none) & \Name[Forename]{SurnameB, Suffix} (\texttt{\bsc Name})\\
-% \texttt{Forename} & \texttt{SurnameB, Suffix} & (none) & \Name*[Forename]{SurnameB, Suffix} (\texttt{\bsc Name*})\\
-% \texttt{Forename} & \texttt{SurnameB, Suffix} & (none) & \Name[Forename]{SurnameB, Suffix} (\texttt{\bsc Name})\\\hline
+% \begin{tabular}{llp{1.2cm}ll}\hline
+% \emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
+% (none) & \texttt{Louis, XIV} & (none) & \Name{Louis, XIV} & |\Name{Louis, XIV}|\\
+% (none) & \texttt{Louis, XIV} & (none) & \Name{Louis, XIV} & |\Name{Louis, XIV}|\\
+% (none) & \texttt{Sun, Yat-sen} & (none) & \Name{Sun, Yat-sen} & |\Name{Sun, Yat-sen}|\\
+% (none) & \texttt{Sun, Yat-sen} & (none) & \Name{Sun, Yat-sen} & |\Name{Sun, Yat-sen}|\\\hline
 % \end{tabular}
 % \end{quote}
 %
-% \subsection{Advanced Features}
-% 
+% \noindent The benefit to using this form is that one can type |\Name*{Louis, XIV}, the| |``\AKA{Louis, XIV}{Sun King}''| and get \Name*{Louis, XIV}, the ``\AKA{Louis, XIV}{Sun King}'' in the text with an appropriate reference from ``Sun King'' to ``Louis XIV'' in the index (see below). The sobriquet feature would otherwise prevent such usage.
+%
+% Using this feature comes with a price. Even though suffix and sobriquet features produce the same \emph{output} with the default options, they are internally \emph{different} with respect to the first/subsequent use mechanism. Use each approach consistently. This workaround takes advantage of the ambiguous default behavior; the \texttt{comma} option will break its functionality. Again, \emph{caveat auctor}.
+%
 % \subsubsection{Alternate forenames in the Text}
 % 
 % I showed above the cases of \Name[M.T.]{Cicero}[Marcus Tullius] and \Name*[John Q.]{Adams}[John Quincy] where one can have a longer name in the text than in the index. Here are fuller examples:
@@ -345,27 +354,27 @@
 % The abbreviated name “De Wette, Wilhelm M.L.” is in the index.
 % \end{quote}
 % 
-% The alternate forenames \emph{override} the \emph{FNN} in the text. This is \emph{not} true with sobriquets, which are \emph{appended} to \emph{SNN}. The difference in the two is whether the \emph{FNN} argument exists. Alternate forenames do not get printed in subsequent occurrences of \texttt{\bsc Name}. They \emph{do} get printed in subsequent occurrences of \texttt{\bsc Name*}. The surname argument is \emph{always} printed. There is, however, the possibility that you might refer to a person with a nickname only. The next macro facilitates this.
+% \noindent Alternate forenames \emph{override} the \emph{FNN} in the text. Sobriquets are \emph{appended} to \emph{SNN}. The presence or absence of \emph{FNN} triggers this difference. Alternate forenames only get printed in subsequent occurrences of \cmd{\Name*}. The surname argument is \emph{always} printed. The next macro allows one to bypass this restriction.
 %
 % \subsubsection{\texttt{\bsc IndexName}}
 % 
 % \DescribeMacro{\IndexName}
 % This macro prints no text in the body. It only creates an index entry that conforms with the rest of the package. Its syntax is:
 % \begin{quote}
-% \texttt{\bsc IndexName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
+% \cmd{\IndexName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
 % \end{quote}
 %
-% The \texttt{\bsc IndexName} \emph{does not work} with the pen name mechanism described below. This example shows \texttt{\bsc Name} and \texttt{\bsc IndexName} working together.
+% \noindent \cmd{\IndexName} \emph{does not work} with the pen name mechanism described below. This example shows \cmd{\Name} and \cmd{\IndexName} working together.
 % 
 % \begin{quote}
 % \bgroup\ttfamily
-% \bsc Name[C.F.W.]\{Walther\}[Carl Ferdinand Wilhelm] was a major\break figure in nineteenth-century American Lutheran history.\break \bsc Name[C.F.W.]\{Walther\} used his full name when signing\break official documents. To his family, friends, and close\break colleagues, however, he was simply\break Ferdinand\bsc IndexName[C.F.W.]\{Walther\}.
+% \bsc Name[C.F.W.]\{Walther\}[Carl Ferdinand Wilhelm] was a major\break figure in American Lutheran history. \bsc Name[C.F.W.]\{Walther\}\break used his full name when signing documents. To family,\break however, he was just Ferdinand\bsc IndexName[C.F.W.]\{Walther\}.
 % \egroup
 % 
-% \Name[C.F.W.]{Walther}[Carl Ferdinand Wilhelm] was a major figure in nineteenth-century American Lutheran history. \Name[C.F.W.]{Walther} used his full name when signing official documents. To his family, friends, and close colleagues, however, he was simply Ferdinand\IndexName[C.F.W.]{Walther}.
+% \Name[C.F.W.]{Walther}[Carl Ferdinand Wilhelm] was a major figure in American Lutheran history. \Name[C.F.W.]{Walther} used his full name when signing documents. To family, however, he was just Ferdinand\IndexName[C.F.W.]{Walther}.
 % \end{quote}
 %
-% One can use this macro for special cases, like referring to works by joint or multiple authors or simply indexing names consistently with this package:
+% \noindent One can use this macro for special cases, like referring to works by joint or multiple authors or simply indexing names consistently with this package:
 %
 % \begin{quote}
 % \bgroup\ttfamily
@@ -388,87 +397,88 @@
 % First Maccabees recounts the suppression of Jewish customs under the Seleucid king \Name{Antiochus IV}[Epiphanes]. His behavior was so egregious that he became an early model for the later profile of Antichrist.\IndexName{Antiochus IV}[Epiphanes]
 % \end{quote}
 %
-% \texttt{\bsc IndexName} may be helpful in a pinch, but it lacks certain safeguards for handling pseudonyms that the following macros introduce.
-% 
-% \subsubsection{\texttt{\bsc PName} and \texttt{\bsc AKA}: Pen Names}
+% \subsubsection{Pen Names: An Introduction}
 % 
-% This section deals with pen names that function differently than the sobriquet feature and apart from it. I have designed these macros to preclude the alternate name and sobriquet features of \texttt{\bsc Name} for the following reasons:
+% \cmd{\IndexName} lacks some safeguards for handling pen names that the macros \cmd{\PName} and \cmd{\AKA} introduce. These macros are incompatible with the alternate name and sobriquet features of \cmd{\Name} for the following reasons:
 %
 % \begin{enumerate}
-% \item It only makes sense for \texttt{\bsc PName} and \texttt{\bsc AKA} to have the better-known name come first, then the lesser-known name.
-% \item Having the names in that order produces an ambiguous argument list when implementing sobriquets. Making the list unambiguous by using a mandatory argument often would require the author to type an empty set of braces.
-% \item The more names and details that get packed into any given macro, the more confusing it is to use. That level of inefficiency defeats the purpose of this package, which is to save typing, yet have standardized names.
-% \item A number of ancient pseudonyms require special typesetting that must be handled manually.
+% \item It makes sense to have the better-known name come first.
+% \item That order produces an ambiguous argument list. Making the list unambiguous requires a mandatory argument, thus, extra keystrokes.
+% \item The more details in any given macro, the more confusing it is to use.
+% \item Many ancient pseudonyms require manual typesetting and indexing.
 % \end{enumerate}
 %
-% The workaround for a name using a sobriquet is simply:
+% \noindent We already saw the strengths and weaknesses of the suffix feature above as a workaround for sobriquets and Eastern names when using \cmd{\PName} and \cmd{\AKA}. A more general workaround for such names follows:
+%
 % \begin{quote}
 % \bgroup\ttfamily
-% \verb!\index{Jean the Fearless|see {Jean sans Peur}}%!\\
-% \bsc Name\{Jean\}[sans Peur] (Jean the Fearless) was Duke of Burgundy from 1404 to 1419.
+% \verb!\index{Jean the Fearless|see{Jean sans Peur}}%!\\
+% |\Name{Jean}[sans Peur]| (Jean the Fearless) was Duke of\break Burgundy from 1404 to 1419.
 % \egroup
 %
-% \index{Jean the Fearless|see {Jean sans Peur}}%
+% \index{Jean the Fearless|see{Jean sans Peur}}%
 % \Name{Jean}[sans Peur] (Jean the Fearless) was Duke of Burgundy from 1404 to 1419.
 % \end{quote}
 %
-% A more complicated example is:
+% \noindent A more complicated example is:
 % \begin{quote}
 % \bgroup\ttfamily\small
-% \verb!\index{Doctor Angelicus@\textit{Doctor Angelicus}|see {Thomas Aquinas}}%!\\
-% \verb!\index{Thomas of Aquino|see {Thomas Aquinas}}%!\\
-% Perhaps the greatest medieval theologian was \bsc Name\{Thomas\}[Aquinas] (Thomas of Aquino), also known as \bsc textit\{Doctor Angelicus\}. His name ``Aquinas'' is not a surname, so many modern scholars refer to him as \bsc Name\{Thomas\}[Aquinas].
+% \verb!\index{Doctor Angelicus@\textit{Doctor Angelicus}|see{Thomas Aquinas}}%!\\
+% \verb!\index{Thomas of Aquino|see{Thomas Aquinas}}%!\\
+% Perhaps the greatest medieval theologian was |\Name{Thomas}[Aquinas]| (Thomas of Aquino), also known as |\textit{Doctor Angelicus}|. His name ``Aquinas'' is not a surname, so many modern scholars simply refer to him as |\Name{Thomas}[Aquinas]|.
 % \egroup
 %
-% \index{Doctor Angelicus=\textit{Doctor Angelicus}|see {Thomas Aquinas}}%
-% \index{Thomas of Aquino|see {Thomas Aquinas}}%
-% Perhaps the greatest medieval theologian was \Name{Thomas}[Aquinas] (Thomas of Aquino), also known as \textit{Doctor Angelicus}. His name ``Aquinas'' is not a surname, so many modern scholars refer to him as \Name{Thomas}[Aquinas].
+% \index{Doctor Angelicus=\textit{Doctor Angelicus}|see{Thomas Aquinas}}%
+% \index{Thomas of Aquino|see{Thomas Aquinas}}%
+% Perhaps the greatest medieval theologian was \Name{Thomas}[Aquinas] (Thomas of Aquino), also known as \textit{Doctor Angelicus}. His name ``Aquinas'' is not a surname, so many modern scholars simply refer to him as \Name{Thomas}[Aquinas].
 % \end{quote}
 % 
-% This also means, unfortunately, that pen names used with Eastern names will have to be indexed manually.
+% \subsubsection{\texttt{\bsc PName}}
 %
 % \DescribeMacro{\PName}
-% Pseudonyms, \emph{noms de plume}, epithets, and monikers can be handled with two macros: \texttt{\bsc PName} and \texttt{\bsc AKA}. The macro \texttt{\bsc PName} takes a well-known name, followed by as lesser-known name. Like \texttt{\bsc Name}, \texttt{\bsc PName} has starred and unstarred forms, but those forms only operate on the main name that is indexed, not on the second, lesser-known name. The syntax is:
+% Pseudonyms, stage names, \emph{noms de plume}, epithets, and monikers can be handled with two macros: \cmd{\PName} and \cmd{\AKA}. The macro \cmd{\PName} usually takes a well-known name, followed by a lesser-known name. Like \cmd{\Name}, \cmd{\PName} has starred and unstarred forms, but those forms only operate on the first name, not on the second name. \cmd{\PName} also handles double-periods. The syntax is:
 % \begin{quote}
-% \texttt{\bsc PName}\oarg{FNN}\marg{SNN}\oarg{lesser-known FNN}\marg{lesser-known SNN}
+% \cmd{\PName}\oarg{FNN}\marg{SNN}\oarg{lesser-known FNN}\marg{lesser-known SNN}
 % \end{quote}
 %
-% The following examples should make clear its use:
+% \noindent The following examples demonstrate uses of \cmd{\PName}. The macros are agnostic of the ``pen name'' itself. The author determines the name that is indexed (the first name) and the subsequent name that only occurs as a \emph{see} reference.
 % 
 % \begin{quote}
-% \texttt{\bsc PName*[Mark]\{Twain\}[Samuel L.]\{Clemens\}}\\
+% |\PName*[Mark]{Twain}[Samuel L.]{Clemens}|\\
 % Print \PName*[Mark]{Twain}[Samuel L.]{Clemens} the first time it appears. Later, print \PName*[Mark]{Twain}[Samuel L.]{Clemens}.\\[1ex]
 % \ForgetName[Mark]{Twain}%
-% \texttt{\bsc PName[Mark]\{Twain\}[Samuel L.]\{Clemens\}}\\
+% |\PName[Mark]{Twain}[Samuel L.]{Clemens}|\\
 % Print \PName[Mark]{Twain}[Samuel L.]{Clemens} the first time it appears. Later, print \PName[Mark]{Twain}[Samuel L.]{Clemens}.\\[1ex]
-% \texttt{\bsc PName*[Willebrord]\{Snel van Royen\}\{Snellius\}}\\
+% |\PName*[Willebrord]{Snel van Royen}{Snellius}|\\
 % Print \PName*[Willebrord]{Snel van Royen}{Snellius} the first time it appears. Later, print \PName*[Willebrord]{Snel van Royen}{Snellius}.\\[1ex]
 % \ForgetName[Willebrord]{Snel van Royen}%
-% \texttt{\bsc PName[Willebrord]\{Snel van Royen\}\{Snellius\}}\\
+% |\PName[Willebrord]{Snel van Royen}{Snellius}|\\
 % Print \PName[Willebrord]{Snel van Royen}{Snellius} the first time it appears. Later, print \PName[Willebrord]{Snel van Royen}{Snellius}.\\[1ex]
-% \texttt{\bsc PName\{Voltaire\}[François-Marie]\{Arouet\}}\\
+% |\PName{Voltaire}[François-Marie]{Arouet}|\\
 % Print \PName{Voltaire}[François-Marie]{Arouet} the first time it appears. Later, print \PName{Voltaire}[François-Marie]{Arouet}. The starred version also produces \PName*{Voltaire}[François-Marie]{Arouet}
 % \end{quote}
 %
+% \subsubsection{\texttt{\bsc AKA}}
+%
 % \DescribeMacro{\AKA}
-% The second macro that handles aliases is \texttt{\bsc AKA}. It is the same alias mechanism used in \texttt{\bsc PName}, but separated for more flexibility. Its syntax is similar to \texttt{\bsc PName}:
+% The second macro that handles aliases is \cmd{\AKA}. It is the same alias mechanism used in \cmd{\PName}, but separated for more flexibility. Its syntax is similar to \cmd{\PName}:
 % \begin{quote}
-% \texttt{\bsc AKA}\oarg{FNN}\marg{SNN}\oarg{lesser-known FNN}\marg{lesser-known SNN}
+% \cmd{\AKA}\oarg{FNN}\marg{SNN}\oarg{lesser-known FNN}\marg{lesser-known SNN}
 % \end{quote}
 %
-% \texttt{\bsc AKA} only prints the pseudonym, \emph{not} the indexed name. The macro also will prevent the double-printing of a period after an abbreviation. Here is an example:
+% \noindent\cmd{\AKA} only prints the pseudonym, \emph{not} the indexed name. The macro also prevents double periods. An example of use follows:
 % 
 % \begin{quote}
 % \bgroup\ttfamily
-% Today we consider \bsc AKA[George]\{Eliot\}[Mary Anne]\{Evans\} and her literary contributions as \bsc Name[George]\{Eliot\}.
+% Today we consider |\AKA[George]{Eliot}[Mary Anne]{Evans}| and her literary contributions as |\Name[George]{Eliot}|.
 % \egroup
 %
 % Today we consider \AKA[George]{Eliot}[Mary Anne]{Evans} and her literary contributions as \Name[George]{Eliot}.
 % \end{quote}
 % 
-% \texttt{\bsc AKA} creates an index entry that cross-references to the ``main'' name given. It is assumed that a \texttt{\bsc Name} macro occurs somewhere in reference to the indexed name. No error checking otherwise occurs for this.
+% \noindent\cmd{\AKA} creates an index entry that cross-references to the ``main'' name given. It is assumed that a \cmd{\Name} macro occurs somewhere in reference to the indexed name. No error checking otherwise occurs for this.
 % 
-% Pseudonyms cannot be indexed with page numbers. They only work as ``see'' cross-references. \texttt{\bsc Name} will print its arguments and emit a warning if you give a pen name. If you want to index a pseudonym with page numbers, use \texttt{\bsc Name} for both the main name and the pseudonym, then manually cross-reference them, e.g.:\medskip
+% Pseudonyms only work as cross-references. \cmd{\Name} will only print a pen name and emit a warning. To index a pseudonym with page numbers, use \cmd{\Name} for both the main name and the pseudonym, then manually cross-reference them, e.g.:\medskip
 %
 % \bgroup\small\index{Rambam|seealso{Maimonides}}
 % \begin{tabular}{p{0.7in}ll}\hline
@@ -478,14 +488,14 @@
 % \end{tabular}
 % \egroup
 %
-% \texttt{\bsc AKA} will not create multiple instances of a cross-reference. This prevents bogus multiple cross-references in the index, but it also excludes the special case where one moniker applies to multiple people, e.g.: \PName*[Willebrord]{Snel van Royen}{Snellius} and his son \PName*[Rudolph]{Snel van Royen}{Snellius}.
-% \index{Snellius|see {Snel van Royen, Rudolph}}%
-% Do not use \texttt{\bsc IndexName} in this case. One must add a manual index entry as a workaround:
+% \noindent\cmd{\AKA} will not create multiple instances of a cross-reference. This prevents bogus multiple cross-references in the index, but it also excludes the special case where one moniker applies to multiple people, e.g.: \PName*[Willebrord]{Snel van Royen}{Snellius} and his son \PName*[Rudolph]{Snel van Royen}{Snellius}.
+% \index{Snellius|see{Snel van Royen, Rudolph}}%
+% Do not use \cmd{\IndexName} in this case. One must add a manual index entry as a workaround:
 % \begin{quote}
-% \verb!\index{Snellius|see {Snel van Royen, Rudolph}}!
+% \verb!\index{Snellius|see{Snel van Royen, Rudolph}}!
 % \end{quote}
 % 
-% Be careful with name collisions, especially with more than one person having the same last name. The following examples illustrate this:
+% \noindent Be careful with name collisions, especially with more than one person having the same last name. The following examples illustrate this:
 % \begin{quote}
 % \texttt{\bsc PName[Willebrord]\{Snel van Royen\}\{Snellius\}}\\
 % \PName[Willebrord]{Snel van Royen}{Snellius}\\[1ex]
@@ -521,17 +531,17 @@
 % \end{tabular}
 % \end{quote}
 % 
-% Other accents will not work unless you use \TeX\ control sequences or \hologo{XeLaTeX}. You can also include the TS1 encoding and do something like the following with the \textsf{inputenc} package, the \textsf{newunicodechar} package, and and UTF8:
+% \noindent Other accents will not work unless you use \TeX\ control sequences or \hologo{XeLaTeX}. You can also include the TS1 encoding and do something like the following with the \textsf{inputenc} package, the \textsf{newunicodechar} package, and and UTF8:
 % 
 % \begin{quote}
-% \texttt{\bsc DeclareTextSymbolDefault\{\bsc textlongs\}\{TS1\}}\\
-% \texttt{\bsc DeclareTextSymbol\{\bsc textlongs\}\{TS1\}\{115\}}\\
-% \texttt{\bsc newunicodechar\{ſ\}\{\bsc textlongs\}}\\
-% \texttt{\bsc newunicodechar\{ā\}\{\bsc=a\}}\\
-% \texttt{\bsc newunicodechar\{ṃ\}\{\bsc d\{m\}\}}
+% |\DeclareTextSymbolDefault{\textlongs}{TS1}|\\
+% |\DeclareTextSymbol{\textlongs}{TS1}{115}|\\
+% |\newunicodechar{ſ}{\textlongs}|\\
+% |\newunicodechar{ā}{\=a}|\\
+% |\newunicodechar{ṃ}{\d{m}}|
 % \end{quote}
 % 
-% Please remember that the appropriate font packages, such as \textsf{lmodern} or the \TeX\ Gyre fonts, are needed to obtain some TS1 glyphs. Also there may be points where \textsf{pdflatex} will accept the input (e.g., Gh{\=a}zali), but \textsf{makeindex} will have problems with that. In ``normal'' operation (I have used \textsf{article} and \textsf{memoir}) these control sequences appear to work. Yet in generating this style file, that was not the case. You may need to use manual index entries in those cases.
+% \noindent Please remember that the appropriate font packages, such as \textsf{lmodern} or the \TeX\ Gyre fonts, are needed to obtain some TS1 glyphs. Also there may be points where \textsf{pdflatex} will accept the input (e.g., Gh{\=a}zali), but \textsf{makeindex} will have problems with that. In ``normal'' operation (I have used \textsf{article} and \textsf{memoir}) these control sequences appear to work fine. Special requirements like those in the \textsf{ltxdoc} class disrupt this functionality, requiring manual index entries in some cases.
 % 
 % \subsection{Name Formatting}
 % 
@@ -540,56 +550,55 @@
 % \changes{v0.8}{2012/01/29}{Expanded description of functionality}
 %
 % \DescribeMacro{\NamesFormat}
-% The first time a name is printed, it is formatted with the font attribute stored in \texttt{\bsc NamesFormat}. This is set with the class options or manually. \texttt{\bsc NamesFormat} can use either the command form or the declaration form of selecting font attributes, e.g., \texttt{\bsc textsc} or \texttt{\bsc scshape}. By redefining this macro, one can ``hook'' into the special typesetting of the first occurrence of a name. Consider the following:
+% The first time a name is printed, it is formatted with the font attribute stored in \cmd{\NamesFormat}. This is set with the class options or manually. \cmd{\NamesFormat} can use either the command form or the declaration form of selecting font attributes, e.g., \cmd{\textsc} or \cmd{\scshape}. By redefining this macro, one can ``hook'' into the special typesetting of the first occurrence of a name. Consider the following:
 %
 % \begin{quote}
-% \texttt{\bsc renewcommand\{\bsc NamesFormat\}[1]\{\bsc textbf\{\#1\}\%}\\
-% \texttt{\bsc ifinner\bsc else\bsc marginpar\{\bsc scriptsize \#1\}\bsc fi\}}
+% |\renewcommand{\NamesFormat}[1]{\textbf{#1}%|\\
+% |\ifinner\else\marginpar{\scriptsize #1}\fi}|
 % \end{quote}
 % 
-% If we \texttt{\bsc let} the value of \texttt{\bsc NamesFormat} to save the current value and implement a temporary change like the above, we get:
-%
+% \noindent If we \cmd{\let} the value of \cmd{\NamesFormat} to save the current value and implement a temporary change like the above, we get:
 % \let\oldformat\NamesFormat
 % \renewcommand{\NamesFormat}[1]{\textbf{#1}\ifinner\else\marginpar{\scriptsize #1}\fi}
 %
 %\begin{quote}
-% \texttt{\bsc Name\{Vlad III\}[Dracula] became known as Vlad Ţepeş, ``The Impaler,''  after his death. He was the son of \bsc Name\{Vlad II\}[Dracul]. Later references to \bsc Name\{Vlad III\}[Dracula] appear thus.}\bigskip
+% \bgroup\ttfamily \bsc Name\{Vlad III\}[Dracula] became known as Vlad Ţepeş, ``The\break Impaler,''  after his death. He was the son of\break \bsc Name\{Vlad II\}[Dracul]. Later references to\break \bsc Name\{Vlad III\}[Dracula] appear thus.\egroup \bigskip
 %
 % \Name{Vlad III}[Dracula] became known as Vlad Ţepeş, ``The Impaler,''  after his death. He was the son of \Name{Vlad II}[Dracul]. Later references to \Name{Vlad III}[Dracula] appear thus.
 % \end{quote}
 %
 % \let\NamesFormat\oldformat
 %
-% After using \texttt{\bsc let} to revert \texttt{\bsc NamesFormat}, a first occurrence again takes the form: \ForgetName{Vlad III}[Dracula]\Name{Vlad III}[Dracula].\\
+% After using \cmd{\let} to revert \cmd{\NamesFormat}, a first occurrence again takes the form: \ForgetName{Vlad III}[Dracula]\Name{Vlad III}[Dracula].\\
 %
-% Let me again stress that with names like \Name*{Vlad II}[Dracul] and \Name*{Vlad III}[Dracula], you cannot use either \texttt{\bsc PName} or \texttt{\bsc AKA}. Attempting to do so will fail. You must use as a guide the examples given above for \Name*{Jean}[sans Peur] and \Name*{Thomas}[Aquinas].
+% Let me again stress that ``royal'' names used in this manner do not work with  \cmd{\PName} and \cmd{\AKA}. Consistently use either the suffix mechanism (Subsection \ref{sec:suffix}) or use as a guide the examples above for \Name*{Jean}[sans Peur] and \Name*{Thomas}[Aquinas].
 %
 % \subsection{Formatting Certain Sections}
 % \label{sec:SectionFormat}
 % 
 % \DescribeMacro{\NamesActive}
 % \DescribeMacro{\NamesInctive}
-% Using the \texttt{frontmatter} option deactivates formatting until \texttt{\bsc NamesActive} occurs. Another macro, \texttt{\bsc NamesInactive}, will deactivate formatting again. These two macros toggle formatting on and off. The mechanism works in a complementary, yet independent manner. It can be used throughout the document.
+% Using the \texttt{frontmatter} option deactivates formatting until \cmd{\NamesActive} occurs. Another macro, \cmd{\NamesInactive}, will deactivate formatting again. These two macros toggle formatting on and off. The mechanism works in a complementary, yet independent manner. It can be used throughout the document.
 % 
-% Here we switch to the ``front matter'' mode with \texttt{\bsc NamesInactive}:
+% Here we switch to the ``front matter'' mode with \cmd{\NamesInactive}:
 % \NamesInactive
 % \begin{quote}
 % \begin{tabular}{ll}
-% \texttt{\bsc Name[Rudolph]\{Carnap\}} & \Name[Rudolph]{Carnap}\\
-% \texttt{\bsc Name[Rudolph]\{Carnap\}} & \Name[Rudolph]{Carnap}\\
-% \texttt{\bsc Name[Nicolas]\{Malebranche\}} & \Name[Nicolas]{Malebranche}\\
-%\texttt{\bsc Name[Nicolas]\{Malebranche\}} & \Name[Nicolas]{Malebranche}\\
+% |\Name[Rudolph]{Carnap}| & \Name[Rudolph]{Carnap}\\
+% |\Name[Rudolph]{Carnap}| & \Name[Rudolph]{Carnap}\\
+% |\Name[Nicolas]{Malebranche}| & \Name[Nicolas]{Malebranche}\\
+%|\Name[Nicolas]{Malebranche}| & \Name[Nicolas]{Malebranche}\\
 % \end{tabular}
 % \end{quote}
 % 
-% Then we switch back to ``main matter'' mode with \texttt{\bsc NamesActive}:
+% Then we switch back to ``main matter'' mode with \cmd{\NamesActive}:
 % \NamesActive
 % \begin{quote}
 % \begin{tabular}{ll}
-% \texttt{\bsc Name[Rudolph]\{Carnap\}} & \Name[Rudolph]{Carnap}\\
-% \texttt{\bsc Name[Rudolph]\{Carnap\}} & \Name[Rudolph]{Carnap}\\
-% \texttt{\bsc Name[Nicolas]\{Malebranche\}} & \Name[Nicolas]{Malebranche}\\
-%\texttt{\bsc Name[Nicolas]\{Malebranche\}} & \Name[Nicolas]{Malebranche}\\
+% |\Name[Rudolph]{Carnap}| & \Name[Rudolph]{Carnap}\\
+% |\Name[Rudolph]{Carnap}| & \Name[Rudolph]{Carnap}\\
+% |\Name[Nicolas]{Malebranche}| & \Name[Nicolas]{Malebranche}\\
+%|\Name[Nicolas]{Malebranche}| & \Name[Nicolas]{Malebranche}\\
 % \end{tabular}
 % \end{quote}
 % 
@@ -597,12 +606,12 @@
 % \label{sec:Tweaks}
 % 
 % \DescribeMacro{\ForgetName}
-% This macro is a ``dirty trick'' of sorts that takes the same optional and mandatory parameters used by \texttt{\bsc Name}. It handles its arguments in the same manner as \texttt{\bsc Name}, except that it ignores the final parameter if \emph{FNN} are present. The syntax is:
+% This macro is a ``dirty trick'' of sorts that takes the same optional and mandatory parameters used by \cmd{\Name}. It handles its arguments in the same manner as \cmd{\Name}, except that it ignores the final parameter if \emph{FNN} are present. The syntax is:
 % \begin{quote}
-% \texttt{\bsc ForgetName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
+% \cmd{\ForgetName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
 % \end{quote}
 %
-% This macro causes \texttt{\bsc Name} and friends to “forget” prior uses of a name with respect to typesetting. The next use will print as if it were a ``first use.'' Index entries and pseudonyms (see above) are \emph{never} forgotten.
+% \noindent This macro causes \cmd{\Name} and friends to “forget” prior uses of a name with respect to typesetting. The next use will print as if it were a ``first use.'' Index entries and pseudonyms (see above) are \emph{never} forgotten.
 % 
 % \StopEventually{\PrintChanges\clearpage\PrintIndex}
 %
@@ -614,22 +623,35 @@
 % \subsection{Class Options and Required Packages}
 %    \begin{macrocode}
 \newif\if@nameauth@DoFormat
+\newif\if@nameauth@DoComma
 \newif\if@nameauth@Punct
 %    \end{macrocode}
-% These boolean values control whether or not formatting of first entries occurs and whether or not a name ends with a period.\\
+% These Boolean values control or are controlled by formatting of first entries, suppression of commas, and whether or not a name ends with a period.\\
 %
 %    \begin{macrocode}
+\newif\if@nameauth@dtx
+%    \end{macrocode}
+% This Boolean value handles proper generation of dtx files. It is set by |\@ifclassloaded|.\\
+%
+% \changes{v0.85}{2012/02/05}{Added nocomma, comma options}
+%    \begin{macrocode}
 \DeclareOption{mainmatter}{\@nameauth@DoFormattrue}
 \DeclareOption{frontmatter}{\@nameauth@DoFormatfalse}
 \DeclareOption{smallcaps}{\newcommand{\NamesFormat}{\scshape}}
 \DeclareOption{italic}{\renewcommand{\NamesFormat}{\itshape}}
 \DeclareOption{boldface}{\renewcommand{\NamesFormat}{\bfseries}}
 \DeclareOption{noformat}{\renewcommand{\NamesFormat}{}}
-\ExecuteOptions{smallcaps,mainmatter}
+\DeclareOption{nocomma}{\@nameauth@DoCommafalse}
+\DeclareOption{comma}{\@nameauth@DoCommatrue}
+\ExecuteOptions{smallcaps,mainmatter,nocomma}
 \ProcessOptions\relax
 \RequirePackage{etoolbox}
 \RequirePackage{xparse}
+\@ifclassloaded{ltxdoc}
+  {\@nameauth@dtxtrue}
+  {\@nameauth@dtxfalse}%
 %    \end{macrocode}
+% The options above interact with the prior Boolean values. Suppressing and showing commas is set at load time and should not be changed in the document or else significant errors will result. |\@ifclassloaded| sets the Boolean value that governs the ``literal'' character used in the index. The other options can be changed without problem and several user interface macros provide that functionality.\\
 %
 % \subsection{Internal Macros}
 % \begin{macro}{\@nameauth@CleanName}
@@ -638,17 +660,51 @@
 \newcommand*{\@nameauth@CleanName}[1]{\expandafter\zap@space\detokenize{#1} \@empty}
 %    \end{macrocode}
 % \end{macro}
-% Thanks to \Name*[Heiko]{Oberdiek}, this macro produces a ``sanitized'' string based on the forename/surname parameters of \texttt{\bsc Name} and friends. With this we can construct a control sequence name (\texttt{\bsc csname}). Testing for the presence of that control sequence determines the existence of pseudonyms and the first occurrence of a name.
+% Thanks to \Name*[Heiko]{Oberdiek}, this macro produces a ``sanitized'' string based on the forename/surname parameters of \cmd{\Name} and friends. With this we can construct a control sequence name. Testing for the presence of that control sequence determines the existence of pseudonyms and the first occurrence of a name.\\
+%
+% \noindent The following macros pertain to both the suffix mechanism mentioned above and the removal of suffixes with subsequent references of \cmd{\Name}.
 %
+% \begin{macro}{\@nameauth@Root}
+% \changes{v0.85}{2012/02/05}{Divide suffix handling into functional parts}
+%    \begin{macrocode}
+\def\@nameauth@Root#1,#2*{#1}%
+%    \end{macrocode}
+% \end{macro}
+% Strips off the second parameter delimited by a comma and an asterisk.
+% 
+% \begin{macro}{\@nameauth@Suffix}
+% \changes{v0.85}{2012/02/05}{Add suffix handling functionality}
+% \begin{macro}{\@nameauth@Truncate}
+% \changes{v0.85}{2012/02/05}{Add suffix handling functionality}
+%    \begin{macrocode}
+\def\@nameauth@Suffix#1,#2*{\ifx#2\@empty\else\@nameauth@Truncate#2\fi}
+\def\@nameauth@Truncate#1,{#1}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% Strips off the first parameter and cleans up any extra commas.
+% 
+% \begin{macro}{\@nameauth@NoComma}
+% \changes{v0.85}{2012/02/05}{Add comma handling routine}
+%    \begin{macrocode}
+\newcommand{\@nameauth@NoComma}[1]{%
+     {\@nameauth@Root#1,*\@nameauth@Suffix#1,*}%
+}
+%    \end{macrocode}
+% \end{macro}
+% This is the heart of the comma suppression feature. Since the presence of commas are necessary for the suffix mechanism to work, commas are stripped as close as possible to generating output either for the body text or for the index.
+% 
 % \begin{macro}{\@nameauth@Zapsuffix}
+% \changes{v0.85}{2012/02/05}{Revise extant suffix handling}
 %    \begin{macrocode}
-\newcommand{\@nameauth@Zapsuffix}[1]{%
-     \def\@@Zapsuffix##1,##2*{##1}%
-     {\@@Zapsuffix#1,*}%
+\newcommand*{\@nameauth@Zapsuffix}[1]{%
+     {\@nameauth@Root#1,*}%
 }
 %    \end{macrocode}
 % \end{macro}
-% This macro does what it says. Anything starting with a comma and ending with the end of the name is stripped off. That includes ``Sr.,'' ``Jr.,'' ``III,'' and so on.
+% Anything starting with a comma and ending with the end of the name is stripped off. That includes ``Sr.,'' ``Jr.,'' ``III,'' and so on.\\
+%
+% \noindent The following macros implement the mechanism to prevent the double-printing of a period after ``Sr.,'' ``Jr.,'' and so on.
 %
 % \begin{macro}{\@nameauth@CheckDot}
 % \changes{v0.8}{2012/01/29}{Renamed macro to help compatibility}
@@ -656,7 +712,7 @@
 \def\@nameauth@CheckDot{\futurelet\@token\@nameauth@EvalDot}
 %    \end{macrocode}
 % \end{macro}
-% This macro assigns the lookahead token \texttt{\bsc @token} to be evaluated by \texttt{\bsc @nameauth@EvalDot} while keeping \texttt{\bsc @token} non-destructively on the list of input tokens. I use this method instead of \texttt{\bsc @nextchar} because I do not want to gobble spaces.
+% This macro assigns the lookahead token \cmd{\@token} to be evaluated by \cmd{\@nameauth@EvalDot} while keeping \cmd{\@token} non-destructively on the list of input tokens. I use this method instead of \cmd{\@nextchar} because I do not want to gobble spaces.
 %
 % \begin{macro}{\@nameauth@EvalDot}
 % \changes{v0.8}{2012/01/29}{Renamed macro to help compatibility}
@@ -664,7 +720,7 @@
 \def\@nameauth@EvalDot{\let\@period=.\ifx\@token\@period\expandafter\@gobble \fi}
 %    \end{macrocode}
 % \end{macro}
-% \texttt{\bsc @nameauth@EvalDot} checks of \texttt{\bsc @token} is a period. If so it gobbles it by using \texttt{\bsc expandafter} to get past the grouping. Another \texttt{\bsc expandafter} occurs immediately before the invocation of \texttt{\bsc @nameauth@CheckDot} in \texttt{\bsc Name} and \texttt{\bsc AKA}.
+% \cmd{\@nameauth@EvalDot} checks of \cmd{\@token} is a period. If so it gobbles it by using \cmd{\expandafter} to get past the grouping. Another \cmd{\expandafter} occurs immediately before the invocation of \cmd{\@nameauth@CheckDot} in \cmd{\Name} and \cmd{\AKA}.
 %
 % \begin{macro}{\@nameauth@TestDot}
 % \changes{v0.8}{2012/01/29}{Renamed macro to help compatibility}
@@ -677,30 +733,40 @@
 }
 %    \end{macrocode}
 % \end{macro}
-% While \texttt{\bsc @nameauth@CheckDot} looks \emph{ahead} for a period, \texttt{\bsc @nameauth@TestDot}---based on a snippet by \Name*[Uwe]{Lueck}---checks for a terminal period in the name passed to it, ignoring medial periods. This string test is compatible with the \textsf{microtype} package.
+% While \cmd{\@nameauth@CheckDot} looks \emph{ahead} for a period, \cmd{\@nameauth@TestDot}---based on a snippet by \Name*[Uwe]{Lueck}---checks for a terminal period in the name passed to it, ignoring medial periods. It always resets the Boolean value before making its test, making it unnecessary to reset elsewhere.
 %
 % \begin{macro}{\@nameauth@FmtName}
 % \changes{v0.8}{2012/01/29}{Renamed macro to help compatibility}
+% \changes{v0.85}{2012/02/05}{Add comma suppression}
 %    \begin{macrocode}
 \DeclareDocumentCommand\@nameauth@FmtName{s m}%
 {%
      \@nameauth@TestDot{#2}%
-     \IfBooleanTF{#1}{#2}{\bgroup\NamesFormat{#2}\egroup}%
+     \if@nameauth@DoComma%
+          \IfBooleanTF{#1}{#2}{\bgroup\NamesFormat{#2}\egroup}%
+     \else
+          \IfBooleanTF{#1}%
+               {\@nameauth@NoComma{#2}}%
+               {\bgroup\NamesFormat{\@nameauth@NoComma{#2}}\egroup}%
+     \fi
 }
 %    \end{macrocode}
 % \end{macro}
-% \texttt{\bsc @nameauth@FmtName} is where the first occurrences of a name are formatted. Notice how \texttt{\bsc NamesFormat} sits between a \texttt{\bsc bgroup} and an \texttt{\bsc egroup} to localize the font change. It is adjacent to the brackets that enclose the second parameter, allowing one to hook into the name formatting procedure.
+% \cmd{\@nameauth@FmtName} is where the first occurrences of a name are formatted. Notice how \cmd{\NamesFormat} sits between a \cmd{\bgroup} and an \cmd{\egroup} to localize the font change. The \cmd{\NamesFormat} hook has been discussed above. Comma suppression occurs here in order for the period-checking routines to work. That means comma suppression operates on the whole name here, but only on the \emph{SNN} field for the index entries. This should not present a noticeable difference, since commas seldom if ever occur in forenames.
 %
 % \subsection{User Interface Macros}
 % \begin{macro}{\Name}
 % \changes{v0.75}{2012/01/19}{Added ``sobriquet'' feature}
 % \changes{v0.8}{2012/01/29}{Merged all major functionality here}
+% \changes{v0.85}{2012/02/05}{Add comma suppression to indexing, ltxdoc compatibility}
+% \changes{v0.86}{2012/02/06}{Slight tweak using \cmd{\edef}}
 %    \begin{macrocode}
 \DeclareDocumentCommand\Name{s o m o}%
 {%
-     \@nameauth@Punctfalse%
+     \if@nameauth@DoComma\edef\Surnames{#3}%
+     \else\edef\Surnames{\@nameauth@NoComma{#3}}\fi%
      \IfValueTF{#2}%
-     {\IfValueTF{#4}{\def\@ForeNames{#4}}{\def\@ForeNames{#2}}%
+     {\IfValueTF{#4}{\edef\Forenames{#4}}{\edef\Forenames{#2}}%
      \ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
           \@nameauth@FmtName*{#2 #3}%
           \PackageWarning{nameauth}%
@@ -709,20 +775,32 @@
           \if@nameauth@DoFormat%
                \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
                \IfBooleanTF{#1}%
-                    {\@nameauth@FmtName*{\@ForeNames{\space}#3}\index{#3,{\space}#2}}%
-                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3,{\space}#2}}%
+                    {\@nameauth@FmtName*{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
+                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
                \else%
                     \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
-                    \@nameauth@FmtName{\@ForeNames{\space}#3}\index{#3,{\space}#2}%
+                    \@nameauth@FmtName{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi%
                \fi%
           \else%
                \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
                \IfBooleanTF{#1}%
-                    {\@nameauth@FmtName*{\@ForeNames{\space}#3}\index{#3,{\space}#2}}%
-                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3,{\space}#2}}%
+                    {\@nameauth@FmtName*{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
+                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
                \else%
                     \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
-                    \@nameauth@FmtName*{\@ForeNames{\space}#3}\index{#3,{\space}#2}%
+                    \@nameauth@FmtName*{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi%
                \fi%
           \fi%
      \fi}%
@@ -735,20 +813,32 @@
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3 #4}\index{#3 #4}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3 #4}}%
+                         {\@nameauth@FmtName*{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
-                         \@nameauth@FmtName{#3 #4}\index{#3 #4}%
+                         \@nameauth@FmtName{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3 #4}\index{#3 #4}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3 #4}}%
+                         {\@nameauth@FmtName*{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
-                         \@nameauth@FmtName*{#3 #4}\index{#3 #4}%
+                         \@nameauth@FmtName*{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi%
                      \fi%
                \fi%
           \fi}%
@@ -760,20 +850,32 @@
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3}\index{#3}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3}}%
+                         {\@nameauth@FmtName*{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
-                         \@nameauth@FmtName{#3}\index{#3}%
+                         \@nameauth@FmtName{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3}\index{#3}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3}}%
+                         {\@nameauth@FmtName*{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
                      \else%
                          \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
-                         \@nameauth@FmtName*{#3}\index{#3}%
+                         \@nameauth@FmtName*{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi%
                     \fi%
                \fi%
           \fi}%
@@ -782,8 +884,17 @@
 }
 %    \end{macrocode}
 % \end{macro}
+% \cmd{\Name} is the heart of this package. \Name*[Marc van]{Dongen} provided the basic structure.
+%
+%The reason why one sees six bifurcate outcomes repeated three times for eighteen ``normal'' and eighteen ``special'' variations is because one must make different decisions based on the dynamic interaction of many factors beyond mere input. First, at every instance where output is generated via \cmd{\index} there is a check to determine if the ``normal'' character for index entry literals will be used or the ``special'' version will be used with the \textsf{ltxdoc} class.
+%
+% Regarding the many branches, one cannot assume that the name will terminate with a suffix like ``Jr.'' until a check has been run to determine if the suffix should be truncated. The main dynamic factors include: the Boolean and value parameters (there are eight valid patterns of input among them), the first or subsequent use, the front or main matter use, possible operations on suffixes, the formatting or non-formatting of output, and whether a pen name has been passed to the routine.
 %
-% \texttt{\bsc Name} first checks for the forenames argument. Two outcomes are possible.
+% Here is how these many factors interrelate:
+%
+% \cmd{\Name} first checks for comma suppression. if so it stores a comma-suppressed version of the third parameter in \cmd{\Surnames}. Otherwise it stores an unchanged version in \cmd{\Surnames}. This will be passed to \cmd{\index} as a literal.
+% 
+%\noindent \cmd{\Name} then checks for the forenames argument. Two outcomes are possible.
 % \begin{enumerate}
 % \item Forenames are present. In this case, the alternate names argument creates two choices.
 % \begin{enumerate}
@@ -797,19 +908,18 @@
 % \end{enumerate}
 % \end{enumerate}
 %
-% A check occurs for a control sequence based on the names given and the suffix \texttt{!PN!} (for pen name). This is how \texttt{\bsc AKA} protects cross-references. If the control sequence exists, then \texttt{\bsc Name} only prints the name given and emits a warning. One cannot use \texttt{\bsc ForgetName} to expunge a pen name. This is a deliberate decision to avoid corruption of the index cross-references.
+% A check occurs for a control sequence based on the names given and the suffix \texttt{!PN!} (for pen name). This is how \cmd{\AKA} protects cross-references. If the control sequence exists, then \cmd{\Name} only prints the name given (but with comma suppression) and emits a warning. One cannot use \cmd{\ForgetName} to expunge a pen name. This is a deliberate decision to avoid corruption of the index cross-references.
 %
-% The next branch involves the boolean value \texttt{@nameauth@DoFormat}, which is controlled by \texttt{\bsc NamesActive} and \texttt{\bsc NamesInactive}. If formatting is active, choose the unstarred form of \texttt{\bsc @nameauth@FmtName}, which applies the formatting hook. Otherwise use the starred form that applies no formatting.
+% The next branch involves the Boolean value \texttt{@nameauth@DoFormat}, which is controlled by \cmd{\NamesActive} and \cmd{\NamesInactive}. If formatting is active, choose the unstarred form of \cmd{\@nameauth@FmtName}, which applies the formatting hook. Otherwise use the starred form that applies no formatting.
 %
 % The state of  \texttt{@nameauth@DoFormat} also controls the suffix used in the control sequences: \texttt{!MN!} for main name or \texttt{!NF!} for no format. This is the heart of the \texttt{frontmatter} / \texttt{mainmatter} mechanism.
 %
-% Where longer and shorter versions of names are printed, there the star parameter controls those outcomes.
+% Where longer and shorter versions of names are printed, there the star parameter controls those outcomes. Comma suppression is used or not, as apppropriate, in the index entries, requiring the use of the ``literal'' character @ in most cases to get the alphabetizing and the output to work properly. Note again that one must always use commas with suffixes in the input, even if commas are suppressed in the output. That is how the mechanism works.
 %
-% The use of \texttt{\bsc expandafter} before \texttt{\bsc @nameauth@CheckDot} works with the other use of \texttt{\bsc expandafter} mentioned with \texttt{\bsc @nameauth@EvalDot} above to move past the closing brace and fetch the period as lookahead. That is only done when the check for a terminal period in the name succeeds.
-%
-% \Name*[Marc van]{Dongen} provided the basic structure for this macro.
+% The use of \cmd{\expandafter} before \cmd{\@nameauth@CheckDot} works with the other use of \cmd{\expandafter} mentioned with \cmd{\@nameauth@EvalDot} above to move past the closing brace and fetch the period as lookahead. That is only done when the check for a terminal period in the name succeeds.
 %
 % \begin{macro}{\PName}
+% \changes{v0.85}{2012/02/05}{Add comma suppression}
 %    \begin{macrocode}
 \DeclareDocumentCommand\PName{s o m o m}%
 {%
@@ -818,55 +928,75 @@
 }
 %    \end{macrocode}
 % \end{macro}
-%
-% \texttt{\bsc PName} is a convenience macro whose starred and unstarred forms call the respective versions of \texttt{\bsc Name}, then \texttt{\bsc AKA}. It prevents both the ``sobriquet'' feature and the alternate forenames feature.
+% \cmd{\PName} is a convenience macro whose starred and unstarred forms call the respective versions of \cmd{\Name}, then \cmd{\AKA}. It prevents both the ``sobriquet'' feature and the alternate forenames feature, as mentioned above. It is only compatible with similar usage via \cmd{\Name} relying on the ambiguous default behavior of suffixes, the suffix suppression routines, and comma suppression.
 %
 % \begin{macro}{\AKA}
+% \changes{v0.85}{2012/02/05}{Add comma suppression, ltxdoc compatibility}
+% \changes{v0.86}{2012/02/06}{Fixed some regressions}
 %    \begin{macrocode}
 \DeclareDocumentCommand\AKA{o m o m}%
 {%
-     \@nameauth@Punctfalse%
+     \if@nameauth@DoComma%
+          \edef\Surnamesi{#2}\edef\Surnamesii{#4}%
+          \else\edef\Surnamesi{\@nameauth@NoComma{#2}}%
+          \edef\Surnamesii{\@nameauth@NoComma{#4}}%
+     \fi%
      \IfValueTF{#3}%
      {\@nameauth@FmtName*{#3 #4}%
           \ifcsname\@nameauth@CleanName{#3#4!PN!}\endcsname\relax\else%
                \csgdef{\@nameauth@CleanName{#3#4!PN!}}{}%
                \IfValueTF{#1}%
-                    {\index{#4,{\space}#3|see{#2,{\space}#1}}}%
-                    {\index{#4,{\space}#3|see{#2}}}%
-               \fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii, #3|see{\Surnamesi, #1}}%
+                    \else\index{#4@\Surnamesii, #3|see{\Surnamesi, #1}}\fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii, #3|see{\Surnamesi}}%
+                    \else\index{#4@\Surnamesii, #3|see{\Surnamesi}}\fi}%
+          \fi}%
      {\@nameauth@FmtName*{#4}%
           \ifcsname\@nameauth@CleanName{#4!PN!}\endcsname\relax\else%
                \csgdef{\@nameauth@CleanName{#4!PN!}}{}%
                \IfValueTF{#1}%
-                    {\index{#4|see{#2,{\space}#1}}}%
-                    {\index{#4|see{#2}}}%
-               \fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii|see{\Surnamesi, #1}}%
+                    \else\index{#4@\Surnamesii|see{\Surnamesi, #1}}\fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii|see{\Surnamesi}}%
+                    \else\index{#4@\Surnamesii|see{\Surnamesi}}\fi}%
+          \fi}%
      \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 %    \end{macrocode}
 % \end{macro}
-%
-% \texttt{\bsc AKA} prints a pseudonym and creates index cross-references. It also checks to see of cross-references already have been generated, and if so, it does not do it again. Like \texttt{\bsc Name} it checks for a terminal period, but only for the alternate name.
+% \cmd{\AKA} prints a pseudonym and creates index cross-references. It also checks to see of cross-references already have been generated, and if so, it does not do it again. Like \cmd{\Name} it checks for a terminal period, but only for the alternate name.
 %
 % \begin{macro}{\IndexName}
 % \changes{v0.75}{2012/01/19}{Optional parameter added; mandatory parameter deleted}
+% \changes{v0.85}{2012/02/05}{Add comma suppression, ltxdoc compatibility}
+% \changes{v0.86}{2012/02/06}{Slight tweak using \cmd{\edef}}
 %    \begin{macrocode}
 \DeclareDocumentCommand\IndexName{o m o}%
 {%
+     \if@nameauth@DoComma\edef\Surnames{#2}%
+     \else\edef\Surnames{\@nameauth@NoComma{#2}}\fi%
      \IfValueTF{#1}%
           {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
-          \else\index{#2,{\space}#1}\fi}%
+               \else%
+                    \if@nameauth@dtx\index{#2=\Surnames, #1}%
+                    \else\index{#2@\Surnames, #1}\fi%
+          \fi}%
           {\IfValueTF{#3}
                {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-               \else\index{#2 #3}\fi}
+               \else%
+                    \if@nameauth@dtx\index{#2=\Surnames{} #3}%
+                    \else\index{#2@\Surnames{} #3}\fi%
+          \fi}%
                {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
-               \else\index{#2}\fi}%
+               \else%
+                    \if@nameauth@dtx\index{#2=\Surnames}%
+                    \else\index{#2@\Surnames}\fi%
+               \fi}
           }%
 }
 %    \end{macrocode}
 % \end{macro}
-%
-% \texttt{\bsc IndexName} creates an index entry that is not already a pseudonym. It prints nothing.
+% \cmd{\IndexName} creates an index entry that is not already a pseudonym. It prints nothing. It does ensure consistent formatting.
 %
 % \begin{macro}{\ForgetName}
 % \changes{v0.75}{2012/01/19}{New parameter added}
@@ -885,28 +1015,22 @@
 }
 %    \end{macrocode}
 % \end{macro}
-%
-% \texttt{\bsc ForgetName} uses the \eTeX facilities to undefine control sequences created by \texttt{\bsc Name}. Using \texttt{\bsc @ifdefined} does not create a control sequence equivalent to \texttt{\bsc relax}, thus using less resources.
+% \cmd{\ForgetName} undefines control sequences to trigger the ``first use'' option of \cmd{\Name}.
 %
 % \begin{macro}{\NamesInactive}
 %    \begin{macrocode}
 \newcommand{\NamesInactive}{\@nameauth@DoFormatfalse}
 %    \end{macrocode}
 % \end{macro}
-%
 % This macro deactivates formatting, even as its counterpart below activates it.
-%
 % \begin{macro}{\NamesActive}
 %    \begin{macrocode}
 \newcommand{\NamesActive}{\@nameauth@DoFormattrue}
 %    \end{macrocode}
 % \end{macro}
 % \clearpage
+% \Finale
 \endinput
-%
 % \iffalse
 %</package>
 % \fi
-%
-% \Finale
-% \clearpage
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index b8f348667b0..e9cc3c63513 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -22,23 +22,35 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{nameauth}
-    [2012/01/29 v0.8 name authority macros to aid consistent display and indexing of names]
+    [2012/02/06 v0.86 name authority macros to aid consistent display and indexing of names]
 \newif\if@nameauth@DoFormat
+\newif\if@nameauth@DoComma
 \newif\if@nameauth@Punct
+\newif\if@nameauth@dtx
 \DeclareOption{mainmatter}{\@nameauth@DoFormattrue}
 \DeclareOption{frontmatter}{\@nameauth@DoFormatfalse}
 \DeclareOption{smallcaps}{\newcommand{\NamesFormat}{\scshape}}
 \DeclareOption{italic}{\renewcommand{\NamesFormat}{\itshape}}
 \DeclareOption{boldface}{\renewcommand{\NamesFormat}{\bfseries}}
 \DeclareOption{noformat}{\renewcommand{\NamesFormat}{}}
-\ExecuteOptions{smallcaps,mainmatter}
+\DeclareOption{nocomma}{\@nameauth@DoCommafalse}
+\DeclareOption{comma}{\@nameauth@DoCommatrue}
+\ExecuteOptions{smallcaps,mainmatter,nocomma}
 \ProcessOptions\relax
 \RequirePackage{etoolbox}
 \RequirePackage{xparse}
+\@ifclassloaded{ltxdoc}
+  {\@nameauth@dtxtrue}
+  {\@nameauth@dtxfalse}%
 \newcommand*{\@nameauth@CleanName}[1]{\expandafter\zap@space\detokenize{#1} \@empty}
-\newcommand{\@nameauth@Zapsuffix}[1]{%
-     \def\@@Zapsuffix##1,##2*{##1}%
-     {\@@Zapsuffix#1,*}%
+\def\@nameauth@Root#1,#2*{#1}%
+\def\@nameauth@Suffix#1,#2*{\ifx#2\@empty\else\@nameauth@Truncate#2\fi}
+\def\@nameauth@Truncate#1,{#1}
+\newcommand{\@nameauth@NoComma}[1]{%
+     {\@nameauth@Root#1,*\@nameauth@Suffix#1,*}%
+}
+\newcommand*{\@nameauth@Zapsuffix}[1]{%
+     {\@nameauth@Root#1,*}%
 }
 \def\@nameauth@CheckDot{\futurelet\@token\@nameauth@EvalDot}
 \def\@nameauth@EvalDot{\let\@period=.\ifx\@token\@period\expandafter\@gobble \fi}
@@ -51,13 +63,20 @@
 \DeclareDocumentCommand\@nameauth@FmtName{s m}%
 {%
      \@nameauth@TestDot{#2}%
-     \IfBooleanTF{#1}{#2}{\bgroup\NamesFormat{#2}\egroup}%
+     \if@nameauth@DoComma%
+          \IfBooleanTF{#1}{#2}{\bgroup\NamesFormat{#2}\egroup}%
+     \else
+          \IfBooleanTF{#1}%
+               {\@nameauth@NoComma{#2}}%
+               {\bgroup\NamesFormat{\@nameauth@NoComma{#2}}\egroup}%
+     \fi
 }
 \DeclareDocumentCommand\Name{s o m o}%
 {%
-     \@nameauth@Punctfalse%
+     \if@nameauth@DoComma\edef\Surnames{#3}%
+     \else\edef\Surnames{\@nameauth@NoComma{#3}}\fi%
      \IfValueTF{#2}%
-     {\IfValueTF{#4}{\def\@ForeNames{#4}}{\def\@ForeNames{#2}}%
+     {\IfValueTF{#4}{\edef\Forenames{#4}}{\edef\Forenames{#2}}%
      \ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
           \@nameauth@FmtName*{#2 #3}%
           \PackageWarning{nameauth}%
@@ -66,20 +85,32 @@
           \if@nameauth@DoFormat%
                \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
                \IfBooleanTF{#1}%
-                    {\@nameauth@FmtName*{\@ForeNames{\space}#3}\index{#3,{\space}#2}}%
-                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3,{\space}#2}}%
+                    {\@nameauth@FmtName*{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
+                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
                \else%
                     \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
-                    \@nameauth@FmtName{\@ForeNames{\space}#3}\index{#3,{\space}#2}%
+                    \@nameauth@FmtName{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi%
                \fi%
           \else%
                \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
                \IfBooleanTF{#1}%
-                    {\@nameauth@FmtName*{\@ForeNames{\space}#3}\index{#3,{\space}#2}}%
-                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3,{\space}#2}}%
+                    {\@nameauth@FmtName*{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
+                    {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi}%
                \else%
                     \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
-                    \@nameauth@FmtName*{\@ForeNames{\space}#3}\index{#3,{\space}#2}%
+                    \@nameauth@FmtName*{\Forenames{} #3}%
+                         \if@nameauth@dtx\index{#3=\Surnames, #2}%
+                         \else\index{#3@\Surnames, #2}\fi%
                \fi%
           \fi%
      \fi}%
@@ -92,20 +123,32 @@
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3 #4}\index{#3 #4}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3 #4}}%
+                         {\@nameauth@FmtName*{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
-                         \@nameauth@FmtName{#3 #4}\index{#3 #4}%
+                         \@nameauth@FmtName{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3 #4}\index{#3 #4}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3 #4}}%
+                         {\@nameauth@FmtName*{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
-                         \@nameauth@FmtName*{#3 #4}\index{#3 #4}%
+                         \@nameauth@FmtName*{#3 #4}%
+                              \if@nameauth@dtx\index{#3=\Surnames{} #4}%
+                              \else\index{#3@\Surnames{} #4}\fi%
                      \fi%
                \fi%
           \fi}%
@@ -117,20 +160,32 @@
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3}\index{#3}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3}}%
+                         {\@nameauth@FmtName*{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
-                         \@nameauth@FmtName{#3}\index{#3}%
+                         \@nameauth@FmtName{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
                     \IfBooleanTF{#1}%
-                         {\@nameauth@FmtName*{#3}\index{#3}}%
-                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}\index{#3}}%
+                         {\@nameauth@FmtName*{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
+                         {\@nameauth@FmtName*{\@nameauth@Zapsuffix{#3}}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi}%
                      \else%
                          \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
-                         \@nameauth@FmtName*{#3}\index{#3}%
+                         \@nameauth@FmtName*{#3}%
+                              \if@nameauth@dtx\index{#3=\Surnames}%
+                              \else\index{#3@\Surnames}\fi%
                     \fi%
                \fi%
           \fi}%
@@ -144,34 +199,53 @@
 }
 \DeclareDocumentCommand\AKA{o m o m}%
 {%
-     \@nameauth@Punctfalse%
+     \if@nameauth@DoComma%
+          \edef\Surnamesi{#2}\edef\Surnamesii{#4}%
+          \else\edef\Surnamesi{\@nameauth@NoComma{#2}}%
+          \edef\Surnamesii{\@nameauth@NoComma{#4}}%
+     \fi%
      \IfValueTF{#3}%
      {\@nameauth@FmtName*{#3 #4}%
           \ifcsname\@nameauth@CleanName{#3#4!PN!}\endcsname\relax\else%
                \csgdef{\@nameauth@CleanName{#3#4!PN!}}{}%
                \IfValueTF{#1}%
-                    {\index{#4,{\space}#3|see{#2,{\space}#1}}}%
-                    {\index{#4,{\space}#3|see{#2}}}%
-               \fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii, #3|see{\Surnamesi, #1}}%
+                    \else\index{#4@\Surnamesii, #3|see{\Surnamesi, #1}}\fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii, #3|see{\Surnamesi}}%
+                    \else\index{#4@\Surnamesii, #3|see{\Surnamesi}}\fi}%
+          \fi}%
      {\@nameauth@FmtName*{#4}%
           \ifcsname\@nameauth@CleanName{#4!PN!}\endcsname\relax\else%
                \csgdef{\@nameauth@CleanName{#4!PN!}}{}%
                \IfValueTF{#1}%
-                    {\index{#4|see{#2,{\space}#1}}}%
-                    {\index{#4|see{#2}}}%
-               \fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii|see{\Surnamesi, #1}}%
+                    \else\index{#4@\Surnamesii|see{\Surnamesi, #1}}\fi}%
+                    {\if@nameauth@dtx\index{#4=\Surnamesii|see{\Surnamesi}}%
+                    \else\index{#4@\Surnamesii|see{\Surnamesi}}\fi}%
+          \fi}%
      \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 \DeclareDocumentCommand\IndexName{o m o}%
 {%
+     \if@nameauth@DoComma\edef\Surnames{#2}%
+     \else\edef\Surnames{\@nameauth@NoComma{#2}}\fi%
      \IfValueTF{#1}%
           {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
-          \else\index{#2,{\space}#1}\fi}%
+               \else%
+                    \if@nameauth@dtx\index{#2=\Surnames, #1}%
+                    \else\index{#2@\Surnames, #1}\fi%
+          \fi}%
           {\IfValueTF{#3}
                {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-               \else\index{#2 #3}\fi}
+               \else%
+                    \if@nameauth@dtx\index{#2=\Surnames{} #3}%
+                    \else\index{#2@\Surnames{} #3}\fi%
+          \fi}%
                {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
-               \else\index{#2}\fi}%
+               \else%
+                    \if@nameauth@dtx\index{#2=\Surnames}%
+                    \else\index{#2@\Surnames}\fi%
+               \fi}
           }%
 }
 \DeclareDocumentCommand\ForgetName{o m o}%