biblatex-apa (1apr11)

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

13 files changed, 173 insertions, 171 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index fb03c12c834..29c06ae58b9 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.6
+Version 2.7
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
@@ -16,14 +16,16 @@ 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 >= 0.9a. If you want
+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
+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
 babel package with the "american" option (see biblatex manual
 section |3.9.1|). You can of course use other languages but in such cases,
 to adhere to APA "American" punctuation rules (following commas moved
 inside closing quotes etc.), then you should set up
-\DeclareQuotePunctuation yourself as per section 4.6.5 of the
+\DeclareQuotePunctuation yourself as per section 4.7.5 of the
 biblatex manual.
 
 You can also use this with apa.cls version 1.3.4 or greater by using 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 f07ce1525e4..4e97e67fbd5 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
@@ -55,61 +55,60 @@
 }
 
 % (APA 6.13)
-@BOOK{6.13a,
+% These are all misc so that we can turn off uniquelist because they all interact and
+% break the examples otherwise. The reason is that we are generating these examples
+% from a real datasource. The table as displayed in the APA 6th assumes that the examples
+% are just static strings.
+@MISC{6.13a,
   AUTHOR         = {A. Walker},
   TITLE          = {Title},
   YEAR           = {2007},
 }
 
-@BOOK{6.13b,
+@MISC{6.13b,
   AUTHOR         = {A. Walker and B. Allen},
   TITLE          = {Title},
   YEAR           = {2004},
 }
 
-@BOOK{6.13c,
+@MISC{6.13c,
   AUTHOR         = {A. Bradley and B. Ramirez and C. Soo},
   TITLE          = {Title},
   YEAR           = {1999},
 }
 
-@BOOK{6.13d,
+@MISC{6.13d,
   AUTHOR         = {A. Bradley and B. Ramirez and C. Soo and D. Walsh},
   TITLE          = {Title},
   YEAR           = {2006},
 }
 
-@BOOK{6.13e,
-  AUTHOR         = {A. Walker and B. Allen and C. Bradley and D. Ramirez and E. Soo},
+@MISC{6.13e,
+  AUTHOR         = {A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
   TITLE          = {Title},
   YEAR           = {2008},
 }
 
-@BOOK{6.13f,
-  AUTHOR         = {Z. Wasserstein and A. Walker and B. Allen and C. Bradley and D. Ramirez and E. Soo},
+@MISC{6.13f,
+  AUTHOR         = {Z. Wasserstein and A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
   TITLE          = {Title},
   YEAR           = {2005},
 }
 
-@BOOK{6.13g,
+@MISC{6.13g,
   AUTHOR         = {{National Institute of Mental Health}},
   SHORTAUTHOR    = {NIMH},
   TITLE          = {Title},
   YEAR           = {2003},
 }
 
-@BOOK{6.13h,
+@MISC{6.13h,
   AUTHOR         = {{University of Pittsburgh}},
   TITLE          = {Title},
   YEAR           = {2005},
 }
 
 % (APA 6.14)
-% The second example from this section is repeated in the APA manual in section 7.01
-% and the bib entry for that example is given below
-% The second entry below is a dummy to show the initials disambiguation in the examples
-% text. Disambiguation only works on single names, hence the dummy entry to force
-% disambiguation.
 @BOOK{6.14,
   AUTHOR         = {I. Light},
   TITLE          = {Deflecting Immigration},
@@ -119,12 +118,6 @@
   PUBLISHER      = {Russell Sage Foundation},
 }
 
-@BOOK{6.14a,
-  AUTHOR         = {D. Light},
-  TITLE          = {Some title},
-  YEAR           = {2009},
-}
-
 % (APA 6.15)
 @ARTICLE{6.15a,
   TITLE          = {Study Finds Something Interesting},
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 332ba24b73d..48ffa65f78f 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 a2c57f90f33..351eb3d1ff4 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
@@ -10,14 +10,36 @@
 % Unicode
 \usepackage{fontspec}
 \setmainfont[Ligatures=TeX]{TeXGyrePagella}
-\setsansfont{Arial}
-\setmonofont{Courier New}
+\setsansfont[Ligatures=TeX]{TexGyreHeros}
+\setmonofont[Ligatures=NoCommon]{TeXGyreCursor}
+\MakeAutoQuote{«}{»}
 
 % Biblatex
 \usepackage[style=apa,%
             backend=biber,
             bibencoding=utf8]{biblatex}
 
+% Custom settings for misc entries in order to format the table for 6.13*
+% This table implies that the examples on each line are in a seperate
+% document but since we are generating the citations from a real data
+% source, we have to prevent the usual uniquelist processing by making
+% all of the examples MISC entrytypes and changing uniquelist
+% per-type. There is no point in just typsetting static data as this
+% wouldn't be a test of anything.
+\ExecuteBibliographyOptions[misc]{uniquelist=false}
+\DeclareNameFormat[misc]{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}}}}}
+
 \MakeShortVerb{\|}
 
 \newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
@@ -59,10 +81,10 @@ demonstrated.
 for the bibliographic entries which these examples use.
 
 \noindent\apa{6.11}\\
-Simple cite. ``Jr.'' suffix is not shown (bib entry for this example has a suffix):\\
+Simple cite. «Jr.» suffix is not shown (bib entry for this example has a suffix):\\
 \apaex{\textcite{6.11}}
 
-\noindent Within a paragraph, not in the ``narrative sense'':\\
+\noindent Within a paragraph, not in the «narrative sense»:\\
 \apaex{\parencite{6.11}}
 
 \noindent To cite the parts separately:\\
@@ -71,7 +93,7 @@ Simple cite. ``Jr.'' suffix is not shown (bib entry for this example has a suffi
 \noindent The per-paragraph rules for elision of years are more flexible in
 APA 6th edition. There is more discretion to do this as the narrative
 consistency suggests and so this style no longer automatically elides years
-aver mention after the first within a paragraph. Cases can be handled as
+after the first mention within a paragraph. Cases can be handled as
 per the examples above.
 
 \noindent\apa{6.12} \apa{6.13}\\
@@ -92,27 +114,32 @@ Subsequent citations within a paragraph:\\
 citations is not automatic as there may be cases where you don't want to do
 this (see APA 6.11).
 
-\noindent\textcolor{red}{Note: The name list disambiguation required in the
-  \emph{Exception:} clause here in the APA manual cannot be automated
-  currently in |biblatex|. This is due to the underlying reliance on the
-  |bibtex| |.bib| data model. This will change in a future |biblatex|
-  release. See |biblatex-apa| docs.}
+\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+}:\\
+\apaex{\textcite{6.12c}}\\
+\apaex{\textcite{6.12d}}\\
+\apaex{\textcite{6.12c}}\\
+\apaex{\textcite{6.12d}}
 
-\noindent Multiple-authors in running text are separated by ``and''.
-However, in parenthetical cites, multiple authors are separated by ``\&'':\\
+\noindent Multiple-authors in running text are separated by «and».
+However, in parenthetical cites, multiple authors are separated by «\&»:\\
 \apaex{\textcite{6.12e}}\\
 \apaex{\parencite{6.12f}}
 
-\noindent The following citation should be name truncated on first cite
-since it has six or more authors:\\
-\apaex{\textcite{6.12g}}
-
-\noindent\textcolor{red}{Note: The note above applies to the disambiguation
-of entries with six or more names}
+\noindent Automatic list disambiguation for ambiguous truncations again,
+this time the truncation is on first cite as there are more than 5 authors:\\
+\apaex{\textcite{6.12g}}\\
+\apaex{\textcite{6.12h}}
 
-\noindent Now, following the examples in Table 6.1, p. 177 of the APA
-manual. Note in the code that typesets these examples, |\citereset| is used
-to pretend that the parenthetical examples are the first in the text.
+\noindent The following table replicates with real data the examples
+in Table 6.1, p.~177 of the APA 6th Edition manual. Note that this
+table in the APA manual essentially assumes that the citations on each
+line are in a separate document since there is no list disambiguation
+or repeated cite truncations between lines. To simulate this with real
+data, the source for this document uses |\citereset| between lines and
+makes all of the data entries of MISC type, unsetting «uniquelist» for
+this type and using a custom labelname style.
 
 \begin{center}
 \begin{tabular}{lllll}
@@ -123,64 +150,62 @@ to pretend that the parenthetical examples are the first in the text.
     citations in text}}\\\\
 \hline
 \\
-\parbox{2cm}{One work by one author}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13a}}} &
-\parbox{2.4cm}{\apaexs{\textcite{6.13a}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13a}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13a}}}\\\\
-\parbox{2cm}{One work by two authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13b}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13b}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13b}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13b}}}\\\\
-\parbox{2cm}{One work by three authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13c}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13c}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13c}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13c}}}\\\\
-\parbox{2cm}{One work by four authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13d}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13d}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13d}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13d}}}\\\\
-\parbox{2cm}{One work by five authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13e}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13e}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13e}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13e}}}\\\\
-\parbox{2cm}{One work by six authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13f}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13f}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13f}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13f}}}\\\\
-\parbox{2cm}{Groups (readily identified through abbreviation) as authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13g}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13g}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13g}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13g}}}\\\\
-\parbox{2cm}{Groups (no abbreviation) as authors}
-& \parbox{2.4cm}{\apaexs{\textcite{6.13h}}} & 
-\parbox{2.4cm}{\apaexs{\textcite{6.13h}}}\citereset
-& \parbox{2.4cm}{\apaexs{\parencite{6.13h}}}
-& \parbox{2.4cm}{\apaexs{\parencite{6.13h}}}\\\\
+\parbox{2cm}{\raggedright One work by one author}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13a}}} &
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13a}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13a}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13a}}}\\\\
+\parbox{2cm}{\raggedright One work by two authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13b}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13b}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13b}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13b}}}\\\\
+\parbox{2cm}{\raggedright One work by three authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13c}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13c}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13c}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13c}}}\\\\
+\parbox{2cm}{\raggedright One work by four authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13d}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13d}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13d}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13d}}}\\\\
+\parbox{2cm}{\raggedright One work by five authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13e}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13e}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13e}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13e}}}\\\\
+\parbox{2cm}{\raggedright One work by six authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13f}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13f}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}}\\\\
+\parbox{2cm}{\raggedright Groups (readily identified through abbreviation) as authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}\\\\
+\parbox{2cm}{\raggedright Groups (no abbreviation) as authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13h}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13h}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13h}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13h}}}\\\\
 \hline
 \end{tabular}
 \end{center}
 
 \noindent\apa{6.14}\\
 Citations of an entry with an author who shares a
