apa7 (3aug20)

git-svn-id: svn://tug.org/texlive/trunk@56037 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 48 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/latex/apa7/apa7.pdf b/Master/texmf-dist/doc/latex/apa7/apa7.pdf
index a6145daf757..eaaac2a8ca2 100644
--- a/Master/texmf-dist/doc/latex/apa7/apa7.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/apa7.pdf
diff --git a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
index 7aa049b5f40..cb080d9a482 100644
--- a/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/samples/longsample.pdf
diff --git a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
index 46cbaded6fd..e2536018fbf 100644
--- a/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
+++ b/Master/texmf-dist/doc/latex/apa7/samples/shortsample.pdf
diff --git a/Master/texmf-dist/source/latex/apa7/apa7.dtx b/Master/texmf-dist/source/latex/apa7/apa7.dtx
index 692341f011c..dc57e6829ea 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:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa7}[2020/07/18 v2.01 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2020/08/02 v2.02 APA formatting (7th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSevenVersionDate{2020/07/18}
-\def\apaSevenVersionNumber{2.01}
+\def\apaSevenVersionDate{2020/08/02}
+\def\apaSevenVersionNumber{2.02}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -249,6 +249,8 @@ and the derived files           apa7.ins,
 %
 % \changes{v2.01}{2020/07/18}{Re-wrote author and affiliation to be APA7 compliant. Fixed spacing on Title Page for title and author. }
 %
+% \changes{v2.02}{2020/08/02}{Added the "and" in multiple author list to translation files. }
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -1438,6 +1440,7 @@ and the derived files           apa7.ins,
 % Based on handling of the same issue in apacite.sty
 
 % First define the default American English macros in case no external file is present or needed
+\def\lastauthorseparator{and}
 \def\acksname{Author Note}
 \def\keywordname{Keywords}
 \def\notesname{Footnotes}
@@ -1983,7 +1986,7 @@ and the derived files           apa7.ins,
     \renewcommand{\lastauthor}{%
       \renewcommand{\authorsep}{, 
         \renewcommand*{\prelastauthorsep}{,}}%
-      \renewcommand{\prelastauthor}{\prelastauthorsep\ and }%
+      \renewcommand{\prelastauthor}{\prelastauthorsep\ \lastauthorseparator\ }% Terminated commands with \ to preserve following space
       ##1%
     }%
       }%
@@ -1995,7 +1998,7 @@ and the derived files           apa7.ins,
     \renewcommand{\lastauthor}{%
       \renewcommand{\authorsep}{, 
         \renewcommand*{\prelastauthorsep}{,}}%
-      \renewcommand{\prelastauthor}{\prelastauthorsep\ and }%
+      \renewcommand{\prelastauthor}{\prelastauthorsep\ \lastauthorseparator\ }% Terminated commands with \ to preserve following space
       ##1\textsuperscript{##2}%
     }%
   }%
@@ -3652,8 +3655,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7american.txt}
 %    \begin{macrocode}
 %<*american>
-\ProvidesFile{APA7american.txt}[2019/12/29 v1.00 apa7 configuration for American English]
+\ProvidesFile{APA7american.txt}[2020/08/02 v1.01 apa7 configuration for American English]
 
+\renewcommand{\lastauthorseparator}{and}
 \renewcommand{\acksname}{Author Note}
 \renewcommand{\keywordname}{Keywords}
 \renewcommand{\notesname}{Footnotes}
@@ -3667,8 +3671,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7british.txt}
 %    \begin{macrocode}
 %<*british>
-\ProvidesFile{APA7british.txt}[2019/12/29 v1.00 apa7 configuration for British English]
+\ProvidesFile{APA7british.txt}[2020/08/02 v1.01 apa7 configuration for British English]
 
+\renewcommand{\lastauthorseparator}{and}
 \renewcommand{\acksname}{Author Note}
 \renewcommand{\keywordname}{Keywords}
 \renewcommand{\notesname}{Footnotes}
@@ -3682,8 +3687,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7english.txt}
 %    \begin{macrocode}
 %<*english>
-\ProvidesFile{APA7english.txt}[2019/12/29 v1.00 apa7 configuration for non-American English]
+\ProvidesFile{APA7english.txt}[2020/08/02 v1.01 apa7 configuration for non-American English]
 
+\renewcommand{\lastauthorseparator}{and}
 \renewcommand{\acksname}{Author Note}
 \renewcommand{\keywordname}{Keywords}
 \renewcommand{\notesname}{Footnotes}
@@ -3695,8 +3701,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7dutch.txt}
 %    \begin{macrocode}
 %<*dutch>
