texlive[55097] Master/texmf-dist: apa7 (11may20)

[commits+karl at tug.org]

Revision: 55097
          http://tug.org/svn/texlive?view=revision&revision=55097
Author:   karl
Date:     2020-05-11 22:46:10 +0200 (Mon, 11 May 2020)
Log Message:
-----------
apa7 (11may20)

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	2020-05-11 20:42:09 UTC (rev 55096)
+++ trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx	2020-05-11 20:46:10 UTC (rev 55097)
@@ -4,11 +4,11 @@
 %                                                                           %
 %    CHANGE THESE VALUES WITH EACH NEW RELEASE:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2020/05/10 v1.07 APA formatting (7th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSevenVersionDate{2020/05/04}
-\def\apaSevenVersionNumber{1.06}
+\def\apaSevenVersionDate{2020/05/10}
+\def\apaSevenVersionNumber{1.07}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -241,6 +241,8 @@
 %
 % \changes{v1.06}{2020/05/04}{Added figurenote command.}
 %
+% \changes{v1.07}{2020/05/10}{Fixed bug in figurenote command. Fixed figure title formatting in doc mode. Thanks RH.}
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -545,7 +547,7 @@
 %   |    \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}|.
+%   Formats figure note when placed 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
@@ -1767,17 +1769,20 @@
    \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
+    \DeclareCaptionLabelSeparator{apalabelsep}{\\}
 }{% jou
     \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
+    \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} 
 }{% doc
     \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
+    \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} 
 }
-\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext}
-\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it}
+\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext}
+\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it}
 
 % space between caption and surrounding document text
 % \setlength{\belowcaptionskip}{0pt}
@@ -1789,7 +1794,7 @@
 %
 %=============================================================
 
-\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}}
+\newcommand{\figurenote}[1]{\par \small \textit{Note.} {#1}}
 
 % Code from theapa.sty
 

Modified: trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls	2020-05-11 20:42:09 UTC (rev 55096)
+++ trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls	2020-05-11 20:46:10 UTC (rev 55097)
@@ -27,7 +27,7 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesClass{apa7}[2020/05/04 v1.06 APA formatting (7th edition)]
+\ProvidesClass{apa7}[2020/05/10 v1.07 APA formatting (7th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -710,21 +710,24 @@
    \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
+    \DeclareCaptionLabelSeparator{apalabelsep}{\\}
 }{% jou
     \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}}
+    \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\}
 }{% doc
     \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}}
     \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\raggedright\textit{#1}}
+    \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\}
 }
-\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=newline,textformat=tabletext}
-\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=newline,textfont=it}
+\captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext}
+\captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it}
 
 
 
-\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}}
+\newcommand{\figurenote}[1]{\par \small \textit{Note.} {#1}}
 
 
 \newcounter{APAenum}