biblatex-apa (20oct13)

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

6 files changed, 57 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index d84c59b9041..ba480b5c10a 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.1
+Version 6.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-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index e4d5f6ae1e7..6cecdfa7847 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
@@ -239,7 +239,7 @@
   YEAR           = {2007},
 }
 
-% PUBSTATE is not used as there is a year
+% PUBSTATE is not used as there is a year - enforces by a style source map in .bbx
 @BOOK{6.16p,
   AUTHOR         = {Steven Smidge},
   TITLE          = {Something 1},
@@ -475,7 +475,6 @@
   OPTIONS     = {useprefix=false},
   AUTHOR      = {von Greaves, Jr., Percy L.},
   TITLE       = {A test of noprefix 2},
-  TITLE       = {Another Title},
   YEAR        = {2001}
 }
 
@@ -483,6 +482,18 @@
 @BOOK{presufftest2,
   AUTHOR      = {von Greaves, Jr., Percy L.},
   TITLE       = {A test of noprefix 2},
-  TITLE       = {Another Title},
   YEAR        = {2001}
 }
+
+% Oxford comma tests
+@BOOK{oc1,
+  AUTHOR      = {Hilarious, Hillary and Mirthful, Malcolm and Chuckles, Charles},
+  TITLE       = {Laughter Through the Ages},
+  YEAR        = {1987}
+}
+
+@BOOK{oc2,
+  AUTHOR      = {Miserable, Markus and Doleful, Derek and Bitter, Brian},
+  TITLE       = {Dictionary of Depressions},
+  YEAR        = {1987}
+}
\ 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 ca2dfe75d4b..2fbcb962bc3 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 a5f6a309294..2827c69411d 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
@@ -110,6 +110,11 @@ demonstrated.
 \noindent Please see accompanying file |biblatex-apa-test-citations.bib|
 for the bibliographic entries which these examples use.
 
+\noindent\apa{4.03}\\
+Oxford comma in citations for three or more names:\\
+\apaex{\textcite{oc1}}\\
+\apaex{\parencite{oc2}}
+
 \noindent\apa{6.11}\\
 Simple cite. «Jr.» suffix is not shown (bib entry for this example has a suffix):\\
 \apaex{\textcite{6.11}}
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 8cd85f5ff86..6ee9941e10f 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 02e399375e9..02e1e466da5 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.1},
+  revision={6.2},
   date={\today}}
 
 \hypersetup{%
@@ -159,7 +159,8 @@ localisation. Thanks to Braulio José Solano Rojas for the Spanish
 localisation. Thanks to Stefan Mayer for the |subtitlepunct| suggestion.
 Thanks to Håkon Malmedal for the Norwegian localisation. Thanks to
 Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström
-for the Swedish localisation.
+for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch
+localisation.
 
 \section{Use}\label{ref:use}
 \label{use}
@@ -174,7 +175,8 @@ example), you can download it from CTAN and then, put the \path{.cbx},
 \path{<texmf>/tex/latex/biblatex/bbx/apa.bbx}\\
 \path{<texmf>/tex/latex/biblatex/lbx/<language>-apa.lbx}\\
 
-\noindent Specify the style in the usual way when loading Bib\LaTeX. 
+\noindent Specify the style in the usual way when loading Bib\LaTeX. If you
+are using \sty{babel}:
 
 \begin{ltxcode}
 \usepackage[american]{babel}
@@ -183,6 +185,16 @@ example), you can download it from CTAN and then, put the \path{.cbx},
 \DeclareLanguageMapping{american}{american-apa}
 \end{ltxcode}
 
+or \sty{polyglossia}:
+
+\begin{ltxcode}
+\usepackage{polyglossia}
+\setdefaultlanguage[variant=american]{english}
+\usepackage{csquotes}
+\usepackage[style=apa]{biblatex}
+\DeclareLanguageMapping{english}{english-apa}
+\end{ltxcode}
+
 \noindent Note that the APA manual requires the forcing of titles into
 «sentence case», that is, initial cap followed by lower case for sentence
 units, with the exception of names and material from languages which do not
@@ -224,14 +236,26 @@ Localisation is provided for APA-specific strings in the accompanying
 |.lbx| files. To use these files, put an appropriate mapping in your
 document preamble, after loading Bib\LaTeX.
 
-Normal use will invoke babel with the «american» babel language. After
-loading babel and biblatex, put this in the preamble (see full preamble
-example in section \ref{ref:use} above):
+Normal use will invoke \sty{babel} with the «american» language or
+\sty{polyglossia} with «american» variant of «english». After
+loading \sty{babel}/\sty{polyglossia} and biblatex, put this in the
+preamble if you are using \sty{babel} (see full preamble example in section
+\ref{ref:use} above):
 
 \begin{ltxcode}
 \DeclareLanguageMapping{american}{american-apa}
 \end{ltxcode}
 
+or for \sty{polyglossia} (since there is no language «american» in
+\sty{polyglossia}---it's just an «english» variant:
+
+\begin{ltxcode}
+\DeclareLanguageMapping{english}{english-apa}
+\end{ltxcode}
+
+The \file{english-apa.lbx} is a copy of the \file{american-apa.lbx} since
+the default is «American» English.
+
 The APA manual does not mention nor sanction any non «American» English
 strings but it is quite common for non-English journals to ask for APA style
 bibliographies and so this must be supported.
@@ -246,7 +270,7 @@ option:
 
 This loads the |german-apa.lbx| file which in turn, loads the |german.lbx|
 file and augments it with APA-specific strings. If you are not using the
-babel «american» option, they you may need to set up the
+\sty{babel} «american» option, they you may need to set up the
 |\DeclareQuotePunctuation| option as mentioned in section \ref{ref:req} above.
 You would only need to do this if, for some strange reason, a non-american
 journal required the (rather horrible) american practice of moving final
@@ -401,6 +425,12 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
 
 \begin{changelog}
 
+\begin{release}{6.2}{2013-10-19}
+\item Corrected Dutch translations
+\item Fixed Norwegian lbx corruption
+\item Misc bugfixes
+\end{release}
+
 \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