From b1471336efbd397ef8a54d3555bb5100a14b6dca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Oct 2020 20:49:54 +0000 Subject: apa7 (11oct20) git-svn-id: svn://tug.org/texlive/trunk@56635 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa7/apa7.pdf | Bin 527794 -> 528179 bytes .../doc/latex/apa7/samples/longsample.pdf | Bin 196742 -> 196742 bytes .../doc/latex/apa7/samples/shortsample.pdf | Bin 64106 -> 65283 bytes .../doc/latex/apa7/samples/shortsample.tex | 8 ++++++-- Master/texmf-dist/source/latex/apa7/apa7.dtx | 21 ++++++++++++++++----- Master/texmf-dist/tex/latex/apa7/apa7.cls | 8 +++++++- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf index d38e5802c11..48cbdad4888 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 841fc1b02fb..a306e58e996 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 57c1868a5be..12717d7ddea 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/doc/latex/apa7/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex index 0b1c9c2aacf..df11e9eff5e 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex @@ -39,7 +39,7 @@ \title{Sample APA-Style Document Using the \textsf{apa7} Package} \authorsnames{Daniel A. Weiss} -\authorsaffiliations{A University Somewhere} +\authorsaffiliations{Departement of Psychology, A University Somewhere} \leftheader{Weiss} @@ -50,6 +50,10 @@ \keywords{APA style, demonstration} +\authornote{\addORCIDlink{Daniel A. Weiss}{0000-0000-0000-0000}, Department of Psychology, A University Somewhere + +Changes of Affiliations and other info here to describe what needs to be said} + \begin{document} \maketitle We begin with \textcite{Shotton1989}. We can also cite this work in @@ -62,7 +66,7 @@ Method section. \subsection{Participants} We had a lot of people in this study, show in Figure \ref{fig:Figure1}. -\begin{figure}[htbp] +\begin{figure}[!htp] \caption{This is my figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=1.4in, width=1.4in]{Figure1.pdf} \figurenote{This is an awesome figure.} diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index b81d61d0944..31ec9cb98ba 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}[2020/08/12 v2.03 APA formatting (7th edition)] +%\ProvidesClass{apa7}[2020/10/11 v2.04 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2020/08/12} -\def\apaSevenVersionNumber{2.03} +\def\apaSevenVersionDate{2020/10/11} +\def\apaSevenVersionNumber{2.04} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -255,6 +255,8 @@ and the derived files apa7.ins, % % \changes{v2.03}{2020/08/12}{Added French localization. } % +% \changes{v2.04}{2020/10/11}{Updated ORCID link style for jou mode. } +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -2743,6 +2745,11 @@ and the derived files apa7.ins, \@ifundefined{def@jou}{}{% +\renewcommand{\addORCIDlink}[2]{\href{https://orcid.org/#2}{{\mbox{\scalerel*{ +\begin{tikzpicture}[yscale=-1,transform shape] +\pic{orcidlogo}; +\end{tikzpicture} +}{|}}} #1}} %========== balance last-page columns ================= @@ -3387,7 +3394,7 @@ and the derived files apa7.ins, \title{Sample APA-Style Document Using the \textsf{apa7} Package} \authorsnames{Daniel A. Weiss} -\authorsaffiliations{A University Somewhere} +\authorsaffiliations{Departement of Psychology, A University Somewhere} \leftheader{Weiss} @@ -3398,6 +3405,10 @@ and the derived files apa7.ins, \keywords{APA style, demonstration} +\authornote{\addORCIDlink{Daniel A. Weiss}{0000-0000-0000-0000}, Department of Psychology, A University Somewhere + +Changes of Affiliations and other info here to describe what needs to be said} + \begin{document} \maketitle We begin with \textcite{Shotton1989}. We can also cite this work in @@ -3410,7 +3421,7 @@ Method section. \subsection{Participants} We had a lot of people in this study, show in Figure \ref{fig:Figure1}. -\begin{figure}[htbp] +\begin{figure}[!htp] \caption{This is my figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=1.4in, width=1.4in]{Figure1.pdf} \figurenote{This is an awesome figure.} diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index 3d4ae4a5674..56df4bd7fa6 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/08/12 v2.03 APA formatting (7th edition)] +\ProvidesClass{apa7}[2020/10/11 v2.04 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -1367,6 +1367,12 @@ \@ifundefined{def@jou}{}{% +\renewcommand{\addORCIDlink}[2]{\href{https://orcid.org/#2}{{\mbox{\scalerel*{ +\begin{tikzpicture}[yscale=-1,transform shape] +\pic{orcidlogo}; +\end{tikzpicture} +}{|}}} #1}} + \IfFileExists{flushend.sty}{\RequirePackage[keeplastbox]{flushend}}{} -- cgit v1.2.3