summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx43
1 files changed, 23 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 64f9333f3f7..6ae6d0d0b07 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -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