nameauth 1.1 (8mar12)

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

1 files changed, 27 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 0931596342d..15efb9f11a6 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{nameauth}
-    [2012/02/20 v1.0 name authority macros to aid consistent display and indexing of names]
+    [2012/03/08 v1.1 name authority macros to aid consistent display and indexing of names]
  %
 %% \DescribeMacro{\IndexActive}
 \newif\if@nameauth@DoFormat
@@ -122,7 +122,7 @@
           \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
                \expandafter\Forenames\expandafter\space\Surnames}%
           \PackageWarning{nameauth}%
-          {\bsc Name Cross-reference: #2 #3 cannot be a page reference.}%
+          {macro Name Cross-reference: #2 #3 cannot be a page reference.}%
      \else%
           \if@nameauth@DoFormat%
                \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
@@ -159,7 +159,7 @@
                \expandafter\@nameauth@FmtName\expandafter*%
                     \expandafter{\Surnames\space#4}%
                \PackageWarning{nameauth}%
-               {\bsc Name Cross-reference: #3 #4 cannot be a page reference.}%
+               {macro Name Cross-reference: #3 #4 cannot be a page reference.}%
           \else%
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#3#4!MN!}\endcsname%
@@ -195,7 +195,7 @@
                \expandafter\@nameauth@FmtName\expandafter*%
                     \expandafter{\Surnames}%
                \PackageWarning{nameauth}%
-               {\bsc Name Cross-reference: #3 cannot be a page reference.}%
+               {macro Name Cross-reference: #3 cannot be a page reference.}%
           \else%
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#3!MN!}\endcsname%
@@ -244,7 +244,7 @@
           \expandafter\@nameauth@FmtName\expandafter*%
                \expandafter{\Forenames}%
           \PackageWarning{nameauth}%
-          {\bsc FName Cross-reference: #1 #2 cannot be a page reference.}%
+          {macro FName Cross-reference: #1 #2 cannot be a page reference.}%
      \else%
           \if@nameauth@DoFormat%
                \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
@@ -275,7 +275,7 @@
                \expandafter\@nameauth@FmtName\expandafter*%
                     \expandafter{\Surnames\space#3}%
                \PackageWarning{nameauth}%
-               {\bsc FName Cross-reference: #2 #3 cannot be a page reference.}%
+               {macro FName Cross-reference: #2 #3 cannot be a page reference.}%
           \else%
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
@@ -303,7 +303,7 @@
                \expandafter\@nameauth@FmtName\expandafter*%
                     \expandafter{\Surnames}%
                \PackageWarning{nameauth}%
-               {\bsc FName Cross-reference: #2 cannot be a page reference.}%
+               {macro FName Cross-reference: #2 cannot be a page reference.}%
           \else%
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
@@ -350,15 +350,15 @@
                \expandafter\Forenames\expandafter\space\Surnamesii}%
           \ifcsname\@nameauth@CleanName{#4#5!PN!}\endcsname%
                \PackageWarning{nameauth}%
-               { \bsc AKA XRef: #1 #2 exists.}%
+               {macro AKA XRef: #4 #5 exists.}%
           \else%
                \ifcsname\@nameauth@CleanName{#4#5!MN!}\endcsname%
                     \PackageWarning{nameauth}%
-                    { \bsc AKA Name reference: #4 #5 already exists; no see ref.}%
+                    {macro AKA Name reference: #4 #5 already exists; no see ref.}%
                \else%
                     \ifcsname\@nameauth@CleanName{#4#5!NF!}\endcsname%
                          \PackageWarning{nameauth}%
-                         { \bsc AKA Name reference: #4 #5 already exists; no see ref.}%
+                         {macro AKA Name reference: #4 #5 already exists; no see ref.}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
                          \IfValueTF{#2}%
@@ -372,15 +372,17 @@
                {\@nameauth@FmtName*{#6}}%
                {\expandafter\@nameauth@FmtName\expandafter*%
                     \expandafter{\Surnamesii\space#6}}%
-          \ifcsname\@nameauth@CleanName{#5#6!PN!}\endcsname\relax%
+          \ifcsname\@nameauth@CleanName{#5#6!PN!}\endcsname%
+               \PackageWarning{nameauth}%
+               {macro AKA XRef: #5 #6 exists.}%
           \else%
                \ifcsname\@nameauth@CleanName{#5#6!MN!}\endcsname%
                     \PackageWarning{nameauth}%
-                    {\bsc AKA Name reference: #5 #6 already exists; no see ref.}%
+                    {macro AKA Name reference: #5 #6 already exists; no see ref.}%
                \else%
                     \ifcsname\@nameauth@CleanName{#5#6!NF!}\endcsname%
                          \PackageWarning{nameauth}%
-                         {\bsc AKA Name reference: #5 #6 already exists; no see ref.}%
+                         {macro AKA Name reference: #5 #6 already exists; no see ref.}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#5#6!PN!}}{}%
                          \IfValueTF{#2}%
@@ -390,15 +392,17 @@
                \fi%
           \fi}%
           {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii}%
-          \ifcsname\@nameauth@CleanName{#5!PN!}\endcsname\relax%
+          \ifcsname\@nameauth@CleanName{#5!PN!}\endcsname%
+               \PackageWarning{nameauth}%
+               {macro AKA XRef: #5 exists.}%
           \else%
                \ifcsname\@nameauth@CleanName{#5!MN!}\endcsname%
                     \PackageWarning{nameauth}%
-                    {\bsc AKA Name reference: #5 already exists; no see ref.}%
+                    {macro AKA Name reference: #5 already exists; no see ref.}%
                \else%
                     \ifcsname\@nameauth@CleanName{#5!NF!}\endcsname%
                          \PackageWarning{nameauth}%
-                         {\bsc AKA Name reference: #5 already exists; no see ref.}%
+                         {macro AKA Name reference: #5 already exists; no see ref.}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#5!PN!}}{}%
                          \IfValueTF{#2}%
@@ -446,15 +450,15 @@
      {%
           \ifcsname\@nameauth@CleanName{#1#2!PN!}\endcsname%
                \PackageWarning{nameauth}%
-               {\bsc ExcludeName XRef: #1 #2 exists.}%
+               {macro ExcludeName XRef: #1 #2 exists.}%
           \else%
                \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
                     \PackageWarning{nameauth}%
-                    {\bsc ExcludeName Reference: #1 #2 already exists; no exclusion.}%
+                    {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
                \else%
                     \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
                          \PackageWarning{nameauth}%
-                         {\bsc ExcludeName Reference: #1 #2 already exists; no exclusion.}%
+                         {macro ExcludeName Reference: #1 #2 already exists; no exclusion.}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#1#2!PN!}}{}%
                     \fi%
@@ -465,11 +469,11 @@
           \else%
                \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
                     \PackageWarning{nameauth}%
-                    {\bsc ExcludeName Reference: #2 #3 already exists; no exclusion.}%
+                    {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
                \else%
                     \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
                          \PackageWarning{nameauth}%
-                         {\bsc ExcludeName Reference: #2 #3 already exists; no exclusion.}%
+                         {macro ExcludeName Reference: #2 #3 already exists; no exclusion.}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#2#3!PN!}}{}%
                     \fi%
@@ -479,11 +483,11 @@
           \else%
                \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
                     \PackageWarning{nameauth}%
-                    {\bsc ExcludeName Reference: #2 already exists; no exclusion.}%
+                    {macro ExcludeName Reference: #2 already exists; no exclusion.}%
                \else%
                     \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
                          \PackageWarning{nameauth}%
-                         {\bsc ExcludeName Reference: #2 already exists; no exclusion.}%
+                         {macro ExcludeName Reference: #2 already exists; no exclusion.}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#2!PN!}}{}%
                     \fi%