biblatex-apa (22feb20)

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

30 files changed, 100 insertions, 77 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index c98168fa60b..646740c2056 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index 1688d3a5363..e8b00af55a8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
index ba07b6c704a..b98452893d9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.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={9.5},
+  revision={9.6},
   date={\today}}
 
 \hypersetup{%
@@ -397,6 +397,10 @@ the examples.
 
 \begin{changelog}
 
+\begin{release}{9.6}{2020-02-22}
+\item Bugfixes
+\end{release}
+
 \begin{release}{9.5}{2020-02-01}
 \item Bugfixes
 \end{release}
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 a5dea0b7488..b09f8bda780 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2020/02/22\space v9.6\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 276fa50c0e9..2e17e6b3f8e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
 %%
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2020/02/01\space v9.5\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2020/02/22\space v9.6\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -98,16 +98,16 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Multiple related entries, even though there are no
-% examples in APA 7th, should probably be this  
+% examples in APA 7th, should probably be this
 
 \renewcommand*{\relateddelim}{\addcomma\addspace}
 
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Force roman numerals into arabic using
 % etoolbox macros
 
@@ -133,7 +133,7 @@
     \iffieldundef{#1year}{}
       {\datecircaprint
         \ifboolexpr{ test {\ifstrequal{#1}{url}}
-                     or test {\ifentrytype{legal}}          
+                     or test {\ifentrytype{legal}}
                      or ( test {\ifentrytype{legadminmaterial}} and
                           test {\ifkeyword{proposed}} ) }
          {\printtext{%
@@ -309,9 +309,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
-% (APA 10.2:32) Remove PUBLISHER if it is the same as GROUPAUTHOR                          
+% (APA 10.2:32) Remove PUBLISHER if it is the same as GROUPAUTHOR
 % Force @COLLECTION, @REFERENCE->@BOOK and @INCOLLECTION,@INREFERENCE->@INBOOK
-                          
+
 \DeclareStyleSourcemap{
   \maps[datatype=bibtex]{
     \map{
@@ -452,7 +452,7 @@
 \DeclareFieldFormat{url}{\url{#1}}
 \DeclareFieldFormat{urldate}{#1}
 
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -505,7 +505,7 @@
   \ifthenelse{\value{listcount}=\value{listtotal}}%
     {\ifmorenames
        {\printdelim{andothersdelim}%
-        \bibstring{andothers}}
+        \biblcstring{andothers}}
        {}%
      \let\bibstring\bibcplstring
      \usebibmacro{roles}{\addspace}{\mkbibparens}}
@@ -521,13 +521,13 @@
          {\namepartgiven}%
          {\namepartgiveni}%
          {\namepartprefix}%
-         {\namepartsuffix}%       
+         {\namepartsuffix}%
        \let\bibstring\bibcpsstring
        \usebibmacro{role}{\addcomma\space}{\@firstofone}}}%
   \ifthenelse{\value{listcount}=\value{listtotal}}%
     {\ifmorenames
        {\printdelim{andothersdelim}%
-        \bibstring{andothers}}
+        \biblcstring{andothers}}
        {}%
      \let\bibstring\bibcplstring
      \usebibmacro{roles}{\addspace}{\@firstofone}}
@@ -619,7 +619,7 @@
                  \value{liststop}=2}
      {\addspace\&\space}
      {\finalandcomma\addspace\&\space}}}
-  
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -657,7 +657,7 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 9.25) No prefix for pages
 
 \DeclareFieldFormat{pages}{#1}
@@ -673,7 +673,7 @@
 \renewbibmacro*{begentry}{%
   \ifkeyword{meta}{\textsuperscript{*}}{}}
 
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -757,13 +757,15 @@
 % (APA 10.1 Example 6) eprints (eLocator)
 
 \renewbibmacro*{eprint}{%
-  \iffieldundef{eprinttype}
-    {}
-    {\iffieldbibstring{eprinttype}
-       {\bibcplstring{\strfield{eprinttype}}}
-       {\strfield{eprinttype}}%
-     \setunit{\addspace}}%
-  \printfield{eprint}}
+  \iftoggle{bbx:eprint}
+    {\iffieldundef{eprinttype}
+       {}
+       {\iffieldbibstring{eprinttype}
+          {\bibcplstring{\strfield{eprinttype}}}
+          {\strfield{eprinttype}}%
+        \setunit{\addspace}}%
+     \printfield{eprint}}
+    {}}
 
 \DeclareFieldFormat{eprint}{#1}
 
@@ -800,7 +802,7 @@
 % "In" precedes editor/trans list, no colon
 % Use a flag to track as it could be inserted in more
 % than one potential location
- 
+
 \newbibmacro*{in}{%
   \ifbool{bbx:in}%
     {}%
@@ -851,9 +853,9 @@
 }
 
 \newcommand*{\apabbx@ifrole@field}{%
-  \xifinlist{field@\currentname @role@}%
+  \xifinlist{field@\currentname @role}%
             \abx@annotation@defined}
-            
+
 \newtoggle{apabbx:role:field:punct}
 
 \newcommand*{\apabbx@rolelist@field}{}
@@ -898,7 +900,7 @@
 % #3 = given name (initials)
 % #4 = name prefix
 % #5 = name suffix
-  
+
 \newbibmacro*{name:delim:apa:family-given}[1]{%
   \ifnumgreater{\value{listcount}}{\value{liststart}}
     {\ifboolexpr{
@@ -1024,7 +1026,7 @@
        \usebibmacro{in}%
        \usebibmacro{editorx}}%
      \setunit{\addcomma\addspace}}}
-   
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1167,7 +1169,7 @@
      \usebibmacro{in}%
      \setunit{\addspace}}}
 
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1207,8 +1209,8 @@
                \biblstring{byauthor}%
                \setunit{\addspace}%
                \usebibmacro{author/editor:related}}}}
-         
-%         
+
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1221,9 +1223,9 @@
      \printfield{maintitle}}}
 
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 10.12) Audiovisual
 
 \newbibmacro*{mainvideo}{%
@@ -1237,9 +1239,9 @@
      \printfield{maintitle}}}
 
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%          
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Related entries
 %
 % Have to force capitlisation bibstring variant because the delim
