texlive[59254] Master/texmf-dist: apa7 (18may21)
commits+karl at tug.org
commits+karl at tug.org
Tue May 18 22:15:09 CEST 2021
Revision: 59254
http://tug.org/svn/texlive?view=revision&revision=59254
Author: karl
Date: 2021-05-18 22:15:09 +0200 (Tue, 18 May 2021)
Log Message:
-----------
apa7 (18may21)
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/shortsample.pdf
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/shortsample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx 2021-05-18 20:14:54 UTC (rev 59253)
+++ trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx 2021-05-18 20:15:09 UTC (rev 59254)
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa7}[2021/04/08 v2.12 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2021/05/17 v2.13 APA formatting (7th edition)]
% %
%<*internal> %
-\def\apaSevenVersionDate{2021/04/08}
-\def\apaSevenVersionNumber{2.12}
+\def\apaSevenVersionDate{2021/05/17}
+\def\apaSevenVersionNumber{2.13}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -273,6 +273,8 @@
%
% \changes{v2.12}{2021/04/08}{Reset equation counter for every appendix (like for figures and tables). Thanks mmrabe. }
%
+% \changes{v2.13}{2021/05/17}{Fix headers for jou style when journal command is provided. }
+%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
% Association is widely used in the social sciences. The most
@@ -1941,7 +1943,7 @@
\long\def\keywords#1{\long\def\@keywords{#1}}
%\long\def\acknowledgements#1{\long\def\@acks{#1}}
\long\def\authornote#1{\long\def\@acks{#1}}
-\def\journal#1{\RequirePackage{fancyhdr}\def\@journal{#1}}
+\def\journal#1{\def\@journal{#1}}
\def\volume#1{\def\@vvolume{#1}}
\def\ccoppy#1{\def\@ccoppy{#1}}
\def\copnum#1{\def\@copnum{#1}}
@@ -2777,6 +2779,8 @@
\@ifundefined{def at jou}{}{%
+\RequirePackage{fancyhdr}
+
\renewcommand{\addORCIDlink}[2]{\href{https://orcid.org/#2}{{\mbox{\scalerel*{
\begin{tikzpicture}[yscale=-1,transform shape]
\pic{orcidlogo};
@@ -2846,6 +2850,8 @@
}
\end{center}
] % end of \twocolumn[]
+
+ \renewcommand{\headrulewidth}{0pt}%
\pagenumbering{arabic}
\@ifundefined{@journal}{\thispagestyle{empty}}{%
@@ -2852,22 +2858,14 @@
\@ifundefined{@vvolume}{\def\@vvolume{\strut}}{}%
\@ifundefined{@copnum}{\def\@copnum{\strut}}{}%
\@ifundefined{@ccoppy}{\def\@ccoppy{\strut}}{}%
- \fancyhead{}
- \fancyhead[LO]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
- \stiny{\@vvolume}}
- \fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
- \stiny{\@copnum}}
- \fancyfoot[CO]{\small\rm\thepage}
- % the following are needed if the starting page number is changed to
- % an even number:
- \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
- \stiny{\@vvolume}}
- \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
- \stiny{\@copnum}}
- \fancyfoot[CE]{\small\rm\thepage}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}
- \thispagestyle{fancy}
+ \fancypagestyle{pageone}{%
+ \fancyhf{}%
+ \fancyhead[L]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
+ \stiny{\@vvolume}}%
+ \fancyhead[R]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
+ \stiny{\@copnum}}%
+ }
+ \thispagestyle{pageone}
}
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
@@ -2881,11 +2879,6 @@
}{% mask author identity -- show nothing in the author note space
}
- \@ifundefined{apaSeven at maskauthoridentity}{% BDB
- \markboth{\hfill\r at headl\hfill}{\hfill\r at headr\hfill}
- }{% mask author identity -- show the short title for both the left and right headers
- \markboth{\hfill\r at headr\hfill}{\hfill\r at headr\hfill}
- }
\@ifundefined{no at tab}{\let\tabular\apaSeventabular}{}
%\noindent
}
@@ -2912,17 +2905,26 @@
\setcounter{secnumdepth}{0}
-\def\ps at myheadings{%
- \let\@mkboth\@gobbletwo
- \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage}
- \def\@oddfoot{}
- \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}}
- \def\@evenfoot{}
+ \fancypagestyle{journalbase}{%
+ \fancyhf{}%
+ \fancyhead[LE]{\thepage}%
+ \fancyhead[RO]{\thepage}%
+ \fancyhead[CO]{\r at headr}%
\def\sectionmark##1{}
\def\subsectionmark##1{}
}
-\pagestyle{myheadings}
+\@ifundefined{apaSeven at maskauthoridentity}{% BDB
+ \fancypagestyle{journal}[journalbase]{%
+ \fancyhead[CE]{\r at headl}%
+ }
+}{% mask author identity -- show the short title for both the left and right headers
+ \fancypagestyle{journal}[journalbase]{%
+ \fancyhead[CE]{\r at headr}%
+ }
+ }
+ \pagestyle{journal}
+
%\long\def\@makecaption#1#2{%
% \let\BBAB\table at BBAB % thp 2005/07/23
% \vskip\abovecaptionskip
Modified: trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls 2021-05-18 20:14:54 UTC (rev 59253)
+++ trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls 2021-05-18 20:15:09 UTC (rev 59254)
@@ -27,7 +27,7 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesClass{apa7}[2021/04/08 v2.12 APA formatting (7th edition)]
+\ProvidesClass{apa7}[2021/05/17 v2.13 APA formatting (7th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -788,7 +788,7 @@
\long\def\abstract#1{\long\def\@abstract{#1}}
\long\def\keywords#1{\long\def\@keywords{#1}}
\long\def\authornote#1{\long\def\@acks{#1}}
-\def\journal#1{\RequirePackage{fancyhdr}\def\@journal{#1}}
+\def\journal#1{\def\@journal{#1}}
\def\volume#1{\def\@vvolume{#1}}
\def\ccoppy#1{\def\@ccoppy{#1}}
\def\copnum#1{\def\@copnum{#1}}
@@ -1385,6 +1385,8 @@
\@ifundefined{def at jou}{}{%
+\RequirePackage{fancyhdr}
+
\renewcommand{\addORCIDlink}[2]{\href{https://orcid.org/#2}{{\mbox{\scalerel*{
\begin{tikzpicture}[yscale=-1,transform shape]
\pic{orcidlogo};
@@ -1447,27 +1449,21 @@
\end{center}
] % end of \twocolumn[]
+ \renewcommand{\headrulewidth}{0pt}%
+
\pagenumbering{arabic}
\@ifundefined{@journal}{\thispagestyle{empty}}{%
\@ifundefined{@vvolume}{\def\@vvolume{\strut}}{}%
\@ifundefined{@copnum}{\def\@copnum{\strut}}{}%
\@ifundefined{@ccoppy}{\def\@ccoppy{\strut}}{}%
- \fancyhead{}
- \fancyhead[LO]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
- \stiny{\@vvolume}}
- \fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
- \stiny{\@copnum}}
- \fancyfoot[CO]{\small\rm\thepage}
- % the following are needed if the starting page number is changed to
- % an even number:
- \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
- \stiny{\@vvolume}}
- \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
- \stiny{\@copnum}}
- \fancyfoot[CE]{\small\rm\thepage}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}
- \thispagestyle{fancy}
+ \fancypagestyle{pageone}{%
+ \fancyhf{}%
+ \fancyhead[L]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\
+ \stiny{\@vvolume}}%
+ \fancyhead[R]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\
+ \stiny{\@copnum}}%
+ }
+ \thispagestyle{pageone}
}
\@ifundefined{apaSeven at maskauthoridentity}{% BDB
@@ -1481,11 +1477,6 @@
}{% mask author identity -- show nothing in the author note space
}
- \@ifundefined{apaSeven at maskauthoridentity}{% BDB
- \markboth{\hfill\r at headl\hfill}{\hfill\r at headr\hfill}
- }{% mask author identity -- show the short title for both the left and right headers
- \markboth{\hfill\r at headr\hfill}{\hfill\r at headr\hfill}
- }
\@ifundefined{no at tab}{\let\tabular\apaSeventabular}{}
%\noindent
}
@@ -1508,18 +1499,27 @@
\setcounter{secnumdepth}{0}
-\def\ps at myheadings{%
- \let\@mkboth\@gobbletwo
- \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage}
- \def\@oddfoot{}
- \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}}
- \def\@evenfoot{}
+ \fancypagestyle{journalbase}{%
+ \fancyhf{}%
+ \fancyhead[LE]{\thepage}%
+ \fancyhead[RO]{\thepage}%
+ \fancyhead[CO]{\r at headr}%
\def\sectionmark##1{}
\def\subsectionmark##1{}
}
-\pagestyle{myheadings}
+\@ifundefined{apaSeven at maskauthoridentity}{% BDB
+ \fancypagestyle{journal}[journalbase]{%
+ \fancyhead[CE]{\r at headl}%
+ }
+}{% mask author identity -- show the short title for both the left and right headers
+ \fancypagestyle{journal}[journalbase]{%
+ \fancyhead[CE]{\r at headr}%
+ }
+ }
+ \pagestyle{journal}
+
\setcounter{topnumber}{2}
\def\topfraction{.85}
\setcounter{bottomnumber}{2}
More information about the tex-live-commits
mailing list.