summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/nameauth
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-11 22:21:46 +0000
committerKarl Berry <karl@freefriends.org>2015-07-11 22:21:46 +0000
commitd951ff19d719f6e02f9e6eb48a5c19f1b94c2076 (patch)
tree8933313275283add3efc658b8a8468f2a5effada /Master/texmf-dist/tex/latex/nameauth
parentf94a0ae45b3e579bab72300a7b4ad72d038af610 (diff)
nameauth (11jul15)
git-svn-id: svn://tug.org/texlive/trunk@37840 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/nameauth')
-rw-r--r--Master/texmf-dist/tex/latex/nameauth/nameauth.sty259
1 files changed, 135 insertions, 124 deletions
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 788ea302cce..e6ae07608af 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -22,14 +22,16 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{nameauth}
- [2013/09/19 v1.8 name authority macros to aid consistent display and indexing of names]
+ [2015/07/09 v1.9 name authority macros to aid consistent display and indexing of names]
\newif\if@nameauth@FullName
\newif\if@nameauth@FirstName
\newif\if@nameauth@AltAKA
\newif\if@nameauth@DoFormat
\newif\if@nameauth@DoIndex
\newif\if@nameauth@AlwaysFormat
+\newif\if@nameauth@AlwaysComma
\newif\if@nameauth@ShowComma
+\newif\if@nameauth@NBSP
\newif\if@nameauth@Comma
\newif\if@nameauth@Punct
\newif\if@nameauth@DoCaps
@@ -52,8 +54,8 @@
\DeclareOption{allreversed}{\@nameauth@RevAlltrue\@nameauth@RevAllCommafalse}
\DeclareOption{allrevcomma}{\@nameauth@RevAlltrue\@nameauth@RevAllCommatrue}
\DeclareOption{notreversed}{\@nameauth@RevAllfalse\@nameauth@RevAllCommafalse}
-\DeclareOption{comma}{\protected@edef\Interspace{,\space}}
-\DeclareOption{nocomma}{\protected@edef\Interspace{\space}}
+\DeclareOption{comma}{\@nameauth@AlwaysCommatrue}
+\DeclareOption{nocomma}{\@nameauth@AlwaysCommafalse}
\DeclareOption{index}{\@nameauth@DoIndextrue}
\DeclareOption{noindex}{\@nameauth@DoIndexfalse}
\ExecuteOptions{nocomma,mainmatter,index,normalcaps,notreversed,smallcaps}
@@ -72,24 +74,13 @@
}
\def\@nameauth@TrimRoot#1,#2\relax{#1}
\newcommand*{\@nameauth@CapRoot}[1]%
-{%
- \@nameauth@CR#1\relax%
-}
+ {\@nameauth@CR#1\relax}
\def\@nameauth@CR#1#2\relax{\uppercase{#1}\@nameauth@Root{#2}}
\newcommand*{\@nameauth@AllCapRoot}[1]%
-{%
- \uppercase{\@nameauth@Root{#1}}%
-}
+ {\uppercase{\@nameauth@Root{#1}}}
\newcommand*{\@nameauth@Suffix}[1]%
-{%
- \@nameauth@TrimSuffix#1\relax%
-}
+ {\@nameauth@TrimSuffix#1\relax}
\def\@nameauth@TrimSuffix#1,#2\relax{\trim@spaces{#2}}
-\def\@nameauth@CheckDot{\futurelet\@token\@nameauth@EvalDot}
-\def\@nameauth@EvalDot%
-{%
- \let\@period=.\ifx\@token\@period\expandafter\@gobble \fi%
-}
\newcommand*{\@nameauth@TestDot}[1]%
{%
\def\TestDot##1.\TestEnd##2\TestStop{\TestPunct{##2}}%
@@ -98,6 +89,9 @@
\@nameauth@Punctfalse%
\TestDot#1\TestEnd.\TestEnd\TestStop%
}
+\def\@nameauth@CheckDot{\futurelet\@token\@nameauth@EvalDot}
+\def\@nameauth@EvalDot%
+ {\let\@period=.\ifx\@token\@period\expandafter\@gobble \fi}
\newcommand{\@nameauth@FmtName}[1]%
{%
\@nameauth@TestDot{#1}%
@@ -132,40 +126,34 @@
\fi%
\fi%
}
-\newcommand{\CapThis}%
-{%
- \@nameauth@DoCapstrue%
-}
-\newcommand{\CapName}%
-{%
- \@nameauth@AllThistrue%
-}
-\newcommand{\RevName}%
-{%
- \@nameauth@RevThistrue%
-}
+\newcommand{\CapThis}{\@nameauth@DoCapstrue}
+\newcommand{\CapName}{\@nameauth@AllThistrue}
+\newcommand{\RevName}{\@nameauth@RevThistrue}
\newcommand{\RevComma}%
-{%
- \@nameauth@RevThistrue%
- \@nameauth@RevThisCommatrue%
-}
-\newcommand{\ShowComma}%
-{%
- \@nameauth@ShowCommatrue%
-}
+ {\@nameauth@RevThistrue\@nameauth@RevThisCommatrue}
+\newcommand{\ShowComma}{\@nameauth@ShowCommatrue}
+\newcommand{\KeepAffix}{\@nameauth@NBSPtrue}
\newcommandx\Name[3][1=\@empty, 3=\@empty]%
{%
\leavevmode\hbox{}%
\protected@edef\testi{#1}%
\protected@edef\testii{#2}%
\protected@edef\testiii{#3}%
- \if@nameauth@AllCaps\CapName\fi%
- \if@nameauth@RevAll\RevName\fi%
- \if@nameauth@RevAllComma\RevComma\fi%
+ \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}%
- \else%
- \let\Space\Interspace%
+ \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi%
\fi%
\protected@edef\RawShort{\@nameauth@Root{#2}}%
\protected@edef\CapShort{\@nameauth@CapRoot{#2}}%
@@ -189,7 +177,7 @@
\fi%
\else%
\protected@edef\Suffix{\@nameauth@Suffix{#2}}%
- \protected@edef\IndexSurnames{\RawShort\Space\Suffix}%
+ \protected@edef\IndexSurnames{\RawShort\ISpace\Suffix}%
\protected@edef\Reversed{\Suffix\Space\RawShort}%
\protected@edef\Surnames{\RawShort\Space\Suffix}%
\if@nameauth@RevThis%
@@ -216,16 +204,13 @@
\fi%
\fi%
\fi%
- \@nameauth@DoCapsfalse%
- \@nameauth@AllThisfalse%
- \@nameauth@ShowCommafalse%
\ifx\testi\@empty%
\ifx\testiii\@empty%
\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
\PackageWarning{nameauth}%
{macro \Name: Xref: #2 cannot be a page reference.}%
\else%
- \@nameauth@Index{\IndexSurnames}[\@nameauth@CleanName{#2}]%
+ \@nameauth@Index{\IndexSurnames}[\@nameauth@CleanName{#2}!TAG!]%
\fi%
\if@nameauth@DoFormat%
\ifcsname\@nameauth@CleanName{#2!MN!}\endcsname%
@@ -285,7 +270,7 @@
\PackageWarning{nameauth}%
{macro \Name: Xref: #2 #3 cannot be a page reference.}%
\else%
- \@nameauth@Index{\IndexSurnames\space#3}[\@nameauth@CleanName{#2#3}]%
+ \@nameauth@Index{\IndexSurnames\ISpace#3}[\@nameauth@CleanName{#2#3}!TAG!]%
\fi%
\if@nameauth@DoFormat%
\ifcsname\@nameauth@CleanName{#2#3!MN!}\endcsname%
@@ -352,16 +337,16 @@
\expandafter\testiii\expandafter\space\Surnames}%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Surnames\expandafter\space#3}%
+ \expandafter\Surnames\expandafter\space\testiii}%
\fi%
\fi%
\fi%
\fi%
\else%
\if@nameauth@RevThisComma%
+ \protected@edef\ISpace{,\space}%
\protected@edef\Space{,\space}%
- \else%
- \let\Space\Interspace%
+ \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi%
\fi%
\ifx\testiii\@empty%
\protected@edef\Forenames{#1}%
@@ -373,9 +358,9 @@
{macro \Name: Xref: #1 #2 cannot be a page reference.}%
\else%
\ifx\Suffix\@empty%
- \@nameauth@Index{\IndexShort, #1}[\@nameauth@CleanName{#1#2}]%
+ \@nameauth@Index{\IndexShort, #1}[\@nameauth@CleanName{#1#2}!TAG!]%
\else%
- \@nameauth@Index{\IndexShort, #1, \Suffix}[\@nameauth@CleanName{#1#2}]%
+ \@nameauth@Index{\IndexShort, #1, \Suffix}[\@nameauth@CleanName{#1#2}!TAG!]%
\fi%
\fi%
\if@nameauth@DoFormat%
@@ -442,25 +427,20 @@
\fi%
\fi%
\fi%
+ \@nameauth@NBSPfalse%
+ \@nameauth@DoCapsfalse%
+ \@nameauth@AllThisfalse%
+ \@nameauth@ShowCommafalse%
\@nameauth@RevThisfalse%
\@nameauth@RevThisCommafalse%
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
}
\WithSuffix\newcommandx\Name*[3][1=\@empty, 3=\@empty]%
-{%
- \@nameauth@FullNametrue%
- \Name[#1]{#2}[#3]%
-}
+ {\@nameauth@FullNametrue\Name[#1]{#2}[#3]}
\newcommandx\FName[3][1=\@empty, 3=\@empty]%
-{%
- \@nameauth@FirstNametrue%
- \Name[#1]{#2}[#3]%
-}
+ {\@nameauth@FirstNametrue\Name[#1]{#2}[#3]}
\WithSuffix\newcommandx\FName*[3][1=\@empty, 3=\@empty]%
-{%
- \@nameauth@FirstNametrue%
- \Name[#1]{#2}[#3]%
-}
+ {\@nameauth@FirstNametrue\Name[#1]{#2}[#3]}
\newcommandx\AKA[5][1=\@empty, 3=\@empty, 5=\@empty]%
{%
\leavevmode\hbox{}%
@@ -469,34 +449,60 @@
\protected@edef\testiii{#3}%
\protected@edef\testiv{#4}%
\protected@edef\testv{#5}%
- \if@nameauth@AllCaps\CapName\fi%
- \if@nameauth@RevAll\RevName\fi%
- \if@nameauth@RevAll\RevComma\fi%
+ \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}%
- \else%
- \let\Space\Interspace%
+ \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi%
\fi%
\protected@edef\Shortii{\@nameauth@Root{#2}}%
\protected@edef\Shortiv{\@nameauth@Root{#4}}%
+ \protected@edef\CapShort{\@nameauth@CapRoot{#4}}%
+ \protected@edef\AllCapShort{\@nameauth@AllCapRoot{#4}}%
\ifx\testii\Shortii%
\let\Surnamesii\Shortii%
\protected@edef\Suffixii{\@empty}%
\else%
\protected@edef\Suffixii{\@nameauth@Suffix{#2}}%
- \protected@edef\Surnamesii{\Shortii\Space\Suffixii}%
+ \protected@edef\Surnamesii{\Shortii\ISpace\Suffixii}%
\fi%
\ifx\testiv\Shortiv%
\protected@edef\Suffixiv{\@empty}%
+ \let\ISurnamesiv\Shortiv%
+ \let\Reversed\Shortiv%
\let\Surnamesiv\Shortiv%
- \let\Reverseiv\Shortiv%
+ \if@nameauth@DoCaps%
+ \let\Surnamesiv\CapShort%
+ \let\Reversed\CapShort%
+ \fi%
+ \if@nameauth@AllThis%
+ \let\Surnamesiv\AllCapShort%
+ \let\Reversed\AllCapShort%
+ \fi%
\else%
\protected@edef\Suffixiv{\@nameauth@Suffix{#4}}%
+ \protected@edef\ISurnamesiv{\Shortiv\ISpace\Suffixiv}%
+ \protected@edef\Reversed{\Suffixiv\Space\Shortiv}%
\protected@edef\Surnamesiv{\Shortiv\Space\Suffixiv}%
- \protected@edef\Reverseiv{\Suffixiv\Space\Shortiv}%
+ \if@nameauth@DoCaps%
+ \protected@edef\Reversed{\Suffixiv\Space\CapShort}%
+ \protected@edef\Surnamesiv{\CapShort\Space\Suffixiv}%
+ \fi%
+ \if@nameauth@AllThis%
+ \protected@edef\Reversed{\Suffixiv\Space\AllCapShort}%
+ \protected@edef\Surnamesiv{\AllCapShort\Space\Suffixiv}%
+ \fi%
\fi%
- \@nameauth@ShowCommafalse%
- \@nameauth@AllThisfalse%
\ifx\testiii\@empty%
\ifx\testv\@empty%
\ifcsname\@nameauth@CleanName{#4!PN!}\endcsname%
@@ -513,22 +519,21 @@
\else%
\csgdef{\@nameauth@CleanName{#4!PN!}}{}%
\ifx\testi\@empty%
- \@nameauth@Index{\Surnamesiv|see{\Surnamesii}}%
+ \@nameauth@Index{\ISurnamesiv|see{\Surnamesii}}%
\else%
- \ifx\Suffixii\@empty \@nameauth@Index{\Surnamesiv|see{\Surnamesii, #1}}%
- \else \@nameauth@Index{\Surnamesiv|see{\Shortii, #1, \Suffixii}}\fi%
+ \ifx\Suffixii\@empty \@nameauth@Index{\ISurnamesiv|see{\Surnamesii, #1}}%
+ \else \@nameauth@Index{\ISurnamesiv|see{\Shortii, #1, \Suffixii}}\fi%
\fi%
\fi%
\fi%
\fi%
- \@nameauth@AltAKAfalse%
\if@nameauth@RevThisComma%
+ \protected@edef\ISpace{,\space}%
\protected@edef\Space{,\space}%
- \else%
- \let\Space\Interspace%
+ \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi%
\fi%
\if@nameauth@RevThis%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Reverseiv}%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Reversed}%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesiv}%
\fi%
@@ -547,27 +552,25 @@
\else%
\csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
\ifx\testi\@empty%
- \@nameauth@Index{\Surnamesiv\space#5|see{\Surnamesii}}%
+ \@nameauth@Index{\ISurnamesiv\ISpace#5|see{\Surnamesii}}%
\else%
- \ifx\Suffixii\@empty \@nameauth@Index{\Surnamesiv\space#5|see{\Surnamesii, #1}}%
- \else \@nameauth@Index{\Surnamesiv\space#5|see{\Shortii, #1, \Suffixii}}\fi%
+ \ifx\Suffixii\@empty \@nameauth@Index{\ISurnamesiv\ISpace#5|see{\Surnamesii, #1}}%
+ \else \@nameauth@Index{\ISurnamesiv\ISpace#5|see{\Shortii, #1, \Suffixii}}\fi%
\fi%
\fi%
\fi%
\fi%
\if@nameauth@RevThisComma%
+ \protected@edef\ISpace{,\space}%
\protected@edef\Space{,\space}%
- \else%
- \let\Space\Interspace%
+ \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi%
\fi%
\if@nameauth@AltAKA%
- \@nameauth@AltAKAfalse%
\if@nameauth@RevThis%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\testv}%
\fi%
\else%
- \@nameauth@AltAKAfalse%
\if@nameauth@RevThis%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\expandafter\testv\expandafter\Space\Surnamesiv}%
\else%
@@ -590,18 +593,18 @@
\else%
\csgdef{\@nameauth@CleanName{#3#4!PN!}}{}%
\ifx\testi\@empty%
- \ifx\Suffixiv\@empty \@nameauth@Index{\Surnamesiv, #3|see{\Surnamesii}}%
+ \ifx\Suffixiv\@empty \@nameauth@Index{\ISurnamesiv, #3|see{\Surnamesii}}%
\else \@nameauth@Index{\Shortiv, #3, \Suffixiv|see{\Surnamesii}}\fi%
\else%
\ifx\Suffixii\@empty%
\ifx\Suffixiv\@empty%
- \@nameauth@Index{\Surnamesiv, #3|see{\Surnamesii, #1}}%
+ \@nameauth@Index{\ISurnamesiv, #3|see{\Surnamesii, #1}}%
\else%
\@nameauth@Index{\Shortiv, #3, \Suffixiv|see{\Surnamesii, #1}}%
\fi%
\else%
\ifx\Suffixiv\@empty%
- \@nameauth@Index{\Surnamesiv, #3|see{\Shortii, #1, \Suffixii}}%
+ \@nameauth@Index{\ISurnamesiv, #3|see{\Shortii, #1, \Suffixii}}%
\else%
\@nameauth@Index{\Shortiv, #3, \Suffixiv|see{\Shortii, #1, \Suffixii}}%
\fi%
@@ -610,11 +613,10 @@
\fi%
\fi%
\fi%
- \@nameauth@AltAKAfalse%
\if@nameauth@RevThisComma%
+ \protected@edef\ISpace{,\space}%
\protected@edef\Space{,\space}%
- \else%
- \let\Space\Interspace%
+ \if@nameauth@NBSP\protected@edef\Space{,\nobreakspace}\fi%
\fi%
\ifx\testv\@empty%
\protected@edef\Forenames{#3}%
@@ -629,6 +631,11 @@
\expandafter\Forenames\expandafter\space\Surnamesiv}%
\fi%
\fi%
+ \@nameauth@NBSPfalse%
+ \@nameauth@AltAKAfalse%
+ \@nameauth@DoCapsfalse%
+ \@nameauth@AllThisfalse%
+ \@nameauth@ShowCommafalse%
\@nameauth@RevThisfalse%
\@nameauth@RevThisCommafalse%
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
@@ -656,14 +663,14 @@
\PackageWarning{nameauth}%
{macro \textbackslash TagName Cannot tag xref: #2.}%
\else%
- \csgdef{\@nameauth@CleanName{#2}}{#4}%
+ \csgdef{\@nameauth@CleanName{#2}!TAG!}{#4}%
\fi%
\else%
\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
\PackageWarning{nameauth}%
{macro \textbackslash TagName Cannot tag xref: #2 #3.}%
\else%
- \csgdef{\@nameauth@CleanName{#2#3}}{#4}%
+ \csgdef{\@nameauth@CleanName{#2#3}!TAG!}{#4}%
\fi%
\fi%
\else%
@@ -671,7 +678,7 @@
\PackageWarning{nameauth}%
{macro \textbackslash TagName Cannot tag xref: #1 #2.}%
\else%
- \csgdef{\@nameauth@CleanName{#1#2}}{#4}%
+ \csgdef{\@nameauth@CleanName{#1#2}!TAG!}{#4}%
\fi%
\fi%
}
@@ -681,12 +688,12 @@
\protected@edef\testiii{#3}%
\ifx\testi\@empty%
\ifx\testiii\@empty%
- \csundef{\@nameauth@CleanName{#2}}%
+ \global\csundef{\@nameauth@CleanName{#2}!TAG!}%
\else%
- \csundef{\@nameauth@CleanName{#2#3}}%
+ \global\csundef{\@nameauth@CleanName{#2#3}!TAG!}%
\fi%
\else%
- \csundef{\@nameauth@CleanName{#1#2}}%
+ \global\csundef{\@nameauth@CleanName{#1#2}!TAG!}%
\fi%
}
\newcommandx\IndexName[3][1=\@empty, 3=\@empty]%
@@ -694,10 +701,12 @@
\protected@edef\testi{#1}%
\protected@edef\testii{#2}%
\protected@edef\testiii{#3}%
+ \protected@edef\Space{\space}%
+ \if@nameauth@AlwaysComma%
+ \protected@edef\Space{,\space}%
+ \fi%
\if@nameauth@ShowComma%
\protected@edef\Space{,\space}%
- \else%
- \let\Space\Interspace%
\fi%
\protected@edef\Short{\@nameauth@Root{#2}}%
\ifx\testii\Short%
@@ -707,21 +716,20 @@
\protected@edef\Suffix{\@nameauth@Suffix{#2}}%
\protected@edef\Surnames{\Short\Space\Suffix}%
\fi%
- \@nameauth@ShowCommafalse%
\ifx\testi\@empty%
\ifx\testiii\@empty%
\ifcsname\@nameauth@CleanName{#2!PN!}\endcsname%
\PackageWarning{nameauth}%
{macro \IndexName: XRef: #2 exists.}%
\else%
- \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}]%
+ \@nameauth@Index{\Surnames}[\@nameauth@CleanName{#2}!TAG!]%
\fi%
\else%
\ifcsname\@nameauth@CleanName{#2#3!PN!}\endcsname%
\PackageWarning{nameauth}%
{macro \IndexName: XRef: #2 #3 exists.}%
\else%
- \@nameauth@Index{\Surnames\space#3}[\@nameauth@CleanName{#2#3}]%
+ \@nameauth@Index{\Surnames\Space#3}[\@nameauth@CleanName{#2#3}!TAG!]%
\fi%
\fi%
\else%
@@ -729,10 +737,11 @@
\PackageWarning{nameauth}%
{macro \IndexName: XRef: #1 #2 exists.}%
\else%
- \ifx\Suffix\@empty \@nameauth@Index{\Short, #1}[\@nameauth@CleanName{#1#2}]%
- \else \@nameauth@Index{\Short, #1, \Suffix}[\@nameauth@CleanName{#1#2}]\fi%
+ \ifx\Suffix\@empty \@nameauth@Index{\Short, #1}[\@nameauth@CleanName{#1#2}!TAG!]%
+ \else \@nameauth@Index{\Short, #1, \Suffix}[\@nameauth@CleanName{#1#2}!TAG!]\fi%
\fi%
\fi%
+ \@nameauth@ShowCommafalse%
}
\newcommandx\ExcludeName[3][1=\@empty, 3=\@empty]%
{%
@@ -795,15 +804,15 @@
\protected@edef\testiii{#3}%
\ifx\testi\@empty%
\ifx\testiii\@empty%
- \csundef{\@nameauth@CleanName{#2!MN!}}%
- \csundef{\@nameauth@CleanName{#2!NF!}}%
+ \global\csundef{\@nameauth@CleanName{#2!MN!}}%
+ \global\csundef{\@nameauth@CleanName{#2!NF!}}%
\else%
- \csundef{\@nameauth@CleanName{#2#3!MN!}}%
- \csundef{\@nameauth@CleanName{#2#3!NF!}}%
+ \global\csundef{\@nameauth@CleanName{#2#3!MN!}}%
+ \global\csundef{\@nameauth@CleanName{#2#3!NF!}}%
\fi%
\else%
- \csundef{\@nameauth@CleanName{#1#2!MN!}}%
- \csundef{\@nameauth@CleanName{#1#2!NF!}}%
+ \global\csundef{\@nameauth@CleanName{#1#2!MN!}}%
+ \global\csundef{\@nameauth@CleanName{#1#2!NF!}}%
\fi%
}
\newcommandx\SubvertName[3][1=\@empty, 3=\@empty]%
@@ -823,16 +832,6 @@
\csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
\fi%
}
-\newcommand{\NamesInactive}{\@nameauth@DoFormatfalse}
-\newcommand{\NamesActive}{\@nameauth@DoFormattrue}
-\newcommand{\AllCapsInactive}{\@nameauth@AllCapsfalse}
-\newcommand{\AllCapsActive}{\@nameauth@AllCapstrue}
-\newcommand{\ReverseInactive}{\@nameauth@RevAllfalse}
-\newcommand{\ReverseActive}{\@nameauth@RevAlltrue}
-\newcommand{\ReverseCommaInactive}{\@nameauth@RevAllfalse\@nameauth@RevAllCommafalse}
-\newcommand{\ReverseCommaActive}{\@nameauth@RevAlltrue\@nameauth@RevAllCommatrue}
-\newcommand{\IndexInactive}{\@nameauth@DoIndexfalse}
-\newcommand{\IndexActive}{\@nameauth@DoIndextrue}
\newenvironment{nameauth}{%
\begingroup%
\csdef{<}##1&##2&##3&##4>{%
@@ -874,6 +873,18 @@
\ignorespaces%
}%
}{\endgroup}
+\newcommand{\NamesInactive}{\@nameauth@DoFormatfalse}
+\newcommand{\NamesActive}{\@nameauth@DoFormattrue}
+\newcommand{\AllCapsInactive}{\@nameauth@AllCapsfalse}
+\newcommand{\AllCapsActive}{\@nameauth@AllCapstrue}
+\newcommand{\ReverseInactive}{\@nameauth@RevAllfalse}
+\newcommand{\ReverseActive}{\@nameauth@RevAlltrue}
+\newcommand{\ReverseCommaInactive}%
+ {\@nameauth@RevAllfalse\@nameauth@RevAllCommafalse}
+\newcommand{\ReverseCommaActive}%
+ {\@nameauth@RevAlltrue\@nameauth@RevAllCommatrue}
+\newcommand{\IndexInactive}{\@nameauth@DoIndexfalse}
+\newcommand{\IndexActive}{\@nameauth@DoIndextrue}
\endinput
%%
%% End of file `nameauth.sty'.