biblatex-apa (21oct10)

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

6 files changed, 61 insertions, 60 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 996f8508fba..42d5f31683d 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.1
+Version 2.2
 
 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-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
index 8a61dc4b69a..1e0384e5e0e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
@@ -561,19 +561,16 @@
 }
 
 % (APA 7.05 Example 43)
-% VOLUME and NUMBER can be used in a thesis entry to specify the DAI volume and number
-% The USERB having the special value "isabstract" field indicates that this is a
-% reference to an abstract, not the actual work and thus the title is not emphasised
-@THESIS{7.05:43,
-  USERB          = {isabstract},
+% This example formats naturally as an article as it has VOLUME, NUMBER etc.
+@ARTICLE{7.05:43,
   AUTHOR         = {L. G. Appelbaum},
+  JOURNALTITLE   = {Dissertation Abstracts International: Section B. Sciences and Engineering},
   TITLE          = {Three Studies of Human Information Processing},
   SUBTITLE       = {Texture Amplification, Motion Representation, and Figure-Ground Segregation},
   VOLUME         = {65},
   NUMBER         = {10},
   YEAR           = {2005},
-  PAGES          = {5428},
-  EPRINTTYPE     = {Dissertation Abstracts International: Section B. Sciences and Engineering}
+  PAGES          = {5428}
 }
 
 % (APA 7.05 Example 44)
@@ -808,12 +805,14 @@
 
 
 % (APA 7.09 Example 62)
+% "eric" is defined as a recognised eprint type in the style and will be formatted as a
+% localised version of "Retrieved from ERIC database (<eprintid>)"
 @UNPUBLISHED{7.09:62,
   AUTHOR         = {K. Kubota},
   TITLE          = {``{S}oaking'' Model for Learning},
   SUBTITLE       = {Analyzing {J}apanese Learning/Teaching Process from a Socio-Historical Perspective},
   YEAR           = {2007},
-  EPRINTTYPE     = {ERIC database},
+  EPRINTTYPE     = {eric},
   EPRINT         = {ED498566}
 }
 
@@ -989,3 +988,4 @@
   LOCATION       = {Washington, DC},
   PUBLISHER      = {U.S. Patent and Trademark Office}
 }
+
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 86609f5ffdd..cfe1d9175c5 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index d645bdc58b0..f511f4bea85 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 727e2488013..f3f8dd9351e 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.1},
+  revision={2.2},
   date={\today}}
 
 \hypersetup{%
@@ -100,7 +100,8 @@ limitations are described below and will be addressed in a future
 
 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.
+localisation. Thanks to Paul Thompson for the suggestion to
+parameterise the max authors setting.
 
 \section{Use}\label{ref:use}
 \label{use}
@@ -300,6 +301,12 @@ close to what you need from the APA examples and then looking in this file
 to see how it was implemented. Some general notes:
 \begin{itemize}
 \setlength{\itemsep}{0pt}
+\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.)
@@ -329,6 +336,12 @@ to see how it was implemented. Some general notes:
 
 \begin{changelog}
 
+\begin{release}{2.2}{2010-10-}
+\item Parameterised max author/editor list (thanks to Paul Thompson)
+\item Better rudimentary regression script
+\item Completely reconfigured EPRINT/EPRINTTYPE
+\end{release}
+
 \begin{release}{2.1}{2010-10-17}
 \item New Dutch localisation (thanks to Alexander van Loon)
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index c75b5faf5a3..d99360ea55d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -29,6 +29,14 @@
 
 \RequireBibliographyStyle{standard}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Allow variable max authors/editors limit
+
+\newcommand{\maxprtauth}{7}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.22) Force roman numerals into arabic
 %            using etoolbox macros
@@ -132,6 +140,23 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.09 Example 62) ERIC
+% eprint references
+
+\DeclareFieldFormat{eprint:eric}{%
+  \iffieldequalstr{userb}{urlisabstract}
+    {\printtext{\bibcpstring{abstract}}\addspace%
+     \printtext{\bibstring{retrieved}}}
+    {\printtext{\bibcpstring{retrieved}}}%
+     \setunit{\addspace}%
+     \printtext{\bibstring{from}}\addspace%
+     ERIC\addspace database\addspace%
+     \mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 6.12) Five author max before "et al" and a one author truncation
@@ -242,9 +267,9 @@
 % (APA 7.10 Example 67) Unknown names and dates
 
 \DeclareNameFormat{apaauthor}{%
-  \ifthenelse{\value{listcount}=7\AND\value{listcount}<\value{liststop}}
+  \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{liststop}}
     {\addcomma\addspace\ldots}
-    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
       {}
       {\ifthenelse{\iffieldequalstr{usere}{unkauth}\OR\iffieldequalstr{usere}{unkauthdate}}
         {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}}
@@ -269,7 +294,7 @@
 % (APA 6.27) Use blank for long lists
 
 \AtBeginBibliography{\renewcommand*{\finalnamedelim}{%
-    \ifthenelse{\value{listcount}>7}
+    \ifthenelse{\value{listcount}>\maxprtauth}
       {}
       {\ifthenelse{\ifcurrentname{author}\OR\boolean{bbx:editorinauthpos}}
          {\ifnum\value{liststop}>1 \finalandcomma\fi\addspace\&\space}
@@ -427,6 +452,7 @@
      \printfield{series}
      \setunit{\addcomma\space}}%
   \printfield{volume}%
+  \setunit{\addspace}%
   \printfield{number}%
   \setunit{\addspace}\newblock
   \usebibmacro{issuename}%
@@ -496,23 +522,23 @@
 % (APA 7.02 Example 27) ... unless there is no author
 
 \DeclareNameFormat{apatranslator}{%
-  \ifthenelse{\value{listcount}=7}
+  \ifthenelse{\value{listcount}=\maxprtauth}
     {\addcomma\addspace\ldots}
-    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
       {}
       {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}}
 
 \DeclareNameFormat{apaeditor}{%
-  \ifthenelse{\value{listcount}=7}
+  \ifthenelse{\value{listcount}=\maxprtauth}
     {\addcomma\addspace\ldots}
-    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
       {}
       {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}}}
 
 \DeclareNameFormat{editorinauthpos}{%
-  \ifthenelse{\value{listcount}=7}
+  \ifthenelse{\value{listcount}=\maxprtauth}
     {\addcomma\addspace\ldots}
-    {\ifthenelse{\value{listcount}>7\AND\value{listcount}<\value{liststop}}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{liststop}}
       {}
       {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}}}
 
@@ -815,29 +841,10 @@
 % (APA 7.02 Example 40--44) Theses titles and volume
 %                           Titles are not emph if only an abstract
 
-\DeclareFieldFormat[thesis]{title}{\iffieldequalstr{userb}{isabstract}{#1}{\mkbibemph{#1}}}
-\DeclareFieldFormat[thesis]{volume}{\mkbibemph{\apanum{#1}}\addspace}
-\DeclareFieldFormat[thesis]{number}{\mkbibparens{\apanum{#1}}\addspace}
-\DeclareFieldFormat[thesis]{eprinttype}{\mkbibemph{#1}\addspace}
-\DeclareFieldFormat[thesis]{eprint}{#1}
-\DeclareFieldFormat[thesis]{pages}{#1}
-
-\newbibmacro*{thesis:retrinfo}{%
-  \printfield{eprinttype}%
-  \clearfield{eprinttype}%
-  \setunit{\addcomma\addspace}%
-  \printfield{volume}%
-  \setunit{\addspace}%
-  \printfield{number}%
-  \setunit{\addcomma\addspace}%
-  \printfield{eprint}%
-  \clearfield{eprint}%
-  \setunit{\addcomma\addspace}%
-  \printfield{pages}%
-  \setunit{\relax}}
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
 
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % (APA 7.05) Unpublished theses
@@ -1004,8 +1011,6 @@
 
 \DeclareFieldFormat{url}{\url{#1}}
 \DeclareFieldFormat{urldate}{#1}
-\DeclareFieldFormat{eprinttype}{#1}
-\DeclareFieldFormat{eprint}{\mkbibparens{#1}}
 
 \renewbibmacro*{url+urldate}{%
      \def\@apaar{retrieved}% default
@@ -1027,21 +1032,6 @@
         \setunit*{\addcolon\addspace}%
         \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
 
-\renewbibmacro*{eprint}{%
-     \def\@apaar{retrieved}% default
-     \iffieldundef{eprint}
-       {}
-       {\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
-         \iffieldequalstr{userb}{urlisabstract}
-         {\printtext{\bibcpstring{abstract}}\addspace%
-           \printtext{\bibstring{\@apaar}}}
-         {\printtext{\bibcpstring{\@apaar}}}%
-        \setunit{\addspace}%
-        \printtext{\bibstring{from}}%
-        \setunit*{\addspace}%
-        \printfield{eprinttype}%
-        \newunit
-        \printfield{eprint}}}
 
 %
 %%%%%%%%%%%%%%%%%
@@ -1407,8 +1397,6 @@
   \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
   \usebibmacro{type+institution}%
   \newunit\newblock
-  \usebibmacro{thesis:retrinfo}
-  \newunit\newblock
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{doi+eprint+url}%