From 0a25eca87ae000c2200142d4149e4fd2ff7ae3c5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Aug 2020 21:43:24 +0000 Subject: apa7 (3aug20) git-svn-id: svn://tug.org/texlive/trunk@56037 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/apa7/apa7.cls | 7 ++++--- Master/texmf-dist/tex/latex/apa7/config/APA7american.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7british.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7czech.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7dutch.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7english.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7german.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7greek.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7ngerman.txt | 3 ++- Master/texmf-dist/tex/latex/apa7/config/APA7turkish.txt | 3 ++- 10 files changed, 22 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex') 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 -- cgit v1.2.3