From cdbf138eeebd04def89eca636d48726ff60fd5cb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Mar 2021 22:42:55 +0000 Subject: apa7 (3mar21) git-svn-id: svn://tug.org/texlive/trunk@58083 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa7/apa7.pdf | Bin 530598 -> 530694 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 | 104 ++++----------------- Master/texmf-dist/tex/latex/apa7/apa7.cls | 2 +- .../tex/latex/apa7/config/APA7endfloat.cfg | 79 +++------------- 6 files changed, 34 insertions(+), 151 deletions(-) diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf index a8733f4fe8f..342cc96d436 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 b0963ba0b82..52c3461ee06 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 cc2a4e39ade..63b1d5be796 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 c00e289be2c..9819cca02bb 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/01 v2.08 APA formatting (7th edition)] +%\ProvidesClass{apa7}[2021/03/03 v2.09 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2021/03/01} -\def\apaSevenVersionNumber{2.08} +\def\apaSevenVersionDate{2021/03/03} +\def\apaSevenVersionNumber{2.09} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -265,6 +265,8 @@ and the derived files apa7.ins, % % \changes{v2.08}{2021/03/01}{Updated BibLaTex to allow overriding bibliography title. } % +% \changes{v2.09}{2021/03/03}{Updated APA7endfloat.cfg file to use more modern DeclareDelayedFloatFlavor. This fixes the bug where longtable can be shown on the same page as another table. } +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -2553,8 +2555,6 @@ and the derived files apa7.ins, \let\BBAB\normal@BBAB% -- thp 2005/07/23 \fi} - - %========== Alterations to captions (BDB) =================== \captionsetup{justification=raggedright} @@ -3850,92 +3850,26 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] %\begin{macro}{APA7endfloat.cfg} % \begin{macrocode} %<*APAendfloat> +\ProvidesFile{APA7endfloat.cfg}[2021/03/03 v2.00 apa7 configuration endfloat] %% %% This is file `endfloat.cfg', -%% modifed from the original supplied with the endfloat package +%% modifed from the original supplied efxmpl.cfg with the endfloat package %% to handle both sideways floats and longtable %% -%% Athanassios Protopapas -%% July 2005 -%% -%% Original authors: James Darrell McCauley , -%% Jeff Goldberg -%% Original version: Version 2.4i +%% Description: LaTeX style to put figures and tables at end of article +%% Keywords: LaTeX, style-option, float, figure, table +%% Authors: James Darrell McCauley , +%% Jeff Goldberg , +%% Axel Sommerfeldt +%% Maintainer: -none- +%% Latest Version: Version 2.7 %% \RequirePackage{rotating} -\let\efsaved@sidewaysfigure\sidewaysfigure -\let\efsaved@sidewaystable\sidewaystable -\let\efsaved@longtable\longtable -\AtBeginTables{\let\sidewaystable=\efsaved@sidewaystable\relax} -\AtBeginTables{\let\longtable=\efsaved@longtable\relax} -\AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} -\def\sidewaystable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% -% \if@domarkers -% \addtocounter{posttbl}{1} -% \tableplace -% \fi - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidetable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidetable#1^^M{\def\test{#1} - \ifx\test\ef@endsidetabletest - \efloat@foundend{ttt}{sidewaystable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xsidetable - \fi \next} -} -\def\sidewaysfigure{\efloat@condopen{fff} - \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% -% \if@domarkers -% \addtocounter{postfig}{1} -% \figureplace -% \fi - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidefigure} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidefigure#1^^M{\def\test{#1} - \ifx\test\ef@endsidefiguretest - \efloat@foundend{fff}{sidewaysfigure} - \else - \efloat@iwrite{fff}{#1}% - \let\next\ef@xsidefigure - \fi \next} -} -\def\longtable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{longtable}}% -% \if@domarkers -% \addtocounter{posttbl}{1} -% \tableplace -% \fi - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xlongtable#1^^M{\def\test{#1} - \ifx\test\ef@endlongtabletest - \efloat@foundend{ttt}{longtable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xlongtable - \fi \next} -} -{\escapechar=-1% - \xdef\ef@endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}% - \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} - \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% -\endinput - -% +\RequirePackage{longtable} +\DeclareDelayedFloatFlavor{sidewaysfigure}{figure} +\DeclareDelayedFloatFlavor{sidewaystable}{table} +\DeclareDelayedFloatFlavor{longtable}{table} +\endinput% % \end{macrocode} %\end{macro} % diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index 33787613c7e..995782811b2 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/01 v2.08 APA formatting (7th edition)] +\ProvidesClass{apa7}[2021/03/03 v2.09 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg b/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg index 031bac6e8e3..4c33c92c8e9 100644 --- a/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg +++ b/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg @@ -27,77 +27,26 @@ %% %% ---------------------------------------------------------------------- %% +\ProvidesFile{APA7endfloat.cfg}[2021/03/03 v2.00 apa7 configuration endfloat] %% %% This is file `endfloat.cfg', -%% modifed from the original supplied with the endfloat package +%% modifed from the original supplied efxmpl.cfg with the endfloat package %% to handle both sideways floats and longtable %% -%% Athanassios Protopapas -%% July 2005 -%% -%% Original authors: James Darrell McCauley , -%% Jeff Goldberg -%% Original version: Version 2.4i +%% Description: LaTeX style to put figures and tables at end of article +%% Keywords: LaTeX, style-option, float, figure, table +%% Authors: James Darrell McCauley , +%% Jeff Goldberg , +%% Axel Sommerfeldt +%% Maintainer: -none- +%% Latest Version: Version 2.7 %% \RequirePackage{rotating} -\let\efsaved@sidewaysfigure\sidewaysfigure -\let\efsaved@sidewaystable\sidewaystable -\let\efsaved@longtable\longtable -\AtBeginTables{\let\sidewaystable=\efsaved@sidewaystable\relax} -\AtBeginTables{\let\longtable=\efsaved@longtable\relax} -\AtBeginFigures{\let\sidewaysfigure=\efsaved@sidewaysfigure\relax} -\def\sidewaystable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{sidewaystable}}% - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidetable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidetable#1^^M{\def\test{#1} - \ifx\test\ef@endsidetabletest - \efloat@foundend{ttt}{sidewaystable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xsidetable - \fi \next} -} -\def\sidewaysfigure{\efloat@condopen{fff} - \efloat@iwrite{fff}{\string\begin{sidewaysfigure}}% - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xsidefigure} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xsidefigure#1^^M{\def\test{#1} - \ifx\test\ef@endsidefiguretest - \efloat@foundend{fff}{sidewaysfigure} - \else - \efloat@iwrite{fff}{#1}% - \let\next\ef@xsidefigure - \fi \next} -} -\def\longtable{\efloat@condopen{ttt} - \efloat@iwrite{ttt}{\string\begin{longtable}}% - \def\@currenvir{efloat@float}% - \begingroup - \let\do\ef@makeinnocent \dospecials - \ef@makeinnocent\^^L% and whatever other special cases - \endlinechar`\^^M \catcode`\^^M=12 \ef@xlongtable} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\ef@xlongtable#1^^M{\def\test{#1} - \ifx\test\ef@endlongtabletest - \efloat@foundend{ttt}{longtable} - \else - \efloat@iwrite{ttt}{#1}% - \let\next\ef@xlongtable - \fi \next} -} -{\escapechar=-1% - \xdef\ef@endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}% - \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}} - \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% +\RequirePackage{longtable} +\DeclareDelayedFloatFlavor{sidewaysfigure}{figure} +\DeclareDelayedFloatFlavor{sidewaystable}{table} +\DeclareDelayedFloatFlavor{longtable}{table} +\endinput% %% %% Copyright (C) 2021 by Daniel A. Weiss %% -- cgit v1.2.3