nameauth (26mar12)

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

6 files changed, 1396 insertions, 1205 deletions

diff --git a/Master/texmf-dist/doc/latex/nameauth/Makefile b/Master/texmf-dist/doc/latex/nameauth/Makefile
index bb2b992a217..71694f7a7d3 100644
--- a/Master/texmf-dist/doc/latex/nameauth/Makefile
+++ b/Master/texmf-dist/doc/latex/nameauth/Makefile
@@ -1,13 +1,22 @@
 engine ?= pdflatex	# Override on the command line
 			# with engine=latex
 			# or with engine=lualatex
-			# or with engine=xetex.
+			# or with engine=xelatex.
 
+# The pdf target is the normal one. It omits the code listing.
 pdf	:	sty
-		$(engine) nameauth.dtx
-		$(engine) nameauth.dtx
+		$(engine) -draftmode "\AtBeginDocument{\OnlyDescription} \input nameauth.dtx"
+		makeindex -s gglo.ist -o nameauth.gls nameauth.glo
 		makeindex -s gind.ist -o nameauth.ind nameauth.idx
+		$(engine) "\AtBeginDocument{\OnlyDescription} \input nameauth.dtx"
+		$(engine) "\AtBeginDocument{\OnlyDescription} \input nameauth.dtx"
+
+# Making this target includes the code listing
+fullpdf	:	sty
+		$(engine) nameauth.dtx
 		makeindex -s gglo.ist -o nameauth.gls nameauth.glo
+		makeindex -s gind.ist -o nameauth.ind nameauth.idx
+		$(engine) nameauth.dtx
 		$(engine) nameauth.dtx
 
 sty	:	nameauth.dtx nameauth.ins
@@ -22,6 +31,9 @@ clean	:
 		rm -f nameauth.ind
 		rm -f nameauth.log
 		rm -f nameauth.out
+		rm -f nameauth.toc
+		rm -f nameauth.hd
+		rm -f nameauth.top
 
 clobber	:	clean
 		rm -f nameauth.dvi
@@ -30,5 +42,4 @@ clobber	:	clean
 		touch nameauth.*
 
 dist:		pdf clean
-		
 
diff --git a/Master/texmf-dist/doc/latex/nameauth/README b/Master/texmf-dist/doc/latex/nameauth/README
index 223e9ae338b..da2519131b2 100644
--- a/Master/texmf-dist/doc/latex/nameauth/README
+++ b/Master/texmf-dist/doc/latex/nameauth/README
@@ -1,16 +1,15 @@
 The nameauth package
 Charles P. Schaum
 charles dot schaum at att dot net
-v1.1 from 2012/03/08
+v1.2 from 2012/03/25
 
 Abstract
 
 Using the nameauth package, an author can encode names according to a
-name authority. Index entries will be consistent if the input parameters are
-consistent. An author can move blocks of text arbitrarily and the names will
-be reformatted automatically, making it easier to transition from drafts to
-a final manuscript. This package mainly supports Western naming conventions,
-with some basic features for ancient, royal, and Eastern names.
+name authority. Index entries are consistent with input parameters. In-text
+formatting of names is predictable and automated, making it easier to go
+from drafts to a final manuscript. This package mainly supports Western
+names, with basic features for ancient, royal, and Eastern names.
 
 Files		Target distribution
 
@@ -44,11 +43,11 @@ Generate the style file with:
 	$ pdflatex nameauth.ins
 
 Generate the documentation with:
-	$ pdflatex nameauth.dtx
-	$ pdflatex nameauth.dtx
-	$ makeindex -s gind.ist -o nameauth.ind nameauth.idx
+	$ pdflatex nameauth.dtx -draftmode "\AtBeginDocument{\OnlyDescription} \input nameauth.dtx"
 	$ makeindex -s gglo.ist -o nameauth.gls nameauth.glo
-	$ pdflatex nameauth.dtx
+	$ makeindex -s gind.ist -o nameauth.ind nameauth.idx
+	$ pdflatex nameauth.dtx "\AtBeginDocument{\OnlyDescription} \input nameauth.dtx"
+	$ pdflatex nameauth.dtx "\AtBeginDocument{\OnlyDescription} \input nameauth.dtx"
 
 I used GNU make to automate the process:
 	$ make dist
diff --git a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
index 0f1d259c741..2cc6eab5edd 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 b50e3ebf88e..a1fb71cca39 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/03/08 v1.1 name authority macros to aid consistent display and indexing of names]
+    [2012/03/25 v1.2 name authority macros to aid consistent display and indexing of names]
 %</package>
 %
 %<*driver>
@@ -35,31 +35,31 @@
 \usepackage{ifluatex}
 \usepackage{ifpdf}
 \ifxetex
-\usepackage{fontspec}
-\defaultfontfeatures{Mapping=tex-text}
-\usepackage{xunicode}
-\usepackage{xltxtra}
+  \usepackage{fontspec}
+  \defaultfontfeatures{Mapping=tex-text}
+  \usepackage{xunicode}
+  \usepackage{xltxtra}
 \else
-\ifluatex
-\usepackage{fontspec}
-\defaultfontfeatures{Ligatures=TeX}
-\else
-\usepackage[utf8]{inputenc}
-\usepackage[TS1,T1]{fontenc}
-\usepackage{newunicodechar}
-\usepackage{lmodern}
-\DeclareTextSymbolDefault{\textlongs}{TS1}
-\DeclareTextSymbol{\textlongs}{TS1}{115}
-\newunicodechar{ſ}{\textlongs}
-\newunicodechar{ā}{\=a}
-\newunicodechar{ṃ}{\d m}
-\fi
+  \ifluatex
+    \usepackage{fontspec}
+    \defaultfontfeatures{Ligatures=TeX}
+  \else
+    \usepackage[utf8]{inputenc}
+    \usepackage[TS1,T1]{fontenc}
+    \usepackage{newunicodechar}
+    \usepackage{lmodern}
+    \DeclareTextSymbolDefault{\textlongs}{TS1}
+    \DeclareTextSymbol{\textlongs}{TS1}{115}
+    \newunicodechar{ſ}{\textlongs}
+    \newunicodechar{ā}{\=a}
+    \newunicodechar{ṃ}{\d m}
+  \fi
 \fi
 \usepackage{makeidx}
 \usepackage{multicol}
-\usepackage{nameauth}[2012/02/20]
-\usepackage[colorlinks=true,linkcolor=blue]{hyperref}
-\begingroup\lccode`!=`\\\lowercase{\endgroup\def\bsc{!}}
+\usepackage[toc]{multitoc}
+\usepackage{nameauth}[2012/03/25]
+\usepackage{hypdoc}
 \makeindex
 \frenchspacing
 \EnableCrossrefs
@@ -73,7 +73,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{896}
+% \CheckSum{983}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -93,21 +93,23 @@
 %
 %
 % \changes{v0.7}{2011/12/26}{Initial version}
-% \changes{v0.75}{2012/01/19}{New features described; documentation subject to change until 1.0}
-% \changes{v0.8}{2012/01/29}{Refactoring improved functionality and compatibility}
+% \changes{v0.75}{2012/01/19}{New features added and described}
+% \changes{v0.8}{2012/01/29}{Improved function and compatibility; added quick start guide}
 % \changes{v0.85}{2012/02/05}{Added comma suppression, new class options, and more functionality}
 % \changes{v0.86}{2012/02/06}{Fixed some regressions}
-% \changes{v0.9}{2012/02/10}{Added first name formatting, comma and suffix handling expandable}
+% \changes{v0.9}{2012/02/10}{Added first name formatting; comma and suffix handling expandable}
 % \changes{v0.92}{2012/02/12}{Build with all major \LaTeX{} engines}
-% \changes{v0.94}{2012/02/15}{Added index suppression, error checking, better particle handling}
-% \changes{v0.95}{2012/02/17}{Fixed occasional incompatibility with \textsf{microtype}.}
-% \changes{v0.96}{2012/02/19}{Defined compatibility limits with \textsf{microtype} and \textsf{memoir}.}
-% \changes{v1.0}{2012/02/20}{Fixed compatibility issues.}
+% \changes{v0.94}{2012/02/15}{Added index suppression, error checking, name particle caps}
+% \changes{v0.95}{2012/02/17}{Bugfixes}
+% \changes{v0.96}{2012/02/19}{Bugfixes}
+% \changes{v1.0}{2012/02/20}{Works fully with \textsf{microtype} and \textsf{memoir}.}
 % \changes{v1.1}{2012/03/08}{Fixed errors when emitting warnings}
+% \changes{v1.2}{2012/03/25}{Added tagging features; extensively edited documentation}
 %
-% \DoNotIndex{\newcommand, \newenvironment, \@empty, \@gobble, \@period, \@token, \protected@edef, \zap@space, \bfseries, \bgroup, \csgdef, \csundef, \def, \detokenize, \expandafter, \edef, \egroup, \else, \endcsname, \endinput, \futurelet, \fi, \if, \ifx, \ifcsname, \index, \IfBooleanTF, \IfValueTF, \itshape, \let, \newif, \relax, \renewcommand, \scshape, \space, \uppercase, \DeclareDocumentCommand, \DeclareOption, \ExecuteOptions, \PackageWarning, \ProcessOptions, \RequirePackage, \if@nameauth@DoComma, \if@nameauth@DoFormat, \if@nameauth@Punct, \if@nameauth@DoIndex, \if@nameauth@Comma, \if@nameauth@DoCaps, \Forenames, \Surnames, \Surnamesi, \Surnamesii, \TestDot, \TestEnd, \TestPunct, \TestStop, \Test, \bsc, \Shortnames}
+% \DoNotIndex{\@empty, \@gobble, \@period, \@token, \if@nameauth@DoComma, \if@nameauth@DoFormat, \if@nameauth@Punct, \if@nameauth@DoIndex, \if@nameauth@Comma, \if@nameauth@DoCaps, \protected@edef, \zap@space, \bfseries, \bgroup, \csgdef, \csundef,  \DeclareDocumentCommand, \DeclareOption, \def, \detokenize, \edef, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \expandafter, \fi, \Forenames, \futurelet \if, \IfBooleanTF, \ifcsname,\IfValueTF,  \ifx, \index, \itshape, \let, \newcommand, \newenvironment, \newif, \PackageWarning, \ProcessOptions, \relax, \renewcommand, \RequirePackage, \scshape, \space, \Shortnames, \Surnames, \Surnamesi, \Surnamesii, \Test, \TestDot, \TestEnd, \TestPunct, \TestStop, \uppercase}
+%
+% \TagName{Louis}[the Pious]{, emperor}\TagName{Ptolemy I}[Soter]{, king}\TagName{Henry}[VIII]{, English king}\TagName{Charles}[the Bald]{, emperor}\TagName{Francis, I}{, French king}\TagName{Demetrius, I Soter}{, king}\TagName{Charles, V}{, emperor}\TagName{Louis, XIV}{, French king}%
 %
-% \providecommand*{\url}{\texttt}
 % \GetFileInfo{nameauth.dtx}
 % \title{The \textsf{nameauth} package}
 % \author{Charles P. Schaum \\ \texttt{charles dot schaum at att dot net}}
@@ -115,12 +117,24 @@
 % \maketitle
 %
 % \begin{abstract}
-% \noindent Using the \textsf{nameauth} package, an author can encode names according to a name authority. Index entries will be consistent if the input parameters are consistent. An author can move blocks of text arbitrarily and the names will be reformatted automatically, making it easier to transition from drafts to a final manuscript. This package mainly supports Western naming conventions, with some basic features for ancient, royal, and Eastern names.
+% \noindent Using the \textsf{nameauth} package, an author can encode names according to a name authority. Index entries are consistent with input parameters. In-text formatting of names is predictable and automated, making it easier to go from drafts to a final manuscript. This package mainly supports Western names, with basic features for ancient, royal, and Eastern names.
 % \end{abstract}
 %
+% \tableofcontents
+% \clearpage
+%
 % \section{Introduction}
 %
-% Suppose you were working on a collection of essays. Different publishers' permissions may force you to accept variance in the spelling of people's names. You would track and index those names using a name authority. Your index might use abbreviated name forms. This package allows the author to encode names so that the time and cost of an editor and proofreader can be minimized. This could make an author more desirable for publication.
+% Suppose you were working on a collection of essays. Different publishers' permissions may force you to accept variance in the spelling of people's names. You would track and index those names using a name authority. Your index might use abbreviated name forms. This package allows the author to encode names so that the time and cost of an editor and proofreader can be minimized. This could make an author more desirable for publication. Features include:
+% \begin{multicols}{2}
+% \begin{itemize}\setlength\itemsep{0pt}\small
+% \item Simultaneous printing and indexing of names with fuller, typographically distinct first references.
+% \item Printing alternate forenames, yet indexing a canonical form.
+% \item Basic handling of variant names.
+% \item Basic formatting and indexing tasks.
+% \item Automatic addition of tags to names in indexes.
+% \end{itemize}
+% \end{multicols}
 %
 % \subsection{Typesetting, Indexing, and Design}
 %
@@ -130,75 +144,70 @@
 %
 % Thanks to \Name[Marc van]{Dongen}, \Name[Enrico]{Gregorio}, \Name[Philipp]{Stephani}, \Name[Heiko]{Oberdiek}, \Name[Uwe]{Lueck}, and \Name[Robert]{Schlicht} for their invaluable assistance. \FName[Marc van]{Dongen}[Marc] showed me the basic structure using the \textsf{xparse} package. \FName[Enrico]{Gregorio} and \FName[Philipp]{Stephani} helped with generating control sequences and sanitizing. \FName[Heiko]{Oberdiek} gave a space-removing solution that could be passed as an argument in a macro. Code adapted from \FName[Uwe]{Lueck}'s work on the texhax list and the sagacious advice of \FName[Robert]{Schlicht}  enabled the routines to function with the \textsf{microtype} package.
 %
+% \subsection{Disclaimer}
+% This documentation uses names of historical figures. Users will refer to real-world figures in their projects. At no time in this document am I intending either to promote, disparage, or make any assertions about any persons living or dead. All names mentioned herein deserve respect for the impact and legacy of their bearers.
+% \clearpage
+%
 % \section{Usage}
 %
 % \subsection{Package Options}
-% If the default behavior is not desired, the following options easily alter it. The class options are listed with defaults first in each category:
+% The defaults are \texttt{mainmatter}, \texttt{smallcaps}, \texttt{nocomma}, and \texttt{index}. With these options, the package begins immediately to format the first occurrences of names with small caps using a longer version of the name if one exists. It suppresses commas between surnames and suffixes and it indexes all names in place. The following class options alter this behavior.\\
 %
 % \begin{quote}\small
 % \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 \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}.\\[0.25ex]\hline
-% {\large\strut}\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 \cmd{\NamesActive} if an author wants the indexing and aliasing functions without any special typesetting. Additional formatting options are discussed in Section \ref{sec:formatting}. This option is \emph{not} equivalent to \texttt{frontmatter}, which prevents formatting when in force. The \texttt{noformat} option simply sets the ``formatting'' to nil, helping one to write the same document for different publishers' style requirements.\\[0.25ex]\hline
-% {\large\strut}\texttt{nocomma} & The default behavior suppresses printing of commas between surnames and suffixes, following modern styles like \emph{Chicago Manual of Style}. See Section \ref{sec:suffix} for additional implications of this behavior.\\[1ex]
-% \texttt{comma} & Print commas between surnames and suffixes, following older styles. Several points throughout the document discuss the limits that this option imposes.\\[0.25ex]\hline
-% {\large\strut}\texttt{index} & The default behavior creates index entries in place with the names.\\[1ex]
-% \texttt{noindex} & Similar to \texttt{frontmatter}, this option prevents indexing until a call to \cmd{\IndexActive}. See also Section \ref{sec:SectionIndex}.\\
+% \texttt{mainmatter} & Use special typesetting for the first occurrence of a name, starting at the beginning of a document.\\[1ex]
+% \texttt{frontmatter} & Suppress the special typesetting \emph{before} the invocation of \cmd{\NamesActive}. This option fits well, e.g., with front matter from a contributor who may not intend the same formatting and emphasis found in the main matter. The ``first use'' mechanism used with this option works independently of the ``first use'' mechanism after the invocation of \cmd{\NamesActive}. Indexing and aliasing features remain consistent. See also Section \ref{sec:SectionFormat}.\\[0.25ex]\hline
+% {\large\strut}\texttt{smallcaps} & Set the first use of a name in small caps.\\[1ex]
+% \texttt{italic} & Italicize the first occurrence of a name.\\[1ex]
+% \texttt{boldface} & Set the first use of a name in boldface.\\[1ex]
+% \texttt{noformat} & This option suppresses name formatting \emph{after} the invocation of \cmd{\NamesActive}. It does not prevent formatting like the \texttt{frontmatter} option. Additional formatting options are discussed in Section \ref{sec:formatting}, which works differently than the methods in Section \ref{sec:SectionFormat}.\\[0.25ex]\hline
+% {\large\strut}\texttt{nocomma} & Suppress commas between surnames and suffixes, following modern styles like \emph{Chicago Manual of Style}. See also Section \ref{sec:suffix}.\\[1ex]
+% \texttt{comma} & Retain commas between surnames and suffixes. This imposes limits on the use of certain macros.\\[0.25ex]\hline
+% {\large\strut}\texttt{index} & Create index entries in place with the names.\\[1ex]
+% \texttt{noindex} & Prevent indexing before the invocation of the macro \cmd{\IndexActive}. See also Section \ref{sec:SectionIndex}.\\
 % \end{tabular}
 % \end{quote}
 % \clearpage
 %
-% \subsection{Example Text}
-% \label{sec:example}
-%
-% We begin with a sample text that attempts to cover the basic features, and even a couple of advanced ones. It is in the genre of a merry wedding reception toast, proving that a serious package can be used lightheartedly.\\
-%
-% \noindent DISCLAIMER: I use a number of names associated with historical figures throughout this document. This is because I expect that the users of this package will refer to real-world figures. At no time in this document am I intending either to promote, disparage, align with, align against, or make any assertions about any persons living or dead. As far as I am concerned, all names mentioned herein deserve respect for the impact and legacy of their bearers.\\
-%
-% \noindent\textbf{Example Text:}
+% \subsection{Quick Start Guide}
 %
