nameauth (20jan12)

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

1 files changed, 298 insertions, 112 deletions

diff --git a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
index 404cee3b1ad..c60ad2b2907 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>
-    [2011/12/26 v0.7 name authority macros to aid consistent display and indexing of names]
+    [2012/01/19 v0.75 name authority macros to aid consistent display and indexing of names]
 %</package>
 %
 %<*driver>
@@ -57,7 +57,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{336}
+% \CheckSum{416}
 %
 % \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
@@ -77,6 +77,7 @@
 %
 %
 % \changes{v0.7}{2011/12/26}{Initial version}
+% \changes{v0.75}{2012/01/19}{New features described; documentation clarified}
 %
 % \DoNotIndex{\newcommand, \newenvironment, \@empty, \@gobble, \bfseries, \bgroup, \def, \egroup, \else, \endcsname, \endinput, \ExecuteOptions, \fi, \if, \ifx, \IfBooleanTF, \IfValueTF, \itshape, \let, \newif, \relax, \renewcommand, \RequirePackage, \scshape, \space}
 %
@@ -89,7 +90,7 @@
 % \maketitle
 %
 % \begin{abstract}
-% These macros help an author to encode the (optional) forenames and (mandatory) surnames of people in order to normalize occurrences in the text and entries in the index. This package is intended for Western-style naming conventions.
+% \noindent These macros help an author to encode the (optional) forenames and (mandatory) surnames of people in order to normalize occurrences in the text and entries in the index. This package is intended for Western-style naming conventions.
 % \end{abstract}
 %
 % \section{Introduction}
@@ -130,13 +131,31 @@
 % This macro generates two forms of the name: a printed form in the text and a form of the name that occurs in the index.\index{name forms|usage}
 % The general syntax is:
 % \begin{quote}
-% \texttt{\bsc Name}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate forenames}\\
-% \texttt{\bsc Name*}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate forenames}
+% \texttt{\bsc Name}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}\\
+% \texttt{\bsc Name*}\oarg{forename(s)}\marg{surname(s)}\oarg{alternate names}
 % \end{quote}
 %
-% From now one we will abbreviate \emph{forename(s)} with \emph{FNN} and \emph{surname(s)} with \emph{SNN} in the syntax descriptions. The unstarred form prints the ``full name'' at the first occurrence, then only the surname(s) thereafter. A ``full name'' in the body texts consists of either the regular or the alternate forename(s), followed by the surname(s). Only the ``regular'' forenames are used in the index. The starred form always prints the full name. Forenames are optional. Surnames are mandatory. Both macros usually apply a different ``font  attribute'' to the name when it first appears in the running text. For example:
+% From now on we will abbreviate \emph{forename(s)} with \emph{FNN} and \emph{surname(s)} with \emph{SNN} at various points. The syntax descriptions above do not capture exactly how the \texttt{\bsc Name} macro behaves. The following table should help:
 %
-% \begin{quote}
+% \begin{quote}\small
+% \begin{tabular}{llll}\hline
+% {\large\strut}\emph{FNN} & \emph{SNN} & Alternate Names & Result\\\hline
+% \texttt{Albert} & \texttt {Einstein} & (none) & \Name[Albert]{Einstein}\\
+% (none) & \texttt{Confucius} & (none) & \Name{Confucius}\\
+% \texttt{M.T.} & \texttt{Cicero} & \texttt{Marcus Tullius} & \Name[M.T.]{Cicero}[Marcus Tullius]\\
+% (none) & \texttt{Charles} & \texttt{the Bald} & \Name{Charles}[the Bald]\\\hline
+% \end{tabular}
+% \end{quote}
+%
+% Basically,\texttt{\bsc Name} connects the \emph{FNN} to the \emph{SNN} to create both a printed form and an indexed form, respectively, \textbf{\emph{FNN}\,\emph{SNN}} and \textbf{\emph{SNN},\,\emph{FNN}}. This takes care of most modern Western names. For those with one name, such as ancient figures or those with stage names, one can drop the \emph{FNN} so that \texttt{\bsc Name} produces the result \textbf{\emph{SNN}} for both text and index.
+%
+% A newer feature added to \texttt{\bsc Name} avoids a complicated workaround. Sometimes you might want to have the option of using either an alternate set of forenames or a sobriquet that functions as a surname for ancient figures. These two alternatives are handled by the final, optional field of \texttt{\bsc Name}. If ``regular'' \emph{FNN} are present, then the alternate names conditionally will replace the \emph{FNN} in the printed form, but not in the indexed form. If no regular \emph{FNN} are present, then the alternate names will be appended to the \emph{SNN} in the printed form \emph{and} in the indexed form. You must use the sobriquet form of a name consistently or risk confusion.
+%
+% I mentioned conditional use. The unstarred form prints the ``full name'' at the first occurrence, then only the partial form thereafter. The starred form always prints the full name. Both macros usually apply a different ``font  attribute'' to the name when it first appears in the running text.
+%
+% Here are some more examples of use:
+%
+% \begin{quote}\small
 % \texttt{\bsc Name*[Johann Wolfgang von]\{Goethe\}}\\
 % Print \Name*[Johann Wolfgang von]{Goethe} the first time it appears.\\
 % Later, print the full name \Name*[Johann Wolfgang von]{Goethe}.\\[1ex]
@@ -144,39 +163,97 @@
 % \ForgetName[Johann Wolfgang von]{Goethe}%
 % Print \Name[Johann Wolfgang von]{Goethe} the first time it appears.\\
 % Later, print only the last name \Name[Johann Wolfgang von]{Goethe}.\\[1ex]
-% \texttt{\bsc Name\{Boethius\}} and \texttt{\bsc Name*\{Boethius\}}\\
+% \texttt{\bsc Name\{Boethius\}} and \texttt{\bsc Name*\{Boethius\}}
 % Print \Name{Boethius} the first time it appears. Later, print \Name{Boethius}.
 % \end{quote}
+%
+% \begin{quote}\small
+% \texttt{\bsc Name*\{Antiochus IV\}[Epiphanes]}\\
+% Print \Name*{Antiochus IV}[Epiphanes] the first time it appears. Later, print the name and sobriquet \Name*{Antiochus IV}[Epiphanes].\\[1ex]
+% \ForgetName{Antiochus IV}[Epiphanes]%
+% \texttt{\bsc Name\{Antiochus IV\}[Epiphanes]}\\
+% Print \Name{Antiochus IV}[Epiphanes] the first time it appears. Later, print just the name \Name{Antiochus IV}[Epiphanes].
+% \end{quote}
 % 
 % \emph{Note}: Here I am playing a ``dirty trick'' by making each line begin as if the name had not yet occurred. See Section \ref{sec:Tweaks} for more.
 %
 % \subsubsection{Suffix Removal}
 % 
-% Observe that \texttt{\bsc Name} and \texttt{\bsc Name*} appear to have the same effect with \Name{Boethius}. That is not exactly true. When \texttt{\bsc Name} is used with a name containing a comma and a suffix, it removes the suffix after the first use, while \texttt{\bsc Name*} does not do this. That results in the following behavior:
+% \texttt{\bsc Name} and \texttt{\bsc Name*} have an additional difference. \texttt{\bsc Name} will truncate the comma and suffizes from subsquent occurrences of last names. For example, it prints the name \Name[Oskar]{Hammerstein, II} the first time and \Name[Oskar]{Hammerstein, II} thereafter.
 % 
-% \begin{quote}
-% \texttt{\bsc Name[Martin Luther]\{King, Jr.\}}\\
-% Print \Name[Martin Luther]{King, Jr.} when it appears and \Name[Martin Luther]{King, Jr.} thereafter. Use the starred form to get \Name*[Martin Luther]{King, Jr.}.
-% \end{quote}
-% 
-% These macros keep track of whether the name ends with the period of an abbreviation like ``Jr.'' and ``Sr.'' That should also work with abbreviations like ``d.~\"{A}.'' (\textit{der \"{A}ltere}). Two periods are not printed when the full name is printed at the end of a sentence. The following example shows the possible combinations:\\
+% These macros keep track of whether the name ends with the period of an abbreviation like ``Jr.'' and ``Sr.'' That should also work with abbreviations like ``d.~\"{A}.'' (\textit{der \"{A}ltere}). Two periods are not printed when the full name is printed at the end of a sentence. The following example shows the possible combinations:
 % 
 % \ForgetName[Martin Luther]{King, Jr.}%
 % \begin{quote}\small
 % \begin{tabular}{ll}
 % \texttt{\bsc Name[Martin Luther]\{King, Jr.\}.} & \Name[Martin Luther]{King, Jr.}.\\
 % \texttt{\bsc Name[Martin Luther]\{King, Jr.\}.} & \Name[Martin Luther]{King, Jr.}.\\
-% \texttt{\bsc Name[Martin Luther]\{King, Jr.\}} & \Name[Martin Luther]{King, Jr.}\\
+% \texttt{\bsc Name[Martin Luther]\{King, Jr.\}} & \Name[Martin Luther]{King, Jr.} (e.g., in a sentence)\\
 % \texttt{\bsc Name*[Martin Luther]\{King, Jr.\}.} & \Name*[Martin Luther]{King, Jr.}.\\
 % \texttt{\bsc Name*[Martin Luther]\{King, Jr.\}} & \Name*[Martin Luther]{King, Jr.}
 % \end{tabular}
 % \end{quote}
