nameauth (1nov16)

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

3 files changed, 45 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
index 5adee70ceee..24541e6d550 100644
--- a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
+++ b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
diff --git a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
index e5b7c97ac09..883bf941c05 100644
--- a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
+++ b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
@@ -180,7 +180,7 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{nameauth}
 %<*package>
-    [2016/10/27 v3.01 Name authority management for consistency in text and index]
+    [2016/11/01 v3.03 Name authority management for consistency in text and index]
 %</package>
 %<*driver>
 \documentclass[11pt]{ltxdoc}
@@ -407,7 +407,7 @@ Running "make install" installs the files in the local TeX tree.
 %</driver>
 % \fi
 %
-% \CheckSum{3085}
+% \CheckSum{3094}
 %
 % \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
@@ -3848,9 +3848,11 @@ Running "make install" installs the files in the local TeX tree.
 }
 %    \end{macrocode}
 % \end{macro}
+% \clearpage
 %
 % \begin{macro}{\@nameauth@NonWest}
 % \changes{v3.0}{2016/10/26}{Added}
+% \changes{v3.02}{2016/11/01}{First name only with ``short'' macros}
 % Print non-Western names from \cmd{\@nameauth@name} and \cmd{\AKA}. We inherit internal control sequences from the naming macros and do nothing if called outside them.
 %    \begin{macrocode}
 \newcommand*\@nameauth@NonWest[1]
@@ -3887,8 +3889,12 @@ Running "make install" installs the files in the local TeX tree.
           \@nameauth@Hook{\SNN\Space\FNN}%
         \fi
       \else
-        \if@nameauth@EastFN
-          \@nameauth@Hook{\FNN}%
+        \if@nameauth@FirstName
+          \if@nameauth@EastFN
+            \@nameauth@Hook{\FNN}%
+          \else
+            \@nameauth@Hook{\SNN}%
+          \fi
         \else
           \@nameauth@Hook{\SNN}%
         \fi
@@ -3903,6 +3909,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 %    \end{macrocode}
 % \end{macro}
+% \clearpage
 %
 % \begin{macro}{\@nameauth@West}
 % \changes{v3.0}{2016/10/26}{Added}
@@ -3958,6 +3965,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 %    \end{macrocode}
 % \end{macro}
+% \clearpage
 %
 % \noindent{\large\bfseries Format Hook Dispatcher}
 % \begin{macro}{\@nameauth@Hook}
@@ -4018,6 +4026,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 %    \end{macrocode}
 % \end{macro}
+% \clearpage
 %
 % \noindent{\large\bfseries Indexing Internals}
 % \begin{macro}{\@nameauth@Index}
@@ -4139,7 +4148,7 @@ Running "make install" installs the files in the local TeX tree.
 % \end{macro}
 %
 % \begin{macro}{\ForceFN}
-% Force the printing of an Eastern forename in the text.
+% Force the printing of an Eastern forename in the text, but only when using the ``short name'' macros.
 % \changes{v3.0}{2016/10/26}{Added}
 %    \begin{macrocode}
 \newcommand*\ForceFN{\@nameauth@EastFNtrue}
@@ -4280,6 +4289,7 @@ Running "make install" installs the files in the local TeX tree.
 % \phantomsection\label{page:parser}
 % \begin{macro}{\NameParser}
 % \changes{v3.0}{2016/10/26}{Added}
+% \changes{v3.03}{2016/11/01}{First name only with ``short'' macros}
 % Generate a name form based on the current state of the \textsf{nameauth} macros in the locked path. Available for use only in the hook macros.
 %    \begin{macrocode}
 \newcommand*\NameParser
@@ -4302,8 +4312,12 @@ Running "make install" installs the files in the local TeX tree.
             \SNN\Space\FNN%
           \fi
         \else
-          \if@nameauth@EastFN
-            \FNN%
+          \if@nameauth@FirstName
+            \if@nameauth@EastFN
+              \FNN%
+            \else
+              \SNN%
+            \fi
           \else
             \SNN%
           \fi
@@ -4379,6 +4393,7 @@ Running "make install" installs the files in the local TeX tree.
   {\@nameauth@FirstNametrue\NameauthFName}
 %    \end{macrocode}
 % \end{macro}
+% \clearpage
 %
 % \noindent{\large\bfseries Index Operations}
 % \begin{macro}{\IndexName}
@@ -4439,6 +4454,9 @@ Running "make install" installs the files in the local TeX tree.
         \else
           \@nameauth@Index{\csbc}{\SNN\space\argc}%
         \fi
+%    \end{macrocode}
+% \clearpage\noindent
+%    \begin{macrocode}
       \else
         \ifcsname\csb!PN\endcsname
           \if@nameauth@Verbose
@@ -4554,6 +4572,9 @@ Running "make install" installs the files in the local TeX tree.
         \fi
       \fi
     \fi
+%    \end{macrocode}
+% \clearpage\noindent
+%    \begin{macrocode}
   \else
     \ifcsname\csab!PN\endcsname
       \if@nameauth@Verbose
@@ -4619,6 +4640,9 @@ Running "make install" installs the files in the local TeX tree.
           {macro \ExcludeName: Reference: #2 exists}%
         \fi
       \fi
+%    \end{macrocode}
+% \clearpage\noindent
+%    \begin{macrocode}
       \ifcsname\csb!PN\endcsname
         \if@nameauth@Verbose
           \PackageWarning{nameauth}%
@@ -4737,6 +4761,7 @@ Running "make install" installs the files in the local TeX tree.
 }
 %    \end{macrocode}
 % \end{macro}
+% \clearpage
 %
 % \begin{macro}{\IncludeName*}
 % \changes{v3.0}{2016/10/26}{Added}
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 3b721a34931..ed85cf6c564 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{nameauth}
-    [2016/10/27 v3.01 Name authority management for consistency in text and index]
+    [2016/11/01 v3.03 Name authority management for consistency in text and index]
 \newif\if@nameauth@InAKA
 \newif\if@nameauth@InName
 \newif\if@nameauth@Xref
@@ -305,8 +305,12 @@
           \@nameauth@Hook{\SNN\Space\FNN}%
         \fi
       \else
-        \if@nameauth@EastFN
-          \@nameauth@Hook{\FNN}%
+        \if@nameauth@FirstName
+          \if@nameauth@EastFN
+            \@nameauth@Hook{\FNN}%
+          \else
+            \@nameauth@Hook{\SNN}%
+          \fi
         \else
           \@nameauth@Hook{\SNN}%
         \fi
@@ -499,8 +503,12 @@
             \SNN\Space\FNN%
           \fi
         \else
-          \if@nameauth@EastFN
-            \FNN%
+          \if@nameauth@FirstName
+            \if@nameauth@EastFN
+              \FNN%
+            \else
+              \SNN%
+            \fi
           \else
             \SNN%
           \fi