biblatex-apa 3.0 (9jun11)

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

6 files changed, 58 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 0ba84fb51dd..e688ca6a5ce 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 2.9
+Version 3.0
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
@@ -17,7 +17,7 @@ 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 >= 1.4. 
-The biber backend for biblatex >= 0.9 is also strongly recommended and some
+The biber backend for biblatex >= 0.9.2 is also strongly recommended and some
 functionality is unavailable without this (see docs). If you want
 to take advantage of the biblatex \DeclareQuotePunctuation facility
 to enforce the APA required "American punctuation", you should use the
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 4e97e67fbd5..8460d484669 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
@@ -319,3 +319,28 @@
   NUMBER         = {12},
   PAGES          = {1423--1458},
 }
+
+% Testing uniqueness for identical name lists and subset lists
+@BOOK{UL1,
+  AUTHOR         = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
+  TITLE          = {Many Things and Other Topics},
+  YEAR           = {2010}
+}
+
+@BOOK{UL2,
+  AUTHOR         = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
+  TITLE          = {Random Articles Found Under Cats},
+  YEAR           = {2010}
+}
+
+@BOOK{UL3,
+  AUTHOR         = {Patricia Petulant and Cloe Clueless and Brian Beffudled},
+  TITLE          = {Can You Say a Word?},
+  YEAR           = {2010}
+}
+
+@BOOK{UL4,
+  AUTHOR         = {Patricia Petulant and Cloe Clueless and Brian Beffudled and Graham Grunt},
+  TITLE          = {Looking at Spiders},
+  YEAR           = {2010}
+}
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 e40a38fd548..05106d05fd0 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 99d840195c4..ca38f3f3602 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
@@ -279,7 +279,24 @@ A patent citation uses the title but with no quotes\\
 \apaex{\textcite{A7.07}}\\
 \apaex{\parencite{A7.07}}
 
-Some misc test cases\\
+\noindent Some tests of uniqueness and uniquelist
+
+\noindent Two works by same authors in same year are disambiguated by extrayear «a»
+and «b» and are truncated after first cite because it is the same author
+list and therefore not ambiguous:\\
+\apaex{\textcite{UL1}}\\
+\apaex{\textcite{UL1}}\\
+\apaex{\textcite{UL2}}\\
+\apaex{\textcite{UL2}}\\
+
+\noindent One author list is an ordered subset of the other and so both need fully
+expanding to be properly disambiguated. Truncating either would be ambiguous.\\
+\apaex{\textcite{UL3}}\\
+\apaex{\textcite{UL3}}\\
+\apaex{\textcite{UL4}}\\
+\apaex{\textcite{UL4}}
+
+\noindent Some misc citation cases\\
 \apaex{\textcite{6.16c,6.16d,6.16e}}\\
 \apaex{\textcite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\
 \apaex{\cite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\
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 e19579e651e..819e7d62069 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 3d27918d7e4..c8e7641afa1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -23,7 +23,7 @@
   url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={2.9},
+  revision={3.0},
   date={\today}}
 
 \hypersetup{%
@@ -62,7 +62,7 @@ APA Style Guide (6th Edition).
 You will need to be using \sty{csquotes} ($\geq$ 4.3) and \sty{biblatex}
 ($\geq$ 1.4). Some features will not work\footnote{Automatic name and name
   list uniqueness disambiguation---see examples doc} without the
-\sty{biber} backend for \sty{biblatex} ($\geq$ 0.9) which is strongly
+\sty{biber} backend for \sty{biblatex} ($\geq$ 0.9.2) which is strongly
 recommended. If you want to take advantage of the \sty{biblatex}
 |\DeclareQuotePunctuation| facility to enforce the APA required «American»
 punctuation, you should normally use the \sty{babel} package with the
@@ -105,7 +105,8 @@ Thanks to Philipp Lehman for \sty{biblatex} which really has been a major
 advance over pure \bibtex. Thanks to Alexander van Loon for the Dutch
 localisation. Thanks to Paul Thompson for the suggestion to
 parameterise the max authors setting. Thanks to George Gkotsis for the
-Greek localisation.
+Greek localisation. Thanks to Erikson Kaszubowski for the Brazilian
+localisation.
 
 \section{Use}\label{ref:use}
 \label{use}
@@ -195,16 +196,6 @@ impossible due to \sty{biblatex} limitations. It is likely that with future
 lifted but that's not likely until after \sty{biblatex} version
 \texttt{1.0}, according to the |biblatex| author Philipp Lehman.
 
-\subsubsection{maxnames/minnames}
-
-You can't reset these |biblatex| options in your document--you'll get a
-message about conflicting options. These are set to ``99'' in |apa.bbx|
-because of the tricky requirements for APA name list truncation. The
-truncation is then done in the author list code rather than by using these
-options. Specifically, the reason is that the APA requirements are that
-name list truncation is done only after the first cite for certain lengths
-of name list and so a global setting cannot be used.
-
 \subsubsection{Reference Section Limitations}
 
 \begin{description}
@@ -320,7 +311,15 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
-\begin{release}{2.8}{2011-05-03}
+\begin{release}{3.0}{2011-05-06}
+\item |maxnames| and |minnames| are now set to sensible things and actually
+  used. |biber| $\geq$ 0.9.3 is now required as this implements a fix for
+  |uniquelist| in |biblatex| which needs |maxnames| and |minnames| set to
+  real values.
+\item Fixed bug with commas before «et al» not appearing in some cases.
+\end{release}
+
+\begin{release}{2.9}{2011-05-03}
 \item APA wants no space between volume and number for articles, even though it's
   horribly ugly\ldots
 \item Made urls not optional with |biblatex| url toggle in |ONLINE| entrytype (thanks to Mattias Erll)