@@ -1250,7 +1252,7 @@
   \iffieldequalstr{relatedtype}{reprintfrom}
     {\renewcommand*{\finentrypunct}{\relax}}
     {}}
-  
+
 \newcommand*{\begrelateddelimreprintfrom}{\addperiod\addspace}
 
 % Some APA related entries are just after title, some are at the end of
@@ -1326,8 +1328,14 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 9.51) Annotations
 
+\newtoggle{bbx:annotation}
+\DeclareBiblatexOption{global,type,entry}[boolean]{annotation}[true]{%
+  \settoggle{bbx:annotation}{#1}}
+\ExecuteBibliographyOptions{annotation=true}
+
 \renewbibmacro*{annotation}{%
-  \iffieldundef{annotation}
+  \ifboolexpr{       test {\iffieldundef{annotation}}
+              or not togl {bbx:annotation}}
     {}
     {\begingroup
      \togglefalse{blx@bibliography}%
@@ -1335,7 +1343,7 @@
      \setunit{}%
      \printfield{annotation}%
      \endgroup}}
- 
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1358,7 +1366,7 @@
   \ifthenelse{\value{listcount}<\value{liststop}}
     {\addcomma\addspace}
     {}}
- 
+
 \DeclareFieldFormat{courtdate}{%
   % disable normal date printing if it's in the citation info
   \iftoggle{apa:courtdate}
@@ -1368,18 +1376,18 @@
          \printlist{organization}\space #1}}}
     {}}
 
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 11.5) Statutes
-  
+
 \newbibmacro*{statdate}{%
   \iffieldundef{origyear}
     {\printtext[parens]{\printlabeldate}}
     {\printtext[parens]{\printorigdate%
                         \addspace\&\addspace rev\adddot\addspace\printlabeldate}}}
-  
+
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1393,7 +1401,7 @@
 
 \DeclareDelimFormat[location]{multilistdelim}{\addcomma\space}
 \DeclareDelimFormat[location]{finallistdelim}{\addcomma\space}
-                  
+
 \newbibmacro*{legmattitle}{%
   \iffieldundef{title}
     {\ifbibxstring{\thefield{source}}{\bibcpsstring{\thefield{source}}}{}%
@@ -1405,10 +1413,10 @@
      \setunit*{\addcolon\addspace}\newblock
      \printfield{subtitle}}}
 
-% 
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-                  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 10.x) General entrytype drivers
 
 % Custom driver to make a cleaner example for 9.44
