apa7 (29dec19)

git-svn-id: svn://tug.org/texlive/trunk@53256 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 27 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf
index 8aa2808975b..ee6608e2366 100644
--- a/Master/texmf-dist/doc/latex/apa7/apa7.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/apa7.pdf
diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
index f41a5b394d0..1af9d9eebc2 100644
--- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
index b94a563fcfc..55900e2ff54 100644
--- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx
index 3a425a97291..303a2064f98 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:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa7}[2019/12/26 v1.00 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2019/12/29 v1.01 APA formatting (7th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSevenVersionDate{2019/12/26}
-\def\apaSevenVersionNumber{1.00}
+\def\apaSevenVersionDate{2019/12/29}
+\def\apaSevenVersionNumber{1.01}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -226,7 +226,10 @@ and the derived files           apa7.ins,
 %
 % \maketitle
 %
-% \changes{v1.0}{2019/12/26}{Initial release}
+% \changes{v1.00}{2019/12/26}{Initial release}
+%
+% \changes{v1.01}{2019/12/29}{Corrected figure caption styles for doc format.}
+% \changes{v1.01}{2019/12/29}{Clarified that apacite and natbib are in 6th edition style.}
 %
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
@@ -311,9 +314,11 @@ and the derived files           apa7.ins,
 %   \textsf{biblatex} package; see Section~\ref{sec:biblatexinfo} for
 %   details.
 % \item \DescribeMacro{apacite}|apacite|: Loads the \textsf{apacite}
-%   package; see Section~\ref{sec:apaciteinfo} for details.
+%   package; see Section~\ref{sec:apaciteinfo} for details. \\
+%   \textit{\textbf{Note:} at this time, this will produce citations in 6th edition format. }
 % \item \DescribeMacro{natbib}|natbib|: See
-%   Section~\ref{sec:natbibinfo} for details.
+%   Section~\ref{sec:natbibinfo} for details. \\
+%   \textit{\textbf{Note:} at this time, this will produce citations in 6th edition format.}
 % \item \DescribeMacro{mask}|mask|: Masks references that are marked
 %   as the author's own (for masked peer review); see
 %   Section~\ref{sec:masking} for details.
@@ -709,10 +714,12 @@ and the derived files           apa7.ins,
 %
 % \subsection{Flexible Bibliographies}
 % The \textsf{apa7} class supports three bibliography packages:
-% \textsf{biblatex}, \textsf{apacite}, and \textsf{natbib}.
+% \textsf{biblatex}, \textsf{apacite}, and \textsf{natbib}. \\ \\
+% At this time, only biblatex is updated to support the 7th edition of APA style for citations and references.
 %
 % \subsubsection{\textsf{biblatex}}
 % \label{sec:biblatexinfo}
+% \textit{\textbf{Note:} This is the recommended method for 7th edition citations and references.} \\
 % Biblatex is the most APA-compliant bibiliography package.  The
 % \DescribeMacro{biblatex}|biblatex| option directs \textsf{apa7} to
 % load the \textsf{biblatex} package with the following options:
@@ -726,6 +733,7 @@ and the derived files           apa7.ins,
 %
 % \subsubsection{\textsf{apacite}}
 % \label{sec:apaciteinfo}
+% \textit{\textbf{Note:} at this time, this will produce citations in 6th edition format.} \\
 % The \textsf{apacite} package is loaded if the
 % \DescribeMacro{apacite}|apacite| option is specified.  This option
 % also informs \textsf{apa7} to mask references using \textsf{apacite}
@@ -734,6 +742,7 @@ and the derived files           apa7.ins,
 %
 % \subsubsection{\textsf{natbib}}
 % \label{sec:natbibinfo}
+% \textit{\textbf{Note:} at this time, this will produce citations in 6th edition format.} \\
 % Specifying the \DescribeMacro{natbib}|natbib| option implicitly
 % loads \textsf{apacite} and \textsf{natbib} and directs
 % \textsf{apa7} to mask references using \textsf{natbib} commands if
@@ -743,7 +752,7 @@ and the derived files           apa7.ins,
 % \label{sec:keywords}
 % Many journals (including APA journals) request authors to provide
 % keywords for their manuscripts to facilitate electronic indexing.
-% \textsf{apa7} introduces the \DescribeMacro{\keywords}|\keywords|
+% \textsf{apa6} introduced the \DescribeMacro{\keywords}|\keywords|
 % command.  If provided, keywords will be displayed on a line beneath
 % the abstract.  For languages other than English, the `Keywords'
 % label can be localized by modifying the appropriate configuration
@@ -1665,9 +1674,9 @@ and the derived files           apa7.ins,
 
 
 
-%========== APA Section heading & seriation, adapted from class apa7e
+%========== APA Section heading & seriation, adapted from class apa6e
 
-% % Below is the license statement from the apa7e class, from which a
+% % Below is the license statement from the apa6e class, from which a
 % % small bit of code was used (with permission from Nathaniel Smith)
 % % Copyright (C) 2011 by Nathaniel J. Smith <njs@pobox.com>
 % %
@@ -1748,9 +1757,9 @@ and the derived files           apa7.ins,
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
 }{% doc
-    \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}#1 #2}
-    \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\textit{#1 #2}}
-    \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
+    \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
+    \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
+    \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
 }
 \captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext}
 \captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it}
@@ -1761,7 +1770,7 @@ and the derived files           apa7.ins,
 
 %=============================================================
 %
-% End of code from apa7e
+% End of code from apa6e
 %
 %=============================================================
 
diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls
index 74092278929..32a365dd7d1 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}[2019/12/26 v1.00 APA formatting (7th edition)]
+\ProvidesClass{apa7}[2019/12/29 v1.01 APA formatting (7th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -715,9 +715,9 @@
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
 }{% doc
-    \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}#1 #2}
-    \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\textit{#1 #2}}
-    \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
+    \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
+    \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
+    \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
 }
 \captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext}
 \captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it}