From 5c4906a6f096f91ef65c49499722b82f03654779 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Jan 2020 21:25:18 +0000 Subject: apa6 (13jan20) git-svn-id: svn://tug.org/texlive/trunk@53390 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/apa6/apa6.cls | 12 +++++++----- Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAczech.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt | 4 ++-- Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt | 4 ++-- 11 files changed, 27 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/tex/latex/apa6') diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls index 0448c82c50a..eda61101277 100644 --- a/Master/texmf-dist/tex/latex/apa6/apa6.cls +++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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@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}}% }{% @@ -231,6 +231,8 @@ } +\renewcommand\and{\vspace{0.25in}\\} + \long\def\ifapamodeman#1#2{\@ifundefined{def@man}{#2}{#1}} \long\def\ifapamodejou#1#2{\@ifundefined{def@jou}{#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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt index 33ea6ba7653..152d7b2b18d 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt index 733b1ba8831..00ad114a2d6 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt index e9c75716988..d62051f4f34 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAczech.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt index 0a479c71971..136837a1f39 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg index efb680b323f..1df806c4fd4 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg +++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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@endsidetabletest{\string\\end\string\{sidewaystable\string\}} \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}% %% -%% Copyright (C) 2011-2017 by Brian D. Beitzel +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt index d8c3d2a3a8d..18e3d7ca7ce 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt index ba9da591921..b4ed7271fa0 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt index 6aa8e65db7e..2ae9e1b083b 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt index 94f5ee2563f..2680aaf1da3 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt index 410d5597db7..af5ca20c981 100644 --- a/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt +++ b/Master/texmf-dist/tex/latex/apa6/config/APAturkish.txt @@ -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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% 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 +%% Copyright (C) 2011-2020 by Brian D. Beitzel %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License (LPPL), either -- cgit v1.2.3