From 3d62c21ac11f8ba5544e0f9d6703827284ba3899 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 7 Apr 2021 15:00:42 +0000 Subject: apa7 (7apr21) git-svn-id: svn://tug.org/texlive/trunk@58787 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa7/apa7.pdf | Bin 530950 -> 530991 bytes .../doc/latex/apa7/samples/longsample.pdf | Bin 196588 -> 196588 bytes .../doc/latex/apa7/samples/shortsample.pdf | Bin 65352 -> 65352 bytes Master/texmf-dist/source/latex/apa7/apa7.dtx | 12 +++++++----- Master/texmf-dist/tex/latex/apa7/apa7.cls | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf index fcfd0c2041f..aa32a866a67 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 35f4b636308..0a0b7b65458 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 135d919bebf..83984dbc31a 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/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index 85bcdc5e884..20bc61a2c7b 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}[2021/03/04 v2.10 APA formatting (7th edition)] +%\ProvidesClass{apa7}[2021/04/05 v2.11 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2021/03/04} -\def\apaSevenVersionNumber{2.10} +\def\apaSevenVersionDate{2021/04/05} +\def\apaSevenVersionNumber{2.11} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -269,6 +269,8 @@ and the derived files apa7.ins, % % \changes{v2.10}{2021/03/04}{Update BibLaTex instructions to remove DeclareLanguageMapping and remove commands that are no longer required. } % +% \changes{v2.11}{2021/04/05}{Updated linebreaks in caption separators to prevent warning. } +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -1844,12 +1846,12 @@ 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}\textit{#1}} - \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} + \DeclareCaptionLabelSeparator{apalabelsep}{\\[\baselineskip]} }{% 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}{\\ \\} + \DeclareCaptionLabelSeparator{apalabelsep}{\\[\baselineskip]} } \captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext} \captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it} diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index e540e0f51e6..289bd531576 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}[2021/03/04 v2.10 APA formatting (7th edition)] +\ProvidesClass{apa7}[2021/04/05 v2.11 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -717,12 +717,12 @@ \DeclareCaptionLabelFormat{tablelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionLabelFormat{figurelabel}{\hspace{-\parindent}\raggedright\textbf{#1 #2}} \DeclareCaptionTextFormat{tabletext}{\hspace{-\parindent}\textit{#1}} - \DeclareCaptionLabelSeparator{apalabelsep}{\\ \\} + \DeclareCaptionLabelSeparator{apalabelsep}{\\[\baselineskip]} }{% 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}{\\ \\} + \DeclareCaptionLabelSeparator{apalabelsep}{\\[\baselineskip]} } \captionsetup[table]{position=above,skip=0pt,labelformat=tablelabel,labelsep=apalabelsep,textformat=tabletext} \captionsetup[figure]{position=above,skip=0pt,labelformat=figurelabel,labelsep=apalabelsep,textfont=it} -- cgit v1.2.3