biblatex-apa (20jul13)

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

24 files changed, 72 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 8f6b7512e66..d84c59b9041 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.0
+Version 6.1
 
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
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 7c10adbf771..e4d5f6ae1e7 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
@@ -54,6 +54,18 @@
   YEAR           = {1996},
 }
 
+@BOOK{6.12i,
+  AUTHOR         = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge},
+  TITLE          = {Title},
+  YEAR           = {1990},
+}
+
+@BOOK{6.12j,
+  AUTHOR         = {A. Albert and B. Bryant and C. Cuthbert and E. Elide},
+  TITLE          = {Title 2},
+  YEAR           = {1991},
+}
+
 % (APA 6.13)
 % 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
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 cc4d3fe60b6..ca2dfe75d4b 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 7141db656aa..a5f6a309294 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
@@ -166,6 +166,13 @@ this time the truncation is on first cite as there are more than 5 authors:\\
 \apaex{\textcite{6.12g}}\\
 \apaex{\textcite{6.12h}}
 
+\noindent Automatic list disambiguation is only for ambiguous author lists
+in the same year so these are not disambiguated:\\
+\apaex{\textcite{6.12i}}\\
+\apaex{\textcite{6.12j}}\\
+\apaex{\textcite{6.12i}}\\
+\apaex{\textcite{6.12j}}
+
 \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
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 aeb19cf34d4..8cd85f5ff86 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 078ea0e5114..02e399375e9 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.0},
+  revision={6.1},
   date={\today}}
 
 \hypersetup{%
@@ -364,16 +364,48 @@ general notes:
   value key (|PUBSTATE| takes a pre-defined set of localisation keys as
   values, see |biblatex| manual).
 \item APA style sometimes refers to the «series» of a multi-volume work.
-  This corresponds to the |MAINTITLE| field in the \path{.bib} and
+  This corresponds to the |MAINTITLE| field in the \file{.bib} and
   \emph{not} the |SERIES| field.
 \item |VOLUME|, |NUMBER| and |CHAPTER| are forced into arabic numerals if
   they are given as roman numerals, as required by \apa{6.22}.
 \end{itemize}
 
+\subsubsection{Retrieval dates for online items}
+
+APA 6th edition section 6.32 says «Do not include retrieval dates unless
+the source material may change over time (e.g., Wikis)». This is open to
+interpretation of what constitutes a Wiki and what counts as «changing over
+time». The style does not implement anything for this requirement by
+default but you can automate your own interpretation by putting this in
+your preamble:
+
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+       \step[fieldsource=url,
+             notmatch=\regexp{wiki},
+             final=1]
+       \step[fieldset=urldate, null]
+    }
+  }
+}
+\end{lstlisting}
+
+\noindent This will dynamically remove the |URLDATE| field from any entry
+where the |URL| field doesn't match the regular expression «wiki». Modify this
+regular expression according to taste. This modification is dynamically
+applied to the data stream by |biber| and does not change your \file{.bib}.
+
 \section{Revision history}\label{rev}
 
 \begin{changelog}
 
+\begin{release}{6.1}{2013-07-19}
+\item Corrected APA 6.12 error and switched to uniquelist=minyear
+\item Documented way of automating some APA 6.32 requirements
+\end{release}
+
 \begin{release}{6.0}{2013-07-10}
 \item Added Swedish localisation
 \item Fixed useprefix=false issue
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 72ee51c5885..f355a98bab4 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2013/07/19\space v6.1\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 7e1c9bd9b1f..fc61fe29dd0 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}[2013/07/09\space v6.0\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2013/07/19\space v6.1\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -208,7 +208,7 @@
                             pagetracker=true,%
                             useprefix=true,%
                             usetranslator=true,%
-                            uniquelist=true,%
+                            uniquelist=minyear,%
                             uniquename=full,%
                             citetracker=true,%
                             maxcitenames=2,%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 6426e59b343..c3a517e0d42 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -25,7 +25,7 @@
 %% biblatex-apa-test-citations.bib (Style examples - citations)
 %% biblatex-apa-test-references.bib (Style examples - references)
 
-\ProvidesFile{apa.cbx}[2013/07/09\space v6.0\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2013/07/19\space v6.1\space APA biblatex citation style]
 \RequireBiber[3]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index 415a36c7ac1..8babfecf6d0 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}[2013/07/09\space v6.0\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2013/07/19\space v6.1\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{
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 c270ba2e9f0..32714930418 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2013/07/19\space v6.1\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 dafb0994f7b..4fd6dc3d7fd 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2013/07/19\space v6.1\space APA biblatex localisation]
 \InheritBibliographyExtras{british}
 
 % (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 5056ac456e1..4810906557b 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2013/07/19\space v6.1\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (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 25cf6a39699..dd03819663b 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2013/07/19\space v6.1\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 d90e62e0cf2..34d2e98c038 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2013/07/19\space v6.1\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 7ffe0b5dfdb..0c4dd2bd203 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2013/07/19\space v6.1\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 9284547538e..c24c84bf4b0 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2013/07/19\space v6.1\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 16f9e75a2ef..337f32f7176 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2013/07/19\space v6.1\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 abf67ff3bf1..86d57bc7b48 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2013/07/19\space v6.1\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 e712c92ad56..04284f18656 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2013/07/19\space v6.1\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 6094f7fd8d0..25d57ea3afd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
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 e3bb3d0f7d2..1c72e7bcb06 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2013/07/19\space v6.1\space APA biblatex localisation]
 \InheritBibliographyExtras{nynorsk}
 
 % (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 69748c9fabc..3b8d5351f50 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2013/07/19\space v6.1\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 3507fa31229..46f845bdf6c 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}[2013/07/09\space v6.0\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2013/07/19\space v6.1\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations