nameauth 1.0 (21feb12)

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

1 files changed, 43 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index c885879b27d..0931596342d 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/19 v0.96 name authority macros to aid consistent display and indexing of names]
+    [2012/02/20 v1.0 name authority macros to aid consistent display and indexing of names]
  %
 %% \DescribeMacro{\IndexActive}
 \newif\if@nameauth@DoFormat
@@ -103,18 +103,16 @@
 }
 \DeclareDocumentCommand\Name{s o m o}%
 {%
-     \edef\Surnames{#3}%
-     \def\ISurnames{#3}%
+     \protected@edef\Surnames{#3}%
      \if@nameauth@DoCaps%
-          \def\Shortnames{\@nameauth@CapRoot{#3,}}%
+          \protected@edef\Shortnames{\@nameauth@CapRoot{#3,}}%
      \else%
-          \def\Shortnames{\@nameauth@Root{#3,}}%
+          \protected@edef\Shortnames{\@nameauth@Root{#3,}}%
      \fi%
      \if@nameauth@DoComma\else%
           \@nameauth@CheckComma{#3}%
           \if@nameauth@Comma%
-               \edef\Surnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
-               \def\ISurnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
+               \protected@edef\Surnames{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
           \fi%
      \fi%
      \IfValueTF{#2}%
@@ -131,28 +129,28 @@
                \IfBooleanTF{#1}%
                     {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
                          \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\ISurnames, #2}}%
+                         \@nameauth@Index{\Surnames, #2}}%
                     {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                         \@nameauth@Index{\ISurnames, #2}}%
+                         \@nameauth@Index{\Surnames, #2}}%
                \else%
                     \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
                     \expandafter\@nameauth@FmtName\expandafter{%
                          \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\ISurnames, #2}%
+                         \@nameauth@Index{\Surnames, #2}%
                \fi%
           \else%
                \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
                \IfBooleanTF{#1}%
                     {\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
                          \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\ISurnames, #2}}%
+                         \@nameauth@Index{\Surnames, #2}}%
                     {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                         \@nameauth@Index{\ISurnames, #2}}%
+                         \@nameauth@Index{\Surnames, #2}}%
                \else%
                     \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
                     \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
                          \expandafter\Forenames\expandafter\space\Surnames}%
-                         \@nameauth@Index{\ISurnames, #2}%
+                         \@nameauth@Index{\Surnames, #2}%
                \fi%
           \fi%
      \fi}%
@@ -168,28 +166,28 @@
                     \IfBooleanTF{#1}%
                          {\expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\ISurnames\space#4}}%
+                              \@nameauth@Index{\Surnames\space#4}}%
                          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                              \@nameauth@Index{\ISurnames\space#4}}%
+                              \@nameauth@Index{\Surnames\space#4}}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3#4!MN!}}{}%
                          \expandafter\@nameauth@FmtName\expandafter{%
                               \Surnames\space#4}%
-                              \@nameauth@Index{\ISurnames\space#4}%
+                              \@nameauth@Index{\Surnames\space#4}%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#3#4!NF!}\endcsname%
                     \IfBooleanTF{#1}%
                          {\expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\ISurnames\space#4}}%
+                              \@nameauth@Index{\Surnames\space#4}}%
                          {\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Shortnames}%
-                              \@nameauth@Index{\ISurnames\space#4}}%
+                              \@nameauth@Index{\Surnames\space#4}}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3#4!NF!}}{}%
                          \expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames\space#4}%
-                              \@nameauth@Index{\ISurnames\space#4}%
+                              \@nameauth@Index{\Surnames\space#4}%
                      \fi%
                \fi%
           \fi}%
@@ -204,27 +202,27 @@
                     \IfBooleanTF{#1}%
                          {\expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames}%
-                              \@nameauth@Index{\ISurnames}}%
+                              \@nameauth@Index{\Surnames}}%
                          {\@nameauth@FmtName*{\Shortnames}%
-                              \@nameauth@Index{\ISurnames}}%
+                              \@nameauth@Index{\Surnames}}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#3!MN!}}{}%
                          \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
-                              \@nameauth@Index{\ISurnames}%
+                              \@nameauth@Index{\Surnames}%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#3!NF!}\endcsname%
                     \IfBooleanTF{#1}%
                          {\expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames}%
-                              \@nameauth@Index{\ISurnames}}%
+                              \@nameauth@Index{\Surnames}}%
                          {\@nameauth@FmtName*{\Shortnames}%
-                              \@nameauth@Index{\ISurnames}}%
+                              \@nameauth@Index{\Surnames}}%
                      \else%
                          \csgdef{\@nameauth@CleanName{#3!NF!}}{}%
                          \expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames}%
-                              \@nameauth@Index{\ISurnames}%
+                              \@nameauth@Index{\Surnames}%
                     \fi%
                \fi%
           \fi}%
@@ -233,13 +231,11 @@
 }
 \DeclareDocumentCommand\FName{o m o}%
 {%
-     \edef\Surnames{#2}%
-     \def\ISurnames{#2}%
+     \protected@edef\Surnames{#2}%
      \if@nameauth@DoComma\else%
           \@nameauth@CheckComma{#2}%
           \if@nameauth@Comma%
-               \edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
-               \def\ISurnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
+               \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
           \fi%
      \fi%
     \IfValueTF{#1}%
@@ -254,23 +250,23 @@
                \ifcsname\@nameauth@CleanName{#1#2!MN!}\endcsname%
                     \expandafter\@nameauth@FmtName\expandafter*%
                          \expandafter{\Forenames}%
-                    \@nameauth@Index{\ISurnames, #1}%
+                    \@nameauth@Index{\Surnames, #1}%
                \else%
                     \csgdef{\@nameauth@CleanName{#1#2!MN!}}{}%
                     \expandafter\@nameauth@FmtName\expandafter{%
                         \expandafter\Forenames\expandafter\space\Surnames}%
-                    \@nameauth@Index{\ISurnames, #1}%
+                    \@nameauth@Index{\Surnames, #1}%
                \fi%
           \else%
                \ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
                    \expandafter\@nameauth@FmtName\expandafter*%
                          \expandafter{\Forenames}%
-                   \@nameauth@Index{\ISurnames, #1}%
+                   \@nameauth@Index{\Surnames, #1}%
                \else%
                     \csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
                     \expandafter\@nameauth@FmtName\expandafter*%
                          \expandafter{\Forenames\expandafter\space\Surnames}%
-                    \@nameauth@Index{\ISurnames, #1}%
+                    \@nameauth@Index{\Surnames, #1}%
                \fi%
           \fi%
      \fi}%
@@ -284,22 +280,22 @@
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
                          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\ISurnames\space#3}%
+                         \@nameauth@Index{\Surnames\space#3}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
                          \expandafter\@nameauth@FmtName%
                               \expandafter{\Surnames\space#3}%
-                         \@nameauth@Index{\ISurnames\space#3}%
+                         \@nameauth@Index{\Surnames\space#3}%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
                          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\ISurnames\space#3}%
+                         \@nameauth@Index{\Surnames\space#3}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
                               \expandafter\@nameauth@FmtName\expandafter*%
                          \expandafter{\Surnames\space#3}%
-                         \@nameauth@Index{\ISurnames\space#3}%
+                         \@nameauth@Index{\Surnames\space#3}%
                      \fi%
                \fi%
           \fi}%
@@ -312,21 +308,21 @@
                \if@nameauth@DoFormat%
                     \ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
                          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\ISurnames}%
+                         \@nameauth@Index{\Surnames}%
                     \else%
                          \csgdef{\@nameauth@CleanName{#2!MN!}}{}%
                          \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
-                         \@nameauth@Index{\ISurnames}%
+                         \@nameauth@Index{\Surnames}%
                      \fi%
                \else%
                     \ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
                          \@nameauth@FmtName*{\@nameauth@Root{#2,}}%
-                         \@nameauth@Index{\ISurnames}%
+                         \@nameauth@Index{\Surnames}%
                      \else%
                          \csgdef{\@nameauth@CleanName{#2!NF!}}{}%
                          \expandafter\@nameauth@FmtName\expandafter*%
                               \expandafter{\Surnames}%
-                         \@nameauth@Index{\ISurnames}%
+                         \@nameauth@Index{\Surnames}%
                     \fi%
                \fi%
           \fi}%
@@ -335,16 +331,16 @@
 }
 \DeclareDocumentCommand\AKA{s o m o m o}%
 {%
-     \def\Surnamesi{#3}%
-     \def\Surnamesii{#5}%
+     \protected@edef\Surnamesi{#3}%
+     \protected@edef\Surnamesii{#5}%
      \if@nameauth@DoComma\else%
           \@nameauth@CheckComma{#3}%
           \if@nameauth@Comma%
-               \def\Surnamesi{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
+               \protected@edef\Surnamesi{\@nameauth@Root{#3}\@nameauth@Suffix{#3}}%
           \fi%
           \@nameauth@CheckComma{#5}%
           \if@nameauth@Comma%
-               \def\Surnamesii{\@nameauth@Root{#5}\@nameauth@Suffix{#5}}%
+               \protected@edef\Surnamesii{\@nameauth@Root{#5}\@nameauth@Suffix{#5}}%
           \fi%
      \fi%
      \IfValueTF{#4}%
@@ -421,11 +417,11 @@
 }
 \DeclareDocumentCommand\IndexName{o m o}%
 {%
-     \def\Surnames{#2}%
+     \protected@edef\Surnames{#2}%
      \if@nameauth@DoComma\else%
           \@nameauth@CheckComma{#2}%
           \if@nameauth@Comma%
-               \edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
+               \protected@edef\Surnames{\@nameauth@Root{#2}\@nameauth@Suffix{#2}}%
           \fi%
      \fi%
      \IfValueTF{#1}%