summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/apa7
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-18 21:43:54 +0000
committerKarl Berry <karl@freefriends.org>2020-07-18 21:43:54 +0000
commita91a56bce2e7db1918095a483776775006a13277 (patch)
treec60717136b08a4a3df1bf32652108702ccea054f /Master/texmf-dist/tex/latex/apa7
parent9900462a3a1dfa8c04dc46006a2f2145e92840e5 (diff)
apa7 (18jul20)
git-svn-id: svn://tug.org/texlive/trunk@55868 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/apa7')
-rw-r--r--Master/texmf-dist/tex/latex/apa7/apa7.cls458
1 files changed, 155 insertions, 303 deletions
diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls
index 56db33d55ff..8a614c0ca22 100644
--- a/Master/texmf-dist/tex/latex/apa7/apa7.cls
+++ b/Master/texmf-dist/tex/latex/apa7/apa7.cls
@@ -27,7 +27,7 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesClass{apa7}[2020/06/19 v1.09 APA formatting (7th edition)]
+\ProvidesClass{apa7}[2020/07/18 v2.01 APA formatting (7th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -759,42 +759,24 @@
\long\def\title#1{\long\def\@title{#1}}
-\long\def\author#1{\long\def\@author{#1}}
+\long\def\author#1{\authorsnames{#1}}
+\long\def\affiliation#1{\ClassWarning{apa7}{Deprecated: see documentation for \string\authorsaffiliations}\authorsaffiliations{#1}}
+\long\def\twoauthors#1#2{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\threeauthors#1#2#3{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\onetwoauthors#1#2#3{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\twooneauthors#1#2#3{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\fourauthors#1#2#3#4{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\fiveauthors#1#2#3#4#5{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\sixauthors#1#2#3#4#5#6{\ClassError{apa7}{Deprecated: see documentation for \string\authorsnames}{For multiple authors use \string\authorsnames}}
+\long\def\twoaffiliations#1#2{\ClassError{apa7}{Deprecated: see documentation for \string\authorsaffiliations}{For multiple affiliations use \string\authorsaffiliations}}
+\long\def\threeaffiliations#1#2#3{\ClassError{apa7}{Deprecated: see documentation for \string\authorsaffiliations}{For multiple affiliations use \string\authorsaffiliations}}
+\long\def\fouraffiliations#1#2#3#4{\ClassError{apa7}{Deprecated: see documentation for \string\authorsaffiliations}{For multiple affiliations use \string\authorsaffiliations}}
+\long\def\fiveaffiliations#1#2#3#4#5{\ClassError{apa7}{Deprecated: see documentation for \string\authorsaffiliations}{For multiple affiliations use \string\authorsaffiliations}}
+\long\def\sixaffiliations#1#2#3#4#5#6{\ClassError{apa7}{Deprecated: see documentation for \string\authorsaffiliations}{For multiple affiliations use \string\authorsaffiliations}}
\long\def\course#1{\long\def\@course{#1}}
\long\def\professor#1{\long\def\@professor{#1}}
\long\def\duedate#1{\long\def\@duedate{#1}}
\long\def\shorttitle#1{\long\def\@shorttitle{#1}}
-\long\def\twoauthors#1#2{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%
- \long\def\@author{#1}}
-\long\def\onetwoauthors#1#2#3{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%
- \long\def\@authorThree{#3}\long\def\@author{#1}}
-\long\def\twooneauthors#1#2#3{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%
- \long\def\@authorThree{#3}\long\def\@author{#1}\def\@twofirst{1}}
-\let\threeauthors=\onetwoauthors
-\long\def\fourauthors#1#2#3#4{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%
- \long\def\@authorThree{#3}\long\def\@authorFour{#4}\long\def\@author{#1}}
-\long\def\fiveauthors#1#2#3#4#5{\long\def\@authorOne{#1}\long\def\@authorTwo{#2}%%%%
- \long\def\@authorThree{#3}\long\def\@authorFour{#4}\long\def\@authorFive{#5}% %%
- \long\def\@author{#1}} %% 2006/01/05 -- added as contributed by Aaron Geller %%
-\long\def\sixauthors#1#2#3#4#5#6{\long\def\@authorOne{#1}% %% thp 2006/01/05
- \long\def\@authorTwo{#2}\long\def\@authorThree{#3}\long\def\@authorFour{#4}%% thp 2006/01/05
- \long\def\@authorFive{#5}\long\def\@authorSix{#6}\long\def\@author{#1}} %% thp 2006/01/05
-\long\def\affiliation#1{\long\def\@affil{#1}}
-\long\def\twoaffiliations#1#2{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%
-\long\def\@affil{#1}}
-\long\def\onetwoaffiliations#1#2#3{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%
- \long\def\@affilThree{#3}\long\def\@affil{#1}}
-\long\def\twooneaffiliations#1#2#3{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%
- \long\def\@affilThree{#3}\long\def\@affil{#1}}
-\let\threeaffiliations=\onetwoaffiliations
-\long\def\fouraffiliations#1#2#3#4{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%
- \long\def\@affilThree{#3}\long\def\@affilFour{#4}\long\def\@affil{#1}}
-\long\def\fiveaffiliations#1#2#3#4#5{\long\def\@affilOne{#1}\long\def\@affilTwo{#2}%%
- \long\def\@affilThree{#3}\long\def\@affilFour{#4}\long\def\@affilFive{#5}% %%
- \long\def\@affil{#1}} %% 2006/01/05 -- added as contributed by Aaron Geller %%
-\long\def\sixaffiliations#1#2#3#4#5#6{\long\def\@affilOne{#1}% %% thp 2006/01/05
- \long\def\@affilTwo{#2}\long\def\@affilThree{#3}\long\def\@affilFour{#4}%% thp 2006/01/05
- \long\def\@affilFive{#5}\long\def\@affilSix{#6}\long\def\@affil{#1}} %% thp 2006/01/05
\long\def\note#1{\long\def\@note{#1}}
\long\def\abstract#1{\long\def\@abstract{#1}}
\long\def\keywords#1{\long\def\@keywords{#1}}
@@ -803,52 +785,144 @@
\def\volume#1{\def\@vvolume{#1}}
\def\ccoppy#1{\def\@ccoppy{#1}}
\def\copnum#1{\def\@copnum{#1}}
-\def\@error@toomanyauthors{\ClassWarningNoLine{apa7}{More authors than affiliations defined}}
-\def\@error@toomanyaffils{\ClassWarningNoLine{apa7}{More affiliations than authors defined}}
+
+
+\newcommand*\listauthors{}
+\newcommand*\listsuperscripts{}
+\newcommand*\listaffiliations{}
+
+\newcommand*{\authorsnames}[2][]{
+ \def\def@multipleauthors{\@multipleauthorsmode} %
+ \renewcommand*\listauthors{}
+ \renewcommand*\listsuperscripts{}
+ \newcounter{NumberOfAuthors}
+ \newcounter{NumberOfSuperscripts}
+ \forcsvlist{\stepcounter{NumberOfAuthors}\listadd\listauthors}{#2}
+ \forcsvlist{\stepcounter{NumberOfSuperscripts}\listadd\listsuperscripts}{#1}
+ }
+
+ \newcommand*{\authorsaffiliations}[1]{
+ \def\def@multipleaffils{\@multipleaffilsmode} %
+ \renewcommand*\listaffiliations{}
+ \newcounter{NumberOfAffiliations}
+ \forcsvlist{\stepcounter{NumberOfAffiliations}\listadd\listaffiliations}{#1}
+ }
+
+\makeatletter
+ \catcode`\|=3
+
+\def\looptwo#1#2{%
+ \edef\tmp{\noexpand\xtwo%
+ \unexpanded\expandafter{#1}\relax % no added delimiter here
+ \unexpanded\expandafter{#2}\relax % no added delimiter here
+ } \tmp%
+ }%
+
+\def\xtwo#1|#2\relax#3|#4\relax{%
+ \dotwo{#1}{#3}%
+ \def\tmp{#2}%
+ \ifx\empty\tmp%
+ \expandafter\@gobble%
+ \else%
+ \expandafter\@firstofone%
+ \fi%
+ {\xtwo#2\relax#4\relax}%
+ }%
+
+ \catcode`\|=12
+\makeatother
+
+\newcommand*{\dotwo}[2]{}
+
+\newcommand*{\authorsep}{}%
+\newcommand*{\lastauthor}{}%
+\newcommand*{\prelastauthor}{}%
+\newcommand*{\prelastauthorsep}{}%
+
+\newcommand{\displayauthors}{%
+ \renewcommand*{\authorsep}{}%
+ \renewcommand*{\lastauthor}{}%
+ \renewcommand*{\prelastauthor}{}%
+ \renewcommand*{\prelastauthorsep}{}%
+ \ifnum\value{NumberOfSuperscripts}=0% If no superscripts are specified, print authors without superscripts.
+\renewcommand*{\do}[1]{%
+ \authorsep%
+ \lastauthor%
+ \renewcommand{\lastauthor}{%
+ \renewcommand{\authorsep}{,
+ \renewcommand*{\prelastauthorsep}{,}}%
+ \renewcommand{\prelastauthor}{\prelastauthorsep\ and }%
+ ##1%
+ }%
+ }%
+ \dolistloop{\listauthors}%
+ \else
+ \renewcommand*{\dotwo}[2]{%
+ \authorsep%
+ \lastauthor%
+ \renewcommand{\lastauthor}{%
+ \renewcommand{\authorsep}{,
+ \renewcommand*{\prelastauthorsep}{,}}%
+ \renewcommand{\prelastauthor}{\prelastauthorsep\ and }%
+ ##1\textsuperscript{##2}%
+ }%
+ }%
+ \looptwo\listauthors\listsuperscripts%
+ \fi
+ \prelastauthor \lastauthor%
+}
+
+\newcommand{\displayaffiliations}{%
+ \ifnum\value{NumberOfSuperscripts}=0% If no superscripts are specified, print affiliations without superscripts.
+ \renewcommand*{\do}[1]{%
+ ##1\\%
+ }%
+ \else
+ \newcounter{AffiliationNumber}
+ \renewcommand*{\do}[1]{%
+ \stepcounter{AffiliationNumber}
+ \textsuperscript{\arabic{AffiliationNumber}}##1\\%
+ }%
+ \fi
+ \dolistloop{\listaffiliations}%
+}
+
+\makeatletter
+
\def\check@author{%
- \@ifundefined{@author}{%
- \ClassWarningNoLine{apa7}{Author not defined}\def\@author{Author}}{}
+ \@ifundefined{def@multipleauthors}{%
+ \ClassWarningNoLine{apa7}{Author not defined}\authorsnames{Author}}{}
\@ifundefined{@title}{%
\ClassWarningNoLine{apa7}{Title not defined}\def\@title{Title}}{}
- \@ifundefined{@affil}{%
- \ClassWarningNoLine{apa7}{Affiliation not defined}\def\@affil{Affiliation}}{}
- \@ifundefined{def@stu}{%
+ \@ifundefined{def@multipleaffils}{%
+ \ClassWarningNoLine{apa7}{Affiliation not defined}\authorsaffiliations{Affiliation}}{}
+ \@ifundefined{def@stu}{% man mode
\@ifundefined{@shorttitle}{%
\ClassWarningNoLine{apa7}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
\@ifundefined{@abstract}{%
\ClassWarningNoLine{apa7}{Abstract not defined}}{}
\@ifundefined{@keywords}{%
\ClassInfo{apa7}{Keywords not defined}}{}
- }{
+ }{ % stu mode
\@ifundefined{@course}{%
- \ClassWarningNoLine{apa7}{Course title not defined}}{}
+ \ClassWarningNoLine{apa7}{Course title not defined}\def\@course{Course Title}}{}
\@ifundefined{@professor}{%
- \ClassWarningNoLine{apa7}{Professor not defined}}{}
+ \ClassWarningNoLine{apa7}{Professor not defined}\def\@professor{Professor Name}}{}
\@ifundefined{@duedate}{%
- \ClassInfo{apa7}{Due date not defined}}{}
+ \ClassWarningNoLine{apa7}{Due date not defined}\def\@duedate{Due Date}}{}
\@ifundefined{@shorttitle}{%
- \def\@shorttitle{}}{}
+ \def\@shorttitle{}}{}%
}
- \@ifundefined{@authorSix}{% % -- thp 2006/01/05
- \@ifundefined{@authorFive}{% % -- thp 2006/01/05
- \@ifundefined{@authorFour}{%
- \@ifundefined{@authorThree}{%
- \@ifundefined{@authorTwo}{%
- }{\@ifundefined{@affilTwo}{\@error@toomanyauthors}{}}
- }{\@ifundefined{@affilThree}{\@error@toomanyauthors}{}}
- }{\@ifundefined{@affilFour}{\@error@toomanyauthors}{}}
- }{\@ifundefined{@affilFive}{\@error@toomanyauthors}{}} % -- thp 2006/01/05
- }{\@ifundefined{@affilSix}{\@error@toomanyauthors}{}} % -- thp 2006/01/05
- \@ifundefined{@affilSix}{% % -- thp 2006/01/05
- \@ifundefined{@affilFive}{% % -- thp 2006/01/05
- \@ifundefined{@affilFour}{%
- \@ifundefined{@affilThree}{%
- \@ifundefined{@affilTwo}{%
- }{\@ifundefined{@authorTwo}{\@error@toomanyaffils}{}}
- }{\@ifundefined{@authorThree}{\@error@toomanyaffils}{}}
- }{\@ifundefined{@authorFour}{\@error@toomanyaffils}{}}
- }{\@ifundefined{@authorFive}{\@error@toomanyaffils}{}} % -- thp 2006/01/05
- }{\@ifundefined{@authorSix}{\@error@toomanyaffils}{}} % -- thp 2006/01/05
+ \@ifundefined{def@multipleauthors}{}{%
+ \ifnum\value{NumberOfSuperscripts}=0%
+ % do nothing. If no superscripts are specified, print authors and affiliations without superscripts.
+ \else \ifnum\value{NumberOfAuthors}=\value{NumberOfSuperscripts}%
+ % do nothing
+ \else
+ \ClassError{apa7}{Number of Authors does not match number of Superscripts}{Please provide an equal number of authors and superscripts.}
+ \fi
+ \fi
+ }%
}
@@ -1165,90 +1239,23 @@
\check@author
\begin{center}
- \vspace*{0.5in}
- \vspace*{1in}
+
+ \vspace*{4\baselineskip}
\textbf\@title%
\ifapamodeman{%
\@ifundefined{def@noextraspace}{%
- \vspace{0.25in}\\
+ \vspace{\baselineskip}\\
}{}
}{%
- \vspace{0.25in}\\
+ \vspace{\baselineskip}\\
}
\@ifundefined{def@stu}{ %Professional manuscript
\@ifundefined{apaSeven@maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- \@author \\
-
- \@affil \vspace{0.25in} \\ }{
- \@ifundefined{@authorThree}{
- \@authorOne \\
-
- \@affilOne \vspace{0.2in} \\
- \@authorTwo \\
-
- \@affilTwo \vspace{0.25in} \\ }{
- \@ifundefined{@authorFour}{
- \@authorOne \\
-
- \@affilOne \vspace{0.2in} \\
- \@authorTwo \\
-
- \@affilTwo \vspace{0.2in} \\
- \@authorThree \\
-
- \@affilThree \vspace{0.25in} \\ }{
- \@ifundefined{@authorFive}{ %% 2006/01/05 added as contributed by Aaron Geller
- \@authorOne \\
-
- \@affilOne \vspace{0.2in} \\
- \@authorTwo \\
-
- \@affilTwo \vspace{0.2in} \\
- \@authorThree \\
-
- \@affilThree \vspace{0.2in} \\
- \@authorFour \\
-
- \@affilFour \vspace{0.25in} \\ }{ %% 2006/01/05 beginning of Aaron Geller contribution
- \@ifundefined{@authorSix}{ %% -- thp 2006/01/05
- \@authorOne \\
-
- \@affilOne \vspace{0.2in} \\
- \@authorTwo \\
+ \displayauthors \\
+ \displayaffiliations
- \@affilTwo \vspace{0.2in} \\
- \@authorThree \\
-
- \@affilThree \vspace{0.2in} \\
- \@authorFour \\
-
- \@affilFour \vspace{0.2in} \\ %% thp corrected distance to non-final value of 0.2in
- \@authorFive \\
-
- \@affilFive \vspace{0.25in} \\ }{%% 2006/01/05 end of Aaaron Geller contribution
- %% --- thp 2006/01/05 beginning of six-author display
- \@authorOne \\
-
- \@affilOne \vspace{0.2in} \\
- \@authorTwo \\
-
- \@affilTwo \vspace{0.2in} \\
- \@authorThree \\
-
- \@affilThree \vspace{0.2in} \\
- \@authorFour \\
-
- \@affilFour \vspace{0.2in} \\
- \@authorFive \\
-
- \@affilFive \vspace{0.2in} \\
- \@authorSix \\
-
- \@affilSix \vspace{0.25in} \\ }}}}}
- %% --- thp 2006/01/05 end of six-author display
\@ifundefined{@note}
{\vspace*{\baselineskip} }
{\@note}
@@ -1270,9 +1277,10 @@
}
}{% mask author identity -- show nothing in the author or author note space
}}{% Student Manuscript
- \@author \\
+ \displayauthors \\
+
+ \displayaffiliations
- \@affil \\
\@course \\
\@professor \\
\@duedate \\
@@ -1376,56 +1384,10 @@
\def\r@headr{\protect\MakeUppercase{\protect\scriptsize\@shorttitle}}% BDB
%%%%%%%%%%%%%%%%%%%%%%%\def\shorttitle#1{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB
-\def\put@one@authaffil#1#2{%
- \parbox[t]{\textwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}}
-
-\newsavebox\auone@box
-\newsavebox\autwo@box
-\newsavebox\autot@box
-\newlength\auone@boxwidth
-\newlength\autwo@boxwidth
-\newlength\autot@boxwidth
-
-\def\default@d@authaffil#1#2#3#4{%
- \parbox[t]{\columnwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}%
- \parbox[t]{\columnwidth}{\begin{center}{\large #3\vspace{0in}}%
- {\\ #4\vspace{0.05in}\\}\end{center}}}
-
-\def\uneven@d@authaffil#1#2#3#4{%
- \hfill\parbox[t]{\auone@boxwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}\hfill\hfill%
- \parbox[t]{\autwo@boxwidth}{\begin{center}{\large #3\vspace{0in}}%
- {\\ #4\vspace{0.05in}\\}\end{center}}\hfill}
-
-\def\put@two@authaffil#1#2#3#4{%
- \let\disp@authaffil\default@d@authaffil
- \sbox\auone@box{\begin{tabular}{c}\large #1\\ #2\end{tabular}}
- \settowidth{\auone@boxwidth}{\usebox\auone@box}
- \sbox\autwo@box{\begin{tabular}{c}\large #3\\ #4\end{tabular}}
- \settowidth{\autwo@boxwidth}{\usebox\autwo@box}
- \ifdim\auone@boxwidth<1.25\columnwidth
- \ifdim\autwo@boxwidth<1.25\columnwidth
- \sbox\autot@box{\usebox\auone@box\hspace{0.4in}\usebox\autwo@box}
- \settowidth{\autot@boxwidth}{\usebox\autot@box}
- \ifdim\autot@boxwidth<\textwidth
- \let\disp@authaffil\uneven@d@authaffil
- \fi
- \fi
- \fi
- \ifdim\auone@boxwidth<\columnwidth
- \ifdim\autwo@boxwidth<\columnwidth
- \let\disp@authaffil\default@d@authaffil
- \fi
- \fi
- \disp@authaffil{#1}{#2}{#3}{#4}
-}
-
\def\maketitle{
\check@author
\@ifundefined{r@headr}{\def\r@headr{\protect\MakeUppercase{\protect\scriptsize\@title}}}{}
- \@ifundefined{r@headl}{\def\r@headl{\protect\MakeUppercase{\protect\scriptsize\@author}}}{}
+ \@ifundefined{r@headl}{\def\r@headl{ADD \\LEFTHEADER COMMAND}}{}
\twocolumn[ % anything appearing within the brackets is set in one-column mode
\vspace{0.03in}
@@ -1435,42 +1397,10 @@
\@ifundefined{apaSeven@maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- % one author-affiliation
- \put@one@authaffil{\@author}{\@affil}}{
- \@ifundefined{@authorThree}{
- % two authors-affiliations
- \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}}{
- \@ifundefined{@authorFour}{
- % three authors-affiliations
- \@ifundefined{@twofirst}{
- % first one, then two
- \put@one@authaffil{\@authorOne}{\@affilOne}\vspace{-0.15in}\\
- \put@two@authaffil{\@authorTwo}{\@affilTwo}{\@authorThree}{\@affilThree}
- }{
- % first two, then one
- \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put@one@authaffil{\@authorThree}{\@affilThree}
- }}{
- \@ifundefined{@authorFive}{ % 2006/01/05 as contributed by Aaron Geller
- % four authors-affiliations
- \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}
- }{ % 2006/01/05 beginning of Aaron Geller contribution
- \@ifundefined{@authorSix}{ % -- thp 2006/01/05
- % five authors-affiliations
- \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}%
- \vspace{-0.15in}\\ % thp added negative vertical space
- \put@one@authaffil{\@authorFive}{\@affilFive}
- }{ % 2006/01/05 end of Aaron Geller contribution
- % six authors-affiliations
- %% --- thp 2006/01/05 beginning of six-author display
- \put@two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put@two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}\vspace{-0.15in}\\
- \put@two@authaffil{\@authorFive}{\@affilFive}{\@authorSix}{\@affilSix}
- %% --- thp 2006/01/05 end of six-author display
- }}}}}
+\parbox[t]{\textwidth}{\begin{center}{\large \displayauthors\vspace{0in}}%
+
+{\displayaffiliations\vspace{0.05in}}\end{center}}
+
\@ifundefined{@note}
{\vspace{0.07in}}
{\vspace{0.07in}\\ {\large\@note\vspace{0.07in}}}
@@ -1654,87 +1584,9 @@
\vspace{0.3in}
\@ifundefined{apaSeven@maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- % one author-affiliation
- {\Large \@author} \\
-
- \@affil \vspace{0.1in} \\ }{
- \@ifundefined{@authorThree}{
- % two authors-affiliations
- {\Large \@authorOne} \\
-
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\ }{
- \@ifundefined{@authorFour}{
- % three authors-affiliations
- {\Large \@authorOne} \\
+ {\Large \displayauthors} \\
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\
- {\Large \@authorThree}\\
-
- \@affilThree \vspace{0.1in} \\ }{
- \@ifundefined{@authorFive}{ %% 2006/01/05 added as contributed by Aaron Geller
- % four authors-affiliations
- {\Large \@authorOne} \\
-
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\
- {\Large \@authorThree}\\
-
- \@affilThree \vspace{0.1in} \\
- {\Large \@authorFour}\\
-
- \@affilFour \vspace{0.1in} \\ }{ %%% 2006/01/05 beginning of Aaron Geller contribution
- \@ifundefined{@authorSix}{ %% -- thp 2006/01/05
- % five authors-affiliations
- {\Large \@authorOne} \\
-
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\
- {\Large \@authorThree}\\
-
- \@affilThree \vspace{0.1in} \\
- {\Large \@authorFour}\\
-
- \@affilFour \vspace{0.1in} \\
- {\Large \@authorFive}\\
-
- \@affilFive \vspace{0.1in} \\ }{ %%% 2006/01/05 end of Aaron Geller contribution
- % six authors-affiliations
- %% --- thp 2006/01/05 beginning of six-author display
- {\Large \@authorOne} \\
-
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\
- {\Large \@authorThree}\\
-
- \@affilThree \vspace{0.1in} \\
- {\Large \@authorFour}\\
-
- \@affilFour \vspace{0.1in} \\
- {\Large \@authorFive}\\
-
- \@affilFive \vspace{0.1in} \\
- {\Large \@authorSix}\\
-
- \@affilSix \vspace{0.1in} \\ }
- %% --- thp 2006/01/05 end of six-author display
- }}}}
- %
- \@ifundefined{@note}
- {\vspace*{\baselineskip} }
- {\@note\vspace{0.2in}}
+ \displayaffiliations \vspace{0.1in}
}{% mask author identity -- show nothing in the author note space
}