biblatex-apa6 (3may20)

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

30 files changed, 275 insertions, 210 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
index 998145555e2..c056b75b0f4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf b/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
index b771b6aaeac..0a57a7be90b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex b/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex
index e2acfe35448..a1b236afe62 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex
@@ -24,7 +24,7 @@
   url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={8.2},
+  revision={8.4},
   date={\today}}
 
 \hypersetup{%
@@ -457,7 +457,15 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
 \section{Revision history}\label{rev}
 
 \begin{changelog}
-\begin{release}{8.2}{2019-12-01}
+\begin{release}{8.4}{2020-05-03}
+\item Misc bug fixes
+\end{release}
+
+\begin{release}{8.3}{2019-12-02}
+\item Misc bug fixes
+\end{release}
+
+  \begin{release}{8.2}{2019-12-01}
 \item Removed |apabackref| option, use the standard
   |biblatex| |backref| option instead
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
index 925571781ea..3ce35769a6e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{american-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
index 6f8714a1882..56248f28708 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
@@ -1,4 +1,4 @@
-%% Copyright 2019 Philip Kime
+%% Copyright 2020 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,10 +12,10 @@
 %%
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa6.bbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex references style]
+\ProvidesFile{apa6.bbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
-\urlstyle{rm} % APA examples all have URLs in same font as text
+\urlstyle{same} % APA examples all have URLs in same font as text
 
 % Declare the language mapping suffix
 \DeclareLanguageMappingSuffix{-apa6}
@@ -82,18 +82,6 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 4.16 Example 29) Some DSM macros
-
-\gdef\DSMIII{\emph{DSM-III}}
-\gdef\DSMIIIR{\emph{DSM-III-R}}
-\gdef\DSMIV{\emph{DSM-IV}}
-\gdef\DSMIVTR{\emph{DSM-IV-TR}}
-\gdef\PsycSCAN{\emph{PsycSCAN}}
-\gdef\PsycARTICLES{\emph{PsycARTICLES}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -177,9 +165,9 @@
 % eprint references
 
 \DeclareFieldFormat{eprint:eric}{%
-  \printtext{\bibcpstring{retrieved}}%
-  \setunit{\addspace}%
-  \printtext{\bibstring{from}}\addspace%
+  \bibcpstring{retrieved}%
+  \addspace
+  \bibstring{from}\addspace%
   ERIC\addspace database\adddot\addspace%
   \mkbibparens{#1}}
 
@@ -298,10 +286,11 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.29) Additional material sometimes goes in parens
-%            after title. This bool tracks the parens.
+%            after title. This bool used to track the
+%            parens. It is no longer needed and just kept
+%            for backwarwds compatibility.
 
 \newbool{bbx:parens}
-\AtEveryBibitem{\global\boolfalse{bbx:parens}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -428,9 +417,12 @@
      \printfield{nameaddon}%
      \ifnameundef{with}
        {}
-       {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
-        \printnames[apaauthor][-\value{listtotal}]{with}}
-        \setunit*{\addspace}}}%
+       {\setunit{\addspace}%
+        \printtext[parens]{%
+          \bibstring{with}%
+          \setunit{\addspace}%
+          \printnames[apaauthor][-\value{listtotal}]{with}}%
+        \setunit{\addspace}}}%
   \newunit\newblock%
   \usebibmacro{labelyear+extradate}}
 
@@ -484,8 +476,8 @@
 
 \DeclareFieldFormat{apadate}{%
   \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} }
-    {\printtext{\mkbibbrackets{#1}}}
-    {\printtext{\mkbibparens{#1}}}}
+    {\mkbibbrackets{#1}}
+    {\mkbibparens{#1}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -544,13 +536,10 @@
 \newbibmacro*{bookaddinfo}{%
   \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
     {}
-    {\printtext{\bibopenparen}%
-     \printfield{edition}%
-     \setunit*{\addcomma\addspace}%
-     \printfield{volumes}%
-     \setunit{}%
-     \printtext{\bibcloseparen}}%
-}
+    {\printtext[parens]{%
+       \printfield{edition}%
+       \setunit*{\addcomma\addspace}%
+       \printfield{volumes}}}}
 
 \renewbibmacro*{title}{%
   \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
@@ -641,21 +630,24 @@
               \iffieldundef{number}\AND%
               \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
   {}
-  {\printtext{\bibopenparen}%
-   \printfield{edition}%
-   \setunit*{\addcomma\addspace}%
-   \printfield{chapter}%
-   \setunit*{\addcomma\addspace}%
-   \notbool{bbx:volseen}%
-     {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}%
-      \printfield{volume}%
-      \iffieldundef{part}{}{\printfield{part}}}{}%
-   \setunit*{\addcomma\addspace}%
-   \printfield{volumes}%
-   \setunit*{\addcomma\addspace}%
-   \printfield{pages}%
-   \setunit{}%
-   \printtext{\bibcloseparen}}}
+  {\printtext[parens]{%
+     \printfield{edition}%
+     \setunit*{\addcomma\addspace}%
+     \printfield{chapter}%
+     \setunit*{\addcomma\addspace}%
+     \notbool{bbx:volseen}%
+       {\iffieldundef{volume}
+          {}
+          {\global\booltrue{bbx:volseen}}%
+        \printfield{volume}%
+        \iffieldundef{part}
+          {}
+          {\printfield{part}}}
+       {}%
+     \setunit*{\addcomma\addspace}%
+     \printfield{volumes}%
+     \setunit*{\addcomma\addspace}%
+     \printfield{pages}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -803,30 +795,28 @@
               \ifnameundef{translator}}%
     {}%
     {\ifnamesequal{editor}{translator}%
-       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
-        \printnames[apanames][-\value{listtotal}]{editor}%
-        \setunit*{\addcomma\addspace}%
-        \usebibmacro{apaeditorstrg}{editor}%
-        \setunit*{\addspace\&\space}%
-        \printtext{\bibcpstring{translator}}%
-        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
-       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
-        \ifnameundef{editor}%
-          {}%
-          {\printnames[apanames][-\value{listtotal}]{editor}%
-           \setunit{\addcomma\addspace}%
-           \usebibmacro{apaeditorstrg}{editor}%
-           \clearname{editor}%
-           \setunit{\adddot}%
-           \setunit*{\addspace\&\space}}%
-        \ifnameundef{translator}%
-          {\setunit{}}%
-          {\printnames[apanames][-\value{listtotal}]{translator}%
-           \setunit{\addcomma\addspace}%
-           \printtext{\bibcpstring{translator}}%
-           \clearname{translator}%
-           \setunit{\adddot}}%
-        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
+       {\printtext[parens]{%
+          \printnames[apanames][-\value{listtotal}]{editor}%
+          \setunit*{\addcomma\addspace}%
+          \usebibmacro{apaeditorstrg}{editor}%
+          \setunit*{\addspace\&\space}%
+          \bibcpstring{translator}}}
+       {\printtext[parens]{%
+          \ifnameundef{editor}%
+            {}%
+            {\printnames[apanames][-\value{listtotal}]{editor}%
+             \setunit{\addcomma\addspace}%
+             \usebibmacro{apaeditorstrg}{editor}%
+             \clearname{editor}%
+             \setunit{\adddot}%
+             \setunit*{\addspace\&\space}}%
+          \ifnameundef{translator}%
+            {\setunit{}}%
+            {\printnames[apanames][-\value{listtotal}]{translator}%
+             \setunit{\addcomma\addspace}%
+             \bibcpstring{translator}%
+             \clearname{translator}%
+             \setunit{\adddot}}}}}}
 
 \newbibmacro*{editor+trans}{%
   \ifthenelse{\ifnameundef{editor}\AND%
@@ -838,17 +828,17 @@
     {\ifnamesequal{editor}{translator}%
       {\usebibmacro{in}%
        \printnames[apanames][-\value{listtotal}]{editor}%
-       \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
-       \usebibmacro{apaeditorstrg}{editor}%
-       \setunit*{\addspace\&\space}%
-       \printtext{\bibcpstring{translator}}%
-       \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+       \setunit{\addspace}
+       \printtext[parens]{%
+         \usebibmacro{apaeditorstrg}{editor}%
+         \setunit*{\addspace\&\space}%
+         \bibcpstring{translator}}}
       {\ifnameundef{translator}%
         {}%
         {\setunit{\addspace}%
          \printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}%
          \setunit{\addcomma\addspace}%
-         \printtext{\bibcpstring{translator}}}%
+         \bibcpstring{translator}}%
          \clearname{translator}%
          \setunit{\adddot\addspace}}%
        \usebibmacro{in}%
@@ -904,8 +894,11 @@
     not test {\iffieldundef{origyear}}
     not test {\iffieldundef{labelyear}}
     and not test {\iffieldsequal{labelyear}{origyear}}}
-      {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}}
-      {}}
+    {\printtext[parens]{%
+       \bibcpstring{origyear}
+       \setunit{\addnbspace}%
+       \printorigdate}}
+    {}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1051,9 +1044,9 @@
 \newcommand*{\begrelateddelimreviewof}{\addspace}
 \DeclareFieldFormat[review]{title}{%
   \entrydata*{\thefield{related}}{%
-    \ifentrytype{article}
-      {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}}
-      {\printtext[apacase]{\thefield{savedtitle}}}}}
+    \printtext[title]{%
+      \printtext[apacase]{%
+        \thefield{savedtitle}}}}}
 
 \DeclareFieldFormat[review]{pages}{#1}
 \DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
@@ -1185,26 +1178,27 @@
 \DeclareFieldFormat{urldate}{#1}
 
 \renewbibmacro*{url+urldate}{%
-     \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}}
+  \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}}
+    {}
+    {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
        {}
-       {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
-         {}
-         {\printtext{\bibcpstring{abstract}}\addspace}%
-         \iffieldequalstr{entrysubtype}{{DVD}}
-           {\printtext{\bibstring{available}}}
-           {\printtext{\bibstring{retrieved}}}%
-          \setunit{\addspace}%
-          \iffieldundef{urlyear}
-            {}
-            {\printtext{\printurldate}%
-             \setunit*{\urldatecomma}}%
-          \printtext{\bibstring{from}}%
-          \setunit*{\addspace}%
-          \printfield{urldescription}%
-          \setunit*{\addcolon\addspace}%
-          \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
-          \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}%
-          \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
+       {\bibcpstring{abstract}%
+        \setunit{\addspace}}%
+     \iffieldequalstr{entrysubtype}{{DVD}}
+       {\bibstring{available}}
+       {\bibstring{retrieved}}%
+     \setunit{\addspace}%
+     \iffieldundef{urlyear}
+       {}
+       {\printurldate
+        \setunit{\urldatecomma}}%
+     \bibstring{from}%
+     \setunit{\addspace}%
+     \printfield{urldescription}%
+     \setunit*{\addcolon\addspace}%
+     \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
+     \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}%
+     \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
 
 %
 %%%%%%%%%%%%%%%%%
@@ -1273,7 +1267,7 @@
 
 \renewbibmacro*{related:reprintfrom}[1]{%
   \entrydata*{#1}{%
-    \printtext{\mkbibemph{\printfield[apacase]{title}}}%
+    \printtext[title]{\printfield[apacase]{title}}%
     \setunit{\bibpagespunct}%
     \printfield{pages}%
     \setunit{\addcomma\addspace}%
@@ -1295,9 +1289,7 @@
 \newbibmacro*{related:reviewof}[1]{%
   \setunit{}% Sanitise this in case no author
   \entrydata*{#1}{%
-    \ifentrytype{article}
-      {\printtext{\printfield[apacase]{title}}}
-      {\printtext{\mkbibemph{\printfield[apacase]{title}}}}%
+    \printtext[title]{\printfield[apacase]{title}}%
     \setunit{\addspace}%
     \bibstring{byauthor}\addspace
     \printnames[apanames][-\value{listtotal}]{author}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
index b30b4da62ae..50815fdc3fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
@@ -1,4 +1,4 @@
-%% Copyright 2019 Philip Kime
+%% Copyright 2020 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
 %%
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa6.cbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex citation style]
+\ProvidesFile{apa6.cbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -42,33 +42,6 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) ampersand separator in parenthetical cites
-
-\DeclareDelimFormat[parencite]{finalnamedelim}
-  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
-
-\DeclareCiteCommand{\parencite}[\mkbibparens]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}%
-   \usebibmacro{cite:post}}
-  {}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand*{\parencite}[\mkbibparens]
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{citeyear}%
-   \usebibmacro{cite:post}}
-  {}
-  {\usebibmacro{postnote}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.11) Suffices are not shown in citations
 % (APA 6.12) 3-5 authors have "et al." after first cite
@@ -268,6 +241,9 @@
       \savefield{fullhash}{\cbx@lasthash}}}%
    \setunit{\multicitedelim}}
 
+\renewcommand*{\iffinalcitedelim}{%
+  \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
 \newbibmacro*{textcite}{%
   \iffieldequals{fullhash}{\cbx@lasthash}
 % Compact cite - more than one thing for same author
@@ -275,18 +251,16 @@
      \usebibmacro{cite:plabelyear+extradate}}
 % New cite
     {%
-    \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
-      {}%
-      \setunit{\compcitedelim}%
+      \ifbool{cbx:parens}
+        {\bibcloseparen\global\boolfalse{cbx:parens}}
+        {}%
+      \setunit{\textcitedelim}%
       \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
   % No author/editor or patent
        {\iffieldundef{shorthand}%
     % Cite using title
          {\usebibmacro{cite:noname}%
-          \setunit{\ifbool{cbx:np}%
-                   {\printdelim{nameyeardelim}}%
-                   {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+          \setunit{\global\booltrue{cbx:parens}\addspace\bibopenparen}%
           \usebibmacro{cite:plabelyear+extradate}}
     % Cite using shorthand
          {\usebibmacro{cite:shorthand}}}
@@ -300,19 +274,22 @@
            {\printnames{shortauthor}}
            {\printnames[labelname][-\value{listtotal}]{author}}}%
   % Year
-        \setunit{\ifbool{cbx:np}
-                  {\printdelim{nameyeardelim}}
-                  {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+        \setunit{\global\booltrue{cbx:parens}\addspace\bibopenparen}%
   % Put the shortauthor inside the year brackets if necessary
         \ifnameundef{shortauthor}
          {}
          {\cbx@apa@ifnamesaved
            {}
            {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}%
+  % Print prenote (belongs to first cite)
+        \ifnumequal{\value{citecount}}{1}
+           {\usebibmacro{prenote}}
+           {}%
   % Actual year printing
         \usebibmacro{cite:plabelyear+extradate}%
   % Save name hash for checks later
-        \savefield{fullhash}{\cbx@lasthash}}}}
+        \savefield{fullhash}{\cbx@lasthash}}%
+      \stepcounter{textcitecount}}}
 
 \newbibmacro*{cite:plabelyear+extradate}{%
   \iffieldundef{labelyear}{}
@@ -363,29 +340,7 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.21) No parens round year for cites when the cite is in
-%            parentheses. Use new command \nptextcite for such cites.
-
-\DeclareDelimFormat[nptextcite]{finalnamedelim}
-  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
-
-\DeclareCiteCommand{\nptextcite}
-  {\usebibmacro{cite:init}%
-   \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \global\booltrue{cbx:np}%
-   \usebibmacro{textcite}%
-   \usebibmacro{cite:post}%
-   \global\boolfalse{cbx:np}}%
-  {}
-  {\iffieldundef{postnote}
-     {}
-     {\printdelim{nameyeardelim}%
-      \printfield{postnote}}}
 
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % No shorthand
@@ -449,7 +404,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \newbool{cbx:parens} % boolean to say we're inside parens
-\newbool{cbx:np} % boolean to say we're using a non-parentheses text cite
 
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
@@ -478,6 +432,16 @@
     {\printfield{labelyear}%
        \printfield{extradate}}}
 