-surname with another entry always appears with initials:\\
+surname with another entry always appears with initials\footnote{This is,
+  as with automatic name list disambiguation, fairly deep magic only
+  possible with biblatex 1.4+ and biber 0.9+}. Note that the APA example
+for this is not really correct for any automated system as the ambiguous
+surname should be disambiguated with initials in both cases---we still
+don't really know in the APA example whether the Light in the 2008 paper is
+the same as the Light in the 2006. The disambiguation performed by biblatex
+makes this clear (or as clear as it can be):\\
 \apaex{\textcite{6.14}}\\
-and\\
-\apaex{\textcite{7.01:3b}}\\\\
-\textcolor{red}{Note: The second citation key here is taken from the APA
-  references section as it is repeated there. This example is currently impossible to automate as
-  it is, due to the nature of name list parsing in BibTeX. Disambiguation
-  works between single names and not names within lists at the moment. The
-  first example works due to a dummy single-name entry with the same
-  surname in the |.bib| for the citation examples. See
- |biblatex-apa| docs. This is planned to be fully supported with |biblatex|
- 2.x which should include the necessary underlying functionality}.
+\apaex{\textcite{7.01:3b}}
 
 \noindent\apa{6.15}\\
 Use |SHORTTITLE| field of the entry if it exists:\\
