CTAN sync 202001140300

1 files changed, 41 insertions, 23 deletions

diff --git a/macros/latex/contrib/apa6/apa6.dtx b/macros/latex/contrib/apa6/apa6.dtx
index 9089571f67..647e6410a9 100644
--- a/macros/latex/contrib/apa6/apa6.dtx
+++ b/macros/latex/contrib/apa6/apa6.dtx
@@ -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 @@ details.
 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 @@ by, the American Psychological Association.
 \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 @@ and the derived files           apa6.ins,
 %     \thanks{This file describes version ^^A
 %     \apaSixVersionNumber, last revised \apaSixVersionDate.}^^A
 % }
-% \author{Brian D. Beitzel\thanks{E-mail: brian@beitzel.com}}
+% \author{Brian D.\ Beitzel\thanks{E-mail: brian@beitzel.com}}
 % \date{Released \apaSixVersionDate}
 %
 % \maketitle
@@ -315,6 +315,12 @@ and the derived files           apa6.ins,
 % \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 @@ and the derived files           apa6.ins,
 % 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 @@ and the derived files           apa6.ins,
 %   |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,14 +949,14 @@ and the derived files           apa6.ins,
 %   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
 %   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 @@ and the derived files           apa6.ins,
 % \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 @@ and the derived files           apa6.ins,
       \ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
     }{%
       \def\def@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@man}{%
         \defbibheading{bibliography}{\section*{\normalfont\refname}}%
       }{%
@@ -1331,6 +1342,9 @@ and the derived files           apa6.ins,
 %  {\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,13 +1993,17 @@ and the derived files           apa6.ins,
 \def\copnum#1{\def\@copnum{#1}}
 \def\@error@toomanyauthors{\ClassWarningNoLine{apa6}{More authors than affiliations defined}}
 \def\@error@toomanyaffils{\ClassWarningNoLine{apa6}{More affiliations than authors defined}}
+% \RequirePackage{xstring}  %% need this if inserting default shorttitle (three lines commented out below)
 \def\check@author{%
  \@ifundefined{@author}{%
   \ClassWarningNoLine{apa6}{Author not defined}\def\@author{Author}}{}
  \@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 @@ and the derived files           apa6.ins,
 \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,14 +3659,14 @@ skill in interpreting the results for the masses.
 \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}
 \shorttitle{Sample Document}
 
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
 \affiliation{SUNY Oneonta}
 
 \leftheader{Beitzel}
@@ -3657,11 +3675,11 @@ skill in interpreting the results for the masses.
 
 \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@oneonta.edu}
 
@@ -4748,4 +4766,4 @@ End Sub
 %\end{macro}
 %
 %
-%\Finale
\ No newline at end of file
+%\Finale