+
+\DeclareCiteCommand{\citeauthor}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite:author}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
 \DeclareCiteCommand{\citeyear}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
@@ -486,6 +450,7 @@
   {\multinamedelim}
   {\usebibmacro{postnote}}
 
+
 \DeclareCiteCommand{\cite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
@@ -495,6 +460,8 @@
   {}
   {\usebibmacro{postnote}}
 
+\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
+
 \DeclareCiteCommand*{\cite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
@@ -504,9 +471,15 @@
   {}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]
-  {\bibsentence
-   \usebibmacro{cite:init}%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) ampersand separator in parenthetical cites
+
+\DeclareDelimFormat[parencite]{finalnamedelim}
+  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}%
@@ -514,35 +487,127 @@
   {}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}
+  {\setunit{\multicitedelim}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \usebibmacro{textcite}%
+   \usebibmacro{citeyear}%
    \usebibmacro{cite:post}}
   {}
-  {\usebibmacro{textcite:postnote}}
+  {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\citeauthor}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.21) No parens round year for cites when the cite is in
+%            parentheses. Use new command \nptextcite for such cites.
+
+\DeclareDelimAlias*[nptextcite]{finalnamedelim}[parencite]{finalnamedelim}
+
+\DeclareCiteCommand{\nptextcite}
   {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
-   \usebibmacro{cite:author}%
+   \usebibmacro{cite}%
    \usebibmacro{cite:post}}
   {}
   {\usebibmacro{postnote}}
 