@@ -197,9 +222,9 @@ Two or more works withing the same parentheses:\\
 
 \noindent Citations of works by same authors in the same year:\\
 \apaex{\parencite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\\\
-\textcolor{red}{Note: This example, (p. 178 APA Manual 6th edition, 2nd
-  printing) is slightly odd as the ``in-press-a'' is not indicated and
-  should be ``in-press'' since no other in press items are listed for the
+\textcolor{red}{Note: This example, (p.~178 APA Manual 6th edition, 2nd
+  printing) is slightly odd as the «in press-a» is not indicated and
+  should be «in press» since no other in press items are listed for the
   same authors in the example.}
 
 \noindent Compact citations in alphabetic order:\\
@@ -242,7 +267,7 @@ See the |biblatex-apa| docs.\\
 \apaex{(\nptextcite[see Table 3 of][]{6.21} for complete data)}
 
 \noindent\apa{6.28}\\
-Entries with no date use ``n.d.''.\\
+Entries with no date use «n.d.».\\
 \apaex{\textcite{6.28a}}\\
 \apaex{\parencite{6.28a}}\\
 \apaex{(\nptextcite{6.28a})}
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 7ea17a95ab4..babf3779464 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 a53a1352583..390532b2d99 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.6},
+  revision={2.7},
   date={\today}}
 
 \hypersetup{%
@@ -60,14 +60,17 @@ APA Style Guide (6th Edition).
 \subsection{Requirements}\label{ref:req}
 
 You will need to be using \sty{csquotes} ($\geq$ 4.3) and \sty{biblatex}
-($\geq$ 0.9a). If you want to take advantage of the \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
+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 «american»
-option (see \sty{biblatex} manual section |3.9.1|). You can of course use
-other languages but in such cases, to adhere to APA «American» punctuation
-rules (following commas moved inside closing quotes etc.), then you should
-set up |\DeclareQuotePunctuation| yourself as per section |4.6.5| of the
-\sty{biblatex} manual.
+punctuation, you should normally use the \sty{babel} package with the
+«american» option (see \sty{biblatex} manual section |3.9.1|). You can of
+course use other languages but in such cases, to adhere to APA «American»
+punctuation rules (following commas moved inside closing quotes etc.), then
+you should set up |\DeclareQuotePunctuation| yourself as per section
+|4.7.5| of the \sty{biblatex} manual.
 
 If you are using the |apa.cls| \latex class, you need be using version
 $\geq$ 1.3.4. The class should be invoked with the |noapacite| class option
@@ -80,7 +83,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\ 2010).
+maintainer is Philip Kime (\textcopyright\ 2011).
 
 \subsection{History}
 