-% {\small\ttfamily This is a toast to |\Name[John]{Smith}| and his longtime sweetheart,\newline |\Name[J.Q.]{Public}[Jane Q.]|. |\FName[John]{Smith}| and\break |``\FName[J.Q.]{Public}[Janie]''| have finally made it official today! After\break casual dating as teenagers, they met again in college where they learned\break about |\Name{Aristotle}| and all the stuff that I can't keep in my head.\break [laughs] Nevertheless, by the time they got to |\Name{John}[Duns Scotus]| they were definitely a number. They studied medieval history-makers like\break |\Name{Gregory, I}| |``\AKA*{Gregory, I}{Gregory}[the Great]''| and by the\break Renaissance they were engaged. After spending time in separate grad schools, these promising medievalists got faculty positions at adjoining colleges\break and here we are. As the brother of |\FName[J.Q.]{Public}[Jane]|\break |``\AKA*[J.Q.]{Public}{Jane}[the Great]''| I am happy to welcome\break |\FName[John]{Smith}[Sir John]| to our raucous family.}\\
-%  
-% This is a toast to \Name[John]{Smith} and his longtime sweetheart, \Name[J.Q.]{Public}[Jane Q.]. \FName[John]{Smith} and ``\FName[J.Q.]{Public}[Janie]'' have finally made it official today! After casual dating as teenagers, they met again in college where they learned about \Name{Aristotle} and all the stuff that I can't keep in my head. [laughs] Nevertheless, by the time they got to \Name{John}[Duns Scotus] they were definitely a number. They studied medieval history-makers like \Name{Gregory, I} ``\AKA*{Gregory, I}{Gregory}[the Great]'' and by the Renaissance they were engaged. After spending time in separate grad schools, these promising medievalists got faculty positions at adjoining colleges and here we are. As the brother of \FName[J.Q.]{Public}[Jane] ``\AKA*[J.Q.]{Public}{Jane}[the Great]'' I am happy to welcome \FName[John]{Smith}[Sir John] to our raucous family.\\
-%  
-% Here you will notice that one can make a reference to Pope |\Name{Gregory, I}| followed by ``the Great'' via |``\AKA*{Gregory, I}{Gregory}[the Great]''|. That is achieved by the ambiguous behavior of the default \texttt{nocomma} option plus the ``sobriquet only'' feature of \cmd{\AKA*}. It is easy to use these features, but can be tricky to debug. Sections \ref{sec:suffix} and \ref{sec:pennames} have more details.
+% This gets one using about 60\% of the package features right away.
 %
-% \subsection{Quick Start Guide}
 % \label{sec:start}
-% \changes{v0.8}{2012/01/29}{Added quick start guide}
-% \changes{v0.85}{2012/02/05}{Updated quick start guide}
-% \changes{v0.96}{2012/02/19}{Redesigned guide for better readability.}
 %
-% This ``cheat sheet'' engages about 80\% of the features in this package.
-%
-% \begin{multicols}{2}\small
 % \subsubsection{Rules of Thumb}
-% \begin{enumerate}\setlength\itemsep{0pt}\small
-% \item \cmd{\frenchspacing} is recommended.
+% \begin{multicols}{2}\small
+% \begin{itemize}\setlength\itemsep{0pt}
+% \item Use \cmd{\frenchspacing}.
 % \item The indexed forms of the names remain the same if you follow the macro input charts consistently.
-% \item Problematic index entries often lead to correctable mistakes.
+% \item Examine index entries to find and correct mistakes.
 % \item Trade work for consistency.
 % \item Use just the macros you \emph{need}.
-% \end{enumerate}
-% \subsubsection{Basic}
-% These examples work predictably under the broadest conditions.
-% \begin{enumerate}\setlength\itemsep{0pt}\small
+% \end{itemize}
+% \end{multicols}
+%
+% \subsubsection{Basic Naming}
+% \begin{multicols}{2}\small
+% \noindent The macro used most often is \cmd{\Name}. When referring to a name for the first time, the following macros all have the same result:
+% \begin{enumerate}\setlength\itemsep{0pt}
 % \item First reference: \ForgetName[John]{Smith}\Name[John]{Smith}\\[0.5ex]
 % |\Name*[John]{Smith}| or\\ |\Name[John]{Smith}| or\\ |\FName[John]{Smith}|
+% \item First mononym reference: \ForgetName{Plato}\Name{Plato}\\[0.5ex]
+% |\Name*{Plato}| or\\ |\Name{Plato}| or\\ |\FName{Plato}|
+% \end{enumerate}
+% Subsequent references to names have a different format depending on the macro used:
+% \begin{enumerate}\setlength\itemsep{0pt}
 % \item Subsequent full name: \Name*[John]{Smith}\\[0.5ex]
 % |\Name*[John]{Smith}|
 % \item Subsequent surname: \Name[John]{Smith}\\[0.5ex]
 % |\Name[John]{Smith}|
 % \item Subsequent forename: \FName[John]{Smith}\\[0.5ex]
 % |\FName[John]{Smith}|
-% \item First mononym reference: \ForgetName{Plato}\Name{Plato}\\[0.5ex]
+% \item Subsequent mononym: \Name{Plato}\\[0.5ex]
 % |\Name*{Plato}| or\\ |\Name{Plato}| or\\ |\FName{Plato}|
-% \item Subsequent references: \Name{Plato}\\[0.5ex]
-% |\Name*{Plato}| or\\ |\Name{Plato}| or\\ |\FName{Plato}|\\[1.5ex]
-% These next examples work with the \texttt{comma} option, not \cmd{\AKA} and \cmd{\PName}. The next page offers a workaround that depends on the \texttt{nocomma} option.
+% \end{enumerate}
+% These next examples work with or without the \texttt{comma} option. \cmd{\AKA} and \cmd{\PName} cannot cross-reference these forms. Page \pageref{sec:Intermediate}, Section \ref{sec:suffix}, and Section \ref{sec:pennames} address this issue with different solutions.
+% \begin{enumerate}\setlength\itemsep{0pt}
 % \item First Eastern ref: \ForgetName{Mao}[Tse-tung]\Name{Mao}[Tse-tung]\\[0.5ex]
 % |\Name*{Mao}[Tse-tung]| or\\ |\Name{Mao}[Tse-tung]|
 % \item Subsequent references: \Name*{Mao}[Tse-tung]\\[0.5ex]
@@ -222,23 +231,26 @@
 % \item Subsequent refs: \Name*{Henry}[VIII]\\[0.5ex]
 % |\Name*{Henry}[VIII]|
 % \item Subsequent references: \Name{Henry}[VIII]\\[0.5ex]
-% |\Name{Henry}[VIII]| or\\ |\FName{Henry}[VIII]|\\[1ex]
+% |\Name{Henry}[VIII]| or\\ |\FName{Henry}[VIII]|
 % \end{enumerate}
-% \subsubsection{Intermediate}
-% The following employ alternate forenames. They keep regular forenames in the index. 
+% These examples show printing of alternate forenames, keeping the same name in the index. They use both the first and final optional parameters of \cmd{\Name} and friends.
 % \begin{enumerate}\setlength\itemsep{0pt}\small
-% \item Print an embellished first reference: \ForgetName[J.Q.]{Public}\Name[J.Q.]{Public}[Jane Q.]\\[0.5ex]
+% \item Long first ref: \ForgetName[J.Q.]{Public}\Name[J.Q.]{Public}[Jane Q.]\\[0.5ex]
 % |\Name*[J.Q.]{Public}[Jane Q.]| or\\ |\Name[J.Q.]{Public}[Jane Q.]| or\\ |\FName[J.Q.]{Public}[Jane Q.]|
-% \item Subsequent full name, alternate forename, same person in index: \Name*[J.Q.]{Public}[Jane Qetsiyah]\\[0.5ex]
+% \item Different forenames, same surname: \Name*[J.Q.]{Public}[Jane Qetsiyah]\\[0.5ex]
 % {\footnotesize |\Name*[J.Q.]{Public}[Jane Qetsiyah]|}
-% \item Subsequent ``shorter'' full name, same person in index: \Name*[J.Q.]{Public}\\[0.5ex]
+% \item Subsequent name: \Name*[J.Q.]{Public}\\[0.5ex]
 % |\Name*[J.Q.]{Public}|
-% \item Subsequent alternate forename, same person in index: \FName[J.Q.]{Public}[Janie]\\[0.5ex]
+% \item Alternate forename: \FName[J.Q.]{Public}[Janie]\\[0.5ex]
 % |\FName[J.Q.]{Public}[Janie]|
 % \end{enumerate}
-% \subsubsection{Advanced}
-% These next examples engage a number of special cases. Many depend on the default \texttt{nocomma} option. Always use a comma to delimit suffixes. Use a space or thin space after the comma. These forms will work with \cmd{\AKA} and \cmd{\PName}. See also Section \ref{sec:suffix}
-% \begin{enumerate}\setlength\itemsep{0pt}\small
+% \end{multicols}
+%
+% \subsubsection{Intermediate Naming}
+% \label{sec:Intermediate}
+% \begin{multicols}{2}\small
+% Always use a comma to delimit suffixes, followed by a space or thin space. \cmd{\AKA} and \cmd{\PName} will cross-reference these forms. See also Section \ref{sec:suffix}. Macros that are too wide for the column are split across lines using the comment token, but need not be so in the text.
+% \begin{enumerate}\setlength\itemsep{0pt}
 % \item First: \ForgetName[George S.]{Patton, Jr.}\Name[George S.]{Patton, Jr.}\\[0.5ex]
 % {\footnotesize |\Name*[George S.]{Patton, Jr.}| or\\ |\Name[George S.]{Patton, Jr.}| or\\ |\FName[George S.]{Patton, Jr.}|}
 % \item Subsequent full: \Name*[George S.]{Patton, Jr.}\\[0.5ex]
@@ -246,13 +258,18 @@
 % \item Subsequent surname: \Name[George S.]{Patton, Jr.}\\[0.5ex]
 % |\Name[George S.]{Patton, Jr.}|
 % \item Subsequent forename: \FName[George S.]{Patton, Jr.}[George]\\[0.5ex]
-% |\FName[George S.]{Patton, Jr.}%|\\|[George]|\\[2ex] The next forms take advantage of comma suppression to implement forms of ancient, royal and Eastern names. Adding a final optional parameter is discouraged.
-% \item First reference: \ForgetName{Gregory, I}\Name{Gregory, I}\\[0.5ex]
-% |\Name*{Gregory, I}| or\\ |\Name{Gregory, I}| or\\ |\FName{Gregory, I}|
-% \item Subsequent full name: \Name*{Gregory, I}\\[0.5ex]
-% |\Name*{Gregory, I}|
-% \item Subsequent name: \Name{Gregory, I}\\[0.5ex]
-% |\Name{Gregory, I}| or\\ |\FName{Gregory, I}|
+% |\FName[George S.]{Patton, Jr.}%|\\|[George]|
+% \end{enumerate}
+% These cases depend on the default \texttt{nocomma} option, whereby one can use comma suppression to implement forms of ancient, royal and Eastern names. By avoiding the final optional parameter of \cmd{\Name} and friends, \cmd{\AKA} and \cmd{\PName} will cross-reference these forms.
+%
+% |\Name{Ptolemy I}[Soter]| (see above) keeps the number with the name. Below, the form |\Name{Demetrius, I Soter}| keeps the number with the sobriquet. To keep the number with the name, use |\Name{Demetrius I, Soter}|.
+% \begin{enumerate}\setlength\itemsep{0pt}
+% \item First reference: \ForgetName{Francis, I}\Name{Francis, I}\\[0.5ex]
+% |\Name*{Francis, I}| or\\ |\Name{Francis, I}| or\\ |\FName{Francis, I}|
+% \item Subsequent full name: \Name*{Francis, I}\\[0.5ex]
+% |\Name*{Francis, I}|
+% \item Subsequent name: \Name{Francis, I}\\[0.5ex]
+% |\Name{Francis, I}| or\\ |\FName{Francis, I}|
 % \item First reference: \ForgetName{Demetrius, I Soter}\Name{Demetrius, I Soter}\\[0.5ex]
 % |\Name*{Demetrius, I Soter}| or\\ |\Name{Demetrius, I Soter}| or\\ |\FName{Demetrius, I Soter}|
 % \item Next full name: \Name*{Demetrius, I Soter}\\[0.5ex]
@@ -264,7 +281,10 @@
 % \item Subsequent full name: \Name*{Sun, Yat-sen}\\[0.5ex]
 % |\Name*{Sun, Yat-sen}|
 % \item Subsequent name: \Name{Sun, Yat-sen}\\[0.5ex]
-% |\Name{Sun, Yat-sen}| or\\ |\FName{Sun, Yat-sen}|\\[2ex] The following illustrate the American style of particulate names.
+% |\Name{Sun, Yat-sen}| or\\ |\FName{Sun, Yat-sen}|
+% \end{enumerate}
+% Particulate names contain prepositions that refer to an ancestral place or name. The following illustrate the American style of particulate names.
+% \begin{enumerate}\setlength\itemsep{0pt}
 % \item First: \Name[Walter]{de la Mare}\\[0.5ex]
 % |\Name*[Walter]{de la Mare}| or\\ |\Name[Walter]{de la Mare}| or\\ |\FName[Walter]{de la Mare}|
 % \item Next reference: \Name[Walter]{de la Mare}\\[0.5ex]
@@ -272,62 +292,41 @@
 % \item At start of sentence: \CapThis\Name[Walter]{de la Mare}\\[0.5ex]
 % |\CapThis\Name[Walter]{de la Mare}|
 % \item Forename: \FName[Walter]{de la Mare}\\[0.5ex]
-% |\FName[Walter]{de la Mare}|\\[2ex] The following illustrate the Continental style of particulate names. The first keeps particles in the index.
-% \item First: \Name[Johann Wolfgang von]{Goethe}\\[0.5ex]
-% {\footnotesize |\Name*[Johann Wolfgang von]{Goethe}|\,or\\ |\Name[Johann Wolfgang von]{Goethe}|\,or\\ |\FName[Johann Wolfgang von]{Goethe}|}
-% \item Subsequent surname: \Name[Johann Wolfgang von]{Goethe}\\[0.5ex]
-% |\Name[Johann Wolfgang von]{Goethe}|
-% \item Next forename: \FName[Johann Wolfgang von]{Goethe}[Johann Wolfgang]\\[0.5ex]
-% |\FName[Johann Wolfgang von]%|\\ |{Goethe}[Johann Wolfgang]|\\[2ex] The following Continental forms prevent the indexing of particles.
+% |\FName[Walter]{de la Mare}|
+% \end{enumerate}
+% \label{FirstVonLast}
+% The following examples illustrate the Continental style of particulate names. Forms 1--4 keep the particles with the names in the index. Forms 5--7 omit the particles in the index by using alternate forenames. Long commands are split using the comment token, but need not be so in the text.
+% \begin{enumerate}\setlength\itemsep{0pt}
+% \item The (admittedly long) first use:\\\Name[Johann Wolfgang von]{Goethe}\\[0.5ex]
+% |\Name*[Johann Wolfgang von]%|\\|{Goethe}| or\\ |\Name[Johann Wolfgang von]%|\\|{Goethe}| or\\ |\FName[Johann Wolfgang von]%|\\|{Goethe}|
+% \item Subsequent: \Name[Johann Wolfgang von]{Goethe}\\[0.5ex]
+% |\Name[Johann Wolfgang von]%|\\|{Goethe}|
+% \item Forenames: \FName[Johann Wolfgang von]{Goethe}[Johann Wolfgang]\\[0.5ex]
+% |\FName[Johann Wolfgang von]%|\\ |{Goethe}[Johann Wolfgang]|
 % \item First: \Name[Adolf]{Harnack}[Adolf von]\\[0.5ex]
-% {\footnotesize|\Name*[Adolf]{Harnack}[Adolf von]|\,or\\ |\Name[Adolf]{Harnack}[Adolf von]|\,or\\ |\FName[Adolf]{Harnack}[Adolf von]|}
+% |\Name*[Adolf]{Harnack}[Adolf von]|\,or\\ |\Name[Adolf]{Harnack}[Adolf von]|\,or\\ |\FName[Adolf]{Harnack}[Adolf von]|
 % \item Next full name: \Name*[Adolf]{Harnack}[Adolf von]\\[0.5ex]
-% |\Name*[Adolf]{Harnack}[Adolf von]| \\[2ex] With the following example, the final optional parameter can be dropped.
+% |\Name*[Adolf]{Harnack}[Adolf von]|
 % \item Subsequent surname: \Name[Adolf]{Harnack}[Adolf von]\\[0.5ex]
-% |\Name[Adolf]{Harnack}[Adolf von]|
+% |\Name[Adolf]{Harnack}[Adolf von]| or |\Name[Adolf]{Harnack}|
 % \item Subsequent forename: \FName[Adolf]{Harnack}\\[0.5ex]
 % |\FName[Adolf]{Harnack}|
 % \end{enumerate}
-% \subsubsection{Expert}
-% The following examples deal with complicated or technical macros.
-% \begin{enumerate}\setlength\itemsep{0pt}\small
-% \item Index, but do not print a reference to ``Public, J.Q.'' \IndexName[J.Q.]{Public}\\[0.5ex]
-% |\IndexName[J.Q.]{Public}|\\[0.5ex] Note that in Western names, the final optional parameters are ignored.
-% \item Index, but do not print a reference to ``Plato'' \IndexName{Plato}\\[0.5ex]
-% |\IndexName{Plato}|
-% \item Index, but do not print a reference to ``Mao Tse-tung'' \IndexName{Mao}[Tse-tung]\\[0.5ex]
-% |\IndexName{Mao}[Tse-tung]|
-% \item Index, but do not print a reference to ``Henry VIII'' \IndexName{Henry}[VIII]\\[0.5ex]
-% |\IndexName{Henry}[VIII]|
-% \item Index, but do not print a reference to ``Ptolemy I Soter'' \IndexName{Ptolemy I}[Soter]\\[0.5ex]
-% |\IndexName{Ptolemy I}[Soter]|\\[0.5ex] The following only work with the default \texttt{nocomma} option.
-% \item Index, but do not print a reference to ``Gregory I'' \IndexName{Gregory, I}\\[0.5ex]
-% |\IndexName{Gregory, I}|
-% \item Index, but do not print a reference to ``Sun Yat-sen'' \IndexName{Sun, Yat-sen}\\[0.5ex]
-% |\IndexName{Sun, Yat-sen}|
-% \item Following a name, print a pseudonym in parentheses: \PName[Bob]{Hope}[Leslie Townes]{Hope}\\[0.5ex]
-% |\PName[Bob]{Hope}%|\\|[Leslie Townes]{Hope}|
-% \item Print a name that is only a \emph{see} reference to another: \AKA[Bob]{Hope}[Lester T.]{Hope}\\[0.5ex]
-% |\AKA[Bob]{Hope}[Lester T.]{Hope}|\\[2ex] The following only works with the default \texttt{nocomma} option.
-% \item Print a name and ``sobriquet'' for an ancient name, making it a cross-reference: \AKA{Leo, I}{Leo}[the Great]\\[0.5ex]
-% |\AKA{Leo, I}{Leo}[the Great]|
-% \item Print only a ``sobriquet'' after a \cmd{\Name} reference: \Name{Leo, I} ``\AKA*{Leo, I}{Leo}[the Great]''\\[0.5ex]
-% |\Name{Leo, I}| |``\AKA*{Leo, I}%| |{Leo}[the Great]''|
-% \end{enumerate}
-% \subsubsection{Pitfalls}
-% Avoiding the following pitfalls will save time and frustration:
-% \begin{enumerate}\setlength\itemsep{0pt}\small
-% \item Mixing sobriquets with modern forms fails due to the ``alternate name'' feature, e.g.:\\ |\Name[First]{Ancient}[Sobriquet]|\\ |\Name[King]{Number}[Sobriquet]|
-% \item Using \cmd{\AKA} and \cmd{\PName} with sobriquet-based forms will fail unless you use comma-delimited suffixes. See Section \ref{sec:suffix}.
-% \item Using a forename or first initials can prevent failure in some cases:\\[0.5ex]{\footnotesize OK: |\Name[J.]{Kreskin}[The Amazing]|\\ |(\AKA[J.]{Kreskin}[Joseph]{Kresge})|\\[0.5ex] FAIL: |\Name[]{Kreskin}[The Amazing]|\\ |(\AKA{Kreskin}[Joseph]{Kresge})|\\[0.5ex] FAIL: |\Name{Kreskin}[The Amazing]|\\ |(\AKA{Kreskin}[Joseph]{Kresge})|}
-% \item \cmd{\Name} can shorten a reference even if you use the full name in the text.
-% \item Unbalanced or incorrect \texttt{\{} braces \texttt{\}} and \texttt{[} brackets \texttt{]}, putting a star |*| after |\FName|, and forgetting periods in initials create errors that can be difficult to track. Leading spaces in macro arguments will create incorrectly sorted index entries.
-% \end{enumerate}
 % \end{multicols}
- %
-% \subsection{Basic Macros: \bsc Name and \bsc FName}
 %
-% \subsubsection{\texttt{\bsc Name} and \texttt{\bsc Name*}}
+% \subsubsection{Common Pitfalls}
+% Avoiding the following pitfalls will save much time and frustration:
+% \begin{enumerate}\setlength\itemsep{0pt}
+% \item Mixing sobriquets with modern forms fails due to the ``alternate name'' feature that replaces the first with the final optional parameters, e.g.:\\ |\Name[First]{Ancient}[Sobriquet]|\\ |\Name[King]{Number}[Sobriquet]|
+% \item Using \cmd{\AKA} and \cmd{\PName} with forms that use the final optional parameter of \cmd{\Name} and friends will fail unless one uses comma-delimited suffixes. See Section \ref{sec:suffix} and Section \ref{sec:AKA}.
+% \item Using a forename or first initials can prevent failure in some cases:\\[0.5ex]{\footnotesize OK: |\Name[J.]{Kreskin}[The Amazing] (\AKA[J.]{Kreskin}[Joseph]{Kresge})|\\[0.5ex] FAIL: |\Name[]{Kreskin}[The Amazing] (\AKA{Kreskin}[Joseph]{Kresge})|\\[0.5ex] FAIL: |\Name{Kreskin}[The Amazing] (\AKA{Kreskin}[Joseph]{Kresge})|}
+% \item \cmd{\Name} can shorten a reference even if you use the full name in the text. Do not depend on the name you see when you are typing. Depend on the form of the macro, whether \cmd{\Name}, \cmd{\Name*}, or \cmd{\FName}.
+% \item Unbalanced or incorrect \texttt{\{} braces \texttt{\}} and \texttt{[} brackets \texttt{]}, putting a star |*| after |\FName|, and forgetting periods in initials create errors that can be difficult to track. Leading spaces in macro arguments will create incorrectly sorted index entries. The results are usually a failure to finish scanning the document or a spurious index entry.
+% \end{enumerate}
+%
+% \subsection{Naming Macros}
+%
+% \subsubsection{Surnames: \cmd{\Name} and \cmd{\Name*}}
 % 
 % \DescribeMacro{\Name}
 % \DescribeMacro{\Name*}
@@ -338,11 +337,11 @@
 % \cmd{\Name*}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}
 % \end{quote}
 %
