From b3225c4301e7724de481f410444fef5463799b9d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 14 Jan 2020 03:00:43 +0000 Subject: CTAN sync 202001140300 --- macros/latex/contrib/apa6/README | 2 +- macros/latex/contrib/apa6/apa6.dtx | 64 +++++++++++++-------- macros/latex/contrib/apa6/apa6.ins | 8 +-- macros/latex/contrib/apa6/apa6.pdf | Bin 596112 -> 595965 bytes macros/latex/contrib/apa6/config/APAamerican.txt | 4 +- macros/latex/contrib/apa6/config/APAbritish.txt | 4 +- macros/latex/contrib/apa6/config/APAczech.txt | 4 +- macros/latex/contrib/apa6/config/APAdutch.txt | 4 +- macros/latex/contrib/apa6/config/APAendfloat.cfg | 4 +- macros/latex/contrib/apa6/config/APAenglish.txt | 4 +- macros/latex/contrib/apa6/config/APAgerman.txt | 4 +- macros/latex/contrib/apa6/config/APAgreek.txt | 4 +- macros/latex/contrib/apa6/config/APAngerman.txt | 4 +- macros/latex/contrib/apa6/config/APAturkish.txt | 4 +- .../contrib/apa6/pseudoTeX/TeX2WordForapa6.bas | 4 +- macros/latex/contrib/apa6/pseudoTeX/apa6.ptex | 4 +- macros/latex/contrib/apa6/samples/bibliography.bib | 4 +- macros/latex/contrib/apa6/samples/longsample.tex | 12 ++-- macros/latex/contrib/apa6/samples/shortsample.tex | 8 +-- 19 files changed, 82 insertions(+), 64 deletions(-) (limited to 'macros/latex/contrib/apa6') diff --git a/macros/latex/contrib/apa6/README b/macros/latex/contrib/apa6/README index 816a267391..c45a7bcc56 100644 --- a/macros/latex/contrib/apa6/README +++ b/macros/latex/contrib/apa6/README @@ -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 +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/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: % % % -%\ProvidesClass{apa6}[2018/09/01 v2.33 APA formatting (6th edition)] +%\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 +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 @@ -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 +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 @@ -84,7 +84,7 @@ by, the American Psychological Association. \endpreamble \postamble -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 @@ -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 diff --git a/macros/latex/contrib/apa6/apa6.ins b/macros/latex/contrib/apa6/apa6.ins index 7aad72df9d..6d5485881b 100644 --- a/macros/latex/contrib/apa6/apa6.ins +++ b/macros/latex/contrib/apa6/apa6.ins @@ -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 @@ -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 +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 @@ -56,7 +56,7 @@ by, the American Psychological Association. \endpreamble \postamble -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 @@ -127,7 +127,7 @@ and the derived files apa6.ins, } \endbatchfile %% -%% 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/macros/latex/contrib/apa6/apa6.pdf b/macros/latex/contrib/apa6/apa6.pdf index 91bb18902d..d6d3fc7cf6 100644 Binary files a/macros/latex/contrib/apa6/apa6.pdf and b/macros/latex/contrib/apa6/apa6.pdf differ diff --git a/macros/latex/contrib/apa6/config/APAamerican.txt b/macros/latex/contrib/apa6/config/APAamerican.txt index 8d11847de7..132ff75ecf 100644 --- a/macros/latex/contrib/apa6/config/APAamerican.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAbritish.txt b/macros/latex/contrib/apa6/config/APAbritish.txt index 1502891d7a..b4fe54695d 100644 --- a/macros/latex/contrib/apa6/config/APAbritish.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAczech.txt b/macros/latex/contrib/apa6/config/APAczech.txt index 13205ef8ef..242beee55c 100644 --- a/macros/latex/contrib/apa6/config/APAczech.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAdutch.txt b/macros/latex/contrib/apa6/config/APAdutch.txt index 451c6c43e6..d8b28e16da 100644 --- a/macros/latex/contrib/apa6/config/APAdutch.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAendfloat.cfg b/macros/latex/contrib/apa6/config/APAendfloat.cfg index 8481d40641..99c937cb39 100644 --- a/macros/latex/contrib/apa6/config/APAendfloat.cfg +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAenglish.txt b/macros/latex/contrib/apa6/config/APAenglish.txt index 3e3f00c6f3..68ab6237d4 100644 --- a/macros/latex/contrib/apa6/config/APAenglish.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAgerman.txt b/macros/latex/contrib/apa6/config/APAgerman.txt index 21be0c34d1..f2adf9a041 100644 --- a/macros/latex/contrib/apa6/config/APAgerman.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAgreek.txt b/macros/latex/contrib/apa6/config/APAgreek.txt index 1d3164079a..665d23d965 100644 --- a/macros/latex/contrib/apa6/config/APAgreek.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAngerman.txt b/macros/latex/contrib/apa6/config/APAngerman.txt index dde821c1c8..3b697bb7c2 100644 --- a/macros/latex/contrib/apa6/config/APAngerman.txt +++ b/macros/latex/contrib/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/macros/latex/contrib/apa6/config/APAturkish.txt b/macros/latex/contrib/apa6/config/APAturkish.txt index 49a3aeadcf..bd1674d9c1 100644 --- a/macros/latex/contrib/apa6/config/APAturkish.txt +++ b/macros/latex/contrib/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 diff --git a/macros/latex/contrib/apa6/pseudoTeX/TeX2WordForapa6.bas b/macros/latex/contrib/apa6/pseudoTeX/TeX2WordForapa6.bas index 359c34ff79..239c8976a1 100644 --- a/macros/latex/contrib/apa6/pseudoTeX/TeX2WordForapa6.bas +++ b/macros/latex/contrib/apa6/pseudoTeX/TeX2WordForapa6.bas @@ -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 @@ -360,7 +360,7 @@ Sub FormatAndMoveTex2WordFigures() End Sub %% -%% 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/macros/latex/contrib/apa6/pseudoTeX/apa6.ptex b/macros/latex/contrib/apa6/pseudoTeX/apa6.ptex index a7363d1dae..a98b14e6f2 100644 --- a/macros/latex/contrib/apa6/pseudoTeX/apa6.ptex +++ b/macros/latex/contrib/apa6/pseudoTeX/apa6.ptex @@ -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 @@ -375,7 +375,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/macros/latex/contrib/apa6/samples/bibliography.bib b/macros/latex/contrib/apa6/samples/bibliography.bib index d65b959273..fe16588c9a 100644 --- a/macros/latex/contrib/apa6/samples/bibliography.bib +++ b/macros/latex/contrib/apa6/samples/bibliography.bib @@ -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 @@ -190,7 +190,7 @@ the design of multimedia instruction}, } %% -%% 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/macros/latex/contrib/apa6/samples/longsample.tex b/macros/latex/contrib/apa6/samples/longsample.tex index a14ca85bfa..38d00b8546 100644 --- a/macros/latex/contrib/apa6/samples/longsample.tex +++ b/macros/latex/contrib/apa6/samples/longsample.tex @@ -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 @@ -34,14 +34,14 @@ \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} @@ -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@oneonta.edu} @@ -185,7 +185,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22] \end{document} %% -%% 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/macros/latex/contrib/apa6/samples/shortsample.tex b/macros/latex/contrib/apa6/samples/shortsample.tex index 739ed5c4f7..8c21c1004c 100644 --- a/macros/latex/contrib/apa6/samples/shortsample.tex +++ b/macros/latex/contrib/apa6/samples/shortsample.tex @@ -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 @@ -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 @@ skill in interpreting the results for the masses. \end{document} %% -%% 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