biblatex-apa

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

5 files changed, 51 insertions, 41 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 054841a0737..b027df24ca1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,5 +1,3 @@
-Version 7.4
-
 Permission is granted to copy, distribute and/or modify this software under
 the terms of the LaTeX Project Public License, version
 1.3c (http://www.latex-project.org/lppl.txt). The current
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 f9e6b2d2019..19e588fc304 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 63689dfcdf6..6350f1ca2af 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
@@ -98,7 +98,6 @@
 \usepackage[colorlinks=true]{hyperref}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%% END PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareLanguageMapping{american}{american-apa}
 
 \begin{document}
 \section*{|biblatex-apa| style examples}
@@ -345,7 +344,7 @@ A patent citation uses the title but with no quotes\\
 
 \noindent Some tests of uniqueness and uniquelist
 
-\noindent Two works by same authors in same year are disambiguated by extrayear «a»
+\noindent Two works by same authors in same year are disambiguated by extradate «a»
 and «b» and are truncated after first cite because it is the same author
 list and therefore not ambiguous:\\
 \apaex{\textcite{UL1}}\\
@@ -398,7 +397,7 @@ these appear in references\\
 \apaex{\textcite{nopretest}}
 
 % presufftest2 and nopresufftest are the same name and so even though
-% useprefix=false nopresufftest, hashes are the same so there is an extrayear
+% useprefix=false nopresufftest, hashes are the same so there is an extradate
 \noindent Testing prefices plus suffices\\
 \apaex{\textcite{presufftest}}\\
 \apaex{\textcite{presufftest2}}\\
@@ -453,3 +452,7 @@ Second citation:\\
 % targets can be checked
 \printbibliography[section=1,title=Misc citation references]
 \end{document}
+
+% Local Variables:
+% TeX-engine: luatex
+% End:
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 ca037f28af8..ff40bd214bc 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 21c5d38123c..82c84b73295 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -24,7 +24,7 @@
   url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
   author={Philip Kime},
   email={Philip@kime.org.uk},
-  revision={7.4},
+  revision={7.5},
   date={\today}}
 
 \hypersetup{%
@@ -44,6 +44,9 @@ 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{7.5}
+This version requires |biblatex| $>=$3.8 and |biber| $>=$2.8.
+
 \minisec{7.1}
 This version requires |biblatex| $>=$3.6 and |biber| $>=$2.6.
 
@@ -180,7 +183,8 @@ Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström
 for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch
 localisation. Thanks to Tea Tušar and Bogdan Filipič for the Slovenian
 localisation. Thanks to Sebastian Ørsted for the Danish localisation.
-Thanks to Jürgen Spitzmüller for the DGPs localisation hints.
+Thanks to Jürgen Spitzmüller for the DGPs localisation hints. Thanks to
+Sergei Golovan for the Russian localisation.
 
 \section{Use}\label{ref:use}
 \label{use}
@@ -202,7 +206,6 @@ are using \sty{babel}:
 \usepackage[american]{babel}
 \usepackage{csquotes}
 \usepackage[style=apa]{biblatex}
-\DeclareLanguageMapping{american}{american-apa}
 \end{ltxcode}
 
 or \sty{polyglossia}:
@@ -212,7 +215,6 @@ or \sty{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
@@ -259,25 +261,10 @@ style anyway.
 \subsection{Localisation}
 
 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.
+|.lbx| files which are loaded automatically.
 
 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}
+\sty{polyglossia} with «american» variant of «english».
 
 The \file{english-apa.lbx} is a copy of the \file{american-apa.lbx} since
 the default is «American» English.
@@ -286,21 +273,11 @@ 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.
 
-Here is an example to load the German localisation strings. This assumes
-that you are using the \sty{babel} package with the appropriate language
-option:
-
-\begin{ltxcode}
-\DeclareLanguageMapping{german}{german-apa}
-\end{ltxcode}
-
-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
-\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
-punctuation marks inside closing quotes.
+If not using the \sty{babel} «american» option, it may be necessary 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 (unpleasant) american practice of moving
+final punctuation marks inside closing quotes.
 
 \subsubsection{Date formats}
 
@@ -424,6 +401,32 @@ general notes:
   they are given as roman numerals, as required by \apa{6.22}.
 \end{itemize}
 
+\subsubsection{Journal number for journals with per-issue pagination}
+As per APA 6th edition section 6.30 and 7.01, journals which paginate by
+issue need the volume number including in the reference section. Since
+there is no way to automatically determine when this is the case, use the
+|biber| sourcemap feature to implement this, removing the |NUMBER| field
+from journals known to implement continuous pagination across volumes. For
+example, with this in your preamble:
+
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+       \step[fieldsource=journaltitle,
+             match=\regexp{(?:journal\stitle\sone|journal\stitle\stwo)}]
+       \step[fieldset=number, null]
+    }
+  }
+}
+\end{lstlisting}
+%
+Simply include |NUMBER| fields for all journals and entries with
+|JOURNALTITLE| of «journal title one» or «journal title two» (which
+are known to paginate across all numbers of a volume) will have
+their |NUMBER| field dynamically removed at document compile time, as
+required.
+
 \subsubsection{Retrieval dates for online items}
 
 APA 6th edition section 6.32 says «Do not include retrieval dates unless
@@ -455,6 +458,12 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
 
 \begin{changelog}
 
+\begin{release}{7.5}{2017-11-05}
+\item Compat for bibaltex 3.8
+\item |\DeclareLanguageMapping| is now no longer necessary due to the new
+  |\DeclareLanguageMappingSuffix| macro.
+\end{release}
+
 \begin{release}{7.4}{2017-01-06}
 \item Minor bugfix release
 \end{release}