-
-\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\textcites}{\textcite}{\setunit{\compcitedelim}}
 \DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\setunit{\multicitedelim}}
-\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}
-  {\setunit{\multicitedelim}}
+
+\DeclareCiteCommand*{\nptextcite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
 \DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}
   {\setunit{\multicitedelim}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
 \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]
   {\footcitetext}{\setunit{\multicitedelim}}
+
+
+\DeclareCiteCommand{\smartcite}[\iffootnote\mkbibparens\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
 \DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]
   {\smartcite}{\setunit{\multicitedelim}}
 
+
+\DeclareCiteCommand{\cbx@textcite}
+  {\usebibmacro{cite:init}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{textcite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+  {\gdef\cbx@savedkeys{}%
+   \citetrackerfalse%
+   \pagetrackerfalse%
+   \DeferNextCitekeyHook%
+   \usebibmacro{cite:init}}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+     {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+      \global\clearfield{multipostnote}}
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx@lasthash}
+     {}
+     {\stepcounter{textcitetotal}%
+      \savefield{namehash}{\cbx@lasthash}}}
+  {}
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+% textcite has nested \DeclareCiteCommand definitions for textcite and we want to use
+% the normal textcite context
+\DeclareDelimcontextAlias{cbx@textcite}{textcite}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
index d85f511a666..1e31e40fa88 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
@@ -1,4 +1,4 @@
-%% Copyright 2019 Philip Kime
+%% Copyright 2020 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa6.dbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex style data model]
+\ProvidesFile{apa6.dbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
index 7229705370f..0ce89fce427 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{austrian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % Following DGPs guidlines for German/Austrian
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
index cb6760a8789..4ec7f9158cf 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{brazilian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
index 036ce2bef11..31642b76bb3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{british-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
index 456a057fd10..dc237de87c4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{danish-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{danish}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
index 4795fcd37b5..903a7b77ae0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{dutch-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
index 9eadd285d0a..79336ea83e5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{english-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{english}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
index 3f19ee669ee..4aed01e37a2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{french-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
index 52465ab0d22..5c90b5fb0ca 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{galician-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{galician}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
index 91a5cea4564..dd01497295d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{german-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
index 3cf49cb96d7..c65da12ebef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{greek-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
index 9fc2a327eaf..f24dda01a33 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{italian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
index eb0034b2e25..efc7dadadee 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{naustrian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
index a5289b2a8a0..3647ba8fc1b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{ngerman-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
index 083b8e97fac..21cf3366ac9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{norsk-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
index 52f60affffc..1e4bd4f6496 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{norwegian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
index 040afdc2e39..793ea220623 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{nswissgerman-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{nswissgerman}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
index 809be547a3f..d6660c762ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{nynorsk-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
index e70cc569c8c..9b272a9977b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{portuguese-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{portuguese}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
index 6850ffa1f9f..42399aa9c90 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{russian-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{russian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
index 1ce595d0d6a..e04b8fcac9c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{slovene-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{slovene}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
index c26be88ec36..79e76697054 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{spanish-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -54,7 +54,7 @@
   page             = {{P\'agina}{{}p\adddot}},
   pages            = {{P\'aginas}{{}pp\adddot}},
   on               = {{el}{el}},
-  retrieved        = {{Recuperado}{Recuperado}},
+  retrieved        = {{Consultado}{Consultado}},
   available        = {{disponible}{disponible}},
   from             = {{desde}{desde}},
   archivedat       = {{archivado en}{archivado en}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
index 644afb1b0d9..667af52f53f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{swedish-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
index 87109df58f4..335cd7df897 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa6.lbx}[2019/12/02\space v8.3\space APA 6th ed. biblatex localisation]
+\ProvidesFile{swissgerman-apa6.lbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex localisation]
 \InheritBibliographyExtras{swissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German