6 files changed, 49 insertions, 18 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}