biblatex-apa

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

25 files changed, 49 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index cbc78415119..130ff38920f 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.3
+Version 6.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-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index 4f6f0c8b3af..12a7e671ca9 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
@@ -510,4 +510,18 @@
   AUTHOR      = {Miserable, Markus and Doleful, Derek and Bitter, Brian},
   TITLE       = {Dictionary of Depressions},
   YEAR        = {1987}
+}
+
+% Test "and others"
+@Article{ao,
+  AUTHOR         = {Boker, S. and Neale, M. and Maes, H. and Wilde, M. and
+                   Spiegel, M. and Brick, T. and Spies, J. and Estabrook,
+                   R. and Kenny, S. and Bates, T. and others},
+  TITLE          = {Open{M}x: {A}n open source extended structural
+                   equation modeling framework},
+  JOURNAL        = {Psychometrika},
+  VOLUME         = {76},
+  NUMBER         = {2},
+  PAGES          = {306--317},
+  YEAR           = 2011
 }
\ No newline at end of file
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 b7dd5117766..ed6b08e949a 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 275d597abc1..83a61cb8bbb 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
@@ -401,6 +401,10 @@ these appear in references\\
 \apaex{\textcite{presufftest2}}\\
 \apaex{\textcite{nopresufftest}}
 
+% Testing "and others"
+\noindent Testing «and others»
+\apaex{\textcite{ao}}
+
 \end{refsection}
 \begin{refsection}[biblatex-apa-test-references]
 \nocite{*}
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 db82137f416..4cb3b7b1cf6 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 9b9adf52b3a..3aacfc4ca87 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -425,6 +425,11 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
 
 \begin{changelog}
 
+\begin{release}{6.4}{2013-10-30}
+\item Fixed explicit «and others» problem
+\item Improved french localisation
+\end{release}
+
 \begin{release}{6.3}{2013-10-28}
 \item Fixed issue where |SHORTAUTHOR| was only being used for exact same citations.
 \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 214095b462f..a91945330c0 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/10/27\space v6.3\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2013/10/30\space v6.4\space APA biblatex references style]
 \RequireBiber[3]
 \RequireBibliographyStyle{standard}
 \urlstyle{rm} % APA examples all have URLs in same font as text
@@ -366,7 +366,8 @@
       {\iffieldequalstr{doubtfulauthor}{true}
         {\mkbibbrackets{\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}?}}
         {\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}}}}%
-  \ifmorenames{\andothersdelim\bibstring{andothers}}{}}
+    \ifthenelse{\value{listcount}=\value{listtotal}}%
+      {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}}
 
 \renewbibmacro*{author}{%
   \ifnameundef{author}
@@ -634,7 +635,8 @@
     {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
       {}
       {\usebibmacro{name:apa:first-last}{#1}{#3}{#4}{#5}{#7}}}%
-  \ifmorenames{\andothersdelim\bibstring{andothers}}{}}
+    \ifthenelse{\value{listcount}=\value{listtotal}}%
+      {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}}
 
 \renewbibmacro*{author/editor}{%
   \ifnameundef{author}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 7976d67deb5..c1d1c3893ff 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/10/27\space v6.3\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2013/10/30\space v6.4\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 4c4512ff285..1fa894c003a 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/10/27\space v6.3\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2013/10/30\space v6.4\space APA biblatex style data model]
 \RequireBiber[3]
 
 \DeclareDatamodelEntrytypes{
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index f91f5bb28a3..857f14d4f0f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2013/10/30\space v6.4\space APA biblatex localisation]
 \InheritBibliographyExtras{austrian}
 
 % (APA 6.22) The example abbreviations
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 48abce49679..a077db3dbe1 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2013/10/30\space v6.4\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 6e6b0d8c4ac..ae8a30abf8e 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2013/10/30\space v6.4\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 15f195c7b38..1ceee7af0b6 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2013/10/30\space v6.4\space APA biblatex localisation]
 \InheritBibliographyExtras{dutch}
 
 % (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index 621ebed496b..ff392aa9ba4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2013/10/30\space v6.4\space APA biblatex localisation]
 \InheritBibliographyExtras{american}
 
 % (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 c55f1f438de..430d8a94597 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2013/10/30\space v6.4\space APA biblatex localisation]
 \InheritBibliographyExtras{french}
 
 % (APA 6.22) The example abbreviations
@@ -42,7 +42,7 @@
   december         = {{d\'ecembre}{d\'ecembre}},
   revisededition   = {{\'Edition\space R\'evis\'e}{\'Ed\adddot\space R\'ev\adddot}},
   page             = {{Page}{{}p\adddot}},
-  pages            = {{Pages}{{}pp\adddot}},
+  pages            = {{Pages}{{}p\adddot}},
   on               = {{le}{le}},
   retrieved        = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}},
   with             = {{avec}{avec}},
@@ -55,7 +55,7 @@
   archivedat       = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
   reviewof         = {{critique\space de}{critique\space de}},
   paragraph        = {{\P}{\P}},
-  paragraphs       = {{\P\P}{\P\P}},
+  paragraphs       = {{\P}{\P}},
   origyear         = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}},
   typechair        = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}},
   typechairs       = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}},
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 033747ad685..a10e17a478d 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2013/10/30\space v6.4\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 5a8e524edf7..98716c3ea03 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2013/10/30\space v6.4\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 2036506afc5..a96e8bc50a4 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2013/10/30\space v6.4\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 5b9f0c4dd07..e1a0b43f896 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2013/10/30\space v6.4\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 4853e6b5030..2cfa2acfd64 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2013/10/30\space v6.4\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 655d713474b..33d81eeaebc 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2013/10/30\space v6.4\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 b7fdd071742..27d8665f0ea 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2013/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2013/10/30\space v6.4\space APA biblatex localisation]
 \InheritBibliographyExtras{norwegian}
 
 % (APA 6.22) The example abbreviations
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 0157bb602d5..3d9db73055f 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2013/10/30\space v6.4\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 fd9d4025c22..e4ab7d1a714 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2013/10/30\space v6.4\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 e21526a9cd7..f56a2353545 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/10/27\space v6.3\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2013/10/30\space v6.4\space APA biblatex localisation]
 \InheritBibliographyExtras{swedish}
 
 % (APA 6.22) The example abbreviations