biblatex-apa (29aug20)

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

31 files changed, 126 insertions, 117 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
index 446a1b009d8..4755c81625a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
@@ -542,10 +542,10 @@
 }
 
 @ARTICLE{10.1:3b,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {C. Goldman},
   TITLE          = {The Complicated Calibration of Love, Especially in Adoption},
   JOURNALTITLE   = {Chicago Tribune},
-  KEYWORDS       = {nonacademic},
   DATE           = {2018-11-28}
 }
 
@@ -718,57 +718,57 @@
 }
 
 % (APA 10.1 Example 15)
-% Note use of KEYWORDS to indicate non-academic magazine so that dates
+% Note use of ENTRYSUBTYPE to indicate non-academic magazine so that dates
 % are formatted correctly
 @ARTICLE{10.1:15a,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {S. Bergeson},
   TITLE          = {Really Cool Neutral Plasmas},
   JOURNALTITLE   = {Science},
   VOLUME         = {363},
   NUMBER         = {6422},
   PAGES          = {33--34},
-  KEYWORDS       = {nonacademic},
   DATE           = {2019-01-04},
   DOI            = {10.1126/science.aau7988}
 }
 
 @ARTICLE{10.1:15b,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {M. Bustillos},
   TITLE          = {On Video Games and Storytelling},
   SUBTITLE       = {An Interview with {Tom} {Bissell}},
   JOURNALTITLE   = {The New Yorker},
-  KEYWORDS       = {nonacademic},
   DATE           = {2013-03-19},
   URL            = {https://www.newyorker.com/books/page-turner/on-video-games-and-storytelling-an-interview-with-tom-bissell}
 }
 
 @ARTICLE{10.1:15c,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {K. Wier},
   TITLE          = {Forgiveness Can Improve Mental and Physical Health},
   JOURNALTITLE   = {Monitor on Psychology},
   VOLUME         = {48},
   NUMBER         = {1},
-  KEYWORDS       = {nonacademic},
   PAGES          = {30},
   DATE           = {2017-01}
 }
 
 % (APA 10.1 Example 16)
 @ARTICLE{10.1:16a,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {B. Guarino},
   TITLE          = {How Will Humanity React to Alien Life?
                     {Psychologists} Have Some Predictions},
   JOURNALTITLE   = {The Washington Post},
-  KEYWORDS       = {nonacademic},
   DATE           = {2017-12-04},
   URL            = {https://www.washingtonpost.com/news/speaking-of-science/wp/2017/12/04/how-will-humanity-react-to-alien-life-psychologists-have-some-predictions}
 }
 
 @ARTICLE{10.1:16b,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {A. Hess},
   TITLE          = {Cats Who Take Direction},
   JOURNALTITLE   = {The New York Times},
-  KEYWORDS       = {nonacademic},
   DATE           = {2019-01-03},
   PAGES          = {C1}
 }
@@ -788,17 +788,18 @@
 % "Comment on the article" string. A simpler but less general way of getting the same
 % results would be:
 %@ARTICLE{10.1:18,
+%  ENTRYSUBTYPE   = {nonacademic},
 %  AUTHOR         = {{KS in NJ}},
 %  TITLE          = {From this article, it sounds like men are figuring
 %                    something out that women have known forever. {I} know of many},
 %  TITLEADDON     = {Comment on the article ``How workout buddies can help stave off loneliness''},
 %  JOURNALTITLE   = {The Washington Post},
-%  KEYWORDS       = {nonacademic},
 %  DATE           = {2019-01-15},
 %  URL            = {https://wapo.st/2HDToGJ}
 %}
 
 @ARTICLE{10.1:18,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {{KS in NJ}},
   TITLE          = {From this article, it sounds like men are figuring
                     something out that women have known forever. {I} know of many},
@@ -806,7 +807,6 @@
   RELATEDTYPE    = {commenton},
   RELATEDSTRING  = {Comment on the article},
   JOURNALTITLE   = {The Washington Post},
-  KEYWORDS       = {nonacademic},
   DATE           = {2019-01-15},
   URL            = {https://wapo.st/2HDToGJ}
 }
@@ -1619,13 +1619,13 @@
 
 % (APA 10.7 Example 68)
 @ARTICLE{10.7:68,
+  ENTRYSUBTYPE   = {nonacademic},
   AUTHOR         = {F. Santos},
   TITLE          = {Reframing Refugee Children's Stories},
   RELATED        = {10.7:68r},
   RELATEDTYPE    = {reviewof},
   RELATEDSTRING  = {Review of the book},
   JOURNALTITLE   = {The New York Times},
-  KEYWORDS       = {nonacademic},
   DATE           = {2019-01-11},
   URL            = {https://nyt.ms/2Hlgjk3}
 }
@@ -2464,7 +2464,7 @@
 @ONLINE{10.16:114,
   GROUPAUTHOR   = {{U.S. Census Bureau}},
   TITLE         = {{U.S.} and World Population Clock},
-  EPRINT        = {U.S. Department of Commerce},
+  ORGANIZATION  = {U.S. Department of Commerce},
   URL           = {https://www.census.gov/popclock/},
   URLDATE       = {2019-07-03}
 }
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 51fe552e248..da9eea03dbf 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 591c07058af..971c8be80ea 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 20605c07381..fb47beb8d20 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.13},
+  revision={9.14},
   date={\today}}
 
 \hypersetup{%
@@ -365,7 +365,7 @@ associated |EDITORTYPE| fields \apa{10.5:63}.
 \subsubsection{Article types}
 
 Since |ARTICLE| entry types are used extensively for academic journals and
-also newspaper articles, the |KEYWORD| ``nonacademic'' should be specified
+also newspaper articles, the |ENTRYSUBTYPE| ``nonacademic'' should be specified
 for articles that are not academic articles in an academic journal. This is
 because date formatting differs in the style between academic and
 non-academic articles. This is a more general solution than introducing new
@@ -397,6 +397,10 @@ the examples.
 
 \begin{changelog}
 
+\begin{release}{9.14}{2020-08-28}
+\item Bugfixes, compat with biblatex 3.15
+\end{release}
+
 \begin{release}{9.13}{2020-05-30}
 \item Fixed Spanish long date format
 \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 7c4cf8f8d5a..7cc81ebb73c 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 \NewBibliographyString{jourarticle}
@@ -279,7 +279,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -301,7 +301,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -323,7 +323,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 7071b6e4228..1b81bd5e17d 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/05/30\space v9.13\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2020/08/28\space v9.14\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{same} % APA examples all have URLs in same font as text
@@ -761,12 +761,15 @@
     \setunit*{\addcomma\addspace}%
     \ifentrytype{book}{\printfield{volume}}{}}}
 
-% Additional post title information in brackets
+% Additional post title information in brackets unless it's the meta subtype "nonacademic"
+% which is used to conditionalise date formats in the .lbx files
 \newbibmacro*{addinfo2}{%
   \printtexte[brackets]{%
-    \iffieldbibstring{entrysubtype}
-      {\bibcplstring{\thefield{entrysubtype}}}
-      {\printfield{entrysubtype}}%
+   \iffieldequalstr{entrysubtype}{nonacademic}
+     {}
+     {\iffieldbibstring{entrysubtype}
+        {\bibcplstring{\thefield{entrysubtype}}}
+        {\printfield{entrysubtype}}}%
     \setunit*{\addsemicolon\addspace}%
     \printfield{note}}}
 
@@ -1773,6 +1776,8 @@
   \usebibmacro{apa:related}%
   \newunit\newblock
   \usebibmacro{eprint}%
+  \newunit\newblock
+  \printlist{organization}%
   \addperiod\addspace
   \newunit\newblock
   \usebibmacro{doi+url}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index f5ac0bb0075..2dcff1742e3 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/05/30\space v9.13\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2020/08/28\space v9.14\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -519,7 +519,7 @@
 % (APA 8.11) No parens round year for cites when the cite is in
 %            parentheses. Use new command \nptextcite for such cites.
 
-\DeclareDelimAlias*[nptextcite]{finalnamedelim}[parencite]{finalnamedelim}
+\DeclareDelimAlias[nptextcite]{finalnamedelim}[parencite]{finalnamedelim}
 
 \DeclareCiteCommand{\nptextcite}
   {\usebibmacro{cite:init}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index aa5ccb71343..dce4fd802a6 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/05/30\space v9.13\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2020/08/28\space v9.14\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 fa509e76d5d..dae9ffb8105 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % Following DGPs guidlines for German/Austrian
@@ -154,7 +154,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -176,7 +176,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -199,7 +199,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 c769ed240d1..a0184d562da 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 \NewBibliographyString{jourarticle}
@@ -149,7 +149,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -171,7 +171,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -193,7 +193,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 a8587b0ecca..32fe71feaee 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 \NewBibliographyString{jourarticle}
@@ -153,7 +153,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -175,7 +175,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -197,7 +197,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 8cbc8bc31d3..06394e17a75 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{danish}
 
 \NewBibliographyString{jourarticle}
@@ -165,7 +165,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -189,7 +189,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -213,7 +213,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 a628eb3da94..e9a4a11ac4d 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 \NewBibliographyString{jourarticle}
@@ -153,7 +153,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -175,7 +175,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -197,7 +197,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 53dd289fcff..2bb647af196 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{english}
 
 \NewBibliographyString{jourarticle}
@@ -155,7 +155,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -177,7 +177,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -199,7 +199,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 e8dc9eb374c..4fcc6b13920 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 \NewBibliographyString{jourarticle}
@@ -148,7 +148,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -170,7 +170,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -192,7 +192,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 607d7686f76..97384b64ade 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{galician-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{galician}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -166,7 +166,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -188,7 +188,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -210,7 +210,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 68e235370a3..f05de16a894 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % Following DGPs guidlines for German/Austrian
@@ -154,7 +154,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -176,7 +176,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -199,7 +199,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 7cf6cc7cdfa..0381d222faf 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 \NewBibliographyString{jourarticle}
@@ -171,7 +171,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -193,7 +193,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -215,7 +215,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 8b1730ceafd..8486f557e34 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 \NewBibliographyString{jourarticle}
@@ -153,7 +153,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -175,7 +175,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -197,7 +197,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 375d04724ec..4e652cdc16b 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % Following DGPs guidlines for German/Austrian
@@ -154,7 +154,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -176,7 +176,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -199,7 +199,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 09ed5836c86..892ab82d356 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % Following DGPs guidlines for German/Austrian
@@ -156,7 +156,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -178,7 +178,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -201,7 +201,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 ce0e5512211..35200f9d062 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 \NewBibliographyString{revisededition}
@@ -113,7 +113,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -137,7 +137,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -161,7 +161,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 334d6c55a88..c6c57461369 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 \NewBibliographyString{revisededition}
@@ -152,7 +152,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -176,7 +176,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -200,7 +200,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 2cd715be0a1..f51849a7ddc 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{nswissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German
@@ -153,7 +153,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -175,7 +175,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -198,7 +198,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 10617811174..ed515577266 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 \NewBibliographyString{jourarticle}
@@ -153,7 +153,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -177,7 +177,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -201,7 +201,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 d8d7f60c994..6cfa4e84249 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{portuguese}
 
 \NewBibliographyString{jourarticle}
@@ -149,7 +149,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -171,7 +171,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -193,7 +193,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 f82ec500e0d..de2920aa471 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{russian}
 
 \NewBibliographyString{jourarticle}
@@ -160,7 +160,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -184,7 +184,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -208,7 +208,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 e2c5c29a0c5..ca59111347f 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{slovene}
 
 \NewBibliographyString{jourarticle}
@@ -188,7 +188,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -212,7 +212,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -236,7 +236,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 7c975a11f47..6d9627f2cc8 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -165,7 +165,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-      and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
     {\clearfield{labelmonth}%
       \clearfield{labelday}}
     {}%
@@ -187,7 +187,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-      and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
     {\clearfield{labelmonth}%
       \clearfield{labelday}}
     {}%
@@ -210,7 +210,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-      and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
     {\clearfield{labelmonth}%
       \clearfield{labelday}}
     {}%
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 db122c22738..a7c425d8679 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 \NewBibliographyString{jourarticle}
@@ -151,7 +151,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -175,7 +175,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -199,7 +199,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
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 fde62e3abab..5a165011c73 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/05/30\space v9.13\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2020/08/28\space v9.14\space APA biblatex localisation]
 \InheritBibliographyExtras{swissgerman}
 
 % Following DGPs guidlines for German/Austrian/Swiss German
@@ -155,7 +155,7 @@
   \protected\def\mkbibdateapalong#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -177,7 +177,7 @@
   \protected\def\mkbibdateapalongextra#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%
@@ -200,7 +200,7 @@
   \protected\def\mkbibdateapalongmdy#1#2#3{%
     % As per 10.1, Articles only have year
     \ifboolexpr{ test {\ifentrytype{article}}
-                 and not test {\ifkeyword{nonacademic}} }
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
       {\clearfield{labelmonth}%
        \clearfield{labelday}}
       {}%