summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/nameauth
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-02-24 22:51:17 +0000
committerKarl Berry <karl@freefriends.org>2013-02-24 22:51:17 +0000
commita3c0a64b48a59420321a3e0f3279daf232b2bcc5 (patch)
tree01e21754afc0dbcc2f767d952b8a27fb57afe2b8 /Master/texmf-dist/tex/latex/nameauth
parent0e16fa40de31459f0f77644759dcd836108c9590 (diff)
nameauth (24feb13)
git-svn-id: svn://tug.org/texlive/trunk@29219 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/nameauth')
-rw-r--r--Master/texmf-dist/tex/latex/nameauth/nameauth.sty322
1 files changed, 248 insertions, 74 deletions
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 333ac40c544..1f5ab08ee4e 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/07/24 v1.4 name authority macros to aid consistent display and indexing of names]
+ [2013/02/22 v1.5 name authority macros to aid consistent display and indexing of names]
\newif\if@nameauth@FullName
@@ -35,6 +35,12 @@
\newif\if@nameauth@Comma
\newif\if@nameauth@Punct
\newif\if@nameauth@DoCaps
+\newif\if@nameauth@AllCaps
+\newif\if@nameauth@AllThis
+\newif\if@nameauth@RevAll
+\newif\if@nameauth@RevThis
+\newif\if@nameauth@RevAllComma
+\newif\if@nameauth@RevThisComma
\DeclareOption{mainmatter}{\@nameauth@DoFormattrue}
\DeclareOption{frontmatter}{\@nameauth@DoFormatfalse}
\DeclareOption{smallcaps}{\newcommand{\NamesFormat}{\scshape}}
@@ -42,13 +48,19 @@
\DeclareOption{boldface}{\renewcommand{\NamesFormat}{\bfseries}}
\DeclareOption{noformat}{\renewcommand{\NamesFormat}{}}
\DeclareOption{alwaysformat}{\@nameauth@AlwaysFormattrue}
+\DeclareOption{allcaps}{\@nameauth@AllCapstrue}
+\DeclareOption{normalcaps}{\@nameauth@AllCapsfalse}
+\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{index}{\@nameauth@DoIndextrue}
\DeclareOption{noindex}{\@nameauth@DoIndexfalse}
-\ExecuteOptions{smallcaps,mainmatter,nocomma,index}
+\ExecuteOptions{nocomma,mainmatter,index,normalcaps,notreversed,smallcaps}
\ProcessOptions\relax
\RequirePackage{etoolbox}
+\RequirePackage{trimspaces}
\RequirePackage{suffix}
\RequirePackage{xargs}
\newcommand*{\@nameauth@CleanName}[1]%
@@ -65,11 +77,15 @@
\@nameauth@CR#1\relax%
}
\def\@nameauth@CR#1#2\relax{\uppercase{#1}\@nameauth@Root{#2}}
+\newcommand*{\@nameauth@AllCapRoot}[1]%
+{%
+ \uppercase{\@nameauth@Root{#1}}%
+}
\newcommand*{\@nameauth@Suffix}[1]%
{%
\@nameauth@TrimSuffix#1\relax%
}
-\def\@nameauth@TrimSuffix#1,#2\relax{#2}
+\def\@nameauth@TrimSuffix#1,#2\relax{\trim@spaces{#2}}
\def\@nameauth@CheckDot{\futurelet\@token\@nameauth@EvalDot}
\def\@nameauth@EvalDot%
{%
@@ -121,46 +137,88 @@
{%
\@nameauth@DoCapstrue%
}
+\newcommand{\CapName}%
+{%
+ \@nameauth@AllThistrue%
+}
+\newcommand{\RevName}%
+{%
+ \@nameauth@RevThistrue%
+}
+\newcommand{\RevComma}%
+{%
+ \@nameauth@RevThistrue%
+ \@nameauth@RevThisCommatrue%
+}
\newcommand{\ShowComma}%
{%
\@nameauth@ShowCommatrue%
}
\newcommandx\Name[3][1=\@empty, 3=\@empty]%
{%
+ \leavevmode\hbox{}%
\protected@edef\testi{#1}%
+ \protected@edef\testii{#2}%
\protected@edef\testiii{#3}%
- \leavevmode\hbox{}%
+ \if@nameauth@AllCaps\CapName\fi%
+ \if@nameauth@RevAll\RevName\fi%
+ \if@nameauth@RevAllComma\RevComma\fi%
\if@nameauth@ShowComma%
\protected@edef\Space{,\space}%
\else%
\let\Space\Interspace%
\fi%
- \protected@edef\RawSurnames{#2}%
\protected@edef\RawShort{\@nameauth@Root{#2}}%
\protected@edef\CapShort{\@nameauth@CapRoot{#2}}%
+ \protected@edef\AllCapShort{\@nameauth@AllCapRoot{#2}}%
\let\IndexShort\RawShort%
- \let\IndexSurnames\RawShort%
- \ifx\RawSurnames\RawShort%
+ \ifx\testii\RawShort%
\protected@edef\Suffix{\@empty}%
+ \let\IndexSurnames\RawShort%
+ \let\Reversed\RawShort%
+ \let\Surnames\RawShort%
+ \let\PrintShort\RawShort%
\if@nameauth@DoCaps%
+ \let\Reversed\CapShort%
\let\Surnames\CapShort%
\let\PrintShort\CapShort%
- \else%
- \let\Surnames\RawShort%
- \let\PrintShort\RawShort%
+ \fi%
+ \if@nameauth@AllThis%
+ \let\Reversed\AllCapShort%
+ \let\Surnames\AllCapShort%
+ \let\PrintShort\AllCapShort%
\fi%
\else%
- \protected@edef\Suffix{\ignorespaces\@nameauth@Suffix{#2}}%
+ \protected@edef\Suffix{\@nameauth@Suffix{#2}}%
\protected@edef\IndexSurnames{\RawShort\Space\Suffix}%
- \if@nameauth@DoCaps%
- \protected@edef\Surnames{\CapShort\Space\Suffix}%
- \let\PrintShort\CapShort%
+ \protected@edef\Reversed{\Suffix\Space\RawShort}%
+ \protected@edef\Surnames{\RawShort\Space\Suffix}%
+ \if@nameauth@RevThis%
+ \let\PrintShort\Suffix%
\else%
- \protected@edef\Surnames{\RawShort\Space\Suffix}%
\let\PrintShort\RawShort%
\fi%
+ \if@nameauth@DoCaps%
+ \protected@edef\Reversed{\Suffix\Space\CapShort}%
+ \protected@edef\Surnames{\CapShort\Space\Suffix}%
+ \if@nameauth@RevThis%
+ \let\PrintShort\Suffix%
+ \else%
+ \let\PrintShort\CapShort%
+ \fi%
+ \fi%
+ \if@nameauth@AllThis%
+ \protected@edef\Reversed{\Suffix\Space\AllCapShort}%
+ \protected@edef\Surnames{\AllCapShort\Space\Suffix}%
+ \if@nameauth@RevThis%
+ \let\PrintShort\Suffix%
+ \else%
+ \let\PrintShort\AllCapShort%
+ \fi%
+ \fi%
\fi%
\@nameauth@DoCapsfalse%
+ \@nameauth@AllThisfalse%
\@nameauth@ShowCommafalse%
\ifx\testi\@empty%
\ifx\testiii\@empty%
@@ -178,7 +236,11 @@
\fi%
\if@nameauth@FullName%
\@nameauth@FullNamefalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Reversed}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnames}%
+ \fi%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
\fi%
@@ -186,7 +248,11 @@
\@nameauth@FullNamefalse%
\@nameauth@FirstNamefalse%
\csgdef{\@nameauth@CleanName{#2!MN!}}{}%
- \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter{\Reversed}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter{\Surnames}%
+ \fi%
\fi%
\else%
\ifcsname\@nameauth@CleanName{#2!NF!}\endcsname%
@@ -196,7 +262,11 @@
\fi%
\if@nameauth@FullName%
\@nameauth@FullNamefalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Reversed}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnames}%
+ \fi%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
\fi%
@@ -204,7 +274,11 @@
\@nameauth@FullNamefalse%
\@nameauth@FirstNamefalse%
\csgdef{\@nameauth@CleanName{#2!NF!}}{}%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Reversed}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnames}%
+ \fi%
\fi%
\fi%
\else%
@@ -222,17 +296,31 @@
\fi%
\if@nameauth@FullName%
\@nameauth@FullNamefalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Surnames\expandafter\space#3}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\testiii\expandafter\space\Surnames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnames\expandafter\space#3}%
+ \fi%
\else%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\testiii}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
+ \fi%
\fi%
\else%
\@nameauth@FullNamefalse%
\@nameauth@FirstNamefalse%
\csgdef{\@nameauth@CleanName{#2#3!MN!}}{}%
- \expandafter\@nameauth@FmtName\expandafter{%
- \expandafter\Surnames\expandafter\space#3}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter{%
+ \expandafter\testiii\expandafter\space\Surnames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter{%
+ \expandafter\Surnames\expandafter\space#3}%
+ \fi%
\fi%
\else%
\ifcsname\@nameauth@CleanName{#2#3!NF!}\endcsname%
@@ -242,21 +330,40 @@
\fi%
\if@nameauth@FullName%
\@nameauth@FullNamefalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Surnames\expandafter\space#3}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\testiii\expandafter\space\Surnames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnames\expandafter\space#3}%
+ \fi%
\else%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\testiii}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
+ \fi%
\fi%
\else%
\@nameauth@FullNamefalse%
\@nameauth@FirstNamefalse%
\csgdef{\@nameauth@CleanName{#2#3!NF!}}{}%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Surnames\expandafter\space#3}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\testiii\expandafter\space\Surnames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnames\expandafter\space#3}%
+ \fi%
\fi%
\fi%
\fi%
\else%
+ \if@nameauth@RevThisComma%
+ \protected@edef\Space{,\space}%
+ \else%
+ \let\Space\Interspace%
+ \fi%
\ifx\testiii\@empty%
\protected@edef\Forenames{#1}%
\else%
@@ -281,8 +388,13 @@
\fi%
\if@nameauth@FullName%
\@nameauth@FullNamefalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Forenames\expandafter\space\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnames\expandafter\Space\Forenames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Forenames\expandafter\space\Surnames}%
+ \fi%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
\fi%
@@ -290,8 +402,13 @@
\@nameauth@FullNamefalse%
\@nameauth@FirstNamefalse%
\csgdef{\@nameauth@CleanName{#1#2!MN!}}{}%
- \expandafter\@nameauth@FmtName\expandafter{%
- \expandafter\Forenames\expandafter\space\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter{%
+ \expandafter\Surnames\expandafter\Space\Forenames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter{%
+ \expandafter\Forenames\expandafter\space\Surnames}%
+ \fi%
\fi%
\else%
\ifcsname\@nameauth@CleanName{#1#2!NF!}\endcsname%
@@ -302,8 +419,13 @@
\fi%
\if@nameauth@FullName%
\@nameauth@FullNamefalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Forenames\expandafter\space\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnames\expandafter\Space\Forenames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Forenames\expandafter\space\Surnames}%
+ \fi%
\else%
\expandafter\@nameauth@FmtName\expandafter*\expandafter{\PrintShort}%
\fi%
@@ -311,11 +433,18 @@
\@nameauth@FullNamefalse%
\@nameauth@FirstNamefalse%
\csgdef{\@nameauth@CleanName{#1#2!NF!}}{}%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Forenames\expandafter\space\Surnames}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnames\expandafter\Space\Forenames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Forenames\expandafter\space\Surnames}%
+ \fi%
\fi%
\fi%
\fi%
+ \@nameauth@RevThisfalse%
+ \@nameauth@RevThisCommafalse%
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
}
\WithSuffix\newcommandx\Name*[3][1=\@empty, 3=\@empty]%
@@ -335,34 +464,40 @@
}
\newcommandx\AKA[5][1=\@empty, 3=\@empty, 5=\@empty]%
{%
+ \leavevmode\hbox{}%
\protected@edef\testi{#1}%
+ \protected@edef\testii{#2}%
\protected@edef\testiii{#3}%
+ \protected@edef\testiv{#4}%
\protected@edef\testv{#5}%
- \leavevmode\hbox{}%
+ \if@nameauth@AllCaps\CapName\fi%
+ \if@nameauth@RevAll\RevName\fi%
+ \if@nameauth@RevAll\RevComma\fi%
\if@nameauth@ShowComma%
\protected@edef\Space{,\space}%
\else%
\let\Space\Interspace%
\fi%
- \protected@edef\RawSurnamesi{#2}%
- \protected@edef\RawSurnamesii{#4}%
- \protected@edef\Shorti{\@nameauth@Root{#2}}%
- \protected@edef\Shortii{\@nameauth@Root{#4}}%
- \ifx\RawSurnamesi\Shorti%
- \let\Surnamesi\Shorti%
- \protected@edef\Suffixi{\@empty}%
- \else%
- \protected@edef\Suffixi{\ignorespaces\@nameauth@Suffix{#2}}%
- \protected@edef\Surnamesi{\Shorti\Space\Suffixi}%
- \fi%
- \ifx\RawSurnamesii\Shortii%
+ \protected@edef\Shortii{\@nameauth@Root{#2}}%
+ \protected@edef\Shortiv{\@nameauth@Root{#4}}%
+ \ifx\testii\Shortii%
\let\Surnamesii\Shortii%
\protected@edef\Suffixii{\@empty}%
\else%
- \protected@edef\Suffixii{\ignorespaces\@nameauth@Suffix{#4}}%
+ \protected@edef\Suffixii{\@nameauth@Suffix{#2}}%
\protected@edef\Surnamesii{\Shortii\Space\Suffixii}%
\fi%
+ \ifx\testiv\Shortiv%
+ \protected@edef\Suffixiv{\@empty}%
+ \let\Surnamesiv\Shortiv%
+ \let\Reverseiv\Shortiv%
+ \else%
+ \protected@edef\Suffixiv{\@nameauth@Suffix{#4}}%
+ \protected@edef\Surnamesiv{\Shortiv\Space\Suffixiv}%
+ \protected@edef\Reverseiv{\Suffixiv\Space\Shortiv}%
+ \fi%
\@nameauth@ShowCommafalse%
+ \@nameauth@AllThisfalse%
\ifx\testiii\@empty%
\ifx\testv\@empty%
\ifcsname\@nameauth@CleanName{#4!PN!}\endcsname%
@@ -379,16 +514,25 @@
\else%
\csgdef{\@nameauth@CleanName{#4!PN!}}{}%
\ifx\testi\@empty%
- \@nameauth@Index{\Surnamesii|see{\Surnamesi}}%
+ \@nameauth@Index{\Surnamesiv|see{\Surnamesii}}%
\else%
- \ifx\Suffixi\@empty \@nameauth@Index{\Surnamesii|see{\Surnamesi, #1}}%
- \else\@nameauth@Index{\Surnamesii|see{\Shorti, #1, \Suffixi}}\fi%
+ \ifx\Suffixii\@empty \@nameauth@Index{\Surnamesiv|see{\Surnamesii, #1}}%
+ \else\@nameauth@Index{\Surnamesiv|see{\Shortii, #1, \Suffixii}}\fi%
\fi%
\fi%
\fi%
\fi%
\@nameauth@AltAKAfalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii}%
+ \if@nameauth@RevThisComma%
+ \protected@edef\Space{,\space}%
+ \else%
+ \let\Space\Interspace%
+ \fi%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Reverseiv}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesiv}%
+ \fi%
\else%
\ifcsname\@nameauth@CleanName{#4#5!PN!}\endcsname%
\PackageWarning{nameauth}%
@@ -404,20 +548,32 @@
\else%
\csgdef{\@nameauth@CleanName{#4#5!PN!}}{}%
\ifx\testi\@empty%
- \@nameauth@Index{\Surnamesii\space#5|see{\Surnamesi}}%
+ \@nameauth@Index{\Surnamesiv\space#5|see{\Surnamesii}}%
\else%
- \ifx\Suffixi\@empty \@nameauth@Index{\Surnamesii\space#5|see{\Surnamesi, #1}}%
- \else\@nameauth@Index{\Surnamesii\space#5|see{\Shorti, #1, \Suffixi}}\fi%
+ \ifx\Suffixii\@empty \@nameauth@Index{\Surnamesiv\space#5|see{\Surnamesii, #1}}%
+ \else\@nameauth@Index{\Surnamesiv\space#5|see{\Shortii, #1, \Suffixii}}\fi%
\fi%
\fi%
\fi%
\fi%
+ \if@nameauth@RevThisComma%
+ \protected@edef\Space{,\space}%
+ \else%
+ \let\Space\Interspace%
+ \fi%
\if@nameauth@AltAKA%
\@nameauth@AltAKAfalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{#5}%
+ \if@nameauth@RevThis%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\testv}%
+ \fi%
\else%
\@nameauth@AltAKAfalse%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{\Surnamesii\space#5}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\expandafter\testv\expandafter\Space\Surnamesiv}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{\expandafter\Surnamesiv\expandafter\space\testv}%
+ \fi%
\fi%
\fi%
\else%
@@ -435,20 +591,20 @@
\else%
\csgdef{\@nameauth@CleanName{#3#4!PN!}}{}%
\ifx\testi\@empty%
- \ifx\Suffixii\@empty \@nameauth@Index{\Surnamesii, #3|see{\Surnamesi}}%
- \else\@nameauth@Index{\Shortii, #3, \Suffixii|see{\Surnamesi}}\fi%
+ \ifx\Suffixiv\@empty \@nameauth@Index{\Surnamesiv, #3|see{\Surnamesii}}%
+ \else\@nameauth@Index{\Shortiv, #3, \Suffixiv|see{\Surnamesii}}\fi%
\else%
- \ifx\Suffixi\@empty%
- \ifx\Suffixii\@empty%
- \@nameauth@Index{\Surnamesii, #3|see{\Surnamesi, #1}}%
+ \ifx\Suffixii\@empty%
+ \ifx\Suffixiv\@empty%
+ \@nameauth@Index{\Surnamesiv, #3|see{\Surnamesii, #1}}%
\else%
- \@nameauth@Index{\Shortii, #3, \Suffixii|see{\Surnamesi, #1}}%
+ \@nameauth@Index{\Shortiv, #3, \Suffixiv|see{\Surnamesii, #1}}%
\fi%
\else%
- \ifx\Suffixii\@empty%
- \@nameauth@Index{\Surnamesii, #3|see{\Shorti, #1, \Suffixi}}%
+ \ifx\Suffixiv\@empty%
+ \@nameauth@Index{\Surnamesiv, #3|see{\Shortii, #1, \Suffixii}}%
\else%
- \@nameauth@Index{\Shortii, #3, \Suffixii|see{\Shorti, #1, \Suffixi}}%
+ \@nameauth@Index{\Shortiv, #3, \Suffixiv|see{\Shortii, #1, \Suffixii}}%
\fi%
\fi%
\fi%
@@ -456,14 +612,26 @@
\fi%
\fi%
\@nameauth@AltAKAfalse%
+ \if@nameauth@RevThisComma%
+ \protected@edef\Space{,\space}%
+ \else%
+ \let\Space\Interspace%
+ \fi%
\ifx\testv\@empty%
\protected@edef\Forenames{#3}%
\else%
\protected@edef\Forenames{#5}%
\fi%
- \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
- \expandafter\Forenames\expandafter\space\Surnamesii}%
+ \if@nameauth@RevThis%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Surnamesiv\expandafter\Space\Forenames}%
+ \else%
+ \expandafter\@nameauth@FmtName\expandafter*\expandafter{%
+ \expandafter\Forenames\expandafter\space\Surnamesiv}%
+ \fi%
\fi%
+ \@nameauth@RevThisfalse%
+ \@nameauth@RevThisCommafalse%
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi%
}
\WithSuffix\newcommandx\AKA*[5][1=\@empty,3=\@empty,5=\@empty]%
@@ -525,19 +693,19 @@
\newcommandx\IndexName[3][1=\@empty, 3=\@empty]%
{%
\protected@edef\testi{#1}%
+ \protected@edef\testii{#2}%
\protected@edef\testiii{#3}%
\if@nameauth@ShowComma%
\protected@edef\Space{,\space}%
\else%
\let\Space\Interspace%
\fi%
- \protected@edef\RawSurnames{#2}%
\protected@edef\Short{\@nameauth@Root{#2}}%
- \ifx\RawSurnames\Short%
+ \ifx\testii\Short%
\let\Surnames\Short%
\protected@edef\Suffix{\@empty}%
\else%
- \protected@edef\Suffix{\ignorespaces\@nameauth@Suffix{#2}}%
+ \protected@edef\Suffix{\@nameauth@Suffix{#2}}%
\protected@edef\Surnames{\Short\Space\Suffix}%
\fi%
\@nameauth@ShowCommafalse%
@@ -658,6 +826,12 @@
}
\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