nameauth (21feb20)

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

1 files changed, 336 insertions, 140 deletions

diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index f91f56ccb3a..eb8220eee73 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -9,17 +9,18 @@
 %% --------:| ----------------------------------------------------------------
 %% nameauth:| Name authority mechanism for consistency in text and index
 %%   Author:| Charles P. Schaum
-%%   E-mail:| charles dot schaum at comcast dot net
+%%   E-mail:| charles dot schaum@comcast.net
 %%  License:| Released under the LaTeX Project Public License 1.3c or later
 %%      See:| http://www.latex-project.org/lppl.txt
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{nameauth}
-    [2017/03/22 3.2 Name authority mechanism for consistency in text and index]
+    [2020/02/20 3.3 Name authority mechanism for consistency in text and index]
 \newif\if@nameauth@InAKA
 \newif\if@nameauth@InName
 \newif\if@nameauth@Xref
 \newif\if@nameauth@Lock
+\newif\if@nameauth@BigLock
 \newif\if@nameauth@InHook
 \newif\if@nameauth@DoIndex
 \newif\if@nameauth@SkipIndex
@@ -29,6 +30,8 @@
 \newif\if@nameauth@MainFormat
 \newif\if@nameauth@AKAFormat
 \newif\if@nameauth@LocalNames
+\newif\if@nameauth@OldReset
+\newif\if@nameauth@OldPass
 \newif\if@nameauth@Forget
 \newif\if@nameauth@Subvert
 \newif\if@nameauth@FirstFormat
@@ -76,6 +79,8 @@
 \DeclareOption{frontmatter}{\@nameauth@MainFormatfalse}
 \DeclareOption{formatAKA}{\@nameauth@AKAFormattrue}
 \DeclareOption{oldAKA}{\@nameauth@OldAKAtrue}
+\DeclareOption{oldreset}{\@nameauth@OldResettrue}
+\DeclareOption{oldpass}{\@nameauth@OldPasstrue}
 \DeclareOption{index}{\@nameauth@DoIndextrue}
 \DeclareOption{noindex}{\@nameauth@DoIndexfalse}
 \DeclareOption{pretag}{\@nameauth@Pretagtrue}
