texlive[55868] Master/texmf-dist: apa7 (18jul20)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 18 23:43:54 CEST 2020
Revision: 55868
http://tug.org/svn/texlive?view=revision&revision=55868
Author: karl
Date: 2020-07-18 23:43:54 +0200 (Sat, 18 Jul 2020)
Log Message:
-----------
apa7 (18jul20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/apa7/apa7.pdf
trunk/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
trunk/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex
trunk/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
trunk/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex
trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx
trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls
Modified: trunk/Master/texmf-dist/doc/latex/apa7/apa7.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex 2020-07-18 21:35:34 UTC (rev 55867)
+++ trunk/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex 2020-07-18 21:43:54 UTC (rev 55868)
@@ -41,8 +41,8 @@
\title{Sample APA-Style Document Using the \textsf{apa7} Package}
\shorttitle{Sample Document}
-\author{Daniel A. Weiss}
-\affiliation{A University Somewhere}
+\authorsnames{Daniel A. Weiss}
+\authorsaffiliations{A University Somewhere}
\leftheader{Weiss}
Modified: trunk/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex 2020-07-18 21:35:34 UTC (rev 55867)
+++ trunk/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex 2020-07-18 21:43:54 UTC (rev 55868)
@@ -38,8 +38,8 @@
\title{Sample APA-Style Document Using the \textsf{apa7} Package}
-\author{Daniel A. Weiss}
-\affiliation{A University Somewhere}
+\authorsnames{Daniel A. Weiss}
+\authorsaffiliations{A University Somewhere}
\leftheader{Weiss}
Modified: trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx 2020-07-18 21:35:34 UTC (rev 55867)
+++ trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx 2020-07-18 21:43:54 UTC (rev 55868)
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa7}[2020/06/19 v1.09 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2020/07/18 v2.01 APA formatting (7th edition)]
% %
%<*internal> %
-\def\apaSevenVersionDate{2020/06/19}
-\def\apaSevenVersionNumber{1.09}
+\def\apaSevenVersionDate{2020/07/18}
+\def\apaSevenVersionNumber{2.01}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -247,6 +247,8 @@
%
% \changes{v1.09}{2020/06/19}{Fixed note command (will no longer print "Author Note" header).}
%
+% \changes{v2.01}{2020/07/18}{Re-wrote author and affiliation to be APA7 compliant. Fixed spacing on Title Page for title and author. }
+%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
% Association is widely used in the social sciences. The most
@@ -276,6 +278,13 @@
% is the sole responsibility of the user to ensure compliance with
% specific journal submission requirements!
%
+% \section{\textsf{apa7} Version 2.01 Changes to Authors and Affiliations}
+% The way that authors and affiliations work has been changed in
+% version 2.01 to be APA 7th edition compliant.
+% This change will require updating any multiple author and/or
+% multiple affiliation documents to use the new |\authorsnames| and
+% |\authorsaffiliations| commands (See Section~\ref{sec:authorsaffiliations}).
+%
% \section{Usage}
% \label{sec:usage}
%
@@ -385,33 +394,45 @@
% The following commands are available within the document preamble
% (i.e., the part of the file preceding |\begin{document}|).
%
+% \subsubsection{Document Title and Headers}
+% \label{sec:titleheaders}
% \begin{itemize}
% \item \DescribeMacro{\title}|\title|\marg{document-title}: The title of the document
% \item \DescribeMacro{\shorttitle}|\shorttitle|\marg{short-title}: A
% shortened version of the title (for page headers)
-% \item \DescribeMacro{\author}|\author|\marg{author(s)}: Author name(s)
+% \item
+% \DescribeMacro{\leftheader}|\leftheader|\marg{author-last-name(s)}:
+% Author last name(s) (for even-page headers in |jou| mode)
% \end{itemize}
+% Optional; use if desired:\par
+% \begin{itemize}
+% \item \DescribeMacro{\journal}|\journal|\marg{journal-name}: Journal
+% name or other note; typeset in the top left header of page 1
+% (|jou| and |doc| modes only); to change the starting page to a
+% number other than 1, insert the following line immediately after
+% |\maketitle|:\\
+% |\setcounter{page}|\marg{custom-page-number}
+% \item \DescribeMacro{\volume}|\volume|\marg{journal-volume}: Volume,
+% number, pages; typeset in the top left header in |jou| and |doc|
+% modes, underneath the content of |\journal|
+% \item \DescribeMacro{\ccoppy}|\ccoppy|\marg{copright-notice}:
+% Copyright notice, etc.; typeset in the top right header of page 1
+% (|jou| and |doc| modes only)
+% \item \DescribeMacro{\copnum}|\copnum|\marg{more-copyright-info}:
+% Any additional text needed; typeset in the top right header in
+% |jou| and |doc| modes, underneath the content of |\ccoppy|
+% \end{itemize}
%
-% For authors across multiple affiliations, follow these formats,
-% noting that authors must be matched in sequence with their
-% affiliations in the |\affiliation| command (hence multiple authors
-% inside some braces represent multiple authors from the same
-% institution):\par
+% \subsubsection{Authors and Affiliations}
+% \label{sec:authorsaffiliations}
+% Based on the new APA 7th edition style guide, the previous method for
+% handling multiple authors and multiple affiliations has been deprecated as of version 2.01 of apa7. \par
+% \textit{The followings commands have been deprecated and will return an error:} \par
% |\twoauthors{First Author(s)}{Second Author(s)}|\par
% |\threeauthors{John and Jim}{Mary and Sue}{Nick}|\par
% |\fourauthors{Helen}{Dick}{Tracy and Larry}{James Bond}|\par
% |\fiveauthors{...}{...}{...}{...}{...}|\par
% |\sixauthors{...}{...}{...}{...}{...}{...}|\par
-% \begin{itemize}
-% \item
-% \DescribeMacro{\leftheader}|\leftheader|\marg{author-last-name(s)}:
-% Author last name(s) (for even-page headers in |jou| mode)
-% \item
-% \DescribeMacro{\affiliation}|\affiliation|\marg{affiliation(s)}:
-% Author affiliation(s)
-% \end{itemize}
-%
-% For multiple affiliations, follow these formats:\par
% |\twoaffiliations{Affil. of 1st Author(s)}{Affil. 2nd Author(s)}|\par
% |\threeaffiliations{U of A}{U of B}{U of C}|\par
% |\fouraffiliations{My Company}{Your Department}{Heaven}{Earth}|\par
@@ -418,6 +439,46 @@
% |\fiveaffiliations{...}{...}{...}{...}{...}|\par
% |\sixaffiliations{...}{...}{...}{...}{...}{...}|\par
% \begin{itemize}
+% \item \DescribeMacro{\author}|\author|\marg{author name}: Author name (if only 1 author)
+% \item \DescribeMacro{\affiliation}|\affiliation|\marg{author's affiliation}: Author's affiliation (if only 1 affiliation)
+% \item \DescribeMacro{\authorsnames}|\authorsnames|\oarg{comma separated list of superscripts}\marg{comma separated list of authors name(s)}: Authors names (if more than 1 author)
+% \end{itemize}
+%
+% Where \marg{authors names} is a comma separated list of authors in display order
+% and \oarg{superscripts} is an optional comma separated list of affiliation superscripts.
+% If there are multiple superscripts for one author, put the set of superscripts within |{ }|.
+%
+% \begin{itemize}
+% \item
+% \DescribeMacro{\authorsaffiliations}|\authorsaffiliations|\marg{comma separated list of affiliation(s)}:
+% Author affiliation(s). Put each affiliation within |{ }| and separate each affiliation with a comma.
+% \end{itemize}
+%
+% \noindent \textbf{Examples:} \par
+% \noindent One author, one affiliation \par
+% |\authorsnames{Maggie C. Leonard}| \par
+% |\authorsaffiliations{{Department of Psychology, George Mason University}}| \par
+% \noindent One author, two affiliations \par
+% |\authorsnames{Andrew K. Jones-Willoughby}| \par
+% |\authorsaffiliations{{School of Psychology, University of Sydney},| \par
+% |{Center for Behavioral Neuroscience, American University}}| \par
+% \noindent Two authors, shared affiliation \par
+% |\authorsnames{Mackenzie J. Clement,Talia R. Cummings}| \par
+% |\authorsaffiliations{{College of Nursing, Michigan State University}}| \par
+% \noindent Two authors, different affiliations \par
+% |\authorsnames[1,2]{Wilhelm T. Webber,Latasha P. Jackson}| \par
+% |\authorsaffiliations{{Max Planck Institute for Human Development, Berlin, Germany},| \par
+% |{College of Education, University of Georgia}}| \par
+% \noindent Three or more authors, different affiliations \par
+% |\authorsnames[1,{2,3},1]{Savannah C. St. John, Fen-Lei Chang, Carlos O. Vásquez III}| \par
+% |\authorsaffiliations{{Education Testing Service, Princeton, New Jersey, ...},| \par
+% |{MRC Cognition and Brain Science Unit, Cambridge, England},| \par
+% |{Department of Psychology, University of Cambridge}}| \par
+%
+%
+% \subsubsection{Title Page Information}
+% \label{sec:titlepageinfo}
+% \begin{itemize}
% \item \DescribeMacro{\course}|\course|\marg{course-number-name}: The
% course number and name (e.g. PSYC 3170: Clinical Psychology)
% \item \DescribeMacro{\professor}|\professor|\marg{professor}: The
@@ -444,21 +505,6 @@
% \item \DescribeMacro{\note}|\note|\marg{note-text}: Notation of
% manuscript date or other information desired beneath the
% affiliation line (not part of the APA 7th edition specification for title page)
-% \item \DescribeMacro{\journal}|\journal|\marg{journal-name}: Journal
-% name or other note; typeset in the top left header of page 1
-% (|jou| and |doc| modes only); to change the starting page to a
-% number other than 1, insert the following line immediately after
-% |\maketitle|:\\
-% |\setcounter{page}|\marg{custom-page-number}
-% \item \DescribeMacro{\volume}|\volume|\marg{journal-volume}: Volume,
-% number, pages; typeset in the top left header in |jou| and |doc|
-% modes, underneath the content of |\journal|
-% \item \DescribeMacro{\ccoppy}|\ccoppy|\marg{copright-notice}:
-% Copyright notice, etc.; typeset in the top right header of page 1
-% (|jou| and |doc| modes only)
-% \item \DescribeMacro{\copnum}|\copnum|\marg{more-copyright-info}:
-% Any additional text needed; typeset in the top right header in
-% |jou| and |doc| modes, underneath the content of |\ccoppy|
% \end{itemize}
%
% \subsection{Maketitle}
@@ -587,8 +633,6 @@
%
% \section{Known Limitations}
% \begin{itemize}
-% \item There is a limit of six affiliations for authors (but an
-% unlimited number of authors across those six affiliations).
% \item The |APAenumerate| environment does not nest properly.
% \end{itemize}
%
@@ -1843,42 +1887,24 @@
%===== apa.cls main declarations for title page contents =====
\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}}
@@ -1888,16 +1914,121 @@
\def\volume#1{\def\@vvolume{#1}}
\def\ccoppy#1{\def\@ccoppy{#1}}
\def\copnum#1{\def\@copnum{#1}}
-\def\@error at toomanyauthors{\ClassWarningNoLine{apa7}{More authors than affiliations defined}}
-\def\@error at toomanyaffils{\ClassWarningNoLine{apa7}{More affiliations than authors defined}}
+
+% Combined code from https://tex.stackexchange.com/questions/297507/how-to-apply-a-do-function-to-two-lists and
+% https://www.dickimaw-books.com/latex/admin/html/exercises/oxfordcomma.shtml
+
+% Create etoolbox lists for multiple authors and affiliations
+\newcommand*\listauthors{}
+\newcommand*\listsuperscripts{}
+\newcommand*\listaffiliations{}
+
+\newcommand*{\authorsnames}[2][]{
+ \def\def at 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 at 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 at author{%
- \@ifundefined{@author}{%
- \ClassWarningNoLine{apa7}{Author not defined}\def\@author{Author}}{}
+ \@ifundefined{def at 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 at stu}{%
+ \@ifundefined{def at multipleaffils}{%
+ \ClassWarningNoLine{apa7}{Affiliation not defined}\authorsaffiliations{Affiliation}}{}
+ \@ifundefined{def at stu}{% man mode
\@ifundefined{@shorttitle}{%
\ClassWarningNoLine{apa7}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
\@ifundefined{@abstract}{%
@@ -1904,36 +2035,26 @@
\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 at toomanyauthors}{}}
- }{\@ifundefined{@affilThree}{\@error at toomanyauthors}{}}
- }{\@ifundefined{@affilFour}{\@error at toomanyauthors}{}}
- }{\@ifundefined{@affilFive}{\@error at toomanyauthors}{}} % -- thp 2006/01/05
- }{\@ifundefined{@affilSix}{\@error at 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 at toomanyaffils}{}}
- }{\@ifundefined{@authorThree}{\@error at toomanyaffils}{}}
- }{\@ifundefined{@authorFour}{\@error at toomanyaffils}{}}
- }{\@ifundefined{@authorFive}{\@error at toomanyaffils}{}} % -- thp 2006/01/05
- }{\@ifundefined{@authorSix}{\@error at toomanyaffils}{}} % -- thp 2006/01/05
+ \@ifundefined{def at 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
+ }%
}
%==== Automatic figure size and orientation determination ====
@@ -2428,91 +2549,24 @@
\begin{center}
- \vspace*{0.5in}
+
% \makebox[\linewidth][l]{\rheadname\hspace{0.1in}\MakeUppercase{\r at headr}}\\ %thp090298
- \vspace*{1in}
+ \vspace*{4\baselineskip}
\textbf\@title%
\ifapamodeman{%
\@ifundefined{def at noextraspace}{%
- \vspace{0.25in}\\
+ \vspace{\baselineskip}\\
}{}
}{%
- \vspace{0.25in}\\
+ \vspace{\baselineskip}\\
}
\@ifundefined{def at stu}{ %Professional manuscript
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
+
+ \displayauthors \\
+ \displayaffiliations
- \@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 \\
-
- \@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}
@@ -2534,9 +2588,10 @@
}
}{% mask author identity -- show nothing in the author or author note space
}}{% Student Manuscript
- \@author \\
-
- \@affil \\
+ \displayauthors \\
+
+ \displayaffiliations
+
\@course \\
\@professor \\
\@duedate \\
@@ -2706,56 +2761,10 @@
\def\r at headr{\protect\MakeUppercase{\protect\scriptsize\@shorttitle}}% BDB
%%%%%%%%%%%%%%%%%%%%%%%\def\shorttitle#1{\def\r at headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB
-\def\put at one@authaffil#1#2{%
- \parbox[t]{\textwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}}
-
-\newsavebox\auone at box
-\newsavebox\autwo at box
-\newsavebox\autot at box
-\newlength\auone at boxwidth
-\newlength\autwo at boxwidth
-\newlength\autot at boxwidth
-
-\def\default at 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 at d@authaffil#1#2#3#4{%
- \hfill\parbox[t]{\auone at boxwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}\hfill\hfill%
- \parbox[t]{\autwo at boxwidth}{\begin{center}{\large #3\vspace{0in}}%
- {\\ #4\vspace{0.05in}\\}\end{center}}\hfill}
-
-\def\put at two@authaffil#1#2#3#4{%
- \let\disp at authaffil\default at d@authaffil
- \sbox\auone at box{\begin{tabular}{c}\large #1\\ #2\end{tabular}}
- \settowidth{\auone at boxwidth}{\usebox\auone at box}
- \sbox\autwo at box{\begin{tabular}{c}\large #3\\ #4\end{tabular}}
- \settowidth{\autwo at boxwidth}{\usebox\autwo at box}
- \ifdim\auone at boxwidth<1.25\columnwidth
- \ifdim\autwo at boxwidth<1.25\columnwidth
- \sbox\autot at box{\usebox\auone at box\hspace{0.4in}\usebox\autwo at box}
- \settowidth{\autot at boxwidth}{\usebox\autot at box}
- \ifdim\autot at boxwidth<\textwidth
- \let\disp at authaffil\uneven at d@authaffil
- \fi
- \fi
- \fi
- \ifdim\auone at boxwidth<\columnwidth
- \ifdim\autwo at boxwidth<\columnwidth
- \let\disp at authaffil\default at d@authaffil
- \fi
- \fi
- \disp at authaffil{#1}{#2}{#3}{#4}
-}
-
\def\maketitle{
\check at author
\@ifundefined{r at headr}{\def\r at headr{\protect\MakeUppercase{\protect\scriptsize\@title}}}{}
- \@ifundefined{r at headl}{\def\r at headl{\protect\MakeUppercase{\protect\scriptsize\@author}}}{}
+ \@ifundefined{r at headl}{\def\r at headl{ADD \\LEFTHEADER COMMAND}}{}
\twocolumn[ % anything appearing within the brackets is set in one-column mode
\vspace{0.03in}
@@ -2766,42 +2775,10 @@
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- % one author-affiliation
- \put at one@authaffil{\@author}{\@affil}}{
- \@ifundefined{@authorThree}{
- % two authors-affiliations
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}}{
- \@ifundefined{@authorFour}{
- % three authors-affiliations
- \@ifundefined{@twofirst}{
- % first one, then two
- \put at one@authaffil{\@authorOne}{\@affilOne}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorTwo}{\@affilTwo}{\@authorThree}{\@affilThree}
- }{
- % first two, then one
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at one@authaffil{\@authorThree}{\@affilThree}
- }}{
- \@ifundefined{@authorFive}{ % 2006/01/05 as contributed by Aaron Geller
- % four authors-affiliations
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}
- }{ % 2006/01/05 beginning of Aaron Geller contribution
- \@ifundefined{@authorSix}{ % -- thp 2006/01/05
- % five authors-affiliations
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}%
- \vspace{-0.15in}\\ % thp added negative vertical space
- \put at 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 at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}\vspace{-0.15in}\\
- \put at 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}}}
@@ -3062,88 +3039,10 @@
\vspace{0.3in}
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- % one author-affiliation
- {\Large \@author} \\
+ {\Large \displayauthors} \\
- \@affil \vspace{0.1in} \\ }{
- \@ifundefined{@authorThree}{
- % two authors-affiliations
- {\Large \@authorOne} \\
+ \displayaffiliations \vspace{0.1in}
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\ }{
- \@ifundefined{@authorFour}{
- % three authors-affiliations
- {\Large \@authorOne} \\
-
- \@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}}
-
}{% mask author identity -- show nothing in the author note space
}
@@ -3480,8 +3379,8 @@
\title{Sample APA-Style Document Using the \textsf{apa7} Package}
-\author{Daniel A. Weiss}
-\affiliation{A University Somewhere}
+\authorsnames{Daniel A. Weiss}
+\authorsaffiliations{A University Somewhere}
\leftheader{Weiss}
@@ -3597,8 +3496,8 @@
\title{Sample APA-Style Document Using the \textsf{apa7} Package}
\shorttitle{Sample Document}
-\author{Daniel A. Weiss}
-\affiliation{A University Somewhere}
+\authorsnames{Daniel A. Weiss}
+\authorsaffiliations{A University Somewhere}
\leftheader{Weiss}
Modified: trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls 2020-07-18 21:35:34 UTC (rev 55867)
+++ trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls 2020-07-18 21:43:54 UTC (rev 55868)
@@ -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,16 +785,118 @@
\def\volume#1{\def\@vvolume{#1}}
\def\ccoppy#1{\def\@ccoppy{#1}}
\def\copnum#1{\def\@copnum{#1}}
-\def\@error at toomanyauthors{\ClassWarningNoLine{apa7}{More authors than affiliations defined}}
-\def\@error at toomanyaffils{\ClassWarningNoLine{apa7}{More affiliations than authors defined}}
+
+
+\newcommand*\listauthors{}
+\newcommand*\listsuperscripts{}
+\newcommand*\listaffiliations{}
+
+\newcommand*{\authorsnames}[2][]{
+ \def\def at 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 at 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 at author{%
- \@ifundefined{@author}{%
- \ClassWarningNoLine{apa7}{Author not defined}\def\@author{Author}}{}
+ \@ifundefined{def at 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 at stu}{%
+ \@ifundefined{def at multipleaffils}{%
+ \ClassWarningNoLine{apa7}{Affiliation not defined}\authorsaffiliations{Affiliation}}{}
+ \@ifundefined{def at stu}{% man mode
\@ifundefined{@shorttitle}{%
\ClassWarningNoLine{apa7}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
\@ifundefined{@abstract}{%
@@ -819,36 +903,26 @@
\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 at toomanyauthors}{}}
- }{\@ifundefined{@affilThree}{\@error at toomanyauthors}{}}
- }{\@ifundefined{@affilFour}{\@error at toomanyauthors}{}}
- }{\@ifundefined{@affilFive}{\@error at toomanyauthors}{}} % -- thp 2006/01/05
- }{\@ifundefined{@affilSix}{\@error at 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 at toomanyaffils}{}}
- }{\@ifundefined{@authorThree}{\@error at toomanyaffils}{}}
- }{\@ifundefined{@authorFour}{\@error at toomanyaffils}{}}
- }{\@ifundefined{@authorFive}{\@error at toomanyaffils}{}} % -- thp 2006/01/05
- }{\@ifundefined{@authorSix}{\@error at toomanyaffils}{}} % -- thp 2006/01/05
+ \@ifundefined{def at 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 at author
\begin{center}
- \vspace*{0.5in}
- \vspace*{1in}
+
+ \vspace*{4\baselineskip}
\textbf\@title%
\ifapamodeman{%
\@ifundefined{def at noextraspace}{%
- \vspace{0.25in}\\
+ \vspace{\baselineskip}\\
}{}
}{%
- \vspace{0.25in}\\
+ \vspace{\baselineskip}\\
}
\@ifundefined{def at stu}{ %Professional manuscript
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- \@author \\
+ \displayauthors \\
+ \displayaffiliations
- \@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 \\
-
- \@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 \\
- \@affil \\
+ \displayaffiliations
+
\@course \\
\@professor \\
\@duedate \\
@@ -1376,56 +1384,10 @@
\def\r at headr{\protect\MakeUppercase{\protect\scriptsize\@shorttitle}}% BDB
%%%%%%%%%%%%%%%%%%%%%%%\def\shorttitle#1{\def\r at headr{\protect\MakeUppercase{\protect\scriptsize #1}}}% BDB
-\def\put at one@authaffil#1#2{%
- \parbox[t]{\textwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}}
-
-\newsavebox\auone at box
-\newsavebox\autwo at box
-\newsavebox\autot at box
-\newlength\auone at boxwidth
-\newlength\autwo at boxwidth
-\newlength\autot at boxwidth
-
-\def\default at 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 at d@authaffil#1#2#3#4{%
- \hfill\parbox[t]{\auone at boxwidth}{\begin{center}{\large #1\vspace{0in}}%
- {\\ #2\vspace{0.05in}\\}\end{center}}\hfill\hfill%
- \parbox[t]{\autwo at boxwidth}{\begin{center}{\large #3\vspace{0in}}%
- {\\ #4\vspace{0.05in}\\}\end{center}}\hfill}
-
-\def\put at two@authaffil#1#2#3#4{%
- \let\disp at authaffil\default at d@authaffil
- \sbox\auone at box{\begin{tabular}{c}\large #1\\ #2\end{tabular}}
- \settowidth{\auone at boxwidth}{\usebox\auone at box}
- \sbox\autwo at box{\begin{tabular}{c}\large #3\\ #4\end{tabular}}
- \settowidth{\autwo at boxwidth}{\usebox\autwo at box}
- \ifdim\auone at boxwidth<1.25\columnwidth
- \ifdim\autwo at boxwidth<1.25\columnwidth
- \sbox\autot at box{\usebox\auone at box\hspace{0.4in}\usebox\autwo at box}
- \settowidth{\autot at boxwidth}{\usebox\autot at box}
- \ifdim\autot at boxwidth<\textwidth
- \let\disp at authaffil\uneven at d@authaffil
- \fi
- \fi
- \fi
- \ifdim\auone at boxwidth<\columnwidth
- \ifdim\autwo at boxwidth<\columnwidth
- \let\disp at authaffil\default at d@authaffil
- \fi
- \fi
- \disp at authaffil{#1}{#2}{#3}{#4}
-}
-
\def\maketitle{
\check at author
\@ifundefined{r at headr}{\def\r at headr{\protect\MakeUppercase{\protect\scriptsize\@title}}}{}
- \@ifundefined{r at headl}{\def\r at headl{\protect\MakeUppercase{\protect\scriptsize\@author}}}{}
+ \@ifundefined{r at headl}{\def\r at 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 at maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- % one author-affiliation
- \put at one@authaffil{\@author}{\@affil}}{
- \@ifundefined{@authorThree}{
- % two authors-affiliations
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}}{
- \@ifundefined{@authorFour}{
- % three authors-affiliations
- \@ifundefined{@twofirst}{
- % first one, then two
- \put at one@authaffil{\@authorOne}{\@affilOne}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorTwo}{\@affilTwo}{\@authorThree}{\@affilThree}
- }{
- % first two, then one
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at one@authaffil{\@authorThree}{\@affilThree}
- }}{
- \@ifundefined{@authorFive}{ % 2006/01/05 as contributed by Aaron Geller
- % four authors-affiliations
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}
- }{ % 2006/01/05 beginning of Aaron Geller contribution
- \@ifundefined{@authorSix}{ % -- thp 2006/01/05
- % five authors-affiliations
- \put at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}%
- \vspace{-0.15in}\\ % thp added negative vertical space
- \put at 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 at two@authaffil{\@authorOne}{\@affilOne}{\@authorTwo}{\@affilTwo}\vspace{-0.15in}\\
- \put at two@authaffil{\@authorThree}{\@affilThree}{\@authorFour}{\@affilFour}\vspace{-0.15in}\\
- \put at 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,88 +1584,10 @@
\vspace{0.3in}
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
- \@ifundefined{@authorTwo}{
- % one author-affiliation
- {\Large \@author} \\
+ {\Large \displayauthors} \\
- \@affil \vspace{0.1in} \\ }{
- \@ifundefined{@authorThree}{
- % two authors-affiliations
- {\Large \@authorOne} \\
+ \displayaffiliations \vspace{0.1in}
- \@affilOne \vspace{0.1in} \\
- {\Large \@authorTwo}\\
-
- \@affilTwo \vspace{0.1in} \\ }{
- \@ifundefined{@authorFour}{
- % three authors-affiliations
- {\Large \@authorOne} \\
-
- \@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}}
-
}{% mask author identity -- show nothing in the author note space
}
More information about the tex-live-commits
mailing list.