-% \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 do not capture exactly how the \cmd{\Name} macro behaves. The following table helps to show first and subsequent references:
+% \noindent From now on we will abbreviate \meta{forename(s)} with \meta{FNN} and \meta{surname(s)} with \meta{SNN} at various points. The following table helps to show how the syntax description works with first and subsequent references:
 %
 % \begin{quote}\small
 % \begin{tabular}{llll}\hline
-% {\large\strut}\emph{FNN} & \emph{SNN} & Alternate Names & Result\\\hline
+% {\large\strut}\meta{FNN} & \meta{SNN} & \meta{Alternate Names} & Result\\\hline
 % \texttt{Albert} & \texttt {Einstein} & (none) & \Name[Albert]{Einstein}\\
 % \texttt{Albert} & \texttt {Einstein} & (none) & \Name[Albert]{Einstein}\\
 % (none) & \texttt{Confucius} & (none) & \Name{Confucius}\\
@@ -354,19 +353,19 @@
 % \end{tabular}
 % \end{quote}
 %
-% \noindent Basically, \cmd{\Name} connects the \emph{FNN} to the \emph{SNN} to create respective printed and indexed forms, usually \emph{FNN}\,\emph{SNN} and \emph{SNN},\,\emph{FNN}. This takes care of most Western names. For those with one name, such as ancient figures or stage names, one can drop the \emph{FNN} so that \cmd{\Name} produces the result \emph{SNN} for both text and index.\cmd{\Name} always prints the surname or ``base name.''
+% \noindent Basically, \cmd{\Name} connects the \meta{FNN} to the \meta{SNN} to create respective printed and indexed forms, usually \meta{FNN}\,\meta{SNN} and \meta{SNN},\,\meta{FNN}. This takes care of most Western names. For those with one name, such as ancient figures or stage names, one can drop the \meta{FNN} so that \cmd{\Name} produces the result \meta{SNN} for both text and index.\cmd{\Name} always prints the surname or ``base name.''
 %
-% Sometimes you might want to have the option of using either an alternate set of forenames, like a nickname, 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 may choose to include or exclude nicknames and such, but you must always use the sobriquet form of a name consistently.
+% Sometimes you might want to have the option of using either an alternate set of forenames, like a nickname, 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'' \meta{FNN} are present, then the alternate names conditionally will replace the \meta{FNN} in the printed form, but not in the indexed form. If no regular \meta{FNN} are present, then the alternate names will be appended to the \meta{SNN} in the printed form \emph{and} in the indexed form. You may choose to include or exclude nicknames and such, but you must always use the sobriquet form of a name consistently.
 %
 % 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.
 %
-% As long as the ``main'' \emph{FNN} are constant in Western-style names, the ``alternate names'' field can vary, yet the index entries will be constant. Sections \ref{sec:example} and  \ref{sec:start} contain a number of ``intermediate'' examples that illustrate this ability to swap out forenames. This is useful when dropping out references to middle initials in \cmd{\FName}. Alternate forenames only get printed in subsequent occurrences of \cmd{\Name*} and \cmd{\FName}. The surname argument is \emph{always} printed in \cmd{\Name*} and \cmd{\Name}.
+% As long as the ``main'' \meta{FNN} are constant in Western-style names, the ``alternate names'' field can vary, yet the index entries will be constant. Section  \ref{sec:start} contains examples that illustrate this ability to swap out forenames. This is useful when dropping out references to middle initials in \cmd{\FName}. Alternate forenames only get printed in subsequent occurrences of \cmd{\Name*} and \cmd{\FName}. The surname argument is \emph{always} printed in \cmd{\Name*} and \cmd{\Name}.
 %
 % Another option employs a ``sobriquet'' feature for royal names and basic Eastern names. \cmd{\AKA} and \cmd{\PName} cannot refer to these forms, although they can use these forms in the \emph{second} name argument to construct a cross-reference. A workaround is discussed in Section \ref{sec:suffix}. The following method is the only one that works with the \texttt{comma} option. Valid ``sobriquet'' forms are:\\
 %
 % \bgroup\footnotesize\ForgetName{Henry}[VIII]
 % \begin{tabular}{llp{1.2cm}ll}\hline
