From 4eb2f50e83b39c2547bcdd31a3648d870ee0343e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 May 2021 20:15:09 +0000 Subject: apa7 (18may21) git-svn-id: svn://tug.org/texlive/trunk@59254 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa7/apa7.pdf | Bin 530896 -> 531855 bytes .../doc/latex/apa7/samples/longsample.pdf | Bin 196588 -> 196590 bytes .../doc/latex/apa7/samples/shortsample.pdf | Bin 65352 -> 65349 bytes Master/texmf-dist/source/latex/apa7/apa7.dtx | 66 +++++++++++---------- Master/texmf-dist/tex/latex/apa7/apa7.cls | 60 +++++++++---------- 5 files changed, 64 insertions(+), 62 deletions(-) diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf index 710740e416c..593afa5e207 100644 Binary files a/Master/texmf-dist/doc/latex/apa7/apa7.pdf and b/Master/texmf-dist/doc/latex/apa7/apa7.pdf differ diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf index 1fe1ad87360..2c1ddfa3132 100644 Binary files a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf and b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf differ diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf index 10623740d35..0fbe41f67c2 100644 Binary files a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf and b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf differ diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index 10da0cabda1..27abc04e06b 100644 --- a/Master/texmf-dist/source/latex/apa7/apa7.dtx +++ b/Master/texmf-dist/source/latex/apa7/apa7.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%\ProvidesClass{apa7}[2021/04/08 v2.12 APA formatting (7th edition)] +%\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 @@ and the derived files apa7.ins, % % \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 @@ and the derived files apa7.ins, \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 @@ and the derived files apa7.ins, \@ifundefined{def@jou}{}{% +\RequirePackage{fancyhdr} + \renewcommand{\addORCIDlink}[2]{\href{https://orcid.org/#2}{{\mbox{\scalerel*{ \begin{tikzpicture}[yscale=-1,transform shape] \pic{orcidlogo}; @@ -2846,28 +2850,22 @@ and the derived files apa7.ins, } \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@maskauthoridentity}{% BDB @@ -2881,11 +2879,6 @@ and the derived files apa7.ins, }{% mask author identity -- show nothing in the author note space } - \@ifundefined{apaSeven@maskauthoridentity}{% BDB - \markboth{\hfill\r@headl\hfill}{\hfill\r@headr\hfill} - }{% mask author identity -- show the short title for both the left and right headers - \markboth{\hfill\r@headr\hfill}{\hfill\r@headr\hfill} - } \@ifundefined{no@tab}{\let\tabular\apaSeventabular}{} %\noindent } @@ -2912,16 +2905,25 @@ and the derived files apa7.ins, \setcounter{secnumdepth}{0} -\def\ps@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@headr}% \def\sectionmark##1{} \def\subsectionmark##1{} } -\pagestyle{myheadings} + +\@ifundefined{apaSeven@maskauthoridentity}{% BDB + \fancypagestyle{journal}[journalbase]{% + \fancyhead[CE]{\r@headl}% + } +}{% mask author identity -- show the short title for both the left and right headers + \fancypagestyle{journal}[journalbase]{% + \fancyhead[CE]{\r@headr}% + } + } + \pagestyle{journal} %\long\def\@makecaption#1#2{% % \let\BBAB\table@BBAB % thp 2005/07/23 diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index 5fc4b5c8296..5c1d9cfb126 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}[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@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@maskauthoridentity}{% BDB @@ -1481,11 +1477,6 @@ }{% mask author identity -- show nothing in the author note space } - \@ifundefined{apaSeven@maskauthoridentity}{% BDB - \markboth{\hfill\r@headl\hfill}{\hfill\r@headr\hfill} - }{% mask author identity -- show the short title for both the left and right headers - \markboth{\hfill\r@headr\hfill}{\hfill\r@headr\hfill} - } \@ifundefined{no@tab}{\let\tabular\apaSeventabular}{} %\noindent } @@ -1508,16 +1499,25 @@ \setcounter{secnumdepth}{0} -\def\ps@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@headr}% \def\sectionmark##1{} \def\subsectionmark##1{} } -\pagestyle{myheadings} + +\@ifundefined{apaSeven@maskauthoridentity}{% BDB + \fancypagestyle{journal}[journalbase]{% + \fancyhead[CE]{\r@headl}% + } +}{% mask author identity -- show the short title for both the left and right headers + \fancypagestyle{journal}[journalbase]{% + \fancyhead[CE]{\r@headr}% + } + } + \pagestyle{journal} \setcounter{topnumber}{2} -- cgit v1.2.3