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.bbx59
1 files changed, 42 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index e3364b4a476..09b1843825a 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}[2018/03/05\space v7.6\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2018/04/02\space v7.7\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -675,8 +675,7 @@
\setunit*{\addcomma\addspace}%
\printfield{pages}%
\setunit{}%
- \printtext{\bibcloseparen}%
- \newunit}}
+ \printtext{\bibcloseparen}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1099,7 +1098,7 @@
\ifnameundef{producer}
{}
{\printnames[apaauthor][-\value{listtotal}]{producer}%
- \newunit
+ \addspace
\printtext[parens]{\bibcpstring{producer}}%
\setunit*{\addcomma\addspace\&\addspace}}}
@@ -1107,7 +1106,7 @@
\ifnameundef{director}
{}
{\printnames[apaauthor][-\value{listtotal}]{director}%
- \newunit
+ \addspace
\printtext[parens]{\bibcpstring{director}}%
\setunit*{\addcomma\addspace\&\addspace}}}
@@ -1115,7 +1114,7 @@
\ifnameundef{writer}
{}
{\printnames[apaauthor][-\value{listtotal}]{writer}%
- \newunit
+ \addspace
\printtext[parens]{\bibcpstring{writer}}%
\setunit*{\addcomma\addspace\&\addspace}}}
@@ -1215,7 +1214,9 @@
{\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
{}
{\printtext{\bibcpstring{abstract}}\addspace}%
- \printtext{\bibstring{retrieved}}%
+ \iffieldequalstr{entrysubtype}{{DVD}}
+ {\printtext{\bibstring{available}}}
+ {\printtext{\bibstring{retrieved}}}%
\setunit{\addspace}%
\iffieldundef{urlyear}
{}
@@ -1301,7 +1302,14 @@
\printfield{pages}%
\setunit{\addcomma\addspace}%
\bibstring{byauthor}\addspace
- \printnames[apanames][-\value{listtotal}]{editor}%
+ \ifnameundef{editor}
+ {}
+ {\printnames[apanames][-\value{listtotal}]{editor}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{apaeditorstrg}{editor}%
+ \setunit{\addcomma\addspace}%
+ \printlabeldateextra
+ \setunit{\addcomma\addspace}}%
\printnames[apanames][-\value{listtotal}]{author}%
\setunit{\addcomma\addspace}%
\usebibmacro{location+publisher}%
@@ -1588,7 +1596,10 @@
\printfield[apacase]{eventtitle}%
\newunit
\printfield{venue}%
- \newunit\newblock
+ \iffieldundef{pages}
+ {\setunit{\addcomma\addspace}}
+ {\newunit}%
+ \newblock
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{origyear}%
@@ -1822,6 +1833,8 @@
\newunit\newblock
\printlist{organization}%
\newunit\newblock
+ \printlist{institution}%
+ \setunit*{\addcomma\addspace}%
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
@@ -2052,9 +2065,12 @@
\usebibmacro{title}%
\newunit\newblock
\printfield{howpublished}%
- \setunit{\addcomma\addspace}\newblock
+ \iflistundef{institution}
+ {\newunit}
+ {\setunit{\addcomma\addspace}}%
+ \newblock
\printlist{institution}%
- \newunit\newblock
+ \setunit*{\addcomma\addspace}\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock
\printlist{location}%
@@ -2139,16 +2155,25 @@
{\href{https://dx.doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}}
-% APA 6th
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02) No LOCATION/PUBLISHER if there is a DOI
+% (Inconsistent in 2nd printing, see 7.04:39 which
+% is incorrect in 2nd printing)
+
\newbibmacro*{location+publisher}{%
- \printlist[default][1-1]{location}%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- \newunit}
+ \iffieldundef{doi}
+ {\printlist[default][1-1]{location}%
+ \setunit*{\addcolon\space}%
+ \printlist{publisher}%
+ \newunit}
+ {}}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\newbibmacro*{type+institution}{%
\setunit{\addspace}%
- \ifthenelse{\iffieldundef{type}\AND\iffieldundef{institution}}
+ \ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} }
{}
{\printtext[parens]{%
\iflistundef{institution}