From d15f76d838e1f2276ee38476c1b59aba781f1237 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Mar 2021 22:04:54 +0000 Subject: apa7 (4mar21) git-svn-id: svn://tug.org/texlive/trunk@58121 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/apa7/apa7.pdf | Bin 530694 -> 530950 bytes .../doc/latex/apa7/samples/longsample.pdf | Bin 196588 -> 196588 bytes .../doc/latex/apa7/samples/longsample.tex | 3 +-- .../doc/latex/apa7/samples/shortsample.pdf | Bin 65352 -> 65352 bytes .../doc/latex/apa7/samples/shortsample.tex | 3 +-- Master/texmf-dist/source/latex/apa7/apa7.dtx | 24 ++++++++++----------- Master/texmf-dist/tex/latex/apa7/apa7.cls | 4 ++-- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf index 342cc96d436..fcfd0c2041f 100644 Binary files a/Master/texmf-dist/doc/latex/apa7/apa7.pdf and b/Master/texmf-dist/doc/latex/apa7/apa7.pdf differ diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf index 52c3461ee06..35f4b636308 100644 Binary files a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf and b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf differ diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex index f8027804734..ed390923950 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.tex @@ -34,8 +34,7 @@ \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} -\DeclareLanguageMapping{american}{american-apa} +\usepackage[style=apa,backend=biber]{biblatex} \addbibresource{bibliography.bib} \title{Sample APA-Style Document Using the \textsf{apa7} Package} diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf index 63b1d5be796..135d919bebf 100644 Binary files a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf and b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf differ diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex index 86c7104ead0..f00b31de39d 100644 --- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex +++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.tex @@ -32,8 +32,7 @@ \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} -\DeclareLanguageMapping{american}{american-apa} +\usepackage[style=apa,backend=biber]{biblatex} \addbibresource{bibliography.bib} \title{Sample APA-Style Document Using the \textsf{apa7} Package} diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx index 9819cca02bb..85bcdc5e884 100644 --- a/Master/texmf-dist/source/latex/apa7/apa7.dtx +++ b/Master/texmf-dist/source/latex/apa7/apa7.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%\ProvidesClass{apa7}[2021/03/03 v2.09 APA formatting (7th edition)] +%\ProvidesClass{apa7}[2021/03/04 v2.10 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2021/03/03} -\def\apaSevenVersionNumber{2.09} +\def\apaSevenVersionDate{2021/03/04} +\def\apaSevenVersionNumber{2.10} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -267,6 +267,8 @@ and the derived files apa7.ins, % % \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. } % +% \changes{v2.10}{2021/03/04}{Update BibLaTex instructions to remove DeclareLanguageMapping and remove commands that are no longer required. } +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -788,9 +790,8 @@ and the derived files apa7.ins, % \textit{\textbf{Note:} This is the recommended method for 7th edition citations and references.} \\ % Biblatex is the most APA-compliant bibiliography package. The % \DescribeMacro{biblatex}|biblatex| option directs \textsf{apa7} to -% load the \textsf{biblatex} package with the following options: -% style=apa,sortcites=true,sorting=nyt; however, the -% |\DeclareLanguageMapping| and |\addbibresource| commands will need +% load the \textsf{biblatex} package with the following option: +% style=apa; however, the |\addbibresource| command will need % to be specified by the user within the document preamble. In the % absence of bibliographic options, \textsf{apa7} will mask references % using \textsf{biblatex} commands if the |mask| option is specified. @@ -915,8 +916,7 @@ and the derived files apa7.ins, \usepackage[american]{babel} \usepackage{csquotes} - \usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} - \DeclareLanguageMapping{american}{american-apa} + \usepackage[style=apa,backend=biber]{biblatex} \addbibresource{bibliography.bib} \title{Sample APA-Style Document Using the \textsf{apa7} Package} @@ -1235,7 +1235,7 @@ and the derived files apa7.ins, \ClassInfo{apa7}{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=apa,backend=biber]{biblatex} \@ifundefined{def@man}{% \defbibheading{bibliography}[\refname]{\section*{\normalfont\textbf{#1}}}% }{% @@ -3411,8 +3411,7 @@ and the derived files apa7.ins, \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} -\DeclareLanguageMapping{american}{american-apa} +\usepackage[style=apa,backend=biber]{biblatex} \addbibresource{bibliography.bib} \title{Sample APA-Style Document Using the \textsf{apa7} Package} @@ -3528,8 +3527,7 @@ skill in interpreting the results for the masses. \usepackage[american]{babel} \usepackage{csquotes} -\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex} -\DeclareLanguageMapping{american}{american-apa} +\usepackage[style=apa,backend=biber]{biblatex} \addbibresource{bibliography.bib} \title{Sample APA-Style Document Using the \textsf{apa7} Package} diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls index 995782811b2..e540e0f51e6 100644 --- a/Master/texmf-dist/tex/latex/apa7/apa7.cls +++ b/Master/texmf-dist/tex/latex/apa7/apa7.cls @@ -27,7 +27,7 @@ %% %% ---------------------------------------------------------------------- %% -\ProvidesClass{apa7}[2021/03/03 v2.09 APA formatting (7th edition)] +\ProvidesClass{apa7}[2021/03/04 v2.10 APA formatting (7th edition)] \NeedsTeXFormat{LaTeX2e} \DeclareOption{man}{% @@ -193,7 +193,7 @@ \ClassInfo{apa7}{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=apa,backend=biber]{biblatex} \@ifundefined{def@man}{% \defbibheading{bibliography}[\refname]{\section*{\normalfont\textbf{#1}}}% }{% -- cgit v1.2.3