texlive[53390] Master/texmf-dist: apa6 (13jan20)
commits+karl at tug.org
commits+karl at tug.org
Mon Jan 13 22:25:19 CET 2020
Revision: 53390
http://tug.org/svn/texlive?view=revision&revision=53390
Author: karl
Date: 2020-01-13 22:25:18 +0100 (Mon, 13 Jan 2020)
Log Message:
-----------
apa6 (13jan20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/apa6/README
trunk/Master/texmf-dist/doc/latex/apa6/apa6.pdf
trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas
trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
trunk/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
trunk/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
trunk/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx
trunk/Master/texmf-dist/source/latex/apa6/apa6.ins
trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls
trunk/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
trunk/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
trunk/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt
Modified: trunk/Master/texmf-dist/doc/latex/apa6/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa6/README 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/doc/latex/apa6/README 2020-01-13 21:25:18 UTC (rev 53390)
@@ -3,7 +3,7 @@
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/doc/latex/apa6/apa6.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -360,7 +360,7 @@
End Sub
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -375,7 +375,7 @@
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -190,7 +190,7 @@
}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
\usepackage[american]{babel}
\usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+\usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\DeclareLanguageMapping{american}{american-apa}
\addbibresource{bibliography.bib}
@@ -41,7 +41,7 @@
\title{Sample APA-Style Document Using the \textsf{apa6} Package}
\shorttitle{Sample Document}
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
\affiliation{SUNY Oneonta}
\leftheader{Beitzel}
@@ -50,11 +50,11 @@
\keywords{APA style, demonstration}
-\authornote{Brian D. Beitzel, Department of Educational Psychology,
+\authornote{Brian D.\ Beitzel, Department of Educational Psychology,
Counseling and Special Education, SUNY Oneonta.
Correspondence concerning this article should be addressed to Brian
- D. Beitzel, Department of Educational Psychology, Counseling and
+ D.\ Beitzel, Department of Educational Psychology, Counseling and
Special Education, SUNY Oneonta, 366 Fitzelle Hall, Oneonta, NY
13820. E-mail: beitzebd at oneonta.edu}
@@ -185,7 +185,7 @@
\end{document}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -32,13 +32,13 @@
\usepackage[american]{babel}
\usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+\usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\DeclareLanguageMapping{american}{american-apa}
\addbibresource{bibliography.bib}
\title{Sample APA-Style Document Using the \textsf{apa6} Package}
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
\affiliation{SUNY Oneonta}
\leftheader{Beitzel}
@@ -132,7 +132,7 @@
\end{document}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/source/latex/apa6/apa6.dtx 2020-01-13 21:25:18 UTC (rev 53390)
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa6}[2018/09/01 v2.33 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2020/01/13 v2.34 APA formatting (6th edition)]
% %
%<*internal> %
-\def\apaSixVersionDate{2018/09/01}
-\def\apaSixVersionNumber{2.33}
+\def\apaSixVersionDate{2020/01/13}
+\def\apaSixVersionNumber{2.34}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,7 +20,7 @@
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -64,7 +64,7 @@
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -84,7 +84,7 @@
\endpreamble
\postamble
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -211,7 +211,7 @@
% \thanks{This file describes version ^^A
% \apaSixVersionNumber, last revised \apaSixVersionDate.}^^A
% }
-% \author{Brian D. Beitzel\thanks{E-mail: brian at beitzel.com}}
+% \author{Brian D.\ Beitzel\thanks{E-mail: brian at beitzel.com}}
% \date{Released \apaSixVersionDate}
%
% \maketitle
@@ -315,6 +315,12 @@
% \changes{v2.33}{2018/09/01}{Eliminated extra blank page before
% the References page under some circumstances}
%
+% \changes{v2.34}{2020/01/13}{Provided the full title as the short
+% title if the full title is 50 or fewer characters}
+%
+% \changes{v2.34}{2020/01/13}{Changed biblatex loading to freeze to
+% APA 6th Edition compatibility}
+%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
% Association is widely used in the social sciences. The most
@@ -792,9 +798,11 @@
% Biblatex is the most APA-compliant bibiliography package. The
% \DescribeMacro{biblatex}|biblatex| option directs \textsf{apa6} to
% load the \textsf{biblatex} package with the following options:
-% style=apa,sortcites=true,sorting=nyt; however, the
+% style=apa6,sortcites=true,sorting=nyt; however, the
% |\DeclareLanguageMapping| and |\addbibresource| commands will need
-% to be specified by the user within the document preamble. In the
+% to be specified by the user within the document preamble. Please
+% note that the \textsf{biblatex-apa6} package must be installed (but
+% not explicitly loaded) for 6th Edition compatibility. In the
% absence of bibliographic options, \textsf{apa6} will mask references
% using \textsf{biblatex} commands if the |mask| option is specified.
% In other words, the only reason to use the |biblatex| option is to
@@ -914,8 +922,11 @@
% |apacite| or |natbib| option has been specified
% \item \textsf{biblatex}: bibliographic package; used only if the
% |biblatex| option has been specified
+% \item \textsf{biblatex-apa6}: bibliographic package; this package
+% must must be installed (but not explicitly loaded) for 6th Edition
+% compatibility
% \item \textsf{booktabs}: formats tables that are much more
-% attractive than the standard \LaTeX\ tables.
+% attractive than the standard \LaTeX\ tables
% \item \textsf{caption}: formats table and figure captions
% \item \textsf{draftwatermark}: includes a ``DRAFT'' watermark; used
% only if the |draftfirst| or |draftall| options are specified
@@ -938,7 +949,7 @@
% loads the \textsf{array} package.
% \item \textsf{lmodern}: needed for proper default text size for
% draft watermark, so used on all documents; may be suppressed from
-% loading with option |nolmodern|.
+% loading with option |nolmodern|
% \item \textsf{substr}: counts masked references; used only if the
% |mask| option is specified
% \item \textsf{threeparttable}: produces nicely formatted table notes
@@ -945,7 +956,7 @@
% that comply with APA style. See |longsample.tex| (in the
% ``samples'' subfolder of the \textsf{apa6} installation;
% specifically, Appendix B in that document) for how to set up a
-% table with notes.
+% table with notes
% \item \textsf{times}: for math definitions
% \end{itemize}
%
@@ -967,13 +978,13 @@
% \usepackage[american]{babel}
%
% \usepackage{csquotes}
-% \usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+% \usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
% \DeclareLanguageMapping{american}{american-apa}
% \addbibresource{bibliography.bib}
%
% \title{Sample APA-Style Document Using the \textsf{apa6} Package}
%
-% \author{Brian D. Beitzel}
+% \author{Brian D.\ Beitzel}
% \affiliation{SUNY Oneonta}
%
% \leftheader{Beitzel}
@@ -1281,7 +1292,7 @@
\ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
}{%
\def\def at biblatex{\@biblatexmode}% the selected bibliography package is Biblatex
- \RequirePackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+ \RequirePackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\@ifundefined{def at man}{%
\defbibheading{bibliography}{\section*{\normalfont\refname}}%
}{%
@@ -1331,6 +1342,9 @@
% {\ClassInfo{apa6}{Using BibTeX with apacite for citations and references}}%
% {\ClassInfo{apa6}{apacite not loaded -- User may load BibLaTeX}}
+% provide compatibility for authors who wish to use the \and command
+% in author lists
+\renewcommand\and{\vspace{0.25in}\\}
%==== Conditional compilation macros depending on mode ====
@@ -1979,6 +1993,7 @@
\def\copnum#1{\def\@copnum{#1}}
\def\@error at toomanyauthors{\ClassWarningNoLine{apa6}{More authors than affiliations defined}}
\def\@error at toomanyaffils{\ClassWarningNoLine{apa6}{More affiliations than authors defined}}
+% \RequirePackage{xstring} %% need this if inserting default shorttitle (three lines commented out below)
\def\check at author{%
\@ifundefined{@author}{%
\ClassWarningNoLine{apa6}{Author not defined}\def\@author{Author}}{}
@@ -1985,7 +2000,10 @@
\@ifundefined{@title}{%
\ClassWarningNoLine{apa6}{Title not defined}\def\@title{Title}}{}
\@ifundefined{@shorttitle}{%
- \ClassWarningNoLine{apa6}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
+ \ClassWarningNoLine{apa6}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
+% \ClassWarningNoLine{apa6}{Short title not defined}%
+% \StrLen{\@title}[\titleLen]\def\@shorttitle{%
+% \ifnum\titleLen 50INSERT SHORTTITLE COMMAND IN PREAMBLE\else\@title\fi}}{}
\@ifundefined{@affil}{%
\ClassWarningNoLine{apa6}{Affiliation not defined}\def\@affil{Affiliation}}{}
\@ifundefined{@abstract}{%
@@ -3528,13 +3546,13 @@
\usepackage[american]{babel}
\usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+\usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\DeclareLanguageMapping{american}{american-apa}
\addbibresource{bibliography.bib}
\title{Sample APA-Style Document Using the \textsf{apa6} Package}
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
\affiliation{SUNY Oneonta}
\leftheader{Beitzel}
@@ -3641,7 +3659,7 @@
\usepackage[american]{babel}
\usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+\usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\DeclareLanguageMapping{american}{american-apa}
\addbibresource{bibliography.bib}
@@ -3648,7 +3666,7 @@
\title{Sample APA-Style Document Using the \textsf{apa6} Package}
\shorttitle{Sample Document}
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
\affiliation{SUNY Oneonta}
\leftheader{Beitzel}
@@ -3657,11 +3675,11 @@
\keywords{APA style, demonstration}
-\authornote{Brian D. Beitzel, Department of Educational Psychology,
+\authornote{Brian D.\ Beitzel, Department of Educational Psychology,
Counseling and Special Education, SUNY Oneonta.
Correspondence concerning this article should be addressed to Brian
- D. Beitzel, Department of Educational Psychology, Counseling and
+ D.\ Beitzel, Department of Educational Psychology, Counseling and
Special Education, SUNY Oneonta, 366 Fitzelle Hall, Oneonta, NY
13820. E-mail: beitzebd at oneonta.edu}
Modified: trunk/Master/texmf-dist/source/latex/apa6/apa6.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/apa6/apa6.ins 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/source/latex/apa6/apa6.ins 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -36,7 +36,7 @@
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -56,7 +56,7 @@
\endpreamble
\postamble
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -127,7 +127,7 @@
}
\endbatchfile
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/apa6.cls 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -27,7 +27,7 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesClass{apa6}[2018/09/01 v2.33 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2020/01/13 v2.34 APA formatting (6th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -188,7 +188,7 @@
\ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
}{%
\def\def at biblatex{\@biblatexmode}% the selected bibliography package is Biblatex
- \RequirePackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+ \RequirePackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\@ifundefined{def at man}{%
\defbibheading{bibliography}{\section*{\normalfont\refname}}%
}{%
@@ -231,7 +231,9 @@
}
+\renewcommand\and{\vspace{0.25in}\\}
+
\long\def\ifapamodeman#1#2{\@ifundefined{def at man}{#2}{#1}}
\long\def\ifapamodejou#1#2{\@ifundefined{def at jou}{#2}{#1}}
\long\def\ifapamodedoc#1#2{\@ifundefined{def at doc}{#2}{#1}}
@@ -785,7 +787,7 @@
\@ifundefined{@title}{%
\ClassWarningNoLine{apa6}{Title not defined}\def\@title{Title}}{}
\@ifundefined{@shorttitle}{%
- \ClassWarningNoLine{apa6}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
+ \ClassWarningNoLine{apa6}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
\@ifundefined{@affil}{%
\ClassWarningNoLine{apa6}{Affiliation not defined}\def\@affil{Affiliation}}{}
\@ifundefined{@abstract}{%
@@ -1772,7 +1774,7 @@
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Footnotes}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Footnotes}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Poznámky}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Voetnoten}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -99,7 +99,7 @@
\xdef\ef at endsidetabletest{\string\\end\string\{sidewaystable\string\}}
\xdef\ef at endlongtabletest{\string\\end\string\{longtable\string\}}}%
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Footnotes}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Fußnoten}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Fußnoten}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
Modified: trunk/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt
===================================================================
--- trunk/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt 2020-01-13 21:24:53 UTC (rev 53389)
+++ trunk/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt 2020-01-13 21:25:18 UTC (rev 53390)
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Dipnotlar}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
More information about the tex-live-commits
mailing list