summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-03 03:02:51 +0000
committerNorbert Preining <norbert@preining.info>2020-05-03 03:02:51 +0000
commitd78de17ddf0443233483fd98f40802cae5aa87c5 (patch)
tree1b7128cc505808a09c18e158288d6c3cdcf5c2fb /macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
parent8626a9c3cb5dc8d02d779d5b5b1e3933d5626f43 (diff)
CTAN sync 202005030302
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx73
1 files changed, 49 insertions, 24 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
index 27f12f59b1..8997133548 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx
@@ -12,10 +12,10 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2020/04/26\space v9.10\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2020/05/02\space v9.11\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
-\urlstyle{rm} % APA examples all have URLs in same font as text
+\urlstyle{same} % APA examples all have URLs in same font as text
% Declare the language mapping suffix
\DeclareLanguageMappingSuffix{-apa}
@@ -288,6 +288,7 @@
\DeclareLabeldate{%
\field{pubstate}
\field{date}
+ \field{eventdate}
\field{year}%legacy - no ISO8601 support
\literal{nodate}
}
@@ -391,6 +392,7 @@
\DeclareFieldFormat*{title}{\mkbibemph{#1}\isdot}
\DeclareFieldFormat[article,inbook,incollection,periodical,misc,legislation,legadminmaterial,jurisdiction,inproceedings,legal]{title}{#1\isdot}
\DeclareFieldFormat[audio,video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
+\DeclareFieldFormat[presentation]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}}{#1}\isdot}
% SUBTITLE
\DeclareFieldFormat[legmaterial]{subtitle}{\mkbibemph{#1}}
@@ -414,8 +416,7 @@
% ORIGTITLE
\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot}
-
-\DeclareFieldFormat[article,inbook,incollection,inproceedings,proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[article,inbook,incollection,inproceedings,proceedings,presentation]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
% VOLUME
\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
@@ -719,7 +720,7 @@
\setunit{\subtitlepunct}%
\printfield[apacase]{subtitle}}}%
\setunit{\addspace}%
- \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \ifthenelse{\ifentrytype{inbook}\OR\ifentrytype{inproceedings}}{}{\usebibmacro{addinfo1}}% additional info in parens
\setunit{\addspace}%
\printfield{titleaddon}%
\setunit{\addspace}%
@@ -779,17 +780,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 10.1 Example 6) eprints (eLocator)
-\renewbibmacro*{eprint}{%
- \iftoggle{bbx:eprint}
- {\iffieldundef{eprinttype}
- {}
- {\iffieldbibstring{eprinttype}
- {\bibcplstring{\strfield{eprinttype}}}
- {\strfield{eprinttype}}%
- \setunit{\addspace}}%
- \printfield{eprint}}
- {}}
-
+\DeclareFieldFormat[article]{eid}{\bibcpstring{jourarticle}~#1}
\DeclareFieldFormat{eprint}{#1}
%
@@ -804,8 +795,8 @@
\setunit*{\addcomma\addspace}%
\printfield{volume}%
\printfield{number}%
- \setunit*{\addcomma\addspace}%
- \usebibmacro{eprint}%
+ \setunit{\addcomma\addspace}%
+ \printfield{eid}%
\newunit\newblock
\usebibmacro{issuename}%
\newunit}
@@ -1634,18 +1625,17 @@
\usebibmacro{title}%
\setunit{\addspace}\newblock
\usebibmacro{apa:related}%
- \newunit\newblock
- \usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
\usebibmacro{maintitle+booktitle}%
\newunit\newblock
\usebibmacro{eventinfo}%
\newunit\newblock
\printlist{organization}%
- \iffieldundef{pages}
- {\setunit{\addcomma\addspace}}
- {\newunit}%
- \newblock
+ \newunit
+ \usebibmacro{location+publisher}%
+ \newunit\newblock
+ \printfield{pages}%
+ \newunit\newblock
\usebibmacro{origyear}%
\newunit\newblock
\usebibmacro{doi+url}%
@@ -1861,6 +1851,41 @@
\usebibmacro{annotation}%
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{presentation}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{apa:related}%
+ \newunit\newblock
+ \usebibmacro{editor+trans}%
+ \setunit*{\addcomma\addspace}\newblock
+ \usebibmacro{maintitle+booktitle}%
+ \newunit\newblock
+ \usebibmacro{eventinfo}%
+ \newunit\newblock
+ \printlist{organization}%
+ \newunit
+ \usebibmacro{location+publisher}%
+ \newunit\newblock
+ \printfield{pages}%
+ \newunit\newblock
+ \usebibmacro{origyear}%
+ \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{pageref}%
+ \usebibmacro{annotation}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{proceedings}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%