summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/apa7/apa7.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-11 03:02:11 +0000
committerNorbert Preining <norbert@preining.info>2020-05-11 03:02:11 +0000
commitfd95e879442e050790f06552eb074eeb7c5b4cab (patch)
treefa133d89d5af2d1a52c702321ee187ad5065f189 /macros/latex/contrib/apa7/apa7.dtx
parentadcdf254252f764d8969df03d013bf5da6333873 (diff)
CTAN sync 202005110302
Diffstat (limited to 'macros/latex/contrib/apa7/apa7.dtx')
-rw-r--r--macros/latex/contrib/apa7/apa7.dtx19
1 files changed, 12 insertions, 7 deletions
diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx
index 5eb0137424..47b0ca5af8 100644
--- a/macros/latex/contrib/apa7/apa7.dtx
+++ b/macros/latex/contrib/apa7/apa7.dtx
@@ -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 @@ and the derived files apa7.ins,
%
% \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 @@ and the derived files apa7.ins,
% | \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 @@ and the derived files apa7.ins,
\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 @@ and the derived files apa7.ins,
%
%=============================================================
-\newcommand{\figurenote}[1]{\newline \small \textit{Note.} {#1}}
+\newcommand{\figurenote}[1]{\par \small \textit{Note.} {#1}}
% Code from theapa.sty