From cc4fa04f89bc3dc30a1c76517dbfdfdaefe03d8e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 May 2020 21:15:57 +0000 Subject: apa7 (4may20) git-svn-id: svn://tug.org/texlive/trunk@55007 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa7/apa7.pdf | Bin 514782 -> 520965 bytes .../doc/latex/apa7/samples/longsample.pdf | Bin 195755 -> 196731 bytes .../doc/latex/apa7/samples/longsample.tex | 2 ++ .../doc/latex/apa7/samples/shortsample.pdf | Bin 58843 -> 63826 bytes .../doc/latex/apa7/samples/shortsample.tex | 17 ++++++---- Master/texmf-dist/source/latex/apa7/apa7.dtx | 36 +++++++++++++-------- Master/texmf-dist/tex/latex/apa7/apa7.cls | 4 ++- 7 files changed, 38 insertions(+), 21 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf index 65bee10d574..c854fb9117e 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 2d327622a42..e7ea5d3a3c6 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/longsample.tex b/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex index d6990519534..2d456aa128e 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex @@ -119,6 +119,7 @@ Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15] \begin{figure} \caption{This is my first figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} + \figurenote{This is a great figure.} \label{fig:Figure1} \end{figure} @@ -143,6 +144,7 @@ As shown in Figure~\ref{fig:Figure2}, these results are impressive. \lipsum[20] \begin{figure} \caption{This is my second figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} + \figurenote{This is a great appendix figure.} \label{fig:Figure2} \end{figure} diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf index 7a698975140..68e951e2c7e 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 d64902401a4..52d30338f31 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex @@ -53,21 +53,24 @@ \begin{document} \maketitle We begin with \textcite{Shotton1989}. We can also cite this work in -parenthesis, like this: \parencite{Shotton1989}. - -A three-author paper \parencite[e.g.,][]{Lassen2006} lists all -three authors for the first citation, then only the first author -on all subsequent citations \parencite{Lassen2006}. +parenthesis, like this: \parencite{Lassen2006}. Note the use of five heading levels throughout this demonstration Method section. \section{Method} \subsection{Participants} -We had a lot of people in this study. +We had a lot of people in this study, show in Figure \ref{fig:Figure1}. + +\begin{figure}[htbp] + \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.} + \label{fig:Figure1} +\end{figure} \subsection{Materials} -Several materials were used for this project. Some of themwere +Several materials were used for this project. Some of them were already created for prior research. \subsubsection{Paper-and-Pencil Instrument} diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index b670b67b92a..5eb0137424e 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/3/27 v1.05 APA formatting (7th edition)] +%\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2020/3/27} -\def\apaSevenVersionNumber{1.05} +\def\apaSevenVersionDate{2020/05/04} +\def\apaSevenVersionNumber{1.06} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -235,10 +235,11 @@ and the derived files apa7.ins, % % \changes{v1.03}{2019/12/29}{Updated class to detect babel package in document and localize accordingly.} % -% \changes{v1.04}{2019/12/30}{Added table of contents.} -% \changes{v1.04}{2019/12/30}{Updated documentation and added correct license statement to cls for apa6 package.} +% \changes{v1.04}{2019/12/30}{Added table of contents. Updated documentation and added correct license statement to cls for apa6 package.} % -% \changes{v1.05}{2020/3/27}{Fixed float placement at end for man and stu mode to ensure one correctly placed figure/table per page. Thanks WC!} +% \changes{v1.05}{2020/03/27}{Fixed float placement at end for man and stu mode to ensure one correctly placed figure/table per page. Thanks WC.} +% +% \changes{v1.06}{2020/05/04}{Added figurenote command.} % % \begin{abstract} % The \textit{Publication Manual} of the American Psychological @@ -543,6 +544,9 @@ and the derived files apa7.ins, % | \centering|\par\vspace{-.5em} % | \begin{threeparttable}|\par % \item +% \DescribeMacro{\figurenote}|\figurenote|\marg{figure-note-text}: +% Formats figure note when placed immidiatly after |\includegraphic|, |\fitfigure|, or similar command within |\begin{figure}| and |\end{figure}|. +% \item % \DescribeMacro{\fitfigure}|\fitfigure|\oarg{height}\marg{eps-filename}: % Automatically fit a postscript figure; use instead of % |\includegraphics| @@ -1785,6 +1789,7 @@ and the derived files apa7.ins, % %============================================================= +\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}} % Code from theapa.sty @@ -3496,21 +3501,24 @@ and the derived files apa7.ins, \begin{document} \maketitle We begin with \textcite{Shotton1989}. We can also cite this work in -parenthesis, like this: \parencite{Shotton1989}. - -A three-author paper \parencite[e.g.,][]{Lassen2006} lists all -three authors for the first citation, then only the first author -on all subsequent citations \parencite{Lassen2006}. +parenthesis, like this: \parencite{Lassen2006}. Note the use of five heading levels throughout this demonstration Method section. \section{Method} \subsection{Participants} -We had a lot of people in this study. +We had a lot of people in this study, show in Figure \ref{fig:Figure1}. + +\begin{figure}[htbp] + \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.} + \label{fig:Figure1} +\end{figure} \subsection{Materials} -Several materials were used for this project. Some of themwere +Several materials were used for this project. Some of them were already created for prior research. \subsubsection{Paper-and-Pencil Instrument} @@ -3675,6 +3683,7 @@ Table~\ref{tab:BasicTable} summarizes the data. \lipsum[15] \begin{figure} \caption{This is my first figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} + \figurenote{This is a great figure.} \label{fig:Figure1} \end{figure} @@ -3700,6 +3709,7 @@ As shown in Figure~\ref{fig:Figure2}, these results are impressive. \lipsum[20] \begin{figure} \caption{This is my second figure caption.} \includegraphics[bb=0in 0in 2.5in 2.5in, height=2.5in, width=2.5in]{Figure1.pdf} + \figurenote{This is a great appendix figure.} \label{fig:Figure2} \end{figure} diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index ec8dcc20feb..e687fc681e0 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/3/27 v1.05 APA formatting (7th edition)] +\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -724,6 +724,8 @@ +\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}} + \newcounter{APAenum} \newskip\@text@par@indent -- cgit v1.2.3