nameauth (22sep16)

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

1 files changed, 114 insertions, 134 deletions

diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 07a991732b0..f01e7f486ff 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -5,6 +5,7 @@
 %% The original source files were:
 %%
 %% nameauth.dtx  (with options: `package')
+%% 
 %% --------:| ----------------------------------------------------------------
 %% nameauth:| Name authority mechanism for consistency in text and index
 %%   Author:| Charles P. Schaum
@@ -14,9 +15,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{nameauth}
-    [2016/04/06 v2.5 Name authority mechanism for consistency in text and index]
+    [2016/09/19 v2.6 Name authority mechanism for consistency in text and index]
+
 \newif\if@nameauth@AlwaysComma
 \newif\if@nameauth@ShowComma
+\newif\if@nameauth@NoComma
 \newif\if@nameauth@MainFormat
 \newif\if@nameauth@AKAFormat
 \newif\if@nameauth@LocalNames
@@ -40,13 +43,13 @@
 \newif\if@nameauth@InAKA
 \newif\if@nameauth@InName
 \newif\if@nameauth@Lock
-\newcommand*{\NamesFormat}{}
-\newcommand*{\MainNameHook}{}
-\newcommand*{\FrontNamesFormat}{}
-\newcommand*{\FrontNameHook}{}
-\newcommand*{\NameauthName}{\@nameauth@Name}
-\newcommand*{\NameauthLName}{\@nameauth@Name}
-\newcommand*{\NameauthFName}{\@nameauth@Name}
+\newcommand*\NamesFormat{}
+\newcommand*\MainNameHook{}
+\newcommand*\FrontNamesFormat{}
+\newcommand*\FrontNameHook{}
+\newcommand*\NameauthName{\@nameauth@Name}
+\newcommand*\NameauthLName{\@nameauth@Name}
+\newcommand*\NameauthFName{\@nameauth@Name}
 \newtoks\@nameauth@toksa%
 \newtoks\@nameauth@toksb%
 \newtoks\@nameauth@toksc%
@@ -71,10 +74,10 @@
 \DeclareOption{notreversed}%
   {\@nameauth@RevAllfalse\@nameauth@RevAllCommafalse}
 \DeclareOption{alwaysformat}{\@nameauth@AlwaysFormattrue}
-\DeclareOption{smallcaps}{\renewcommand*{\NamesFormat}{\scshape}}
-\DeclareOption{italic}{\renewcommand*{\NamesFormat}{\itshape}}
-\DeclareOption{boldface}{\renewcommand*{\NamesFormat}{\bfseries}}
-\DeclareOption{noformat}{\renewcommand*{\NamesFormat}{}}
+\DeclareOption{smallcaps}{\renewcommand*\NamesFormat{\scshape}}
+\DeclareOption{italic}{\renewcommand*\NamesFormat{\itshape}}
+\DeclareOption{boldface}{\renewcommand*\NamesFormat{\bfseries}}
+\DeclareOption{noformat}{\renewcommand*\NamesFormat{}}
 \ExecuteOptions%
   {nocomma,%
    mainmatter,%
@@ -90,12 +93,12 @@
 \RequirePackage{trimspaces}
 \RequirePackage{suffix}
 \RequirePackage{xargs}
-\newcommand*{\@nameauth@Clean}[1]%
+\newcommand*\@nameauth@Clean[1]%
   {\expandafter\zap@space\detokenize{#1} \@empty}
-\newcommand*{\@nameauth@Root}[1]%
+\newcommand*\@nameauth@Root[1]%
   {\@nameauth@TrimRoot#1,\@empty\relax}
 \def\@nameauth@TrimRoot#1,#2\relax{\trim@spaces{#1}}
-\newcommand*{\@nameauth@CapRoot}[1]%
+\newcommand*\@nameauth@CapRoot[1]%
 {%
   \ifxetex
     \@nameauth@CRii#1\relax%
@@ -113,12 +116,12 @@
 }
 \def\@nameauth@CRii#1#2\relax{\uppercase{#1}\@nameauth@Root{#2}}
 \def\@nameauth@CRiii#1#2#3\relax{\uppercase{#1#2}\@nameauth@Root{#3}}
-\newcommand*{\@nameauth@AllCapRoot}[1]%
+\newcommand*\@nameauth@AllCapRoot[1]%
   {\uppercase{\@nameauth@Root{#1}}}
-\newcommand*{\@nameauth@Suffix}[1]%
+\newcommand*\@nameauth@Suffix[1]%
   {\@nameauth@TrimSuffix#1\relax}
 \def\@nameauth@TrimSuffix#1,#2\relax{\trim@spaces{#2}}
-\newcommand*{\@nameauth@TestDot}[1]%
+\newcommand*\@nameauth@TestDot[1]%
 {%
   \def\TestDot##1.\TestEnd##2\TestStop{\TestPunct{##2}}%
   \def\TestPunct##1%
@@ -126,11 +129,11 @@
   \@nameauth@Punctfalse%
   \TestDot#1\TestEnd.\TestEnd\TestStop%
 }
-\newcommand*{\@nameauth@CheckDot}%
+\newcommand*\@nameauth@CheckDot%
   {\futurelet\@token\@nameauth@EvalDot}
-\newcommand*{\@nameauth@EvalDot}%
+\newcommand*\@nameauth@EvalDot%
   {\let\@period=.\ifx\@token\@period\expandafter\@gobble \fi}
-\newcommand*{\@nameauth@FmtName}[1]%
+\newcommand*\@nameauth@FmtName[1]%
 {%
   \if@nameauth@InAKA
     \if@nameauth@AlwaysFormat
@@ -171,13 +174,14 @@
   \fi
 }
 \newcommand*\@nameauth@Actual{@}
-\newcommand*{\@nameauth@Index}[2]%
+\newcommand*\@nameauth@Index[2]%
 {%
   \def\cseq{#1}%
   \ifcsname\cseq!TAG\endcsname
     \ifcsname\cseq!PRE\endcsname
       \if@nameauth@DoIndex
-        \index{\csname\cseq!PRE\endcsname#2\csname\cseq!TAG\endcsname}%
+        \index%
+        {\csname\cseq!PRE\endcsname#2\csname\cseq!TAG\endcsname}%
       \fi
     \else
       \if@nameauth@DoIndex\index{#2\csname\cseq!TAG\endcsname}\fi
@@ -204,7 +208,7 @@
   \protected@edef\testc{#3}%
   \protected@edef\argc{\trim@spaces{#3}}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \@nameauth@toksa\expandafter{#1}%
   \@nameauth@toksb\expandafter{#2}%
@@ -221,18 +225,22 @@
   \if@nameauth@AllCaps\@nameauth@AllThistrue\fi
   \if@nameauth@RevAll\@nameauth@RevThistrue\fi
   \if@nameauth@RevAllComma\@nameauth@RevThisCommatrue\fi
-  \protected@edef\ISpace{\space}%
+  \IndexName[#1]{#2}[#3]%
   \protected@edef\Space{\space}%
   \if@nameauth@NBSP\protected@edef\Space{\nobreakspace}\fi
-  \if@nameauth@AlwaysComma
-    \protected@edef\ISpace{,\space}%
-    \protected@edef\Space{,\space}%
-    \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
-  \fi
-  \if@nameauth@ShowComma
-    \protected@edef\ISpace{,\space}%
-    \protected@edef\Space{,\space}%
-    \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
+  \ifx\arga\@empty\else
+    \if@nameauth@AlwaysComma
+      \protected@edef\Space{,\space}%
+      \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
+    \fi
+    \if@nameauth@ShowComma
+      \protected@edef\Space{,\space}%
+      \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
+    \fi
+    \if@nameauth@NoComma
+      \protected@edef\Space{\space}%
+      \if@nameauth@NBSP\protected@edef\Space{\nobreakspace}\fi
+    \fi
   \fi
   \protected@edef\RawShort{\@nameauth@Root{#2}}%
   \if@nameauth@DoCaps
@@ -241,10 +249,8 @@
     \let\CapShort\RawShort%
   \fi
   \protected@edef\AllCapShort{\@nameauth@AllCapRoot{#2}}%
-  \let\IndexShort\RawShort%
   \ifx\testb\testbr
-    \protected@edef\Suff{\@empty}%
-    \let\IndexSNN\RawShort%
+    \let\Suff\@empty%
     \let\Reversed\RawShort%
     \let\SNN\RawShort%
     \let\PrintShort\RawShort%
@@ -260,7 +266,6 @@
     \fi
   \else
     \protected@edef\Suff{\@nameauth@Suffix{#2}}%
-    \protected@edef\IndexSNN{\RawShort\ISpace\Suff}%
     \protected@edef\Reversed{\Suff\Space\RawShort}%
     \protected@edef\SNN{\RawShort\Space\Suff}%
     \if@nameauth@RevThis
@@ -289,12 +294,6 @@
   \fi
   \ifx\testa\@empty
     \ifx\testc\@empty
-      \ifcsname\csb!PN\endcsname
-        \PackageWarning{nameauth}%
-        {macro \Name: Xref: #2 cannot be a page reference}%
-      \else
-        \@nameauth@Index{\csb}{\IndexSNN}%
-      \fi
       \if@nameauth@MainFormat
         \ifcsname\csb!MN\endcsname
           \if@nameauth@FirstName
@@ -353,12 +352,6 @@
         \fi
       \fi
     \else
-      \ifcsname\csbc!PN\endcsname
-        \PackageWarning{nameauth}%
-        {macro \Name: Xref: #2 #3 cannot be a page reference}%
-      \else
-        \@nameauth@Index{\csbc}{\IndexSNN\ISpace\argc}%
-      \fi
       \if@nameauth@MainFormat
         \ifcsname\csbc!MN\endcsname
           \if@nameauth@FirstName
@@ -366,9 +359,9 @@
           \fi
           \if@nameauth@FullName
             \if@nameauth@RevThis
-              \ex\@nameauth@FmtName\ex{\ex\argc\ex\space\SNN}%
+              \ex\@nameauth@FmtName\ex{\ex\argc\ex\Space\SNN}%
             \else
-              \ex\@nameauth@FmtName\ex{\ex\SNN\ex\space\argc}%
+              \ex\@nameauth@FmtName\ex{\ex\SNN\ex\Space\argc}%
             \fi
           \else
             \if@nameauth@RevThis
@@ -384,9 +377,9 @@
           \@nameauth@FullNametrue%
           \@nameauth@FirstNamefalse%
           \if@nameauth@RevThis
-            \ex\@nameauth@FmtName\ex{\ex\argc\ex\space\SNN}%
+            \ex\@nameauth@FmtName\ex{\ex\argc\ex\Space\SNN}%
           \else
-            \ex\@nameauth@FmtName\ex{\ex\SNN\ex\space\argc}%
+            \ex\@nameauth@FmtName\ex{\ex\SNN\ex\Space\argc}%
           \fi
           \csgdef{\csbc!MN}{}%
           \@nameauth@FullNamefalse%
@@ -398,9 +391,9 @@
           \fi
           \if@nameauth@FullName
             \if@nameauth@RevThis
-              \ex\@nameauth@FmtName\ex{\ex\argc\ex\space\SNN}%
+              \ex\@nameauth@FmtName\ex{\ex\argc\ex\Space\SNN}%
             \else
-              \ex\@nameauth@FmtName\ex{\ex\SNN\ex\space\argc}%
+              \ex\@nameauth@FmtName\ex{\ex\SNN\ex\Space\argc}%
             \fi
           \else
             \if@nameauth@RevThis
@@ -416,9 +409,9 @@
           \@nameauth@FullNametrue%
           \@nameauth@FirstNamefalse%
           \if@nameauth@RevThis
-            \ex\@nameauth@FmtName\ex{\ex\argc\ex\space\SNN}%
+            \ex\@nameauth@FmtName\ex{\ex\argc\ex\Space\SNN}%
           \else
-            \ex\@nameauth@FmtName\ex{\ex\SNN\ex\space\argc}%
+            \ex\@nameauth@FmtName\ex{\ex\SNN\ex\Space\argc}%
           \fi
           \csgdef{\csbc!NF}{}%
           \@nameauth@FullNamefalse%
@@ -427,7 +420,6 @@
     \fi
   \else
     \if@nameauth@RevThisComma
-      \protected@edef\ISpace{,\space}%
       \protected@edef\Space{,\space}%
       \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
     \fi
@@ -436,16 +428,6 @@
     \else
       \let\FNN\argc%
     \fi
-    \ifcsname\csab!PN\endcsname
-      \PackageWarning{nameauth}%
-      {macro \Name: Xref: #1 #2 cannot be a page reference}%
-    \else
-      \ifx\Suff\@empty
-        \@nameauth@Index{\csab}{\IndexShort,\space\arga}%
-      \else
-        \@nameauth@Index{\csab}{\IndexShort,\space\arga,\space\Suff}%
-      \fi
-    \fi
     \if@nameauth@MainFormat
       \ifcsname\csab!MN\endcsname
         \if@nameauth@FirstName
@@ -506,6 +488,7 @@
       \fi
     \fi
   \fi
+  \IndexName[#1]{#2}[#3]%
   \@nameauth@Lockfalse%
   \@nameauth@InNamefalse%
   \@nameauth@FirstFormatfalse%
@@ -514,34 +497,37 @@
   \@nameauth@Accentfalse%
   \@nameauth@AllThisfalse%
   \@nameauth@ShowCommafalse%
+  \@nameauth@NoCommafalse%
   \@nameauth@RevThisfalse%
   \@nameauth@RevThisCommafalse%
   \fi
   \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
 }
-\newcommand*{\CapThis}{\@nameauth@DoCapstrue}
-\newcommand*{\AccentCapThis}{\@nameauth@Accenttrue\@nameauth@DoCapstrue}
-\newcommand*{\CapName}{\@nameauth@AllThistrue}
-\newcommand*{\AllCapsInactive}{\@nameauth@AllCapsfalse}
-\newcommand*{\AllCapsActive}{\@nameauth@AllCapstrue}
-\newcommand*{\RevName}{\@nameauth@RevThistrue}
-\newcommand*{\ReverseInactive}{\@nameauth@RevAllfalse}
-\newcommand*{\ReverseActive}{\@nameauth@RevAlltrue}
-\newcommand*{\RevComma}%
+\newcommand*\CapThis{\@nameauth@DoCapstrue}
+\newcommand*\AccentCapThis%
+  {\@nameauth@Accenttrue\@nameauth@DoCapstrue}
+\newcommand*\CapName{\@nameauth@AllThistrue}
+\newcommand*\AllCapsInactive{\@nameauth@AllCapsfalse}
+\newcommand*\AllCapsActive{\@nameauth@AllCapstrue}
+\newcommand*\RevName{\@nameauth@RevThistrue}
+\newcommand*\ReverseInactive{\@nameauth@RevAllfalse}
+\newcommand*\ReverseActive{\@nameauth@RevAlltrue}
+\newcommand*\RevComma%
   {\@nameauth@RevThistrue\@nameauth@RevThisCommatrue}
-\newcommand*{\ReverseCommaInactive}%
+\newcommand*\ReverseCommaInactive%
   {\@nameauth@RevAllfalse\@nameauth@RevAllCommafalse}
-\newcommand*{\ReverseCommaActive}%
+\newcommand*\ReverseCommaActive%
   {\@nameauth@RevAlltrue\@nameauth@RevAllCommatrue}
-\newcommand*{\ShowComma}{\@nameauth@ShowCommatrue}
-\newcommand*{\KeepAffix}{\@nameauth@NBSPtrue}
-\newcommand*{\NamesInactive}{\@nameauth@MainFormatfalse}
-\newcommand*{\NamesActive}{\@nameauth@MainFormattrue}
+\newcommand*\ShowComma{\@nameauth@ShowCommatrue}
+\newcommand*\NoComma{\@nameauth@NoCommatrue}
+\newcommand*\KeepAffix{\@nameauth@NBSPtrue}
+\newcommand*\NamesInactive{\@nameauth@MainFormatfalse}
+\newcommand*\NamesActive{\@nameauth@MainFormattrue}
 \newcommand*\LocalNames{\global\@nameauth@LocalNamestrue}
 \newcommand*\GlobalNames{\global\@nameauth@LocalNamesfalse}
-\newcommand*{\IndexInactive}{\@nameauth@DoIndexfalse}
-\newcommand*{\IndexActive}{\@nameauth@DoIndextrue}
-\newcommand*{\IndexActual}[1]%
+\newcommand*\IndexInactive{\@nameauth@DoIndexfalse}
+\newcommand*\IndexActive{\@nameauth@DoIndextrue}
+\newcommand*\IndexActual[1]%
   {\global\renewcommand*\@nameauth@Actual{#1}}
 \def\Name{\NameauthName}
 \WithSuffix\def\Name*{\@nameauth@FullNametrue\NameauthLName}
@@ -566,7 +552,7 @@
   \protected@edef\teste{#5}%
   \protected@edef\arge{\trim@spaces{#5}}%
   \def\csd{\@nameauth@Clean{#4}}%
-  \def\csde{\@nameauth@Clean{#4#5}}%
+  \def\csde{\@nameauth@Clean{#4,#5}}%
   \def\cscd{\@nameauth@Clean{#3!#4}}%
   \@nameauth@toksa\expandafter{#3}%
   \@nameauth@toksb\expandafter{#4}%
@@ -592,18 +578,21 @@
   \if@nameauth@AllCaps\@nameauth@AllThistrue\fi
   \if@nameauth@RevAll\@nameauth@RevThistrue\fi
   \if@nameauth@RevAllComma\@nameauth@RevThisCommatrue\fi
-  \protected@edef\ISpace{\space}%
   \protected@edef\Space{\space}%
   \if@nameauth@NBSP\protected@edef\Space{\nobreakspace}\fi
-  \if@nameauth@AlwaysComma
-    \protected@edef\ISpace{,\space}%
-    \protected@edef\Space{,\space}%
-    \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
-  \fi
-  \if@nameauth@ShowComma
-    \protected@edef\ISpace{,\space}%
-    \protected@edef\Space{,\space}%
-    \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
+  \ifx\argc\@empty\else
+    \if@nameauth@AlwaysComma
+      \protected@edef\Space{,\space}%
+      \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
+    \fi
+    \if@nameauth@ShowComma
+      \protected@edef\Space{,\space}%
+      \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
+    \fi
+    \if@nameauth@NoComma
+      \protected@edef\Space{\space}%
+      \if@nameauth@NBSP\protected@edef\Space{\nobreakspace}\fi
+    \fi
   \fi
   \protected@edef\Shortb{\@nameauth@Root{#2}}%
   \protected@edef\Shortd{\@nameauth@Root{#4}}%
@@ -615,13 +604,13 @@
   \protected@edef\AllCapShort{\@nameauth@AllCapRoot{#4}}%
   \ifx\testb\testbr
     \let\SNNb\Shortb%
-    \protected@edef\Suffb{\@empty}%
+    \let\Suffb\@empty%
   \else
     \protected@edef\Suffb{\@nameauth@Suffix{#2}}%
-    \protected@edef\SNNb{\Shortb\ISpace\Suffb}%
+    \protected@edef\SNNb{\Shortb\space\Suffb}%
   \fi
   \ifx\testd\testdr
-    \protected@edef\Suffd{\@empty}%
+    \let\Suffd\@empty%
     \let\ISNNd\Shortd%
     \let\Reversed\Shortd%
     \let\SNNd\Shortd%
@@ -635,7 +624,7 @@
     \fi
   \else
     \protected@edef\Suffd{\@nameauth@Suffix{#4}}%
-    \protected@edef\ISNNd{\Shortd\ISpace\Suffd}%
+    \protected@edef\ISNNd{\Shortd\space\Suffd}%
     \protected@edef\Reversed{\Suffd\Space\Shortd}%
     \protected@edef\SNNd{\Shortd\Space\Suffd}%
     \if@nameauth@DoCaps
@@ -677,7 +666,6 @@
         \fi
       \fi
       \if@nameauth@RevThisComma
-        \protected@edef\ISpace{,\space}%
         \protected@edef\Space{,\space}%
         \if@nameauth@NBSP
           \protected@edef\Space{,\nobreakspace}%
@@ -705,21 +693,20 @@
           \else
             \ifx\testa\@empty
               \@nameauth@Index{\csde}%
-                {\ISNNd\ISpace\arge|see{\SNNb}}%
+                {\ISNNd\space\arge|see{\SNNb}}%
             \else
               \ifx\Suffb\@empty
                 \@nameauth@Index{\csde}%
-                  {\ISNNd\ISpace\arge|see{\SNNb,\space\arga}}%
+                  {\ISNNd\space\arge|see{\SNNb,\space\arga}}%
               \else
                 \@nameauth@Index{\csde}%
-                {\ISNNd\ISpace\arge|see{\Shortb,\space\arga,\space\Suffb}}%
+                {\ISNNd\space\arge|see{\Shortb,\space\arga,\space\Suffb}}%
               \fi
             \fi
           \fi
         \fi
       \fi
       \if@nameauth@RevThisComma
-        \protected@edef\ISpace{,\space}%
         \protected@edef\Space{,\space}%
         \if@nameauth@NBSP
           \protected@edef\Space{,\nobreakspace}%
@@ -732,7 +719,7 @@
         \if@nameauth@RevThis
           \ex\@nameauth@FmtName\ex{\ex\arge\ex\Space\SNNd}%
         \else
-          \ex\@nameauth@FmtName\ex{\ex\SNNd\ex\space\arge}%
+          \ex\@nameauth@FmtName\ex{\ex\SNNd\ex\Space\arge}%
         \fi
       \fi
       \ifcsname\csde!PN\endcsname\else\csgdef{\csde!PN}{}\fi
@@ -781,7 +768,6 @@
       \fi
     \fi
     \if@nameauth@RevThisComma
-      \protected@edef\ISpace{,\space}%
       \protected@edef\Space{,\space}%
       \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi
     \fi
@@ -811,6 +797,7 @@
   \@nameauth@Accentfalse%
   \@nameauth@AllThisfalse%
   \@nameauth@ShowCommafalse%
+  \@nameauth@NoCommafalse%
   \@nameauth@RevThisfalse%
   \@nameauth@RevThisCommafalse%
   \fi
@@ -828,7 +815,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -855,7 +842,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -882,7 +869,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -912,7 +899,7 @@
   \protected@edef\testc{#3}%
   \protected@edef\argc{\trim@spaces{#3}}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -923,20 +910,13 @@
       {macro \IndexName: Essential name malformed}%
     \fi
   \fi
-  \protected@edef\Space{\space}%
-  \if@nameauth@AlwaysComma
-    \protected@edef\Space{,\space}%
-  \fi
-  \if@nameauth@ShowComma
-    \protected@edef\Space{,\space}%
-  \fi
   \let\Short\testbr%
   \ifx\testb\testbr
     \let\SNN\Short%
-    \protected@edef\Suff{\@empty}%
+    \let\Suff\@empty%
   \else
     \protected@edef\Suff{\@nameauth@Suffix{#2}}%
-    \protected@edef\SNN{\Short\Space\Suff}%
+    \protected@edef\SNN{\Short\space\Suff}%
   \fi
   \ifx\testa\@empty
     \ifx\testc\@empty
@@ -951,7 +931,7 @@
         \PackageWarning{nameauth}%
         {macro \IndexName: XRef: #2 #3 exists}%
       \else
-        \@nameauth@Index{\csbc}{\SNN\Space\argc}%
+        \@nameauth@Index{\csbc}{\SNN\space\argc}%
       \fi
     \fi
   \else
@@ -966,7 +946,6 @@
       \fi
     \fi
   \fi
-  \@nameauth@ShowCommafalse%
 }
 \newcommandx*\TagName[4][1=\@empty, 3=\@empty]%
 {%
@@ -974,7 +953,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1016,7 +995,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1043,7 +1022,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1082,7 +1061,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1154,7 +1133,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1181,7 +1160,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1208,7 +1187,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \def\test{!}%
   \ifx\testb\@empty
@@ -1245,7 +1224,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1299,7 +1278,7 @@
   \protected@edef\testb{\trim@spaces{#2}}%
   \protected@edef\testc{#3}%
   \def\csb{\@nameauth@Clean{#2}}%
-  \def\csbc{\@nameauth@Clean{#2#3}}%
+  \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
   \ifx\testb\@empty
     \PackageError{nameauth}%
@@ -1345,7 +1324,8 @@
       \csgdef{\csab!MN}{}%
       \csgdef{\csab!NF}{}%
     \fi
-  \fi}
+  \fi
+}
 \newenvironment{nameauth}{%
   \begingroup%
   \let\ex\expandafter%