texlive[58083] Master/texmf-dist: apa7 (3mar21)
commits+karl at tug.org
commits+karl at tug.org
Wed Mar 3 23:42:56 CET 2021
Revision: 58083
http://tug.org/svn/texlive?view=revision&revision=58083
Author: karl
Date: 2021-03-03 23:42:55 +0100 (Wed, 03 Mar 2021)
Log Message:
-----------
apa7 (3mar21)
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
trunk/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg
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 2021-03-03 22:42:38 UTC (rev 58082)
+++ trunk/Master/texmf-dist/source/latex/apa7/apa7.dtx 2021-03-03 22:42:55 UTC (rev 58083)
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa7}[2021/03/01 v2.08 APA formatting (7th edition)]
+%<class>\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 @@
%
% \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 @@
\let\BBAB\normal at BBAB% -- thp 2005/07/23
\fi}
-
-
%========== Alterations to captions (BDB) ===================
\captionsetup{justification=raggedright}
@@ -3850,92 +3850,26 @@
%\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 <protopap at ilsp.gr>
-%% July 2005
+%% Description: LaTeX style to put figures and tables at end of article
+%% Keywords: LaTeX, style-option, float, figure, table
+%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
+%% Jeff Goldberg <jeffrey at goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
%%
-%% Original authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
-%% Jeff Goldberg <j.goldberg at cranfield.ac.uk>
-%% Original version: Version 2.4i <October 1995>
-%%
\RequirePackage{rotating}
-\let\efsaved at sidewaysfigure\sidewaysfigure
-\let\efsaved at sidewaystable\sidewaystable
-\let\efsaved at longtable\longtable
-\AtBeginTables{\let\sidewaystable=\efsaved at sidewaystable\relax}
-\AtBeginTables{\let\longtable=\efsaved at longtable\relax}
-\AtBeginFigures{\let\sidewaysfigure=\efsaved at sidewaysfigure\relax}
-\def\sidewaystable{\efloat at condopen{ttt}
- \efloat at iwrite{ttt}{\string\begin{sidewaystable}}%
-% \if at domarkers
-% \addtocounter{posttbl}{1}
-% \tableplace
-% \fi
- \def\@currenvir{efloat at float}%
- \begingroup
- \let\do\ef at makeinnocent \dospecials
- \ef at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \ef at xsidetable}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef at xsidetable#1^^M{\def\test{#1}
- \ifx\test\ef at endsidetabletest
- \efloat at foundend{ttt}{sidewaystable}
- \else
- \efloat at iwrite{ttt}{#1}%
- \let\next\ef at xsidetable
- \fi \next}
-}
-\def\sidewaysfigure{\efloat at condopen{fff}
- \efloat at iwrite{fff}{\string\begin{sidewaysfigure}}%
-% \if at domarkers
-% \addtocounter{postfig}{1}
-% \figureplace
-% \fi
- \def\@currenvir{efloat at float}%
- \begingroup
- \let\do\ef at makeinnocent \dospecials
- \ef at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \ef at xsidefigure}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef at xsidefigure#1^^M{\def\test{#1}
- \ifx\test\ef at endsidefiguretest
- \efloat at foundend{fff}{sidewaysfigure}
- \else
- \efloat at iwrite{fff}{#1}%
- \let\next\ef at xsidefigure
- \fi \next}
-}
-\def\longtable{\efloat at condopen{ttt}
- \efloat at iwrite{ttt}{\string\begin{longtable}}%
-% \if at domarkers
-% \addtocounter{posttbl}{1}
-% \tableplace
-% \fi
- \def\@currenvir{efloat at float}%
- \begingroup
- \let\do\ef at makeinnocent \dospecials
- \ef at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \ef at xlongtable}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef at xlongtable#1^^M{\def\test{#1}
- \ifx\test\ef at endlongtabletest
- \efloat at foundend{ttt}{longtable}
- \else
- \efloat at iwrite{ttt}{#1}%
- \let\next\ef at xlongtable
- \fi \next}
-}
-{\escapechar=-1%
- \xdef\ef at endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}%
- \xdef\ef at endsidetabletest{\string\\end\string\{sidewaystable\string\}}
- \xdef\ef at endlongtabletest{\string\\end\string\{longtable\string\}}}%
-\endinput
-
-%</APAendfloat>
+\RequirePackage{longtable}
+\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
+\DeclareDelayedFloatFlavor{sidewaystable}{table}
+\DeclareDelayedFloatFlavor{longtable}{table}
+\endinput%</APAendfloat>
% \end{macrocode}
%\end{macro}
%
Modified: trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls 2021-03-03 22:42:38 UTC (rev 58082)
+++ trunk/Master/texmf-dist/tex/latex/apa7/apa7.cls 2021-03-03 22:42:55 UTC (rev 58083)
@@ -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}{%
Modified: trunk/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg 2021-03-03 22:42:38 UTC (rev 58082)
+++ trunk/Master/texmf-dist/tex/latex/apa7/config/APA7endfloat.cfg 2021-03-03 22:42:55 UTC (rev 58083)
@@ -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 <protopap at ilsp.gr>
-%% July 2005
+%% Description: LaTeX style to put figures and tables at end of article
+%% Keywords: LaTeX, style-option, float, figure, table
+%% Authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
+%% Jeff Goldberg <jeffrey at goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt at f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
%%
-%% Original authors: James Darrell McCauley <jdm5548 at diamond.tamu.edu>,
-%% Jeff Goldberg <j.goldberg at cranfield.ac.uk>
-%% Original version: Version 2.4i <October 1995>
-%%
\RequirePackage{rotating}
-\let\efsaved at sidewaysfigure\sidewaysfigure
-\let\efsaved at sidewaystable\sidewaystable
-\let\efsaved at longtable\longtable
-\AtBeginTables{\let\sidewaystable=\efsaved at sidewaystable\relax}
-\AtBeginTables{\let\longtable=\efsaved at longtable\relax}
-\AtBeginFigures{\let\sidewaysfigure=\efsaved at sidewaysfigure\relax}
-\def\sidewaystable{\efloat at condopen{ttt}
- \efloat at iwrite{ttt}{\string\begin{sidewaystable}}%
- \def\@currenvir{efloat at float}%
- \begingroup
- \let\do\ef at makeinnocent \dospecials
- \ef at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \ef at xsidetable}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef at xsidetable#1^^M{\def\test{#1}
- \ifx\test\ef at endsidetabletest
- \efloat at foundend{ttt}{sidewaystable}
- \else
- \efloat at iwrite{ttt}{#1}%
- \let\next\ef at xsidetable
- \fi \next}
-}
-\def\sidewaysfigure{\efloat at condopen{fff}
- \efloat at iwrite{fff}{\string\begin{sidewaysfigure}}%
- \def\@currenvir{efloat at float}%
- \begingroup
- \let\do\ef at makeinnocent \dospecials
- \ef at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \ef at xsidefigure}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef at xsidefigure#1^^M{\def\test{#1}
- \ifx\test\ef at endsidefiguretest
- \efloat at foundend{fff}{sidewaysfigure}
- \else
- \efloat at iwrite{fff}{#1}%
- \let\next\ef at xsidefigure
- \fi \next}
-}
-\def\longtable{\efloat at condopen{ttt}
- \efloat at iwrite{ttt}{\string\begin{longtable}}%
- \def\@currenvir{efloat at float}%
- \begingroup
- \let\do\ef at makeinnocent \dospecials
- \ef at makeinnocent\^^L% and whatever other special cases
- \endlinechar`\^^M \catcode`\^^M=12 \ef at xlongtable}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\ef at xlongtable#1^^M{\def\test{#1}
- \ifx\test\ef at endlongtabletest
- \efloat at foundend{ttt}{longtable}
- \else
- \efloat at iwrite{ttt}{#1}%
- \let\next\ef at xlongtable
- \fi \next}
-}
-{\escapechar=-1%
- \xdef\ef at endsidefiguretest{\string\\end\string\{sidewaysfigure\string\}}%
- \xdef\ef at endsidetabletest{\string\\end\string\{sidewaystable\string\}}
- \xdef\ef at endlongtabletest{\string\\end\string\{longtable\string\}}}%
+\RequirePackage{longtable}
+\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
+\DeclareDelayedFloatFlavor{sidewaystable}{table}
+\DeclareDelayedFloatFlavor{longtable}{table}
+\endinput%</APAendfloat>
%%
%% Copyright (C) 2021 by Daniel A. Weiss <daniel.weiss.led at gmail.com>
%%
More information about the tex-live-commits
mailing list.