@@ -187,8 +192,8 @@
 }
 \newcommand*\@nameauth@Error[2]
 {%
-  \edef\msga{#2 SNN field empty}%
-  \edef\msgb{#2 SNN field malformed}%
+  \edef\msga{#2 SNN arg empty}%
+  \edef\msgb{#2 SNN arg malformed}%
   \protected@edef\testname{\trim@spaces{#1}}%
   \protected@edef\testroot{\@nameauth@Root{#1}}%
   \ifx\testname\@empty
@@ -200,15 +205,26 @@
 }
 \newcommandx*\@nameauth@Name[3][1=\@empty, 3=\@empty]
 {%
+  \if@nameauth@BigLock\@nameauth@Locktrue\fi
   \unless\if@nameauth@Lock
     \@nameauth@Locktrue%
     \@nameauth@InNametrue%
     \@nameauth@Error{#2}{macro \string\@nameauth@name}%
     \if@nameauth@JustIndex
       \IndexName[#1]{#2}[#3]%
-      \@nameauth@InNamefalse%
-      \@nameauth@Lockfalse%
-      \@nameauth@JustIndexfalse%
+      \if@nameauth@OldPass
+        \@nameauth@JustIndexfalse%
+      \else
+        \if@nameauth@OldReset
+          \@nameauth@FullNamefalse%
+          \@nameauth@FirstNamefalse%
+          \@nameauth@JustIndexfalse%
+        \else
+          \global\@nameauth@FullNamefalse%
+          \global\@nameauth@FirstNamefalse%
+          \global\@nameauth@JustIndexfalse%
+        \fi
+      \fi
     \else
       \if@nameauth@Forget
         \ForgetName[#1]{#2}[#3]%
@@ -225,28 +241,46 @@
         \@nameauth@Parse[#1]{#2}[#3]{!NF}%
       \fi
       \unless\if@nameauth@SkipIndex\IndexName[#1]{#2}[#3]\fi
-      \@nameauth@SkipIndexfalse%
-      \@nameauth@Forgetfalse%
-      \@nameauth@Subvertfalse%
-      \@nameauth@Lockfalse%
-      \@nameauth@InNamefalse%
-      \@nameauth@NBSPfalse%
-      \@nameauth@NBSPXfalse%
-      \@nameauth@DoCapsfalse%
-      \@nameauth@Accentfalse%
-      \@nameauth@AllThisfalse%
-      \@nameauth@ShowCommafalse%
-      \@nameauth@NoCommafalse%
-      \@nameauth@RevThisfalse%
-      \@nameauth@RevThisCommafalse%
-      \@nameauth@ShortSNNfalse%
-      \@nameauth@EastFNfalse%
+      \if@nameauth@OldReset
+        \@nameauth@SkipIndexfalse%
+        \@nameauth@Forgetfalse%
+        \@nameauth@Subvertfalse%
+        \@nameauth@NBSPfalse%
+        \@nameauth@NBSPXfalse%
+        \@nameauth@DoCapsfalse%
+        \@nameauth@Accentfalse%
+        \@nameauth@AllThisfalse%
+        \@nameauth@ShowCommafalse%
+        \@nameauth@NoCommafalse%
+        \@nameauth@RevThisfalse%
+        \@nameauth@RevThisCommafalse%
+        \@nameauth@ShortSNNfalse%
+        \@nameauth@EastFNfalse%
+      \else
+        \global\@nameauth@SkipIndexfalse%
+        \global\@nameauth@Forgetfalse%
+        \global\@nameauth@Subvertfalse%
+        \global\@nameauth@NBSPfalse%
+        \global\@nameauth@NBSPXfalse%
+        \global\@nameauth@DoCapsfalse%
+        \global\@nameauth@Accentfalse%
+        \global\@nameauth@AllThisfalse%
+        \global\@nameauth@ShowCommafalse%
+        \global\@nameauth@NoCommafalse%
+        \global\@nameauth@RevThisfalse%
+        \global\@nameauth@RevThisCommafalse%
+        \global\@nameauth@ShortSNNfalse%
+        \global\@nameauth@EastFNfalse%
+      \fi
     \fi
+    \@nameauth@Lockfalse%
+    \@nameauth@InNamefalse%
   \fi
   \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
 }
 \newcommandx*\@nameauth@Parse[4][1=\@empty, 3=\@empty]
 {%
+  \if@nameauth@BigLock\@nameauth@Lockfalse\fi
   \if@nameauth@Lock
     \let\ex\expandafter%
     \protected@edef\arga{\trim@spaces{#1}}%
@@ -365,6 +399,7 @@
 }
 \newcommand*\@nameauth@NonWest[1]
 {%
+  \if@nameauth@BigLock\@nameauth@Lockfalse\fi
   \if@nameauth@Lock
     \unless\ifcsname#1\endcsname
       \@nameauth@FirstFormattrue%
@@ -411,12 +446,18 @@
     \unless\ifcsname#1\endcsname
       \unless\if@nameauth@InAKA\csgdef{#1}{}\fi
     \fi
-    \@nameauth@FullNamefalse%
-    \@nameauth@FirstNamefalse%
+    \if@nameauth@OldReset
+      \@nameauth@FullNamefalse%
+      \@nameauth@FirstNamefalse%
+    \else
+      \global\@nameauth@FullNamefalse%
+      \global\@nameauth@FirstNamefalse%
+    \fi
   \fi
 }
 \newcommand*\@nameauth@West[1]
 {%
+  \if@nameauth@BigLock\@nameauth@Lockfalse\fi
   \if@nameauth@Lock
     \unless\ifcsname#1\endcsname
       \@nameauth@FirstFormattrue%
@@ -459,12 +500,18 @@
     \unless\ifcsname#1\endcsname
       \unless\if@nameauth@InAKA\csgdef{#1}{}\fi
     \fi
-    \@nameauth@FullNamefalse%
-    \@nameauth@FirstNamefalse%
+    \if@nameauth@OldReset
+      \@nameauth@FullNamefalse%
+      \@nameauth@FirstNamefalse%
+    \else
+      \global\@nameauth@FullNamefalse%
+      \global\@nameauth@FirstNamefalse%
+    \fi
   \fi
 }
 \newcommand*\@nameauth@Hook[1]
 {%
+  \if@nameauth@BigLock\@nameauth@Lockfalse\fi
   \if@nameauth@Lock
     \@nameauth@InHooktrue%
     \protected@edef\test{#1}%
@@ -507,45 +554,124 @@
         \fi
       \fi
     \fi
-    \@nameauth@FirstFormatfalse%
+    \if@nameauth@OldReset
+      \@nameauth@FirstFormatfalse%
+    \else
+      \global\@nameauth@FirstFormatfalse%
+    \fi
     \@nameauth@InHookfalse%
   \fi
 }
 \newcommand*\@nameauth@Index[2]
 {%
-  \def\cseq{#1}%
   \let\ex\expandafter%
-  \ifcsname\cseq!TAG\endcsname
-    \protected@edef\Tag{\csname#1!TAG\endcsname}%
-    \ex\def\ex\ShortTag\ex{\ex\@nameauth@TrimTag\ex{\Tag}}%
-  \fi
   \if@nameauth@DoIndex
-    \ifcsname\cseq!TAG\endcsname
-      \ifcsname\cseq!PRE\endcsname
-        \if@nameauth@Xref%
-          \index%
-          {\csname\cseq!PRE\endcsname#2\ShortTag}%
+    \ifcsname#1!TAG\endcsname
+      \protected@edef\Tag{\csname#1!TAG\endcsname}%
+      \ex\def\ex\ShortTag\ex{\ex\@nameauth@TrimTag\ex{\Tag}}%
+      \ifcsname#1!PRE\endcsname
+        \protected@edef\Pre{\csname#1!PRE\endcsname}%
+        \if@nameauth@Xref
+          \protected@edef\Entry{\Pre#2\ShortTag}%
         \else
-          \index%
-          {\csname\cseq!PRE\endcsname#2\csname\cseq!TAG\endcsname}%
+          \protected@edef\Entry{\Pre#2\Tag}%
         \fi
       \else
         \if@nameauth@Xref
-          \index{#2\ShortTag}%
+          \protected@edef\Entry{#2\ShortTag}%
         \else
-          \index{#2\csname\cseq!TAG\endcsname}%
+          \protected@edef\Entry{#2\Tag}%
         \fi
       \fi
     \else
-      \ifcsname\cseq!PRE\endcsname
-        \index{\csname\cseq!PRE\endcsname#2}%
+      \ifcsname#1!PRE\endcsname
+        \protected@edef\Pre{\csname#1!PRE\endcsname}%
+        \protected@edef\Entry{\Pre#2}%
       \else
-        \index{#2}%
+        \protected@edef\Entry{#2}%
       \fi
     \fi
+    \ex\index\ex{\Entry}%
   \fi
 }
 \newcommand*\@nameauth@Actual{@}
+\newcommandx*\@nameauth@Debug[3][1=\@empty, 3=\@empty]
+{%
+  \bgroup%
+    \def\index##1{##1}%
+    \@nameauth@DoIndextrue%
+    \protected@edef\arga{\trim@spaces{#1}}%
+    \protected@edef\argc{\trim@spaces{#3}}%
+    \protected@edef\suffb{\@nameauth@Suffix{#2}}%
+    \def\csb{\@nameauth@Clean{#2}}%
+    \def\csbc{\@nameauth@Clean{#2,#3}}%
+    \def\csab{\@nameauth@Clean{#1!#2}}%
+    \@nameauth@Error{#2}{macro \string\@nameauth@Debug}%
+    \ifx\arga\@empty
+      \ifx\argc\@empty
+        \ifdefined\ShortIdxEntry
+          \csundef{\csb!PRE}%
+          \csundef{\csb!TAG}%
+          \csundef{\csb!PN}%
+          \IndexName[#1]{#2}[#3]%
+        \else
+          \ifdefined\LongIdxEntry
+            \csundef{\csb!PN}%
+            \IndexName[#1]{#2}[#3]%
+          \else
+            \csb%
+          \fi
+        \fi
+      \else
+        \ifx\suffb\@empty
+          \ifdefined\ShortIdxEntry
+            \csundef{\csbc!PRE}%
+            \csundef{\csbc!TAG}%
+            \csundef{\csbc!PN}%
+            \IndexName[#1]{#2}[#3]%
+          \else
+            \ifdefined\LongIdxEntry
+              \csundef{\csbc!PN}%
+              \IndexName[#1]{#2}[#3]%
+            \else
+              \csbc%
+            \fi
+          \fi
+        \else
+          \ifdefined\ShortIdxEntry
+            \csundef{\csb!PRE}%
+            \csundef{\csb!TAG}%
+            \csundef{\csb!PN}%
+            \IndexName[#1]{#2}[#3]%
+          \else
+            \ifdefined\LongIdxEntry
+              \csundef{\csb!PN}%
+              \IndexName[#1]{#2}[#3]%
+            \else
+              \csb%
+            \fi
+          \fi
+        \fi
+      \fi
+    \else
+      \ifdefined\ShortIdxEntry
+        \csundef{\csab!PRE}%
+        \csundef{\csab!TAG}%
+        \csundef{\csab!PN}%
+        \IndexName[#1]{#2}[#3]%
+      \else
+        \ifdefined\LongIdxEntry
+          \csundef{\csab!PN}%
+          \IndexName[#1]{#2}[#3]%
+        \else
+          \csab%
+        \fi
+      \fi
+    \fi
+    \global\undef{\LongIdxEntry}%
+    \global\undef{\ShortIdxEntry}%
+  \egroup%
+}
 \newcommand*\CapThis{\@nameauth@DoCapstrue}
 \newcommand*\AccentCapThis%
   {\@nameauth@Accenttrue\@nameauth@DoCapstrue}
@@ -617,6 +743,11 @@
 \newcommand*\IndexActual[1]
   {\global\renewcommand*\@nameauth@Actual{#1}}
 \newcommand*\SeeAlso{\@nameauth@SeeAlsotrue}
+\newcommand*\ShowPattern{\@nameauth@Debug}
+\newcommand*\ShowIdxPageref%
+  {\def\LongIdxEntry{}\ShowPattern}
+\WithSuffix{\newcommand*}\ShowIdxPageref*%
+  {\def\ShortIdxEntry{}\ShowPattern}
 \newcommand*\NameParser
 {%
   \if@nameauth@InHook
@@ -705,6 +836,11 @@
 \newcommand\FName{\@nameauth@FirstNametrue\NameauthFName}
 \WithSuffix{\newcommand*}\FName*%
   {\@nameauth@FirstNametrue\NameauthFName}
+\newcommand*\IndexProtect
+{%
+  \@nameauth@DoIndexfalse%
+  \@nameauth@BigLocktrue%
+}
 \newcommandx*\IndexName[3][1=\@empty, 3=\@empty]
 {%
   \protected@edef\arga{\trim@spaces{#1}}%
@@ -796,9 +932,11 @@
           \fi
         \else
           \if@nameauth@SeeAlso
-            \@nameauth@Index{\csb}{\rootb\space\suffb|seealso{\target}}%
+            \@nameauth@Index{\csb}%
+              {\rootb\space\suffb|seealso{\target}}%
           \else
-            \@nameauth@Index{\csb}{\rootb\space\suffb|see{\target}}%
+            \@nameauth@Index{\csb}%
+              {\rootb\space\suffb|see{\target}}%
           \fi
         \fi
         \csgdef{\csb!PN}{}%
@@ -865,8 +1003,12 @@
       \csgdef{\csab!PN}{}%
     \fi
   \fi
-  \@nameauth@SeeAlsofalse%
   \@nameauth@Xreffalse%
+  \if@nameauth@OldReset
+    \@nameauth@SeeAlsofalse%
+  \else
+    \global\@nameauth@SeeAlsofalse%
+  \fi
 }
 \newcommandx*\ExcludeName[3][1=\@empty, 3=\@empty]
 {%
@@ -913,7 +1055,7 @@
         \ifcsname\csbc!PN\endcsname
           \if@nameauth@Verbose
             \PackageWarning{nameauth}%
-            {macro \ExcludeName: Xref: #2 exists}%
+            {macro \ExcludeName: Xref: #2 #3 exists}%
           \fi
         \else
           \csgdef{\csbc!PN}{!}%
@@ -953,7 +1095,7 @@
     \ifcsname\csab!PN\endcsname
       \if@nameauth@Verbose
         \PackageWarning{nameauth}%
-        {macro \ExcludeName: Xref: #2 exists}%
+        {macro \ExcludeName: Xref: #1 #2 exists}%
       \fi
     \else
       \csgdef{\csab!PN}{!}%
@@ -973,25 +1115,49 @@
     \ifx\argc\@empty
       \ifcsname\csb!PN\endcsname
         \edef\testex{\csname\csb!PN\endcsname}%
-        \unless\ifx\testex\@empty\global\csundef{\csb!PN}\fi
+        \unless\ifx\testex\@empty\global\csundef{\csb!PN}%
+        \else
+          \if@nameauth@Verbose
+            \PackageWarning{nameauth}%
+            {macro \IncludeName: Xref: #2 exists}%
+          \fi
+        \fi
       \fi
     \else
       \ifx\suffb\@empty
         \ifcsname\csbc!PN\endcsname
           \edef\testex{\csname\csbc!PN\endcsname}%
-          \unless\ifx\testex\@empty\global\csundef{\csbc!PN}\fi
+          \unless\ifx\testex\@empty\global\csundef{\csbc!PN}%
+          \else
+            \if@nameauth@Verbose
+              \PackageWarning{nameauth}%
+              {macro \IncludeName: Xref: #2 #3 exists}%
+            \fi
+          \fi
         \fi
       \else
         \ifcsname\csb!PN\endcsname
           \edef\testex{\csname\csb!PN\endcsname}%
-          \unless\ifx\testex\@empty\global\csundef{\csb!PN}\fi
+          \unless\ifx\testex\@empty\global\csundef{\csb!PN}%
+          \else
+            \if@nameauth@Verbose
+              \PackageWarning{nameauth}%
+              {macro \IncludeName: Xref: #2 exists}%
+            \fi
+          \fi
         \fi
       \fi
     \fi
   \else
     \ifcsname\csab!PN\endcsname
       \edef\testex{\csname\csab!PN\endcsname}%
-      \unless\ifx\testex\@empty\global\csundef{\csab!PN}\fi
+      \unless\ifx\testex\@empty\global\csundef{\csab!PN}%
+      \else
+        \if@nameauth@Verbose
+          \PackageWarning{nameauth}%
+          {macro \IncludeName: Xref: #1 #2 exists}%
+        \fi
+      \fi
     \fi
   \fi
 }
@@ -1170,19 +1336,21 @@
   \def\csb{\@nameauth@Clean{#2}}%
   \def\csbc{\@nameauth@Clean{#2,#3}}%
   \def\csab{\@nameauth@Clean{#1!#2}}%
-  \@nameauth@Error{#2}{macro \string\NameQueryInfo}%
-  \ifx\arga\@empty
-    \ifx\argc\@empty
-      \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
-    \else
-      \ifx\Suff\@empty
-        \ifcsname\csbc!DB\endcsname\csname\csbc!DB\endcsname\fi
-      \else
+  \unless\if@nameauth@BigLock
+    \@nameauth@Error{#2}{macro \string\NameQueryInfo}%
+    \ifx\arga\@empty
+      \ifx\argc\@empty
         \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
+      \else
+        \ifx\Suff\@empty
+          \ifcsname\csbc!DB\endcsname\csname\csbc!DB\endcsname\fi
+        \else
+          \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
+        \fi
       \fi
+    \else
+      \ifcsname\csab!DB\endcsname\csname\csab!DB\endcsname\fi
     \fi
-  \else
-    \ifcsname\csab!DB\endcsname\csname\csab!DB\endcsname\fi
   \fi
 }
 \newcommandx*\NameClearInfo[3][1=\@empty, 3=\@empty]
@@ -1409,47 +1577,68 @@
 }
 \newcommandx*\AKA[5][1=\@empty, 3=\@empty, 5=\@empty]
 {%
+  \if@nameauth@BigLock\@nameauth@Locktrue\fi
   \unless\if@nameauth@Lock
-  \@nameauth@Locktrue%
-  \@nameauth@JustIndexfalse%
-  \@nameauth@InAKAtrue%
-  \@nameauth@Error{#2}{macro \string\AKA}%
-  \@nameauth@Error{#4}{macro \string\AKA}%
-  \leavevmode\hbox{}%
-  \protected@edef\argi{\trim@spaces{#1}}%
-  \protected@edef\rooti{\@nameauth@Root{#2}}%
-  \protected@edef\suffi{\@nameauth@Suffix{#2}}%
-  \@nameauth@Parse[#3]{#4}[#5]{!PN}%
-  \unless\if@nameauth@SkipIndex
-    \ifx\argi\@empty
-      \ifx\suffi\@empty
-        \IndexRef[#3]{#4}[#5]{\rooti}%
-      \else
-        \IndexRef[#3]{#4}[#5]{\rooti\space\suffi}%
-      \fi
+    \@nameauth@Locktrue%
+    \@nameauth@InAKAtrue%
+    \if@nameauth@OldReset
+      \@nameauth@JustIndexfalse%
     \else
-      \ifx\suffi\@empty
-        \IndexRef[#3]{#4}[#5]{\rooti,\space\argi}%
+      \global\@nameauth@JustIndexfalse%
+    \fi
+    \@nameauth@Error{#2}{macro \string\AKA}%
+    \@nameauth@Error{#4}{macro \string\AKA}%
+    \leavevmode\hbox{}%
+    \protected@edef\argi{\trim@spaces{#1}}%
+    \protected@edef\rooti{\@nameauth@Root{#2}}%
+    \protected@edef\suffi{\@nameauth@Suffix{#2}}%
+    \@nameauth@Parse[#3]{#4}[#5]{!PN}%
+    \unless\if@nameauth@SkipIndex
+      \ifx\argi\@empty
+        \ifx\suffi\@empty
+          \IndexRef[#3]{#4}[#5]{\rooti}%
+        \else
+          \IndexRef[#3]{#4}[#5]{\rooti\space\suffi}%
+        \fi
       \else
-        \IndexRef[#3]{#4}[#5]{\rooti,\space\argi,\space\suffi}%
+        \ifx\suffi\@empty
+          \IndexRef[#3]{#4}[#5]{\rooti,\space\argi}%
+        \else
+          \IndexRef[#3]{#4}[#5]{\rooti,\space\argi,\space\suffi}%
+        \fi
       \fi
     \fi
-  \fi
-  \@nameauth@SkipIndexfalse%
-  \@nameauth@Lockfalse%
-  \@nameauth@InAKAfalse%
-  \@nameauth@AltAKAfalse%
-  \@nameauth@NBSPfalse%
-  \@nameauth@NBSPXfalse%
-  \@nameauth@DoCapsfalse%
-  \@nameauth@Accentfalse%
-  \@nameauth@AllThisfalse%
-  \@nameauth@ShowCommafalse%
-  \@nameauth@NoCommafalse%
-  \@nameauth@RevThisfalse%
-  \@nameauth@RevThisCommafalse%
-  \@nameauth@ShortSNNfalse%
-  \@nameauth@EastFNfalse%
+    \if@nameauth@OldReset
+      \@nameauth@SkipIndexfalse%
+      \@nameauth@AltAKAfalse%
+      \@nameauth@NBSPfalse%
+      \@nameauth@NBSPXfalse%
+      \@nameauth@DoCapsfalse%
+      \@nameauth@Accentfalse%
+      \@nameauth@AllThisfalse%
+      \@nameauth@ShowCommafalse%
+      \@nameauth@NoCommafalse%
+      \@nameauth@RevThisfalse%
+      \@nameauth@RevThisCommafalse%
+      \@nameauth@ShortSNNfalse%
+      \@nameauth@EastFNfalse%
+    \else
+      \global\@nameauth@SkipIndexfalse%
+      \global\@nameauth@AltAKAfalse%
+      \global\@nameauth@NBSPfalse%
+      \global\@nameauth@NBSPXfalse%
+      \global\@nameauth@DoCapsfalse%
+      \global\@nameauth@Accentfalse%
+      \global\@nameauth@AllThisfalse%
+      \global\@nameauth@ShowCommafalse%
+      \global\@nameauth@NoCommafalse%
+      \global\@nameauth@RevThisfalse%
+      \global\@nameauth@RevThisCommafalse%
+      \global\@nameauth@ShortSNNfalse%
+      \global\@nameauth@EastFNfalse%
+    \fi
+    \@nameauth@Lockfalse%
+    \@nameauth@InAKAfalse%
   \fi
   \if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
 }
@@ -1482,78 +1671,86 @@
     \ifcsname\@arga\endcsname
       \PackageWarning{nameauth}%
       {environment nameauth: Shorthand macro already exists}%
-   \fi
-   \ifx\@testd\@empty
+    \fi
+    \ifx\@testd\@empty
       \ifx\@testb\@empty
-        \ex\csgdef\ex{\ex\@arga\ex}\ex{\ex\NameauthName\ex{%
-          \the\@nameauth@etoksc}}%
-        \ex\csgdef\ex{\ex L\ex\@arga\ex}\ex{%
-          \ex\@nameauth@FullNametrue%
+        \ex\csgdef\ex{\ex\@arga\ex}%
+          \ex{\ex\NameauthName\ex{\the\@nameauth@etoksc}}%
+        \ex\csgdef\ex{\ex L\ex\@arga\ex}%
+          \ex{\ex\@nameauth@FullNametrue%
           \ex\NameauthLName\ex{\the\@nameauth@etoksc}}%
-        \ex\csgdef\ex{\ex S\ex\@arga\ex}\ex{%
-          \ex\@nameauth@FirstNametrue%
+        \ex\csgdef\ex{\ex S\ex\@arga\ex}%
+          \ex{\ex\@nameauth@FirstNametrue%
           \ex\NameauthFName\ex{\the\@nameauth@etoksc}}%
       \else
         \ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex\@arga\ex\ex\ex}%
-          \ex\ex\ex{\ex\ex\ex\NameauthName\ex\ex\ex[%
-          \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+          \ex\ex\ex{\ex\ex\ex\NameauthName%
+          \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+          \ex{\the\@nameauth@etoksc}}%
         \ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex L\ex\ex\ex\@arga%
           \ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FullNametrue%
-          \ex\ex\ex\NameauthLName\ex\ex\ex[%
-          \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+          \ex\ex\ex\NameauthLName%
+          \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+          \ex{\the\@nameauth@etoksc}}%
         \ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex S\ex\ex\ex\@arga%
           \ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FirstNametrue%
-          \ex\ex\ex\NameauthFName\ex\ex\ex[%
-          \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+          \ex\ex\ex\NameauthFName%
+          \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+          \ex{\the\@nameauth@etoksc}}%
       \fi
     \else
       \ifx\@testb\@empty
         \ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex\@arga\ex\ex\ex}%
-          \ex\ex\ex{\ex\ex\ex\NameauthName\ex\ex\ex{%
-          \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+          \ex\ex\ex{\ex\ex\ex\NameauthName%
+          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+          \ex[\the\@nameauth@etoksd]}%
         \ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex L\ex\ex\ex\@arga%
           \ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FullNametrue%
-          \ex\ex\ex\NameauthLName\ex\ex\ex{%
-          \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+          \ex\ex\ex\NameauthLName%
+          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+          \ex[\the\@nameauth@etoksd]}%
         \ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex S\ex\ex\ex\@arga%
           \ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FirstNametrue%
-          \ex\ex\ex\NameauthFName\ex\ex\ex{%
-          \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+          \ex\ex\ex\NameauthFName%
+          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+          \ex[\the\@nameauth@etoksd]}%
       \else
         \ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
           \ex\ex\ex\ex\ex\ex\ex\@arga\ex\ex\ex\ex\ex\ex\ex}%
           \ex\ex\ex\ex\ex\ex\ex{\ex\ex\ex\ex\ex\ex\ex\NameauthName%
-          \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb%
-          \ex\ex\ex]\ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
-          \the\@nameauth@etoksd]}%
+          \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the%
+          \ex\ex\ex\@nameauth@etoksb\ex\ex\ex]%
+          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+          \ex[\the\@nameauth@etoksd]}%
         \ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
           \ex\ex\ex\ex\ex\ex\ex L\ex\ex\ex\ex\ex\ex\ex\@arga%
           \ex\ex\ex\ex\ex\ex\ex}\ex\ex\ex\ex\ex\ex\ex{%
           \ex\ex\ex\ex\ex\ex\ex\@nameauth@FullNametrue%
-          \ex\ex\ex\ex\ex\ex\ex\NameauthLName\ex\ex\ex\ex\ex\ex\ex[%
-          \ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb%
-          \ex\ex\ex]\ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
-          \the\@nameauth@etoksd]}%
+          \ex\ex\ex\ex\ex\ex\ex\NameauthLName%
+          \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex%
+          \@nameauth@etoksb\ex\ex\ex]%
+          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+          \ex[\the\@nameauth@etoksd]}%
         \ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
           \ex\ex\ex\ex\ex\ex\ex S\ex\ex\ex\ex\ex\ex\ex\@arga%
           \ex\ex\ex\ex\ex\ex\ex}\ex\ex\ex\ex\ex\ex\ex{%
           \ex\ex\ex\ex\ex\ex\ex\@nameauth@FirstNametrue%
-          \ex\ex\ex\ex\ex\ex\ex\NameauthFName\ex\ex\ex\ex\ex\ex\ex[%
-          \ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb\ex\ex\ex]%
-          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
-          \the\@nameauth@etoksd]}%
+          \ex\ex\ex\ex\ex\ex\ex\NameauthFName%
+          \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex%
+          \@nameauth@etoksb\ex\ex\ex]%
+          \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+          \ex[\the\@nameauth@etoksd]}%
       \fi
-    \fi
-    \ignorespaces%
+    \fi\ignorespaces%
   }\ignorespaces%
 }{\endgroup\ignorespaces}
 %% 
-%% Copyright (C) 2017 by Charles P. Schaum <charles dot schaum at comcast dot net>
+%% Copyright (C) 2020 by Charles P. Schaum <charles dot schaum@comcast.net>
 %% 
-%% This work may be distributed and/or modified under the
+%% This work may be distributed and / or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
 %% version 1.3c of this license or (at your option) any later
-%% version.  The latest version of this license is in the file:
+%% version. The latest version of this license is in the file:
 %% 
 %% http://www.latex-project.org/lppl.txt
 %% 
@@ -1561,9 +1758,8 @@
 %% Charles P. Schaum.
 %% 
 %% This work consists of the files nameauth.dtx, examples.tex, and a Makefile.
-%% Running "make" generates the derived files README, nameauth.pdf and
-%% nameauth.sty. Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%% 
+%% These files generate README.txt / README, nameauth.ins, nameauth.sty, and
+%% nameauth.pdf, with other intermediate files, as a part of this work. See
+%% the README.txt or README for more information.
 %%
 %% End of file `nameauth.sty'.