biblatex-apa (14may16)

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

28 files changed, 147 insertions, 100 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 8169e92993e..36434691ac8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 6.8
+Version 6.9
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
@@ -16,8 +16,8 @@ In this document and in the code, the specific APA requirements are
 referred to by the section and (if appropriate) the example number of the
 APA Style Guide 6th Edition).
 
-You will need to be using csquotes >= 4.3 and biblatex >= 2.0 The biber
-backend for biblatex >= 1.0 is also required. This style will not work
+You will need to be using csquotes >= 4.3 and biblatex >= 3.4 The biber
+backend for biblatex >= 2.5 is also required. This style will not work
 correctly if using bibtex as the backend for biblatex. If you want to take
 advantage of the biblatex \DeclareQuotePunctuation facility to enforce the
 APA required "American punctuation", you should use the babel package with
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index 3046616ad99..62c187153ff 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
@@ -513,7 +513,7 @@
 }
 
 % Test "and others"
-@ARTICLE{ao,
+@ARTICLE{ao1,
   AUTHOR         = {Boker, S. and Neale, M. and Maes, H. and Wilde, M. and
                    Spiegel, M. and Brick, T. and Spies, J. and Estabrook,
                    R. and Kenny, S. and Bates, T. and others},
@@ -523,7 +523,12 @@
   VOLUME         = {76},
   NUMBER         = {2},
   PAGES          = {306--317},
-  YEAR           = 2011
+  YEAR           = {2011}
+}
+
+@ARTICLE{ao2,
+  AUTHOR = {Olive, K. A. and others},
+  DATE   = {2014}
 }
 
 % Testing season
@@ -556,6 +561,16 @@
   YEAR = {1992}
 }
 
+@ARTICLE{deutsch1963,
+  TITLE = {Attention: Some theoretical considerations},
+  AUTHOR = {Deutsch, J. Anthony and Deutsch, Diana},
+  JOURNAL = {Psychological Review},
+  VOLUME = {70},
+  NUMBER = {1},
+  PAGES = {1--10},
+  YEAR = {1963},
+}
+
 % Testing multicite name elision
 @article{kingetal2005a,
   author = {King, J. E. and Weiss, A. and Farmer, K. H.},
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index c78630657d1..465e7321548 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
index 4665227212c..e88f2a4243d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
@@ -26,7 +26,6 @@
 % wouldn't be a test of anything.
 \ExecuteBibliographyOptions[misc]{uniquelist=false}
 \DeclareNameFormat[misc]{labelname}{%
-  \nameparts{#1}%
   \ifthenelse{\value{listcount}=1\OR\value{listtotal}=2}
     {\usebibmacro{labelname:doname}
       {\namepartfamily}
@@ -379,8 +378,7 @@ semi-colon would be strange:
 \apaex{\fullcite{FC1}}\\
 \apaex{\fullcitebib{FC1}}
 
-% In citations, "WITH" is ignored (APA 6.27)
-\noindent Testing «with»---should not be present in cites\\
+\noindent Testing «with»---should not be present in cites (APA 6.27)\\
 \apaex{\cite{with1}}\\
 \apaex{\textcite{with1}}
 
@@ -412,20 +410,19 @@ these appear in references\\
 \apaex{\textcite{presufftest2}}\\
 \apaex{\textcite{nopresufftest}}
 
-% Testing "and others"
 \noindent Testing «and others»\\
-\apaex{\textcite{ao}}
+\apaex{\textcite{ao1}}\\
+\apaex{\textcite{ao2}}
 
-% Testing season
 \noindent Testing seasonal periodical citations\\
 \apaex{\textcite{season1}}
 
-% Testing first list name initials only as per
-% http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html
+\noindent Testing first list name initials only as per:\\
+\url{http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html}\\
 First citation:\\
-\apaex{\parencite{first,second,third,fourth}}\\
+\apaex{\parencite{first,second,third,fourth,deutsch1963}}\\
 Second citation:\\
-\apaex{\parencite{first,second,third,fourth}}
+\apaex{\parencite{first,second,third,fourth,deutsch1963}}
 
 % Testing name elision in cites
 % That is, \parencite{kingetal2005a,weissetal2007a,weissetal2009a}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index a57ab3a933d..426c70aea28 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
index 681935b9b6c..8347e873963 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -18,14 +18,13 @@
                        {\texttt{(APA #2)}}%
                        {\texttt{(APA #2 Example #1)}}}
 
-
 \titlepage{%
   title={APA Bib\LaTeX\ style},
   subtitle={Citation and References macros for Bib\LaTeX},
   url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={6.8},
+  revision={6.9},
   date={\today}}
 
 \hypersetup{%
@@ -45,6 +44,9 @@ Please see the revision history below (section \ref{rev}) for  details on change
 version. This section is just for important things like incompatible
 changes which users should be aware of.
 
+\minisec{6.9}
+This version requires |biblatex| $>=$3.4 and |biber| $>=$2.5.
+
 \minisec{6.8}
 This version requires |biblatex| $>=$3.3 and |biber| $>=$2.4.
 
@@ -118,7 +120,7 @@ APA Style Guide (6th Edition).
 \subsection{Requirements}\label{ref:req}
 
 You will need to be using \sty{csquotes} ($\geq$ 4.3), Bib\LaTeX\ ($\geq$
-2.6) and Biber ($\geq$ 1.6). If you want to take advantage of the
+3.4) and Biber ($\geq$ 2.5). If you want to take advantage of the
 Bib\LaTeX\ |\DeclareQuotePunctuation| facility to enforce the APA required
 «American» punctuation, you should normally use the \sty{babel} package
 with the «american» option (see Bib\LaTeX\ manual section |3.9.1|). You can
@@ -234,6 +236,12 @@ printed in the References. APA style defaults to 7. You can change this if
 you really want to fully print all author list references in certain
 contexts (for example in a CV where you are an author in position 8 \ldots)
 
+Setting Bib\LaTeX package options which change name processing
+like \opt{uniquename} and \opt{uniquelist} is not supported as this style
+does tricky things internally to match the peculiar APA standard. You
+should not need to change them anyway as then you wouldn't be using APA
+style anyway.
+
 \subsection{Localisation}
 
 Localisation is provided for APA-specific strings in the accompanying
@@ -429,6 +437,17 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
 
 \begin{changelog}
 
+\begin{release}{6.9}{2016-05-13}
+\item Bug fixes
+\item Requires |biblatex| 3.4+ and biber 2.5+
+\end{release}
+
+\begin{release}{6.8}{2016-03-01}
+\item Bug fixes
+\item Updated to use new \cmd{DeclareNameFormat} structure for |biblatex|
+  3.3+ (which is now required)
+\end{release}
+
 \begin{release}{6.7}{2015-01-23}
 \item Bug fixes
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index 085984bc963..80d786e25f7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 4e52667c1f4..4944245cda7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.bbx}[2016/03/01\space v6.8\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2016/05/13\space v6.9\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -217,11 +217,12 @@
                             minbibnames=6,%
                             abbreviate=true,%
                             mincrossrefs=999,%
+                            uniqueprimaryauthor=true,%
+                            eventdate=comp,%
                             date=apalong,%
                             datelabel=apalong,%
                             origdate=apalong,%
                             urldate=apalong,%
-                            eventdate=comp,
                             dateabbrev=false}
 
 %
@@ -360,7 +361,6 @@
 \DeclareNameAlias{default}{apaauthor}
 
 \DeclareNameFormat{apaauthor}{%
-  \nameparts{#1}%
   \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
     {\addcomma\addspace\ldots\addspace}
     {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
@@ -642,7 +642,6 @@
 % (APA 7.02 Example 27) ... unless there is no author
 
 \DeclareNameFormat{apanames}{%
-  \nameparts{#1}%
   \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
     {\addcomma\addspace\ldots}
     {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
@@ -687,59 +686,64 @@
 % (APA 6.27) Name format. Don't capitalise prefixes
 % (APA 6.27) Full name disambiguation using brackets
 
-% #1 = last name
-% #2 = first name
-% #3 = first name (initials)
-% #4 = name prefix, a.k.a. 'von part'
-% #5 = name affix, a.k.a. 'junior part'
+% #1 = family name
+% #2 = given name
+% #3 = given name (initials)
+% #4 = name prefix
+% #5 = name suffix
 
 \newbibmacro*{name:apa:family-given}[5]{%
   \ifuseprefix
     {\usebibmacro{name:delim}{#4#1}%
      \usebibmacro{name:hook}{#4#1}%
-     \ifempty{#4}{}{%
+     \ifdefvoid{#4}{}{%
        \mkbibnameprefix{#4}%
        \ifpunctmark{'}{}{\addhighpenspace}}%
-     \mkbibnamelast{#1\isdot}%
-     \ifempty{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot%
+     \mkbibnamefamily{#1\isdot}%
+     \ifdefvoid{#2}{}{\addcomma\addlowpenspace\mkbibnamegiven{#3}\isdot%
                     \ifthenelse{\value{uniquename}>1}
                       {\addspace\mkbibbrackets{#2}}
                       {}}%
-     \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}
+     \ifdefvoid{#5}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#5}\isdot}}
     {\usebibmacro{name:delim}{#1}%
      \usebibmacro{name:hook}{#1}%
-     \mkbibnamelast{#1}\isdot
-     \ifempty{#2#4}{}{\addcomma}%
-     \ifempty{#2}{}{\addlowpenspace\mkbibnamefirst{#3}%
+     \mkbibnamefamily{#1}\isdot
+     \ifboolexpe{%
+       test {\ifdefvoid{#2}}
+       and
+       test {\ifdefvoid{#4}}}
+       {}
+       {\addcomma}%
+     \ifdefvoid{#2}{}{\addlowpenspace\mkbibnamegiven{#3}%
                     \ifthenelse{\value{uniquename}>1}
                       {\addspace\mkbibbrackets{#2}}
                       {}}%
-     \ifempty{#4}{}{%
+     \ifdefvoid{#4}{}{%
        \addhighpenspace\mkbibnameprefix{#4}%
        \ifpunctmark{'}{}{\addhighpenspace}}%
-     \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
+     \ifdefvoid{#5}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#5}\isdot}}}
 
 \newbibmacro*{name:apa:given-family}[5]{%
   \ifuseprefix
     {\usebibmacro{name:delim}{#2}%
      \usebibmacro{name:hook}{#2}%
-     \ifempty{#2}{}{\mkbibnamefirst{#3}\isdot%
+     \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
                     \ifthenelse{\value{uniquename}>1}
                       {\addspace\mkbibbrackets{#2}}
                       {}\addspace}%
-     \ifempty{#4}{}{%
+     \ifdefvoid{#4}{}{%
        \mkbibnameprefix{#4\isdot}%
        \ifpunctmark{'}{}{\addhighpenspace}}%
-     \mkbibnamelast{#1\isdot}%
-     \ifempty{#5}{}{\addlowpenspace\mkbibnameaffix{#5}\isdot}}
+     \mkbibnamefamily{#1\isdot}%
+     \ifdefvoid{#5}{}{\addlowpenspace\mkbibnamesuffix{#5}\isdot}}
     {\usebibmacro{name:delim}{#1}%
      \usebibmacro{name:hook}{#1}%
-     \ifempty{#2}{}{\mkbibnamefirst{#3}\isdot%
+     \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
                     \ifthenelse{\value{uniquename}>1}
                       {\addspace\mkbibbrackets{#2}}
                       {}\addspace}%
-     \mkbibnamelast{#1}\isdot
-     \ifempty{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
+     \mkbibnamefamily{#1}\isdot
+     \ifdefvoid{#5}{}{\addcomma\addlowpenspace\mkbibnamesuffix{#5}\isdot}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index f5c608ccb12..220709a82ff 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
 %% 
 %% The Current Maintainer of this work is Philip Kime.
 
-\ProvidesFile{apa.cbx}[2016/03/01\space v6.8\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2016/05/13\space v6.9\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -70,44 +70,50 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.11) Suffices are not shown in citations
 % (APA 6.12) 3-5 authors have "et al." after first cite
-% (Blog http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author
+% (Blog http://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]{%
-  \ifnumcomp{\value{listcount}}{>}{1}
+  \ifboolexpr{test {\ifnumcomp{\value{listcount}}{>}{1}}
+              or
+              test {\ifuniqueprimaryauthor}}
     {\setcounter{uniquename}{0}}
     {}%
   \ifcase\value{uniquename}%
     \ifuseprefix
-      {\usebibmacro{name:family}{#1}{#3}{#5}{}}
-      {\usebibmacro{name:family}{#1}{#3}{}{}}%
-   \or
+      {\usebibmacro{name:family}{#1}{#3}{#5}{\relax}}
+      {\usebibmacro{name:family}{#1}{#3}{\relax}{\relax}}%
+  \or
      \ifuseprefix
-       {\usebibmacro{name:given-family}{#1}{#4}{#5}{}}
-       {\usebibmacro{name:given-family}{#1}{#4}{}{}}%
-   \or
+       {\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}{}}
-       {\usebibmacro{name:given-family}{#1}{#3}{}{}}%
-   \fi
-   \usebibmacro{name:andothers}}
+       {\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
+% 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}{%
-  \nameparts{#1}%
+  % 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}%
@@ -119,9 +125,12 @@
       {\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}}
-     {\ifnumcomp{\value{listcount}}{<}{\cbx@min + 1}% normal name
+     % Less than the truncation point, print normally
+     {\ifnumcomp{\value{listcount}}{<}{\cbx@min + 1}
        {\usebibmacro{labelname:doname}%
          {\namepartfamily}%
          {\namepartfamilyi}%
@@ -132,25 +141,29 @@
          {\namepartsuffix}%
          {\namepartsuffixi}}
        {}%
-      \ifnumcomp{\value{listcount}}{=}{\cbx@min + 1}% first past ul is et al
-      % 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}}
-         {\andothersdelim\bibstring{andothers}}
-         {\usebibmacro{labelname:doname}%
-           {\namepartfamily}%
-           {\namepartfamilyi}%
-           {\namepartgiven}%
-           {\namepartgiveni}%
-           {\namepartprefix}%
-           {\namepartprefixi}%
-           {\namepartsuffix}%
-           {\namepartsuffixi}}}
-       {}%
-      \ifnumcomp{\value{listcount}}{>}{\cbx@min + 1}% nothing thereafter
+      % 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}}
+          {\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}%
@@ -169,7 +182,6 @@
 %            SHORTAUTHOR brackets in parencites
 
 \DeclareNameFormat{sabrackets}{%
-  \nameparts{#1}%
   \ifciteseen
   {\usebibmacro{labelname:doname}%
      {\namepartfamily}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index a279d40978f..cdf4592a0ac 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -25,7 +25,7 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.dbx}[2016/03/01\space v6.8\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2016/05/13\space v6.9\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index 307c04867aa..9c4f0cef641 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
index 105a4e6f985..dadc19d8716 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{brazilian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index 55e18e20caa..6b390450de6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
index ff8856cac29..9e9599850b0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2014/04/16\space v6.5\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{danish}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index 877d0db571e..da83afff1f5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index a3a6a4db527..8034403c063 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{english}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index 5aed1d1b4dc..918fcf39c3c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index d05f5172732..0aedb668c99 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{german}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index 9e884be07a8..000f26c2c9e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{greek}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index 2773f3cf72b..c1b829207ef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{italian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
index 45446228609..937f3e3cb48 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{naustrian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index 7ff395dd210..18a347bf38a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{ngerman}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
index 99e861a4656..cea9a6e3dba 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{norsk}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
index aac86314eaf..f41e917e0af 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
index 6766dd9ec67..513cce7c0e1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
index d0e8c540065..f584c00aeeb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{slovene}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index 2e6692bb424..df830f485c1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{spanish}
 
 \setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
index 0ff1c2dd48b..dae141f77a7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2016/03/01\space v6.8\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations