texlive[45766] Master/texmf-dist: biblatex-apa
commits+karl at tug.org
commits+karl at tug.org
Sun Nov 12 23:33:49 CET 2017
Revision: 45766
http://tug.org/svn/texlive?view=revision&revision=45766
Author: karl
Date: 2017-11-12 23:33:48 +0100 (Sun, 12 Nov 2017)
Log Message:
-----------
biblatex-apa
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2017-11-12 22:33:48 UTC (rev 45766)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2017-11-12 22:33:48 UTC (rev 45766)
@@ -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 @@
\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 @@
\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 @@
% targets can be checked
\printbibliography[section=1,title=Misc citation references]
\end{document}
+
+% Local Variables:
+% TeX-engine: luatex
+% End:
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2017-11-12 22:33:48 UTC (rev 45766)
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip at kime.org.uk},
- revision={7.4},
+ revision={7.5},
date={\today}}
\hypersetup{%
@@ -44,6 +44,9 @@
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 @@
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 @@
\usepackage[american]{babel}
\usepackage{csquotes}
\usepackage[style=apa]{biblatex}
-\DeclareLanguageMapping{american}{american-apa}
\end{ltxcode}
or \sty{polyglossia}:
@@ -212,7 +215,6 @@
\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,26 +261,11 @@
\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):
+\sty{polyglossia} with «american» variant of «english».
-\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.
@@ -286,22 +273,12 @@
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:
+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.
-\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.
-
\subsubsection{Date formats}
Obviously, an American style uses month/day/year formats. European formats
@@ -424,6 +401,32 @@
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 @@
\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}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{american}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -12,11 +12,14 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2017/01/06\space v7.4\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2017/11/05\space v7.5\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
+% Declare the language mapping suffix
+\DeclareLanguageMappingSuffix{-apa}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Automated capitalisation after colons
% (http://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html)
@@ -41,7 +44,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Used to join citations/references to
-% extrayear
+% extradate
\newcommand{\apashortdash}{-}
@@ -191,7 +194,7 @@
% (APA 6.25) Sorting is nyt but we need to account for PUBSTATE which comes
% after all normal cites for the same author
-\DeclareSortingScheme{apa}{
+\DeclareSortingTemplate{apa}{
\sort{
\field{presort}
}
@@ -423,7 +426,7 @@
{\namepartprefix}%
{\namepartsuffix}}}}%
\ifthenelse{\value{listcount}=\value{listtotal}}%
- {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}}
+ {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
\renewbibmacro*{author}{%
\ifnameundef{author}
@@ -437,7 +440,7 @@
\printnames[apaauthor][-\value{listtotal}]{with}}
\setunit*{\addspace}}}%
\newunit\newblock%
- \usebibmacro{labelyear+extrayear}}
+ \usebibmacro{labelyear+extradate}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -449,12 +452,12 @@
% (APA 6.27) Use blank for long lists
% (APA 4.03) Serial comma for lists of three or more
-\AtBeginBibliography{\renewcommand*{\finalnamedelim}{%
- \ifthenelse{\value{listcount}>\maxprtauth}
- {}
- {\ifthenelse{\value{liststop}>2}
- {\finalandcomma\addspace\&\space}
- {\addspace\&\space}}}}
+\DeclareDelimFormat[bib]{finalnamedelim}{%
+ \ifthenelse{\value{listcount}>\maxprtauth}
+ {}
+ {\ifthenelse{\value{liststop}>2}
+ {\finalandcomma\addspace\&\space}
+ {\addspace\&\space}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -477,7 +480,7 @@
\iffieldundef{endmonth}{}{/\printfield{endmonth}}}}
{\addcomma\space\printfield{issue}}}
-\newbibmacro*{labelyear+extrayear}{%
+\newbibmacro*{labelyear+extradate}{%
\iffieldundef{labelyear}
{\iffieldundef{origyear}
{}
@@ -580,7 +583,7 @@
\ifnameundef{director}\AND%
\ifnameundef{writer}}
{\newunit\newblock
- \usebibmacro{labelyear+extrayear}}
+ \usebibmacro{labelyear+extradate}}
{}}}
\renewbibmacro*{maintitle}{%
@@ -698,7 +701,7 @@
{\namepartprefix}%
{\namepartsuffix}}}%
\ifthenelse{\value{listcount}=\value{listtotal}}%
- {\ifmorenames{\andothersdelim\bibstring{andothers}}{}}{}}
+ {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
\renewbibmacro*{author/editor}{%
\ifnameundef{author}
@@ -721,7 +724,7 @@
% various year placement tests
\clearname{editor}%
\setunit{\adddot\addspace}%
- \usebibmacro{labelyear+extrayear}%
+ \usebibmacro{labelyear+extradate}%
\setunit{\adddot\addspace}}}
%
@@ -1212,7 +1215,7 @@
\printfield{urldescription}%
\setunit*{\addcolon\addspace}%
\iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
- \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}
+ \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}%
\iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
%
@@ -1774,7 +1777,7 @@
\usebibmacro{related}}
{}%
\newunit\newblock
- \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extrayear}}{}%
+ \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
\newunit\newblock
\usebibmacro{journal+issuetitle}%
\newunit\newblock
@@ -1912,7 +1915,7 @@
\usebibmacro{director}%
\usebibmacro{producer}%
\newunit\newblock
- \usebibmacro{labelyear+extrayear}%
+ \usebibmacro{labelyear+extradate}%
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
@@ -1941,7 +1944,7 @@
\usebibmacro{director}%
\usebibmacro{producer}%
\newunit\newblock
- \usebibmacro{labelyear+extrayear}%
+ \usebibmacro{labelyear+extradate}%
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
@@ -1970,7 +1973,7 @@
\usebibmacro{director}%
\usebibmacro{producer}%
\newunit\newblock
- \usebibmacro{labelyear+extrayear}%
+ \usebibmacro{labelyear+extradate}%
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2017/01/06\space v7.4\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2017/11/05\space v7.5\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19,7 +19,7 @@
% (APA 6.16) labelyear postfix is not emphasised or italic
% Dashes between labelyear and non-numeric year (or pseudo-year)
-\DeclareFieldFormat{extrayear}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
+\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -27,7 +27,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.11) requires comma separator between authors and years
-\renewcommand*{\nameyeardelim}{\addcomma\space}
+\DeclareDelimFormat{nameyeardelim}{\addcomma\space}
+\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36,7 +37,7 @@
% (APA 6.12) No comma before "et al" if there is only one name
% preceding it
-\renewcommand*{\andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace}
+\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -44,9 +45,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.12) ampersand separator in parenthetical cites
+\DeclareDelimFormat[parencite]{finalnamedelim}
+ {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
\DeclareCiteCommand{\parencite}[\mkbibparens]
- {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
- \usebibmacro{cite:init}%
+ {\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{cite}}
@@ -55,8 +58,7 @@
\usebibmacro{cite:post}}
\DeclareCiteCommand*{\parencite}[\mkbibparens]
- {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
- \usebibmacro{cite:init}%
+ {\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\usebibmacro{citeyear}}
@@ -147,7 +149,7 @@
% least one more element after the current potential truncation point
% so that "et al" covers at least two elements.
{\ifnumcomp{\value{listcount}}{<}{\value{listtotal}}
- {\andothersdelim\bibstring{andothers}}
+ {\printdelim{andothersdelim}\bibstring{andothers}}
{\usebibmacro{labelname:doname}%
{\namepartfamily}%
{\namepartfamilyi}%
@@ -214,7 +216,7 @@
% (APA 6.13) Deal with SHORTAUTHOR fields
% (APA 6.16) Multiple same author cites in a compact citation call do not
% need to be repeated but the full years must be repeated with
-% their extrayear postfixes
+% their extradate postfixes
% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
% (APA 6.28) ISSUE after year when available
\def\citeresetapa{\global\let\cbx at apa@names\@empty}
@@ -228,7 +230,7 @@
\iffieldequals{fullhash}{\cbx at lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}%
+ \usebibmacro{cite:plabelyear+extradate}}%
% Single cite
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
% No author/editor
@@ -256,13 +258,13 @@
\iffieldequals{fullhash}{\cbx at lasthash}
% Multiple cites in one command
{\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}%
+ \usebibmacro{cite:plabelyear+extradate}}%
% Single cite
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
% No author/editor
{\usebibmacro{cite:noname}%
- \setunit{\nameyeardelim}%
- \usebibmacro{cite:plabelyear+extrayear}%
+ \setunit{\printdelim{nameyeardelim}}%
+ \usebibmacro{cite:plabelyear+extradate}%
\savefield{fullhash}{\cbx at lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
@@ -270,8 +272,8 @@
{\cbx at apa@ifnamesaved
{\printnames{shortauthor}}
{\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
- \setunit{\nameyeardelim}%
- \usebibmacro{cite:plabelyear+extrayear}%
+ \setunit{\printdelim{nameyeardelim}}%
+ \usebibmacro{cite:plabelyear+extradate}%
\savefield{fullhash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
@@ -279,7 +281,7 @@
\iffieldequals{fullhash}{\cbx at lasthash}
% Compact cite - more than one thing for same author
{\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}
+ \usebibmacro{cite:plabelyear+extradate}}
% New cite
{%
\ifbool{cbx:parens}
@@ -292,9 +294,9 @@
% Cite using title
{\usebibmacro{cite:noname}%
\setunit{\ifbool{cbx:np}%
- {\nameyeardelim}%
+ {\printdelim{nameyeardelim}}%
{\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
- \usebibmacro{cite:plabelyear+extrayear}}
+ \usebibmacro{cite:plabelyear+extradate}}
% Cite using shorthand
{\usebibmacro{cite:shorthand}}}
% Normal cite with author/editor
@@ -308,7 +310,7 @@
{\printnames[labelname][-\value{listtotal}]{author}}}%
% Year
\setunit{\ifbool{cbx:np}
- {\nameyeardelim}
+ {\printdelim{nameyeardelim}}
{\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
% Put the shortauthor inside the year brackets if necessary
\ifnameundef{shortauthor}
@@ -315,13 +317,13 @@
{}
{\cbx at apa@ifnamesaved
{}
- {\printnames{shortauthor}\setunit{\nameyeardelim}}}%
+ {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}%
% Actual year printing
- \usebibmacro{cite:plabelyear+extrayear}%
+ \usebibmacro{cite:plabelyear+extradate}%
% Save name hash for checks later
\savefield{fullhash}{\cbx at lasthash}}}}
-\newbibmacro*{cite:plabelyear+extrayear}{%
+\newbibmacro*{cite:plabelyear+extradate}{%
\iffieldundef{labelyear}{}
{\printtext[bibhyperref]{%
\clearfield{labelmonth}% don't want months in citations
@@ -347,7 +349,7 @@
\ifciteseen
{\printfield{shorthand}}
{\printnames[labelname][-\value{listtotal}]{labelname}%
- \setunit{\nameyeardelim}%
+ \setunit{\printdelim{nameyeardelim}}%
\printfield{title}\space\printfield{shorthand}}}
%
@@ -374,11 +376,12 @@
% (APA 6.21) No parens round year for cites when the cite is in
% parentheses. Use new command \nptextcite for such cites.
+\DeclareDelimFormat[nptextcite]{finalnamedelim}
+ {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim}
\DeclareCiteCommand{\nptextcite}
- {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
- \usebibmacro{cite:init}%
+ {\usebibmacro{cite:init}%
\usebibmacro{prenote}}
{\usebibmacro{citeindex}%
\global\booltrue{cbx:np}%
@@ -387,7 +390,7 @@
{}
{\iffieldundef{postnote}
{}
- {\nameyeardelim
+ {\printdelim{nameyeardelim}%
\printfield{postnote}}%
\usebibmacro{cite:post}}
@@ -402,8 +405,8 @@
{\usebibmacro{cite:init}}
{\iffieldequals{fullhash}{\cbx at lasthash}
{\setunit{\compcitedelim}%
- \usebibmacro{cite:plabelyear+extrayear}}
- {\usebibmacro{cite:plabelyear+extrayear}%
+ \usebibmacro{cite:plabelyear+extradate}}
+ {\usebibmacro{cite:plabelyear+extradate}%
\savefield{fullhash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
@@ -414,9 +417,12 @@
% Fullcite should use "&"
% Also need to reset the global booleans which are normally done at
% every bib item but since these aren't bib items, they are not reset
+
+\DeclareDelimFormat[fullcite,fullcitebib]{finalnamedelim}
+ {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
\DeclareCiteCommand{\fullcite}
- {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
- \usebibmacro{prenote}}
+ {\usebibmacro{prenote}}
{\usedriver
{\DeclareNameAlias{sortname}{default}%
\global\boolfalse{bbx:parens}%
@@ -431,8 +437,7 @@
\usebibmacro{cite:post}}
\DeclareCiteCommand{\fullcitebib}
- {\renewcommand{\finalnamedelim}{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}%
- \list{}
+ {\list{}
{\setlength{\leftmargin}{\bibhang}%
\setlength{\itemindent}{-\leftmargin}%
\setlength{\itemsep}{\bibitemsep}%
@@ -473,20 +478,20 @@
\newbibmacro*{cite:labelyear}{%
\printfield{labelyear}}
-\newbibmacro*{cite:extrayear}{%
- \printfield{extrayear}}
+\newbibmacro*{cite:extradate}{%
+ \printfield{extradate}}
-\newbibmacro*{cite:labelyear+extrayear}{%
+\newbibmacro*{cite:labelyear+extradate}{%
\iffieldundef{labelyear}
{}
{\printfield{labelyear}%
- \printfield{extrayear}}}
+ \printfield{extradate}}}
\DeclareCiteCommand{\citeyear}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}
- {\usebibmacro{cite:plabelyear+extrayear}}
+ {\usebibmacro{cite:plabelyear+extradate}}
{\multinamedelim}
{\usebibmacro{postnote}}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2017/01/06\space v7.4\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2017/11/05\space v7.5\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
% (APA 6.22) The example abbreviations
@@ -81,7 +81,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{british}
% (APA 6.22) The example abbreviations
@@ -87,7 +87,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
% (APA 6.22) The example abbreviations
@@ -101,7 +101,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\thefield{#1}\printfield{extrayear}}%
+ {\thefield{#1}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
% (APA 6.22) The example abbreviations
@@ -87,7 +87,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{english}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{french}
% (APA 6.22) The example abbreviations
@@ -82,7 +82,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
% (APA 6.22) The example abbreviations
@@ -105,7 +105,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
% (APA 6.22) The example abbreviations
@@ -87,7 +87,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
% (APA 6.22) The example abbreviations
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
% (APA 6.22) The example abbreviations
@@ -79,7 +79,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -0,0 +1,132 @@
+\ProvidesFile{russian-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
+\InheritBibliographyExtras{russian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+ inherit = {russian},
+ revisededition = {{исправленное издание}{испр\adddotspace изд\adddot}},
+ on = {{на}{на}},
+ retrieved = {{получено}{получено}},
+ available = {{доступно}{доступно}},
+ from = {{c}{c}},
+ archivedat = {{в архиве\space на}{в архиве\space на}},
+ with = {{с}{с}},
+ paragraph = {{абзац}{абз\adddot}},
+ paragraphs = {{абзацы}{абз\adddot}},
+ producer = {{продюсер}{продюсер}},
+ execproducer = {{исполнительный продюсер}{исполнительный продюсер}},
+ director = {{режиссер}{режиссер}},
+ writer = {{сценарист}{сценарист}},
+ origyear = {{оригинальная\space работа\space опубликована}{ориг\adddotspace работа\space опубл\adddot}},
+ typechair = {{Председатель}{Председатель}},
+ typechairs = {{Председатели}{Председатели}},
+ typevolume = {{Редактор\space тома}{Ред\adddotspace т\adddot}},
+ typevolumes = {{Редакторы\space тома}{Ред\adddotspace т\adddot}},
+ typeseries = {{Редактор\space серии}{Ред\adddotspace сер\adddot}},
+ typeseriess = {{Редакторы\space серии}{Ред\adddotspace сер\adddot}},
+ typevolseries = {{Редактор\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
+ typevolseriess = {{Редакторы\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
+ annodomini = {{нашей\space эры}{н\adddotspace э\adddot}},
+ beforechrist = {{до\space нашей\space эры}{до н\adddotspace э\adddot}},
+}
+
+\protected\gdef\lbx at sl@mkbibmonth#1{%
+ \ifcase0#1\relax
+ #1\BibliographyWarning{Month out of range}%
+ \or\abx at bibmonth{datejanuary}%
+ \or\abx at bibmonth{datefebruary}%
+ \or\abx at bibmonth{datemarch}%
+ \or\abx at bibmonth{dateapril}%
+ \or\abx at bibmonth{datemay}%
+ \or\abx at bibmonth{datejune}%
+ \or\abx at bibmonth{datejuly}%
+ \or\abx at bibmonth{dateaugust}%
+ \or\abx at bibmonth{dateseptember}%
+ \or\abx at bibmonth{dateoctober}%
+ \or\abx at bibmonth{datenovember}%
+ \or\abx at bibmonth{datedecember}%
+ \else
+ #1\BibliographyWarning{Month out of range}%
+ \fi}%
+
+\DeclareBibliographyExtras{%
+ \def\urldatecomma{\addspace}%
+ %
+ \protected\def\mkbibdateapalong#1#2#3{%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#3}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#3}
+ {\iffieldundef{#1}
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
+ %
+ \protected\def\mkbibdateapalongextra#1#2#3{%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#3}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#3}
+ {\iffieldundef{#1}
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
+ %
+ \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \iffieldundef{#3}%
+ {}%
+ {\stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#3}%
+ {\mkbibmonth{\thefield{#2}}}%
+ {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
% (APA 6.22) The example abbreviations
@@ -122,7 +122,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -99,7 +99,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#2}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
% (APA 6.22) The example abbreviations
@@ -86,7 +86,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2017-11-12 22:33:34 UTC (rev 45765)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2017-11-12 22:33:48 UTC (rev 45766)
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2017/01/06\space v7.4\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2017/11/05\space v7.5\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
@@ -89,7 +89,7 @@
\protected\def\mkbibdateapalongextra#1#2#3{%
\iffieldundef{#1}%
{}%
- {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
\iffieldundef{#3}%
{}%
{\iffieldundef{#1}%
More information about the tex-live-commits
mailing list