biblatex-apa .09 (7mar10)

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

6 files changed, 2419 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
new file mode 100644
index 00000000000..b25c394e5f3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -0,0 +1,89 @@
+\ProvidesFile{american-apa.lbx}
+\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{nodate}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+
+\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}},
+  nodate           = {{no\space date}{{}n\adddot d\adddot}},
+  reviewof         = {{Review\space of}{review\space of}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  january          = {{January}{January}},
+  february         = {{February}{February}},
+  march            = {{March}{March}},
+  april            = {{April}{April}},
+  may              = {{May}{May}},
+  june             = {{June}{June}},
+  july             = {{July}{July}},
+  august           = {{August}{August}},
+  september        = {{September}{September}},
+  october          = {{October}{October}},
+  november         = {{November}{November}},
+  december         = {{December}{December}},
+  origyear         = {{original\space work\space published}{original\space work\space published}},
+  typechair        = {{Chair}{Chair}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddot\space 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\adddot\space Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+\DefineBibliographyExtras{american}{%
+  \protected\def\mkbibdatelong#1#2#3{%
+      \iffieldundef{#1}
+        {}
+        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
+          {}
+          {\thefield{#1},\space}}%
+      \iffieldundef{#2}
+      {}
+      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
+        {}
+        {\mkbibmonth{\thefield{#2}}\addspace}%
+        \iffieldundef{#3}
+        {}
+        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+          {}
+          {\stripzeros{\thefield{#3}}}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
new file mode 100644
index 00000000000..2192505ccf1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -0,0 +1,1683 @@
+%% apa.bbx
+%% Copyright 2010 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.
+%%
+%% This work consists of the files:
+%%
+%% apa.cbx (biblatex citation style)
+%% apa.bbx (biblatex references style)
+%% *.lbx (localisation files for APA-specific strings)
+%% biblatex-apa.pdf (Style documentation)
+%% biblatex-apa.tex (Style documentation source)
+%% biblatex-apa-test.pdf (Style examples)
+%% biblatex-apa-test.tex (Style examples source)
+%% biblatex-apa-test-citations.bib (Style examples - citations)
+%% biblatex-apa-test-references.bib (Style examples - references)
+
+\ProvidesFile{apa.bbx}
+
+\RequireBibliographyStyle{standard}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.22) Force roman numerals into arabic
+%            using etoolbox macros
+
+\newcommand{\apanum}[1]{\ifrmnum{#1}{\rmntonum{#1}}{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% APA does not seem to differentiate between italics and slanted fonts.
+% All examples in the APA manual are actually in a slanted font, not
+% italic.
+
+\renewrobustcmd*{\mkbibemph}{\textsl}
+\protected\long\def\blx@imc@mkbibemph#1{%
+  \textsl{#1}\relax
+  \blx@imc@setpunctfont\textsl}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% 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\apaemph#1{\textsl{#1}}
+\gdef\DSMIII{\apaemph{DSM-III}}
+\gdef\DSMIIIR{\apaemph{DSM-III-R}}
+\gdef\DSMIV{\apaemph{DSM-IV}}
+\gdef\DSMIVTR{\apaemph{DSM-IV-TR}}
+\gdef\PsycSCAN{\apaemph{PsycSCAN}}
+\gdef\PsycARTICLES{\apaemph{PsycARTICLES}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) Five author max before "et al" and a one author truncation
+%            policy. Note that this doesn't really work properly due to
+%            BibTeX limitations so we effectively disable it with "999"
+%            and deal with it in the author format below
+% (APA 6.x)  citation tracking is global
+% (APA 6.14) uses initials to disambiguate shared surnames
+% (APA 6.16) uses 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
+
+\ExecuteBibliographyOptions{labelyear,%
+                            sorting=nyt,%
+                            pagetracker,%
+                            firstinits=true,%
+                            useprefix=true,%
+                            usetranslator=true,%
+                            uniquename=init,%
+                            citetracker=true,%
+                            maxnames=999,%
+                            minnames=999,%
+                            abbreviate=true,%
+                            mincrossrefs=999,%
+                            alldates=long}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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 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{series}{#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
+
+\DeclareNameFormat{apaauthor}{%
+  \ifthenelse{\value{listcount}=7}
+    {\addcomma\addspace\ldots}
+    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+      {}
+      {\ifthenelse{\iffieldequalstr{usere}{unkauth}\OR\iffieldequalstr{usere}{unkauthdate}}
+        {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}}
+        {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}}}}
+
+\renewbibmacro*{author}{%
+  \ifnameundef{author}
+    {\usebibmacro{labeltitle}}
+    {\printnames[apaauthor]{author}%
+     \setunit*{\addspace}%
+     \printfield{nameaddon}}%
+  \newunit\newblock%
+  \usebibmacro{labelyear+extrayear}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) References section delimiters are ampersands, not " and "
+%            Needs to be in this hook otherwise it sets this for all
+%            citations too.
+% (APA 6.27) Use blank for long lists
+
+\AtBeginBibliography{\renewcommand*{\finalnamedelim}{%
+    \ifthenelse{\value{listcount}>7}
+      {}
+      {\ifstrequal{\currentlist}{author}
+        {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
+        {\ifthenelse{\boolean{bbx:editorinauthpos}}
+          {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
+          {\addspace\&\space}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.28) Use "(n.d.)." for references with no year. This depends
+%            on the noyear macros and strings from apa.cbx
+%            Months and days go into parenthesis with year, if set
+% (APA 6.29) Issue goes where month normally goes if it
+%            is set.
+
+% 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+extrayear}{%
+  \iffieldundef{labelyear}
+    {\iffieldundef{origyear}
+      {\printtext[parens]{\usebibmacro{cite:noyear}}}
+      {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}
+    {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{issue}}
+       {\printtext[yearorunkyear]{\printfield{labelyear}\printfield{extrayear}}}
+       {\iffieldundef{day}
+          {\printtext[yearorunkyear]{\printfield{labelyear}%
+           \usebibmacro{monthorissue}}}
+          {\printtext[parens]{\printdate}}}}}
+
+
+\DeclareFieldFormat{yearorunkyear}{%
+  \ifthenelse{\iffieldequalstr{usere}{unkdate}\OR\iffieldequalstr{usere}{unkauthdate}}
+    {\mkbibbrackets{ca\adddot\addspace#1}}
+    {\mkbibparens{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) General format of titles.
+%            Ugly Chicago-style lowercasing of English titles
+
+\DeclareFieldFormat{apacase}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat{issuetitle}{#1\isdot}
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat{origtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[article]{title}{#1\isdot}
+\DeclareFieldFormat[article]{origtitle}{\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inbook]{title}{#1\isdot}
+\DeclareFieldFormat[inbook]{origtitle}{\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[incollection]{title}{#1\isdot}
+\DeclareFieldFormat[incollection]{origtitle}{\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inproceedings]{title}{#1\isdot}
+\DeclareFieldFormat[inproceedings]{origtitle}{\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[proceedings]{title}{#1\isdot}
+\DeclareFieldFormat[proceedings]{origtitle}{\MakeSentenceCase*{#1}\isdot}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.01 Example 10) Articles that aren't newspapers don't have
+%                       prefix for pages.
+
+\DeclareFieldFormat[article]{pages}{\iffieldequalstr{entrysubtype}{newspaper}
+                                      {\mkpageprefix{#1}}
+                                      {#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29)      Additional {main}title information in brackets (using)
+%                 {MAIN}TITLEADDON field. Colon after maintitle.
+
+\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\MakeSentenceCase*{#1}}}
+
+\newbibmacro*{bookaddinfo}{%
+  \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
+    {}
+    {\printtext{\bibleftparen}%
+     \printfield{edition}%
+     \setunit*{\addcomma\addspace}%
+     \printfield{volumes}%
+     \setunit{}%
+     \printtext{\bibrightparen}}%
+}
+
+\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{namea}\AND%
+       \ifnameundef{nameb}}
+        {\newunit\newblock
+         \usebibmacro{labelyear+extrayear}}
+        {}}}
+
+\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}%
+  \iffieldundef{series}
+    {}
+    {\newunit
+     \printfield{series}
+     \setunit{\addcomma\space}}%
+  \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{\bibleftparen}%
+   \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{number}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{volumes}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{pages}%
+   \setunit{}%
+   \printtext{\bibrightparen}%
+   \newunit}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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{apatranslator}{%
+  \ifthenelse{\value{listcount}=7}
+    {\addcomma\addspace\ldots}
+    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+      {}
+      {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}}
+
+\DeclareNameFormat{apaeditor}{%
+  \ifthenelse{\value{listcount}=7}
+    {\addcomma\addspace\ldots}
+    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+      {}
+      {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}}
+
+\DeclareNameFormat{editorinauthpos}{%
+  \ifthenelse{\value{listcount}=7}
+    {\addcomma\addspace\ldots}
+    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+      {}
+      {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}}}
+
+\renewbibmacro*{author/editor}{%
+  \ifnameundef{author}
+    {\usebibmacro{editorinauthpos}}
+    {\global\boolfalse{bbx:editorinauthpos}%
+     \usebibmacro{author}}}
+
+\newbibmacro*{editorinauthpos}{%
+    \printnames[editorinauthpos]{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}\global\booltrue{bbx:editorinauthpos}%
+       \setunit{\adddot\addspace}%
+       \usebibmacro{labelyear+extrayear}%
+       \setunit{\adddot\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.01 Example 20) Even non-numeral pages need prefix
+
+\NumCheckSetup{\ifcurrentfield{pages}
+  {\DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}}
+  {\DeclareNumChars{.}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27 Name format. Don't capitalise prefixes
+
+\renewbibmacro*{name:last-first}[4]{%
+  \ifuseprefix
+    {\usebibmacro{name:delim}{#3#1}%
+     \usebibmacro{name:hook}{#3#1}%
+     \ifblank{#3}{}{%
+       \mkbibnameprefix{#3\isdot}%
+       \ifpunctmark{'}{}{\addhighpenspace}}%
+     \mkbibnamelast{#1\isdot}%
+     \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+     \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+    {\usebibmacro{name:delim}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamelast{#1}\isdot
+     \ifblank{#2#3}{}{\addcomma}%
+     \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+     \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
+     \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\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{\bibleftparen}\global\booltrue{bbx:parens}%
+        \printnames[apaeditor]{editor}%
+        \setunit*{\addcomma\addspace}%
+        \usebibmacro{apaeditorstrg}{editor}%
+        \setunit*{\addspace\&\space}%
+        \printtext{\bibcpstring{translator}}%
+        \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}
+       {\printtext{\bibleftparen}\global\booltrue{bbx:parens}%
+        \ifnameundef{editor}%
+          {}%
+          {\printnames[apaeditor]{editor}%
+           \setunit{\addcomma\addspace}%
+           \usebibmacro{apaeditorstrg}{editor}%
+           \clearname{editor}%
+           \setunit{\adddot}%
+           \setunit*{\addspace\&\space}}%
+        \ifnameundef{translator}%
+          {\setunit{}}%
+          {\printnames[apatranslator]{translator}%
+           \setunit{\addcomma\addspace}%
+           \printtext{\bibcpstring{translator}}%
+           \clearname{translator}%
+           \setunit{\adddot}}%
+        \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}}}
+ 
+\newbibmacro*{editor+trans}{%
+  \ifthenelse{\ifnameundef{editor}\AND%
+              \ifnameundef{editora}\AND%
+              \ifnameundef{editorb}\AND%
+              \ifnameundef{editorc}\AND%
+              \ifnameundef{translator}}%
+    {}%
+    {\ifnamesequal{editor}{translator}%
+      {\usebibmacro{in}%
+       \printnames[apaeditor]{editor}%
+       \setunit{\addspace\bibleftparen\global\booltrue{bbx:parens}}%
+       \usebibmacro{apaeditorstrg}{editor}%
+       \setunit*{\addspace\&\space}%
+       \printtext{\bibcpstring{translator}}%
+       \ifbool{bbx:parens}{\printtext{\bibrightparen}\global\boolfalse{bbx:parens}}{}}
+      {\ifnameundef{translator}%
+        {}%
+        {\setunit{\relax}%
+         \printtext[parens]{\printnames[apatranslator]{translator}%
+          \setunit{\addcomma\addspace}%
+          \printtext{\bibcpstring{translator}}}%
+         \clearname{translator}%
+         \setunit{\adddot\addspace}}%
+       \usebibmacro{in}%
+       \usebibmacro{editorx}}}%
+  \newunit}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Special journal issues
+
+\DeclareFieldFormat[periodical]{title}{#1\isdot}
+\DeclareFieldFormat[periodical]{issuetitle}{\mkbibemph{#1}\isdot}
+
+\renewbibmacro*{periodical}{%
+  \iffieldundef{title}
+    {}
+    {\printtext[title]{%
+       \printfield[apacase]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{subtitle}}}}
+
+\renewbibmacro*{title+issuetitle}{%
+  \usebibmacro{periodical}%
+  \newunit
+  \usebibmacro{issue}%
+  \setunit*{\addcomma\addspace}%
+  \setunit{\addcomma\space}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 21) Original year
+
+\DeclareFieldFormat{origyear}{\mkbibparens{\bibcpstring{origyear}~\thefield{origyear}}}
+
+% Only give ORIGYEAR in references if both:
+%   YEAR is also given
+%   YEAR and ORIGYEAR are different
+
+\newbibmacro*{origyear}{%
+  \ifthenelse{\NOT\iffieldundef{labelyear}\AND\NOT\iffieldsequal{labelyear}{origyear}}
+    {\printfield{origyear}}
+    {}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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}%
+          \printfield{number}%
+          \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{\global\booltrue{bbx:volseen}}%
+          \printfield{volume}%
+          \printfield{part}%
+          \setunit{\adddot}%
+          \printfield{number}%
+          \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
+
+\renewcommand*{\subtitlepunct}{\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{\apanum{#1}}}
+
+\newbibmacro*{apa:reportnum}{%
+  \iffieldundef{number}%
+    {}%
+    {\printfield{number}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Periodicals emph number, location
+%            and pages (with no prefix)
+
+\DeclareFieldFormat[periodical]{pages}{\mkbibemph{#1}}
+\DeclareFieldFormat[periodical]{number}{\mkbibemph{\apanum{#1}}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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}{\iffieldundef{abstract}{\mkbibemph{#1}}{#1}}
+\DeclareFieldFormat[thesis]{volume}{\mkbibemph{\apanum{#1}}\addspace}
+\DeclareFieldFormat[thesis]{number}{\mkbibparens{\apanum{#1}}\addspace}
+\DeclareFieldFormat[thesis]{eprinttype}{\mkbibemph{#1}\addspace}
+\DeclareFieldFormat[thesis]{eprint}{#1}
+\DeclareFieldFormat[thesis]{pages}{#1}
+
+\newbibmacro*{thesis:retrinfo}{%
+  \printfield{eprinttype}%
+  \clearfield{eprinttype}%
+  \setunit{\addcomma\addspace}%
+  \printfield{volume}%
+  \setunit{\addspace}%
+  \printfield{number}%
+  \setunit{\addcomma\addspace}%
+  \printfield{eprint}%
+  \clearfield{eprint}%
+  \setunit{\addcomma\addspace}%
+  \printfield{pages}%
+  \setunit{\relax}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.05) Unpublished theses
+
+\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.06) Reviews
+
+\DeclareFieldFormat[review]{title}{#1}
+\DeclareFieldFormat[review]{origtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[review]{pages}{#1}
+\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}}
+
+\newbibmacro*{reviewauthor}{%
+  \ifnameundef{author}
+    {\usebibmacro{reviewlabeltitle}}
+    {\printnames[apaauthor]{author}}%
+  \newunit\newblock%
+  \usebibmacro{labelyear+extrayear}}
+
+\newbibmacro*{reviewlabeltitle}{%
+  \iffieldundef{label}
+    {\usebibmacro{reviewof}%
+     \clearfield{entrysubtype}%
+     \clearfield{origtitle}%
+     \clearfield{verba}}
+    {\printfield{label}}}
+
+\newbibmacro*{reviewtitle}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
+    {\printtext{}}% Dummy printtext as we do want to record that we output
+                  % a title for the punctuation tracker
+    {\printtext[title]{%
+        \printfield[apacase]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[apacase]{subtitle}}%
+     \setunit{\addspace}%
+     \printfield{titleaddon}}}
+
+\newbibmacro*{reviewof}{%
+  \iffieldundef{origtitle}
+    {}
+    {\printtext[brackets]{%
+     \printfield{entrysubtype}\addspace%
+     \printtext[origtitle]{%
+       \printfield[apacase]{origtitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{origsubtitle}}%
+       \setunit{\addcomma\addspace}%       
+       \printfield{verba}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Films
+
+\DeclareNameFormat[movie]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareNameFormat[movie]{nameb}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+
+\newbibmacro*{mediaauthor}{%
+  \ifnameundef{namea}
+    {}
+     {\printnames{namea}%
+      \newunit%
+      \printtext[parens]{\printfield{nameatype}}}
+  \setunit*{\addcomma\addspace\&\addspace}%
+  \ifnameundef{nameb}
+    {}
+    {\printnames{nameb}%
+     \setunit{\addspace}%
+     \printtext[parens]{\printfield{namebtype}}}
+  \newunit
+  \usebibmacro{labelyear+extrayear}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%
+% (APA 7.07) Misc
+
+\DeclareNameFormat[misc]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareNameFormat[misc]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareFieldFormat[misc]{title}{\iffieldequalstr{userd}{dataset}{\mkbibemph{#1}}{%
+                                 \iffieldequalstr{userd}{description}{\mkbibbrackets{#1}}{#1}}}
+\DeclareFieldFormat[misc]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.07) Audiovisual
+
+\DeclareNameFormat[audio]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareNameFormat[audio]{nameb}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareNameFormat[video]{namea}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareNameFormat[video]{nameb}{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
+\DeclareNameFormat[video]{namec}{\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
+\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{namec}
+       {}
+       {\printnames{namec}%
+        \setunit{\addspace}%
+        \printtext[parens]{\printfield{namectype}}}
+     \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*{on}{%
+  \bibcpstring{on}\setunit{\space}}
+
+\newbibmacro*{album}{%
+  \iffieldundef{maintitle}
+    {}
+    {\usebibmacro{on}%
+     \setunit{\addspace}%
+     \usebibmacro{avmaintitle}%
+     \newunit}}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10) Letters
+
+
+\DeclareFieldFormat[letter]{title}{\iffieldequalstr{entrysubtype}{collection}{#1}{\mkbibbrackets{#1}}}
+\DeclareFieldFormat[letter]{number}{\mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%
+% (APA 6.31) URLs
+
+\DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{urldate}{#1}
+\DeclareFieldFormat{eprinttype}{#1}
+\DeclareFieldFormat{eprint}{\mkbibparens{#1}}
+
+\renewbibmacro*{url+urldate}{%
+     \def\@apaar{retrieved}% default
+     \iffieldundef{url}
+       {}
+       {\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
+         \iffieldundef{abstract}
+         {\printtext{\bibcpstring{\@apaar}}}
+         {\printtext{\bibcpstring{abstract}}\addspace%
+           \printtext{\bibstring{\@apaar}}}%
+        \setunit{\addspace}%
+        \iffieldundef{urlyear}
+          {}
+          {\printurldate%
+           \setunit*{\addcomma\addspace}}%
+        \printtext{\bibstring{from}}%
+        \setunit*{\addspace}%
+        \printlist{organization}%
+        \setunit*{\addcolon\addspace}%
+        \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
+
+\renewbibmacro*{eprint}{%
+     \def\@apaar{retrieved}% default
+     \iffieldundef{eprint}
+       {}
+       {\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
+         \iffieldundef{abstract}
+         {\printtext{\bibcpstring{\@apaar}}}
+         {\printtext{\bibcpstring{abstract}}\addspace%
+           \printtext{\bibstring{\@apaar}}}%
+        \setunit{\addspace}%
+        \printtext{\bibstring{from}}%
+        \setunit*{\addspace}%
+        \printfield{eprinttype}%
+        \newunit
+        \printfield{eprint}}}
+
+%
+%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newbibmacro*{apa:finpunct}{%
+  \iffieldundef{addendum}{}{\renewcommand*{\finentrypunct}{\relax}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.x) General type layouts
+
+\DeclareBibliographyDriver{article}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\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}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{book:editor+trans}%
+  \newunit\newblock
+  \printfield{series}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+year}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\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}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \setunit{\addcomma\addspace}%
+  \printtext{\printfield{number}}%
+  \newunit\newblock
+  \printfield{series}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \newunit\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{series}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit*{\addspace}\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\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{series}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\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{series}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \printfield{eventtitle}%
+  \newunit
+  \printfield{venue}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \printfield{series}%
+  \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}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \printfield{entrysubtype}%
+  \addperiod\addspace
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\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{date}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{periodical}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title+issuetitle}%
+  \setunit{\addcomma\addspace}
+  \printlist{location}%
+  \setunit{\addcomma\addspace}
+  \printfield{volume}%
+  \setunit*{\adddot}%
+  \printfield{number}%
+  \setunit{\addcomma\addspace}
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \usebibmacro{apa:reportnum}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{type+institution+year}%
+  \newunit\newblock
+  \usebibmacro{thesis:retrinfo}
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{review}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{reviewauthor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{reviewtitle}%
+  \newblock
+  \usebibmacro{reviewof}%
+  \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:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \newunit\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
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{letter}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\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}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{mediaauthor}%
+  \setunit{\labelnamepunct}\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}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{movie}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{mediaauthor}%
+  \setunit{\labelnamepunct}\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}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{mediaauthor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{album}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{software}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{apa:softwaretitle}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \setunit{\addcomma\addspace}\newblock
+  \printlist{institution}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:finpunct}
+  \usebibmacro{finentry}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Modified, common macros
+
+\newbibmacro*{editorx}{%
+  \ifnameundef{editor}
+    {}
+    {\printnames[apaeditor]{editor}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}
+     \clearname{editor}%
+     \newunit}%
+  \ifnameundef{editora}
+    {}
+    {\printnames[apaeditor]{editora}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editora}}
+     \clearname{editora}%
+     \newunit}%
+  \ifnameundef{editorb}
+    {}
+    {\printnames[apaeditor]{editorb}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editorb}}
+     \clearname{editorb}%
+     \newunit}%
+  \ifnameundef{editorc}
+    {}
+    {\printnames[apaeditor]{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\space
+  \ifhyperref
+    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}}
+
+\newbibmacro*{location+publisher}{%
+  \printlist{location}%
+  \setunit*{\addcolon\space}%
+  \printlist{publisher}%
+  \newunit}
+
+\newbibmacro*{type+institution+year}{%
+  \ifthenelse{\iffieldundef{type}\AND\iffieldundef{institution}}
+    {}
+    {\printtext[parens]{%
+       \iflistundef{institution}
+         {\setunit*{\addspace}}
+         {\setunit*{\addcolon\space}}%
+       \printfield{type}%
+       \setunit*{\addcomma\space}%
+       \printlist{institution}}%
+     \newunit}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Unchanged from authoryear-comp (biblatex v0.9)
+
+\DeclareBibliographyOption{dashed}[true]{%
+  \ifstrequal{#1}{true}
+    {\ExecuteBibliographyOptions{pagetracker}%
+     \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}}
+    {\ExecuteBibliographyOptions{pagetracker=false}%
+     \renewbibmacro*{bbx:savehash}{}}}
+
+\DeclareFieldFormat{shorthandwidth}{#1}
+\renewcommand*{\thebibitem}{\item}
+\renewcommand*{\thelositem}{\item}
+\setlength{\bibitemsep}{0pt}
+
+\DeclareNameAlias{author}{sortname}
+\DeclareNameAlias{editor}{sortname}
+\DeclareNameAlias{translator}{sortname}
+
+\renewenvironment*{thebibliography}
+  {\list
+     {}
+     {\setlength{\leftmargin}{\bibhang}%
+      \setlength{\itemindent}{-\leftmargin}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}}}
+  {\endlist}
+
+\renewenvironment*{theshorthands}
+  {\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}
+
+\InitializeBibliographyStyle{%
+  \global\undef\bbx@lasthash}
+
+\newbibmacro*{bbx:savehash}{%
+  \savefield{fullhash}{\bbx@lasthash}}
+
+\newbool{bbx@inset}
+\DeclareBibliographyDriver{set}{%
+  \booltrue{bbx@inset}%
+  \entryset{}{}%
+  \finentry}
+
+\newbibmacro*{labeltitle}{%
+  \iffieldundef{label}
+    {\iffieldundef{shorttitle}
+       {\printfield{title}%
+        \clearfield{title}
+        \global\booltrue{bbx:titleinauthpos}}
+       {\printfield[title]{shorttitle}}}
+    {\printfield{label}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
new file mode 100644
index 00000000000..da1b4b5621b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -0,0 +1,389 @@
+%% apa.cbx
+%% Copyright 2010 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.
+%%
+%% This work consists of the files:
+%%
+%% apa.cbx (biblatex citation style)
+%% apa.bbx (biblatex references style)
+%% *.lbx (localisation files for APA-specific strings)
+%% biblatex-apa.pdf (Style documentation)
+%% biblatex-apa.tex (Style documentation source)
+%% biblatex-apa-test.pdf (Style examples)
+%% biblatex-apa-test.tex (Style examples source)
+%% biblatex-apa-test-citations.bib (Style examples - citations)
+%% biblatex-apa-test-references.bib (Style examples - references)
+
+\ProvidesFile{apa.cbx}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.16) year postfix is not emphasised or italic
+
+\DeclareFieldFormat{extrayear}{\mknumalph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.11) requires comma separator between authors and years
+
+\renewcommand*{\nameyeardelim}{\addcomma\space}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) ampersand separator in parenthetical cites
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
+   \usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{cite}}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
+   \usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{citeyear}}}
+  {}
+  {\usebibmacro{postnote}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) 3-5 authors have "et al." after first cite. This doesn't
+%            work properly in general with disambiguation of "et al"s
+%            due to BibTeX limitations, see docs.
+
+% #1 = last name
+% #2 = last name (initials)
+% #3 = first name
+% #4 = first name (initials)
+% #5 = name prefix, a.k.a. 'von part'
+% #6 = name prefix (initials)
+% #7 = name affix, a.k.a. 'junior part'
+% #8 = name affix (initials)
+
+\newbibmacro*{labelname:doname}[8]{%
+  \ifcase\value{uniquename}%
+     \usebibmacro{name:last}{#1}{#3}{#5}{#7}%
+   \or
+     \usebibmacro{name:first-last}{#1}{#4}{#5}{#8}%
+   \or
+     \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}%
+   \fi
+   \usebibmacro{name:andothers}}
+
+
+\DeclareNameFormat{labelname}{%
+  \ifthenelse{\value{listcount}=1\OR\value{listtotal}=2}
+    {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}
+    {\ifthenelse{\value{listtotal}>5}
+      {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
+       \ifnum\value{listcount}>2 \relax\fi}
+      {\ifciteseen
+       {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
+        \ifnum\value{listcount}=3 \relax\fi
+        \ifnum\value{listcount}=4 \relax\fi
+        \ifnum\value{listcount}=5 \relax\fi}
+       {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.13) Groups as names
+%            SHORTAUTHOR brackets in parencites
+
+\DeclareNameFormat{sabrackets}{\ifciteseen
+                                 {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}
+                                 {\mkbibbrackets{\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}}
+
+\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 extrayear postfixes
+%            "in press" extrayear needs a short dash to join to label
+% (APA 6.28) If no date, use "n.d." without parentheses and with a comma
+%             and space before.
+% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
+
+\newbibmacro*{cite}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+% Multiple cites in one command
+   {\setunit{\compcitedelim}%
+    \usebibmacro{cite:plabelyear+extrayear}}%
+% Single cite
+   {\ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
+% No author/editor
+     {\usebibmacro{cite:noname}%
+       \setunit{\nameyeardelim}%
+      \iffieldundef{labelyear}
+        {\usebibmacro{cite:noyear}}
+        {\usebibmacro{cite:plabelyear+extrayear}%
+         \savefield{namehash}{\cbx@lasthash}}}
+% Normal cite
+     {\cbx@tempa
+      \ifnameundef{shortauthor}
+        {\printnames{labelname}}
+        {\ifciteseen
+          {\printnames{shortauthor}}
+          {\printnames{author}\addspace\printnames[sabrackets]{shortauthor}}}%
+      \setunit{\nameyeardelim}%
+      \iffieldundef{labelyear}
+        {\usebibmacro{cite:noyear}}
+        {\usebibmacro{cite:plabelyear+extrayear}%
+         \savefield{namehash}{\cbx@lasthash}}%
+      \global\let\cbx@tempa=\multicitedelim}}}
+
+\newbibmacro*{textcite}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+% Compact cite - more than one thing for same author
+    {\setunit{\compcitedelim}%
+     \usebibmacro{cite:plabelyear+extrayear}}
+% Single cite
+    {\cbx@tempa
+      \ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
+  % No author/editor or patent
+       {\iffieldundef{shorthand}
+    % Cite using title
+         {\usebibmacro{cite:noname}%
+          \setunit{\global\booltrue{cbx:parens}\addspace\bibleftparen}%
+          \usebibmacro{cite:plabelyear+extrayear}}
+    % Cite using shorthand
+         {\usebibmacro{cite:shorthand}}}
+  % Normal cite with author/editor
+  % Normal full cite
+       {\ifnameundef{shortauthor}
+    % Normal full cite
+         {\printnames{labelname}}
+    % Cite using short author
+         {\ifciteseen
+           {\printnames{shortauthor}}
+           {\printnames{author}}}%
+  % Year
+        \setunit{\iffieldundef{labelyear}
+                 {\nameyeardelim}
+                 {\global\booltrue{cbx:parens}\addspace\bibleftparen}}
+  % Put the shortauthor inside the year brackets if necessary
+        \ifnameundef{shortauthor}
+         {}
+         {\ifciteseen
+           {}
+           {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
+        \iffieldundef{labelyear}%
+          {\usebibmacro{cite:noyear}}%
+          {\usebibmacro{cite:plabelyear+extrayear}}%
+        \savefield{namehash}{\cbx@lasthash}}}%
+  \gdef\cbx@tempa{\ifbool{cbx:parens}
+                   {\bibrightparen\global\boolfalse{cbx:parens}}
+                   {}%
+                  \multicitedelim}}
+
+\newcommand{\apashortdash}{-}
+
+\newbibmacro*{cite:plabelyear+extrayear}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printfield[noformat]{origyear}\setunit*{\addslash}%
+       \printfield{labelyear}%
+       \iffieldequalstr{labelyear}{in press}
+         {\iffieldundef{extrayear}
+           {\setunit{\relax}}
+           {\setunit{\apashortdash}}%
+         \printfield{extrayear}}
+         {\printfield{extrayear}}}}%
+
+\newbibmacro*{cite:shorthand}{%
+  \ifciteseen
+    {\printfield{shorthand}}
+    {\printnames{labelname}%
+     \setunit{\nameyeardelim}%
+     \printfield{title}\space\printfield{shorthand}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.15) Fall back to title for citations without authors
+
+\DeclareFieldFormat{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.22) Fall back to "n.d." for citations without dates
+%            Strings defined in apa.bbx
+
+\newbibmacro*{cite:noyear}{%
+  \ifnameundef{shortauthor}
+    {}
+    {\ifciteseen
+      {}
+      {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
+  \printtext{\biblcstring{nodate}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.21) No parens round year for cites when the cite is in
+%            parentheses. Use new command \nptextcite for such cites.
+
+\DeclareCiteCommand{\nptextcite}
+  {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
+   \usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{nptextcite}}}
+  {}
+  {\iffieldundef{postnote}
+     {}
+     {\ifbool{cbx:parens}
+        {\postnotedelim}
+	{\nameyeardelim}%
+      \printfield{postnote}}}
+
+\newbibmacro*{nptextcite}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+    {\setunit{\compcitedelim}%
+     \usebibmacro{cite:plabelyear+extrayear}}
+    {\cbx@tempa
+     \ifthenelse{\ifnameundef{labelname}\OR\equal{\thefield{entrytype}}{patent}}
+       {\usebibmacro{cite:noname}%
+	   \setunit{%
+	     \global\booltrue{cbx:parens}%
+	     \nameyeardelim}%
+	   \usebibmacro{cite:plabelyear+extrayear}}
+       {\printnames{labelname}%
+	\setunit{%
+	  \global\booltrue{cbx:parens}%
+	  \nameyeardelim}%
+        \iffieldundef{labelyear}
+           {\usebibmacro{cite:noyear}}
+           {\usebibmacro{cite:plabelyear+extrayear}}}%
+        \savefield{namehash}{\cbx@lasthash}}%
+  \gdef\cbx@tempa{%
+    \ifbool{cbx:parens}
+      {\addcomma\global\boolfalse{cbx:parens}}
+      {}%
+    \multicitedelim}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% No shorthand
+% 
+
+\newbibmacro*{citeyear}{%
+  \iffieldundef{labelyear}
+    {\cbx@tempa
+     \usebibmacro{cite:noyear}%
+     \usebibmacro{cite:init}}
+    {\iffieldequals{namehash}{\cbx@lasthash}
+       {\setunit{\compcitedelim}%
+        \usebibmacro{cite:labelyear+extrayear}}
+       {\cbx@tempa
+        \usebibmacro{cite:labelyear+extrayear}%
+        \savefield{namehash}{\cbx@lasthash}}}
+  \global\let\cbx@tempa=\multicitedelim}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\newbool{cbx:parens}
+
+\newbibmacro*{cite:init}{%
+  \global\boolfalse{cbx:parens}%
+  \global\let\cbx@tempa=\empty
+  \global\undef\cbx@lasthash}
+
+\newbibmacro*{cite:labelyear}{%
+  \printfield{labelyear}}
+
+\newbibmacro*{cite:extrayear}{%
+  \printfield{extrayear}}
+
+\newbibmacro*{cite:labelyear+extrayear}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printfield{labelyear}%
+       \printfield{extrayear}}}
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{cite}}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{citeyear}}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\bibsentence
+   \usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{cite}}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\textcite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \printtext[bibhyperref]{\usebibmacro{textcite}}}
+  {}
+  {\iffieldundef{postnote}
+     {\ifbool{cbx:parens}
+        {\bibrightparen}
+	{}}
+     {\ifbool{cbx:parens}
+        {\postnotedelim}
+	{\addspace\bibleftparen}%
+      \printfield{postnote}\bibrightparen}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
new file mode 100644
index 00000000000..0724ba6e083
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -0,0 +1,86 @@
+\ProvidesFile{french-apa.lbx}
+\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{nodate}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+
+\DeclareBibliographyStrings{%
+  inherit          = {french},
+  january          = {{janvier}{janvier}},
+  february         = {{f\'evrier}{f\'evrier}},
+  march            = {{mars}{mars}},
+  april            = {{avril}{avril}},
+  may              = {{mai}{mai}},
+  june             = {{juin}{juin}},
+  july             = {{juillet}{juillet}},
+  august           = {{ao\^ut}{ao\^ut}},
+  september        = {{septembre}{septembre}},
+  october          = {{octobre}{octobre}},
+  november         = {{novembre}{novembre}},
+  december         = {{d\'ecembre}{d\'ecembre}},
+  revisededition   = {{\'Edition\space R\'evis\'e}{\'Ed\adddot\space R\'ev\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{le}{le}},
+  retrieved        = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}},
+  available        = {{disponible}{disponible}},
+  from             = {{\`a\space partir\space de}{\`a\space partir\space de}},
+  archivedat       = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
+  nodate           = {{pas\space de\space date}{{}p\adddot d\adddot}},
+  reviewof         = {{critique\space de}{critique\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\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\adddot\space vol\adddot}},
+  typevolumes      = {{R\'edacteur\space du\space volume}{R\'eds\adddot\space vol\adddot}},
+  typeseries       = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddot\space ser\adddot}},
+  typeseriess      = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddot\space ser\adddot}},
+  typevolseries    = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddot\space vol\space\&\space ser\adddot}},
+  typevolseriess   = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddot\space vol\space\&\space ser\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+\DefineBibliographyExtras{french}{%
+  \protected\def\mkbibdatelong#1#2#3{%
+      \iffieldundef{#1}
+        {}
+        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
+          {}
+          {\thefield{#1},\space}}%
+      \iffieldundef{#2}
+      {}
+      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
+        {}
+        {\mkbibmonth{\thefield{#2}}\addspace}%
+        \iffieldundef{#3}
+        {}
+        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+          {}
+          {\stripzeros{\thefield{#3}}}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
new file mode 100644
index 00000000000..23350780985
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -0,0 +1,86 @@
+\ProvidesFile{german-apa.lbx}
+\InheritBibliographyExtras{german}
+
+% (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}
+
+\DeclareBibliographyStrings{%
+  inherit          = {german},
+  january          = {{Januar}{Januar}},
+  february         = {{Februar}{Februar}},
+  march            = {{M\"arz}{M\"arz}},
+  april            = {{April}{April}},
+  may              = {{Mai}{Mai}},
+  june             = {{Juni}{Juni}},
+  july             = {{Juli}{Juli}},
+  august           = {{August}{August}},
+  september        = {{September}{September}},
+  october          = {{Oktober}{Oktober}},
+  november         = {{November}{November}},
+  december         = {{Dezember}{Dezember}},
+  revisededition   = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+  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}},
+  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}},
+  typechair        = {{Konferenzstuhl}{Konferenzstuhl}},
+  typechairs       = {{Konferenzst\"uhle}{Konferenzst\"uhle}},
+  typevolume       = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+  typevolumes      = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+  typeseries       = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
+  typeseriess      = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
+  typevolseries    = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+  typevolseriess   = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+\DefineBibliographyExtras{american}{%
+  \protected\def\mkbibdatelong#1#2#3{%
+      \iffieldundef{#1}
+        {}
+        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
+          {}
+          {\thefield{#1},\space}}%
+      \iffieldundef{#2}
+      {}
+      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
+        {}
+        {\mkbibmonth{\thefield{#2}}\addspace}%
+        \iffieldundef{#3}
+        {}
+        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+          {}
+          {\stripzeros{\thefield{#3}}}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
new file mode 100644
index 00000000000..cbb24b450a5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -0,0 +1,86 @@
+\ProvidesFile{ngerman-apa.lbx}
+\InheritBibliographyExtras{ngerman}
+
+% (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}
+
+\DeclareBibliographyStrings{%
+  inherit          = {ngerman},
+  january          = {{Januar}{Januar}},
+  february         = {{Februar}{Februar}},
+  march            = {{M\"arz}{M\"arz}},
+  april            = {{April}{April}},
+  may              = {{Mai}{Mai}},
+  june             = {{Juni}{Juni}},
+  july             = {{Juli}{Juli}},
+  august           = {{August}{August}},
+  september        = {{September}{September}},
+  october          = {{Oktober}{Oktober}},
+  november         = {{November}{November}},
+  december         = {{Dezember}{Dezember}},
+  revisededition   = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+  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}},
+  nodate           = {{ohne\space Datum}{{}o\adddot D\adddot}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}},
+  typechair        = {{Konferenzstuhl}{Konferenzstuhl}},
+  typechairs       = {{Konferenzst\"uhle}{Konferenzst\"uhle}},
+  typevolume       = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+  typevolumes      = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+  typeseries       = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
+  typeseriess      = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
+  typevolseries    = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+  typevolseriess   = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+\DefineBibliographyExtras{american}{%
+  \protected\def\mkbibdatelong#1#2#3{%
+      \iffieldundef{#1}
+        {}
+        {\ifthenelse{\equal{#1}{endyear}\AND\iffieldsequal{year}{endyear}}
+          {}
+          {\thefield{#1},\space}}%
+      \iffieldundef{#2}
+      {}
+      {\ifthenelse{\equal{#2}{endmonth}\AND\iffieldsequal{month}{endmonth}}
+        {}
+        {\mkbibmonth{\thefield{#2}}\addspace}%
+        \iffieldundef{#3}
+        {}
+        {\ifthenelse{\equal{#3}{endday}\AND\iffieldsequal{day}{endday}}
+          {}
+          {\stripzeros{\thefield{#3}}}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput