biblatex-apa (1feb20)

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

27 files changed, 145 insertions, 133 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index 3d4c044114f..a5dea0b7488 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 2195222875f..276fa50c0e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.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,7 +12,7 @@
 %%
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2019/12/22\space v9.4\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2020/02/01\space v9.5\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -491,48 +491,46 @@
     {\addcomma\space\ldots\space}
     {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
       {}
-      {\printtext{\usebibmacro{name:apa:family-given}%
+      {\usebibmacro{name:apa:family-given}%
          {\namepartfamily}%
          {\namepartgiven}%
          {\namepartgiveni}%
          {\namepartprefix}%
-         {\namepartsuffix}}%
+         {\namepartsuffix}%
        \let\bibstring\bibcplstring
-       \setunit{\addspace}%
-       \printtext{\mkbibparense{\usebibmacro{role}}}%
-       \hasitemannotation[\currentname][username]{\addspace\mkbibbrackets{\getitemannotation[\currentname][username]}}{}}}%
-    \ifthenelse{\value{listcount}=\value{listtotal}}%
-      {\ifmorenames
-         {\printdelim{andothersdelim}
-           \bibstring{andothers}}
-         {}%
-       \let\bibstring\bibcplstring
-       \setunit{\addspace}%
-       \printtext{\mkbibparense{\usebibmacro{roles}}}}
-      {}}
+       \usebibmacro{role}{\addspace}{\mkbibparens}%
+       \hasitemannotation[\currentname][username]
+         {\addspace\mkbibbrackets{\getitemannotation[\currentname][username]}}
+         {}}}%
+  \ifthenelse{\value{listcount}=\value{listtotal}}%
+    {\ifmorenames
+       {\printdelim{andothersdelim}%
+        \bibstring{andothers}}
+       {}%
+     \let\bibstring\bibcplstring
+     \usebibmacro{roles}{\addspace}{\mkbibparens}}
+    {}}
 
 \DeclareNameFormat{apanames}{%
   \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
     {\addcomma\space\ldots\space}
     {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
       {}
-      {\printtext{\usebibmacro{name:apa:given-family}%
+      {\usebibmacro{name:apa:given-family}%
          {\namepartfamily}%
          {\namepartgiven}%
          {\namepartgiveni}%
          {\namepartprefix}%
-         {\namepartsuffix}}%       
+         {\namepartsuffix}%       
        \let\bibstring\bibcpsstring
-       \setunit{\addcomma\addspace}%
-       \usebibmacro{role}}}%
+       \usebibmacro{role}{\addcomma\space}{\@firstofone}}}%
   \ifthenelse{\value{listcount}=\value{listtotal}}%
     {\ifmorenames
        {\printdelim{andothersdelim}%
         \bibstring{andothers}}
        {}%
      \let\bibstring\bibcplstring
-     \setunit{\addspace}%
-     \usebibmacro{roles}}
+     \usebibmacro{roles}{\addspace}{\@firstofone}}
     {}}
 
 \renewbibmacro*{author/editor}{%
@@ -585,9 +583,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}}}
 
 \newbibmacro*{author:related}{%
   \ifnameundef{author}
@@ -639,8 +640,8 @@
 
 \DeclareFieldFormat{apadate}{%
   \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} }
-    {\printtext{\mkbibbrackets{#1}}}
-    {\printtext{\mkbibparens{#1}}}}
+    {\mkbibbrackets{#1}}
+    {\mkbibparens{#1}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -758,9 +759,10 @@
 \renewbibmacro*{eprint}{%
   \iffieldundef{eprinttype}
     {}
-    {\printtext{%
-       \iffieldbibstring{eprinttype}{\bibcplstring{\strfield{eprinttype}}}{\strfield{eprinttype}}%
-       \setunit{\addspace}}}%
+    {\iffieldbibstring{eprinttype}
+       {\bibcplstring{\strfield{eprinttype}}}
+       {\strfield{eprinttype}}%
+     \setunit{\addspace}}%
   \printfield{eprint}}
 
 \DeclareFieldFormat{eprint}{#1}
@@ -811,73 +813,79 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Names
 
-% Individual name roles
-\newbibmacro*{role}{%
-  \hasitemannotation[\currentname][role]%
-    {\getitemannotation[\currentname][role]}
-    {\ifitemannotation[\currentname][role]{writer}
-       {\bibstring{writer}%
-        \setunit{\addspace\&\addspace}}
-       {}%
-     \ifitemannotation[\currentname][role]{director}
-       {\bibstring{director}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \ifitemannotation[\currentname][role]{execproducer}
-       {\bibstring{execproducer}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \ifitemannotation[\currentname][role]{producer}
-       {\bibstring{producer}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \ifitemannotation[\currentname][role]{host}
-       {\bibstring{host}%
-         \setunit{\addspace\&\addspace}}
+\newcommand*{\apabbx@ifrole@item}{%
+  \xifinlist{item@\currentname @role@\the\value{listcount}}%
+            \abx@annotation@defined}
+
+\newtoggle{apabbx:role:item:punct}
+
+\newcommand*{\apabbx@rolelist@item}{}
+\forcsvlist{\listadd\apabbx@rolelist@item}{%
+  writer,director,execproducer,producer,host,chair,guestexpert}
+
+\newcommand*{\apabbx@printrole@item@i}[1]{%
+  \ifitemannotation[\currentname][role]{#1}
+    {\iftoggle{apabbx:role:item:punct}
+       {\addspace\&\space}
        {}%
-     \ifitemannotation[\currentname][role]{chair}
-       {\bibstring{chair}%
-         \setunit{\addspace\&\addspace}}
+     \bibstring{#1}%
+     \toggletrue{apabbx:role:item:punct}}
+    {}%
+}
+
+\newcommand*{\apabbx@printrole@item}{%
+  \forlistloop{\apabbx@printrole@item@i}{\apabbx@rolelist@item}}
+
+% Individual name roles
+% takes two arguments
+% {<pre punct>}{<wrapper>}
+\newbibmacro*{role}[2]{%
+  \apabbx@ifrole@item
+    {#1%
+     #2{%
+       \togglefalse{apabbx:role:item:punct}%
+       \hasitemannotation[\currentname][role]%
+         {\getitemannotation[\currentname][role]}
+         {\apabbx@printrole@item}}}
+    {}%
+}
+
+\newcommand*{\apabbx@ifrole@field}{%
+  \xifinlist{field@\currentname @role@}%
+            \abx@annotation@defined}
+            
+\newtoggle{apabbx:role:field:punct}
+
+\newcommand*{\apabbx@rolelist@field}{}
+\forcsvlist{\listadd\apabbx@rolelist@field}{%
+  writers,directors,execproducers,producers,hosts,chairs,guestexperts}
+
+\newcommand*{\apabbx@printrole@field@i}[1]{%
+  \iffieldannotation[\currentname][role]{#1}
+    {\iftoggle{apabbx:role:field:punct}
+       {\addspace\&\space}
        {}%
-     \ifitemannotation[\currentname][role]{guestexpert}
-       {\bibstring{guestexpert}%
-         \setunit{\addspace\&\addspace}}
-       {}}%
-  \setunit{}}
+     \bibstring{#1}%
+     \toggletrue{apabbx:role:field:punct}}
+    {}%
+}
+
+\newcommand*{\apabbx@printrole@field}{%
+  \forlistloop{\apabbx@printrole@field@i}{\apabbx@rolelist@field}}
 
 % roles for complete name lists
-\newbibmacro*{roles}{%
-  \hasfieldannotation[\currentname][role]%
-    {\getfieldannotation[\currentname][role]}
-    {\iffieldannotation[\currentname][role]{writers}
-       {\bibstring{writers}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \iffieldannotation[\currentname][role]{directors}
-       {\bibstring{directors}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \iffieldannotation[\currentname][role]{execproducers}
-       {\bibstring{execproducers}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \iffieldannotation[\currentname][role]{producers}
-       {\bibstring{producers}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \iffieldannotation[\currentname][role]{hosts}
-       {\bibstring{hosts}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \iffieldannotation[\currentname][role]{chairs}
-       {\bibstring{chairs}%
-         \setunit{\addspace\&\addspace}}
-       {}%
-     \iffieldannotation[\currentname][role]{guestexperts}
-       {\bibstring{guestexperts}%
-         \setunit{\addspace\&\addspace}}
-       {}}%
-  \setunit{}}
+% takes two arguments
+% {<pre punct>}{<wrapper>}
+\newbibmacro*{roles}[2]{%
+  \apabbx@ifrole@field
+    {#1%
+     #2{%
+       \togglefalse{apabbx:role:field:punct}%
+       \hasfieldannotation[\currentname][role]%
+         {\getfieldannotation[\currentname][role]}
+         {\apabbx@printrole@field}}}
+    {}%
+}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -969,7 +977,7 @@
         \setunit*{\addcomma\addspace}%
         \usebibmacro{apaeditorstrg}{editor}%
         \setunit*{\addspace\&\space}%
-        \printtext{\bibcpstring{translator}}}
+        \bibcpstring{translator}}
        {\ifnameundef{editor}%
           {}%
           {\printnames[apanames][-\value{listtotal}]{editor}%
@@ -981,13 +989,13 @@
           {\setunit{}}%
           {\printnames[apanames][-\value{listtotal}]{translator}%
            \setunit{\addcomma\addspace}%
-           \printtext{\bibcpstring{translator}}%
+           \bibcpstring{translator}%
            \clearname{translator}}%
         \ifnameundef{narrator}%
           {\setunit{}}%
           {\printnames[apanames][-\value{listtotal}]{narrator}%
            \setunit{\addcomma\addspace}%
-           \printtext{\bibcpstring{narrator}}%
+           \bibcpstring{narrator}%
            \clearname{narrator}}}}}
 
 \newbibmacro*{editor+trans}{%
@@ -1055,7 +1063,10 @@
     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}%
      \renewcommand*{\finentrypunct}{\relax}}
     {}}
 
@@ -1216,11 +1227,12 @@
 % (APA 10.12) Audiovisual
 
 \newbibmacro*{mainvideo}{%
-  \iffieldundef{maintitle}{}
+  \iffieldundef{maintitle}
+    {}
     {\usebibmacro{in}%
      \printnames[apanames][-\value{listtotal}]{execproducer}%
      \setunit{\addspace}%
-     \printtext{\mkbibparens{\bibcplstring{execproducers}}}%
+     \bibcplstring[\mkbibparens]{execproducers}%
      \setunit{\addcomma\addspace}%
      \printfield{maintitle}}}
 
@@ -1351,9 +1363,9 @@
   % disable normal date printing if it's in the citation info
   \iftoggle{apa:courtdate}
     {\iflistundef{organization}
-      {\printtext{\mkbibparens{#1}}}
-      {\printtext{\mkbibparens{%
-          \printlist{organization}\space #1}}}}
+      {\mkbibparens{#1}}
+      {\mkbibparens{%
+         \printlist{organization}\space #1}}}
     {}}
 
 % 
@@ -1384,7 +1396,7 @@
                   
 \newbibmacro*{legmattitle}{%
   \iffieldundef{title}
-    {\bibcpsstring{\thefield{source}}%
+    {\ifbibxstring{\thefield{source}}{\bibcpsstring{\thefield{source}}}{}%
      \setunit*{\addspace}%
      \bibcpsstring{\thefield{type}}%
      \setunit*{\addspace}%
@@ -2048,8 +2060,8 @@
     {}
     {\iffieldundef{urlyear}
       {}
-      {\printtext{\bibstring{retrieved}}%
-       \addspace
+      {\bibstring{retrieved}%
+       \setunit{\addspace}%
        \printurldate
        \setunit{\urldatecomma}%
        \bibstring{from}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 60bce4cd698..40cfadefd9f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.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{apa.cbx}[2019/12/22\space v9.4\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2020/02/01\space v9.5\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index bdf8c528b47..5687733b513 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.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{apa.dbx}[2019/12/22\space v9.4\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2020/02/01\space v9.5\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index 2152e0653b9..e98bbb5e175 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % Following DGPs guidlines for German/Austrian
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
index 32ea0349e4f..2d255a06700 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index d33e390f928..e250ee65a3b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
index 5eb2430cf13..e1d31d68a00 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{danish}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index 3f36d6331b9..a25af318fdc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index 8d0e798320a..fd325840d36 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{english}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index 53ef923c6d1..ff34c5bd69e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
index 8d340301d27..7baef5db249 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{galician-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2020/02/01\space v9.5\space APA 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-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index 9262e8b2540..27be3dc3d27 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % Following DGPs guidlines for German/Austrian
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index 45d00c966bb..1741c080a19 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index dfed9697309..73cd0ebdf3c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
index 201cfa1c075..13aa253002a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % Following DGPs guidlines for German/Austrian
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index fe72f9b8f6f..de82a0556c4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % Following DGPs guidlines for German/Austrian
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
index ac3f89d301a..15ba2bf6775 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
index 7578dcd0ddd..0fc240f30b9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
index e0bee5c83c0..02d8a1fc9ae 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{nswissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
index f06936bbfa4..c3e34ba4d70 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
index 6e80f0791bd..8ab547b392d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{portuguese}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
index 7f0292a4a4f..130f9db214b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{russian}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
index 128514c4de1..7c6d66f25e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{slovene}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index 1472a1f9ef6..60c7c1773a6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
index 691d202eecf..b6bc5dd15b6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 \NewBibliographyString{revisededition}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
index d48a68ad7cc..283a7aa28c5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2019/12/22\space v9.4\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2020/02/01\space v9.5\space APA biblatex localisation]
 \InheritBibliographyExtras{swissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German