summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx41
1 files changed, 20 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
index 56248f28708..7c207ed44f3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa6.bbx}[2020/05/03\space v8.4\space APA 6th ed. biblatex references style]
+\ProvidesFile{apa6.bbx}[2020/08/28\space v8.5\space APA 6th ed. biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{same} % APA examples all have URLs in same font as text
@@ -409,9 +409,13 @@
\ifthenelse{\value{listcount}=\value{listtotal}}%
{\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+\DeclareDelimFormat[bib,biblist]{nameyeardelim}{\newunitpunct}
+\DeclareDelimAlias*[bib,biblist]{nonameyeardelim}{nameyeardelim}
+
\renewbibmacro*{author}{%
\ifnameundef{author}
- {\usebibmacro{labeltitle}}
+ {\usebibmacro{labeltitle}%
+ \setunit{\printdelim{nonameyeardelim}}}
{\printnames[apaauthor][-\value{listtotal}]{author}%
\setunit*{\addspace}%
\printfield{nameaddon}%
@@ -422,8 +426,9 @@
\bibstring{with}%
\setunit{\addspace}%
\printnames[apaauthor][-\value{listtotal}]{with}}%
- \setunit{\addspace}}}%
- \newunit\newblock%
+ \setunit{\addspace}}%
+ \setunit{\printdelim{nameyeardelim}}}%
+ \newblock
\usebibmacro{labelyear+extradate}}
%
@@ -566,7 +571,7 @@
\ifnameundef{producer}\AND%
\ifnameundef{director}\AND%
\ifnameundef{writer}}
- {\newunit\newblock
+ {\setunit{\printdelim{nonameyeardelim}}\newblock
\usebibmacro{labelyear+extradate}}
{}}}
@@ -702,9 +707,9 @@
% don't lose sight of the fact we once had an editor for
% various year placement tests
\clearname{editor}%
- \setunit{\adddot\addspace}%
+ \setunit{\printdelim{nameyeardelim}}%
\usebibmacro{labelyear+extradate}%
- \setunit{\adddot\addspace}}}
+ \newunit}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -871,7 +876,7 @@
\setunit{\addspace}%
\printfield{issuetitle}%
\notbool{bbx:editorinauthpos}
- {\newunit
+ {\setunit{\printdelim{nonameyeardelim}}%
\usebibmacro{labelyear+extradate}}
{}}
@@ -1040,14 +1045,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 7.06) Reviews
-% The title of the review depends on the entrytype of the thing reviewed
\newcommand*{\begrelateddelimreviewof}{\addspace}
-\DeclareFieldFormat[review]{title}{%
- \entrydata*{\thefield{related}}{%
- \printtext[title]{%
- \printtext[apacase]{%
- \thefield{savedtitle}}}}}
-
+\DeclareFieldFormat[review]{title}{#1}
\DeclareFieldFormat[review]{pages}{#1}
\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}}
@@ -1754,7 +1753,7 @@
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \newunit\newblock
+ \setunit{\printdelim{nonameyeardelim}}\newblock
\ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
\newunit\newblock
\usebibmacro{journal+issuetitle}%
@@ -1894,7 +1893,7 @@
\usebibmacro{writer}%
\usebibmacro{director}%
\usebibmacro{producer}%
- \newunit\newblock
+ \setunit{\printdelim{nameyeardelim}}\newblock
\usebibmacro{labelyear+extradate}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
@@ -1923,7 +1922,7 @@
\usebibmacro{writer}%
\usebibmacro{director}%
\usebibmacro{producer}%
- \newunit\newblock
+ \setunit{\printdelim{nameyeardelim}}\newblock
\usebibmacro{labelyear+extradate}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
@@ -1952,7 +1951,7 @@
\usebibmacro{writer}%
\usebibmacro{director}%
\usebibmacro{producer}%
- \newunit\newblock
+ \setunit{\printdelim{nameyeardelim}}\newblock
\usebibmacro{labelyear+extradate}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
@@ -2125,8 +2124,8 @@
{}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\newbibmacro*{type+institution}{%
\setunit{\addspace}%
\ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} }