@@ -1690,7 +1698,7 @@
   \printtext[parens]{\ifkeyword{proposed}{\bibstring{proposed}\space}{}\printlabeldate}%
   \setunit{\addspace}\newblock
   \printfield{note}%
-  \newunit\newblock  
+  \newunit\newblock
   \usebibmacro{doi+url}%
   \usebibmacro{pageref}%
   \usebibmacro{annotation}%
@@ -1706,7 +1714,7 @@
   \printtext[parens]{\printlabeldate}%
   \setunit{\addspace}\newblock
   \printfield{note}%
-  \newunit\newblock  
+  \newunit\newblock
   \usebibmacro{doi+url}%
   \usebibmacro{pageref}%
   \usebibmacro{annotation}%
@@ -2049,11 +2057,22 @@
          {\bibcpstring{type\thefield{#1type}s}}
          {\bibcpstring{type\thefield{#1type}}}}}
 
+
+
 %(APA 9.35) No periods after URLS
+% we'll override a global url option for for @online entries
+\ExecuteBibliographyOptions[online]{url=true}
 \newbibmacro*{doi+url}{%
-  \iffieldundef{doi}
-    {\iffieldundef{url}{\newunit}{\usebibmacro{url+urldate}\setunit{\addspace}}}
-    {\printfield{doi}\renewcommand*{\finentrypunct}{\relax}\setunit{\addspace}}}
+  \ifboolexpr{          test {\iffieldundef{doi}}
+                 or not togl {bbx:doi}}
+    {\ifboolexpr{       test {\iffieldundef{url}}
+                 or not togl {bbx:url}}
+       {\newunit}
+       {\usebibmacro{url+urldate}%
+        \setunit{\addspace}}}
+    {\printfield{doi}%
+     \renewcommand*{\finentrypunct}{\relax}%
+     \setunit{\addspace}}}
 
 \renewbibmacro*{url+urldate}{%
   \ifthenelse{\iffieldundef{url}\OR\NOT\iffieldundef{doi}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 40cfadefd9f..5402613ff04 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.cbx}[2020/02/01\space v9.5\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2020/02/22\space v9.6\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 5687733b513..41b5f27814c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.dbx}[2020/02/01\space v9.5\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2020/02/22\space v9.6\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 e98bbb5e175..80f3cebcbe8 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2020/02/22\space v9.6\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 2d255a06700..dca61ac5830 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2020/02/22\space v9.6\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 e250ee65a3b..e25ea7aa574 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2020/02/22\space v9.6\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 e1d31d68a00..4687e1e7687 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2020/02/22\space v9.6\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 a25af318fdc..50df0232564 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2020/02/22\space v9.6\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 fd325840d36..9beefcdda6e 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2020/02/22\space v9.6\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 ff34c5bd69e..7cf11289202 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2020/02/22\space v9.6\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 7baef5db249..f748b01fc6c 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2020/02/22\space v9.6\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 27be3dc3d27..d15e8684965 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2020/02/22\space v9.6\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 1741c080a19..05d4e2eee7c 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2020/02/22\space v9.6\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 73cd0ebdf3c..4ca83ae13e0 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2020/02/22\space v9.6\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 13aa253002a..c01d9dd092b 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2020/02/22\space v9.6\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 de82a0556c4..cf25c6e5d75 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2020/02/22\space v9.6\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 15ba2bf6775..eaccd6ab9e3 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2020/02/22\space v9.6\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 0fc240f30b9..6cf00a509be 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2020/02/22\space v9.6\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 02d8a1fc9ae..e2734bce625 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2020/02/22\space v9.6\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 c3e34ba4d70..d12084810df 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2020/02/22\space v9.6\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 8ab547b392d..8b4e9d6d316 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2020/02/22\space v9.6\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 130f9db214b..85a886a8e68 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2020/02/22\space v9.6\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 7c6d66f25e0..58e628fc8da 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2020/02/22\space v9.6\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 60c7c1773a6..fb2ef37e307 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2020/02/22\space v9.6\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 b6bc5dd15b6..e2c9f5a31d9 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2020/02/22\space v9.6\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 283a7aa28c5..a6a27faa2a0 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}[2020/02/01\space v9.5\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2020/02/22\space v9.6\space APA biblatex localisation]
 \InheritBibliographyExtras{swissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German