biblatex-apa6 (27nov19)

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

27 files changed, 6826 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
new file mode 100644
index 00000000000..2edf71b300e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
@@ -0,0 +1,144 @@
+\ProvidesFile{american-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{american}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {american},
+  revisededition   = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{on}{on}},
+  retrieved        = {{retrieved}{retrieved}},
+  available        = {{available}{available}},
+  from             = {{from}{from}},
+  archivedat       = {{archived\space at}{archived\space at}},
+  with             = {{with}{with}},
+  reprintas        = {{reprinted as}{reprinted as}},
+  reprintfrom      = {{reprinted from}{reprinted from}},
+  reviewof         = {{review\space of}{review\space of}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  mathesis         = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}},
+  phdthesis        = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
+  origyear         = {{original\space work\space published}{original\space work\space published}},
+  typechair        = {{Chair}{Chair}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
+  typeseries       = {{Series\space Editor}{Series\space Ed\adddot}},
+  typeseriess      = {{Series\space Editors}{Series\space Eds\adddot}},
+  typevolseries    = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
new file mode 100644
index 00000000000..08a37060cf2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
@@ -0,0 +1,2243 @@
+%% Copyright 2019 Philip Kime
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Philip Kime.
+
+\ProvidesFile{apa6.bbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex references style]
+\RequireBiber[3]
+\RequireBibliographyStyle{standard}
+\urlstyle{rm} % APA examples all have URLs in same font as text
+
+% Declare the language mapping suffix
+\DeclareLanguageMappingSuffix{-apa6}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Automated capitalisation after colons
+%  (https://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html)
+%  Copied and adapted from ieee.bbx
+
+% {<process>} {*} {<text>}
+\newcommand*{\bbx@colon@search}[3]{%
+  \bbx@colon@search@aux#1#2\empty#3: \stop
+}
+\long\def\bbx@colon@search@aux#1#2#3: #4\stop{%
+  \expandafter#1\expandafter#2\expandafter{#3}%
+  \ifblank{#4}
+    {}
+    {%
+      : %
+      \bbx@colon@search@aux#1#2\empty#4\stop
+    }%
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Used to join citations/references to
+%  extradate
+
+\newcommand{\apashortdash}{-}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Allow variable max authors/editors limit
+
+\newcommand{\maxprtauth}{7}
+\DeclareBibliographyOption{apamaxprtauth}{%
+  \ifstrempty{#1}
+    {}
+    {\renewcommand{\maxprtauth}{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.22) Force roman numerals into arabic
+%            using etoolbox macros
+
+\newcommand{\apanum}[1]{\ifrmnum{#1}{\rmntonum{#1}}{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Apa defines no particular hanging indent but this makes it look like the
+% examples in the style manual.
+
+\setlength{\bibhang}{2.5em}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 4.16 Example 29) Some DSM macros
+
+\gdef\DSMIII{\emph{DSM-III}}
+\gdef\DSMIIIR{\emph{DSM-III-R}}
+\gdef\DSMIV{\emph{DSM-IV}}
+\gdef\DSMIVTR{\emph{DSM-IV-TR}}
+\gdef\PsycSCAN{\emph{PsycSCAN}}
+\gdef\PsycARTICLES{\emph{PsycARTICLES}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+
+% Date formats. Suppress end range of less specific fields
+\newcommand*{\mkdaterangeapalong}[1]{%
+  \begingroup
+    \blx@metadateinfo{#1}%
+    \iffieldundef{#1year}{}
+      {\datecircaprint
+       \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+         {\printtext{%
+             \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
+             \iffieldundef{#1endyear}%
+               {}%
+               {\iffieldequalstr{#1endyear}{}% open-ended range?
+                 {\mbox{\bibdatedash}}
+                 {\bibdatedash%
+                  \iffieldsequal{#1year}{#1endyear}%
+                    {\iffieldsequal{#1month}{#1endmonth}%
+                      {\iffieldsequal{#1day}{#1endday}%
+                        {}%
+                        {\mkbibdateapalongmdy{}{}{#1endday}}}%
+                      {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
+                    {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
+             \dateuncertainprint}}
+         {\printtext{%
+             \mkbibdateapalong{#1year}{#1month}{#1day}%
+             \dateeraprint{#1year}%
+             \iffieldundef{#1endyear}%
+               {}%
+               {\iffieldequalstr{#1endyear}{}% open-ended range?
+                 {\mbox{\bibdatedash}}
+                 {\bibdatedash%
+                  \iffieldsequal{#1year}{#1endyear}%
+                    {\iffieldsequal{#1month}{#1endmonth}%
+                      {\iffieldsequal{#1day}{#1endday}%
+                        {}%
+                        {\mkbibdateapalong{}{}{#1endday}}}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
+                    {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                   \dateeraprint{#1endyear}}}%
+               \enddateuncertainprint}}}}%
+  \endgroup}
+
+% Only for DATE as only \printdateextra is used
+\newcommand*{\mkdaterangeapalongextra}[1]{%
+  \begingroup
+    \blx@metadateinfo{#1}%
+    \iffieldundef{#1year}{}
+      {\printtext{%
+        \datecircaprint
+        \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+        \dateeraprint{#1year}%
+        \dateuncertainprint
+        \iffieldundef{#1endyear}%
+          {}%
+          {\iffieldequalstr{#1endyear}{}% open-ended range?
+            {\mbox{\bibdatedash}}
+            {\bibdatedash%
+             \iffieldsequal{#1year}{#1endyear}%
+               {\iffieldsequal{#1month}{#1endmonth}%
+                  {\iffieldsequal{#1day}{#1endday}%
+                    {}%
+                    {\mkbibdateapalongextra{}{}{#1endday}}}
+                  {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
+               {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                \dateeraprint{#1endyear}}}%
+           \enddateuncertainprint}}}%
+  \endgroup}
+
+\AtEndPreamble{%
+  \renewcommand*{\datecircaprint}{%
+    \ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.09 Example 62) ERIC
+% eprint references
+
+\DeclareFieldFormat{eprint:eric}{%
+  \printtext{\bibcpstring{retrieved}}%
+  \setunit{\addspace}%
+  \printtext{\bibstring{from}}\addspace%
+  ERIC\addspace database\adddot\addspace%
+  \mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) Five author max before "et al" and a one author truncation policy
+%            However, only after the first cite, see the labelname format
+%            in .cbx. It's also overridden per-entry by uniquelist
+% (APA 6.x)  Citation tracking is global
+% (APA 6.14) Use initials to disambiguate shared surnames
+% (APA 6.16) Use year postfix to disambiguate multiple items in same year
+% (APA 6.10) Never reference anything not cited
+% (APA 6.25) Author initials only
+% (APA 6.25) Sorting is nyt but we need to account for PUBSTATE which comes
+%            after all normal cites for the same author
+
+\DeclareSortingTemplate{apa}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \field{sortname}
+    \field{author}
+    \field{editor}
+    \field{translator}
+    \field{writer}
+    \field{director}
+    \field{producer}
+    \field{execproducer}
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{pubstate}
+  }
+  \sort{
+    \field{sortyear}
+    \field{year}
+    \literal{-2000000000}% APA has "nodates" coming first
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{volume}
+    \literal{0}
+  }
+}
+
+% Don't fall back on other year fields if there is no year, use
+% "nodate" string
+\DeclareLabeldate{%
+  \field{pubstate}
+  \field{date}
+  \field{year}%legacy - no EDTF support
+  \literal{nodate}
+}
+
+% Due to APA strange requirements like truncation after first cite and
+% ellipsis from 7th to n-1 in bib, there might be some really strange
+% edge cases which can't be handled as this needs treating in the style
+% after biber has finished. Very unlikely though.
+\ExecuteBibliographyOptions{%
+                            abbreviate=true,%
+                            autocite=inline,%
+                            backref=true,%
+                            citetracker=true,%
+                            date=apalong,%
+                            dateabbrev=false,%
+                            datecirca=true,%
+                            dateera=christian,%
+                            labeldate=apalong,%
+                            dateuncertain=true,%
+                            eventdate=comp,%
+                            labeldateparts=true,%
+                            maxbibnames=7,%
+                            maxcitenames=2,%
+                            minbibnames=6,%
+                            mincitenames=1,%
+                            mincrossrefs=999,%
+                            origdate=apalong,%
+                            pagetracker=true,%
+                            sortcites=true,%
+                            sorting=apa,%
+                            uniquelist=minyear,%
+                            uniquename=full,%
+                            uniqueprimaryauthor=true,%
+                            urldate=apalong,%
+                            useprefix=true,%
+                            usetranslator=true}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \step[fieldsource=year, final]
+      \step[fieldset=pubstate, null]
+    }
+    \map{
+      \step[fieldsource=date, final]
+      \step[fieldset=pubstate, null]
+   }
+  }
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% It is not APA standard to have backrefs in the bib
+% Some users might like it though.
+
+\newbool{apa:backref}
+\DeclareBibliographyOption{apabackref}{%
+  \ifstrequal{#1}{true}
+    {\global\booltrue{apa:backref}}
+    {\global\boolfalse{apa:backref}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Additional material sometimes goes in parens
+%            after title. This bool tracks the parens.
+
+\newbool{bbx:parens}
+\AtEveryBibitem{\global\boolfalse{bbx:parens}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.06:47) Reviews are awkward - if no author, date
+%               position changes so we need a flag to
+%               track this
+
+\newbool{bbx:noreviewauthor}
+\AtEveryBibitem{\global\boolfalse{bbx:noreviewauthor}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Sometimes "Vol" is inside the additional
+%            material parens, sometimes not. This bool
+%            tracks if it has been inserted yet.
+%            Can't use \clearfield{volume} as some
+%            later number format tests need to know
+%            whether volume was defined.
+
+\newbool{bbx:volseen}
+\AtEveryBibitem{\global\boolfalse{bbx:volseen}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) This bool tracks if the title was put
+%            in the author position.
+%            Can't use \clearfield{title} as some
+%            later punctuation tests need to know
+%            whether title was defined.
+
+\newbool{bbx:titleinauthpos}
+\AtEveryBibitem{\global\boolfalse{bbx:titleinauthpos}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Need a flag to say when the editor
+%            is in author position because this
+%            can effect where the year goes.
+
+\newbool{bbx:editorinauthpos}
+\AtEveryBibitem{\global\boolfalse{bbx:editorinauthpos}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Flag to say whether the "in" has
+%            been placed already in IN*
+%            Reset every bibitem.
+
+\newbool{bbx:in}
+\AtEveryBibitem{\global\boolfalse{bbx:in}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Set up some standard APA formats
+
+\DeclareFieldFormat{volume}{\apanum{#1}}
+\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
+\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
+\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
+\DeclareFieldFormat{part}{#1}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.25) Works by the same author have the full author
+%            name, not an eliding dash. Author is always
+%            last name first.
+% (APA 6.27) Ellipsis in 7th position and then nothing until last
+% (APA 7.10 Example 67) Unknown names and dates
+%
+
+% \printnames does different things depending on whether the format you are
+% calling is the default for the name field or is a custom format:
+%
+%   * Default format (e.g. "labelname" format for printing labelname): no
+%     start/stop max/minnames truncation is done first - the format is
+%     supposed to do it.
+%   * Custom format (e.g. "labelname" format for printing author):
+%     max/minnames truncation is done before calling the format so we have
+%     to do \printnames[format][-\value{listtotal}]{field} to ensure we get
+%     all of the names in the list to work on
+
+\DeclareNameAlias{default}{apaauthor}
+
+\DeclareNameFormat{apaauthor}{%
+  \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
+    {\addcomma\space\ldots\space}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
+      {}
+      {\iffieldannotation{uncertain}
+        {\mkbibbrackets{\usebibmacro{name:apa:family-given}%
+                         {\namepartfamily}%
+                         {\namepartgiven}%
+                         {\namepartgiveni}%
+                         {\namepartprefix}%
+                         {\namepartsuffix}?}}
+        {\usebibmacro{name:apa:family-given}%
+          {\namepartfamily}%
+          {\namepartgiven}%
+          {\namepartgiveni}%
+          {\namepartprefix}%
+          {\namepartsuffix}}}}%
+    \ifthenelse{\value{listcount}=\value{listtotal}}%
+      {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+
+\renewbibmacro*{author}{%
+  \ifnameundef{author}
+    {\usebibmacro{labeltitle}}
+    {\printnames[apaauthor][-\value{listtotal}]{author}%
+     \setunit*{\addspace}%
+     \printfield{nameaddon}%
+     \ifnameundef{with}
+       {}
+       {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
+        \printnames[apaauthor][-\value{listtotal}]{with}}
+        \setunit*{\addspace}}}%
+  \newunit\newblock%
+  \usebibmacro{labelyear+extradate}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) References section delimiters are ampersands, not " and "
+% (APA 6.27) Use blank for long lists
+% (APA 4.03) Serial comma for lists of three or more
+
+\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
+  \ifthenelse{\value{listcount}>\maxprtauth}
+    {}
+    {\ifthenelse{\value{liststop}>2}
+       {\finalandcomma\addspace\&\space}
+       {\addspace\&\space}}}
+
+\DeclareDelimFormat[bib,biblist]{finalnamedelim:apa:family-given}{%
+  \ifthenelse{\value{listcount}>\maxprtauth}
+    {}
+    {\finalandcomma\addspace\&\space}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.28) Use "nodate" bibstring for references with no year
+%            Months and days go into parenthesis with year, if set
+% (APA 6.29) Issue goes where month normally goes if it
+%            is set.
+% (APA 7.10) circa or uncertain dates in brackets
+
+% Make sure endmonth gets an expansion too
+\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}}
+
+\newbibmacro*{monthorissue}{%
+  \iffieldundef{issue}
+    {\iffieldundef{month}
+      {}
+      {\addcomma\space\printfield{month}%
+      \iffieldundef{endmonth}{}{/\printfield{endmonth}}}}
+    {\addcomma\space\printfield{issue}}}
+
+\newbibmacro*{labelyear+extradate}{%
+  \iffieldundef{labelyear}
+    {\iffieldundef{origyear}
+      {}
+      {\printtext[apadate]{\printorigdate}}}%
+    {\printtext[apadate]{\printlabeldateextra}}}
+
+\DeclareFieldFormat{apadate}{%
+  \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} }
+    {\printtext{\mkbibbrackets{#1}}}
+    {\printtext{\mkbibparens{#1}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) General format of titles.
+%            Ugly Chicago-style lowercasing of English titles
+
+\DeclareFieldFormat{apacase}{\bbx@colon@search\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat{issuetitle}{#1\isdot}
+\DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}}
+\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[article]{title}{#1\isdot}
+\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inbook]{title}{#1\isdot}
+\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[incollection]{title}{#1\isdot}
+\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inproceedings]{title}{#1\isdot}
+\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[proceedings]{title}{#1\isdot}
+\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.01 Example 10) Newspapers have prefix for pages.
+
+\DeclareFieldFormat[newsarticle]{pages}{%
+    \DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}%
+    \mkpageprefix{#1}%
+    \DeclareNumChars{.}}
+
+\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}}
+\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[newsarticle]{title}{#1}
+\DeclareFieldFormat[article]{pages}{#1}
+
+\newbibmacro*{newspaper}{%
+  \printfield{newspaper}
+  \setunit{\addcomma\space}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29)      Additional {main}title information in brackets (using)
+%                 {MAIN}TITLEADDON field. Colon after maintitle.
+
+\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
+
+\newbibmacro*{bookaddinfo}{%
+  \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
+    {}
+    {\printtext{\bibopenparen}%
+     \printfield{edition}%
+     \setunit*{\addcomma\addspace}%
+     \printfield{volumes}%
+     \setunit{}%
+     \printtext{\bibcloseparen}}%
+}
+
+\renewbibmacro*{title}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
+    {}
+    {\iffieldundef{origtitle}
+      {\printtext[title]{%
+        \printfield[apacase]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[apacase]{subtitle}}}
+      {\printfield{origtitle}%
+       \setunit{\addspace}%
+       \printtext[brackets]{%
+        \printfield[apacase]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[apacase]{subtitle}}}%
+     \setunit{\addspace}%
+     \printfield{titleaddon}%
+     \iffieldequalstr{entrytype}{book}%
+       {\setunit{\addspace}\usebibmacro{bookaddinfo}}%
+       {}%
+     \ifthenelse{%
+       \ifnameundef{author}\AND%
+       \(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND%
+       \ifnameundef{producer}\AND%
+       \ifnameundef{director}\AND%
+       \ifnameundef{writer}}
+        {\newunit\newblock
+         \usebibmacro{labelyear+extradate}}
+        {}}}
+
+\renewbibmacro*{maintitle}{%
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+    {}
+    {\printtext[maintitle]{%
+       \printfield[apacase]{maintitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{mainsubtitle}}%
+    \setunit{\addspace}}
+  \printfield{maintitleaddon}%
+  \addcolon}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Format of volume and number for articles
+
+\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Commas between title and volume for articles
+
+\renewbibmacro*{journal+issuetitle}{%
+  \usebibmacro{journal}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{volume}%
+  \printfield{number}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{issuename}%
+  \newunit}
+
+\newbibmacro*{issuename}{%
+  \iffieldundef{issuetitle}
+    {}
+    {\printtext[issuetitle]{%
+       \printfield[noformat]{issuetitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[noformat]{issuesubtitle}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Additional information for non-periodicals in
+%            parenthesis after title. This is ugly but it's
+%            hard to put in "optional parens" like this
+%            around an unknown amount of characters.
+
+\newbibmacro*{addinfo}{%
+  \ifthenelse{\iffieldundef{edition}\AND%
+              \iffieldundef{chapter}\AND%
+              \iffieldundef{volumes}\AND%
+              \iffieldundef{pages}\AND%
+              \iffieldundef{number}\AND%
+              \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
+  {}
+  {\printtext{\bibopenparen}%
+   \printfield{edition}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{chapter}%
+   \setunit*{\addcomma\addspace}%
+   \notbool{bbx:volseen}%
+     {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}%
+      \printfield{volume}%
+      \iffieldundef{part}{}{\printfield{part}}}{}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{volumes}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{pages}%
+   \setunit{}%
+   \printtext{\bibcloseparen}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) "In " precedes editor/trans list, no colon
+
+\newbibmacro*{in}{%
+  \ifbool{bbx:in}%
+    {}%
+    {\global\booltrue{bbx:in}%
+     \bibcpstring{in}\setunit{\space}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Editors have first names first ...
+% (APA 7.02 Example 27) ... unless there is no author
+
+\DeclareNameFormat{apanames}{%
+  \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
+    {\addcomma\space\ldots\space}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
+      {}
+      {\usebibmacro{name:apa:given-family}%
+        {\namepartfamily}%
+        {\namepartgiven}%
+        {\namepartgiveni}%
+        {\namepartprefix}%
+        {\namepartsuffix}}}%
+    \ifthenelse{\value{listcount}=\value{listtotal}}%
+      {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+
+\renewbibmacro*{author/editor}{%
+  \ifnameundef{author}
+    {\ifnameundef{editor}
+      {}
+      {\usebibmacro{editorinauthpos}}}
+    {\global\boolfalse{bbx:editorinauthpos}%
+     \usebibmacro{author}}}
+
+\newbibmacro*{editorinauthpos}{%
+    \global\booltrue{bbx:editorinauthpos}%
+    \printnames[apaauthor][-\value{listtotal}]{editor}%
+    \setunit{\addspace}%
+    \ifnameundef{editor}
+      {}
+      {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}%
+       % need to clear editor so we don't get an "In" clause later
+       % But we also need to set a flag to say we did this so we
+       % don't lose sight of the fact we once had an editor for
+       % various year placement tests
+       \clearname{editor}%
+       \setunit{\adddot\addspace}%
+       \usebibmacro{labelyear+extradate}%
+       \setunit{\adddot\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Name format. Don't capitalise prefixes
+% (APA 6.27) Full name disambiguation using brackets
+
+% #1 = family name
+% #2 = given name
+% #3 = given name (initials)
+% #4 = name prefix
+% #5 = name suffix
+
+\newbibmacro*{name:delim:apa:family-given}[1]{%
+  \ifnumgreater{\value{listcount}}{\value{liststart}}
+    {\ifboolexpr{
+       test {\ifnumless{\value{listcount}}{\value{liststop}}}
+       or
+       test \ifmorenames
+     }
+       {\printdelim{multinamedelim}}
+       {\printdelim{finalnamedelim:apa:family-given}}}
+    {}}
+
+\newbibmacro*{name:apa:family-given}[5]{%
+  \ifuseprefix
+    {\usebibmacro{name:delim:apa:family-given}{#4#1}%
+     \usebibmacro{name:hook}{#4#1}%
+     \ifdefvoid{#4}{}{%
+       \mkbibnameprefix{#4}\isdot%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot%
+     \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#3}\isdot%
+                      \ifthenelse{\value{uniquename}>1}
+                        {\bibnamedelimd\mkbibbrackets{#2}}
+                        {}}%
+     \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}
+    {\usebibmacro{name:delim:apa:family-given}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamefamily{#1}\isdot
+     \ifboolexpe{%
+       test {\ifdefvoid{#2}}
+       and
+       test {\ifdefvoid{#4}}}
+       {}
+       {\revsdnamepunct}%
+     \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#3}%
+                      \ifthenelse{\value{uniquename}>1}
+                        {\bibnamedelimd\mkbibbrackets{#2}}
+                        {}}%
+     \ifdefvoid{#4}{}{%
+       \bibnamedelimc\mkbibnameprefix{#4}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}}
+
+\newbibmacro*{name:apa:given-family}[5]{%
+  \usebibmacro{name:delim}{#2#4#1#5}%
+  \usebibmacro{name:hook}{#2#4#1#5}%
+  \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
+                   \ifthenelse{\value{uniquename}>1}
+                     {\bibnamedelimd\mkbibbrackets{#2}}
+                     {}%
+                   \bibnamedelimd}%
+  \ifdefvoid{#4}{}{%
+    \mkbibnameprefix{#4}\isdot
+    \ifprefchar{}{\bibnamedelimc}}%
+  \mkbibnamefamily{#1}\isdot%
+  \ifdefvoid{#5}{}{\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Editor string in parens after author list
+% (APA 7.02 Example 21) Collapse editor and trans if same
+% (APA 7.02 Example 26) Translator
+
+
+% Separated out into book and in* macros because otherwise
+% this makes one ugly, huge, unreadable beast.
+
+\newbibmacro*{book:editor+trans}{%
+  \ifthenelse{\ifnameundef{editor}\AND%
+              \ifnameundef{editora}\AND%
+              \ifnameundef{editorb}\AND%
+              \ifnameundef{editorc}\AND%
+              \ifnameundef{translator}}%
+    {}%
+    {\ifnamesequal{editor}{translator}%
+       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
+        \printnames[apanames][-\value{listtotal}]{editor}%
+        \setunit*{\addcomma\addspace}%
+        \usebibmacro{apaeditorstrg}{editor}%
+        \setunit*{\addspace\&\space}%
+        \printtext{\bibcpstring{translator}}%
+        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
+        \ifnameundef{editor}%
+          {}%
+          {\printnames[apanames][-\value{listtotal}]{editor}%
+           \setunit{\addcomma\addspace}%
+           \usebibmacro{apaeditorstrg}{editor}%
+           \clearname{editor}%
+           \setunit{\adddot}%
+           \setunit*{\addspace\&\space}}%
+        \ifnameundef{translator}%
+          {\setunit{}}%
+          {\printnames[apanames][-\value{listtotal}]{translator}%
+           \setunit{\addcomma\addspace}%
+           \printtext{\bibcpstring{translator}}%
+           \clearname{translator}%
+           \setunit{\adddot}}%
+        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
+
+\newbibmacro*{editor+trans}{%
+  \ifthenelse{\ifnameundef{editor}\AND%
+              \ifnameundef{editora}\AND%
+              \ifnameundef{editorb}\AND%
+              \ifnameundef{editorc}\AND%
+              \ifnameundef{translator}}%
+    {\setunit{\adddot\addspace}}%
+    {\ifnamesequal{editor}{translator}%
+      {\usebibmacro{in}%
+       \printnames[apanames][-\value{listtotal}]{editor}%
+       \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
+       \usebibmacro{apaeditorstrg}{editor}%
+       \setunit*{\addspace\&\space}%
+       \printtext{\bibcpstring{translator}}%
+       \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+      {\ifnameundef{translator}%
+        {}%
+        {\setunit{\addspace}%
+         \printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}%
+         \setunit{\addcomma\addspace}%
+         \printtext{\bibcpstring{translator}}}%
+         \clearname{translator}%
+         \setunit{\adddot\addspace}}%
+       \usebibmacro{in}%
+       \usebibmacro{editorx}}%
+     \setunit{\addcomma\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Special journal issues are periodicals
+
+\DeclareFieldFormat[periodical]{pages}{#1}
+\DeclareFieldFormat[periodical]{title}{#1\isdot}
+\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
+
+\renewbibmacro*{periodical}{%
+  \iffieldundef{title}
+    {}
+    {\printtext[title]{%
+       \printfield[apacase]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{subtitle}}}}
+
+\renewbibmacro*{title+issuetitle}{%
+  \usebibmacro{periodical}%
+  \setunit{\addspace}%
+  \printfield{issuetitle}%
+  \notbool{bbx:editorinauthpos}
+    {\newunit
+     \usebibmacro{labelyear+extradate}}
+    {}}
+
+\newbibmacro*{pnumber}{%
+  \printfield{volume}%
+  \printfield{number}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 21) Original year
+
+% Only give ORIGYEAR in references if both:
+%   YEAR is also given
+%   YEAR and ORIGYEAR are different
+
+\newbibmacro*{origyear}{%
+  \ifboolexpr{%
+    not test {\iffieldundef{origyear}}
+    not test {\iffieldundef{labelyear}}
+    and not test {\iffieldsequal{labelyear}{origyear}}}
+      {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}}
+      {}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02) "In " before booktitle, edited or not
+% (APA 6.30) Non-periodical volume number followed by "."
+
+\renewbibmacro*{maintitle+title}{%
+  \iffieldsequal{maintitle}{title}
+    {\clearfield{maintitle}%
+     \clearfield{mainsubtitle}%
+     \clearfield{maintitleaddon}}
+    {\iffieldundef{maintitle}
+      {}
+      {\usebibmacro{maintitle}%
+       \newunit\newblock
+       \iffieldundef{volume}
+         {}
+         {\setunit{\global\booltrue{bbx:volseen}}%
+          \printfield{volume}%
+          \printfield{part}%
+          \setunit{\adddot\space}}}}%
+  \usebibmacro{title}%
+  \newunit}
+
+\renewbibmacro*{maintitle+booktitle}{%
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}
+    {}
+    {\usebibmacro{in}%
+     \iffieldundef{maintitle}
+      {}
+      {\usebibmacro{maintitle}%
+       \newunit\newblock
+       \iffieldundef{volume}
+         {}
+         {\setunit{\addspace\global\booltrue{bbx:volseen}}%
+          \printfield{volume}%
+          \printfield{part}%
+          \setunit{\adddot\addspace}}}%
+    \usebibmacro{booktitle}}}
+
+\renewbibmacro*{booktitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{booksubtitle}}
+    {}
+    {\printtext[booktitle]{%
+       \printfield[apacase]{booktitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{booksubtitle}}%
+     \setunit{\addspace}}%
+  \printfield{booktitleaddon}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Colon separates title/subtitle
+%            Skip if following terminating punctuation
+
+\renewcommand*{\subtitlepunct}{\ifterm{}{\addcolon}\space}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Format of volume depends on whether
+%            there is a maintitle (what APA calls "series") or not.
+
+\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
+                              {\bibcpstring{volume}~\apanum{#1}}
+                              {\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Number for reports with no prefix if not
+%            a numeral. Report number is optional and so must be
+%            the parens.
+
+\DeclareFieldFormat{number}{\iffieldundef{volume}
+                             {\ifinteger{\thefield{number}}
+                               {\addspace\mkbibemph{\bibcpstring{number}~\apanum{#1}}\adddot}
+                               {\apanum{#1}}}
+                             {\mkbibemph{\apanum{#1}}}}
+
+\DeclareFieldFormat[report]{number}{\mkbibparens{\iffieldundef{type}
+                                                  {}
+                                                  {\printfield{type}\setunit{\addspace}}%
+                                                  \bibcpstring{number}~\apanum{#1}}}
+
+\newbibmacro*{apa:reportnum}{%
+  \iffieldundef{number}%
+    {}%
+    {\printfield{number}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Location only shows first item
+
+\DeclareListFormat{default}{%
+  \usebibmacro{list:delim}{#1}%
+  #1\isdot}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 38) Proceedings emph number, location
+%                       and location. Pages have no prefix
+
+\DeclareListFormat[proceedings]{location}{\mkbibemph{#1}}
+\DeclareFieldFormat[proceedings]{pages}{#1}
+\DeclareFieldFormat[proceedings]{number}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[proceedings]{volume}{\mkbibemph{\apanum{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 40--44) Theses titles and volume
+%                           Titles are not emph if only an abstract
+
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.05) Unpublished theses
+
+\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.06) Reviews
+
+% The title of the review depends on the entrytype of the thing reviewed
+\newcommand*{\begrelateddelimreviewof}{\addspace}
+\DeclareFieldFormat[review]{title}{%
+  \entrydata*{\thefield{related}}{%
+    \ifentrytype{article}
+      {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}}
+      {\printtext[apacase]{\thefield{savedtitle}}}}}
+
+\DeclareFieldFormat[review]{pages}{#1}
+\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}}
+
+\newbibmacro*{reviewauthor}{%
+  \ifnameundef{author}
+    {\booltrue{bbx:noreviewauthor}}
+    {\usebibmacro{author}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Media authors
+
+\newbibmacro*{producer}{%
+  \ifnameundef{producer}
+    {}
+    {\printnames[apaauthor][-\value{listtotal}]{producer}%
+     \addspace
+     \printtext[parens]{\bibcpstring{producer}}%
+     \setunit*{\addcomma\addspace\&\addspace}}}
+
+\newbibmacro*{director}{%
+  \ifnameundef{director}
+    {}
+    {\printnames[apaauthor][-\value{listtotal}]{director}%
+     \addspace
+     \printtext[parens]{\bibcpstring{director}}%
+     \setunit*{\addcomma\addspace\&\addspace}}}
+
+\newbibmacro*{writer}{%
+  \ifnameundef{writer}
+    {}
+    {\printnames[apaauthor][-\value{listtotal}]{writer}%
+     \addspace
+     \printtext[parens]{\bibcpstring{writer}}%
+     \setunit*{\addcomma\addspace\&\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%
+% (APA 7.07) Misc and data
+
+\DeclareFieldFormat[data]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[data]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[misc]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}}
+\DeclareFieldFormat[misc]{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{{#1}\isdot}}
+
+\newbibmacro*{datatitle}{%
+  \iffieldundef{title}
+    {\iffieldundef{entrysubtype}
+      {}
+      {\printfield{entrysubtype}}}
+    {\iffieldundef{entrysubtype}
+      {}
+      {\usebibmacro{title}\addspace
+       \printfield{entrysubtype}}}}
+
+%
+%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.07) Audiovisual
+
+\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}}{#1}}
+\DeclareFieldFormat[video]{maintitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[video]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[audio]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[music]{title}{#1}
+\DeclareFieldFormat[music]{maintitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[music]{mainsubtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[audio]{howpublished}{\mkbibparens{#1}}
+
+\newbibmacro*{tvseries}{%
+  \iffieldundef{maintitle}
+    {}
+    {\usebibmacro{in}%
+     \ifnameundef{execproducer}
+       {}
+       {\printnames[apanames][-\value{listtotal}]{execproducer}%
+         \addspace
+         \printtext[parens]{\bibcpstring{execproducer}}}
+     \setunit{\addcomma\addspace}%
+     \usebibmacro{avmaintitle}%
+     \newunit}}
+
+\newbibmacro*{avmaintitle}{%
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+    {}
+    {\printtext[maintitle]{%
+       \printfield[apacase]{maintitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{mainsubtitle}}%
+    \setunit{\addspace}}
+  \printfield{maintitleaddon}}
+
+\newbibmacro*{album}{%
+  \iffieldundef{maintitle}
+    {}
+    {\bibcpstring{on}%
+     \setunit{\addspace}%
+     \usebibmacro{avmaintitle}%
+     \newunit}}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10) Letter/Letters
+
+\DeclareFieldFormat[letter]{title}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[letters]{title}{#1}
+\DeclareFieldFormat[letter]{number}{\mkbibparens{#1}}
+\DeclareFieldFormat[letters]{number}{\mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%
+% (APA 6.31) URLs
+
+\DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{abstracturl}{\url{#1}}
+\DeclareFieldFormat{urldate}{#1}
+
+\renewbibmacro*{url+urldate}{%
+     \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}}
+       {}
+       {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
+         {}
+         {\printtext{\bibcpstring{abstract}}\addspace}%
+         \iffieldequalstr{entrysubtype}{{DVD}}
+           {\printtext{\bibstring{available}}}
+           {\printtext{\bibstring{retrieved}}}%
+          \setunit{\addspace}%
+          \iffieldundef{urlyear}
+            {}
+            {\printtext{\printurldate}%
+             \setunit*{\urldatecomma}}%
+          \printtext{\bibstring{from}}%
+          \setunit*{\addspace}%
+          \printfield{urldescription}%
+          \setunit*{\addcolon\addspace}%
+          \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
+          \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}%
+          \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
+
+%
+%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.11) Non-emph titles for online items
+%            Subtype in brackets
+
+
+\DeclareFieldFormat[online]{title}{#1}
+\DeclareFieldFormat[online]{entrysubtype}{\mkbibbrackets{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA A7.07) Emph titles for patents
+
+\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.08 Example 56) Software has version in title
+
+\DeclareFieldFormat[software]{title}{#1}
+\DeclareFieldFormat[software]{version}{\mkbibparens{\bibcpstring{version}~#1}}
+
+\newbibmacro*{apa:softwaretitle}{%
+  \printtext[title]{%
+  \printfield[apacase]{title}%
+  \setunit{\subtitlepunct}%
+  \printfield[apacase]{subtitle}}%
+  \setunit{\addspace}%
+  \iffieldundef{version}%
+     {}
+     {\printfield{version}}
+  \printfield{titleaddon}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Hacky bits to suppress final period in some cases.
+% * If there is an ORIGYEAR field (APA 7.02:21)
+% * Unless there is a RELATED and ADDENDUM
+\newbibmacro*{apa:finpunct}{%
+  \iffieldundef{origyear}
+    {\ifboolexpr{
+       test {\iffieldundef{addendum}}
+       and
+       test {\iffieldundef{related}}}
+     {}
+     {\renewcommand*{\finentrypunct}{\relax}}}
+    {\renewcommand*{\finentrypunct}{\relax}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Related entries
+
+\DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}}
+\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
+
+\renewbibmacro*{related:reprintfrom}[1]{%
+  \entrydata*{#1}{%
+    \printtext{\mkbibemph{\printfield[apacase]{title}}}%
+    \setunit{\bibpagespunct}%
+    \printfield{pages}%
+    \setunit{\addcomma\addspace}%
+    \bibstring{byauthor}\addspace
+    \ifnameundef{editor}
+      {}
+      {\printnames[apanames][-\value{listtotal}]{editor}%
+       \setunit{\addcomma\addspace}%
+       \usebibmacro{apaeditorstrg}{editor}%
+       \setunit{\addcomma\addspace}%
+       \printlabeldateextra
+       \setunit{\addcomma\addspace}}%
+    \printnames[apanames][-\value{listtotal}]{author}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{location+publisher}%
+    \newunit\newblock
+    \usebibmacro{related}}}
+
+\newbibmacro*{related:reviewof}[1]{%
+  \setunit{}% Sanitise this in case no author
+  \entrydata*{#1}{%
+    \ifentrytype{article}
+      {\printtext{\printfield[apacase]{title}}}
+      {\printtext{\mkbibemph{\printfield[apacase]{title}}}}%
+    \setunit{\addspace}%
+    \bibstring{byauthor}\addspace
+    \printnames[apanames][-\value{listtotal}]{author}%
+    \printnames[apanames][-\value{listtotal}]{producer}%
+    \printnames[apanames][-\value{listtotal}]{director}%
+    \setunit{\addcomma\addspace}%
+    \printdateextra
+    \newunit\newblock
+    \usebibmacro{related}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.x) General type layouts
+
+\DeclareBibliographyDriver{article}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{journal+issuetitle}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{newsarticle}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{newspaper}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{maintitle+title}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{book:editor+trans}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{booktitle}%
+  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{location+publisher}%
+  \setunit{\addcomma\addspace}%
+  \printfield{volume}%
+  \setunit*{\adddot}%
+  \printfield{number}%
+  \setunit{\addcomma\addspace}
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \setunit{\addcomma\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit*{\addspace}\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \setunit*{\addcomma\addspace}\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \setunit*{\addcomma\addspace}\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \iffieldundef{eventyear}{}{\setunit{\addcomma\addspace}}%
+  \printeventdate
+  \setunit*{\addspace}\newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \printfield[apacase]{eventtitle}%
+  \newunit
+  \printfield{venue}%
+  \iffieldundef{pages}
+    {\setunit{\addcomma\addspace}}
+    {\newunit}%
+  \newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \printfield{entrysubtype}%
+  \addperiod\addspace
+  \iftoggle{bbx:doi}
+    {\printfield{doi}%
+     \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}%
+     \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{url+urldate}%
+  \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{byholder}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{periodical}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title+issuetitle}%
+  \setunit{\adddot\addspace}
+  \usebibmacro{journal}%
+  \setunit{\addcomma\addspace}
+  \printlist{location}%
+  \setunit{\addcomma\addspace}
+  \usebibmacro{pnumber}%
+  \setunit{\addcomma\addspace}
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \usebibmacro{apa:reportnum}%
+  \newunit\newblock
+  \printlist{institution}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{type+institution}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{review}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{reviewauthor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \newunit\newblock
+  \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
+  \newunit\newblock
+  \usebibmacro{journal+issuetitle}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \printlist{institution}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{data}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{datatitle}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{letter}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printlist{institution}%
+  \setunit{\addspace}\newblock
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{letters}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printlist{institution}%
+  \setunit{\addspace}\newblock
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{writer}%
+  \usebibmacro{director}%
+  \usebibmacro{producer}%
+  \newunit\newblock
+  \usebibmacro{labelyear+extradate}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{tvseries}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{movie}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{writer}%
+  \usebibmacro{director}%
+  \usebibmacro{producer}%
+  \newunit\newblock
+  \usebibmacro{labelyear+extradate}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{tvseries}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{writer}%
+  \usebibmacro{director}%
+  \usebibmacro{producer}%
+  \newunit\newblock
+  \usebibmacro{labelyear+extradate}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{album}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{software}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{apa:softwaretitle}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \iflistundef{institution}
+    {\newunit}
+    {\setunit{\addcomma\addspace}}%
+  \newblock
+  \printlist{institution}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}
+  \usebibmacro{finentry}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Modified, common macros
+
+\newbibmacro*{editorx}{%
+  \ifnameundef{editor}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editor}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}
+     \clearname{editor}%
+     \newunit}%
+  \ifnameundef{editora}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editora}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editora}}
+     \clearname{editora}%
+     \newunit}%
+  \ifnameundef{editorb}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editorb}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editorb}}
+     \clearname{editorb}%
+     \newunit}%
+  \ifnameundef{editorc}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editorc}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editorc}}
+     \clearname{editorc}%
+     \newunit}}
+
+\newbibmacro*{apaeditorstrg}[1]{%
+  \iffieldundef{#1type}
+    {\ifthenelse{\value{#1}>1\OR\ifandothers{#1}}
+       {\bibcpstring{editors}}
+       {\bibcpstring{editor}}}
+    {\ifthenelse{\value{#1}>1\OR\ifandothers{#1}}
+         {\bibcpstring{type\thefield{#1type}s}}
+         {\bibcpstring{type\thefield{#1type}}}}}
+
+\renewbibmacro*{doi+eprint+url}{%
+  \iftoggle{bbx:doi}
+    {\printfield{doi}%
+     \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}%
+     \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:url}
+    {\usebibmacro{url+urldate}%
+     \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}}
+
+
+\DeclareFieldFormat{doi}{%
+  doi\addcolon
+  \ifhyperref
+    {\href{https://doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02) No LOCATION/PUBLISHER if there is a DOI
+%            (Inconsistent in 2nd printing, see 7.04:39 which
+%            is incorrect in 2nd printing)
+
+\newbibmacro*{location+publisher}{%
+  \iffieldundef{doi}
+    {\printlist[default][1-1]{location}%
+     \setunit*{\addcolon\space}%
+     \printlist{publisher}%
+     \newunit}
+    {}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+  
+\newbibmacro*{type+institution}{%
+  \setunit{\addspace}%
+  \ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} }
+    {}
+    {\printtext[parens]{%
+       \iflistundef{institution}
+         {\setunit*{\addspace}}
+         {\setunit*{\addcolon\space}}%
+       \printfield{type}%
+       \setunit*{\addcomma\space}%
+       \printlist{institution}%
+       \setunit*{\addcomma\space}%
+       \printlist{location}}%
+     \newunit}}
+
+\newbibmacro*{labeltitle}{%
+  \iffieldundef{label}
+    {\printfield{title}%
+     \clearfield{title}%
+     \setunit{\addspace}%
+     \printfield{entrysubtype}%
+     \clearfield{entrysubtype}%
+     \global\booltrue{bbx:titleinauthpos}}
+    {\printfield{label}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Wrapper for backrefs
+
+\newbibmacro{apa:pageref}{%
+  \ifbool{apa:backref}{\usebibmacro{pageref}}{}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+
+% Unchanged from authoryear-comp
+
+\DeclareBibliographyOption{dashed}[true]{%
+  \ifstrequal{#1}{true}
+    {\ExecuteBibliographyOptions{pagetracker}%
+     \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
+    {\ExecuteBibliographyOptions{pagetracker=false}%
+     \renewbibmacro*{bbx:savehash}{}}}
+
+\DeclareFieldFormat{shorthandwidth}{#1}
+\setlength{\bibitemsep}{0pt}
+
+\DeclareNameAlias{author}{sortname}
+\DeclareNameAlias{editor}{sortname}
+\DeclareNameAlias{translator}{sortname}
+
+\defbibenvironment{bibliography}
+  {\list
+     {}
+     {\setlength{\leftmargin}{\bibhang}%
+      \setlength{\itemindent}{-\leftmargin}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shorthands}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}
+     {\setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\InitializeBibliographyStyle{%
+  \global\undef\bbx@lasthash}
+
+\newbibmacro*{bbx:savehash}{%
+  \savefield{fullhash}{\bbx@lasthash}}
+
+\newbool{bbx@inset}
+\DeclareBibliographyDriver{set}{%
+  \booltrue{bbx@inset}%
+  \entryset{}{}%
+  \newunit\newblock
+  \usebibmacro{setpageref}%
+  \finentry}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
new file mode 100644
index 00000000000..5ab584a083b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
@@ -0,0 +1,538 @@
+%% Copyright 2019 Philip Kime
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Philip Kime.
+
+\ProvidesFile{apa6.cbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex citation style]
+\RequireBiber[3]
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.16) labelyear postfix is not emphasised or italic
+%            Dashes between labelyear and non-numeric year (or pseudo-year)
+
+\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.11) requires comma separator between authors and years
+
+\DeclareDelimFormat{nameyeardelim}{\addcomma\space}
+\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) No comma before "et al" if there is only one name
+%            preceding it
+
+\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) ampersand separator in parenthetical cites
+
+\DeclareDelimFormat[parencite]{finalnamedelim}
+  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.11) Suffices are not shown in citations
+% (APA 6.12) 3-5 authors have "et al." after first cite
+% (Blog https://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author and only when not unique across all *primary* authors
+
+\newbibmacro*{labelname:doname}[8]{%
+  \ifboolexpr{test {\ifnumcomp{\value{listcount}}{>}{1}}
+              or
+              test {\ifuniqueprimaryauthor}}
+    {\setcounter{uniquename}{0}}
+    {}%
+  \ifcase\value{uniquename}%
+    \ifuseprefix
+      {\usebibmacro{name:family}{#1}{#3}{#5}{\relax}}
+      {\usebibmacro{name:family}{#1}{#3}{\relax}{\relax}}%
+  \or
+     \ifuseprefix
+       {\usebibmacro{name:given-family}{#1}{#4}{#5}{\relax}}
+       {\usebibmacro{name:given-family}{#1}{#4}{\relax}{\relax}}%
+  \or
+     \ifuseprefix
+       {\usebibmacro{name:given-family}{#1}{#3}{#5}{\relax}}
+       {\usebibmacro{name:given-family}{#1}{#3}{\relax}{\relax}}%
+  \fi
+  \usebibmacro{name:andothers}}
+
+% Can't do this with the built-in printnames format as APA requires truncation
+% and disambiguation only after first cite
+% We either use uniquelist or minnames for truncation. If uniquelist isn't
+% defined, we fall back on minnames
+%
+% \printnames does different things depending on whether the format you are
+% calling is the default for the name field or is a custom format:
+%
+% max/minnames truncation is done before calling the format so we have
+% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
+% all of the names in the list to work on here
+%
+% Explicit "and others" is dealt with in labelname:doname via a custom name:andothers
+
+\DeclareNameFormat{labelname}{%
+  % First set the truncation point
+  \ifthenelse{\value{uniquelist}>1}
+    {\numdef\cbx@min{\value{uniquelist}}}
+    {\numdef\cbx@min{\value{minnames}}}%
+  % Always print the first name and the second if there are only two since
+  % "et al" must always be plural
+  \ifboolexpr{test {\ifnumcomp{\value{listcount}}{=}{1}}
+              or test {\ifnumcomp{\value{listtotal}}{=}{2}}}
+    {\usebibmacro{labelname:doname}%
+      {\namepartfamily}%
+      {\namepartfamilyi}%
+      {\namepartgiven}%
+      {\namepartgiveni}%
+      {\namepartprefix}%
+      {\namepartprefixi}%
+      {\namepartsuffix}%
+      {\namepartsuffixi}}
+    % We are looking at name >=3
+    % If the list is 6 or more names or we have seen citation before, potential truncation
+    {\ifboolexpr{test {\ifnumcomp{\value{listtotal}}{>}{5}}
+                 or test {\ifciteseen}}
+     % Less than the truncation point, print normally
+     {\ifnumcomp{\value{listcount}}{<}{\cbx@min + 1}
+       {\usebibmacro{labelname:doname}%
+         {\namepartfamily}%
+         {\namepartfamilyi}%
+         {\namepartgiven}%
+         {\namepartgiveni}%
+         {\namepartprefix}%
+         {\namepartprefixi}%
+         {\namepartsuffix}%
+         {\namepartsuffixi}}
+       {}%
+      % At potential truncation point ...
+      \ifnumcomp{\value{listcount}}{=}{\cbx@min + 1}
+        % but enforce plurality of et al - only truncate here if there is at
+        % least one more element after the current potential truncation point
+        % so that "et al" covers at least two elements.
+        {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}}
+          {\printdelim{andothersdelim}\bibstring{andothers}}
+          {\usebibmacro{labelname:doname}%
+            {\namepartfamily}%
+            {\namepartfamilyi}%
+            {\namepartgiven}%
+            {\namepartgiveni}%
+            {\namepartprefix}%
+            {\namepartprefixi}%
+            {\namepartsuffix}%
+            {\namepartsuffixi}}}
+        {}%
+      % After truncation point, do not print name
+      \ifnumcomp{\value{listcount}}{>}{\cbx@min + 1}
+       {\relax}%
+       {}}%
+     % We are looking at name >=3
+     % Name list is < 6 names or we haven't seen this citation before, print normally
+     {\usebibmacro{labelname:doname}%
+       {\namepartfamily}%
+       {\namepartfamilyi}%
+       {\namepartgiven}%
+       {\namepartgiveni}%
+       {\namepartprefix}%
+       {\namepartprefixi}%
+       {\namepartsuffix}%
+       {\namepartsuffixi}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.13) Groups as names
+%            SHORTAUTHOR brackets in parencites
+
+\DeclareNameFormat{sabrackets}{%
+  \mkbibbrackets{%
+    \usebibmacro{labelname:doname}%
+      {\namepartfamily}%
+      {\namepartfamilyi}%
+      {\namepartgiven}%
+      {\namepartgiveni}%
+      {\namepartprefix}%
+      {\namepartprefixi}%
+      {\namepartsuffix}%
+      {\namepartsuffixi}}}
+
+\DeclareFieldFormat{shorthand}{\ifciteseen
+                                {#1}
+                                {\mkbibbrackets{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.13) Deal with SHORTAUTHOR fields
+% (APA 6.16) Multiple same author cites in a compact citation call do not
+%            need to be repeated but the full years must be repeated with
+%            their extradate postfixes
+% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
+% (APA 6.28) ISSUE after year when available
+\def\citeresetapa{\global\let\cbx@apa@names\@empty}
+\citeresetapa
+\def\cbx@apa@ifnamesaved{%
+  \xifinlist{\thefield{fullhash}}{\cbx@apa@names}
+    {\@firstoftwo}
+    {\@secondoftwo}}
+
+\newbibmacro*{cite:author}{%
+  \iffieldequals{fullhash}{\cbx@lasthash}
+% Multiple cites in one command
+   {\setunit{\compcitedelim}%
+    \usebibmacro{cite:plabelyear+extradate}}%
+% Single cite
+   {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+% No author/editor
+     {\usebibmacro{cite:noname}%
+       \savefield{fullhash}{\cbx@lasthash}}
+% Normal cite
+     {\ifnameundef{shortauthor}
+        {\printnames[labelname][-\value{listtotal}]{labelname}}%
+        {\cbx@apa@ifnamesaved
+          {\printnames{shortauthor}}
+          {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
+      \savefield{fullhash}{\cbx@lasthash}}}%
+   \setunit{\multicitedelim}}
+
+% Using fullhash instead of namehash otherwise we may omit namelist for
+% lists which are equal only because of minnames truncation i.e:
+%
+% X and Y and Z (2009)
+% X and W and V (2010)
+%
+% which have the same namehash due to minnames visibility truncation to 1 
+% would be printed incorrectly as
+% \cite{one, two} -> X, Y & Z 2009, 2010
+\newbibmacro*{cite}{%
+  \iffieldequals{fullhash}{\cbx@lasthash}
+% Multiple cites in one command
+   {\setunit{\compcitedelim}%
+    \usebibmacro{cite:plabelyear+extradate}}%
+% Single cite
+   {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+% No author/editor
+     {\usebibmacro{cite:noname}%
+       \setunit{\printdelim{nameyeardelim}}%
+       \usebibmacro{cite:plabelyear+extradate}%
+       \savefield{fullhash}{\cbx@lasthash}}
+% Normal cite
+     {\ifnameundef{shortauthor}
+        {\printnames[labelname][-\value{listtotal}]{labelname}}%
+        {\cbx@apa@ifnamesaved
+          {\printnames{shortauthor}}
+          {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
+      \setunit{\printdelim{nameyeardelim}}%
+      \usebibmacro{cite:plabelyear+extradate}%
+      \savefield{fullhash}{\cbx@lasthash}}}%
+   \setunit{\multicitedelim}}
+
+\newbibmacro*{textcite}{%
+  \iffieldequals{fullhash}{\cbx@lasthash}
+% Compact cite - more than one thing for same author
+    {\setunit{\compcitedelim}%
+     \usebibmacro{cite:plabelyear+extradate}}
+% New cite
+    {%
+    \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+      \setunit{\compcitedelim}%
+      \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+  % No author/editor or patent
+       {\iffieldundef{shorthand}%
+    % Cite using title
+         {\usebibmacro{cite:noname}%
+          \setunit{\ifbool{cbx:np}%
+                   {\printdelim{nameyeardelim}}%
+                   {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+          \usebibmacro{cite:plabelyear+extradate}}
+    % Cite using shorthand
+         {\usebibmacro{cite:shorthand}}}
+  % Normal cite with author/editor
+  % Normal full cite
+       {\ifnameundef{shortauthor}%
+    % Normal full cite
+         {\printnames[labelname][-\value{listtotal}]{labelname}}
+    % Cite using short author
+         {\cbx@apa@ifnamesaved
+           {\printnames{shortauthor}}
+           {\printnames[labelname][-\value{listtotal}]{author}}}%
+  % Year
+        \setunit{\ifbool{cbx:np}
+                  {\printdelim{nameyeardelim}}
+                  {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+  % Put the shortauthor inside the year brackets if necessary
+        \ifnameundef{shortauthor}
+         {}
+         {\cbx@apa@ifnamesaved
+           {}
+           {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}%
+  % Actual year printing
+        \usebibmacro{cite:plabelyear+extradate}%
+  % Save name hash for checks later
+        \savefield{fullhash}{\cbx@lasthash}}}}
+
+\newbibmacro*{cite:plabelyear+extradate}{%
+  \iffieldundef{labelyear}{}
+    {\printtext[bibhyperref]{%
+        \clearfield{labelmonth}% don't want months in citations
+        \clearfield{labelday}% don't want days in citations
+        \clearfield{labelendmonth}% don't want months in citations
+        \clearfield{labelendday}% don't want days in citations
+        \iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges
+          {\clearfield{labelendyear}}
+          {}%
+        \iffieldundef{origyear}{}
+          {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} }
+            {\mkbibbrackets{\printorigdate}}
+            {\printorigdate}%
+           \setunit*{\addslash}}%
+       \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} }
+         {\mkbibbrackets{\printlabeldateextra}}
+         {\printlabeldateextra}}}%
+  \iffieldundef{issue}
+    {}
+    {\addcomma\addspace\printfield{issue}}}
+
+\newbibmacro*{cite:shorthand}{%
+  \ifciteseen
+    {\printfield{shorthand}}
+    {\printnames[labelname][-\value{listtotal}]{labelname}%
+     \setunit{\printdelim{nameyeardelim}}%
+     \printfield{title}\space\printfield{shorthand}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.15) Fall back to title for citations without authors
+
+\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[patent]{citetitle}{#1}
+
+\newbibmacro*{cite:noname}{%
+    \printfield[citetitle]{labeltitle}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.21) No parens round year for cites when the cite is in
+%            parentheses. Use new command \nptextcite for such cites.
+
+\DeclareDelimFormat[nptextcite]{finalnamedelim}
+  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim}
+\DeclareCiteCommand{\nptextcite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \global\booltrue{cbx:np}%
+   \usebibmacro{textcite}%
+   \usebibmacro{cite:post}%
+   \global\boolfalse{cbx:np}}%
+  {}
+  {\iffieldundef{postnote}
+     {}
+     {\printdelim{nameyeardelim}%
+      \printfield{postnote}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% No shorthand
+% 
+\newbibmacro*{citeyear}{%
+  \iffieldundef{labelyear}
+    {\usebibmacro{cite:init}}
+    {\iffieldequals{fullhash}{\cbx@lasthash}
+       {\setunit{\compcitedelim}%
+        \usebibmacro{cite:plabelyear+extradate}}
+       {\usebibmacro{cite:plabelyear+extradate}%
+        \savefield{fullhash}{\cbx@lasthash}}}%
+  \setunit{\multicitedelim}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Fullcite should use "&"
+% Also need to reset the global booleans which are normally done at
+% every bib item but since these aren't bib items, they are not reset
+
+\DeclareDelimFormat[fullcite,fullcitebib]{finalnamedelim}
+   {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}%
+      \global\boolfalse{bbx:parens}%
+      \global\boolfalse{bbx:volseen}%
+      \global\boolfalse{bbx:titleinauthpos}%
+      \global\boolfalse{bbx:editorinauthpos}%
+      \global\boolfalse{bbx:in}%
+      \global\let\blx@related@loop\@empty}
+    {\thefield{entrytype}}%
+   \usebibmacro{cite:post}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\fullcitebib}
+  {\list{}
+   {\setlength{\leftmargin}{\bibhang}%
+     \setlength{\itemindent}{-\leftmargin}%
+     \setlength{\itemsep}{\bibitemsep}%
+     \setlength{\parsep}{\bibparsep}}\item}
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}%
+      \global\boolfalse{bbx:parens}%
+      \global\boolfalse{bbx:volseen}%
+      \global\boolfalse{bbx:titleinauthpos}%
+      \global\boolfalse{bbx:editorinauthpos}%
+      \global\boolfalse{bbx:in}}
+    {\thefield{entrytype}}%
+   \finentry
+   \usebibmacro{cite:post}}
+  {\item}
+  {\endlist}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newbool{cbx:parens} % boolean to say we're inside parens
+\newbool{cbx:np} % boolean to say we're using a non-parentheses text cite
+
+\newbibmacro*{textcite:postnote}{%
+  \usebibmacro{postnote}%
+  \ifbool{cbx:parens}
+    {\bibcloseparen\global\boolfalse{cbx:parens}}
+    {}}
+
+\newbibmacro*{cite:init}{%
+  \global\boolfalse{cbx:parens}%
+  \global\undef\cbx@lasthash}
+
+\newbibmacro*{cite:post}{%
+  \xifinlist{\thefield{fullhash}}{\cbx@apa@names}
+    {}
+    {\listxadd{\cbx@apa@names}{\thefield{fullhash}}}}
+
+\newbibmacro*{cite:labelyear}{%
+  \printfield{labelyear}}
+
+\newbibmacro*{cite:extradate}{%
+  \printfield{extradate}}
+
+\newbibmacro*{cite:labelyear+extradate}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printfield{labelyear}%
+       \printfield{extradate}}}
+
+\DeclareCiteCommand{\citeyear}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{cite:plabelyear+extradate}}
+  {\multinamedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\bibsentence
+   \usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim}
+
+\DeclareCiteCommand{\textcite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{textcite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\citeauthor}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite:author}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
new file mode 100644
index 00000000000..ae97a33c4a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
@@ -0,0 +1,128 @@
+%% Copyright 2019 Philip Kime
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Philip Kime.
+
+\ProvidesFile{apa6.dbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex style data model]
+\RequireBiber[3]
+
+\DeclareDatamodelEntrytypes{
+  letters,
+  data,
+  newsarticle}
+
+\DeclareDatamodelFields[type=list, datatype=name]{
+  with,
+  writer,
+  producer,
+  execproducer,
+  director}
+
+\DeclareDatamodelFields[type=field, datatype=literal]{
+  abstractloc,
+  titleisdescription,
+  newspaper,
+  urldescription}
+
+\DeclareDatamodelFields[type=field, datatype=verbatim]{
+  abstracturl}
+
+\DeclareDatamodelEntryfields{
+  titleisdescription,
+  with,
+  abstractloc,
+  abstracturl,
+  urldescription}
+
+
+\DeclareDatamodelEntryfields[video]{
+  writer,
+  producer,
+  execproducer,
+  director}
+
+\DeclareDatamodelEntryfields[newsarticle]{
+  author,
+  newspaper,
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
+  doi,
+  editor,
+  editora,
+  editorb,
+  editorc,
+  editoratype,
+  editorbtype,
+  editorctype,
+  eid,
+  eprint,
+  eprintclass,
+  eprinttype,
+  issn,
+  issue,
+  issuetitle,
+  issuesubtitle,
+  language,
+  note,
+  number,
+  origlanguage,
+  pages,
+  series,
+  subtitle,
+  titleaddon,
+  translator,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
+  volume}
+
+\DeclareDatamodelEntryfields[data]{
+  title,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  day,
+  endday,
+  endmonth,
+  endyear,
+  month,
+  year,
+  addendum,
+  author,
+  language,
+  location,
+  note,
+  organization,
+  pubstate,
+  subtitle,
+  titleaddon,
+  type,
+  url,
+  urlday,
+  urlendday,
+  urlendmonth,
+  urlendyear,
+  urlmonth,
+  urlyear,
+  version}
+
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
new file mode 100644
index 00000000000..66d59e87178
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
@@ -0,0 +1,213 @@
+\ProvidesFile{austrian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{austrian}
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {austrian},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  with             = {{mit}{mit}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa@lbx@de@mkdaterangeapalong#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa@lbx@de@mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa@lbx@de@mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa@lbx@de@mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
new file mode 100644
index 00000000000..590501e7abb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
@@ -0,0 +1,136 @@
+\ProvidesFile{brazilian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{brazilian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {brazilian},
+  revisededition   = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}},
+  on               = {{em}{em}},
+  retrieved        = {{recuperado}{recuperado}},
+  available        = {{dispon\'ivel}{disp.}},
+  from             = {{de}{de}},
+  archivedat       = {{arquivado\space em}{arquivado\space em}},
+  reviewof         = {{Revis\~ao\space de}{revis\~ao\space de}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  origyear         = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
+  typechair        = {{Coordenador}{Coord\adddot}},
+  typechairs       = {{Coordenadores}{Coords\adddot}},
+  typevolume       = {{Editor\space do\space Volume}{Ed\adddotspace Vol\adddot}},
+  typevolumes      = {{Editores\space do\space Volume}{Eds\adddotspace Vol\adddot}},
+  typeseries       = {{Editor\space da\space S\'erie}{Ed\adddotspace S\'erie\adddot}},
+  typeseriess      = {{Editores\space da\space S\'erie}{Eds\adddotspace S\'erie\adddot}},
+  typevolseries    = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddotspace Vol\space\&\space S\'erie}},
+  typevolseriess   = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
new file mode 100644
index 00000000000..3843f5ce947
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
@@ -0,0 +1,142 @@
+\ProvidesFile{british-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{british}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {british},
+  revisededition   = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{on}{on}},
+  retrieved        = {{retrieved}{retrieved}},
+  available        = {{available}{available}},
+  from             = {{from}{from}},
+  archivedat       = {{archived\space at}{archived\space at}},
+  reviewof         = {{Review\space of}{review\space of}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Master's thesis}{Master's\addabbrvspace thesis}},
+  phdthesis        = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
+  origyear         = {{original\space work\space published}{original\space work\space published}},
+  typechair        = {{Chair}{Chair}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
+  typeseries       = {{Series\space Editor}{Series\space Ed\adddot}},
+  typeseriess      = {{Series\space Editors}{Series\space Eds\adddot}},
+  typevolseries    = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
new file mode 100644
index 00000000000..c157ec89559
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
@@ -0,0 +1,155 @@
+\ProvidesFile{danish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{danish}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {danish},
+  revisededition   = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{hentet}{hentet}},
+  available        = {{tilgængelig}{tilgængelig}},
+  from             = {{fra}{fra}},
+  archivedat       = {{arkiveret\space ved}{arkiveret\space ved}},
+  reviewof         = {{anmeldelse\space af}{anmeldelse\space af}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{producent}{producent}},
+  director         = {{instrukt{\o}r}{instrukt{\o}r}},
+  writer           = {{manuskript}{manuskript}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  january          = {{januar}{januar}},
+  february         = {{februar}{februar}},
+  march            = {{marts}{marts}},
+  april            = {{april}{april}},
+  may              = {{maj}{maj}},
+  june             = {{juni}{juni}},
+  july             = {{juli}{juli}},
+  august           = {{august}{august}},
+  september        = {{september}{september}},
+  october          = {{oktober}{oktober}},
+  november         = {{november}{november}},
+  december         = {{december}{december}},
+  mathesis         = {{Speciale}{Speciale}},
+  phdthesis        = {{Ph.d.-afhandling}{Ph.d.-afhandling}},
+  origyear         = {{oprindeligt\space offentliggjort}{oprindeligt\space offentliggjort}},
+  typechair        = {{ordstyrer}{ordstyrer}},
+  typechairs       = {{ordstyrere}{ordstyrere}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rer}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rer}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\thefield{#1}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\thefield{#1}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \thefield{#1}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
new file mode 100644
index 00000000000..6756cce9c46
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
@@ -0,0 +1,142 @@
+\ProvidesFile{dutch-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{dutch}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {dutch},
+  revisededition   = {{Herziene\space editie}{herz\adddotspace ed\adddot}},
+  page             = {{Pagina}{{}p\adddot}},
+  pages            = {{Pagina's}{{}pp\adddot}},
+  on               = {{op}{op}},
+  retrieved        = {{verkregen}{verkregen}},
+  available        = {{beschikbaar}{beschikbaar}},
+  from             = {{van}{van}},
+  archivedat       = {{gearchiveerd\space onder}{gearchiveerd\space onder}},
+  reviewof         = {{bespreking\space van}{bespreking\space van}},
+  producer         = {{producent}{producent}},
+  execproducer     = {{uitvoerend producent}{uitvoerend producent}},
+  director         = {{regisseur}{regisseur}},
+  writer           = {{schrijver}{schrijver}},
+  with             = {{met}{met}},% FIXME: check
+  paragraph        = {{par\adddot}{par\adddot}},
+  paragraphs       = {{par\adddot}{par\adddot}},
+  mathesis         = {{masterscriptie}{masterscriptie}},
+  phdthesis        = {{proefschrift}{proefschrift}},
+  origyear         = {{origineel\space werk\space gepubliceerd}{origineel\space werk\space gepubliceerd}},
+  typechair        = {{hoofd}{hoofd}},
+  typechairs       = {{hoofden}{hoofden}},
+  typevolume       = {{Deelredacteur}{Deelred\adddot}},
+  typevolumes      = {{Deelredacteuren}{Deelred\adddot}},
+  typeseries       = {{Reeksredacteur}{Reeksred\adddot}},
+  typeseriess      = {{Reeksredacteuren}{Reeksred\adddot}},
+  typevolseries    = {{Reeks-\space en\space deelredacteur}{Reeks-\space\& deelred\adddot}},
+  typevolseriess   = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
new file mode 100644
index 00000000000..a028706c995
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
@@ -0,0 +1,144 @@
+\ProvidesFile{english-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{english}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {american},
+  revisededition   = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{on}{on}},
+  retrieved        = {{retrieved}{retrieved}},
+  available        = {{available}{available}},
+  from             = {{from}{from}},
+  archivedat       = {{archived\space at}{archived\space at}},
+  with             = {{with}{with}},
+  reprintas        = {{reprinted as}{reprinted as}},
+  reprintfrom      = {{reprinted from}{reprinted from}},
+  reviewof         = {{review\space of}{review\space of}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  mathesis         = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}},
+  phdthesis        = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
+  origyear         = {{original\space work\space published}{original\space work\space published}},
+  typechair        = {{Chair}{Chair}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
+  typeseries       = {{Series\space Editor}{Series\space Ed\adddot}},
+  typeseriess      = {{Series\space Editors}{Series\space Eds\adddot}},
+  typevolseries    = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \print*date to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
new file mode 100644
index 00000000000..c25b3f181f7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
@@ -0,0 +1,137 @@
+\ProvidesFile{french-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{french}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {french},
+  inpress          = {{sous presse}{sous presse}},% remove when biblatex has it
+  revisededition   = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}p\adddot}},
+  on               = {{le}{le}},
+  retrieved        = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}},
+  with             = {{avec}{avec}},
+  producer         = {{producteur}{producteur}},
+  execproducer     = {{producteur ex\'ecutif}{producteur ex\'ecutif}},
+  director         = {{r\'ealisateur}{r\'ealisateur}},
+  writer           = {{\'ecrivain}{\'ecrivain}},
+  available        = {{disponible}{disponible}},
+  from             = {{\`a\space partir\space de}{\`a\space partir\space de}},
+  archivedat       = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
+  reviewof         = {{critique\space de}{critique\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P}{\P}},
+  origyear         = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}},
+  typechair        = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}},
+  typechairs       = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}},
+  typevolume       = {{R\'edacteur\space du\space volume}{R\'ed\adddotspace vol\adddot}},
+  typevolumes      = {{R\'edacteur\space du\space volume}{R\'eds\adddotspace vol\adddot}},
+  typeseries       = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddotspace ser\adddot}},
+  typeseriess      = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddotspace ser\adddot}},
+  typevolseries    = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddotspace vol\space\&\space ser\adddot}},
+  typevolseriess   = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
new file mode 100644
index 00000000000..f7a118a5204
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
@@ -0,0 +1,153 @@
+\ProvidesFile{galician-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{galician}
+
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {galician},
+  inpress          = {{no prelo}{no prelo}},% remove when biblatex has it
+  january          = {{xaneiro}{xaneiro}},
+  february         = {{febreiro}{febreiro}},
+  march            = {{marzo}{marzo}},
+  april            = {{abril}{abril}},
+  may              = {{maio}{maio}},
+  june             = {{xu\~no}{xu\~no}},
+  july             = {{xullo}{xullo}},
+  august           = {{agosto}{agosto}},
+  september        = {{setembro}{setembro}},
+  october          = {{outubro}{outubro}},
+  november         = {{novembro}{novembro}},
+  december         = {{decembro}{decembro}},
+  nodate           = {{s\adddot d\adddot}{s\adddot d\adddot}},
+  mathesis         = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}},
+  phdthesis        = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}},
+  revisededition   = {{edici\'on\space revisada}{edici\'on\space revisada}},
+  producer         = {{produtor}{produtor}},
+  execproducer     = {{produtor executivo}{produtor executivo}},
+  director         = {{director}{director}},
+  writer           = {{escritor}{escritor}},
+  with             = {{con}{con}},
+  page             = {{p\'axina}{{}p\adddot}},
+  pages            = {{p\'axinas}{{}pp\adddot}},
+  on               = {{o}{o}},
+  retrieved        = {{obtido}{obtido}},
+  available        = {{dispo\~nible}{dispo\~nible}},
+  from             = {{desde}{desde}},
+  archivedat       = {{arquivado en}{arquivado en}},
+  reviewof         = {{revisi\'on\space de}{revisi\'on\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{data\space orixinal\space de\space publicaci\'on}{data\space orixinal\space de\space publicaci\'on}},
+  typechair        = {{coordinador}{coord\adddot}},
+  typechairs       = {{coordinadores}{coords\adddot}},
+  typevolume       = {{editor\space do\space volume}{ed\adddotspace vol\adddot}},
+  typevolumes      = {{editores\space do\space volume}{eds\adddotspace vol\adddot}},
+  typeseries       = {{editor\space da\space serie}{ed\adddotspace ser\adddot}},
+  typeseriess      = {{editores\space da\space serie}{eds\adddotspace ser\adddot}},
+  typevolseries    = {{editor\space da\space serie\space e\space do\space volume}{ed\adddotspace vol\space\&\space ser\adddot}},
+  typevolseriess   = {{editores\space da\space serie\space e\space do\space volume}{eds\adddotspace vol\space\&\space ser\adddot}},
+  annodomini       = {{d\adddot\space C\adddot}{d\adddot\space C\adddot}},
+  beforechrist     = {{a\adddot\space C\adddot}{a\adddot\space C\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
+       \mkbibmonth{\thefield{#2}}%
+}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {el\addspace\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {\addspace{en}\addspace}%
+      {\iffieldundef{#3}%
+        {en\addspace}%
+        {\addspace{de}\addspace}%
+       \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \thefield{#1}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
new file mode 100644
index 00000000000..2284ae5376d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
@@ -0,0 +1,212 @@
+\ProvidesFile{german-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{german}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {german},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff}{Zugriff}},
+  available        = {{Erh\"altlich}{Erh\"altlich}},
+  with             = {{mit}{mit}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa@lbx@de@mkdaterangeapalong#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa@lbx@de@mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa@lbx@de@mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa@lbx@de@mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
new file mode 100644
index 00000000000..89d3fd03f6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
@@ -0,0 +1,159 @@
+\ProvidesFile{greek-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{greek}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {greek},
+  revisededition   = {{Αναθεωρημένη\space Έκδοση}{εκδ \adddotspace εκ\adddot}},
+  page             = {{Σελίδα}{{}σ\adddot}},
+  pages            = {{Σελίδες}{{}σσ\adddot}},
+  on               = {{στις}{στις}},
+  retrieved        = {{ανακτήθηκε}{ανακτήθηκε}},
+  available        = {{διαθέσιμο}{διαθέσιμο}},
+  from             = {{από}{από}},
+  archivedat       = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}},
+  reviewof         = {{Αναθεώρηση\space του}{αναθεώρηση\space του}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Μεταπτυχιακή εργασία}{Μεταπτυχιακή\addabbrvspace εργασία}},
+  phdthesis        = {{Διδακτορική\addabbrvspace διατριβή}{Διδακτορική\addabbrvspace διατριβή}},
+  origyear         = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}},
+  typechair        = {{Πρόεδρος}{Πρόεδρος}},
+  typechairs       = {{Πρόεδροι}{Πρόεδροι}},
+  typevolume       = {{Τόμος\space Συντάκτης}{Τομ\adddotspace Συν\adddot}},
+  typevolumes      = {{Τόμοι\space Συντάκτες}{Τομ\adddotspace Συν\adddot}},
+  typeseries       = {{Σειρά\space Συντάκτης}{Σειρά\space Συν\adddot}},
+  typeseriess      = {{Σειρά\space Συντάκτες}{Σειρά\space Συν\adddot}},
+  typevolseries    = {{Σειρά\space και\space Τόμος\space Συντάκτης}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
+  typevolseriess   = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\lbx@gr@mkbibmonth#1{%
+    \ifcase0#1\relax
+      #1\BibliographyWarning{Month out of range}%
+    \or\abx@bibmonth{datejanuary}%
+    \or\abx@bibmonth{datefebruary}%
+    \or\abx@bibmonth{datemarch}%
+    \or\abx@bibmonth{dateapril}%
+    \or\abx@bibmonth{datemay}%
+    \or\abx@bibmonth{datejune}%
+    \or\abx@bibmonth{datejuly}%
+    \or\abx@bibmonth{dateaugust}%
+    \or\abx@bibmonth{dateseptember}%
+    \or\abx@bibmonth{dateoctober}%
+    \or\abx@bibmonth{datenovember}%
+    \or\abx@bibmonth{datedecember}%
+    \else
+      #1\BibliographyWarning{Month out of range}%
+    \fi}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \lbx@gr@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \lbx@gr@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \lbx@gr@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
new file mode 100644
index 00000000000..9c82fa5377c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
@@ -0,0 +1,142 @@
+\ProvidesFile{italian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{italian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {italian},
+  revisededition   = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}},
+  page             = {{Pagina}{{}p\adddot}},
+  pages            = {{Pagine}{{}pp\adddot}},
+  on               = {{il}{il}},
+  retrieved        = {{recuperato}{recuperato}},
+  available        = {{disponibile}{disponibile}},
+  from             = {{da}{da}},
+  archivedat       = {{archiviato\space il}{archiviato\space il}},
+  reviewof         = {{Revisione\space di}{revisione\space di}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Tesi\space di\space laurea}{Tesi\space di\space laurea}},
+  phdthesis        = {{Tesi\space di\space dottorato}{Tesi\space di\space dottorato}},
+  origyear         = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}},
+  typechair        = {{Moderatore}{Moderatore}},
+  typechairs       = {{Moderatori}{Moderatori}},
+  typevolume       = {{Redattore\space del\space Volume}{Red\adddotspace Vol\adddot}},
+  typevolumes      = {{Redattori\space del\space Volume}{Red\adddotspace Vol\adddot}},
+  typeseries       = {{Curatore\space della\space Collana}{Cur\addotspace Coll\adddot}},
+  typeseriess      = {{Curatori\space della\space Collana}{Cur\addotspace Coll\adddot}},
+  typevolseries    = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
+  typevolseriess   = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
new file mode 100644
index 00000000000..0b9a18d7d35
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
@@ -0,0 +1,214 @@
+\ProvidesFile{naustrian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{naustrian}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {naustrian},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Autor}{Autor}},
+  writer           = {{Schriftsteller}{Schriftsteller}},
+  with             = {{mit}{mit}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa@lbx@de@mkdaterangeapalong#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa@lbx@de@mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa@lbx@de@mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa@lbx@de@mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
new file mode 100644
index 00000000000..2d01ef9607d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
@@ -0,0 +1,215 @@
+\ProvidesFile{ngerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{ngerman}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {ngerman},
+  abstract         = {{Abstract}{Abstract}},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  with             = {{mit}{mit}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{auf}{auf}},
+  retrieved        = {{verf\"ugbar}{verf\"ugbar}},
+  available        = {{Erh\"altlich}{Erh\"altlich}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+  nodate           = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}}
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa@lbx@de@mkdaterangeapalong#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa@lbx@de@mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa@lbx@de@mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa@lbx@de@mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
new file mode 100644
index 00000000000..888bd6c768d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
@@ -0,0 +1,146 @@
+\ProvidesFile{norsk-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{norsk}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {norsk},
+  revisededition   = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{hentet}{hentet}},
+  available        = {{tilgjengelig}{tilgjengelig}},
+  from             = {{fra}{fra}},
+  archivedat       = {{arkivert\space ved}{arkivert\space ved}},
+  reviewof         = {{anmeldelse\space av}{anmeldelse\space av}},
+  producer         = {{produsent}{produsent}},
+  execproducer     = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+  director         = {{regiss{\o}r}{regiss{\o}r}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Masteroppgave}{Masteroppgave}},
+  phdthesis        = {{Doktoravhandling}{Doktoravhandling}},
+  origyear         = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
+  typechair        = {{ordstyrer}{ordstyrer}},
+  typechairs       = {{ordstyrere}{ordstyrere}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rer}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rer}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
new file mode 100644
index 00000000000..28736a539fa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
@@ -0,0 +1,143 @@
+\ProvidesFile{norwegian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{norwegian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {norwegian},
+  revisededition   = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{hentet}{hentet}},
+  available        = {{tilgjengelig}{tilgjengelig}},
+  from             = {{fra}{fra}},
+  archivedat       = {{arkivert\space ved}{arkivert\space ved}},
+  reviewof         = {{anmeldelse\space av}{anmeldelse\space av}},
+  producer         = {{produsent}{produsent}},
+  execproducer     = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+  director         = {{regiss{\o}r}{regiss{\o}r}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Masteroppgave}{Masteroppgave}},
+  phdthesis        = {{Doktoravhandling}{Doktoravhandling}},
+  origyear         = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
+  typechair        = {{ordstyrer}{ordstyrer}},
+  typechairs       = {{ordstyrere}{ordstyrere}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rer}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rer}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
new file mode 100644
index 00000000000..cdf01301000
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
@@ -0,0 +1,214 @@
+\ProvidesFile{nswissgerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{nswissgerman}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian/Swiss German
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {nswissgerman},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  with             = {{mit}{mit}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa@lbx@de@mkdaterangeapalong#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa@lbx@de@mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa@lbx@de@mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa@lbx@de@mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
new file mode 100644
index 00000000000..0a9748dd881
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
@@ -0,0 +1,146 @@
+\ProvidesFile{nynorsk-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{nynorsk}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {nynorsk},
+  revisededition   = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{henta}{henta}},
+  available        = {{tilgjengeleg}{tilgjengeleg}},
+  from             = {{fr{\aa}}{fr{\aa}}},
+  archivedat       = {{arkivert\space ved}{arkivert\space ved}},
+  reviewof         = {{melding\space av}{melding\space av}},
+  producer         = {{produsent}{produsent}},
+  execproducer     = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
+  director         = {{regiss{\o}r}{regiss{\o}r}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}},
+  phdthesis        = {{Doktoravhandling}{Doktoravhandling}},
+  origyear         = {{opphavleg\space publisert}{opphavleg\space publisert}},
+  typechair        = {{ordstyrar}{ordstyrar}},
+  typechairs       = {{ordstyrarar}{ordstyrarar}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rar}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rar}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
new file mode 100644
index 00000000000..4f7a522de8f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
@@ -0,0 +1,134 @@
+\ProvidesFile{portuguese-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{portuguese}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {portuguese},
+  revisededition   = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}},
+  on               = {{em}{em}},
+  retrieved        = {{obtido}{obtido}},
+  available        = {{dispon\'ivel}{disp.}},
+  from             = {{de}{de}},
+  archivedat       = {{arquivado\space em}{arquivado\space em}},
+  reviewof         = {{Revis\~ao\space de}{revis\~ao\space de}},
+  producer         = {{produtor}{produtor}},
+  execproducer     = {{produtor executivo}{produtor executivo}},
+  director         = {{diretor}{diretor}},
+  writer           = {{escritor}{escritor}},
+  with             = {{com}{com}},
+  origyear         = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
+  typechair        = {{Coordenador}{Coord\adddot}},
+  typechairs       = {{Coordenadores}{Coords\adddot}},
+  typevolume       = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}},
+  typevolumes      = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}},
+  typeseries       = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}},
+  typeseriess      = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}},
+  typevolseries    = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}},
+  typevolseriess   = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
new file mode 100644
index 00000000000..c574ef0dbd2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
@@ -0,0 +1,147 @@
+\ProvidesFile{russian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{russian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {russian},
+  revisededition   = {{исправленное издание}{испр\adddotspace изд\adddot}},
+  on               = {{на}{на}},
+  retrieved        = {{получено}{получено}},
+  available        = {{доступно}{доступно}},
+  from             = {{c}{c}},
+  archivedat       = {{в архиве\space на}{в архиве\space на}},
+  with             = {{с}{с}},
+  paragraph        = {{абзац}{абз\adddot}},
+  paragraphs       = {{абзацы}{абз\adddot}},
+  producer         = {{продюсер}{продюсер}},
+  execproducer     = {{исполнительный продюсер}{исполнительный продюсер}},
+  director         = {{режиссер}{режиссер}},
+  writer           = {{сценарист}{сценарист}},
+  origyear         = {{оригинальная\space работа\space опубликована}{ориг\adddotspace работа\space опубл\adddot}},
+  typechair        = {{Председатель}{Председатель}},
+  typechairs       = {{Председатели}{Председатели}},
+  typevolume       = {{Редактор\space тома}{Ред\adddotspace т\adddot}},
+  typevolumes      = {{Редакторы\space тома}{Ред\adddotspace т\adddot}},
+  typeseries       = {{Редактор\space серии}{Ред\adddotspace сер\adddot}},
+  typeseriess      = {{Редакторы\space серии}{Ред\adddotspace сер\adddot}},
+  typevolseries    = {{Редактор\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
+  typevolseriess   = {{Редакторы\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
+  annodomini       = {{нашей\space эры}{н\adddotspace э\adddot}},
+  beforechrist     = {{до\space нашей\space эры}{до н\adddotspace э\adddot}},
+}
+
+\protected\gdef\lbx@sl@mkbibmonth#1{%
+  \ifcase0#1\relax
+    #1\BibliographyWarning{Month out of range}%
+  \or\abx@bibmonth{datejanuary}%
+  \or\abx@bibmonth{datefebruary}%
+  \or\abx@bibmonth{datemarch}%
+  \or\abx@bibmonth{dateapril}%
+  \or\abx@bibmonth{datemay}%
+  \or\abx@bibmonth{datejune}%
+  \or\abx@bibmonth{datejuly}%
+  \or\abx@bibmonth{dateaugust}%
+  \or\abx@bibmonth{dateseptember}%
+  \or\abx@bibmonth{dateoctober}%
+  \or\abx@bibmonth{datenovember}%
+  \or\abx@bibmonth{datedecember}%
+  \else
+    #1\BibliographyWarning{Month out of range}%
+  \fi}%
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}%
+          {\addcomma\addspace}%
+         \mkbibmonth{\thefield{#2}}}%
+        {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}%
+          {\addcomma\addspace}%
+         \mkbibmonth{\thefield{#2}}}%
+        {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {\mkbibmonth{\thefield{#2}}}%
+        {\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
new file mode 100644
index 00000000000..86d1f32930c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
@@ -0,0 +1,175 @@
+\ProvidesFile{slovene-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{slovene}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\NewBibliographyString{% Month name variants used after day
+  datejanuary,
+  datefebruary,
+  datemarch,
+  dateapril,
+  datemay,
+  datejune,
+  datejuly,
+  dateaugust,
+  dateseptember,
+  dateoctober,
+  datenovember,
+  datedecember%
+}
+
+\DeclareBibliographyStrings{%
+  inherit          = {slovene},
+  revisededition   = {{dopolnjena izdaja}{dopolnjena iz\adddot}},
+  on               = {{na}{na}},
+  retrieved        = {{pridobljeno}{pridobljeno}},
+  available        = {{dostopno}{dostopno}},
+  from             = {{}{}},
+  archivedat       = {{arhivirano\space na}{arhivirano\space na}},
+  with             = {{z}{z}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  producer         = {{producent}{producent}},
+  execproducer     = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}},
+  director         = {{re\v{z}iser}{re\v{z}iser}},
+  writer           = {{avtor}{avtor}},
+  datejanuary      = {{januarja}{januarja}},
+  datefebruary     = {{februarja}{februarja}},
+  datemarch        = {{marca}{marca}},
+  dateapril        = {{aprila}{aprila}},
+  datemay          = {{maja}{maja}},
+  datejune         = {{junija}{junija}},
+  datejuly         = {{julija}{julija}},
+  dateaugust       = {{avgusta}{avgusta}},
+  dateseptember    = {{septembra}{septembra}},
+  dateoctober      = {{oktobra}{oktobra}},
+  datenovember     = {{novembra}{novembra}},
+  datedecember     = {{decembra}{decembra}},
+  origyear         = {{izvirno\space delo\space objavljeno}{izvirno\space delo\space objavljeno}},
+  typechair        = {{Predsednik}{Predsednik}},
+  typechairs       = {{Predsedniki}{Predsedniki}},
+  typevolume       = {{urednik}{ur\adddot}},
+  typevolumes      = {{uredniki}{ur\adddot}},
+  typeseries       = {{urednik}{ur\adddot}},
+  typeseriess      = {{uredniki}{ur\adddot}},
+  typevolseries    = {{urednik}{ur\adddot}},
+  typevolseriess   = {{uredniki}{ur\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+\protected\gdef\lbx@sl@mkbibmonth#1{%
+  \ifcase0#1\relax
+    #1\BibliographyWarning{Month out of range}%
+  \or\abx@bibmonth{datejanuary}%
+  \or\abx@bibmonth{datefebruary}%
+  \or\abx@bibmonth{datemarch}%
+  \or\abx@bibmonth{dateapril}%
+  \or\abx@bibmonth{datemay}%
+  \or\abx@bibmonth{datejune}%
+  \or\abx@bibmonth{datejuly}%
+  \or\abx@bibmonth{dateaugust}%
+  \or\abx@bibmonth{dateseptember}%
+  \or\abx@bibmonth{dateoctober}%
+  \or\abx@bibmonth{datenovember}%
+  \or\abx@bibmonth{datedecember}%
+  \else
+    #1\BibliographyWarning{Month out of range}%
+  \fi}%
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \lbx@sl@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
new file mode 100644
index 00000000000..a3fd406240d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
@@ -0,0 +1,152 @@
+\ProvidesFile{spanish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{spanish}
+
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {spanish},
+  inpress          = {{en prensa}{en prensa}},% remove when biblatex has it
+  january          = {{enero}{enero}},
+  february         = {{febrero}{febrero}},
+  march            = {{marzo}{marzo}},
+  april            = {{abril}{abril}},
+  may              = {{mayo}{mayo}},
+  june             = {{junio}{junio}},
+  july             = {{julio}{julio}},
+  august           = {{agosto}{agosto}},
+  september        = {{septiembre}{septiembre}},
+  october          = {{octubre}{octubre}},
+  november         = {{noviembre}{noviembre}},
+  december         = {{diciembre}{diciembre}},
+  nodate           = {{s\adddot f\adddot}{s\adddot f\adddot}},
+  mathesis         = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}},
+  phdthesis        = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}},
+  revisededition   = {{Edici\'on\space revisada}{Edici\'on\space revisada}},
+  producer         = {{productor}{productor}},
+  execproducer     = {{productor ejecutivo}{productor ejecutivo}},
+  director         = {{director}{director}},
+  writer           = {{escritor}{escritor}},
+  with             = {{con}{con}},
+  page             = {{P\'agina}{{}p\adddot}},
+  pages            = {{P\'aginas}{{}pp\adddot}},
+  on               = {{el}{el}},
+  retrieved        = {{Recuperado}{Recuperado}},
+  available        = {{disponible}{disponible}},
+  from             = {{desde}{desde}},
+  archivedat       = {{archivado en}{archivado en}},
+  reviewof         = {{revisi\'on\space de}{revisi\'on\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}},
+  typechair        = {{Coordinador}{Coord\adddot}},
+  typechairs       = {{Coordinadores}{Coords\adddot}},
+  typevolume       = {{Editor\space del\space volumen}{Ed\adddotspace vol\adddot}},
+  typevolumes      = {{Editores\space del\space volumen}{Eds\adddotspace vol\adddot}},
+  typeseries       = {{Editor\space de\space la\space serie}{Ed\adddotspace ser\adddot}},
+  typeseriess      = {{Editores\space de\space la\space serie}{Eds\adddotspace ser\adddot}},
+  typevolseries    = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddotspace vol\space\&\space ser\adddot}},
+  typevolseriess   = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
+       \mkbibmonth{\thefield{#2}}%
+}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {el\addspace\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {\addspace{en}\addspace}%
+      {\iffieldundef{#3}%
+        {en\addspace}%
+        {\addspace{de}\addspace}%
+       \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \thefield{#1}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
new file mode 100644
index 00000000000..dc8ebe7cc95
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
@@ -0,0 +1,139 @@
+\ProvidesFile{swedish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{swedish}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{nodate}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {swedish},
+  revisededition   = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}},
+  page             = {{sida}{{}s\adddot}},
+  pages            = {{sidor}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{h\"amtad}{h\"amtad}},
+  available        = {{tillg\"anglig}{tillg\"anglig}},
+  from             = {{fr{\aa}n}{fr{\aa}n}},
+  archivedat       = {{arkiverat\space vid}{arkiverat\space vid}},
+  nodate           = {{utan\space {\aa}r}{u\adddot~{\aa}}},
+  reviewof         = {{granskning\space av}{granskning\space av}},
+  producer         = {{producent}{producent}},
+  execproducer     = {{exekutiv\space producent}{exekutiv\space producent}},
+  director         = {{regiss\"or}{regiss\"or}},
+  editor           = {{redakt\"or}{red\adddot}},
+  editors          = {{redakt\"or}{red\adddot}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{examensuppsats}{examensuppsats}},
+  phdthesis        = {{doktorsavhandling}{doktorsavhandling}},
+  origyear         = {{originalarbete\space publicerat}{originalarbete\space publicerat}},
+  typechair        = {{ordf\"orande}{ordf\"orande}},
+  typechairs       = {{ordf\"oranden}{ordf\"oranden}},
+  typevolume       = {{redakt\"or}{red\adddot}},
+  typevolumes      = {{redakt\"orer}{red\adddot}},
+  typeseries       = {{redakt\"or}{red\adddot}},
+  typeseriess      = {{redakt\"orer}{red\adddot}},
+  typevolseries    = {{redakt\"or}{red\adddot}},
+  typevolseriess   = {{redakt\"orer}{red\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx b/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
new file mode 100644
index 00000000000..83af38ef923
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
@@ -0,0 +1,213 @@
+\ProvidesFile{swissgerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{swissgerman}
+
+% Following DGPs guidlines for German/Austrian/Swiss German
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {swissgerman},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  with             = {{mit}{mit}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa@lbx@de@mkdaterangeapalong#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa@lbx@de@mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx@metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa@lbx@de@mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa@lbx@de@mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput