biblatex-apa (3mar16)

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

6 files changed, 72 insertions, 36 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index f164e495855..8169e92993e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,9 +1,9 @@
-Version 6.7
+Version 6.8
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
 1.3c (http://www.latex-project.org/lppl.txt). The current
-maintainer is Philip Kime (© 2013).
+maintainer is Philip Kime (© 2016).
 
 This package is a biblatex style for APA (American Psychological
 Association) style compliant documents typeset in LaTeX. It
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 949d8897188..3046616ad99 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
@@ -535,34 +535,42 @@
   PAGES   = {100--103},
   YEAR    = {2001}
 }
+% Testing name initials as per: http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html
+@BOOK{first,
+  AUTHOR = {Brown, Y. and Campbell, W. K.},
+  YEAR = {2004}
+}
+
+@BOOK{second,
+  AUTHOR = {Campbell, A. and Muncer, M. and Gorman, B.},
+  YEAR = {1993}
+}
 
-% Testing only first name initials as per
-% http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html
-@article{first,
-	Author = {Yuri Brown and William Campbell},
-	Journal = {Research},
-	Title = {A first article},
-	Year = {2004}
+@BOOK{third,
+  AUTHOR = {Campbell, W. K. and Bush, C. P. and Brunell, A. B.},
+  YEAR = {2005}
 }
 
-@article{second,
-	Author = {Anne Campbell and Mike Muncer and Brian Gorman},
-	Journal = {Research},
-	Title = {A second article},
-	Year = {1993}
+@BOOK{fourth,
+  AUTHOR = {Smyth, L. N. and Campbell, A. and Adams, K.},
+  YEAR = {1992}
 }
 
-@article{fourth,
-	Author = {Lucy Smith and Anne Campbell and Keith Adams},
-	Journal = {Research},
-	Title = {A fourth article},
-	Year = {1992}
+% Testing multicite name elision
+@article{kingetal2005a,
+  author = {King, J. E. and Weiss, A. and Farmer, K. H.},
+  title = {Title},
+  year = {2005}
 }
 
-@article{third,
-	Author = {William Campbell and Carl Bush and Andy Brunell},
-	Journal = {Research},
-	Title = {A third article},
-	Year = {2005}
+@article{weissetal2007a,
+  author = {Weiss, A. and King, J. E. and Hopkins, W. D.},
+  title = {Title},
+  year = {2007}
 }
 
+@article{weissetal2009a,
+  author = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.},
+  title = {Title},
+  year = {2009}
+}
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 afbbdec05eb..c78630657d1 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 15f725144d2..4665227212c 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,8 +26,17 @@
 % 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}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}
+    {\usebibmacro{labelname:doname}
+      {\namepartfamily}
+      {\namepartfamilyi}
+      {\namepartgiven}
+      {\namepartgiveni}
+      {\namepartprefix}
+      {\namepartprefixi}
+      {\namepartsuffix}
+      {\namepartsuffixi}}
     {\ifthenelse{\value{listtotal}>5}
       {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
        \ifnum\value{listcount}>2 \relax\fi}
@@ -36,8 +45,15 @@
         \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}}}}}
-
+       {\usebibmacro{labelname:doname}
+         {\namepartfamily}
+         {\namepartfamilyi}
+         {\namepartgiven}
+         {\namepartgiveni}
+         {\namepartprefix}
+         {\namepartprefixi}
+         {\namepartsuffix}
+         {\namepartsuffixi}}}}}
 \MakeShortVerb{\|}
 
 \newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
@@ -142,7 +158,7 @@ which have two authors are never name-truncated after the first cite:\\
 \noindent First citation of 3--5 author entry:\\
 \apaex{\textcite{6.12b}}
 
-\noindent Subsequent first citations in a paragraph:\\
+\noindent Subsequent citations:\\
 \apaex{\textcite{6.12b}}\\
 Subsequent citations within a paragraph:\\
 \apaex{\citeauthor{6.12b}}
@@ -152,8 +168,7 @@ citations is not automatic as there may be cases where you don't want to do
 this (see APA 6.11).
 
 \noindent Automatic list disambiguation for ambiguous truncations after
-first cite\footnote{This feature is fairly deep magic and only works when using
-  biblatex 1.4+ together with biber 0.9+}. Note that «et al» is plural so
+first cite. Note that «et al» is plural so
 it will only truncate two or more names. If it would truncate just one
 name, we just give the name:\\
 \apaex{\textcite{6.12c}}\\
@@ -390,9 +405,8 @@ these appear in references\\
 \apaex{\textcite{pretest}}\\
 \apaex{\textcite{nopretest}}
 
-% presufftest2 and nopresufftest have same year but don't have extrayear
-% because useprefix=false for MISC and this is taken account of in
-% extrayear generation
+% presufftest2 and nopresufftest are the same name and so even though
+% useprefix=false nopresufftest, hashes are the same so there is an extrayear
 \noindent Testing prefices plus suffices\\
 \apaex{\textcite{presufftest}}\\
 \apaex{\textcite{presufftest2}}\\
@@ -410,8 +424,19 @@ these appear in references\\
 % http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html
 First citation:\\
 \apaex{\parencite{first,second,third,fourth}}\\
+Second citation:\\
 \apaex{\parencite{first,second,third,fourth}}
 
+% Testing name elision in cites
+% That is, \parencite{kingetal2005a,weissetal2007a,weissetal2009a}
+% Should give:
+% (King, Weiss, & Farmer, 2005; Weiss, King, & Hopkins, 2007; Weiss et al., 2009)
+% and not
+% (King, Weiss, & Farmer, 2005; Weiss, King, & Hopkins, 2007, 2009)
+% which happens if elision is based on namehash because the mincitenames
+% truncation of the 2007 and 2009 names is the same
+\noindent{Testing name elision in cites}\\
+\apaex{\parencite{kingetal2005a,weissetal2007a,weissetal2009a}}
 \end{refsection}
 \begin{refsection}[../bibtex/bib/biblatex-apa-test-references]
 \nocite{*}
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 c4d767a8e52..a57ab3a933d 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 c95ddbdf55d..681935b9b6c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -25,7 +25,7 @@
   url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={6.7},
+  revision={6.8},
   date={\today}}
 
 \hypersetup{%
@@ -45,6 +45,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.8}
+This version requires |biblatex| $>=$3.3 and |biber| $>=$2.4.
+
 \minisec{5.0}
 The style now uses the customisable data model functionality of |biblatex|
 2.0 and |biber| 1.0 and so these are now required. Several cases
@@ -135,7 +138,7 @@ as per the |apa.cls| documentation. Without this class option, the
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the \latex Project Public License, version
 1.3c\footnote{\url{http://www.latex-project.org/lppl.txt}}. The current
-maintainer is Philip Kime (\textcopyright\ 2011).
+maintainer is Philip Kime (\textcopyright\ 2015).
 
 \subsection{History}
 
@@ -161,7 +164,7 @@ Thanks to Håkon Malmedal for the Norwegian localisation. Thanks to
 Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström
 for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch
 localisation. Thanks to Tea Tušar and Bogdan Filipič for the Slovenian
-localisation.
+localisation. Thanks to Sebastian Ørsted for the Danish localisation.
 
 \section{Use}\label{ref:use}
 \label{use}