@@ -194,45 +197,12 @@ lifted but that's not likely until after \sty{biblatex} version
 \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 ``999'' in |apa.bbx|
+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. Sorry. This will be changed when |biblatex| moves to using |biber|
-as a backend with a more sophisticated data model.
-
-\subsubsection{Citation Limitations}
-
-\begin{itemize}
-\item \apa{6.14} Disambiguation of truncated author name lists. This is
-  currently impossible to automate via a \sty{biblatex} style. The
-  \sty{maxnames} and \sty{minnames} options of \sty{biblatex} only serve to
-  specify the truncation limits but do not disambiguate name lists which
-  truncate to the same string. This cannot be reliably done in the style
-  since it would need to build a backwards and forward list of identical
-  truncations and map these onto the internal \sty{fullhash} field of
-  \sty{biblatex} in order to determine which truncations need
-  disambiguating. Since there is no way of knowing, when you truncate
-  something, whether something later in the document would have the same
-  truncation (without \path{.aux} file support anyway), this is not really
-  possible. It's also further complicated by the fact that \bibtex doesn't
-  really support name lists in a way which would make this possible and
-  since the main name list processing is done in \sty{biblatex} by \bibtex
-  still, there isn't much that can be done about this at the moment until
-  \sty{biblatex} moves to using something other than \bibtex for its data.
-  See the following Usenet thread:\\
-
-  \url{http://groups.google.com/group/comp.text.tex/browse_thread/thread/f3c50d7065159ad4#}\\
-
-  A related issue is that the \sty{uniquename} option doesn't work in lists
-  of authors, again because all the name processing is done by \bibtex.
-  Currently, \sty{biblatex} disambiguates non-unique names in lists by
-  using the \sty{labelyear} mechanisms which is against APA style (and most
-  styles since this is supposed to disambiguate same author(s)/different
-  year situations) but there's nothing really that can be done about it at
-  the moment. Thankfully, these two problems are not that common and only
-  occur when you have long lists of authors which share many members with
-  variations in initials etc.
-\end{itemize}
+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}
 
@@ -349,6 +319,13 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{2.7}{2011-04-1}
+\item Biber is now a strongly recommended requirement due to APA name and
+  name list disambiguation requirements.
+\item Updated for biblatex 1.4/biber 0.9 with automatic list
+  disambiguation. Package now deals with all APA 6th Edition citation examples.
+\end{release}
+
 \begin{release}{2.6}{2011-03-15}
 \item Made fullcite use ampersand
 \item Added fullcitebib macro to allow fake bib citations
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 21f073a3442..66129a1eb7e 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 @@
-% v2.6
+% v2.7
 \ProvidesFile{american-apa.lbx}
 \InheritBibliographyExtras{american}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index c10c0e3b812..da9c9f863b4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -1,4 +1,4 @@
-%% apa.bbx v2.6
+%% apa.bbx v2.7
 %% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -159,10 +159,12 @@
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (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.12) Five author max before "et al" and a one author truncation policy
+%            However, only after the first cite, which means we can't use
+%            maxnames/minnames and have to do this in the Format for
+%            labelname (in the cbx). Anyway, since the truncation is to
+%            one name and APA requires we use the biblatex uniquelist
+%            functionality, maxnames/minnames isn't really indicated.
 % (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
@@ -176,10 +178,11 @@
                             firstinits=true,%
                             useprefix=true,%
                             usetranslator=true,%
+                            uniquelist=true,%
                             uniquename=init,%
                             citetracker=true,%
-                            maxnames=999,%
-                            minnames=999,%
+                            maxnames=99,%
+                            minnames=99,%
                             abbreviate=true,%
                             mincrossrefs=999,%
                             alldates=apalong}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index a43548160c3..4312c0b854f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -1,4 +1,4 @@
-%% apa.cbx v2.6
+%% apa.cbx v2.7
 %% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -68,9 +68,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (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.
+% (APA 6.12) 3-5 authors have "et al." after first cite
 
 % #1 = last name
 % #2 = last name (initials)
@@ -91,19 +89,23 @@
    \fi
    \usebibmacro{name:andothers}}
 
+% Can't do this with the built-in printnames as APA requires truncation
+% and disambiguation only after first cite
 
 \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}}}}}
+    {\ifthenelse{\ifciteseen\OR\value{listtotal}>5}
+     {\ifnumcomp{\value{listcount}}{<}{\value{uniquelist} + 1}% normal name
+      {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}%
+       {}%
+      \ifnumcomp{\value{listcount}}{=}{\value{uniquelist} + 1}% first past ul is et al
+       {\andothersdelim\bibstring{andothers}}%
+       {}%
+      \ifnumcomp{\value{listcount}}{>}{\value{uniquelist} + 1}% nothing thereafter
+       {\relax}%
+       {}}%
+     {\usebibmacro{labelname:doname}{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 82fb0a2ee8a..15c94f4b9c9 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 @@
-% v2.6
+% v2.7
 \ProvidesFile{dutch-apa.lbx}
 \InheritBibliographyExtras{dutch}
 
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 0dc6e643059..edb178ec2fe 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 @@
-% v2.6
+% v2.7
 \ProvidesFile{french-apa.lbx}
 \InheritBibliographyExtras{french}
 
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 0d1b919c361..77d07131ee5 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 @@
-% v2.6
+% v2.7
 \ProvidesFile{german-apa.lbx}
 \InheritBibliographyExtras{german}
 
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 f7bcf8c1abc..5652b7d3c94 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 @@
-% v2.6
+% v2.7
 \ProvidesFile{ngerman-apa.lbx}
 \InheritBibliographyExtras{ngerman}