-\ProvidesFile{APA7dutch.txt}[2019/12/29 v1.00 apa7 configuration for Dutch]
+\ProvidesFile{APA7dutch.txt}[2020/08/02 v1.01 apa7 configuration for Dutch]
 
+\renewcommand{\lastauthorseparator}{en}% and
 \renewcommand{\acksname}{Auteursnoot}% Author Note
 \renewcommand{\keywordname}{Trefwoorden}% Keywords
 \renewcommand{\notesname}{Voetnoten}% Footnotes
@@ -3708,8 +3715,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7german.txt}
 %    \begin{macrocode}
 %<*german>
-\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for German]
+\ProvidesFile{APA7german.txt}[2020/08/02 v1.01 apa7 configuration for German]
 
+\renewcommand{\lastauthorseparator}{und}% and
 \renewcommand{\acksname}{Autorenhinweis}% Author Note
 \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords
 \renewcommand{\notesname}{Fußnoten}% Footnotes
@@ -3721,8 +3729,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7ngerman.txt}
 %    \begin{macrocode}
 %<*ngerman>
-\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for "new" German]
+\ProvidesFile{APA7ngerman.txt}[2020/08/02 v1.01 apa7 configuration for "new" German]
 
+\renewcommand{\lastauthorseparator}{und}% and
 \renewcommand{\acksname}{Autorenhinweis}% Author Note
 \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords
 \renewcommand{\notesname}{Fußnoten}% Footnotes
@@ -3734,8 +3743,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7greek.txt}
 %    \begin{macrocode}
 %<*greek>
-\ProvidesFile{APA7greek.txt}[2019/12/29 v1.00 apa7 configuration for Greek]
+\ProvidesFile{APA7greek.txt}[2020/08/02 v1.01 apa7 configuration for Greek]
 
+\renewcommand{\lastauthorseparator}{και}% and
 \renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note
 \renewcommand{\keywordname}{L'exeis kleidi'a}% Keywords
 \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
@@ -3747,8 +3757,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7czech.txt}
 %    \begin{macrocode}
 %<*czech>
-\ProvidesFile{APA7czech.txt}[2019/12/29 v1.00 apa7 configuration for Czech]
+\ProvidesFile{APA7czech.txt}[2020/08/02 v1.01 apa7 configuration for Czech]
 
+\renewcommand{\lastauthorseparator}{a}% and
 \renewcommand{\acksname}{Poznámka~autora}% Author Note
 \renewcommand{\keywordname}{Klícová~1slova}% Keywords
 \renewcommand{\notesname}{Poznámky}% Footnotes
@@ -3760,8 +3771,9 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\begin{macro}{APA7turkish.txt}
 %    \begin{macrocode}
 %<*turkish>
-\ProvidesFile{APA7turkish.txt}[2019/12/29 v1.00 apa7 configuration for Turkish]
+\ProvidesFile{APA7turkish.txt}[2020/08/02 v1.01 apa7 configuration for Turkish]
 
+\renewcommand{\lastauthorseparator}{ve}% and
 \renewcommand{\acksname}{Yazar Notu}% Author Note
 \renewcommand{\keywordname}{Anahtar Kelimeler}% Keywords
 \renewcommand{\notesname}{Dipnotlar}% Footnotes
diff --git a/Master/texmf-dist/tex/latex/apa7/apa7.cls b/Master/texmf-dist/tex/latex/apa7/apa7.cls
index 8a614c0ca22..7dac58b6297 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}[2020/07/18 v2.01 APA formatting (7th edition)]
+\ProvidesClass{apa7}[2020/08/02 v2.02 APA formatting (7th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -371,6 +371,7 @@
 
 
 
+\def\lastauthorseparator{and}
 \def\acksname{Author Note}
 \def\keywordname{Keywords}
 \def\notesname{Footnotes}
@@ -851,7 +852,7 @@
     \renewcommand{\lastauthor}{%
       \renewcommand{\authorsep}{,
         \renewcommand*{\prelastauthorsep}{,}}%
-      \renewcommand{\prelastauthor}{\prelastauthorsep\ and }%
+      \renewcommand{\prelastauthor}{\prelastauthorsep\ \lastauthorseparator\ }% Terminated commands with \ to preserve following space
       ##1%
     }%
       }%
@@ -863,7 +864,7 @@
     \renewcommand{\lastauthor}{%
       \renewcommand{\authorsep}{,
         \renewcommand*{\prelastauthorsep}{,}}%
-      \renewcommand{\prelastauthor}{\prelastauthorsep\ and }%
+      \renewcommand{\prelastauthor}{\prelastauthorsep\ \lastauthorseparator\ }% Terminated commands with \ to preserve following space
       ##1\textsuperscript{##2}%
     }%
   }%
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7american.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7american.txt
index fd740bffa82..0b12aee2eca 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7american.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7american.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7american.txt}[2019/12/29 v1.00 apa7 configuration for American English]
+\ProvidesFile{APA7american.txt}[2020/08/02 v1.01 apa7 configuration for American English]
 
+\renewcommand{\lastauthorseparator}{and}
 \renewcommand{\acksname}{Author Note}
 \renewcommand{\keywordname}{Keywords}
 \renewcommand{\notesname}{Footnotes}
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7british.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7british.txt
index e41cf135d71..c75142fdd88 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7british.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7british.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7british.txt}[2019/12/29 v1.00 apa7 configuration for British English]
+\ProvidesFile{APA7british.txt}[2020/08/02 v1.01 apa7 configuration for British English]
 
+\renewcommand{\lastauthorseparator}{and}
 \renewcommand{\acksname}{Author Note}
 \renewcommand{\keywordname}{Keywords}
 \renewcommand{\notesname}{Footnotes}
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt
index 33393493d16..eb60de4d0cc 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7czech.txt}[2019/12/29 v1.00 apa7 configuration for Czech]
+\ProvidesFile{APA7czech.txt}[2020/08/02 v1.01 apa7 configuration for Czech]
 
+\renewcommand{\lastauthorseparator}{a}% and
 \renewcommand{\acksname}{Poznámka~autora}% Author Note
 \renewcommand{\keywordname}{Klícová~1slova}% Keywords
 \renewcommand{\notesname}{Poznámky}% Footnotes
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt
index 8b0affbf8bc..d72d8868182 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7dutch.txt}[2019/12/29 v1.00 apa7 configuration for Dutch]
+\ProvidesFile{APA7dutch.txt}[2020/08/02 v1.01 apa7 configuration for Dutch]
 
+\renewcommand{\lastauthorseparator}{en}% and
 \renewcommand{\acksname}{Auteursnoot}% Author Note
 \renewcommand{\keywordname}{Trefwoorden}% Keywords
 \renewcommand{\notesname}{Voetnoten}% Footnotes
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7english.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7english.txt
index 7cd8d1abdc8..87cc7a763f8 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7english.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7english.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7english.txt}[2019/12/29 v1.00 apa7 configuration for non-American English]
+\ProvidesFile{APA7english.txt}[2020/08/02 v1.01 apa7 configuration for non-American English]
 
+\renewcommand{\lastauthorseparator}{and}
 \renewcommand{\acksname}{Author Note}
 \renewcommand{\keywordname}{Keywords}
 \renewcommand{\notesname}{Footnotes}
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7german.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7german.txt
index ab24c54b257..b5a185bdb68 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7german.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7german.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for German]
+\ProvidesFile{APA7german.txt}[2020/08/02 v1.01 apa7 configuration for German]
 
+\renewcommand{\lastauthorseparator}{und}% and
 \renewcommand{\acksname}{Autorenhinweis}% Author Note
 \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords
 \renewcommand{\notesname}{Fußnoten}% Footnotes
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt
index 94f46bf5f85..89be164f2f2 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7greek.txt}[2019/12/29 v1.00 apa7 configuration for Greek]
+\ProvidesFile{APA7greek.txt}[2020/08/02 v1.01 apa7 configuration for Greek]
 
+\renewcommand{\lastauthorseparator}{και}% and
 \renewcommand{\acksname}{Shmei'wseis tou suggraf'ea}% Author Note
 \renewcommand{\keywordname}{L'exeis kleidi'a}% Keywords
 \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt
index ae85d5c4a7c..66f2ff46854 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7german.txt}[2019/12/29 v1.00 apa7 configuration for "new" German]
+\ProvidesFile{APA7ngerman.txt}[2020/08/02 v1.01 apa7 configuration for "new" German]
 
+\renewcommand{\lastauthorseparator}{und}% and
 \renewcommand{\acksname}{Autorenhinweis}% Author Note
 \renewcommand{\keywordname}{Schl\"usselw\"orter}% Keywords
 \renewcommand{\notesname}{Fußnoten}% Footnotes
diff --git a/Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt b/Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt
index fe6c8189d9a..42c4fec16cf 100644
--- a/Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt
+++ b/Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt
@@ -27,8 +27,9 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesFile{APA7turkish.txt}[2019/12/29 v1.00 apa7 configuration for Turkish]
+\ProvidesFile{APA7turkish.txt}[2020/08/02 v1.01 apa7 configuration for Turkish]
 
+\renewcommand{\lastauthorseparator}{ve}% and
 \renewcommand{\acksname}{Yazar Notu}% Author Note
 \renewcommand{\keywordname}{Anahtar Kelimeler}% Keywords
 \renewcommand{\notesname}{Dipnotlar}% Footnotes