-% 
+%
+% \subsubsection{Tabular Summary of \texttt{\bsc Name}}
+%
+% We begin by recapitulating the original uses: Usual Western forenames and surnames, persons with a mononym, an abbreviated name in the index and a fuller name in the text, and a mononym plus sobriquet option:
+%
+% \begin{quote}\small
+% \begin{tabular}{llll}\hline
+% {\large\strut}\emph{FNN} & \emph{SNN} & Alternate Names & Result\\\hline
+% \texttt{Harry S.} & \texttt {Truman} & (none) & \Name[Harry S.]{Truman}\\
+% (none) & \texttt{Mencius} & (none) & \Name{Mencius}\\
+% \texttt{John Q.} & \texttt{Adams} & \texttt{John Quincy} & \Name[John Q.]{Adams}[John Quincy]\\
+% (none) & \texttt{Ptolemy I} & \texttt{Soter} & \Name{Ptolemy I}[Soter]\\\hline
+% \end{tabular}
+% \end{quote}
+%
+% Different results can be achieved when the options are applied creatively. In some cases, the sobriquet option can serve for lists of royalty and references to them. In others, this use will fail:
+%
+% \begin{quote}\small
+% \begin{tabular}{llp{1.2cm}ll}\hline
+% \emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
+% (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & \texttt{\bsc Name\{Henry\}[VIII]}\\
+% (none) & \texttt{Henry} & \texttt{VIII} & \Name*{Henry}[VIII] & \texttt{\bsc Name*\{Henry\}[VIII]}\\
+% (none) & \texttt{Henry} & \texttt{VIII} & \Name{Henry}[VIII] & \texttt{\bsc Name\{Henry\}[VIII]}\\
+% \texttt{Henry} & \texttt{Tudor} & \texttt{VIII} & \textsc{VIII Tudor} & \texttt{\bsc Name[Henry]\{Tudor\}[VIII]}\\\hline
+% \end{tabular}
+% \end{quote}
+%
+% Very rudimentary references to Eastern names (I plead ignorance on this point) can be achieved via the sobriquet feature:
+%
+% \begin{quote}\small
+% \begin{tabular}{llp{1.2cm}ll}\hline
+% \emph{FNN} & \emph{SNN} & Alternate Names & Result & Function\\\hline
+% (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & \texttt{\bsc Name\{Chiang\}[Kai-shek]}\\
+% (none) & \texttt{Chiang} & \texttt{Kai-shek} & \Name{Chiang}[Kai-shek] & \texttt{\bsc Name\{Chiang\}[Kai-shek]}\\
+% (none) & \texttt{Sun} & \texttt{Yat-sen} & \Name{Sun}[Yat-sen] & \texttt{\bsc Name\{Sun\}[Yat-sen]}\\
+% (none) & \texttt{Sun} & \texttt{Yat-sen} & \Name{Sun}[Yat-sen] & \texttt{\bsc Name\{Sun\}[Yat-sen]}\\\hline
+% \end{tabular}
+% \end{quote}
+%
+% Here is a general table of options. Sobriquets and suffixes do mix, but not well:
+%
+% \begin{quote}\small
+% \begin{tabular}{llp{1.4cm}p{4cm}}\hline
+% \emph{FNN} & \emph{SNN} & Alternate Names & Result\\\hline
+% \texttt{Forename} & \texttt{SurnameA, Suffix} & \texttt{Othername} & \Name[Forename]{SurnameA, Suffix}[Othername] (\texttt{\bsc Name})\\
+% \texttt{Forename} & \texttt{SurnameA, Suffix} & \texttt{Othername} & \Name*[Forename]{SurnameA, Suffix}[Othername] (\texttt{\bsc Name*})\\
+% \texttt{Forename} & \texttt{SurnameA, Suffix} & \texttt{Othername} & \Name[Forename]{SurnameA, Suffix}[Othername] (\texttt{\bsc Name})\\\hline
+% \texttt{Forename} & \texttt{SurnameB, Suffix} & (none) & \Name[Forename]{SurnameB, Suffix} (\texttt{\bsc Name})\\
+% \texttt{Forename} & \texttt{SurnameB, Suffix} & (none) & \Name*[Forename]{SurnameB, Suffix} (\texttt{\bsc Name*})\\
+% \texttt{Forename} & \texttt{SurnameB, Suffix} & (none) & \Name[Forename]{SurnameB, Suffix} (\texttt{\bsc Name})\\\hline
+% (none) & \texttt{SurnameC, Suffix} & \texttt{Sobriquet} & \Name{SurnameC, Suffix}[Sobriquet] (\texttt{\bsc Name})\\
+% (none) & \texttt{SurnameC, Suffix} & \texttt{Sobriquet} & \Name*{SurnameC, Suffix}[Sobriquet] (\texttt{\bsc Name*})\\
+% (none) & \texttt{SurnameC, Suffix} & \texttt{Sobriquet} & \Name{SurnameC, Suffix}[Sobriquet] (\texttt{\bsc Name})\\\hline
+% \end{tabular}
+% \end{quote}
+%
 % \subsection{Advanced Features}
 % 
 % \subsubsection{Alternate forenames in the Text}
 % 
-% In some cultures people receive three or more forenames. It is often inadvisable to use so many names in the index. Yet you might wish to introduce a person with all of his or her names. If nothing else, this is a grandiose flourish that can add a bit of \textit{gravitas} to a historical figure's role in the text. The ``alternate forenames'' optional argument comes to the rescue. The following examples show how one might use alternate forenames:
+% I showed above the cases of \Name[M.T.]{Cicero}[Marcus Tullius] and \Name*[John Q.]{Adams}[John Quincy] where one can have a longer name in the text than in the index. Here are fuller examples:
 % 
 % \begin{quote}\small
 % \texttt{\bsc Name[Wilhelm M.L.]\{De Wette\}[Wilhelm Martin Leberecht]}\\
@@ -195,43 +272,94 @@
 % The abbreviated name “De Wette, Wilhelm M.L.” is in the index.
 % \end{quote}
 % 
-% Observe that the alternate forenames override the regular forenames in the text. They do not get printed, however, in subsequent occurrences of \texttt{\bsc Name}. The surname argument is always printed. There is, however, the possibility that you might refer to a person with a nickname only. The next macro facilitates this.
+% The alternate forenames \emph{override} the \emph{FNN} in the text. This is \emph{not} true with sobriquets, which are \emph{appended} to \emph{SNN}. The difference in the two is whether the \emph{FNN} argument exists. Alternate forenames do not get printed in subsequent occurrences of \texttt{\bsc Name}. They \emph{do} get printed in subsequent occurrences of \texttt{\bsc Name*}. The surname argument is \emph{always} printed. There is, however, the possibility that you might refer to a person with a nickname only. The next macro facilitates this.
 %
 % \subsubsection{\texttt{\bsc IndexName}}
 % 
 % \DescribeMacro{\IndexName}
-% This macro allows one to print any text in the body---such as a nickname---yet it will create a standard index entry for the person so named. Its syntax is:
+% This macro prints no text in the body. It only creates an index entry that conforms with the rest of the package. Its syntax is:
 % \begin{quote}
-% \texttt{\bsc IndexName}\oarg{FNN}\marg{SNN}\oarg{text}
+% \texttt{\bsc IndexName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
 % \end{quote}
 %
-% \texttt{\bsc IndexName} will not interfere with the \textit{nom de plume} mechanism described below. It allows considerable flexibility while retaining the helpful indexing features. For example, a historian might wish to refer to a person with a familiar name when the history text describes close familial relationships:
+% The \texttt{\bsc IndexName} \emph{does not work} with the pen name mechanism described below. This example shows \texttt{\bsc Name} and \texttt{\bsc IndexName} working together.
 % 
 % \begin{quote}
 % \bgroup\ttfamily
-% \bsc Name[C.F.W.]\{Walther\}[Carl Ferdinand Wilhelm] was a major\break
-% figure in nineteenth-century American Lutheran history.\break
-% \bsc Name[C.F.W.]\{Walther\} used his full name when signing\break
-% official documents. To his family, friends, and close\break
-% colleagues, however, he was simply\break
-% \bsc IndexName[C.F.W.]\{Walther\}\{Ferdinand\}.
+% \bsc Name[C.F.W.]\{Walther\}[Carl Ferdinand Wilhelm] was a major\break figure in nineteenth-century American Lutheran history.\break \bsc Name[C.F.W.]\{Walther\} used his full name when signing\break official documents. To his family, friends, and close\break colleagues, however, he was simply\break Ferdinand\bsc IndexName[C.F.W.]\{Walther\}.
 % \egroup
 % 
-% \Name[C.F.W.]{Walther}[Carl Ferdinand Wilhelm] was a major figure in nineteenth-century American Lutheran history.
-% \Name[C.F.W.]{Walther} used his full name when signing
-% official documents. To his family, friends, and close
-% colleagues, however, he was simply \IndexName[C.F.W.]{Walther}{Ferdinand}.
+% \Name[C.F.W.]{Walther}[Carl Ferdinand Wilhelm] was a major figure in nineteenth-century American Lutheran history. \Name[C.F.W.]{Walther} used his full name when signing official documents. To his family, friends, and close colleagues, however, he was simply Ferdinand\IndexName[C.F.W.]{Walther}.
+% \end{quote}
+%
+% One can use this macro for special cases, like referring to works written or produced by joint or multiple authors:
+%
+% \begin{quote}
+% \bgroup\ttfamily
+% \bsc newcommand\{\bsc SJB\}\%\break
+% \{\bsc IndexName[Stan]\{Berenstain\}\bsc IndexName[Jan]\{Berenstain\}\}\break
+% \bsc textit\{The Berenstain Bears\} is a popular series of\break children's books with over 300 titles. One can index the\break Berenstains\bsc SJB\{\} in this manner.
+% \egroup
+%
+% \newcommand{\SJB}%
+% {\IndexName[Stan]{Berenstain}\IndexName[Jan]{Berenstain}}
+% \textit{The Berenstain Bears} is a popular series of children's books with over 300 titles. One can index the Berenstains\SJB{} in this manner.
+% \end{quote}
+%
+% \ForgetName{Antiochus IV}[Epiphanes]%
+% \begin{quote}
+% \bgroup\ttfamily
+% First Maccabees recounts the suppression of Jewish customs\break under the Seleucid king \bsc Name\{Antiochus IV\}[Epiphanes]. His behavior was so egregious that he became an early model for the later profile of Antichrist\break \bsc IndexName\{Antiochus IV\}[Epiphanes].
+% \egroup
+%
+% First Maccabees recounts the suppression of Jewish customs under the Seleucid king \Name{Antiochus IV}[Epiphanes]. His behavior was so egregious that he became an early model for the later profile of Antichrist \IndexName{Antiochus IV}[Epiphanes].
 % \end{quote}
 %
 % \texttt{\bsc IndexName} may be helpful in a pinch, but it lacks certain safeguards for handling pseudonyms that the following macros introduce.
 % 
 % \subsubsection{\texttt{\bsc PName} and \texttt{\bsc AKA}: Pen Names}
 % 
+% This section deals with pen names that function differently than the sobriquet feature and apart from it. I have designed these macros to preclude the alternate name and sobriquet features of \texttt{\bsc Name} for the following reasons:
+%
+% \begin{enumerate}
+% \item It only makes sense for \texttt{\bsc PName} and \texttt{\bsc AKA} to have the better-known name come first, then the lesser-known name.
+% \item Having the names in that order produces an ambiguous argument list when implementing sobriquets. Making the list unambiguous by using a mandatory argument often would require the author to type an empty set of braces.
+% \item The more names and details that get packed into any given macro, the more confusing it is to use. That level of inefficiency defeats the purpose of this package, which is to save typing, yet have standardized names.
+% \item A number of ancient pseudonyms require special typesetting that must be handled manually.
+% \end{enumerate}
+%
+% The workaround for a name using a sobriquet is simply:
+% \begin{quote}
+% \bgroup\ttfamily
+% \verb!\index{Jean the Fearless|see {Jean sans Peur}}%!\\
+% \bsc Name\{Jean\}[sans Peur] (Jean the Fearless) was Duke of Burgundy from 1404 to 1419.
+% \egroup
+%
+% \index{Jean the Fearless|see {Jean sans Peur}}%
+% \Name{Jean}[sans Peur] (Jean the Fearless) was Duke of Burgundy from 1404 to 1419.
+% \end{quote}
+%
+% A more complicated example is:
+% \begin{quote}
+% \bgroup\ttfamily\small
+% \verb!\index{Doctor Angelicus@\textit{Doctor Angelicus}|see {Thomas Aquinas}}%!\\
+% \verb!\index{Thomas of Aquino|see {Thomas Aquinas}}%!\\
+% Perhaps the greatest medieval theologian was \bsc Name\{Thomas\}[Aquinas] (Thomas of Aquino), also known as \bsc textit\{Doctor Angelicus\}. His name ``Aquinas'' is not a surname, so many modern scholars refer to him as \bsc Name\{Thomas\}[Aquinas].
+% \egroup
+%
+% \index{Doctor Angelicus=\textit{Doctor Angelicus}|see {Thomas Aquinas}}%
+% \index{Thomas of Aquino|see {Thomas Aquinas}}%
+% Perhaps the greatest medieval theologian was \Name{Thomas}[Aquinas] (Thomas of Aquino), also known as \textit{Doctor Angelicus}. His name ``Aquinas'' is not a surname, so many modern scholars refer to him as \Name{Thomas}[Aquinas].
+% \end{quote}
+% 
+% This also means, unfortunately, that Eastern names, as touched on earlier, will have to be indexed manually.
+%
 % \DescribeMacro{\PName}
-% People may use pseudonyms or \emph{noms de plume}. Sometimes they become known by epithets or monikers. There are two macros to handle this. The first of these macros, \texttt{\bsc PName}, introduces the name of the person under which he or she will be indexed, followed by the pseudonym in parentheses. Like \texttt{\bsc Name} it has starred and unstarred forms, although the star only operates on the main name that is indexed, not the pseudonym. It is likely that one is known more by the pen name, so an abbreviation mechanism for lesser-known information seems counterintuitive for clarity. The syntax is:
+% People may use pseudonyms or \emph{noms de plume}. Sometimes they become known by epithets or monikers. There are two macros to handle this. The first of these macros, \texttt{\bsc PName}, opens with the well-known name under which a person is indexed, followed by the lesser-known name, which it sets in parentheses.
 %
+%Like \texttt{\bsc Name}, \texttt{\bsc PName} has starred and unstarred forms, but those forms only operate on the name that is indexed, not on the second, lesser-known name. The syntax is:
 % \begin{quote}
-% \texttt{\bsc PName}\oarg{FNN}\marg{SNN}\oarg{alternate FNN}\marg{alternate SNN}
+% \texttt{\bsc PName}\oarg{FNN}\marg{SNN}\oarg{lesser-known FNN}\marg{lesser-known SNN}
 % \end{quote}
 %
 % The following examples should make clear its use:
@@ -251,45 +379,34 @@
 % Print \PName{Voltaire}[François-Marie]{Arouet} the first time it appears. Later, print \PName{Voltaire}[François-Marie]{Arouet}. The starred version also produces \PName*{Voltaire}[François-Marie]{Arouet}
 % \end{quote}
 %
-% Observe carefully that \texttt{\bsc PName} does not allow the ``optional forenames'' parameter used in \texttt{\bsc Name}. This is done intentionally to reduce the possible confusion of a double alias.
-%
 % \DescribeMacro{\AKA}
-% The second macro that handles aliases is \texttt{\bsc AKA}. It is the same alias mechanism used in \texttt{\bsc PName}, but separated from the normal indexing feature for more flexibility. Its syntax is similar to \texttt{\bsc PName}:
-%
+% The second macro that handles aliases is \texttt{\bsc AKA}. It is the same alias mechanism used in \texttt{\bsc PName}, but separated for more flexibility. Its syntax is similar to \texttt{\bsc PName}:
 % \begin{quote}
-% \texttt{\bsc AKA}\oarg{FNN}\marg{SNN}\oarg{alternate FNN}\marg{alternate SNN}
+% \texttt{\bsc AKA}\oarg{FNN}\marg{SNN}\oarg{lesser-known FNN}\marg{lesser-known SNN}
 % \end{quote}
 %
-% \texttt{\bsc AKA} only prints the pseudonym, not the indexed name. The macro also will prevent the double-printing of a period after an abbreviation. Here are a few examples of how to use it:
+% \texttt{\bsc AKA} only prints the pseudonym, \emph{not} the indexed name. The macro also will prevent the double-printing of a period after an abbreviation. Here is an example:
 % 
 % \begin{quote}
-% \texttt{\bsc AKA[George]\{Eliot\}[Mary Anne]\{Evans\}}\dots\\
-% \texttt{\bsc Name[George]\{Eliot\}}\\[1ex]
+% \bgroup\ttfamily
+% Today we consider \bsc AKA[George]\{Eliot\}[Mary Anne]\{Evans\} and her literary contributions as \bsc Name[George]\{Eliot\}.
+% \egroup
+%
 % Today we consider \AKA[George]{Eliot}[Mary Anne]{Evans} and her literary contributions as \Name[George]{Eliot}.
-% 
-% \index{Doctor Angelicus=\textit{Doctor Angelicus}|see {Thomas Aquinas}}%
-% \texttt{\bsc PName\{Thomas Aquinas\}\{Thomas of Aquino\}}\dots\\[1ex]
-% Perhaps the greatest medieval theologian was \PName{Thomas Aquinas}{Thomas of Aquino}, known as \textit{Doctor Angelicus}. His name ``Aquinas'' is not a surname, so many modern scholars refer to him as Thomas.
 % \end{quote}
 % 
-% To index \textit{Doctor Angelicus} as a pseudonym one must use the following method in order to format the index entry correctly. Note that the ``actual'' character @ may be redefined.\\
-%
-% {\small \verb!\index{Doctor Angelicus@\textit{Doctor Angelicus}|see {Thomas Aquinas}}!}\\
-% 
-% \texttt{\bsc AKA} creates an index entry that cross-references to the ``main'' name given. It is assumed that a \texttt{\bsc Name} macro occurs somewhere in reference to the indexed name. No error checking otherwise occurs for this. As a general rule, the more one has to account for exceptions, the shakier the rules get. My own use of these macros involves people with English, French, German, Italian, Latin, and Central European names. If all you ever index are John Smith and Jerry Jones, you may never need any macros beyond \texttt{\bsc Name}.
+% \texttt{\bsc AKA} creates an index entry that cross-references to the ``main'' name given. It is assumed that a \texttt{\bsc Name} macro occurs somewhere in reference to the indexed name. No error checking otherwise occurs for this.
 % 
-% Pseudonyms cannot be indexed with page numbers. They only work as ``see'' references that point to name entries in the index that do have page references. \texttt{\bsc Name} will print a pseudonym if it is used and emit a warning. If you want to index a pseudonym with page numbers, use \texttt{\bsc Name} for both the main name and the pseudonym, then manually cross-reference them.
+% Pseudonyms cannot be indexed with page numbers. They only work as ``see'' cross-references. \texttt{\bsc Name} will print its arguments and emit a warning if you give a pen name as its arguments. If you want to index a pseudonym with page numbers, use \texttt{\bsc Name} for both the main name and the pseudonym, then manually cross-reference them.
 % 
-% \texttt{\bsc AKA} will only create one \textit{see} reference per pseudonym. This has the side effect of excluding the special case where a pseudonym applies to multiple people: \PName*[Willebrord]{Snel van Royen}{Snellius} and his son \PName*[Rudolph]{Snel van Royen}{Snellius} have the same Latin moniker.
+% \texttt{\bsc AKA} will not create multiple instances of a cross-reference. This prevents bogus multiple cross-references in the index, but it also excludes the special case where one moniker applies to multiple people, e.g.: \PName*[Willebrord]{Snel van Royen}{Snellius} and his son \PName*[Rudolph]{Snel van Royen}{Snellius}.
 % \index{Snellius|see {Snel van Royen, Rudolph}}%
-%
-% You will see in the index that Snellius points to two entries. I had to add a manual index entry to work around it:
+% Do not use \texttt{\bsc IndexName} in this case. One must add a manual index entry as a workaround:
 % \begin{quote}
 % \verb!\index{Snellius|see {Snel van Royen, Rudolph}}!
 % \end{quote}
-% Otherwise the moniker Snellius would point in the index only to the first occurrence, which is \PName*[Willebrord]{Snel van Royen}{Snellius}. This is one case when \emph{not} to use \texttt{\bsc IndexName}---it would involve more typing and still would not create the desired index reference.
 % 
-% Be careful with name collisions, especially with more than one person having the same last name:
+% Be careful with name collisions, especially with more than one person having the same last name. The following examples illustrate this:
 % \begin{quote}
 % \texttt{\bsc PName[Willebrord]\{Snel van Royen\}\{Snellius\}}\\
 % \PName[Willebrord]{Snel van Royen}{Snellius}\\[1ex]
@@ -335,7 +452,7 @@
 % \texttt{\bsc newunicodechar\{ṃ\}\{\bsc d\{m\}\}}
 % \end{quote}
 % 
-% Please remember that the appropriate font packages, such as \textsf{lmodern} or the \TeX\ Gyre fonts, are needed to obtain some TS1 glyphs. Also there may be points where \textsf{pdflatex} will accept the input (e.g., Gh{\=a}zali), but \textsf{makeindex} will have problems with that. In ``normal'' operation (I have used \textsf{article} and \textsf{memoir}) these control sequences appear to work. Yet in generating this style file that was not the case. You may need to use manual index entries for those cases.
+% Please remember that the appropriate font packages, such as \textsf{lmodern} or the \TeX\ Gyre fonts, are needed to obtain some TS1 glyphs. Also there may be points where \textsf{pdflatex} will accept the input (e.g., Gh{\=a}zali), but \textsf{makeindex} will have problems with that. In ``normal'' operation (I have used \textsf{article} and \textsf{memoir}) these control sequences appear to work. Yet in generating this style file, that was not the case. You may need to use manual index entries in those cases.
 % 
 % \subsection{Name Formatting}
 % 
@@ -355,7 +472,7 @@
 % 
 % \DescribeMacro{\NamesActive}
 % \DescribeMacro{\NamesInctive}
-% Using the \texttt{frontmatter} option will deactivate formatting until \texttt{\bsc NamesActive} activates it. Another macro, \texttt{\bsc NamesInactive}, will deactivate formatting. These two macros toggle formatting on and off. They can be used throughout the document
+% Using the \texttt{frontmatter} option deactivates formatting until \texttt{\bsc NamesActive} occurs. Another macro, \texttt{\bsc NamesInactive}, will deactivate formatting again. These two macros toggle formatting on and off. The mechanism works in a complementary, yet independent manner. It can be used throughout the document.
 % 
 % Here we switch to the ``front matter'' mode with \texttt{\bsc NamesInactive}:
 % \NamesInactive
@@ -379,13 +496,16 @@
 % \end{tabular}
 % \end{quote}
 % 
-% See how the mechanism works in a complementary, yet independent manner. The index entries all will have the same format.
-% 
 % \subsection{Tweaks:\texttt{\bsc ForgetName}}
 % \label{sec:Tweaks}
 % 
 % \DescribeMacro{\ForgetName}
-% The macro \texttt{\bsc ForgetName} is a ``dirty trick'' of sorts that takes the optional and mandatory parameters used by \texttt{\bsc Name} to create an index entry. Thus it does not take the final optional parameter. It causes the macros 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.
+% This macro is a ``dirty trick'' of sorts that takes the same optional and mandatory parameters used by \texttt{\bsc Name}. It handles its arguments in the same manner as \texttt{\bsc Name}, except that it ignores the final parameter if \emph{FNN} are present. The syntax is:
+% \begin{quote}
+% \texttt{\bsc ForgetName}\oarg{FNN}\marg{SNN}\oarg{alternate names}
+% \end{quote}
+%
+% This macro causes \texttt{\bsc Name} and friends to “forget” prior uses of a name with respect to typesetting. The next use will print as if it were a ``first use.'' Index entries and pseudonyms (see above) are \emph{never} forgotten.
 % 
 % \StopEventually{\PrintChanges\clearpage\PrintIndex}
 %
@@ -470,6 +590,7 @@
 % \texttt{\bsc @FmtName} is where the first occurrences of a name are formatted. Notice how \texttt{\bsc NamesFormat} sits between a \texttt{\bsc bgroup} and an \texttt{\bsc egroup} to localize the font change. It is adjacent to the brackets that enclose the second parameter, allowing one to hook into the name formatting procedure.
 %
 % \begin{macro}{\@FName}
+% \changes{v0.75}{2012/01/19}{Added ``sobriquet'' feature}
 %    \begin{macrocode}
 \DeclareDocumentCommand\@FName{o m o}%
 {%
@@ -496,42 +617,76 @@
                \fi%
           \fi%
      \fi}%
-     {\ifcsname\@CleanName{#2!PN!}\endcsname%
-          \@FmtName*{#1 #2}%
-          \PackageWarning{nameauth}%
-          {You cannot create a page reference from the pen name: #1 #2.}%
-     \else%
-          \if@nameauth@DoFormat%
-               \ifcsname\@CleanName{#2!MN!}\endcsname%
-                    \@FmtName*{#2}\index{#2}%
+     {\IfValueTF{#3}
+          {\ifcsname\@CleanName{#2#3!PN!}\endcsname%
+               \@FmtName*{#2 #3}%
+               \PackageWarning{nameauth}%
+               {You cannot create a page reference from the pen name: #2 #3.}%
+          \else%
+               \if@nameauth@DoFormat%
+                    \ifcsname\@CleanName{#2#3!MN!}\endcsname%
+                         \@FmtName*{#2 #3}\index{#2 #3}%
+                    \else%
+                         \csgdef{\@CleanName{#2#3!MN!}}{}%
+                         \@FmtName{#2 #3}\index{#2 #3}%
+                    \fi%
                \else%
-                    \csgdef{\@CleanName{#2!MN!}}{}%
-                    \@FmtName{#2}\index{#2}%
+                    \ifcsname\@CleanName{#2#3!NF!}\endcsname%
+                         \@FmtName*{#2 #3}\index{#2 #3}%
+                    \else%
+                         \csgdef{\@CleanName{#2#3!NF!}}{}%
+                         \@FmtName*{#2 #3}\index{#2 #3}%
+                    \fi%
                \fi%
+          \fi}%
+          {\ifcsname\@CleanName{#2!PN!}\endcsname%
+               \@FmtName*{#2}%
+               \PackageWarning{nameauth}%
+               {You cannot create a page reference from the pen name: #2.}%
           \else%
-               \ifcsname\@CleanName{#2!NF!}\endcsname%
-                    \@FmtName*{#2}\index{#2}%
+               \if@nameauth@DoFormat%
+                    \ifcsname\@CleanName{#2!MN!}\endcsname%
+                         \@FmtName*{#2}\index{#2}%
+                    \else%
+                         \csgdef{\@CleanName{#2!MN!}}{}%
+                         \@FmtName{#2}\index{#2}%
+                    \fi%
                \else%
-                    \csgdef{\@CleanName{#2!NF!}}{}%
-                    \@FmtName*{#2}\index{#2}%
+                    \ifcsname\@CleanName{#2!NF!}\endcsname%
+                         \@FmtName*{#2}\index{#2}%
+                    \else%
+                         \csgdef{\@CleanName{#2!NF!}}{}%
+                         \@FmtName*{#2}\index{#2}%
+                    \fi%
                \fi%
-          \fi%
-     \fi}%
+          \fi}%
+     }%
 }
 %    \end{macrocode}
 % \end{macro}
-% \texttt{\bsc @FName} (full name) first checks for the optional forenames argument. Two outcomes are possible. Either the forenames and surnames will be printed, or the surnames only will be printed. One cannot have ``alternate'' forenames with a surname-only entry. In that case, one must use either \texttt{\bsc AKA} or \texttt{\bsc IndexName}.
 %
-% Next \texttt{\bsc @FName} checks if the ``alternate'' forenames exist. If so, they are used as forenames for the body text and the ``regular'' forenames are used in the index. Otherwise the ``regular'' forenames are used for both.
+% \texttt{\bsc @FName} (full name) first checks for the forenames argument. Two outcomes are possible.
+% \begin{enumerate}
+% \item Forenames are present. In this case, the alternate names argument creates two choices.
+% \begin{enumerate}
+% \item The alternate names replace the forenames in the printed form, not the indexed form.
+% \item The absence of alternate names will result in the forenames being used for both forms.
+% \end{enumerate}
+% \item Forenames are absent. In that case, the alternate names argument creates two different choices.
+% \begin{enumerate}
+% \item The alternate names are appended to the surnames in both printed and indexed forms.
+% \item Only the surnames are used.
+% \end{enumerate}
+% \end{enumerate}
 %
-% Third, a check occurs for a control sequence name based on the names given and the suffix \texttt{!PN!} (for pen name) wrapped in a pair of bangs. This format is used by \texttt{\bsc AKA} to create the index \emph{see} cross-references. If such a control sequence exists, then \texttt{\bsc @FName} prints the name given, emits a warning, and creates no index entry. Nor will ``alternate forenames'' be examined in this case. One cannot use \texttt{\bsc ForgetName} to expunge a pen name. This is a deliberate decision to avoid corruption of the index cross-references.
+% A check occurs for a control sequence based on the names given and the suffix \texttt{!PN!} (for pen name) wrapped in a pair of bangs. This is how \texttt{\bsc AKA} protects cross-references. If the control sequence exists, then \texttt{\bsc @FName} only prints the name given and emits a warning. One cannot use \texttt{\bsc ForgetName} to expunge a pen name. This is a deliberate decision to avoid corruption of the index cross-references.
 %
-% The fourth branch involves the boolean value \texttt{@nameauth@DoFormat}, which is controlled by \texttt{\bsc NamesActive} and \texttt{\bsc NamesInactive}. If formatting is active, choose the unstarred form of \texttt{\bsc @FmtName}, which applies the formatting hook. Otherwise use the starred dorm that applies no formatting.
+% The next branch involves the boolean value \texttt{@nameauth@DoFormat}, which is controlled by \texttt{\bsc NamesActive} and \texttt{\bsc NamesInactive}. If formatting is active, choose the unstarred form of \texttt{\bsc @FmtName}, which applies the formatting hook. Otherwise use the starred form that applies no formatting.
 %
-% The state of  \texttt{@nameauth@DoFormat} also controls the suffix used: \texttt{!MN!} for main name or \texttt{!NF!} for no format. Suffixes are enclosed in pairs of bangs.
-% \clearpage
+% The state of  \texttt{@nameauth@DoFormat} also controls the suffix used in the control sequences: \texttt{!MN!} for main name or \texttt{!NF!} for no format. Suffixes are enclosed in pairs of bangs.
 %
 % \begin{macro}{\@LName}
+% \changes{v0.75}{2012/01/19}{Added ``sobriquet'' feature}
 %    \begin{macrocode}
 \DeclareDocumentCommand\@LName{o m o}%
 {%
@@ -558,36 +713,60 @@
                \fi%
           \fi%
      \fi}%
-     {\ifcsname\@CleanName{#2!PN!}\endcsname%
-          \@FmtName*{#1 #2}%
-          \PackageWarning{nameauth}%
-          {You cannot create a page reference from the pen name: #1 #2.}
-     \else%
-          \if@nameauth@DoFormat%
-               \ifcsname\@CleanName{#2!MN!}\endcsname%
-                    \@FmtName*{\@Zapsuffix{#2}}\index{#2}%
+     {\IfValueTF{#3}
+          {\ifcsname\@CleanName{#2#3!PN!}\endcsname%
+               \@FmtName*{#2 #3}%
+               \PackageWarning{nameauth}%
+               {You cannot create a page reference from the pen name: #2 #3.}%
+          \else%
+               \if@nameauth@DoFormat%
+                    \ifcsname\@CleanName{#2#3!MN!}\endcsname%
+                         \@FmtName*{\@Zapsuffix{#2}}\index{#2 #3}%
+                    \else%
+                         \csgdef{\@CleanName{#2#3!MN!}}{}%
+                         \@FmtName{#2 #3}\index{#2 #3}%
+                    \fi%
                \else%
-                    \csgdef{\@CleanName{#2!MN!}}{}%
-                    \@FmtName{#2}\index{#2}%
+                    \ifcsname\@CleanName{#2#3!NF!}\endcsname%
+                         \@FmtName*{\@Zapsuffix{#2}}\index{#2 #3}%
+                    \else%
+                         \csgdef{\@CleanName{#2#3!NF!}}{}%
+                         \@FmtName*{#2 #3}\index{#2 #3}%
+                    \fi%
                \fi%
+          \fi}%
+          {\ifcsname\@CleanName{#2!PN!}\endcsname%
+               \@FmtName*{#2}%
+               \PackageWarning{nameauth}%
+               {You cannot create a page reference from the pen name: #2.}%
           \else%
-               \ifcsname\@CleanName{#2!NF!}\endcsname%
-                    \@FmtName*{\@Zapsuffix{#2}}\index{#2}%
+               \if@nameauth@DoFormat%
+                    \ifcsname\@CleanName{#2!MN!}\endcsname%
+                         \@FmtName*{\@Zapsuffix{#2}}\index{#2}%
+                    \else%
+                         \csgdef{\@CleanName{#2!MN!}}{}%
+                         \@FmtName{#2}\index{#2}%
+                    \fi%
                \else%
-                    \csgdef{\@CleanName{#2!NF!}}{}%
-                    \@FmtName*{#2}\index{#2}%
+                    \ifcsname\@CleanName{#2!NF!}\endcsname%
+                         \@FmtName*{\@Zapsuffix{#2}}\index{#2}%
+                    \else%
+                         \csgdef{\@CleanName{#2!NF!}}{}%
+                         \@FmtName*{#2}\index{#2}%
+                    \fi%
                \fi%
-          \fi%
-     \fi}%
+          \fi}%
+     }%
 }
 %    \end{macrocode}
 % \end{macro}
-% \texttt{\bsc @LName} (last name only) differs little from \texttt{\bsc @FName} apart from its use of \texttt{\bsc @ZapSuffix} and the last name only \emph{except} in the case of the first occurrence of a name. One could make a good case that \texttt{\bsc @FName} and \texttt{\bsc @LName} should be combined. When I tried that, the result introduced bugs that proved difficult to track down. This version simply worked, so I stuck with it.
+% \texttt{\bsc @LName} (last name only) differs little from \texttt{\bsc @FName} apart from its use of \texttt{\bsc @ZapSuffix} and its printing of surnames only \emph{except} in the first occurrence of a name. One could make a good case that \texttt{\bsc @FName} and \texttt{\bsc @LName} should be combined. When I tried that, the result introduced bugs that proved difficult to track down. This version simply worked, so I stuck with it.
 %
 % \Name*[Marc van]{Dongen} provided the basic structure for these two macros.
 %
 % \subsection{User Interface Macros}
 % \begin{macro}{\Name}
+% \changes{v0.75}{2012/01/19}{Added ``sobriquet'' feature}
 %    \begin{macrocode}
 \DeclareDocumentCommand\Name{s o m o}%
 {%
@@ -597,7 +776,7 @@
 }
 %    \end{macrocode}
 % \end{macro}
-% \texttt{\bsc Name} and \texttt{\bsc Name*} call \texttt{\bsc @LName} and \texttt{\bsc @FName}, respectively. The use of \texttt{\bsc expandafter} before \texttt{\bsc @CheckDot} works with the other use of \texttt{\bsc expandafter} mentioned with \texttt{\bsc @EvalDot} above to move past the closing brace and fetch the period as lookahead. Yet that is only done when the check for a terminal period in the name succeeds.
+% \texttt{\bsc Name} and \texttt{\bsc Name*} call \texttt{\bsc @LName} and \texttt{\bsc @FName}, respectively. The use of \texttt{\bsc expandafter} before \texttt{\bsc @CheckDot} works with the other use of \texttt{\bsc expandafter} mentioned with \texttt{\bsc @EvalDot} above to move past the closing brace and fetch the period as lookahead. That is only done when the check for a terminal period in the name succeeds.
 %
 % \begin{macro}{\PName}
 %    \begin{macrocode}
@@ -609,7 +788,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \texttt{\bsc PName} is a convenience macro whose starred and unstarred forms call the respective versions of \texttt{\bsc Name}, then \texttt{\bsc AKA}.
+% \texttt{\bsc PName} is a convenience macro whose starred and unstarred forms call the respective versions of \texttt{\bsc Name}, then \texttt{\bsc AKA}. It prevents both the ``sobriquet'' feature and the alternate forenames feature.
 %
 % \begin{macro}{\AKA}
 %    \begin{macrocode}
@@ -634,29 +813,36 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \texttt{\bsc AKA} prints a pseudonym and creates index cross-references. It also checks to see of cross-references already have been generated, and if so, it does not do it again. Like \texttt{\bsc Name} it checks for a terminal period, but only for the \emph{pseudonym}.
+% \texttt{\bsc AKA} prints a pseudonym and creates index cross-references. It also checks to see of cross-references already have been generated, and if so, it does not do it again. Like \texttt{\bsc Name} it checks for a terminal period, but only for the alternate name.
 %
 % \begin{macro}{\IndexName}
+% \changes{v0.75}{2012/01/19}{Optional parameter added; mandatory parameter deleted}
 %    \begin{macrocode}
-\DeclareDocumentCommand\IndexName{o m m}%
+\DeclareDocumentCommand\IndexName{o m o}%
 {%
-     \IfValueTF{#1}%     
+     \IfValueTF{#1}%
           {\ifcsname\@CleanName{#1#2!PN!}\endcsname\else\index{#2,{\space}#1}\fi}%
-          {\ifcsname\@CleanName{#2!PN!}\endcsname\else\index{#2}\fi}%
-     {#3}%
+          {\IfValueTF{#3}
+               {\ifcsname\@CleanName{#2#3!PN!}\endcsname\else\index{#2 #3}\fi}
+               {\ifcsname\@CleanName{#2!PN!}\endcsname\else\index{#2}\fi}%
+          }%
 }
 %    \end{macrocode}
 % \end{macro}
 %
-% \texttt{\bsc IndexName} creates an index entry that is not already a pseudonym. It also prints text, but not necessarily the name that is indexed.
+% \texttt{\bsc IndexName} creates an index entry that is not already a pseudonym. It prints nothing.
 %
 % \begin{macro}{\ForgetName}
+% \changes{v0.75}{2012/01/19}{New parameter added}
 %    \begin{macrocode}
-\DeclareDocumentCommand\ForgetName{o m}%
+\DeclareDocumentCommand\ForgetName{o m o}%
 {%
-     \IfValueTF{#1}%     
+     \IfValueTF{#1}%
           {\csundef{\@CleanName{#1#2!MN!}}\csundef{\@CleanName{#1#2!NF!}}}%
-          {\csundef{\@CleanName{#2!MN!}}\csundef{\@CleanName{#2!NF!}}}%
+          {\IfValueTF{#3}%
+               {\csundef{\@CleanName{#2#3!MN!}}\csundef{\@CleanName{#2#3!NF!}}}%
+               {\csundef{\@CleanName{#2!MN!}}\csundef{\@CleanName{#2!NF!}}}%
+          }%
 }
 %    \end{macrocode}
 % \end{macro}