-% {\normalsize\strut}\emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
+% {\normalsize\strut}\meta{FNN} & \meta{SNN} & \meta{Alternate Names} & Result & Function\\\hline
 % (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & |\Name{Henry}[VIII]|\\
 % (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & |\Name{Henry}[VIII]|\\\hline
 % (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & |\Name{Chiang}[Kai-shek]|\\
@@ -374,11 +373,11 @@
 % \end{tabular}
 % \egroup\bigskip
 %
-% \noindent Again, 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 between the two actions---\emph{this is a central concept}. 
+% \noindent Again, alternate forenames \emph{override} the \meta{FNN} in the text. Sobriquets are \emph{appended} to \meta{SNN}. The presence or absence of \meta{FNN} triggers this difference between the two actions---\textbf{this is a central concept}. 
 %
 % \emph{Note}: Throughout this manual I play a ``dirty trick'' that makes a name print as if it had not yet occurred. In some cases I make a first occurrence print as if the name already had occurred. This trick can be used, for example, to force the formatting of the first name in a chapter or section. See Section \ref{sec:Tweaks} for more.
 %
-% \subsubsection{\texttt{\bsc FName}}
+% \subsubsection{Forenames: \cmd{\FName}}
 %
 % \DescribeMacro{\FName}
 % This casual friend of \cmd{\Name} prints only ``first'' names except if a first use occurs, whereupon it prints a full, formatted name as set by the class options or the formatting macros. \cmd{\FName} is intended for Western-style names. The syntax is basically the same:
@@ -389,7 +388,7 @@
 %
 % \begin{quote}\small
 % \begin{tabular}{llll}\hline
-% {\large\strut}\emph{FNN} & \emph{SNN} & Alternate Names & Result\\\hline
+% {\large\strut}\meta{FNN} & \meta{SNN} & \meta{Alternate Names} & Result\\\hline
 % \texttt{Albert} & \texttt {Einstein} & (none) & \FName[Albert]{Einstein}\\
 % (none) & \texttt{Confucius} & (none) & \FName{Confucius}\\
 % \texttt{M.T.} & \texttt{Cicero} & \texttt{Marcus Tullius} & \FName[M.T.]{Cicero}[Marcus Tullius]\\
@@ -405,25 +404,14 @@
 % \begin{quote}|\FName[J.D.]{Rock, III}|, ``\FName[J.D.]{Rock, III},'' |\FName{Charles, V}|, ``\FName{Charles, V}''\end{quote}
 % \cmd{\FName} suppresses extra periods if a forename with initials occurs at the end of a sentence, as in the plot-line ``who shot \FName[J.D.]{Rock, III}.'' See also Section \ref{sec:suffix}.
 %
-% \subsection{Advanced Topics}
-%
-% \subsubsection{Error Handling}
-% \label{sec:error}
-%
-% Except for \cmd{\ExcludeName}, the macros silently print any erroneous arguments in the text and emit warnings. Sometimes a warning is just a warning. \cmd{\PName} produces warnings via \cmd{\Name} and \cmd{\AKA}. Warnings result from:
-% \begin{enumerate}\setlength{\itemsep}{-0.4ex}
-% \item Using a cross-reference \oarg{alternate FNN}\marg{alternate SNN}\oarg{alt. names} created by \cmd{\AKA} as a reference in \cmd{\Name}, \cmd{\FName}, and \cmd{\PName}.
-% \item Using a reference \oarg{FNN}\marg{SNN}\oarg{alternate names} created by \cmd{\Name}, \cmd{\FName}, and \cmd{\PName} as a cross-reference in \cmd{\AKA}.
-% \item Using \cmd{\AKA} to create the same xref multiple times.
-% \item Using \cmd{\ExcludeName} to exclude a name that has already been used.
-% \end{enumerate}
-% 
+% \subsection{Advanced Naming Topics}
 % \subsubsection{Naming Conventions}
 %
 % \DescribeMacro{\CapThis}
-% English names with the particles \emph{de}, \emph{de\ la}, \emph{d'}, \emph{von}, \emph{van}, and \emph{ten} generally keep them with the last name, using varied capitalization. \emph{Le}, \emph{La}, and \emph{L'} are capitalized unless preceded by \emph{de}. In English, these particles go in the \emph{SNN} field of \cmd{\Name}, e.g., \ForgetName[Walter]{de la Mare}\Name[Walter]{de la Mare}. To capitalize the first particle in a subsequent \cmd{\Name} reference at the beginning of a sentence, use |\CapThis\Name[Walter]{de la Mare}|. \CapThis\Name[Walter]{de la Mare} will think it fair.
+% English names with the particles \emph{de}, \emph{de\ la}, \emph{d'}, \emph{von}, \emph{van}, and \emph{ten} generally keep them with the last name, using varied capitalization. \emph{Le}, \emph{La}, and \emph{L'} are capitalized unless preceded by \emph{de}. In English, these particles go in the \meta{SNN} field of \cmd{\Name}, e.g., \ForgetName[Walter]{de la Mare}\Name[Walter]{de la Mare}. To capitalize the first particle in a subsequent \cmd{\Name} reference at the beginning of a sentence, use |\CapThis\Name[Walter]{de la Mare}|. \CapThis\Name[Walter]{de la Mare} will think it fair.
 %
-% Names foreign to English usually put these particles in the \emph{FNN} field of \cmd{\Name}. Yet these particles are not first names. Using \cmd{\FName} with alternate forenames overcomes this issue. Section \ref{sec:start} likely has the best illustration of this.
+% Names foreign to English usually put these particles in the \meta{FNN} field of \cmd{\Name}. Yet these particles are not first names. Using \cmd{\FName} with alternate forenames avoids the particles. See the examples on page \pageref{FirstVonLast}.
+
 %
 % \subsubsection{Hyphenation}
 %
@@ -431,38 +419,14 @@
 %
 % One can insert optional hyphens in the arguments of \cmd{\Name} and friends but that must be done \emph{consistently} to avoid variants being treated as different names.
 %
-% \subsubsection{\texttt{\bsc IndexName}}
-% 
-% \DescribeMacro{\IndexName}
-% This macro creates an index entry like \cmd{\Name} and friends. It prints no text in the body and includes no special formatting. The syntax is similar to \cmd{\Name}:
-% \begin{quote}
-% \cmd{\IndexName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
-% \end{quote}
-% \cmd{\IndexName} does not index the alternate names unless \emph{FNN} are absent, like \cmd{\Name} using the sobriquet feature. See also Section \ref{sec:SectionIndex} for switching indexing on and off.
-%
-% \subsubsection{\texttt{\bsc ExcludeName}}
-% 
-% \DescribeMacro{\ExcludeName}
-% This prevents \cmd{\Name}, etc. from both formatting and indexing a specific name, but \emph{only if that name has not been used}. See also Section \ref{sec:error}. The syntax is:
-% \begin{quote}
-% \cmd{\ExcludeName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
-% \end{quote}
-% To suppress only indexing but retain formatting, enclose \cmd{\Name}, etc. between \cmd{\IndexInactive} and \cmd{\IndexActive}.
-%
-% \subsubsection{Manual Index Entries}
-% \label{sec:manual}
-%
-% \cmd{\Name} and friends produce index entries compatible with manual index entries since version 0.9. The \texttt{.idx} file is a helpful reference when linking manual entries with \textsf{nameauth} entries, although it is usually unnecessary to consult.
-%
 % \subsubsection{Suffix Removal}
 % \label{sec:suffix}
-% \changes{v0.85}{2012/02/05}{New suffix removal features}
 % 
-% \cmd{\Name}---not \cmd{\Name*}---truncates comma-delimited suffixes from last names. For example, it prints the name \Name[Oskar]{Hammerstein, II} the first time and \Name[Oskar]{Hammerstein, II} thereafter. One must always use a comma to activate this, e.g., |\Name[Oskar]{Hammerstein, II}|. The space after the comma is literal, but not manipulated by the package in case one wants to use a thin space.
+% \cmd{\Name}---not \cmd{\Name*}---truncates comma-delimited suffixes from last names. For example, it prints the name \Name[Oskar]{Hammerstein, II} the first time and \Name[Oskar]{Hammerstein, II} thereafter. One must always use a comma to activate this, e.g., |\Name[Oskar]{Hammerstein, II}|. You should use a space or a thin space after the comma in order to separate the suffix from the surname.
 %
-% Again, \textbf{the comma is not optional with suffixes}. It is how this feature works. More than one comma in the \emph{SNN} argument of \cmd{\Name} and friends will cause unwanted results. Fortunately, that is unlikely.
+% Again, \textbf{the comma is not optional with suffixes}. It is how this feature works. More than one comma in the \meta{SNN} argument of \cmd{\Name} and friends will cause unwanted results. Fortunately, that is unlikely.
 %
-%  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 possible combinations:
+%  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 combinations:
 % 
 % \ForgetName[Martin Luther]{King, Jr.}%
 % \begin{quote}\small
@@ -479,7 +443,7 @@
 %
 % \begin{quote}\small\ForgetName{Sun, Yat-sen}
 % \begin{tabular}{llp{1.2cm}ll}\hline
-% {\large\strut}\emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
+% {\large\strut}\meta{FNN} & \meta{SNN} & \meta{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}|\\
@@ -489,51 +453,233 @@
 %
 % \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. The sobriquet feature would otherwise prevent such usage.
 %
-% Even though suffix and sobriquet features look like they produce the same \emph{output} in the body text using the \texttt{nocomma} option, they are internally \emph{different}. They will not respect each other regarding ``first use,'' although they will (tentatively) cooperate in the index. Use each approach consistently. An example of ``dangerous'' use of these features occurs in Section \ref{sec:formatting}. The \texttt{comma} option will cause these forms above to have commas and behave differently. Again, \emph{caveat auctor}.
+% Even though suffix and sobriquet features look like they produce the same \emph{output} in the body text using the \texttt{nocomma} option, they are internally \emph{different}. They will not respect each other regarding ``first use,'' although they will (tentatively) cooperate in the index. Use each approach consistently. An example of ``dangerous'' use of these features occurs in Section \ref{sec:formatting}. The \texttt{comma} option will cause these forms above to have commas and behave differently.
+%
+% \subsubsection{Accented Names}
+% \label{sec:accents}
+% 
+% The following Unicode characters are available using \textsf{inputenc}/\textsf{fontenc}:
+% \begin{quote}
+% \begin{tabular}{llll}
+% \scshape À Á Â Ã Ä Å Æ & \scshape Ç È É Ê Ë & \scshape Ì Í Î Ï Ð Ñ & \scshape first use \\
+% À Á Â Ã Ä Å Æ & Ç È É Ê Ë & Ì Í Î Ï Ð Ñ & second use \\[1ex]
+% \scshape Ò Ó Ô Õ Ö Ø & \scshape Ù Ú Û Ü Ý & \scshape Þ ß & \scshape first use \\
+% Ò Ó Ô Õ Ö Ø & Ù Ú Û Ü Ý & Þ ß & second use \\[1ex]
+% \scshape à á â ã ä å æ & \scshape ç è é ê ë & \scshape ì í î ï ð ñ & \scshape first use \\
+% à á â ã ä å æ & ç è é ê ë & ì í î ï ð ñ & second use \\[1ex]
+% \scshape ò ó ô õ ö ø & \scshape ù ú û ü ý & \scshape þ ÿ & \scshape first use \\
+% ò ó ô õ ö ø & ù ú û ü ý & þ ÿ & second use \\[1ex]
+% \scshape Ă ă Ą ą Ć ć Č č & \scshape Ď ď Đ đ Ę ę Ě ě & \scshape Ğ ğ İ ı & \scshape first use \\
+% Ă ă Ą ą Ć ć Č č & Ď ď Đ đ Ę ę Ě ě & Ğ ğ İ ı & second use \\[1ex]
+% \scshape IJ ij Ľ ľ Ł ł & \scshape Ń ń Ň ň Œ œ & \scshape Ŕ ŕ Ř ř & \scshape first use \\
+% IJ ij Ľ ľ Ł ł & Ń ń Ň ň Œ œ & Ŕ ŕ Ř ř & second use \\[1ex]
+% \scshape Ś Ş ş Š š Ţ ţ Ť ť & \scshape Ů ů Ű ű & \scshape Ź ź Ż ż Ž ž & \scshape first use \\
+% Ś Ş ş Š š Ţ ţ Ť ť & Ů ů Ű ű & Ź ź Ż ż Ž ž &  second use \\
+% \end{tabular}
+% \end{quote}
+% 
+% \noindent One may add control sequences to names, thanks to the help of \Name*[Robert]{Schlicht}. The next example adds more accented characters under \textsf{inputenc}/\textsf{fontenc}:
+%  \begin{quote}\small
+% |\usepackage{newunicodechar}|\\
+% |\DeclareTextSymbolDefault{\textlongs}{TS1}|\\
+% |\DeclareTextSymbol{\textlongs}{TS1}{115}|\\
+% |\newunicodechar{ſ}{\textlongs}|\\
+% |\newunicodechar{ā}{\=a}|\\
+% |\newunicodechar{ṃ}{\d m}|
+% \end{quote}
+%
+% For some situations, such as ``traditional'' NFSS, you will need fonts with TS1 glyphs, e.g., |\usepackage{lmodern}|. See the informative tables on pages 455--63 in \emph{The Latex Companion}. This allows |\Name{Ghazāli}| to generate \IndexInactive\Name{Ghazāli}\IndexActive.
+%
+% In some cases, indexing accented names will fail unless you use \textsf{xetex} or \textsf{luatex}, both of which use \textsf{fontspec} instead of NFSS. Control sequences like |\=a| fail even in manual index entries when using \textsf{makeindex} and \texttt{gind.ist} because the equal sign is interpreted as a ``literal'' character, as mentioned by \Name[Dan]{Luecking}. I used |\IndexInactive\Name{Ghazāli}\IndexActive| to prevent the index entry ``ali'' sorted under ``Ghaz'' because even the manual entry fails in that case.
+%
+% It is important that this package work in the context of multiple languages. The use of multiple typesetting engines facilitates that. This snippet from the preamble to this file allows it to be typeset with multiple engines.\\
+%
+% \begin{tabular}{ll}
+% |\usepackage{ifxetex}|\\
+% |\usepackage{ifluatex}|\\
+% |\ifxetex| & |% uses fontspec|\\
+% \hbox{\quad}|\usepackage{fontspec}|\\
+% \hbox{\quad}|\defaultfontfeatures{Mapping=tex-text}|\\
+% \hbox{\quad}|\usepackage{xunicode}|\\
+% \hbox{\quad}|\usepackage{xltxtra}|\\
+% |\else|\\
+% \hbox{\quad}|\ifluatex| & |% also uses fontspec|\\
+% \hbox{\quad}\hbox{\quad}|\usepackage{fontspec}|\\
+% \hbox{\quad}\hbox{\quad}|\defaultfontfeatures{Ligatures=TeX}|\\
+% \hbox{\quad}|\else| & |% traditional NFSS|\\
+% \hbox{\qquad}|\usepackage[utf8]{inputenc}|\\
+% \hbox{\qquad}|\usepackage[TS1,T1]{fontenc}|\\
+% \hbox{\quad}|\fi|\\
+% |\fi|
+% \end{tabular}\\
+% \medskip
+%
+% \noindent I used the following in the text itself to allow for conditional processing that helps one document work under multiple engines:\\
+%
+% \begin{tabular}{l}
+% |\ifxetex |\meta{xelatex text}|%|\\
+% |\else%|\\
+% \hbox{\quad}|\ifluatex%|\\
+% \hbox{\qquad}|\ifpdf |\meta{lualatex in pdf mode text}|%|\\
+% \hbox{\qquad}|\else |\meta{lualatex in dvi mode text}|%|\\
+% \hbox{\qquad}|\fi%|\\
+% \hbox{\quad}|\else%|\\
+% \hbox{\qquad}|\ifpdf |\meta{pdflatex text}|%|\\
+% \hbox{\qquad}|\else |\meta{latex text}|%|\\
+% \hbox{\qquad}|\fi%|\\
+% \hbox{\quad}|\fi%|\\
+% |\fi|
+% \end{tabular}
+%
+% \subsubsection{Name Formatting}
+% \label{sec:formatting}
+%
+% \DescribeMacro{\NamesFormat}
+% The first instance of a name is formatted with \cmd{\NamesFormat}. In addition to using the class options, one can redefine \cmd{\NamesFormat}. For example, if you wanted to suppress formatting in footnotes, you could do something like:
+%
+% \begin{quote}
+% |\makeatletter|\\
+% |\let\@oldfntext\@makefntext|\\
+% |\long\def\@makefntext#1{\def\NamesFormat{}\@oldfntext{#1}}|\\
+% |\makeatother|
+% \end{quote}
+%
+% \noindent This approach synchronizes the ``first use'' feature in the text and the footnotes, but only suppresses the formatting. It takes advantage of the deep nesting of \cmd{\@makefntext} and a localized \cmd{\def} to make a temporary change.
+%
+% A second example puts the mention of first names in the margin. The code below gives us:
+% \let\oldformat\NamesFormat
+% \renewcommand{\NamesFormat}[1]{\textbf{#1}\ifinner\else\marginpar{\scriptsize #1}\fi}
+%
+% \begin{quote}
+% \bgroup\small\ttfamily
+% |\let\oldformat\NamesFormat|\\
+% |\renewcommand{\NamesFormat}[1]{\textbf{#1}%|\\
+% |\ifinner\else\marginpar{\scriptsize #1}\fi}|
+%
+% |\Name{Vlad III}[Dracula]| was known as Vlad Ţepeş, ``The Impaler,''\break  after his death. He was the son of |\Name{Vlad II}%| |[Dracul]|, a\break member of the Order of the Dragon. Later references to\break |\Name{Vlad III}[Dracula]| appear thus.\egroup
+%
+% \Name{Vlad III}[Dracula] was known as Vlad Ţepeş, ``The Impaler,''  after his death. He was the son of \Name{Vlad II}[Dracul], a member of the Order of the Dragon. Later references to \Name{Vlad III}[Dracula] appear thus.
+% \end{quote}
+%
+% \noindent The forms above do not work with \cmd{\PName} and \cmd{\AKA}. Consistently use either the suffix mechanism (Section \ref{sec:suffix}) or see Section \ref{sec:pennames} regarding manual entries. If you use the suffix mechanism, you would use the following forms:
+%
+%\begin{quote}\ForgetName{Vlad III}[Dracula]\ForgetName{Vlad II}[Dracul]
+% \bgroup\small\ttfamily |\Name{Vlad III, Dracula}| was known as |\AKA{Vlad III, Dracula}%|\break|{Vlad}[Ţepeş]|, |``\AKA*{Vlad III, Dracula}{Vlad}[the Impaler],''|\break  after his death. He was the son of |\Name{Vlad II, Dracul}|, a\break member of the Order of the Dragon. Later references to\break |\Name{Vlad III, Dracula}| appear thus.\egroup
+%
+% \Name{Vlad III, Dracula} was known as \AKA{Vlad III, Dracula}%
+% {Vlad}[Ţepeş], ``\AKA*{Vlad III, Dracula}{Vlad}[the Impaler],''  after his death. He was the son of \Name{Vlad II, Dracul}, a member of the Order of the Dragon. Later references to \Name{Vlad III, Dracula} appear thus.
+% \end{quote}
+% \let\NamesFormat\oldformat
+%
+% \noindent After using \cmd{\let} to revert \cmd{\NamesFormat}, a first occurrence again takes the form: \ForgetName{Vlad III}[Dracula]\Name{Vlad III}[Dracula], while subsequent references are to \Name{Vlad III}[Dracula].
+%
+% The ``Dracula'' example  above was manipulated extensively. Mixing the sobriquet and suffix forms otherwise may cause errors to ``bite.'' Puns aside, \Name{Vlad III}[Dracula] was a complex historical figure, more so than the character of \Name[Bram]{Stoker}.
+%
+% \subsubsection{Formatting Certain Sections}
+% \label{sec:SectionFormat}
+% 
+% \DescribeMacro{\NamesActive}
+% \DescribeMacro{\NamesInactive}
+% Using the \texttt{frontmatter} option deactivates formatting until \cmd{\NamesActive} occurs. Another macro, \cmd{\NamesInactive}, will deactivate formatting again. These two macros toggle two independent systems of formatting and first use.\\
+% 
+% Here we switch to the ``front matter'' mode with \cmd{\NamesInactive}:
+% \NamesInactive
+% \begin{quote}
+% \begin{tabular}{ll}
+% |\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 \cmd{\NamesActive}:
+% \NamesActive
+% \begin{quote}
+% \begin{tabular}{ll}
+% |\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}
+% 
+%\noindent Notice that we have two cases of ``first use.'' That works fine in different parts of the document, but not within the same part. Avoid using \cmd{\NamesInactive} to turn off formatting in footnotes because that can produce undesirable results like the example above. Fixing that would require use of the tweaking macros in both body text and footnotes. Instead, use the example for suppressing formatting in Section \ref{sec:formatting} and apply tweaks like \cmd{\ForgetName} in the body text as needed.
+%
+% \subsubsection{Tweaks: \cmd{\ForgetName} and \cmd{\SubvertName}}
+% \label{sec:Tweaks}
+% 
+% These two macros are meant for tweaking text at or near final draft stage. They affect both front matter and main matter.
+%
+% \DescribeMacro{\ForgetName}
+% 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 way, except that it ignores the final parameter if \meta{FNN} are present. The syntax is:
+% \begin{quote}
+% \cmd{\ForgetName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
+% \end{quote}
+%
+% \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.
+% 
+% \DescribeMacro{\SubvertName}
+% This macro is the opposite of the one above. It takes the same parameters. It handles its arguments in the same manner. The syntax is:
+% \begin{quote}
+% \cmd{\SubvertName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
+% \end{quote}
+%
+% \noindent This macro causes \cmd{\Name} and friends to think that a prior use of a name already has occurred. The next use will print as if it were a ``subsequent use.''
 %
-% \subsubsection{Pen Names: An Introduction}
+% \subsection{Name Variant Macros}
+% \subsubsection{Introduction and Manual Index Entries}
 % \label{sec:pennames}
 % 
-% The macro \cmd{\AKA} deals with pseudonyms, stage names, \emph{noms de plume}, etc. We already saw the suffix feature above as a workaround for sobriquets and Eastern names when using \cmd{\AKA}. Before we examine its function in detail, we touch on the only solution for some name forms, especially if one chooses the \texttt{comma} option:
+% The macro \cmd{\AKA} deals with pseudonyms, stage names, \emph{noms de plume}, etc. With this macro we move into a hybrid naming/indexing area of functionality. \cmd{\Name} and friends produce index entries compatible with manual index entries since version 0.9. If needed, the \texttt{.idx} file can be a helpful reference when linking manual entries with \textsf{nameauth} entries.
+%
+% Before we examine \cmd{\AKA} in detail, we should cover the manual solution that \cmd{\AKA} helps to automate. This remains the only solution for name forms that use the final optional parameter of \cmd{\Name} and friends, especially if one chooses the \texttt{comma} option. It also is the only option for using special formatting in the text.
 %
 % \begin{quote}
 % \bgroup\ttfamily\small
 % \verb!\index{Jean the Fearless|see{Jean sans Peur}}%!\\
-% |\Name{Jean}[sans Peur]| (Jean the Fearless) was Duke of Burgundy\break from 1404 to 1419.
+% |\Name{Jean}[sans Peur]| (Jean the Fearless) reigned as Duke of\break Burgundy from 1404 to 1419.
 % \egroup
 %
+% \TagName{Jean}[sans Peur]{, duke}%
 % \index{Jean the Fearless|see{Jean sans Peur}}%
-% \Name{Jean}[sans Peur] (Jean the Fearless) was Duke of Burgundy from 1404 to 1419.
+% \Name{Jean}[sans Peur] (Jean the Fearless) reigned as Duke of Burgundy from 1404 to 1419.
 % \end{quote}
 %
-% \noindent The suffix workaround also can work with the above example, but be careful; see Section \ref{sec:formatting}.  A more complicated example is:
+% \noindent The suffix workaround would use |\Name{Jean, sans Peur}| but be careful; see Section \ref{sec:formatting}.  A more complicated example is:
 % \begin{quote}
 % \bgroup\ttfamily\footnotesize
 % \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 \break |\Name{Thomas}[Aquinas]|.
+% Perhaps the greatest medieval theologian was |\Name{Thomas}[Aquinas]|\break (Thomas of Aquino), also known as |\textit{Doctor Angelicus}|. His name\break ``Aquinas'' is not a surname, so many modern scholars simply refer to him\break 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 simply refer to him as \Name{Thomas}[Aquinas].
-% \end{quote}
-% 
-% \subsubsection{\texttt{\bsc AKA}}
+% \end{quote} 
+%
+% \noindent This case must be handled manually due to the italic text formatting.
+% \subsubsection{\cmd{\AKA}}
+% \label{sec:AKA}
 %
 % \DescribeMacro{\AKA}
 % \DescribeMacro{\AKA*}
 % The primary macro that handles aliases is \cmd{\AKA}. Its syntax is:
 % \begin{quote}
-% \cmd{\AKA}\oarg{FNN}\marg{SNN}\oarg{alternate FNN}\marg{alternate SNN}\oarg{alt. names}\\
-% \cmd{\AKA*}\oarg{FNN}\marg{SNN}\oarg{alternate FNN}\marg{alternate SNN}\oarg{alt. names}
+% \cmd{\AKA}\oarg{FNN}\marg{SNN}\oarg{alt. FNN}\marg{alt. SNN}\oarg{alt. names}\\
+% \cmd{\AKA*}\oarg{FNN}\marg{SNN}\oarg{alt. FNN}\marg{alt. SNN}\oarg{alt. names}
 % \end{quote}
 %
-% \noindent Notice that the \emph{FNN} and \emph{SNN} arguments \emph{do not accept} the third argument field of \cmd{\Name}. This means that one cannot use \cmd{\AKA} to create a \emph{see} reference to a name with a sobriquet or to an Eastern name unless one uses the suffix feature mentioned previously. Here is a quick review of what works and what fails:
+% \noindent The \meta{FNN} and \meta{SNN} arguments \emph{do not include} the final optional argument of \cmd{\Name} to avoid ambiguity. \cmd{\AKA} will not create a \emph{see} reference to a name with a sobriquet or to an Eastern name unless one uses the suffix feature mentioned previously. This macro is designed with Western names in mind.
+%
+% \cmd{\AKA} only prints the alternate name. It assumes that a \cmd{\Name} macro occurs somewhere to create the page-indexed target of a cross-reference. No error checking otherwise occurs for this. The macro also prevents double periods.
+%
+% Here is a quick review of what works and what fails:
 %
 % \begin{quote}\footnotesize
 % \begin{tabular}{llllll}\hline
-% {\normalsize\strut}\emph{FNN} & \emph{SNN} & Alt. \emph{FNN} & Alt. \emph{SNN} & Alt. names & Result \\\hline
+% {\normalsize\strut}\meta{FNN} & \meta{SNN} & \meta{Alt. FNN} & \meta{Alt. SNN} & \meta{Alt. names} & Result \\\hline
 % {\small\strut}\texttt{Bob} & \texttt{Hope} & \texttt{Leslie Townes} & \texttt{Hope} & (none) & success\\
 % {\small\strut}\dag\texttt{Bob} & \texttt{Hope} & \texttt{Leslie Townes} & \texttt{Hope} & \texttt{Lester T.} & success\\\hline
 % {\small\strut}(none) & \texttt{Louis} & \texttt{XIV} & \texttt{Sun King} & (none) & FAIL\\
@@ -547,13 +693,9 @@
 % \S{} This produces different output, depending on whether \cmd{\AKA} or \cmd{\AKA*} is used.
 % \end{quote}
 %
-% \noindent Since \cmd{\AKA} is designed to handle a number of otherwise incompatible needs, its use may be the most complex of all macros in this package. \cmd{\AKA} creates a cross reference. The target of this cross-reference is either \emph{SNN}, \emph{FNN} or just \emph{SNN}. The main entry in which the cross-reference occurs is constructed exactly like \cmd{\Name} handles its arguments. The \emph{alternate FNN} are replaced by the \emph{alternate names} if both exist. The \emph{alternate names} follow the \emph{alternate SNN} otherwise.
-%
-% The twist is the starred form \cmd{\AKA*}. If the starred form is used with the template (none)\marg{alternate SNN}\oarg{alt. names}, it only prints the \oarg{alt. names}. This allows it to be used in the manner of the example text in Section \ref{sec:example}. \cmd{\AKA} prints \marg{alternate SNN} followed by \oarg{alt. names}. A difference between this macro and \cmd{\Name} using sobriquets is that this macro creates a cross-reference and allows the ``sobriquet'' to be printed separately.
+% \noindent \cmd{\AKA} prints an alternate name and creates a cross reference in the index. The target of this cross-reference is either \meta{SNN}, \meta{FNN} or just \meta{SNN}. In the cross-reference, the \meta{alternate names} replace the \meta{alternate FNN} if both exist. Otherwise the \meta{alternate names} follow the \meta{alternate SNN}.
 %
-% \cmd{\AKA} only prints the alternate name. It assumes that a \cmd{\Name} macro occurs somewhere to create the page-indexed target of a cross-reference. No error checking otherwise occurs for this. The macro also prevents double periods.
-%
-%A brief example follows:
+% If the starred form \cmd{\AKA*} is used with the template \meta{none}\marg{alternate SNN}\oarg{alt. names}, it only prints the \meta{alt. names}. With the same template, \cmd{\AKA} prints \meta{alternate SNN} followed by \meta{alt. names}. Section \ref{sec:TagName} offers a complete presentation of related features. A brief example follows:
 % 
 % \begin{quote}
 % \bgroup\ttfamily
@@ -563,9 +705,9 @@
 % Today we consider \AKA[George]{Eliot}[Mary Anne]{Evans} and her literary contributions as \Name[George]{Eliot}.
 % \end{quote}
 % 
-% \noindent The alternate name references generated by \cmd{\AKA} and \cmd{\AKA*} only work as cross-references and cannot be used with \cmd{\Name} and \cmd{\FName}, which print the alternate names and emit a warning. See also Section \ref{sec:error}.
+% \noindent The cross-references generated by \cmd{\AKA} and \cmd{\AKA*} cannot be used with other macros in this package. See also Section \ref{sec:error}.
 %
-% In certain cases, the alternate name might need to be indexed with page numbers. Do not use \cmd{\AKA} if that is so. Use \cmd{\Name} for both the main and the alternate names. Then create manual cross-references with \cmd{\index}, e.g.:\bigskip
+% In certain cases, the alternate name might need to be indexed with page numbers. Do not use \cmd{\AKA} if that is so. Use \cmd{\Name} for both the main and the alternate names. Then create manual cross-references with \cmd{\index}, e.g.:\label{Rambam}\bigskip
 %
 % \bgroup\footnotesize\index{Rambam|seealso{Maimonides}}
 % \begin{tabular}{p{0.7in}ll}\hline
@@ -581,7 +723,7 @@
 % \verb!\index{Snellius|see{Snel van Royen, Rudolph}}!
 % \end{quote}
 % 
-% \subsubsection{\texttt{\bsc PName}}
+% \subsubsection{\cmd{\PName}}
 %
 % \DescribeMacro{\PName}
 % \cmd{\PName} is a ``convenience macro'' that sacrifices flexibility for simplicity. It does not implement \cmd{\AKA*} and it works best with Western-style names. It calls \cmd{\Name} or \cmd{\Name*} and prints a Western-style ``main'' name. It then always calls \cmd{\AKA} with a full alternate name and prints it in parentheses. The syntax is:
@@ -602,166 +744,101 @@
 %
 % \noindent If you use the unstarred forms  \cmd{\PName} and \cmd{\Name}, you must remember that, just because you include a full name as a parameter does not mean that the full name will print. You could end up with ambiguous references to the same last name, e.g., ``Snel van Royen.'' You are responsible for checking this.
 %
-% \subsection{Accented Names}
-% \label{sec:accents}
+% \subsection{Indexing Macros}
+% \subsubsection{\cmd{\IndexName}}
 % 
-% The snippet on the next page from the preamble allows this document to be typeset with multiple engines. I used the following test in the text itself:\\
-%
-% \bgroup\footnotesize%
-% \noindent |\ifxetex\textsf{xelatex}%|\\
-% |\else\ifluatex%|\\
-% \hbox{\qquad}|\ifpdf\textsf{lualatex} in \texttt{pdf} mode%|\\
-% \hbox{\qquad}|\else\textsf{lualatex} in \texttt{dvi} mode\fi%|\\
-% \hbox{\quad}|\else%|\\
-% \hbox{\qquad}|\ifpdf\textsf{pdflatex}%|\\
-% \hbox{\qquad}|\else\textsf{latex}\fi\fi%|\\
-% |\fi{}|\egroup
-%
-% \bgroup\footnotesize%
-% \begin{tabular}{ll}
-% |\usepackage{ifxetex}|\\
-% |\usepackage{ifluatex}|\\
-% |\ifxetex| & |% uses fontspec and other packages|\\
-% \hbox{\quad}|\usepackage{fontspec}|\\
-% \hbox{\quad}|\defaultfontfeatures{Mapping=tex-text}|\\
-% \hbox{\quad}|\usepackage{xunicode}|\\
-% \hbox{\quad}|\usepackage{xltxtra}|\\
-% |\else|\\
-% \hbox{\quad}|\ifluatex| & |% also uses fontspec|\\
-% \hbox{\quad}\hbox{\quad}|\usepackage{fontspec}|\\
-% \hbox{\quad}\hbox{\quad}|\defaultfontfeatures{Ligatures=TeX}|\\
-% \hbox{\quad}|\else| & |% with pdflatex and latex|\\
-% \hbox{\qquad}|\usepackage[utf8]{inputenc}|\\
-% \hbox{\qquad}|\usepackage[TS1,T1]{fontenc}|\\
-% \hbox{\quad}|\fi|\\
-% |\fi|
-% \end{tabular}
-% \egroup\\
-%
-% \noindent The following Unicode characters are available using \textsf{inputenc}/\textsf{fontenc}:
+% \DescribeMacro{\IndexName}
+% This macro creates an index entry like those created by \cmd{\Name} and friends. It prints no text in the body and permits no special formatting. The syntax is:
 % \begin{quote}
-% \begin{tabular}{llll}
-% \scshape À Á Â Ã Ä Å Æ & \scshape Ç È É Ê Ë & \scshape Ì Í Î Ï Ð Ñ & \scshape first use \\
-% À Á Â Ã Ä Å Æ & Ç È É Ê Ë & Ì Í Î Ï Ð Ñ & second use \\[1ex]
-% \scshape Ò Ó Ô Õ Ö Ø & \scshape Ù Ú Û Ü Ý & \scshape Þ ß & \scshape first use \\
-% Ò Ó Ô Õ Ö Ø & Ù Ú Û Ü Ý & Þ ß & second use \\[1ex]
-% \scshape à á â ã ä å æ & \scshape ç è é ê ë & \scshape ì í î ï ð ñ & \scshape first use \\
-% à á â ã ä å æ & ç è é ê ë & ì í î ï ð ñ & second use \\[1ex]
-% \scshape ò ó ô õ ö ø & \scshape ù ú û ü ý & \scshape þ ÿ & \scshape first use \\
-% ò ó ô õ ö ø & ù ú û ü ý & þ ÿ & second use \\[1ex]
-% \scshape Ă ă Ą ą Ć ć Č č & \scshape Ď ď Đ đ Ę ę Ě ě & \scshape Ğ ğ İ ı & \scshape first use \\
-% Ă ă Ą ą Ć ć Č č & Ď ď Đ đ Ę ę Ě ě & Ğ ğ İ ı & second use \\[1ex]
-% \scshape IJ ij Ľ ľ Ł ł & \scshape Ń ń Ň ň Œ œ & \scshape Ŕ ŕ Ř ř & \scshape first use \\
-% IJ ij Ľ ľ Ł ł & Ń ń Ň ň Œ œ & Ŕ ŕ Ř ř & second use \\[1ex]
-% \scshape Ś Ş ş Š š Ţ ţ Ť ť & \scshape Ů ů Ű ű & \scshape Ź ź Ż ż Ž ž & \scshape first use \\
-% Ś Ş ş Š š Ţ ţ Ť ť & Ů ů Ű ű & Ź ź Ż ż Ž ž &  second use \\
-% \end{tabular}
-% \end{quote}
-% 
-% \noindent One may add control sequences to names, thanks to the help of \Name*[Robert]{Schlicht}. The next example adds more accented characters under \textsf{inputenc}/\textsf{fontenc}:
-%  \begin{quote}\small
-% |\usepackage{newunicodechar}|\\
-% |\DeclareTextSymbolDefault{\textlongs}{TS1}|\\
-% |\DeclareTextSymbol{\textlongs}{TS1}{115}|\\
-% |\newunicodechar{ſ}{\textlongs}|\\
-% |\newunicodechar{ā}{\=a}|\\
-% |\newunicodechar{ṃ}{\d m}|
+% \cmd{\IndexName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
 % \end{quote}
+% \cmd{\IndexName} does not index the alternate names unless \meta{FNN} are absent. If indexing is switched off (see Section \ref{sec:SectionIndex}), this macro does nothing. It will not create index entries for names that have been used as cross-references.
 %
-% \noindent For some glyphs you will need fonts with TS1 glyphs, e.g., |\usepackage{lmodern}|. See also pages 455--63 in \emph{The Latex Companion}. This allows |\Name{Ghazāli}| to generate \IndexInactive\Name{Ghazāli}\IndexActive. Control sequences like |\=a| fail even in manual index entries when using \textsf{makeindex} and \texttt{gind.ist} because the equal sign is interpreted as a ``literal'' character, as mentioned by \Name[Dan]{Luecking}. I stopped |\Name| from indexing \IndexInactive\Name{Ghazāli}\IndexActive{} to prevent the entry ``ali'' sorted under ``Ghaz''.
-%
-% \subsection{Name Formatting}
-% \label{sec:formatting}
-%
-% \DescribeMacro{\NamesFormat}
-% 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:
+% \subsubsection{\cmd{\TagName}}
+% \label{sec:TagName}
 %
+% \DescribeMacro{\TagName}
+% This macro creates a tag that will appear in all index entries corresponding to the name arguments from the point of invocation of \cmd{\TagName} onward. For consistency throughout the document, tag names at the beginning. The syntax is:
 % \begin{quote}
-% |\renewcommand{\NamesFormat}[1]{\textbf{#1}%|\\
-% |\ifinner\else\marginpar{\scriptsize #1}\fi}|
+% \cmd{\TagName}\oarg{FNN}\marg{SNN}\oarg{alternate names}\marg{tag}
 % \end{quote}
-% 
-% \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}
+% Tags created by \cmd{\TagName} can be helpful in the indexes of history texts. Several features of this package are designed for historical research. Suppose you are working with medieval subject matter. The following macros come in handy:\\
 %
-%\begin{quote}
-% \bgroup\ttfamily |\Name{Vlad III}[Dracula]| became known as Vlad Ţepeş, ``The\break Impaler,''  after his death. He was the son of\break |\Name{Vlad II}[Dracul]|, a member of the Order of the Dragon. Later references to |\Name{Vlad III}[Dracula]| appear thus.\egroup
+% \begin{tabular}{p{2in}p{2in}}
+% |\TagName{Leo, I}{, pope}| |\TagName{Gregory, I}{, pope}| & Tag these names at the beginning of the document.\TagName{Leo, I}{, pope}\TagName{Gregory, I}{, pope}\\
+% \dots & \\
+% |\Name{Leo, I}| |\Name{Gregory, I}| & First references to \Name{Leo, I} and \Name{Gregory, I}\\
+% \dots & \\
+% |\Name*{Leo, I} was known as| |\AKA{Leo, I}{Leo}[the Great].| & \Name*{Leo, I} was known as \AKA{Leo, I}{Leo}[the Great].\\
+% \dots & \\
+% |\Name{Gregory, I}| |``\AKA*{Gregory, I}%| |{Gregory}[the Great]''| & \Name{Gregory, I} ``\AKA*{Gregory, I}{Gregory}[the Great]'' was another major pope.\\
+% \end{tabular}\\
 %
-% \Name{Vlad III}[Dracula] became known as Vlad Ţepeş, ``The Impaler,''  after his death. He was the son of \Name{Vlad II}[Dracul], a member of the Order of the Dragon. Later references to \Name{Vlad III}[Dracula] appear thus.
-% \end{quote}
-%
-% \let\NamesFormat\oldformat
+% \noindent \cmd{\TagName} causes tags in the index entries to be inserted automatically from the point of invocation. \cmd{\AKA} prints the name and the sobriquet, while \cmd{\AKA*} only prints the sobriquet, One could do similarly with emperors, kings, etc.
 %
-% \noindent After using \cmd{\let} to revert \cmd{\NamesFormat}, a first occurrence again takes the form: \ForgetName{Vlad III}[Dracula]\Name{Vlad III}[Dracula], while subsequent references are to \Name{Vlad III}[Dracula].\\
-%
-% Let me again stress that the forms above do not work with  \cmd{\PName} and \cmd{\AKA}. Consistently use either the suffix mechanism (Section \ref{sec:suffix}) or use as a guide the examples above for \Name*{Jean}[sans Peur] and \Name*{Thomas}[Aquinas]. If you use the suffix mechanism, you would use the following forms:
-%
-%\begin{quote}\ForgetName{Vlad III}[Dracula]\ForgetName{Vlad II}[Dracul]
-% \bgroup\ttfamily |\Name{Vlad III, Dracula}| became known as \break |\AKA{Vlad III, Dracula}{Vlad}[Ţepeş]|,\break |``\AKA{Vlad III, Dracula}{Vlad}[the Impaler],''|  after his death. He was the son of |\Name{Vlad II, Dracul}|, a member of the Order of the Dragon. Later references to |\Name{Vlad III, Dracula}| appear thus.\egroup
+% \subsubsection{\cmd{\UntagName}}
 %
-% \Name{Vlad III, Dracula} became known as \AKA{Vlad III, Dracula}{Vlad}[Ţepeş], ``\AKA*{Vlad III, Dracula}{Vlad}[the Impaler],''  after his death. He was the son of \Name{Vlad II, Dracul}, a member of the Order of the Dragon. Later references to \Name{Vlad III, Dracula} appear thus.
+% \DescribeMacro{\UntagName}
+% This macro removes a tag created by \cmd{\TagName}. The syntax is:
+% \begin{quote}
+% \cmd{\UntagName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
 % \end{quote}
+% \cmd{\TagName} will replace one tag with another tag, but it does not remove a tag from a name. That is the role of \cmd{\UntagName}. By using these two commands, one can disambiguate different people with the same name. For example:\\
 %
-% \noindent NOTE: The ``Dracula'' example is complex and the usual ``first use'' feature has been manipulated extensively to produce these results. If you mix casually the sobriquet and suffix forms, errors may ``bite.'' Puns aside, \Name{Vlad III}[Dracula] was a complex historical figure, as was his father, living in the no-man's land between the Ottoman Empire and the Holy Roman Empire.
+% \begin{tabular}{p{2in}p{2in}}
+% |\ForgetName[John]{Smith}| |\TagName[John]{Smith}%| |{, the other one}| |\Name[John]{Smith}|\dots & This is the first reference to \ForgetName[John]{Smith}\TagName[John]{Smith}{, the other one}\Name[John]{Smith}, ``the other one'' in the index. Notice that it is tweaked.\\
+% |\ForgetName[John]{Smith}| |\TagName[John]{Smith}%| |{, the third}| |\Name[John]{Smith}|\dots & This refers to \ForgetName[John]{Smith}\TagName[John]{Smith}{, the third}\Name[John]{Smith} ``the third'' in the index. It is tweaked again as a ``first occurrence.''\\
+% |\SubvertName[John]{Smith}| |\UntagName[John]{Smith}| |\Name*[John]{Smith}| & This refers to the \SubvertName[John]{Smith}\UntagName[John]{Smith}\Name*[John]{Smith} in the quick start guide. It is tweaked in order to force a subsequent reference.\\
+% \end{tabular}\\
 %
-% \subsection{Formatting Certain Sections}
-% \label{sec:SectionFormat}
-% 
-% \DescribeMacro{\NamesActive}
-% \DescribeMacro{\NamesInactive}
-% 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 \cmd{\NamesInactive}:
-% \NamesInactive
-% \begin{quote}
-% \begin{tabular}{ll}
-% |\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}
+% \noindent Tagging and untagging in this manner requires the author to juggle more info. With more freedom comes more responsibility.
+%
+% \subsubsection{\cmd{\ExcludeName}}
 % 
-% Then we switch back to ``main matter'' mode with \cmd{\NamesActive}:
-% \NamesActive
+% \DescribeMacro{\ExcludeName}
+% This prevents \cmd{\Name}, etc. from both formatting and indexing a specific name, but \emph{only if that name has not been used}. See also Section \ref{sec:error}. The syntax is:
 % \begin{quote}
-% \begin{tabular}{ll}
-% |\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}
+% \cmd{\ExcludeName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
 % \end{quote}
-% 
-% \subsection{Indexing Certain Sections}
+% To suppress only indexing but retain formatting, enclose \cmd{\Name}, etc. between \cmd{\IndexInactive} and \cmd{\IndexActive}.
+%
+% \subsubsection{Indexing Certain Sections}
 % \label{sec:SectionIndex}
 %
-%% \DescribeMacro{\IndexActive}
+% \DescribeMacro{\IndexActive}
 % \DescribeMacro{\IndexInactive}
 % Using the \texttt{noindex} option deactivates indexing until \cmd{\IndexActive} occurs. Another macro, \cmd{\IndexInactive}, will deactivate indexing again. These can be used throughout the document, independently of \cmd{\ExcludeName}.
 %
-% \subsection{Tweaks: \texttt{\bsc ForgetName} and \texttt{\bsc SubvertName}}
-% \label{sec:Tweaks}
-% 
-% Using these two macros may hinder the arbitrary rearrangement of text. I suggest that one wait until the final draft before implementing them.
+% \subsubsection{Variant Spellings}
 %
-% \DescribeMacro{\ForgetName}
-% 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 way, except that it ignores the final parameter if \emph{FNN} are present. The syntax is:
-% \begin{quote}
-% \cmd{\ForgetName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
-% \end{quote}
+% Handling variant name spellings can be complicated, but one could create macros on a per-case basis to make it easier. For example, one might settle on the form \Name[W.E.B.]{Du Bois} in one's name authority. Yet an essay could use \IndexInactive\Name*[W.E.B.]{DuBois}\IndexActive, where the publisher would not grant the right to alter the spelling. In that case, do the following in that document section:
 %
-% \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.
-% 
-% \DescribeMacro{\SubvertName}
-% This macro is the opposite of the one above. It takes the same parameters. It handles its arguments in the same manner. The syntax is:
-% \begin{quote}
-% \cmd{\SubvertName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
-% \end{quote}
+% \begin{enumerate}\setlength\itemsep{0pt}
+% \item In those cases where the only variation in the name is spacing (as above), you must call \cmd{\ForgetName} to generate a ``first use'' of the alternate spelling. The ``first use'' mechanism ignores spaces.
+% \item In all cases of the variant spelling, wrap \cmd{\Name} and friends between \cmd{\IndexInactive} and \cmd{\IndexActive}. A macro can do this easily.
+% \item Call \cmd{\IndexName} with the authoritative form right after \cmd{\IndexActive}. Again, this can be part of a macro.
+% \end{enumerate}
 %
-% \noindent This macro causes \cmd{\Name} and friends to think that a prior use of a name already has occurred. The next use will print as if it were a ``subsequent use.''
+% This looks cumbersome, but it ensures accuracy. It cannot be reduced to an all-purpose macro because that would generate an ambiguous argument list. It should only be used in those cases where minor variations in spelling do not cause the reader to question the identity of the person in question.
+%
+% \subsection{Error Handling}
+% \label{sec:error}
 %
+% Except for the indexing macros, most of the macros in this package print any erroneous arguments in the text without formatting. Unless there is a syntax error, all macros emit meaningful warnings. The convenience macros do not emit warnings; however, their component macros do. For example, \cmd{\PName} produces warnings via \cmd{\Name} and \cmd{\AKA}.
+%
+% Not all warnings are created equal. For example, the multiple creation of a cross-reference with \cmd{\AKA} will generate a warning, but it will have no ill effects. Some warnings, especially in the case of indexing macros, indicate that the macro produced no output.
+%
+% Examine the warning messages and check the index in order to find possible errors. Warnings result from:
+%
+% \begin{enumerate}\setlength{\itemsep}{-0.4ex}
+% \item Using a cross-reference \oarg{alternate FNN}\marg{alternate SNN}\oarg{alt. names} created by \cmd{\AKA} as a reference in \cmd{\Name}, \cmd{\FName}, and \cmd{\PName}.
+% \item Using a reference \oarg{FNN}\marg{SNN}\oarg{alternate names} created by \cmd{\Name}, \cmd{\FName}, and \cmd{\PName} as a cross-reference in \cmd{\AKA}.
+% \item Using \cmd{\AKA} to create the same cross-reference multiple times.
+% \item Using \cmd{\IndexName} to index a cross-reference as a main entry.
+% \item Using \cmd{\TagName} to tag a cross-reference.
+% \item Using \cmd{\ExcludeName} to exclude a name that has already been used.
+% \end{enumerate}
+% 
 % \StopEventually{\PrintChanges\clearpage\PrintIndex}
 %
 % \section{Implementation}
@@ -776,7 +853,7 @@
 \newif\if@nameauth@DoIndex
 \newif\if@nameauth@DoComma
 %    \end{macrocode}
-% These Boolean values are used to control formatting, index suppression, and comma suppression. They all may be set with class options, but the first two can be toggled with the user interface macros \cmd{\NamesActive}---\cmd{\NamesInctive} and \cmd{\IndexActive}---\cmd{\IndexInctive}.\\
+% These Boolean values control formatting, index suppression, and comma suppression. They all may be set with class options. The first two can be toggled with \cmd{\NamesActive}---\cmd{\NamesInctive} and \cmd{\IndexActive}---\cmd{\IndexInctive}.\\
 %
 %    \begin{macrocode}
 \newif\if@nameauth@Comma
@@ -784,14 +861,11 @@
 %    \end{macrocode}
 % These Boolean values are used internally for detection of suffixes and final periods.\\
 %
-% \changes{v0.94}{2012/02/15}{Added capitalization feature}
 %    \begin{macrocode}
 \newif\if@nameauth@DoCaps
 %    \end{macrocode}
-% This Boolean triggers select first letter capitalization of names preceded by particles like \emph{de la} that may need occasional initial capitalization. That first letter capitalization happens only in \cmd{\Name}.\\
+% This Boolean triggers capitalization in \cmd{\Name} of particles like \emph{de la} that may occur at the start of a sentence.\\
 %
-% \changes{v0.85}{2012/02/05}{Added nocomma, comma options}
-% \changes{v0.94}{2012/02/15}{Added index, noindex options}
 %    \begin{macrocode}
 \DeclareOption{mainmatter}{\@nameauth@DoFormattrue}
 \DeclareOption{frontmatter}{\@nameauth@DoFormatfalse}
@@ -816,7 +890,7 @@
 %    \begin{macrocode}
 \newcommand*{\@nameauth@CleanName}[1]%
 {%
-    \expandafter\zap@space\detokenize{#1} \@empty%
+  \expandafter\zap@space\detokenize{#1} \@empty%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -829,7 +903,7 @@
 %    \begin{macrocode}
 \newcommand*{\@nameauth@Root}[1]%
 {%
-     \@nameauth@TrimRoot#1\relax%
+  \@nameauth@TrimRoot#1\relax%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -849,11 +923,11 @@
 %    \begin{macrocode}
 \newcommand*{\@nameauth@Suffix}[1]%
 {%
-     \@nameauth@TrimSuffix#1\relax%
+  \@nameauth@TrimSuffix#1\relax%
 }
 %    \end{macrocode}
 % \end{macro}
-% Anything before a comma is stripped off by |\@nameauth@Suffix|, but it should be called only in a conditional governed by |@nameauth@Comma| and \cmd{\@nameauth@CheckComma} or else errors will result. This macro calls its auxiliary macro below.
+% Anything before a comma is stripped off by |\@nameauth@Suffix|, but it should be called only in a conditional governed by the Boolean |@nameauth@Comma| and the macro \cmd{\@nameauth@CheckComma} or else errors will result. This macro calls its auxiliary macro below.
 %
 % \begin{macro}{\@nameauth@TrimSuffix}
 % \changes{v0.9}{2012/02/10}{added macro}
@@ -869,7 +943,7 @@
 %    \begin{macrocode}
 \newcommand*{\@nameauth@CheckComma}[1]%
 {%
-     \@nameauth@CheckSuffix#1,\relax%
+  \@nameauth@CheckSuffix#1,\relax%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -880,12 +954,12 @@
 %    \begin{macrocode}
 \def\@nameauth@CheckSuffix#1,#2\relax%
 {%
-     \def\Test{#2}%
-     \ifx\Test\@empty\@nameauth@Commafalse\else\@nameauth@Commatrue\fi%
+  \def\Test{#2}%
+  \ifx\Test\@empty\@nameauth@Commafalse\else\@nameauth@Commatrue\fi%
 }
 %    \end{macrocode}
 % \end{macro}
-% This macro checks for a comma-delimited suffix and sets the Boolean |@nameauth@Comma| true if the suffix is not equal to the empty string.\bigskip\hrule\bigskip
+% This macro checks for a comma-delimited suffix and sets the Boolean value of |@nameauth@Comma| to true if the suffix is not equal to the empty string.\bigskip\hrule\bigskip
 %\noindent The next macros check whether the next token is a period. They are only called if the terminal character produced within \cmd{\Name} and \cmd{\FName} is itself a period.
 %
 % \begin{macro}{\@nameauth@CheckDot}
@@ -901,7 +975,7 @@
 %    \begin{macrocode}
 \def\@nameauth@EvalDot%
 {%
-    \let\@period=.\ifx\@token\@period\expandafter\@gobble \fi%
+  \let\@period=.\ifx\@token\@period\expandafter\@gobble \fi%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -912,11 +986,11 @@
 %    \begin{macrocode}
 \newcommand*{\@nameauth@TestDot}[1]%
 {%
-     \def\TestDot##1.\TestEnd##2\TestStop{\TestPunct{##2}}%
-     \def\TestPunct##1%
-          {\ifx\TestPunct##1\TestPunct\else\@nameauth@Puncttrue\fi}%
-     \@nameauth@Punctfalse%
-     \TestDot#1\TestEnd.\TestEnd\TestStop%
+  \def\TestDot##1.\TestEnd##2\TestStop{\TestPunct{##2}}%
+  \def\TestPunct##1%
+    {\ifx\TestPunct##1\TestPunct\else\@nameauth@Puncttrue\fi}%
+  \@nameauth@Punctfalse%
+  \TestDot#1\TestEnd.\TestEnd\TestStop%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -933,11 +1007,11 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\@nameauth@FmtName{s m}%
 {%
-    \@nameauth@DoCapsfalse%
-    \@nameauth@TestDot{#2}%
-    \IfBooleanTF{#1}%
-          {#2}%
-          {\bgroup\NamesFormat{#2}\egroup}%
+  \@nameauth@DoCapsfalse%
+  \@nameauth@TestDot{#2}%
+  \IfBooleanTF{#1}%
+    {#2}%
+    {\bgroup\NamesFormat{#2}\egroup}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -946,19 +1020,26 @@
 % \begin{macro}{\@nameauth@Index}
 % \changes{v0.94}{2012/02/15}{Added macro}
 %    \begin{macrocode}
-\newcommand{\@nameauth@Index}[1]{%
-     \if@nameauth@DoIndex\index{#1}\fi%
+\DeclareDocumentCommand\@nameauth@Index{m o}%
+{%
+  \IfValueTF{#2}
+  {\ifcsname#2\endcsname%
+    \if@nameauth@DoIndex\index{#1\csname#2\endcsname}\fi%
+  \else%
+    \if@nameauth@DoIndex\index{#1}\fi%
+  \fi}%
+  {\if@nameauth@DoIndex\index{#1}\fi}%
 }
 %    \end{macrocode}
 % \end{macro}
-% If the indexing flag is true, create an index entry, otherwise do nothing.
+% If the indexing flag is true, create an index entry, otherwise do nothing.\clearpage
 %
 % \begin{macro}{\@nameauth@CapRoot}
 % \changes{v0.95}{2012/02/17}{Added macro}
 %    \begin{macrocode}
 \newcommand*{\@nameauth@CapRoot}[1]%
 {%
-     \@nameauth@CR#1\relax%
+  \@nameauth@CR#1\relax%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -979,7 +1060,7 @@
 %    \begin{macrocode}
 \newcommand{\CapThis}%
 {%
-     \@nameauth@DoCapstrue%
+  \@nameauth@DoCapstrue%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -997,131 +1078,131 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\Name{s o m o}%
 {%
-     \protected@edef\Surnames{#3}%
-     \if@nameauth@DoCaps%
-          \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
-     \else%
-          \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
-     \fi%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#3}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
-          \fi%
-     \fi%
-     \IfValueTF{#2}%
-     {\IfValueTF{#4}%
-          {\def\Forenames{#4}}{\def\Forenames{#2}}%
-     \ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-          \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-               \expandafter\Forenames\expandafter\space\Surnames}%
-          \PackageWarning{nameauth}%
-          {macro Name Cross-reference: #2 #3 cannot be a page reference.}%
-     \else%
-          \if@nameauth@DoFormat%
-               \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
-               \IfBooleanTF{#1}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}%
-               \fi%
-          \else%
-               \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
-               \IfBooleanTF{#1}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}%
-               \fi%
-          \fi%
-     \fi}%
-     {\IfValueTF{#4}
-          {\ifcsname\@nameauth@CleanName{#3#4!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames\space#4}%
-               \PackageWarning{nameauth}%
-               {macro Name Cross-reference: #3 #4 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                         {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter{%
-                              \Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                         {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}%
-                     \fi%
-               \fi%
-          \fi}%
-          {\ifcsname\@nameauth@CleanName{#3!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames}%
-               \PackageWarning{nameauth}%
-               {macro Name Cross-reference: #3 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}}%
-                         {\@nameauth@FmtName*{\Shortnames}%
-                              \@nameauth@Index{\Surnames}}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}}%
-                         {\@nameauth@FmtName*{\Shortnames}%
-                              \@nameauth@Index{\Surnames}}%
-                     \else%
-                         \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
-     \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
+  \protected@edef\Surnames{#3}%
+  \if@nameauth@DoCaps%
+    \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
+  \else%
+    \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
+  \fi%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#3}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
+    \fi%
+  \fi%
+  \IfValueTF{#2}%
+  {\IfValueTF{#4}%
+    {\def\Forenames{#4}}{\def\Forenames{#2}}%
+  \ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+    \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+      \expandafter\Forenames\expandafter\space\Surnames}%
+    \PackageWarning{nameauth}%
+    {macro Name Cross-reference: #2 #3 cannot be a page reference.}%
+  \else%
+    \if@nameauth@DoFormat%
+      \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
+      \IfBooleanTF{#1}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]%
+      \fi%
+    \else%
+      \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
+      \IfBooleanTF{#1}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]%
+      \fi%
+    \fi%
+  \fi}%
+  {\IfValueTF{#4}
+    {\ifcsname\@nameauth@CleanName{#3#4!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames\space#4}%
+      \PackageWarning{nameauth}%
+      {macro Name Cross-reference: #3 #4 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter{%
+            \Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]%
+        \fi%
+      \fi%
+    \fi}%
+    {\ifcsname\@nameauth@CleanName{#3!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames}%
+      \PackageWarning{nameauth}%
+      {macro Name Cross-reference: #3 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+          {\@nameauth@FmtName*{\Shortnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+          {\@nameauth@FmtName*{\Shortnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]%
+        \fi%
+      \fi%
+    \fi}%
+  }%
+  \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1163,103 +1244,103 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\FName{o m o}%
 {%
-     \protected@edef\Surnames{#2}%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#2}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
-          \fi%
-     \fi%
-    \IfValueTF{#1}%
-     {\IfValueTF{#3}{\edef\Forenames{#3}}{\edef\Forenames{#1}}%
-     \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+  \protected@edef\Surnames{#2}%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#2}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
+    \fi%
+  \fi%
+  \IfValueTF{#1}%
+  {\IfValueTF{#3}{\edef\Forenames{#3}}{\edef\Forenames{#1}}%
+  \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+    \expandafter\@nameauth@FmtName\expandafter*%
+      \expandafter{\Forenames}%
+    \PackageWarning{nameauth}%
+    {macro FName Cross-reference: #1 #2 cannot be a page reference.}%
+  \else%
+    \if@nameauth@DoFormat%
+      \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
+        \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Forenames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \else%
+        \csgdef{\@nameauth@CleanName{#1#2!MN!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \fi%
+    \else%
+      \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
+        \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Forenames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \else%
+        \csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Forenames\expandafter\space\Surnames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \fi%
+    \fi%
+  \fi}%
+  {\IfValueTF{#3}
+    {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames\space#3}%
+      \PackageWarning{nameauth}%
+      {macro FName Cross-reference: #2 #3 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
+          \expandafter\@nameauth@FmtName%
+            \expandafter{\Surnames\space#3}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
+            \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Surnames\space#3}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \fi%
+      \fi%
+    \fi}%
+    {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames}%
+      \PackageWarning{nameauth}%
+      {macro FName Cross-reference: #2 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2!MN!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2!NF!}}{}%
           \expandafter\@nameauth@FmtName\expandafter*%
-               \expandafter{\Forenames}%
-          \PackageWarning{nameauth}%
-          {macro FName Cross-reference: #1 #2 cannot be a page reference.}%
-     \else%
-          \if@nameauth@DoFormat%
-               \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
-                    \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Forenames}%
-                    \@nameauth@Index{\Surnames, #1}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#1#2!MN!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter{%
-                        \expandafter\Forenames\expandafter\space\Surnames}%
-                    \@nameauth@Index{\Surnames, #1}%
-               \fi%
-          \else%
-               \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
-                   \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Forenames}%
-                   \@nameauth@Index{\Surnames, #1}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Forenames\expandafter\space\Surnames}%
-                    \@nameauth@Index{\Surnames, #1}%
-               \fi%
-          \fi%
-     \fi}%
-     {\IfValueTF{#3}
-          {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames\space#3}%
-               \PackageWarning{nameauth}%
-               {macro FName Cross-reference: #2 #3 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
-                         \expandafter\@nameauth@FmtName%
-                              \expandafter{\Surnames\space#3}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
-                              \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Surnames\space#3}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                     \fi%
-               \fi%
-          \fi}%
-          {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames}%
-               \PackageWarning{nameauth}%
-               {macro FName Cross-reference: #2 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2!MN!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
-                         \@nameauth@Index{\Surnames}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames}%
-                     \else%
-                         \csgdef{\@nameauth@CleanName{#2!NF!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                         \@nameauth@Index{\Surnames}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
-     \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
+            \expandafter{\Surnames}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \fi%
+      \fi%
+    \fi}%
+  }%
+  \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1275,88 +1356,88 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\AKA{s o m o m o}%
 {%
-     \protected@edef\Surnamesi{#3}%
-     \protected@edef\Surnamesii{#5}%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#3}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnamesi{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
-          \fi%
-          \@nameauth@CheckComma{#5}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnamesii{\@nameauth@Root{#5}\@nameauth@Suffix{#5}}%
-          \fi%
-     \fi%
-     \IfValueTF{#4}%
-     {\IfValueTF{#6}%
-          {\edef\Forenames{#6}}{\edef\Forenames{#4}}%
-          \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-               \expandafter\Forenames\expandafter\space\Surnamesii}%
-          \ifcsname\@nameauth@CleanName{#4#5!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro AKA XRef: #4 #5 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#4#5!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro AKA Name reference: #4 #5 already exists; no see ref.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#4#5!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro AKA Name reference: #4 #5 already exists; no see ref.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
-                         \IfValueTF{#2}%
-                              {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi, #2}}}%
-                              {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi}}}%
-                    \fi%
-               \fi%
-          \fi}%
-     {\IfValueTF{#6}%
-          {\IfBooleanTF{#1}%
-               {\@nameauth@FmtName*{#6}}%
-               {\expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnamesii\space#6}}%
-          \ifcsname\@nameauth@CleanName{#5#6!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro AKA XRef: #5 #6 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#5#6!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro AKA Name reference: #5 #6 already exists; no see ref.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#5#6!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro AKA Name reference: #5 #6 already exists; no see ref.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#5#6!PN!}}{}%
-                         \IfValueTF{#2}%
-                              {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi, #2}}}%
-                              {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi}}}%
-                    \fi%
-               \fi%
-          \fi}%
-          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii}%
-          \ifcsname\@nameauth@CleanName{#5!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro AKA XRef: #5 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#5!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro AKA Name reference: #5 already exists; no see ref.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#5!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro AKA Name reference: #5 already exists; no see ref.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#5!PN!}}{}%
-                         \IfValueTF{#2}%
-                              {\@nameauth@Index{\Surnamesii|see{\Surnamesi, #2}}}%
-                              {\@nameauth@Index{\Surnamesii|see{\Surnamesi}}}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
-     \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
+  \protected@edef\Surnamesi{#3}%
+  \protected@edef\Surnamesii{#5}%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#3}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnamesi{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
+    \fi%
+    \@nameauth@CheckComma{#5}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnamesii{\@nameauth@Root{#5}\@nameauth@Suffix{#5}}%
+    \fi%
+  \fi%
+  \IfValueTF{#4}%
+  {\IfValueTF{#6}%
+    {\edef\Forenames{#6}}{\edef\Forenames{#4}}%
+    \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+      \expandafter\Forenames\expandafter\space\Surnamesii}%
+    \ifcsname\@nameauth@CleanName{#4#5!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro AKA XRef: #4 #5 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#4#5!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro AKA Name reference: #4 #5 already exists; no see ref.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#4#5!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro AKA Name reference: #4 #5 already exists; no see ref.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
+          \IfValueTF{#2}%
+            {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi, #2}}}%
+            {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi}}}%
+        \fi%
+      \fi%
+    \fi}%
+  {\IfValueTF{#6}%
+    {\IfBooleanTF{#1}%
+      {\@nameauth@FmtName*{#6}}%
+      {\expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnamesii\space#6}}%
+    \ifcsname\@nameauth@CleanName{#5#6!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro AKA XRef: #5 #6 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#5#6!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro AKA Name reference: #5 #6 already exists; no see ref.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#5#6!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro AKA Name reference: #5 #6 already exists; no see ref.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#5#6!PN!}}{}%
+          \IfValueTF{#2}%
+            {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi, #2}}}%
+            {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi}}}%
+        \fi%
+      \fi%
+    \fi}%
+    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii}%
+    \ifcsname\@nameauth@CleanName{#5!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro AKA XRef: #5 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#5!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro AKA Name reference: #5 already exists; no see ref.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#5!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro AKA Name reference: #5 already exists; no see ref.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#5!PN!}}{}%
+          \IfValueTF{#2}%
+            {\@nameauth@Index{\Surnamesii|see{\Surnamesi, #2}}}%
+            {\@nameauth@Index{\Surnamesii|see{\Surnamesi}}}%
+        \fi%
+      \fi%
+    \fi}%
+  }%
+  \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1367,44 +1448,98 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\PName{s o m o m o}%
 {%
-     \IfBooleanTF{#1}{\Name*[#2]{#3}}{\Name[#2]{#3}}%
-     {\space}(\AKA[#2]{#3}[#4]{#5}[#6])%
+  \IfBooleanTF{#1}{\Name*[#2]{#3}}{\Name[#2]{#3}}%
+  {\space}(\AKA[#2]{#3}[#4]{#5}[#6])%
 }
 %    \end{macrocode}
 % \end{macro}
 % \cmd{\PName} is a convenience macro whose starred and unstarred forms call the respective versions of \cmd{\Name}, followed only by \cmd{\AKA}.
 %
+% \begin{macro}{\TagName}
+% \changes{v1.2}{2012/02/25}{Added macro.}
+%    \begin{macrocode}
+\DeclareDocumentCommand\TagName{o m o m}%
+{%
+  \IfValueTF{#1}%
+    {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro TagName Cannot tag xref: #1 #2.}%
+    \else%
+      \csgdef{\@nameauth@CleanName{#1#2}}{#4}%
+    \fi}%
+    {\IfValueTF{#3}
+      {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro TagName Cannot tag xref: #2 #3.}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2#3}}{#4}%
+      \fi}%
+      {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro TagName Cannot tag xref: #2.}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2}}{#4}%
+      \fi}%
+    }%
+}
+%    \end{macrocode}
+% \end{macro}
+% \cmd{\TagName} creates an index entry tag after a name that is not already a pseudonym.
+%
+% \begin{macro}{\UntagName}
+% \changes{v1.2}{2012/02/25}{Added macro.}
+%    \begin{macrocode}
+\DeclareDocumentCommand\UntagName{o m o}%
+{%
+  \IfValueTF{#1}%
+    {\csundef{\@nameauth@CleanName{#1#2}}}%
+    {\IfValueTF{#3}
+      {\csundef{\@nameauth@CleanName{#2#3}}}%
+      {\csundef{\@nameauth@CleanName{#2}}}%
+    }%
+}
+%    \end{macrocode}
+% \end{macro}
+% \cmd{\TagName} creates an index entry tag after a name that is not already a pseudonym.
+%
 % \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}}
 % \changes{v0.9}{2012/02/10}{redesigned macro}
 % \changes{v1.0}{2012/02/20}{Fixed compatibility issues.}
+% \changes{v1.2}{2012/02/25}{Added warnings.}
 %    \begin{macrocode}
 \DeclareDocumentCommand\IndexName{o m o}%
 {%
-     \protected@edef\Surnames{#2}%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#2}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
-          \fi%
-     \fi%
-     \IfValueTF{#1}%
-          {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
-               \else%
-                    \@nameauth@Index{\Surnames, #1}%
-               \fi}%
-          {\IfValueTF{#3}
-               {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-               \else%
-                    \@nameauth@Index{\Surnames\space#3}%
-               \fi}%
-               {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
-               \else%
-                    \@nameauth@Index{\Surnames}%
-               \fi}%
-          }%
+  \protected@edef\Surnames{#2}%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#2}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
+    \fi%
+  \fi%
+  \IfValueTF{#1}%
+    {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro IndexName XRef: #1 #2 exists.}%
+    \else%
+      \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+    \fi}%
+    {\IfValueTF{#3}
+      {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro IndexName XRef: #2 #3 exists.}%
+      \else%
+        \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+      \fi}%
+      {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro IndexName XRef: #2 exists.}%
+      \else%
+        \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+      \fi}%
+    }%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1415,73 +1550,73 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\ExcludeName{o m o}%
 {%
-     \IfValueTF{#1}%
-     {%
-          \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro ExcludeName XRef: #1 #2 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#1#2!PN!}}{}%
-                    \fi%
-               \fi%
-          \fi}%
-     {\IfValueTF{#3}%
-          {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname\relax%
-          \else%
-               \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2#3!PN!}}{}%
-                    \fi%
-               \fi%
-          \fi}%
-          {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname\relax%
-          \else%
-               \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro ExcludeName Reference: #2 already exists; no exclusion.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro ExcludeName Reference: #2 already exists; no exclusion.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2!PN!}}{}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
+  \IfValueTF{#1}%
+  {%
+    \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro ExcludeName XRef: #1 #2 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#1#2!PN!}}{}%
+        \fi%
+      \fi%
+    \fi}%
+  {\IfValueTF{#3}%
+    {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname\relax%
+    \else%
+      \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2#3!PN!}}{}%
+        \fi%
+      \fi%
+    \fi}%
+    {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname\relax%
+    \else%
+      \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro ExcludeName Reference: #2 already exists; no exclusion.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro ExcludeName Reference: #2 already exists; no exclusion.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2!PN!}}{}%
+        \fi%
+      \fi%
+    \fi}%
+  }%
 }
 %    \end{macrocode}
 % \end{macro}
-% This macro prevents a name from being indexed by using the exclusion mechanism of \cmd{\AKA} to prevent the other macros from indexing a name. The result is that \cmd{\Name} and friends will print their arguments, emit a warning, and continue.\clearpage
+% This macro prevents a name from being formatted or indexed by using the exclusion mechanism of \cmd{\AKA}. The result is that \cmd{\Name} and friends will print their arguments, emit a warning, and continue.
 %
 % \begin{macro}{\ForgetName}
 % \changes{v0.75}{2012/01/19}{New parameter added}
 %    \begin{macrocode}
 \DeclareDocumentCommand\ForgetName{o m o}%
 {%
-     \IfValueTF{#1}%
-          {\csundef{\@nameauth@CleanName{#1#2!MN!}}%
-          \csundef{\@nameauth@CleanName{#1#2!NF!}}}%
-          {\IfValueTF{#3}%
-               {\csundef{\@nameauth@CleanName{#2#3!MN!}}%
-               \csundef{\@nameauth@CleanName{#2#3!NF!}}}%
-               {\csundef{\@nameauth@CleanName{#2!MN!}}%
-               \csundef{\@nameauth@CleanName{#2!NF!}}}%
-          }%
+  \IfValueTF{#1}%
+    {\csundef{\@nameauth@CleanName{#1#2!MN!}}%
+    \csundef{\@nameauth@CleanName{#1#2!NF!}}}%
+    {\IfValueTF{#3}%
+      {\csundef{\@nameauth@CleanName{#2#3!MN!}}%
+      \csundef{\@nameauth@CleanName{#2#3!NF!}}}%
+      {\csundef{\@nameauth@CleanName{#2!MN!}}%
+      \csundef{\@nameauth@CleanName{#2!NF!}}}%
+    }%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1492,15 +1627,15 @@
 %    \begin{macrocode}
 \DeclareDocumentCommand\SubvertName{o m o}%
 {%
-     \IfValueTF{#1}%
-          {\csgdef{\@nameauth@CleanName{#1#2!MN!}}%
-          \csgdef{\@nameauth@CleanName{#1#2!NF!}}}%
-          {\IfValueTF{#3}%
-               {\csgdef{\@nameauth@CleanName{#2#3!MN!}}%
-               \csgdef{\@nameauth@CleanName{#2#3!NF!}}}%
-               {\csgdef{\@nameauth@CleanName{#2!MN!}}%
-               \csgdef{\@nameauth@CleanName{#2!NF!}}}%
-          }%
+  \IfValueTF{#1}%
+    {\csgdef{\@nameauth@CleanName{#1#2!MN!}}%
+    \csgdef{\@nameauth@CleanName{#1#2!NF!}}}%
+    {\IfValueTF{#3}%
+      {\csgdef{\@nameauth@CleanName{#2#3!MN!}}%
+      \csgdef{\@nameauth@CleanName{#2#3!NF!}}}%
+      {\csgdef{\@nameauth@CleanName{#2!MN!}}%
+      \csgdef{\@nameauth@CleanName{#2!NF!}}}%
+    }%
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 15efb9f11a6..2774f2109de 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -22,9 +22,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{nameauth}
-    [2012/03/08 v1.1 name authority macros to aid consistent display and indexing of names]
- %
-%% \DescribeMacro{\IndexActive}
+    [2012/03/25 v1.2 name authority macros to aid consistent display and indexing of names]
+
 \newif\if@nameauth@DoFormat
 \newif\if@nameauth@DoIndex
 \newif\if@nameauth@DoComma
@@ -47,477 +46,523 @@
 \RequirePackage{xparse}
 \newcommand*{\@nameauth@CleanName}[1]%
 {%
-    \expandafter\zap@space\detokenize{#1} \@empty%
+  \expandafter\zap@space\detokenize{#1} \@empty%
 }
 \newcommand*{\@nameauth@Root}[1]%
 {%
-     \@nameauth@TrimRoot#1\relax%
+  \@nameauth@TrimRoot#1\relax%
 }
 \def\@nameauth@TrimRoot#1,#2\relax{#1}
 \newcommand*{\@nameauth@Suffix}[1]%
 {%
-     \@nameauth@TrimSuffix#1\relax%
+  \@nameauth@TrimSuffix#1\relax%
 }
 \def\@nameauth@TrimSuffix#1,#2\relax{#2}
 \newcommand*{\@nameauth@CheckComma}[1]%
 {%
-     \@nameauth@CheckSuffix#1,\relax%
+  \@nameauth@CheckSuffix#1,\relax%
 }
 \def\@nameauth@CheckSuffix#1,#2\relax%
 {%
-     \def\Test{#2}%
-     \ifx\Test\@empty\@nameauth@Commafalse\else\@nameauth@Commatrue\fi%
+  \def\Test{#2}%
+  \ifx\Test\@empty\@nameauth@Commafalse\else\@nameauth@Commatrue\fi%
 }
 \def\@nameauth@CheckDot{\futurelet\@token\@nameauth@EvalDot}
 \def\@nameauth@EvalDot%
 {%
-    \let\@period=.\ifx\@token\@period\expandafter\@gobble \fi%
+  \let\@period=.\ifx\@token\@period\expandafter\@gobble \fi%
 }
 \newcommand*{\@nameauth@TestDot}[1]%
 {%
-     \def\TestDot##1.\TestEnd##2\TestStop{\TestPunct{##2}}%
-     \def\TestPunct##1%
-          {\ifx\TestPunct##1\TestPunct\else\@nameauth@Puncttrue\fi}%
-     \@nameauth@Punctfalse%
-     \TestDot#1\TestEnd.\TestEnd\TestStop%
+  \def\TestDot##1.\TestEnd##2\TestStop{\TestPunct{##2}}%
+  \def\TestPunct##1%
+    {\ifx\TestPunct##1\TestPunct\else\@nameauth@Puncttrue\fi}%
+  \@nameauth@Punctfalse%
+  \TestDot#1\TestEnd.\TestEnd\TestStop%
 }
 \DeclareDocumentCommand\@nameauth@FmtName{s m}%
 {%
-    \@nameauth@DoCapsfalse%
-    \@nameauth@TestDot{#2}%
-    \IfBooleanTF{#1}%
-          {#2}%
-          {\bgroup\NamesFormat{#2}\egroup}%
+  \@nameauth@DoCapsfalse%
+  \@nameauth@TestDot{#2}%
+  \IfBooleanTF{#1}%
+    {#2}%
+    {\bgroup\NamesFormat{#2}\egroup}%
 }
-\newcommand{\@nameauth@Index}[1]{%
-     \if@nameauth@DoIndex\index{#1}\fi%
+\DeclareDocumentCommand\@nameauth@Index{m o}%
+{%
+  \IfValueTF{#2}
+  {\ifcsname#2\endcsname%
+    \if@nameauth@DoIndex\index{#1\csname#2\endcsname}\fi%
+  \else%
+    \if@nameauth@DoIndex\index{#1}\fi%
+  \fi}%
+  {\if@nameauth@DoIndex\index{#1}\fi}%
 }
 \newcommand*{\@nameauth@CapRoot}[1]%
 {%
-     \@nameauth@CR#1\relax%
+  \@nameauth@CR#1\relax%
 }
 \def\@nameauth@CR#1#2\relax{\uppercase{#1}\@nameauth@Root{#2}}
 \newcommand{\CapThis}%
 {%
-     \@nameauth@DoCapstrue%
+  \@nameauth@DoCapstrue%
 }
 \DeclareDocumentCommand\Name{s o m o}%
 {%
-     \protected@edef\Surnames{#3}%
-     \if@nameauth@DoCaps%
-          \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
-     \else%
-          \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
-     \fi%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#3}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
-          \fi%
-     \fi%
-     \IfValueTF{#2}%
-     {\IfValueTF{#4}%
-          {\def\Forenames{#4}}{\def\Forenames{#2}}%
-     \ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-          \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-               \expandafter\Forenames\expandafter\space\Surnames}%
-          \PackageWarning{nameauth}%
-          {macro Name Cross-reference: #2 #3 cannot be a page reference.}%
-     \else%
-          \if@nameauth@DoFormat%
-               \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
-               \IfBooleanTF{#1}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}%
-               \fi%
-          \else%
-               \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
-               \IfBooleanTF{#1}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-                    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                         \@nameauth@Index{\Surnames, #2}}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-                         \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\Surnames, #2}%
-               \fi%
-          \fi%
-     \fi}%
-     {\IfValueTF{#4}
-          {\ifcsname\@nameauth@CleanName{#3#4!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames\space#4}%
-               \PackageWarning{nameauth}%
-               {macro Name Cross-reference: #3 #4 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                         {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter{%
-                              \Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                         {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                              \@nameauth@Index{\Surnames\space#4}}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\Surnames\space#4}%
-                     \fi%
-               \fi%
-          \fi}%
-          {\ifcsname\@nameauth@CleanName{#3!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames}%
-               \PackageWarning{nameauth}%
-               {macro Name Cross-reference: #3 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}}%
-                         {\@nameauth@FmtName*{\Shortnames}%
-                              \@nameauth@Index{\Surnames}}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
-                    \IfBooleanTF{#1}%
-                         {\expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}}%
-                         {\@nameauth@FmtName*{\Shortnames}%
-                              \@nameauth@Index{\Surnames}}%
-                     \else%
-                         \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                              \@nameauth@Index{\Surnames}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
-     \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
+  \protected@edef\Surnames{#3}%
+  \if@nameauth@DoCaps%
+    \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
+  \else%
+    \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
+  \fi%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#3}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
+    \fi%
+  \fi%
+  \IfValueTF{#2}%
+  {\IfValueTF{#4}%
+    {\def\Forenames{#4}}{\def\Forenames{#2}}%
+  \ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+    \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+      \expandafter\Forenames\expandafter\space\Surnames}%
+    \PackageWarning{nameauth}%
+    {macro Name Cross-reference: #2 #3 cannot be a page reference.}%
+  \else%
+    \if@nameauth@DoFormat%
+      \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
+      \IfBooleanTF{#1}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]%
+      \fi%
+    \else%
+      \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
+      \IfBooleanTF{#1}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+        {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+          \@nameauth@Index{\Surnames, #2}[\@nameauth@CleanName{#2#3}]%
+      \fi%
+    \fi%
+  \fi}%
+  {\IfValueTF{#4}
+    {\ifcsname\@nameauth@CleanName{#3#4!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames\space#4}%
+      \PackageWarning{nameauth}%
+      {macro Name Cross-reference: #3 #4 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter{%
+            \Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames\space#4}%
+            \@nameauth@Index{\Surnames\space#4}[\@nameauth@CleanName{#3#4}]%
+        \fi%
+      \fi%
+    \fi}%
+    {\ifcsname\@nameauth@CleanName{#3!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames}%
+      \PackageWarning{nameauth}%
+      {macro Name Cross-reference: #3 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+          {\@nameauth@FmtName*{\Shortnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
+        \IfBooleanTF{#1}%
+          {\expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+          {\@nameauth@FmtName*{\Shortnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter*%
+            \expandafter{\Surnames}%
+            \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#3}]%
+        \fi%
+      \fi%
+    \fi}%
+  }%
+  \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 \DeclareDocumentCommand\FName{o m o}%
 {%
-     \protected@edef\Surnames{#2}%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#2}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
-          \fi%
-     \fi%
-    \IfValueTF{#1}%
-     {\IfValueTF{#3}{\edef\Forenames{#3}}{\edef\Forenames{#1}}%
-     \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+  \protected@edef\Surnames{#2}%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#2}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
+    \fi%
+  \fi%
+  \IfValueTF{#1}%
+  {\IfValueTF{#3}{\edef\Forenames{#3}}{\edef\Forenames{#1}}%
+  \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+    \expandafter\@nameauth@FmtName\expandafter*%
+      \expandafter{\Forenames}%
+    \PackageWarning{nameauth}%
+    {macro FName Cross-reference: #1 #2 cannot be a page reference.}%
+  \else%
+    \if@nameauth@DoFormat%
+      \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
+        \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Forenames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \else%
+        \csgdef{\@nameauth@CleanName{#1#2!MN!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter{%
+          \expandafter\Forenames\expandafter\space\Surnames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \fi%
+    \else%
+      \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
+        \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Forenames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \else%
+        \csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
+        \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Forenames\expandafter\space\Surnames}%
+        \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+      \fi%
+    \fi%
+  \fi}%
+  {\IfValueTF{#3}
+    {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames\space#3}%
+      \PackageWarning{nameauth}%
+      {macro FName Cross-reference: #2 #3 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
+          \expandafter\@nameauth@FmtName%
+            \expandafter{\Surnames\space#3}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
+            \expandafter\@nameauth@FmtName\expandafter*%
+          \expandafter{\Surnames\space#3}%
+          \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+        \fi%
+      \fi%
+    \fi}%
+    {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
+      \expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnames}%
+      \PackageWarning{nameauth}%
+      {macro FName Cross-reference: #2 cannot be a page reference.}%
+    \else%
+      \if@nameauth@DoFormat%
+        \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2!MN!}}{}%
+          \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \fi%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
+          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2!NF!}}{}%
           \expandafter\@nameauth@FmtName\expandafter*%
-               \expandafter{\Forenames}%
-          \PackageWarning{nameauth}%
-          {macro FName Cross-reference: #1 #2 cannot be a page reference.}%
-     \else%
-          \if@nameauth@DoFormat%
-               \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
-                    \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Forenames}%
-                    \@nameauth@Index{\Surnames, #1}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#1#2!MN!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter{%
-                        \expandafter\Forenames\expandafter\space\Surnames}%
-                    \@nameauth@Index{\Surnames, #1}%
-               \fi%
-          \else%
-               \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
-                   \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Forenames}%
-                   \@nameauth@Index{\Surnames, #1}%
-               \else%
-                    \csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
-                    \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Forenames\expandafter\space\Surnames}%
-                    \@nameauth@Index{\Surnames, #1}%
-               \fi%
-          \fi%
-     \fi}%
-     {\IfValueTF{#3}
-          {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames\space#3}%
-               \PackageWarning{nameauth}%
-               {macro FName Cross-reference: #2 #3 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
-                         \expandafter\@nameauth@FmtName%
-                              \expandafter{\Surnames\space#3}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
-                              \expandafter\@nameauth@FmtName\expandafter*%
-                         \expandafter{\Surnames\space#3}%
-                         \@nameauth@Index{\Surnames\space#3}%
-                     \fi%
-               \fi%
-          \fi}%
-          {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
-               \expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnames}%
-               \PackageWarning{nameauth}%
-               {macro FName Cross-reference: #2 cannot be a page reference.}%
-          \else%
-               \if@nameauth@DoFormat%
-                    \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2!MN!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
-                         \@nameauth@Index{\Surnames}%
-                     \fi%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
-                         \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\Surnames}%
-                     \else%
-                         \csgdef{\@nameauth@CleanName{#2!NF!}}{}%
-                         \expandafter\@nameauth@FmtName\expandafter*%
-                              \expandafter{\Surnames}%
-                         \@nameauth@Index{\Surnames}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
-     \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
+            \expandafter{\Surnames}%
+          \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+        \fi%
+      \fi%
+    \fi}%
+  }%
+  \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 \DeclareDocumentCommand\AKA{s o m o m o}%
 {%
-     \protected@edef\Surnamesi{#3}%
-     \protected@edef\Surnamesii{#5}%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#3}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnamesi{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
-          \fi%
-          \@nameauth@CheckComma{#5}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnamesii{\@nameauth@Root{#5}\@nameauth@Suffix{#5}}%
-          \fi%
-     \fi%
-     \IfValueTF{#4}%
-     {\IfValueTF{#6}%
-          {\edef\Forenames{#6}}{\edef\Forenames{#4}}%
-          \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
-               \expandafter\Forenames\expandafter\space\Surnamesii}%
-          \ifcsname\@nameauth@CleanName{#4#5!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro AKA XRef: #4 #5 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#4#5!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro AKA Name reference: #4 #5 already exists; no see ref.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#4#5!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro AKA Name reference: #4 #5 already exists; no see ref.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
-                         \IfValueTF{#2}%
-                              {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi, #2}}}%
-                              {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi}}}%
-                    \fi%
-               \fi%
-          \fi}%
-     {\IfValueTF{#6}%
-          {\IfBooleanTF{#1}%
-               {\@nameauth@FmtName*{#6}}%
-               {\expandafter\@nameauth@FmtName\expandafter*%
-                    \expandafter{\Surnamesii\space#6}}%
-          \ifcsname\@nameauth@CleanName{#5#6!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro AKA XRef: #5 #6 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#5#6!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro AKA Name reference: #5 #6 already exists; no see ref.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#5#6!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro AKA Name reference: #5 #6 already exists; no see ref.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#5#6!PN!}}{}%
-                         \IfValueTF{#2}%
-                              {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi, #2}}}%
-                              {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi}}}%
-                    \fi%
-               \fi%
-          \fi}%
-          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii}%
-          \ifcsname\@nameauth@CleanName{#5!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro AKA XRef: #5 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#5!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro AKA Name reference: #5 already exists; no see ref.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#5!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro AKA Name reference: #5 already exists; no see ref.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#5!PN!}}{}%
-                         \IfValueTF{#2}%
-                              {\@nameauth@Index{\Surnamesii|see{\Surnamesi, #2}}}%
-                              {\@nameauth@Index{\Surnamesii|see{\Surnamesi}}}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
-     \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
+  \protected@edef\Surnamesi{#3}%
+  \protected@edef\Surnamesii{#5}%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#3}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnamesi{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
+    \fi%
+    \@nameauth@CheckComma{#5}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnamesii{\@nameauth@Root{#5}\@nameauth@Suffix{#5}}%
+    \fi%
+  \fi%
+  \IfValueTF{#4}%
+  {\IfValueTF{#6}%
+    {\edef\Forenames{#6}}{\edef\Forenames{#4}}%
+    \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+      \expandafter\Forenames\expandafter\space\Surnamesii}%
+    \ifcsname\@nameauth@CleanName{#4#5!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro AKA XRef: #4 #5 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#4#5!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro AKA Name reference: #4 #5 already exists; no see ref.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#4#5!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro AKA Name reference: #4 #5 already exists; no see ref.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
+          \IfValueTF{#2}%
+            {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi, #2}}}%
+            {\@nameauth@Index{\Surnamesii, #4|see{\Surnamesi}}}%
+        \fi%
+      \fi%
+    \fi}%
+  {\IfValueTF{#6}%
+    {\IfBooleanTF{#1}%
+      {\@nameauth@FmtName*{#6}}%
+      {\expandafter\@nameauth@FmtName\expandafter*%
+        \expandafter{\Surnamesii\space#6}}%
+    \ifcsname\@nameauth@CleanName{#5#6!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro AKA XRef: #5 #6 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#5#6!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro AKA Name reference: #5 #6 already exists; no see ref.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#5#6!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro AKA Name reference: #5 #6 already exists; no see ref.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#5#6!PN!}}{}%
+          \IfValueTF{#2}%
+            {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi, #2}}}%
+            {\@nameauth@Index{\Surnamesii\space#6|see{\Surnamesi}}}%
+        \fi%
+      \fi%
+    \fi}%
+    {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii}%
+    \ifcsname\@nameauth@CleanName{#5!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro AKA XRef: #5 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#5!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro AKA Name reference: #5 already exists; no see ref.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#5!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro AKA Name reference: #5 already exists; no see ref.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#5!PN!}}{}%
+          \IfValueTF{#2}%
+            {\@nameauth@Index{\Surnamesii|see{\Surnamesi, #2}}}%
+            {\@nameauth@Index{\Surnamesii|see{\Surnamesi}}}%
+        \fi%
+      \fi%
+    \fi}%
+  }%
+  \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
 }
 \DeclareDocumentCommand\PName{s o m o m o}%
 {%
-     \IfBooleanTF{#1}{\Name*[#2]{#3}}{\Name[#2]{#3}}%
-     {\space}(\AKA[#2]{#3}[#4]{#5}[#6])%
+  \IfBooleanTF{#1}{\Name*[#2]{#3}}{\Name[#2]{#3}}%
+  {\space}(\AKA[#2]{#3}[#4]{#5}[#6])%
+}
+\DeclareDocumentCommand\TagName{o m o m}%
+{%
+  \IfValueTF{#1}%
+    {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro TagName Cannot tag xref: #1 #2.}%
+    \else%
+      \csgdef{\@nameauth@CleanName{#1#2}}{#4}%
+    \fi}%
+    {\IfValueTF{#3}
+      {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro TagName Cannot tag xref: #2 #3.}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2#3}}{#4}%
+      \fi}%
+      {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro TagName Cannot tag xref: #2.}%
+      \else%
+        \csgdef{\@nameauth@CleanName{#2}}{#4}%
+      \fi}%
+    }%
+}
+\DeclareDocumentCommand\UntagName{o m o}%
+{%
+  \IfValueTF{#1}%
+    {\csundef{\@nameauth@CleanName{#1#2}}}%
+    {\IfValueTF{#3}
+      {\csundef{\@nameauth@CleanName{#2#3}}}%
+      {\csundef{\@nameauth@CleanName{#2}}}%
+    }%
 }
 \DeclareDocumentCommand\IndexName{o m o}%
 {%
-     \protected@edef\Surnames{#2}%
-     \if@nameauth@DoComma\else%
-          \@nameauth@CheckComma{#2}%
-          \if@nameauth@Comma%
-               \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
-          \fi%
-     \fi%
-     \IfValueTF{#1}%
-          {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
-               \else%
-                    \@nameauth@Index{\Surnames, #1}%
-               \fi}%
-          {\IfValueTF{#3}
-               {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
-               \else%
-                    \@nameauth@Index{\Surnames\space#3}%
-               \fi}%
-               {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
-               \else%
-                    \@nameauth@Index{\Surnames}%
-               \fi}%
-          }%
+  \protected@edef\Surnames{#2}%
+  \if@nameauth@DoComma\else%
+    \@nameauth@CheckComma{#2}%
+    \if@nameauth@Comma%
+      \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
+    \fi%
+  \fi%
+  \IfValueTF{#1}%
+    {\ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro IndexName XRef: #1 #2 exists.}%
+    \else%
+      \@nameauth@Index{\Surnames, #1}[\@nameauth@CleanName{#1#2}]%
+    \fi}%
+    {\IfValueTF{#3}
+      {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro IndexName XRef: #2 #3 exists.}%
+      \else%
+        \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+      \fi}%
+      {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro IndexName XRef: #2 exists.}%
+      \else%
+        \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+      \fi}%
+    }%
 }
 \DeclareDocumentCommand\ExcludeName{o m o}%
 {%
-     \IfValueTF{#1}%
-     {%
-          \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
-               \PackageWarning{nameauth}%
-               {macro ExcludeName XRef: #1 #2 exists.}%
-          \else%
-               \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#1#2!PN!}}{}%
-                    \fi%
-               \fi%
-          \fi}%
-     {\IfValueTF{#3}%
-          {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname\relax%
-          \else%
-               \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2#3!PN!}}{}%
-                    \fi%
-               \fi%
-          \fi}%
-          {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname\relax%
-          \else%
-               \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
-                    \PackageWarning{nameauth}%
-                    {macro ExcludeName Reference: #2 already exists; no exclusion.}%
-               \else%
-                    \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
-                         \PackageWarning{nameauth}%
-                         {macro ExcludeName Reference: #2 already exists; no exclusion.}%
-                    \else%
-                         \csgdef{\@nameauth@CleanName{#2!PN!}}{}%
-                    \fi%
-               \fi%
-          \fi}%
-     }%
+  \IfValueTF{#1}%
+  {%
+    \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
+      \PackageWarning{nameauth}%
+      {macro ExcludeName XRef: #1 #2 exists.}%
+    \else%
+      \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#1#2!PN!}}{}%
+        \fi%
+      \fi%
+    \fi}%
+  {\IfValueTF{#3}%
+    {\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname\relax%
+    \else%
+      \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2#3!PN!}}{}%
+        \fi%
+      \fi%
+    \fi}%
+    {\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname\relax%
+    \else%
+      \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
+        \PackageWarning{nameauth}%
+        {macro ExcludeName Reference: #2 already exists; no exclusion.}%
+      \else%
+        \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
+          \PackageWarning{nameauth}%
+          {macro ExcludeName Reference: #2 already exists; no exclusion.}%
+        \else%
+          \csgdef{\@nameauth@CleanName{#2!PN!}}{}%
+        \fi%
+      \fi%
+    \fi}%
+  }%
 }
 \DeclareDocumentCommand\ForgetName{o m o}%
 {%
-     \IfValueTF{#1}%
-          {\csundef{\@nameauth@CleanName{#1#2!MN!}}%
-          \csundef{\@nameauth@CleanName{#1#2!NF!}}}%
-          {\IfValueTF{#3}%
-               {\csundef{\@nameauth@CleanName{#2#3!MN!}}%
-               \csundef{\@nameauth@CleanName{#2#3!NF!}}}%
-               {\csundef{\@nameauth@CleanName{#2!MN!}}%
-               \csundef{\@nameauth@CleanName{#2!NF!}}}%
-          }%
+  \IfValueTF{#1}%
+    {\csundef{\@nameauth@CleanName{#1#2!MN!}}%
+    \csundef{\@nameauth@CleanName{#1#2!NF!}}}%
+    {\IfValueTF{#3}%
+      {\csundef{\@nameauth@CleanName{#2#3!MN!}}%
+      \csundef{\@nameauth@CleanName{#2#3!NF!}}}%
+      {\csundef{\@nameauth@CleanName{#2!MN!}}%
+      \csundef{\@nameauth@CleanName{#2!NF!}}}%
+    }%
 }
 \DeclareDocumentCommand\SubvertName{o m o}%
 {%
-     \IfValueTF{#1}%
-          {\csgdef{\@nameauth@CleanName{#1#2!MN!}}%
-          \csgdef{\@nameauth@CleanName{#1#2!NF!}}}%
-          {\IfValueTF{#3}%
-               {\csgdef{\@nameauth@CleanName{#2#3!MN!}}%
-               \csgdef{\@nameauth@CleanName{#2#3!NF!}}}%
-               {\csgdef{\@nameauth@CleanName{#2!MN!}}%
-               \csgdef{\@nameauth@CleanName{#2!NF!}}}%
-          }%
+  \IfValueTF{#1}%
+    {\csgdef{\@nameauth@CleanName{#1#2!MN!}}%
+    \csgdef{\@nameauth@CleanName{#1#2!NF!}}}%
+    {\IfValueTF{#3}%
+      {\csgdef{\@nameauth@CleanName{#2#3!MN!}}%
+      \csgdef{\@nameauth@CleanName{#2#3!NF!}}}%
+      {\csgdef{\@nameauth@CleanName{#2!MN!}}%
+      \csgdef{\@nameauth@CleanName{#2!NF!}}}%
+    }%
 }
 \newcommand{\NamesInactive}{\@nameauth@DoFormatfalse}
 \newcommand{\NamesActive}{\@nameauth@DoFormattrue}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index d747933e5b9..dba243111aa 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1848,6 +1848,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'lmake'	=> 'latex',  # requires interaction
  'luaindex'	=> 'lualatex --shell-escape',
  'mylatexformat'=> 'tex',
+ 'nameauth'	=> 'latex',  # requires interaction
  'nomentbl'	=> 'latex -translate-file=empty.tcx',	# no 8-bit
  'pbsheet'	=> 'latex',  # requires interaction
  'thumb'	=> 'latex -translate-file=empty.tcx',	# no 8-bit