biblatex-apa (26jan12)

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

15 files changed, 99 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index acd4d0fecc5..cc7bea63f2b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 4.3
+Version 4.4
 
 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index e7400b0b65c..c33fe1068da 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 b46be700160..861260936a7 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
@@ -119,7 +119,9 @@ it will only truncate two or more names. If it would truncate just one
 name, we just give the name:\\
 \apaex{\textcite{6.12c}}\\
 \apaex{\textcite{6.12d}}\\
-\apaex{\textcite{6.12c}}\\
+\apaex{\textcite{6.12c}}\footnote{This example is incorrect in the
+  APA manual because «et al» is replacing only one name. This has been
+  verified with the APA and will be corrected in future editions.}\\
 \apaex{\textcite{6.12d}}
 
 \noindent Multiple-authors in running text are separated by «and».
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 bd6a588859f..8766f52f150 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 3709d7bee45..7832e1dbb24 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={4.3},
+  revision={4.4},
   date={\today}}
 
 \hypersetup{%
@@ -45,6 +45,10 @@ 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{4.4}
+The |\maxprtauth| command is now a package option called
+«apamaxprtauth», see section \ref{opts}.
+
 \minisec{4.3}
 Specifying entries as «in press» should now be done using the official |biblatex|
 mechanism for this. Instead of, for example:
@@ -165,6 +169,30 @@ APA-style sentence case in the References section. Unlike the References
 section, titles in citations in the APA style appear in normal case and the
 style will ensure this too.
 
+\subsection{Package options}\label{opts}
+
+The following options are set as usual in the options passed to
+|biblatex|.
+
+\begin{ltxcode}
+apabackref=true|false
+\end{ltxcode}% | stupid comment to stop emacs highlighting as verb due
+             % to single pipe
+
+\noindent It is not APA style to include backreferences in the References to
+pages where citations of the entry occur. However, this is very
+useful, especially in proofing and so if you set the |apabackref|
+option to «true», these are enabled. The default is «false».
+
+\begin{ltxcode}
+apamaxprtauth=<num>
+\end{ltxcode}
+
+\noindent This option controls the number of author/editor names which are
+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)
+
 \subsection{Localisation}
 
 Localisation is provided for APA-specific strings in the accompanying
@@ -313,12 +341,6 @@ general notes:
   citations and the references will be the localisation of the |PUBSTATE|
   value key (|PUBSTATE| takes a pre-defined set of localisation keys as
   values, see |biblatex| manual).
-\item The |\maxprtauth| commands returns the number of author/editor
-  names which are printed. APA style defaults to 7. You can reset this
-  after loading biblatex with, for example,
-  |\renewcommand{\maxprtauth}{25}| 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)
 \item There are occasions where there is no sensible \path{.bib} key to
   use. This applies to things like |AUDIO| and |VIDEO| entries mainly. The
   format of these requires that different roles (Director, Producer etc.)
@@ -348,11 +370,15 @@ general notes:
 
 \begin{changelog}
 
-\begin{release}{4.3}{2012-01-21}
+\begin{release}{4.4}{2012-01-25}
+\item |\maxprtauth| command is now a package option «apamaxprtauth»
+\item New package option «apabackref» controlling whether
+  backreferences and links to citations appear in the References.
+\end{release}
+
+\begin{release}{4.3}{2012-01-22}
 \item «et al» now only replaces two or more names since it's plural
 \item «in press» items now should use the |biblatex| |PUBSTATE| field
-  (Requires |biber| $\geq$ 0.9.9 to fully support disambiguation of «in
-  press» items by the same author)
 \item Fixed «in press» hyphenation issue for disambiguation in references
 \item URLs are now by default in roman font as per APA style.
 \end{release}
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 69eb0f5457c..b163719ce5a 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 @@
-% v4.3
+% v4.4
 \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 d1a813d4377..dbb195150af 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 v4.3
+%% apa.bbx v4.4
 %% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
@@ -44,6 +44,10 @@
 %  Allow variable max authors/editors limit
 
 \newcommand{\maxprtauth}{7}
+\DeclareBibliographyOption{apamaxprtauth}{%
+  \ifstrempty{#1}
+    {}
+    {\renewcommand{\maxprtauth}{#1}}}
 
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -201,6 +205,7 @@
 
 \ExecuteBibliographyOptions{labelyear=true,%
                             sorting=apa,%
+                            backref=true,%
                             pagetracker=true,%
                             firstinits=true,%
                             useprefix=true,%
@@ -217,6 +222,19 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% It is not APA standard to have backrefs in the bib
+% Some users might like it though.
+
+\newbool{apa:backref}
+\DeclareBibliographyOption{apabackref}{%
+  \ifstrequal{#1}{true}
+    {\global\booltrue{apa:backref}}
+    {\global\boolfalse{apa:backref}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.29) Additional material sometimes goes in parens
 %            after title. This bool tracks the parens.
@@ -1143,6 +1161,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \usebibmacro{apa:finpunct}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{book}{%
@@ -1165,6 +1184,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1186,6 +1206,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1213,6 +1234,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1234,6 +1256,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1261,6 +1284,7 @@
   \usebibmacro{origyear}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1288,6 +1312,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1321,6 +1346,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1348,6 +1374,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1374,6 +1401,7 @@
   \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1396,6 +1424,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1419,6 +1448,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1437,6 +1467,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1454,6 +1485,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1475,6 +1507,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1502,6 +1535,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1523,6 +1557,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1542,6 +1577,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1561,6 +1597,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1578,6 +1615,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1592,6 +1630,7 @@
   \newunit\newblock
   \usebibmacro{location+publisher}%
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1606,6 +1645,7 @@
   \newunit\newblock
   \usebibmacro{doi+eprint+url}%
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}%
   \usebibmacro{finentry}}
 
@@ -1627,6 +1667,7 @@
   \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
   \usebibmacro{apa:finpunct}
   \usebibmacro{finentry}}
 
@@ -1730,6 +1771,14 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Wrapper for backrefs
+
+\newbibmacro{apa:pageref}{%
+  \ifbool{apa:backref}{\usebibmacro{pageref}}{}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 7b3ac3e965a..83885d9e15c 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 v4.3
+%% apa.cbx v4.4
 %% Copyright 2011 Philip Kime
 %%
 %% This work may be distributed and/or modified under the
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 390bed25f2b..acd2417c883 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 @@
-% v4.3
+% v4.4
 \ProvidesFile{brazilian-apa.lbx}
 \InheritBibliographyExtras{brazilian}
 
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 a4e007561a5..04352f5174e 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 @@
-% v4.3
+% v4.4
 \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 27b2f4fe17e..acbe9dd97ad 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 @@
-% v4.3
+% v4.4
 \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 9335699464a..b55be2207c9 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 @@
-% v4.3
+% v4.4
 \ProvidesFile{german-apa.lbx}
 \InheritBibliographyExtras{german}
 
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 682f338aaca..e5be6414e73 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 @@
-% v4.3
+% v4.4
 \ProvidesFile{greek-apa.lbx}
 \InheritBibliographyExtras{greek}
 
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 fc836917b8d..c51761438fa 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 @@
-% v4.3
+% v4.4
 \ProvidesFile{ngerman-apa.lbx}
 \InheritBibliographyExtras{ngerman}
 
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 9a8a54ac3cb..4f01945e9c6 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 @@
-% v4.3
+% v4.4
 \ProvidesFile{spanish-apa.lbx}
 \InheritBibliographyExtras{spanish}