summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-23 21:21:40 +0000
committerKarl Berry <karl@freefriends.org>2019-11-23 21:21:40 +0000
commitb401c75df834df176d4d53d29c8fb1ec7e371951 (patch)
treef60d3bd46b22b5722f31d4e2f2c9c92f8470d72b /Master/texmf-dist/tex
parent42a95a7a7b4edd55b88f3c9fb7a1a64e6c498ba5 (diff)
biblatex-apa (23nov19)
git-svn-id: svn://tug.org/texlive/trunk@52900 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx112
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx1938
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx207
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx109
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx112
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx113
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx115
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx113
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx119
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx232
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx116
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx114
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx116
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx114
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx117
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx110
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx115
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx119
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx114
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx117
27 files changed, 3401 insertions, 1740 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index 7ea26032683..cb2a128c6df 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{american-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{american}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,78 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {american},
+ article = {{article}{article}},
+ painting = {{painting}{painting}},
+ present = {{present}{present}},
+ song = {{song}{song}},
+ album = {{album}{album}},
+ map = {{map}{map}},
+ photograph = {{photograph}{photograph}},
+ photographs = {{photographs}{photographs}},
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},
+ lecturenotes = {{lecturenotes}{lecturenotes}},
+ podcast = {{audio\space podcast}{audio\space podcast}},
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},
+ interview = {{interview}{interview}},
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},
+ lithograph = {{lithograph}{lith\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space series}{TV\space series}},
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},
+ supplement = {{supplement}{suppl\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+ reviewof = {{review of}{rev\adddotspace of}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
on = {{on}{on}},
@@ -38,13 +99,29 @@
with = {{with}{with}},
reprintas = {{reprinted as}{reprinted as}},
reprintfrom = {{reprinted from}{reprinted from}},
- reviewof = {{review\space of}{review\space of}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ commentonarticle = {{comment\space on\space the\space article}{comment\space on\space the\space article}},
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
+ part = {{part}{pt\adddot}},
+ paragraph = {{paragraph}{para\adddot}},
+ paragraphs = {{paragraphs}{paras\adddot}},
+ narrator = {{narrator}{narr\adddot}},
+ narrators = {{narrators}{narrs\adddot}},
producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
+ producers = {{producers}{producers}},
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},
+ director = {{director}{dir\adddot}},
+ directors = {{directors}{dirs\adddot}},
writer = {{writer}{writer}},
+ writers = {{writers}{writers}},
+ host = {{host}{host}},
+ hosts = {{hosts}{hosts}},
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},
mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}},
phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
@@ -58,22 +135,23 @@
typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +171,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -115,9 +193,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index eca08b80a94..41480df9df5 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}[2019/09/07\space v8.0\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2019/11/23\space v9.0\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -43,62 +43,81 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Used to join citations/references to
-% extradate
+% Optional parens/brackets
+% Thanks to egreg from https://tex.stackexchange.com/questions/53068/how-to-check-if-a-macro-value-is-empty-or-will-not-create-text-with-plain-tex-co
+% for this test for expanded emptiness so that we can easily opt to not print parens around nothing
+% Without this, it is very messy - you have to test all potential fields for defness first and this
+% is messy because the fields in the additional info vary betwee entrytypes
+\def\foreverunspace{%
+ \ifnum\lastnodetype=11
+ \unskip\foreverunspace
+ \else
+ \ifnum\lastnodetype=12
+ \unkern\foreverunspace
+ \else
+ \ifnum\lastnodetype=13
+ \unpenalty\foreverunspace
+ \fi
+ \fi
+ \fi
+}
-\newcommand{\apashortdash}{-}
+\newrobustcmd{\mkbibparense}[1]{%
+ \setbox0=\hbox{#1\foreverunspace}%
+ \ifdim\wd0=0pt
+ \else
+ % Since we are evaluating the argument twice and it contains \setunit,
+ % need to sanitise \setunit second time around. Can't just put in \box0
+ % as it might be long and won't linebreak
+ \mkbibparens{\setunit{}#1}%
+ \fi}
+
+\newrobustcmd{\mkbibbracketse}[1]{%
+ \setbox0=\hbox{#1\foreverunspace}%
+ \ifdim\wd0=0pt
+ \else
+ % Since we are evaluating the argument twice and it contains \setunit,
+ % need to sanitise \setunit second time around. Can't just put in \box0
+ % as it might be long and won't linebreak
+ \mkbibbrackets{\setunit{}#1}%
+ \fi}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.8) - Allow variable max authors/editors limit
+% Default to APA 19
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Allow variable max authors/editors limit
-
-\newcommand{\maxprtauth}{7}
+\newcommand{\maxprtauth}{20}
\DeclareBibliographyOption{apamaxprtauth}{%
\ifstrempty{#1}
{}
{\renewcommand{\maxprtauth}{#1}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.22) Force roman numerals into arabic
-% using etoolbox macros
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Force roman numerals into arabic using
+% etoolbox macros
\newcommand{\apanum}[1]{\ifrmnum{#1}{\rmntonum{#1}}{#1}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Apa defines no particular hanging indent but this makes it look like the
-% examples in the style manual.
-
-\setlength{\bibhang}{2.5em}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 4.16 Example 29) Some DSM macros
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.43) Hanging indent of 0.5in
-\gdef\DSMIII{\emph{DSM-III}}
-\gdef\DSMIIIR{\emph{DSM-III-R}}
-\gdef\DSMIV{\emph{DSM-IV}}
-\gdef\DSMIVTR{\emph{DSM-IV-TR}}
-\gdef\PsycSCAN{\emph{PsycSCAN}}
-\gdef\PsycARTICLES{\emph{PsycARTICLES}}
+\setlength{\bibhang}{0.5in}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Date formats. Suppress end range of less specific fields
+
\newcommand*{\mkdaterangeapalong}[1]{%
\begingroup
\blx@metadateinfo{#1}%
@@ -110,7 +129,7 @@
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
+ {\bibdatedash\bibstring{present}}
{\bibdatedash%
\iffieldsequal{#1year}{#1endyear}%
{\iffieldsequal{#1month}{#1endmonth}%
@@ -126,7 +145,7 @@
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
+ {\bibdatedash\bibstring{present}}
{\bibdatedash%
\iffieldsequal{#1year}{#1endyear}%
{\iffieldsequal{#1month}{#1endmonth}%
@@ -152,7 +171,7 @@
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
+ {\bibdatedash\bibstring{present}}
{\bibdatedash%
\iffieldsequal{#1year}{#1endyear}%
{\iffieldsequal{#1month}{#1endmonth}%
@@ -170,33 +189,24 @@
\ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.09 Example 62) ERIC
-% eprint references
-
-\DeclareFieldFormat{eprint:eric}{%
- \printtext{\bibcpstring{retrieved}}%
- \setunit{\addspace}%
- \printtext{\bibstring{from}}\addspace%
- ERIC\addspace database\adddot\addspace%
- \mkbibparens{#1}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) Five author max before "et al" and a one author truncation policy
-% However, only after the first cite, see the labelname format
-% in .cbx. It's also overridden per-entry by uniquelist
-% (APA 6.x) Citation tracking is global
-% (APA 6.14) Use initials to disambiguate shared surnames
-% (APA 6.16) Use year postfix to disambiguate multiple items in same year
-% (APA 6.10) Never reference anything not cited
-% (APA 6.25) Author initials only
-% (APA 6.25) Sorting is nyt but we need to account for PUBSTATE which comes
-% after all normal cites for the same author
+% (APA 8.12) sort citations
+% (APA 8.17) More than two authors is truncated to one but overriden for list ambiguity to
+% point of no ambiguity
+% (APA 8.20) Use initials to disambiguate shared surnames
+% (APA 8.19) Use year postfix to disambiguate multiple items in same year
+% (APA 9.44, 9.46, 9.47) Sorting is nyt but we need to account for PUBSTATE which comes
+% after all normal cites for the same author
+% (APA 9.42) Secular Before Common Era dates, approximate dates
+% (APA Figure 9.2) Sorting ignores punctuation in names
+% (APA 9.47) Ignore "The", "An" and "A" when sorting titles
+
+\DeclareNosort{
+ \nosort{setnames}{\regexp{\p{General_Category=Punctuation}}}
+ \nosort{settitles}{\regexp{\A(?:The|An|A)\s+}}
+}
\DeclareSortingTemplate{apa}{
\sort{
@@ -208,12 +218,8 @@
\sort{
\field{sortname}
\field{author}
+ \field{groupauthor}
\field{editor}
- \field{translator}
- \field{writer}
- \field{director}
- \field{producer}
- \field{execproducer}
\field{sorttitle}
\field{title}
}
@@ -235,19 +241,24 @@
}
}
+% Include groupauthor
+\DeclareLabelname{%
+ \field{shortauthor}
+ \field{author}
+ \field{groupauthor}
+ \field{shorteditor}
+ \field{editor}
+}
+
% Don't fall back on other year fields if there is no year, use
% "nodate" string
\DeclareLabeldate{%
\field{pubstate}
\field{date}
- \field{year}%legacy - no EDTF support
+ \field{year}%legacy - no ISO8601 support
\literal{nodate}
}
-% Due to APA strange requirements like truncation after first cite and
-% ellipsis from 7th to n-1 in bib, there might be some really strange
-% edge cases which can't be handled as this needs treating in the style
-% after biber has finished. Very unlikely though.
\ExecuteBibliographyOptions{%
abbreviate=true,%
autocite=inline,%
@@ -256,32 +267,35 @@
date=apalong,%
dateabbrev=false,%
datecirca=true,%
- dateera=christian,%
- labeldate=apalong,%
+ dateera=secular,%
dateuncertain=true,%
eventdate=comp,%
+ labeldate=apalong,%
labeldateparts=true,%
- maxbibnames=7,%
+ maxbibnames=20,%
maxcitenames=2,%
- minbibnames=6,%
+ minbibnames=19,%
mincitenames=1,%
mincrossrefs=999,%
+ maxitems=999,%
origdate=apalong,%
pagetracker=true,%
sortcites=true,%
sorting=apa,%
uniquelist=minyear,%
- uniquename=full,%
+ uniquename=init,%
uniqueprimaryauthor=true,%
urldate=apalong,%
useprefix=true,%
- usetranslator=true}
+ usetranslator=true,%
+ usenarrator=true}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
+% (APA 10.2:32) Remove PUBLISHER if it is the same as GROUPAUTHOR
+
\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
\map{
@@ -291,8 +305,16 @@
\map{
\step[fieldsource=date, final]
\step[fieldset=pubstate, null]
+ }
+ \map{
+ \step[typesource=hardware, typetarget=software, final]
+ }
+ \map{
+ \step[fieldsource=groupauthor, match=\regexp{([^{}]+)}, final]
+ \step[fieldsource=publisher, match=\regexp{$1}, final]%$
+ \step[fieldset=publisher, null]
}
- }
+ }
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -308,95 +330,119 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Additional material sometimes goes in parens
-% after title. This bool tracks the parens.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Flag to say whether the "in" has
+% been placed already in IN*
+% Reset every bibitem.
-\newbool{bbx:parens}
-\AtEveryBibitem{\global\boolfalse{bbx:parens}}
+\newbool{bbx:in}
+\AtEveryBibitem{\global\boolfalse{bbx:in}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.06:47) Reviews are awkward - if no author, date
-% position changes so we need a flag to
-% track this
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Set up some standard APA formats
-\newbool{bbx:noreviewauthor}
-\AtEveryBibitem{\global\boolfalse{bbx:noreviewauthor}}
+% General format of titles. Ugly Chicago-style lowercasing of English titles
+\DeclareFieldFormat{apacase}{\bbx@colon@search\MakeSentenceCase*{#1}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% HOWPUBLISHED
+\DeclareFieldFormat[unpublished]{howpublished}{\mkbibbrackets{%
+ \ifbibstring{#1}{\bibcpstring{#1}}{#1}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Sometimes "Vol" is inside the additional
-% material parens, sometimes not. This bool
-% tracks if it has been inserted yet.
-% Can't use \clearfield{volume} as some
-% later number format tests need to know
-% whether volume was defined.
+% TITLE
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[article]{title}{#1\isdot}
+\DeclareFieldFormat[inbook]{title}{#1\isdot}
+\DeclareFieldFormat[incollection]{title}{#1\isdot}
+\DeclareFieldFormat[inproceedings]{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[proceedings]{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[periodical]{title}{#1\isdot}
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[image]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[misc]{title}{#1\isdot}
+\DeclareFieldFormat[audio]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
+\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
-\newbool{bbx:volseen}
-\AtEveryBibitem{\global\boolfalse{bbx:volseen}}
+% TITLEADDON
+\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% MAINTITLEADDON
+\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) This bool tracks if the title was put
-% in the author position.
-% Can't use \clearfield{title} as some
-% later punctuation tests need to know
-% whether title was defined.
+% BOOKTITLEADDON
+\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
-\newbool{bbx:titleinauthpos}
-\AtEveryBibitem{\global\boolfalse{bbx:titleinauthpos}}
+% ISSUETITLE
+\DeclareFieldFormat{issuetitle}{#1\isdot}
+\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ORIGTITLE
+\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Need a flag to say when the editor
-% is in author position because this
-% can effect where the year goes.
+% VOLUME
+\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
+ {\bibcpstring{volume}~\apanum{#1}}
+ {\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}}
+\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
-\newbool{bbx:editorinauthpos}
-\AtEveryBibitem{\global\boolfalse{bbx:editorinauthpos}}
+% VOLUMES
+\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% CHAPTER
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Flag to say whether the "in" has
-% been placed already in IN*
-% Reset every bibitem.
+\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
-\newbool{bbx:in}
-\AtEveryBibitem{\global\boolfalse{bbx:in}}
+% NUMBER
+\DeclareFieldFormat{number}{\iffieldundef{volume}
+ {\ifinteger{\thefield{number}}
+ {\addspace\mkbibemph{\bibcpstring{number}~\apanum{#1}}\adddot}
+ {\apanum{#1}}}
+ {\mkbibemph{\apanum{#1}}}}
+\DeclareFieldFormat[report]{number}{\apanum{#1}}
+\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareFieldFormat[reprint]{number}{\mkbibbrackets{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% PAGES
+\DeclareFieldFormat[inbook]{pages}{\mkpageprefix[bookpagination]{#1}}
+\DeclareFieldFormat[incollection]{pages}{\mkpageprefix[bookpagination]{#1}}
+\DeclareFieldFormat[periodical]{pages}{#1}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Set up some standard APA formats
+% LOCATION
+\DeclareListFormat[misc]{location}{\mkbibemph{#1}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
-\DeclareFieldFormat{volume}{\apanum{#1}}
-\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
-\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
-\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
-\DeclareFieldFormat{part}{#1}
+% NAMEADDON
+\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}}
-%
+% VERSION
+\DeclareFieldFormat[dataset]{version}{\bibcpstring{version}~#1}
+\DeclareFieldFormat[software]{version}{\bibcpstring{version}~#1}
+
+% URL
+\DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{urldate}{#1}
+
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.25) Works by the same author have the full author
+% (APA 9.47) Works by the same author have the full author
% name, not an eliding dash. Author is always
% last name first.
-% (APA 6.27) Ellipsis in 7th position and then nothing until last
-% (APA 7.10 Example 67) Unknown names and dates
-%
+% (APA 10.1:4) Ellipsis from 20th position and then nothing until last
+% (APA 9.x) Unknown names and dates
+% (APA 9.8) Two group authors drop the comma in between
% \printnames does different things depending on whether the format you are
% calling is the default for the name field or is a custom format:
@@ -409,6 +455,16 @@
% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
% all of the names in the list to work on
+% It's not completely obvious but it's implied that names identical apart from a suffix
+% are to be treated as different name lists for extradate calculation so we add suffix
+% to the default definition
+\DeclareUniquenameTemplate{
+ \namepart[use=true, base=true]{prefix}
+ \namepart[base=true]{family}
+ \namepart{given}
+ \namepart{suffix}
+}
+
\DeclareNameAlias{default}{apaauthor}
\DeclareNameFormat{apaauthor}{%
@@ -416,43 +472,92 @@
{\addcomma\space\ldots\space}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
- {\iffieldannotation{uncertain}
- {\mkbibbrackets{\usebibmacro{name:apa:family-given}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}?}}
- {\usebibmacro{name:apa:family-given}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}}}}%
+ {\printtext{\usebibmacro{name:apa:family-given}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ \let\bibstring\bibcplstring
+ \setunit{\addspace}%
+ \printtext{\mkbibparense{\usebibmacro{role}}}%
+ \hasitemannotation[\currentname][username]{\addspace\mkbibbrackets{\getitemannotation[\currentname][username]}}{}}}%
\ifthenelse{\value{listcount}=\value{listtotal}}%
- {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+ {\ifmorenames
+ {\printdelim{andothersdelim}
+ \bibstring{andothers}}
+ {}%
+ \let\bibstring\bibcplstring
+ \setunit{\addspace}%
+ \printtext{\mkbibparense{\usebibmacro{roles}}}}
+ {}}
-\renewbibmacro*{author}{%
- \ifnameundef{author}
- {\usebibmacro{labeltitle}}
- {\printnames[apaauthor][-\value{listtotal}]{author}%
- \setunit*{\addspace}%
- \printfield{nameaddon}%
- \ifnameundef{with}
- {}
- {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
- \printnames[apaauthor][-\value{listtotal}]{with}}
- \setunit*{\addspace}}}%
+\DeclareNameFormat{apanames}{%
+ \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
+ {\addcomma\space\ldots\space}
+ {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
+ {}
+ {\printtext{\usebibmacro{name:apa:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ \let\bibstring\bibcpsstring
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{role}}}%
+ \ifthenelse{\value{listcount}=\value{listtotal}}%
+ {\ifmorenames
+ {\printdelim{andothersdelim}%
+ \bibstring{andothers}}
+ {}%
+ \let\bibstring\bibcplstring
+ \setunit{\addspace}%
+ \usebibmacro{roles}}
+ {}}
+
+\renewbibmacro*{author/editor}{%
+ \ifthenelse{\ifnameundef{author}\AND\ifnameundef{groupauthor}}
+ {\ifnameundef{editor}
+ {\usebibmacro{title}%
+ % need to clear all title fields so we don't get them again later
+ \clearfield{title}%
+ \clearfield{subtitle}%
+ \clearfield{titleaddon}}
+ {\usebibmacro{editorinauthpos}}}
+ {\usebibmacro{author}}%
\newunit\newblock%
\usebibmacro{labelyear+extradate}}
+\newbibmacro*{editorinauthpos}{%
+ \printnames[apaauthor][-\value{listtotal}]{editor}%
+ \setunit{\addspace}%
+ \ifnameundef{editor}
+ {}
+ {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}%
+ % need to clear editor so we don't get an "In" clause later
+ \clearname{editor}}}
+
+\renewbibmacro*{author}{%
+ \ifnameundef{author}
+ {\printnames[apaauthor][-\value{listtotal}]{groupauthor}}
+ {\printnames[apaauthor][-\value{listtotal}]{author}}%
+ \setunit*{\addspace}%
+ \printfield{nameaddon}%
+ \ifnameundef{with}
+ {}
+ {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
+ \printnames[apaauthor][-\value{listtotal}]{with}}
+ \setunit*{\addspace}}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) References section delimiters are ampersands, not " and "
-% (APA 6.27) Use blank for long lists
-% (APA 4.03) Serial comma for lists of three or more
+% (APA 9.8) Author delimiters are ampersands before final author
+% Long author lists
+% Serial comma for lists of three or more
+% Ampersand only (no comma) between two group authors
\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
\ifthenelse{\value{listcount}>\maxprtauth}
@@ -464,29 +569,22 @@
\DeclareDelimFormat[bib,biblist]{finalnamedelim:apa:family-given}{%
\ifthenelse{\value{listcount}>\maxprtauth}
{}
- {\finalandcomma\addspace\&\space}}
-
+ {\ifthenelse{\ifcurrentname{groupauthor}\AND%
+ \value{liststop}=2}
+ {\addspace\&\space}
+ {\finalandcomma\addspace\&\space}}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.28) Use "nodate" bibstring for references with no year
+% (APA 9.47) Use "nodate" bibstring for references with no year
% Months and days go into parenthesis with year, if set
-% (APA 6.29) Issue goes where month normally goes if it
-% is set.
-% (APA 7.10) circa or uncertain dates in brackets
+% (APA 8.13, 10.2) circa or uncertain dates in brackets
% Make sure endmonth gets an expansion too
\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}}
-\newbibmacro*{monthorissue}{%
- \iffieldundef{issue}
- {\iffieldundef{month}
- {}
- {\addcomma\space\printfield{month}%
- \iffieldundef{endmonth}{}{/\printfield{endmonth}}}}
- {\addcomma\space\printfield{issue}}}
-
\newbibmacro*{labelyear+extradate}{%
\iffieldundef{labelyear}
{\iffieldundef{origyear}
@@ -502,71 +600,42 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) General format of titles.
-% Ugly Chicago-style lowercasing of English titles
-
-\DeclareFieldFormat{apacase}{\bbx@colon@search\MakeSentenceCase*{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.5) Conference event information
-\DeclareFieldFormat{issuetitle}{#1\isdot}
-\DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}}
-\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx@colon@search\MakeSentenceCase*{#1}}\isdot}
-\DeclareFieldFormat[article]{title}{#1\isdot}
-\DeclareFieldFormat[article]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[inbook]{title}{#1\isdot}
-\DeclareFieldFormat[inbook]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[incollection]{title}{#1\isdot}
-\DeclareFieldFormat[incollection]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[inproceedings]{title}{#1\isdot}
-\DeclareFieldFormat[inproceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat[proceedings]{title}{#1\isdot}
-\DeclareFieldFormat[proceedings]{origtitle}{\bbx@colon@search\MakeSentenceCase*{#1}\isdot}
+\newbibmacro*{eventinfo}{%
+ \printfield{eventtitle}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.01 Example 10) Newspapers have prefix for pages.
-
-\DeclareFieldFormat[newsarticle]{pages}{%
- \DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}%
- \mkpageprefix{#1}%
- \DeclareNumChars{.}}
-\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}}
-\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[newsarticle]{title}{#1}
-\DeclareFieldFormat[article]{pages}{#1}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.25) No prefix for pages
-\newbibmacro*{newspaper}{%
- \printfield{newspaper}
- \setunit{\addcomma\space}}
+\DeclareFieldFormat{pages}{#1}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Additional {main}title information in brackets (using)
-% {MAIN}TITLEADDON field. Colon after maintitle.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.52) References in a meta-analysis
+% Dates ignore month/day in nonacademic
+% articles
-\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
-\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
-\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx@colon@search\MakeSentenceCase*{#1}}}
+\renewbibmacro*{begentry}{%
+ \ifkeyword{meta}{\textsuperscript{*}}{}}
-\newbibmacro*{bookaddinfo}{%
- \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
- {}
- {\printtext{\bibopenparen}%
- \printfield{edition}%
- \setunit*{\addcomma\addspace}%
- \printfield{volumes}%
- \setunit{}%
- \printtext{\bibcloseparen}}%
-}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Title and additional post title information
\renewbibmacro*{title}{%
\ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
- {}
+ {\printfield{titleaddon}}
{\iffieldundef{origtitle}
{\printtext[title]{%
\printfield[apacase]{title}%
@@ -579,52 +648,104 @@
\setunit{\subtitlepunct}%
\printfield[apacase]{subtitle}}}%
\setunit{\addspace}%
+ \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \setunit{\addspace}%
+ \iffieldundef{related}
+ {}
+ {\ifthenelse{\iffieldequalstr{relatedtype}{reviewofbook}\OR%
+ \iffieldequalstr{relatedtype}{reviewoffilm}\OR%
+ \iffieldequalstr{relatedtype}{reviewoftv}\OR%
+ \iffieldequalstr{relatedtype}{commentonarticle}}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ \togglefalse{bbx:related}}% disable default related expansion later on
+ {}}%
+ \setunit{\addspace}%
\printfield{titleaddon}%
- \iffieldequalstr{entrytype}{book}%
- {\setunit{\addspace}\usebibmacro{bookaddinfo}}%
- {}%
- \ifthenelse{%
- \ifnameundef{author}\AND%
- \(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND%
- \ifnameundef{producer}\AND%
- \ifnameundef{director}\AND%
- \ifnameundef{writer}}
- {\newunit\newblock
- \usebibmacro{labelyear+extradate}}
- {}}}
-
-\renewbibmacro*{maintitle}{%
- \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
- {}
- {\printtext[maintitle]{%
- \printfield[apacase]{maintitle}%
- \setunit{\subtitlepunct}%
- \printfield[apacase]{mainsubtitle}}%
- \setunit{\addspace}}
- \printfield{maintitleaddon}%
- \addcolon}
+ \setunit{\addspace}%
+ \usebibmacro{addinfo2}}}%
+
+\newbibmacro*{addinfo1}{%
+ \printtext{%
+ \mkbibparense{%
+ \usebibmacro{editor+trans+narr}%
+ \setunit*{\addsemicolon\addspace}%
+ \printfield{edition}%
+ \setunit*{\addcomma\addspace}%
+ \ifthenelse{\ifentrytype{report}\OR%
+ \ifentrytype{thesis}\OR%
+ \ifentrytype{unpublished}\OR%
+ \ifentrytype{dataset}\OR%
+ \ifentrytype{software}\OR%
+ \ifentrytype{audio}\OR%
+ \ifentrytype{patent}\OR%
+ \ifentrytype{image}}{\usebibmacro{addinfo3}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{inbook}{\printfield{pages}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{book}{\printfield{volumes}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{book}{\printfield{volume}}{}}}}
+
+% Additional post title information in brackets
+\newbibmacro*{addinfo2}{%
+ \printtext{%
+ \mkbibbracketse{%
+ \iffieldbibstring{entrysubtype}
+ {\bibcplstring{\thefield{entrysubtype}}}
+ {\printfield{entrysubtype}}%
+ \setunit*{\addsemicolon\addspace}%
+ \printfield{note}}}}
+
+% number/issue information
+\newbibmacro*{addinfo3}{%
+ \iffieldundef{type}
+ {\iffieldundef{issue}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}
+ {\printfield{issue}\setunit{\addspace}%
+ \iffieldundef{number}
+ {}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}}}
+ {\printfield{type}\setunit{\addspace}%
+ \iffieldundef{number}
+ {}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}}%
+ \ifthenelse{\ifentrytype{dataset}\OR\ifentrytype{software}}
+ {\setunit*{\addsemicolon\addspace}%
+ \printfield{version}}
+ {}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Format of volume and number for articles
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.1 Example 6) eprints (eLocator)
-\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
-\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+\renewbibmacro*{eprint}{%
+ \iffieldundef{eprinttype}
+ {}
+ {\printtext{%
+ \iffieldbibstring{eprinttype}{\bibcpstring{\strfield{eprinttype}}}{\strfield{eprinttype}}%
+ \setunit{\addspace}}}%
+ \printfield{eprint}}
+
+\DeclareFieldFormat{eprint}{#1}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Commas between title and volume for articles
+% (APA 10) Commas between title and volume for articles
+% (APA 10.6) eLocator is part of journal info
\renewbibmacro*{journal+issuetitle}{%
\usebibmacro{journal}%
\setunit*{\addcomma\addspace}%
\printfield{volume}%
\printfield{number}%
- \setunit{\addspace}\newblock
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{eprint}%
+ \newunit\newblock
\usebibmacro{issuename}%
\newunit}
@@ -639,42 +760,11 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Additional information for non-periodicals in
-% parenthesis after title. This is ugly but it's
-% hard to put in "optional parens" like this
-% around an unknown amount of characters.
-
-\newbibmacro*{addinfo}{%
- \ifthenelse{\iffieldundef{edition}\AND%
- \iffieldundef{chapter}\AND%
- \iffieldundef{volumes}\AND%
- \iffieldundef{pages}\AND%
- \iffieldundef{number}\AND%
- \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
- {}
- {\printtext{\bibopenparen}%
- \printfield{edition}%
- \setunit*{\addcomma\addspace}%
- \printfield{chapter}%
- \setunit*{\addcomma\addspace}%
- \notbool{bbx:volseen}%
- {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}%
- \printfield{volume}%
- \iffieldundef{part}{}{\printfield{part}}}{}%
- \setunit*{\addcomma\addspace}%
- \printfield{volumes}%
- \setunit*{\addcomma\addspace}%
- \printfield{pages}%
- \setunit{}%
- \printtext{\bibcloseparen}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) "In " precedes editor/trans list, no colon
-
+% "In" precedes editor/trans list, no colon
+% Use a flag to track as it could be inserted in more
+% than one potential location
+
\newbibmacro*{in}{%
\ifbool{bbx:in}%
{}%
@@ -685,60 +775,88 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Editors have first names first ...
-% (APA 7.02 Example 27) ... unless there is no author
-
-\DeclareNameFormat{apanames}{%
- \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
- {\addcomma\space\ldots\space}
- {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
- {}
- {\usebibmacro{name:apa:given-family}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}}}%
- \ifthenelse{\value{listcount}=\value{listtotal}}%
- {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
-
-\renewbibmacro*{author/editor}{%
- \ifnameundef{author}
- {\ifnameundef{editor}
- {}
- {\usebibmacro{editorinauthpos}}}
- {\global\boolfalse{bbx:editorinauthpos}%
- \usebibmacro{author}}}
-
-\newbibmacro*{editorinauthpos}{%
- \global\booltrue{bbx:editorinauthpos}%
- \printnames[apaauthor][-\value{listtotal}]{editor}%
- \setunit{\addspace}%
- \ifnameundef{editor}
- {}
- {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}%
- % need to clear editor so we don't get an "In" clause later
- % But we also need to set a flag to say we did this so we
- % don't lose sight of the fact we once had an editor for
- % various year placement tests
- \clearname{editor}%
- \setunit{\adddot\addspace}%
- \usebibmacro{labelyear+extradate}%
- \setunit{\adddot\addspace}}}
+% Names
+
+% Individual name roles
+\newbibmacro*{role}{%
+ \hasitemannotation[\currentname][role]%
+ {\getitemannotation[\currentname][role]}
+ {\ifitemannotation[\currentname][role]{writer}
+ {\bibstring{writer}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{director}
+ {\bibstring{director}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{execproducer}
+ {\bibstring{execproducer}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{producer}
+ {\bibstring{producer}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{host}
+ {\bibstring{host}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{chair}
+ {\bibstring{chair}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{guestexpert}
+ {\bibstring{guestexpert}%
+ \setunit{\addspace\&\addspace}}
+ {}}%
+ \setunit{}}
+
+% roles for complete name lists
+\newbibmacro*{roles}{%
+ \hasfieldannotation[\currentname][role]%
+ {\getfieldannotation[\currentname][role]}
+ {\iffieldannotation[\currentname][role]{writers}
+ {\bibstring{writers}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{directors}
+ {\bibstring{directors}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{execproducers}
+ {\bibstring{execproducers}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{producers}
+ {\bibstring{producers}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{hosts}
+ {\bibstring{hosts}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{chairs}
+ {\bibstring{chairs}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{guestexperts}
+ {\bibstring{guestexperts}%
+ \setunit{\addspace\&\addspace}}
+ {}}%
+ \setunit{}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Name format. Don't capitalise prefixes
-% (APA 6.27) Full name disambiguation using brackets
+% Name format
% #1 = family name
% #2 = given name
% #3 = given name (initials)
% #4 = name prefix
% #5 = name suffix
-
+
\newbibmacro*{name:delim:apa:family-given}[1]{%
\ifnumgreater{\value{listcount}}{\value{liststart}}
{\ifboolexpr{
@@ -799,46 +917,44 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Editor string in parens after author list
-% (APA 7.02 Example 21) Collapse editor and trans if same
-% (APA 7.02 Example 26) Translator
-
-
-% Separated out into book and in* macros because otherwise
-% this makes one ugly, huge, unreadable beast.
+% (APA 9.10) Role strings in parens after author list
+% Collapse roles if same person
+% (APA 10.1 Example 10) Translator
+% (APA 10.2 Example 22) Narrator
-\newbibmacro*{book:editor+trans}{%
+\newbibmacro*{editor+trans+narr}{%
\ifthenelse{\ifnameundef{editor}\AND%
\ifnameundef{editora}\AND%
\ifnameundef{editorb}\AND%
\ifnameundef{editorc}\AND%
- \ifnameundef{translator}}%
- {}%
+ \ifnameundef{translator}\AND%
+ \ifnameundef{narrator}}%
+ {\printtext{}}% Print nothing, so the puncutation tracker is kept informed
{\ifnamesequal{editor}{translator}%
- {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
- \printnames[apanames][-\value{listtotal}]{editor}%
+ {\printnames[apanames][-\value{listtotal}]{editor}%
\setunit*{\addcomma\addspace}%
\usebibmacro{apaeditorstrg}{editor}%
\setunit*{\addspace\&\space}%
- \printtext{\bibcpstring{translator}}%
- \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
- {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
- \ifnameundef{editor}%
+ \printtext{\bibcpstring{translator}}}
+ {\ifnameundef{editor}%
{}%
{\printnames[apanames][-\value{listtotal}]{editor}%
\setunit{\addcomma\addspace}%
\usebibmacro{apaeditorstrg}{editor}%
\clearname{editor}%
- \setunit{\adddot}%
\setunit*{\addspace\&\space}}%
\ifnameundef{translator}%
{\setunit{}}%
{\printnames[apanames][-\value{listtotal}]{translator}%
\setunit{\addcomma\addspace}%
\printtext{\bibcpstring{translator}}%
- \clearname{translator}%
- \setunit{\adddot}}%
- \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
+ \clearname{translator}}%
+ \ifnameundef{narrator}%
+ {\setunit{}}%
+ {\printnames[apanames][-\value{listtotal}]{narrator}%
+ \setunit{\addcomma\addspace}%
+ \printtext{\bibcpstring{narrator}}%
+ \clearname{narrator}}}}}
\newbibmacro*{editor+trans}{%
\ifthenelse{\ifnameundef{editor}\AND%
@@ -850,35 +966,28 @@
{\ifnamesequal{editor}{translator}%
{\usebibmacro{in}%
\printnames[apanames][-\value{listtotal}]{editor}%
- \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
- \usebibmacro{apaeditorstrg}{editor}%
- \setunit*{\addspace\&\space}%
- \printtext{\bibcpstring{translator}}%
- \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+ \setunit{\addspace}%
+ \printtext[parens]{%
+ \usebibmacro{apaeditorstrg}{editor}%
+ \setunit*{\addspace\&\space}%
+ \bibcpstring{translator}}}
{\ifnameundef{translator}%
{}%
{\setunit{\addspace}%
\printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}%
- \setunit{\addcomma\addspace}%
- \printtext{\bibcpstring{translator}}}%
+ \setunit{\addcomma\addspace}%
+ \bibcpstring{translator}}%
\clearname{translator}%
\setunit{\adddot\addspace}}%
\usebibmacro{in}%
\usebibmacro{editorx}}%
\setunit{\addcomma\addspace}}}
-
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Special journal issues are periodicals
-
-\DeclareFieldFormat[periodical]{pages}{#1}
-\DeclareFieldFormat[periodical]{title}{#1\isdot}
-\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
-\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
-\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Special journal issues are periodicals
\renewbibmacro*{periodical}{%
\iffieldundef{title}
@@ -891,21 +1000,17 @@
\renewbibmacro*{title+issuetitle}{%
\usebibmacro{periodical}%
\setunit{\addspace}%
- \printfield{issuetitle}%
- \notbool{bbx:editorinauthpos}
- {\newunit
- \usebibmacro{labelyear+extradate}}
- {}}
+ \printfield{issuetitle}}%
\newbibmacro*{pnumber}{%
\printfield{volume}%
\printfield{number}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02 Example 21) Original year
+% (APA 10.1 Example 10) Original year
% Only give ORIGYEAR in references if both:
% YEAR is also given
@@ -916,15 +1021,15 @@
not test {\iffieldundef{origyear}}
not test {\iffieldundef{labelyear}}
and not test {\iffieldsequal{labelyear}{origyear}}}
- {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}}
- {}}
+ {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}%
+ \renewcommand*{\finentrypunct}{\relax}}
+ {}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02) "In " before booktitle, edited or not
-% (APA 6.30) Non-periodical volume number followed by "."
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.3) Reference work references
\renewbibmacro*{maintitle+title}{%
\iffieldsequal{maintitle}{title}
@@ -937,8 +1042,7 @@
\newunit\newblock
\iffieldundef{volume}
{}
- {\setunit{\global\booltrue{bbx:volseen}}%
- \printfield{volume}%
+ {\printfield{volume}%
\printfield{part}%
\setunit{\adddot\space}}}}%
\usebibmacro{title}%
@@ -954,11 +1058,22 @@
\newunit\newblock
\iffieldundef{volume}
{}
- {\setunit{\addspace\global\booltrue{bbx:volseen}}%
- \printfield{volume}%
+ {\printfield{volume}%
\printfield{part}%
\setunit{\adddot\addspace}}}%
- \usebibmacro{booktitle}}}
+ \usebibmacro{booktitle}%
+ \setunit{\addspace}%
+ \usebibmacro{addinfo1}}}
+
+\renewbibmacro*{maintitle}{%
+ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+ {}
+ {\printtext[maintitle]{%
+ \printfield[apacase]{maintitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[apacase]{mainsubtitle}}%
+ \setunit{\addspace}}
+ \printfield{maintitleaddon}}
\renewbibmacro*{booktitle}{%
\ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{booksubtitle}}
@@ -971,360 +1086,222 @@
\printfield{booktitleaddon}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Colon separates title/subtitle
-% Skip if following terminating punctuation
+% Colon separates title/subtitle
+% Skip if following terminating punctuation
\renewcommand*{\subtitlepunct}{\ifterm{}{\addcolon}\space}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Format of volume depends on whether
-% there is a maintitle (what APA calls "series") or not.
-
-\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
- {\bibcpstring{volume}~\apanum{#1}}
- {\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Number for reports with no prefix if not
-% a numeral. Report number is optional and so must be
-% the parens.
-
-\DeclareFieldFormat{number}{\iffieldundef{volume}
- {\ifinteger{\thefield{number}}
- {\addspace\mkbibemph{\bibcpstring{number}~\apanum{#1}}\adddot}
- {\apanum{#1}}}
- {\mkbibemph{\apanum{#1}}}}
-
-\DeclareFieldFormat[report]{number}{\mkbibparens{\iffieldundef{type}
- {}
- {\printfield{type}\setunit{\addspace}}%
- \bibcpstring{number}~\apanum{#1}}}
-
-\newbibmacro*{apa:reportnum}{%
- \iffieldundef{number}%
- {}%
- {\printfield{number}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Location only shows first item
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.2.24) Multiple publishers, semi-colon sep
-\DeclareListFormat{default}{%
- \usebibmacro{list:delim}{#1}%
+\DeclareListFormat{publisher}{%
+ \usebibmacro{publisher:delim}{#1}%
#1\isdot}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02 Example 38) Proceedings emph number, location
-% and location. Pages have no prefix
-
-\DeclareListFormat[proceedings]{location}{\mkbibemph{#1}}
-\DeclareFieldFormat[proceedings]{pages}{#1}
-\DeclareFieldFormat[proceedings]{number}{\mkbibemph{\apanum{#1}}}
-\DeclareFieldFormat[proceedings]{volume}{\mkbibemph{\apanum{#1}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02 Example 40--44) Theses titles and volume
-% Titles are not emph if only an abstract
+\newbibmacro*{publisher:delim}[1]{%
+ \ifnumgreater{\value{listcount}}{\value{liststart}}
+ {\printdelim[publisher]{multilistdelim}}
+ {}}
-\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+\DeclareDelimFormat[publisher]{multilistdelim}{\addsemicolon\space}
+\DeclareDelimFormat[publisher]{finallistdelim}{\addsemicolon\space}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.05) Unpublished theses
+%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.10) Software
-\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newbibmacro*{appentry}{%
+ \iffieldundef{appentry}
+ {\newunit\newblock}
+ {\printfield[apacase]{appentry}%
+ \newunit\newblock
+ \usebibmacro{in}%
+ \setunit{\addspace}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (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}}{%
- \ifentrytype{article}
- {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}}
- {\printtext[apacase]{\thefield{savedtitle}}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.1 Example 18) Comment on article
-\DeclareFieldFormat[review]{pages}{#1}
-\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
-\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}}
+\newcommand*{\begrelateddelimcommentonarticle}{\addspace}
+\DeclareFieldFormat{related:commentonarticle}{\def\bibstring{\blx@imc@bibcpstring}\mkbibbrackets{#1}}
-\newbibmacro*{reviewauthor}{%
- \ifnameundef{author}
- {\booltrue{bbx:noreviewauthor}}
- {\usebibmacro{author}}}
+\renewbibmacro*{related:commentonarticle}[1]{%
+ \entrydata*{#1}{%
+ \printtext{\mkbibquote{\printfield[apacase]{title}}}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Media authors
-
-\newbibmacro*{producer}{%
- \ifnameundef{producer}
- {}
- {\printnames[apaauthor][-\value{listtotal}]{producer}%
- \addspace
- \printtext[parens]{\bibcpstring{producer}}%
- \setunit*{\addcomma\addspace\&\addspace}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newbibmacro*{director}{%
- \ifnameundef{director}
- {}
- {\printnames[apaauthor][-\value{listtotal}]{director}%
- \addspace
- \printtext[parens]{\bibcpstring{director}}%
- \setunit*{\addcomma\addspace\&\addspace}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.7) Reviews - role strings need to be the
+% short versions in reviews
-\newbibmacro*{writer}{%
- \ifnameundef{writer}
- {}
- {\printnames[apaauthor][-\value{listtotal}]{writer}%
- \addspace
- \printtext[parens]{\bibcpstring{writer}}%
- \setunit*{\addcomma\addspace\&\addspace}}}
+\newcommand*{\begrelateddelimreviewofbook}{\addspace}
+\DeclareFieldFormat{related:reviewofbook}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}}
+\newbibmacro*{related:reviewofbook}[1]{\usebibmacro{related:reviewofx}{#1}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand*{\begrelateddelimreviewoffilm}{\addspace}
+\DeclareFieldFormat{related:reviewoffilm}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}}
+\newbibmacro*{related:reviewoffilm}[1]{\usebibmacro{related:reviewofx}{#1}}
-%%%%%%%%%%%%%%%%%
-% (APA 7.07) Misc and data
+\newcommand*{\begrelateddelimreviewoftv}{\addspace}
+\DeclareFieldFormat{related:reviewoftv}{\def\bibstring{\blx@imc@bibcpsstring}\mkbibbrackets{#1}}
+\newbibmacro*{related:reviewoftv}[1]{\usebibmacro{related:reviewofx}{#1}}
-\DeclareFieldFormat[data]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat[data]{entrysubtype}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[misc]{entrysubtype}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}}
-\DeclareFieldFormat[misc]{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{{#1}\isdot}}
+\DeclareFieldFormat{reviewtitle}{%
+ \iffieldequalstr{entrysubtype}{tvepisode}
+ {\mkbibquote{\bbx@colon@search\MakeSentenceCase*{#1}}}
+ {\bbx@colon@search\MakeSentenceCase*{#1}}}
-\newbibmacro*{datatitle}{%
- \iffieldundef{title}
- {\iffieldundef{entrysubtype}
- {}
- {\printfield{entrysubtype}}}
- {\iffieldundef{entrysubtype}
- {}
- {\usebibmacro{title}\addspace
- \printfield{entrysubtype}}}}
-
-%
-%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.07) Audiovisual
-
-\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}}{#1}}
-\DeclareFieldFormat[video]{maintitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[video]{entrysubtype}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[audio]{entrysubtype}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[music]{title}{#1}
-\DeclareFieldFormat[music]{maintitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[music]{mainsubtitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[audio]{howpublished}{\mkbibparens{#1}}
-
-\newbibmacro*{tvseries}{%
- \iffieldundef{maintitle}
- {}
- {\usebibmacro{in}%
- \ifnameundef{execproducer}
- {}
- {\printnames[apanames][-\value{listtotal}]{execproducer}%
- \addspace
- \printtext[parens]{\bibcpstring{execproducer}}}
- \setunit{\addcomma\addspace}%
- \usebibmacro{avmaintitle}%
- \newunit}}
+\newbibmacro*{related:reviewofx}[1]{%
+ \entrydata*{#1}{%
+ \printtext{\mkbibemph{%
+ \printfield[reviewtitle]{title}%
+ \iffieldundef{subtitle}
+ {}
+ {\setunit{\addcolon\addspace}%
+ \printfield[reviewtitle]{subtitle}}}%
+ \setunit{\addcomma\addspace}%
+ \biblstring{byauthor}%
+ \setunit{\addspace}%
+ \printnames[apanames][-\value{listtotal}]{author}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newbibmacro*{avmaintitle}{%
- \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
- {}
- {\printtext[maintitle]{%
- \printfield[apacase]{maintitle}%
- \setunit{\subtitlepunct}%
- \printfield[apacase]{mainsubtitle}}%
- \setunit{\addspace}}
- \printfield{maintitleaddon}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.13) Audio
-\newbibmacro*{album}{%
- \iffieldundef{maintitle}
- {}
- {\bibcpstring{on}%
+\newbibmacro*{mainaudio}{%
+ \iffieldundef{maintitle}{}
+ {\iffieldequalstr{entrysubtype}{podcastepisode}{\bibcpstring{in}}{\bibcpstring{on}}%
\setunit{\addspace}%
- \usebibmacro{avmaintitle}%
- \newunit}}
-
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10) Letter/Letters
-
-\DeclareFieldFormat[letter]{title}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[letters]{title}{#1}
-\DeclareFieldFormat[letter]{number}{\mkbibparens{#1}}
-\DeclareFieldFormat[letters]{number}{\mkbibparens{#1}}
-
-%
-%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%
-% (APA 6.31) URLs
-
-\DeclareFieldFormat{url}{\url{#1}}
-\DeclareFieldFormat{abstracturl}{\url{#1}}
-\DeclareFieldFormat{urldate}{#1}
-
-\renewbibmacro*{url+urldate}{%
- \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}}
- {}
- {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
- {}
- {\printtext{\bibcpstring{abstract}}\addspace}%
- \iffieldequalstr{entrysubtype}{{DVD}}
- {\printtext{\bibstring{available}}}
- {\printtext{\bibstring{retrieved}}}%
- \setunit{\addspace}%
- \iffieldundef{urlyear}
- {}
- {\printtext{\printurldate}%
- \setunit*{\urldatecomma}}%
- \printtext{\bibstring{from}}%
- \setunit*{\addspace}%
- \printfield{urldescription}%
- \setunit*{\addcolon\addspace}%
- \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
- \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}%
- \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
-
-%
-%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.11) Non-emph titles for online items
-% Subtype in brackets
-
-
-\DeclareFieldFormat[online]{title}{#1}
-\DeclareFieldFormat[online]{entrysubtype}{\mkbibbrackets{#1}}
+ \printfield{maintitle}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA A7.07) Emph titles for patents
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.12) Audiovisual
-\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.08 Example 56) Software has version in title
-
-\DeclareFieldFormat[software]{title}{#1}
-\DeclareFieldFormat[software]{version}{\mkbibparens{\bibcpstring{version}~#1}}
-
-\newbibmacro*{apa:softwaretitle}{%
- \printtext[title]{%
- \printfield[apacase]{title}%
- \setunit{\subtitlepunct}%
- \printfield[apacase]{subtitle}}%
- \setunit{\addspace}%
- \iffieldundef{version}%
- {}
- {\printfield{version}}
- \printfield{titleaddon}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Hacky bits to suppress final period in some cases.
-% * If there is an ORIGYEAR field (APA 7.02:21)
-% * Unless there is a RELATED and ADDENDUM
-\newbibmacro*{apa:finpunct}{%
- \iffieldundef{origyear}
- {\ifboolexpr{
- test {\iffieldundef{addendum}}
- and
- test {\iffieldundef{related}}}
- {}
- {\renewcommand*{\finentrypunct}{\relax}}}
- {\renewcommand*{\finentrypunct}{\relax}}}
+\newbibmacro*{mainvideo}{%
+ \iffieldundef{maintitle}{}
+ {\usebibmacro{in}%
+ \printnames[apanames][-\value{listtotal}]{execproducer}%
+ \setunit{\addspace}%
+ \printtext{\mkbibparens{\bibcplstring{execproducers}}}%
+ \setunit{\addcomma\addspace}%
+ \printfield{maintitle}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Related entries
+%
+% Have to force capitlisation bibstring variant because the delim
+% has no printable char and this breaks default capitalisation
-\DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}}
+% Suppress final period after reprints in parens
+\renewbibmacro*{endrelated}{%
+ \iffieldequalstr{relatedtype}{reprintfrom}
+ {\renewcommand*{\finentrypunct}{\relax}}
+ {}}
+
+\newcommand*{\begrelateddelimreprintfrom}{\addperiod\addspace}
+\DeclareFieldFormat{related:reprintfrom}{\let\bibstring\bibcpstring\mkbibparens{#1}}
\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
\renewbibmacro*{related:reprintfrom}[1]{%
\entrydata*{#1}{%
- \printtext{\mkbibemph{\printfield[apacase]{title}}}%
- \setunit{\bibpagespunct}%
- \printfield{pages}%
- \setunit{\addcomma\addspace}%
- \bibstring{byauthor}\addspace
- \ifnameundef{editor}
- {}
- {\printnames[apanames][-\value{listtotal}]{editor}%
+ \ifentrytype{article}
+ {\mkbibquote{%
+ \printfield[apacase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[apacase]{subtitle}}%
+ \setunit{\addcomma\addspace}%
+ \printlabeldateextra
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{journal}%
+ \setunit*{\addcomma\addspace}%
+ \printfield{volume}%
+ \printfield[reprint]{number}%
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{eprint}%
+ \setunit{\addcomma\addspace}%
+ \iffieldundef{issuetitle}
+ {}
+ {\printtext[issuetitle]{%
+ \printfield[noformat]{issuetitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[noformat]{issuesubtitle}}}%
+ \setunit{\addcomma\addspace}%
+ \printfield{pages}%
+ \setunit{\addcomma\addspace}%
+ \printfield{note}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{doi+url}%
+ \setunit{}}
+ {\ifentrytype{incollection}
+ {\mkbibemph{%
+ \printfield[apacase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[apacase]{subtitle}}%
+ \setunit{\addcomma\addspace}%
+ \printfield{pages}%
+ \setunit{\addcomma\addspace}%
+ \biblstring{byauthor}\space
+ \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}%
- \newunit\newblock
- \usebibmacro{related}}}
-
-\newbibmacro*{related:reviewof}[1]{%
- \setunit{}% Sanitise this in case no author
- \entrydata*{#1}{%
- \ifentrytype{article}
- {\printtext{\printfield[apacase]{title}}}
- {\printtext{\mkbibemph{\printfield[apacase]{title}}}}%
- \setunit{\addspace}%
- \bibstring{byauthor}\addspace
- \printnames[apanames][-\value{listtotal}]{author}%
- \printnames[apanames][-\value{listtotal}]{producer}%
- \printnames[apanames][-\value{listtotal}]{director}%
- \setunit{\addcomma\addspace}%
- \printdateextra
- \newunit\newblock
- \usebibmacro{related}}}
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{doi+url}%
+ \setunit{}}
+ {}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.x) General type layouts
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.51) Annotations
+
+\renewbibmacro*{annotation}{%
+ \iffieldundef{annotation}
+ {}
+ {\begingroup
+ \togglefalse{blx@bibliography}%
+ \newline
+ \setunit{}%
+ \printfield{annotation}%
+ \endgroup}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.x) General entrytype drivers
+
+% Custom driver to make a cleaner example for 9.44
+\DeclareBibliographyDriver{nameonly}{%
+ \usebibmacro{begentry}%
+ \printnames[apaauthor][-\value{listtotal}]{author}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{article}{%
\usebibmacro{bibindex}%
@@ -1339,43 +1316,43 @@
\newunit\newblock
\printfield{note}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
+ \newblock
+ \usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
- \newunit\newblock
+ \setunit{\addspace}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:finpunct}%
\usebibmacro{apa:pageref}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{newsarticle}{%
+\DeclareBibliographyDriver{audio}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \usebibmacro{newspaper}%
- \setunit{\bibpagespunct}%
- \printfield{pages}%
- \newunit\newblock
- \printfield{entrysubtype}%
+ \usebibmacro{mainaudio}%
\newunit\newblock
- \printfield{note}%
+ \usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
+ \newblock
+ \usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
- \newunit\newblock
+ \setunit{\addspace}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:finpunct}%
\usebibmacro{apa:pageref}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{book}{%
@@ -1384,15 +1361,11 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
- \setunit{\addspace}\newblock
- \usebibmacro{book:editor+trans}%
- \newunit\newblock
- \printfield{note}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
@@ -1402,59 +1375,28 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{booklet}{%
+\DeclareBibliographyDriver{dataset}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printfield{howpublished}%
- \newunit\newblock
\printfield{type}%
- \newunit\newblock
+ \newunit
\printfield{note}%
\newunit\newblock
- \usebibmacro{location+publisher}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{proceedings}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
+ \printlist{organization}%
\newunit\newblock
- \usebibmacro{booktitle}%
- \setunit{\addcomma\addspace}\newblock
\usebibmacro{location+publisher}%
- \setunit{\addcomma\addspace}%
- \printfield{volume}%
- \setunit*{\adddot}%
- \printfield{number}%
- \setunit{\addcomma\addspace}
- \printfield{pages}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \printlist{organization}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printlist{institution}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1462,10 +1404,10 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{collection}{%
+\DeclareBibliographyDriver{image}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1473,13 +1415,9 @@
\usebibmacro{title}%
\newunit\newblock
\usebibmacro{location+publisher}%
- \setunit{\addcomma\addspace}%
- \printfield{number}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1487,28 +1425,26 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+ \newunit\newblock
\usebibmacro{editor+trans}%
\newblock
\usebibmacro{maintitle+booktitle}%
- \newblock
- \usebibmacro{addinfo}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \setunit*{\addspace}\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
@@ -1518,21 +1454,19 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+ \newunit\newblock
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
\usebibmacro{maintitle+booktitle}%
- \newblock
- \usebibmacro{addinfo}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1540,8 +1474,8 @@
\newunit\newblock
\usebibmacro{origyear}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1549,41 +1483,35 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+ \newunit\newblock
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
\usebibmacro{maintitle+booktitle}%
- \iffieldundef{eventyear}{}{\setunit{\addcomma\addspace}}%
- \printeventdate
- \setunit*{\addspace}\newblock
- \usebibmacro{addinfo}%
+ \newunit\newblock
+ \usebibmacro{eventinfo}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
\newunit
- \printfield[apacase]{eventtitle}%
- \newunit
\printfield{venue}%
\iffieldundef{pages}
{\setunit{\addcomma\addspace}}
{\newunit}%
\newblock
- \usebibmacro{location+publisher}%
- \newunit\newblock
\usebibmacro{origyear}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1591,7 +1519,7 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{manual}{%
@@ -1601,8 +1529,6 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printfield{edition}%
- \newunit\newblock
\printfield{type}%
\newunit
\printfield{version}%
@@ -1613,40 +1539,8 @@
\newunit
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{online}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \printfield{entrysubtype}%
- \addperiod\addspace
- \iftoggle{bbx:doi}
- {\printfield{doi}%
- \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}%
- \newunit\newblock
- \iftoggle{bbx:eprint}
- {\usebibmacro{eprint}%
- \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}%
- \newunit\newblock
- \usebibmacro{url+urldate}%
- \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1654,27 +1548,20 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{patent}{%
+\DeclareBibliographyDriver{misc}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \setunit*{\addspace}%
- \printfield{number}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{byholder}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1682,28 +1569,21 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{periodical}{%
+\DeclareBibliographyDriver{online}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title+issuetitle}%
- \setunit{\adddot\addspace}
- \usebibmacro{journal}%
- \setunit{\addcomma\addspace}
- \printlist{location}%
- \setunit{\addcomma\addspace}
- \usebibmacro{pnumber}%
- \setunit{\addcomma\addspace}
- \printfield{pages}%
- \newunit\newblock
- \printfield{note}%
+ \usebibmacro{title}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printlist{organization}%
+ \addperiod\addspace
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1711,47 +1591,21 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{report}{%
+\DeclareBibliographyDriver{patent}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \usebibmacro{apa:reportnum}%
- \newunit\newblock
- \printlist{institution}%
- \newunit\newblock
- \printfield{note}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{thesis}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \usebibmacro{type+institution}%
- \newunit\newblock
\printfield{note}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
@@ -1760,89 +1614,26 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{review}{%
+\DeclareBibliographyDriver{periodical}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{reviewauthor}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \newunit\newblock
- \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
- \newunit\newblock
- \usebibmacro{journal+issuetitle}%
- \newunit\newblock
- \printfield{note}%
- \setunit{\bibpagespunct}%
+ \usebibmacro{title+issuetitle}%
+ \setunit{\adddot\addspace}
+ \usebibmacro{journal}%
+ \setunit{\addcomma\addspace}
+ \printlist{location}%
+ \setunit{\addcomma\addspace}
+ \usebibmacro{pnumber}%
+ \setunit{\addcomma\addspace}
\printfield{pages}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{misc}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \printfield{entrysubtype}%
- \newunit\newblock
- \printfield{howpublished}%
- \newunit\newblock
- \printfield{type}%
- \newunit
- \printfield{version}%
- \newunit
\printfield{note}%
\newunit\newblock
- \printlist{organization}%
- \newunit\newblock
- \printlist{institution}%
- \setunit*{\addcomma\addspace}%
- \usebibmacro{location+publisher}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{data}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{datatitle}%
- \newunit\newblock
- \printfield{type}%
- \newunit
- \printfield{version}%
- \newunit
- \printfield{note}%
- \newunit\newblock
- \printlist{organization}%
- \newunit\newblock
- \usebibmacro{location+publisher}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
@@ -1851,26 +1642,32 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{letter}{%
+\DeclareBibliographyDriver{proceedings}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printlist{institution}%
- \setunit{\addspace}\newblock
+ \usebibmacro{eventinfo}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{booktitle}%
+ \setunit{\addcomma\addspace}%
+ \printfield{volume}%
+ \setunit*{\adddot}%
\printfield{number}%
+ \setunit{\addcomma\addspace}
+ \printfield{pages}%
\newunit\newblock
\printfield{note}%
- \setunit{\addcomma\addspace}\newblock
- \usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printlist{organization}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1878,10 +1675,10 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{letters}{%
+\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1889,15 +1686,13 @@
\usebibmacro{title}%
\newunit\newblock
\printlist{institution}%
- \setunit{\addspace}\newblock
- \printfield{number}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1905,28 +1700,21 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{video}{%
+\DeclareBibliographyDriver{software}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{writer}%
- \usebibmacro{director}%
- \usebibmacro{producer}%
- \newunit\newblock
- \usebibmacro{labelyear+extradate}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{appentry}%
\usebibmacro{title}%
- \setunit{\addspace}\newblock
- \printfield{entrysubtype}%
- \newunit\newblock
- \usebibmacro{tvseries}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1934,54 +1722,23 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{movie}{%
+\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{writer}%
- \usebibmacro{director}%
- \usebibmacro{producer}%
- \newunit\newblock
- \usebibmacro{labelyear+extradate}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \setunit{\addspace}\newblock
- \printfield{entrysubtype}%
\newunit\newblock
- \usebibmacro{tvseries}%
+ \printlist{institution}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{audio}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{writer}%
- \usebibmacro{director}%
- \usebibmacro{producer}%
- \newunit\newblock
- \usebibmacro{labelyear+extradate}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \setunit{\addspace}\newblock
- \printfield{entrysubtype}%
- \newunit\newblock
- \usebibmacro{location+publisher}%
+ \printfield{note}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
@@ -1990,39 +1747,26 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{music}{%
+\DeclareBibliographyDriver{unpublished}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \usebibmacro{album}%
- \newunit\newblock
- \usebibmacro{location+publisher}%
- \printfield{addendum}%
+ \setunit{\addspace}%
+ \printfield{howpublished}%
\newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{software}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{apa:softwaretitle}%
+ \printlist{location}%
+ \setunit{\addcomma\addspace}
+ \printlist{institution}%
\newunit\newblock
- \usebibmacro{location+publisher}%
+ \printfield{note}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -2030,29 +1774,22 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{unpublished}{%
+\DeclareBibliographyDriver{video}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printfield{howpublished}%
- \iflistundef{institution}
- {\newunit}
- {\setunit{\addcomma\addspace}}%
- \newblock
- \printlist{institution}%
- \setunit*{\addcomma\addspace}\newblock
- \printfield{note}%
- \setunit*{\addcomma\addspace}\newblock
- \printlist{location}%
+ \usebibmacro{mainvideo}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{location+publisher}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -2060,7 +1797,7 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
%
@@ -2108,69 +1845,34 @@
{\bibcpstring{type\thefield{#1type}s}}
{\bibcpstring{type\thefield{#1type}}}}}
-\renewbibmacro*{doi+eprint+url}{%
- \iftoggle{bbx:doi}
- {\printfield{doi}%
- \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}%
- \newunit\newblock
- \iftoggle{bbx:eprint}
- {\usebibmacro{eprint}%
- \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}%
- \newunit\newblock
- \iftoggle{bbx:url}
- {\usebibmacro{url+urldate}%
- \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}}
+%(APA 9.35) No periods after URLS
+\newbibmacro*{doi+url}{%
+ \iffieldundef{doi}
+ {\iffieldundef{url}{\newunit}{\usebibmacro{url+urldate}\setunit{\addspace}}}
+ {\printfield{doi}\renewcommand*{\finentrypunct}{\relax}\setunit{\addspace}}}
+\renewbibmacro*{url+urldate}{%
+ \ifthenelse{\iffieldundef{url}\OR\NOT\iffieldundef{doi}}
+ {}
+ {\iffieldundef{urlyear}
+ {}
+ {\printtext{\bibstring{retrieved}}%
+ \addspace
+ \printurldate
+ \setunit{\urldatecomma}%
+ \bibstring{from}%
+ \setunit{\addspace}}%
+ \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
\DeclareFieldFormat{doi}{%
- doi\addcolon
\ifhyperref
- {\href{https://doi.org/#1}{\nolinkurl{#1}}}
- {\nolinkurl{#1}}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (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)
+ {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
+ {\nolinkurl{https://doi.org/#1}}}
\newbibmacro*{location+publisher}{%
- \iffieldundef{doi}
- {\printlist[default][1-1]{location}%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- \newunit}
- {}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\newbibmacro*{type+institution}{%
- \setunit{\addspace}%
- \ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} }
- {}
- {\printtext[parens]{%
- \iflistundef{institution}
- {\setunit*{\addspace}}
- {\setunit*{\addcolon\space}}%
- \printfield{type}%
- \setunit*{\addcomma\space}%
- \printlist{institution}%
- \setunit*{\addcomma\space}%
- \printlist{location}}%
- \newunit}}
-
-\newbibmacro*{labeltitle}{%
- \iffieldundef{label}
- {\printfield{title}%
- \clearfield{title}%
- \setunit{\addspace}%
- \printfield{entrysubtype}%
- \clearfield{entrysubtype}%
- \global\booltrue{bbx:titleinauthpos}}
- {\printfield{label}}}
+ \printlist{location}%
+ \setunit*{\addcomma\space}%
+ \printlist{publisher}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2185,8 +1887,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-
% Unchanged from authoryear-comp
\DeclareBibliographyOption{dashed}[true]{%
@@ -2199,10 +1899,6 @@
\DeclareFieldFormat{shorthandwidth}{#1}
\setlength{\bibitemsep}{0pt}
-\DeclareNameAlias{author}{sortname}
-\DeclareNameAlias{editor}{sortname}
-\DeclareNameAlias{translator}{sortname}
-
\defbibenvironment{bibliography}
{\list
{}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 8750aeb35db..6989787742a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -12,20 +12,21 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2019/09/07\space v8.0\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2019/11/23\space v9.0\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.16) labelyear postfix is not emphasised or italic
+% (APA 8.19) labelyear postfix is not emphasised or italic
% Dashes between labelyear and non-numeric year (or pseudo-year)
+\newcommand{\apashortdash}{-}
\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.11) requires comma separator between authors and years
+% (APA 8.11) requires comma separator between authors and years
\DeclareDelimFormat{nameyeardelim}{\addcomma\space}
\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space}
@@ -34,7 +35,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) No comma before "et al" if there is only one name
+% (APA 8.17) No comma before "et al" if there is only one name
% preceding it
\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace}
@@ -43,7 +44,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) ampersand separator in parenthetical cites
+% (APA 8.17) ampersand separator in parenthetical cites
\DeclareDelimFormat[parencite]{finalnamedelim}
{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
@@ -70,10 +71,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.11) Suffices are not shown in citations
-% (APA 6.12) 3-5 authors have "et al." after first cite
-% (Blog http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author and only when not unique across all *primary* authors
-
+% (APA 8.10) Suffices are not shown in citations
+% (APA 8.17) 3+ authors have "et al."
+% (APA 8.20) Initials only for primary author and only when not unique across all *primary* authors
+
\newbibmacro*{labelname:doname}[8]{%
\ifboolexpr{test {\ifnumcomp{\value{listcount}}{>}{1}}
or
@@ -95,92 +96,22 @@
\fi
\usebibmacro{name:andothers}}
-% Can't do this with the built-in printnames format as APA requires truncation
-% and disambiguation only after first cite
-% We either use uniquelist or minnames for truncation. If uniquelist isn't
-% defined, we fall back on minnames
-%
-% \printnames does different things depending on whether the format you are
-% calling is the default for the name field or is a custom format:
-%
-% max/minnames truncation is done before calling the format so we have
-% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
-% all of the names in the list to work on here
-%
-% Explicit "and others" is dealt with in labelname:doname via a custom name:andothers
-
\DeclareNameFormat{labelname}{%
- % First set the truncation point
- \ifthenelse{\value{uniquelist}>1}
- {\numdef\cbx@min{\value{uniquelist}}}
- {\numdef\cbx@min{\value{minnames}}}%
- % Always print the first name and the second if there are only two since
- % "et al" must always be plural
- \ifboolexpr{test {\ifnumcomp{\value{listcount}}{=}{1}}
- or test {\ifnumcomp{\value{listtotal}}{=}{2}}}
- {\usebibmacro{labelname:doname}%
- {\namepartfamily}%
- {\namepartfamilyi}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartprefixi}%
- {\namepartsuffix}%
- {\namepartsuffixi}}
- % We are looking at name >=3
- % If the list is 6 or more names or we have seen citation before, potential truncation
- {\ifboolexpr{test {\ifnumcomp{\value{listtotal}}{>}{5}}
- or test {\ifciteseen}}
- % Less than the truncation point, print normally
- {\ifnumcomp{\value{listcount}}{<}{\cbx@min + 1}
- {\usebibmacro{labelname:doname}%
- {\namepartfamily}%
- {\namepartfamilyi}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartprefixi}%
- {\namepartsuffix}%
- {\namepartsuffixi}}
- {}%
- % At potential truncation point ...
- \ifnumcomp{\value{listcount}}{=}{\cbx@min + 1}
- % but enforce plurality of et al - only truncate here if there is at
- % least one more element after the current potential truncation point
- % so that "et al" covers at least two elements.
- {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}}
- {\printdelim{andothersdelim}\bibstring{andothers}}
- {\usebibmacro{labelname:doname}%
- {\namepartfamily}%
- {\namepartfamilyi}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartprefixi}%
- {\namepartsuffix}%
- {\namepartsuffixi}}}
- {}%
- % After truncation point, do not print name
- \ifnumcomp{\value{listcount}}{>}{\cbx@min + 1}
- {\relax}%
- {}}%
- % We are looking at name >=3
- % Name list is < 6 names or we haven't seen this citation before, print normally
- {\usebibmacro{labelname:doname}%
- {\namepartfamily}%
- {\namepartfamilyi}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartprefixi}%
- {\namepartsuffix}%
- {\namepartsuffixi}}}}
+ \usebibmacro{labelname:doname}%
+ {\namepartfamily}%
+ {\namepartfamilyi}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartprefixi}%
+ {\namepartsuffix}%
+ {\namepartsuffixi}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.13) Groups as names
+% (APA 8.21) Groups as names
% SHORTAUTHOR brackets in parencites
\DeclareNameFormat{sabrackets}{%
@@ -204,12 +135,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.13) Deal with SHORTAUTHOR fields
-% (APA 6.16) Multiple same author cites in a compact citation call do not
+% (APA 8.21) Deal with SHORTAUTHOR fields
+% (APA 8.12) Multiple same author cites in a compact citation call do not
% need to be repeated but the full years must be repeated with
% their extradate postfixes
-% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
-% (APA 6.28) ISSUE after year when available
+% (APA 8.15) Cite ORIGYEAR/YEAR if ORIGYEAR present
+% (APA 10.1:11) Reprints have original year in citation
+
\def\citeresetapa{\global\let\cbx@apa@names\@empty}
\citeresetapa
\def\cbx@apa@ifnamesaved{%
@@ -223,17 +155,20 @@
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
% Single cite
- {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+ {\ifnameundef{labelname}
% No author/editor
{\usebibmacro{cite:noname}%
\savefield{fullhash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
- {\printnames[labelname][-\value{listtotal}]{labelname}}%
- {\cbx@apa@ifnamesaved
+ {\printnames{labelname}}%
+ {\cbx@apa@ifnamesaved
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
- \savefield{fullhash}{\cbx@lasthash}}}%
+ {\ifnameundef{groupauthor}
+ {\printnames[labelname]{author}}
+ {\printnames[labelname]{groupauthor}}%
+ \addspace\printnames[sabrackets]{shortauthor}}}%
+ \savefield{fullhash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
% Using fullhash instead of namehash otherwise we may omit namelist for
@@ -251,7 +186,7 @@
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
% Single cite
- {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+ {\ifnameundef{labelname}
% No author/editor
{\usebibmacro{cite:noname}%
\setunit{\printdelim{nameyeardelim}}%
@@ -259,11 +194,14 @@
\savefield{fullhash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
- {\printnames[labelname][-\value{listtotal}]{labelname}}%
- {\cbx@apa@ifnamesaved
- {\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
- \setunit{\printdelim{nameyeardelim}}%
+ {\printnames{labelname}}%
+ {\cbx@apa@ifnamesaved
+ {\printnames{shortauthor}}
+ {\ifnameundef{groupauthor}
+ {\printnames[labelname]{author}}
+ {\printnames[labelname]{groupauthor}}%
+ \addspace\printnames[sabrackets]{shortauthor}}}%
+ \setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
\savefield{fullhash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
@@ -279,8 +217,8 @@
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\setunit{\compcitedelim}%
- \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
- % No author/editor or patent
+ \ifnameundef{labelname}
+ % No author/editor
{\iffieldundef{shorthand}%
% Cite using title
{\usebibmacro{cite:noname}%
@@ -294,11 +232,13 @@
% Normal full cite
{\ifnameundef{shortauthor}%
% Normal full cite
- {\printnames[labelname][-\value{listtotal}]{labelname}}
+ {\printnames{labelname}}
% Cite using short author
{\cbx@apa@ifnamesaved
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}}}%
+ {\ifnameundef{groupauthor}
+ {\printnames[labelname]{author}}
+ {\printnames[labelname]{groupauthor}}}}%
% Year
\setunit{\ifbool{cbx:np}
{\printdelim{nameyeardelim}}
@@ -324,22 +264,22 @@
\iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges
{\clearfield{labelendyear}}
{}%
- \iffieldundef{origyear}{}
- {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} }
- {\mkbibbrackets{\printorigdate}}
- {\printorigdate}%
+ \iffieldundef{origyear}
+ {}
+ {\printorigdate%
\setunit*{\addslash}}%
- \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} }
- {\mkbibbrackets{\printlabeldateextra}}
- {\printlabeldateextra}}}%
- \iffieldundef{issue}
- {}
- {\addcomma\addspace\printfield{issue}}}
+ \iffieldundef{related}
+ {}
+ {\iffieldequalstr{relatedtype}{reprintfrom}
+ {\entrydata*{\thefield{related}}{\printlabeldateextra}%
+ \setunit*{\addslash}}
+ {}}%
+ \printlabeldateextra}}}
\newbibmacro*{cite:shorthand}{%
\ifciteseen
{\printfield{shorthand}}
- {\printnames[labelname][-\value{listtotal}]{labelname}%
+ {\printnames{labelname}%
\setunit{\printdelim{nameyeardelim}}%
\printfield{title}\space\printfield{shorthand}}}
@@ -347,15 +287,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.15) Fall back to title for citations without authors
+% (APA 8.14) Fall back to title for citations without authors
\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}}
\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}}
\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[patent]{citetitle}{#1}
\newbibmacro*{cite:noname}{%
\printfield[citetitle]{labeltitle}}
@@ -363,8 +303,23 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.2:32) Raw field cite formats
+
+\DeclareFieldFormat{citefield}{%
+ \ifcurrentfield{edition}
+ {\ifinteger{#1}
+ {\mkbibordedition{#1}~\bibstring{edition}}
+ {#1\isdot}}
+ {\ifcurrentfield{shorthand}
+ {\mkbibemph{#1}}
+ {#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.21) No parens round year for cites when the cite is in
+% (APA 8.11) No parens round year for cites when the cite is in
% parentheses. Use new command \nptextcite for such cites.
\DeclareDelimFormat[nptextcite]{finalnamedelim}
@@ -416,10 +371,6 @@
{\usebibmacro{prenote}}
{\usedriver
{\DeclareNameAlias{sortname}{default}%
- \global\boolfalse{bbx:parens}%
- \global\boolfalse{bbx:volseen}%
- \global\boolfalse{bbx:titleinauthpos}%
- \global\boolfalse{bbx:editorinauthpos}%
\global\boolfalse{bbx:in}%
\global\let\blx@related@loop\@empty}
{\thefield{entrytype}}%
@@ -435,10 +386,6 @@
\setlength{\parsep}{\bibparsep}}\item}
{\usedriver
{\DeclareNameAlias{sortname}{default}%
- \global\boolfalse{bbx:parens}%
- \global\boolfalse{bbx:volseen}%
- \global\boolfalse{bbx:titleinauthpos}%
- \global\boolfalse{bbx:editorinauthpos}%
\global\boolfalse{bbx:in}}
{\thefield{entrytype}}%
\finentry
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index 68172942b86..479c8d24a98 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -12,117 +12,70 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2019/09/07\space v8.0\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2019/11/23\space v9.0\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
- letters,
- data,
- newsarticle}
+ nameonly}
\DeclareDatamodelFields[type=list, datatype=name]{
- with,
- writer,
- producer,
+ groupauthor,
+ narrator,
execproducer,
- director}
+ execdirector,
+ with}
\DeclareDatamodelFields[type=field, datatype=literal]{
abstractloc,
- titleisdescription,
- newspaper,
+ appentry,
urldescription}
\DeclareDatamodelFields[type=field, datatype=verbatim]{
abstracturl}
\DeclareDatamodelEntryfields{
- titleisdescription,
with,
+ groupauthor,
+ narrator,
+ execproducer,
+ execdirector,
abstractloc,
abstracturl,
urldescription}
+\DeclareDatamodelEntryfields[software]{
+ appentry}
-\DeclareDatamodelEntryfields[video]{
- writer,
- producer,
- execproducer,
- director}
-
-\DeclareDatamodelEntryfields[newsarticle]{
- author,
- newspaper,
- title,
- day,
- endday,
- endmonth,
- endyear,
- month,
- year,
+\DeclareDatamodelEntryfields[report]{
addendum,
+ author,
+ authortype,
+ chapter,
doi,
- editor,
- editora,
- editorb,
- editorc,
- editoratype,
- editorbtype,
- editorctype,
- eid,
eprint,
eprintclass,
eprinttype,
- issn,
- issue,
- issuetitle,
- issuesubtitle,
+ institution,
+ isrn,
language,
+ location,
note,
number,
- origlanguage,
pages,
- series,
- subtitle,
- titleaddon,
- translator,
- url,
- urlday,
- urlendday,
- urlendmonth,
- urlendyear,
- urlmonth,
- urlyear,
- volume}
-
-\DeclareDatamodelEntryfields[data]{
- title,
- day,
- endday,
- endmonth,
- endyear,
- day,
- endday,
- endmonth,
- endyear,
- month,
- year,
- addendum,
- author,
- language,
- location,
- note,
- organization,
+ pagetotal,
pubstate,
subtitle,
+ title,
titleaddon,
type,
- url,
- urlday,
- urlendday,
- urlendmonth,
- urlendyear,
- urlmonth,
- urlyear,
version}
+\DeclareDatamodelConstraints[book,inbook,article,report]{
+ \constraint[type=mandatory]{
+ \constraintfieldsor{
+ \constraintfield{author}
+ \constraintfield{groupauthor}
+ }
+ \constraintfield{title}
+ }
+}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index 68dad61f4b7..846ae4ae84f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,11 +1,9 @@
-\ProvidesFile{austrian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -22,20 +20,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
-
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
+
\DeclareBibliographyStrings{%
inherit = {austrian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{Comment\space on\space the\space article}
+ {Comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{Review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{Review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{Review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
@@ -45,8 +123,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
index bf7f3079cf3..21c066eb3e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{brazilian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,14 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {brazilian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{writer}{writer}},%FIXME
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
revisededition = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}},
on = {{em}{em}},
retrieved = {{recuperado}{recuperado}},
@@ -34,10 +118,6 @@
from = {{de}{de}},
archivedat = {{arquivado\space em}{arquivado\space em}},
reviewof = {{Revis\~ao\space de}{revis\~ao\space de}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
with = {{with}{with}},
origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
typechair = {{Coordenador}{Coord\adddot}},
@@ -50,22 +130,23 @@
typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -85,9 +166,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -107,9 +188,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index 1fcef0cb1aa..24264adb556 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{british-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{british}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,14 +17,93 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {british},
+ article = {{article}{article}},
+ painting = {{painting}{painting}},
+ present = {{present}{present}},
+ song = {{song}{song}},
+ album = {{album}{album}},
+ map = {{map}{map}},
+ photograph = {{photograph}{photograph}},
+ photographs = {{photographs}{photographs}},
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},
+ lecturenotes = {{lecturenotes}{lecturenotes}},
+ podcast = {{audio\space podcast}{audio\space podcast}},
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},
+ interview = {{interview}{interview}},
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},
+ lithograph = {{lithograph}{lith\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space series}{TV\space series}},
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},
+ narrator = {{narrator}{narr\adddot}},
+ narrators = {{narrators}{narrs\adddot}},
+ producer = {{producer}{producer}},
+ producers = {{producers}{producers}},
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},
+ director = {{director}{dir\adddot}},
+ directors = {{directors}{dirs\adddot}},
+ writer = {{writer}{writer}},
+ writers = {{writers}{writers}},
+ host = {{host}{host}},
+ hosts = {{hosts}{hosts}},
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},
+ supplement = {{supplement}{suppl\adddot}},
+ part = {{part}{pt\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
@@ -36,13 +113,14 @@
from = {{from}{from}},
archivedat = {{archived\space at}{archived\space at}},
reviewof = {{Review\space of}{review\space of}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
with = {{with}{with}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},
+ paragraphs = {{paragraphs}{paras\adddot}},
mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}},
phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
@@ -56,22 +134,23 @@
typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +170,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -113,9 +192,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
index 0d781b0ec06..71850bba646 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{danish-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {danish},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{producent}{producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{instrukt{\o}r}{instr\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manuskript}{manuskript}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fra}{fra}},
archivedat = {{arkiveret\space ved}{arkiveret\space ved}},
reviewof = {{anmeldelse\space af}{anmeldelse\space af}},
- producer = {{producer}{producer}},
- execproducer = {{producent}{producent}},
- director = {{instrukt{\o}r}{instrukt{\o}r}},
- writer = {{manuskript}{manuskript}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
january = {{januar}{januar}},
february = {{februar}{februar}},
march = {{marts}{marts}},
@@ -68,22 +146,23 @@
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -105,9 +184,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -129,9 +208,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index ce42bcddc4e..443cd13bf71 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{dutch-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {dutch},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producent}{producent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{uitvoerend producent}{uitvoerend producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regisseur}{reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{schrijver}{schrijver}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{met}{met}},% FIXME: check
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Pagina}{{}p\adddot}},
pages = {{Pagina's}{{}pp\adddot}},
on = {{op}{op}},
@@ -36,11 +119,6 @@
from = {{van}{van}},
archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}},
reviewof = {{bespreking\space van}{bespreking\space van}},
- producer = {{producent}{producent}},
- execproducer = {{uitvoerend producent}{uitvoerend producent}},
- director = {{regisseur}{regisseur}},
- writer = {{schrijver}{schrijver}},
- with = {{met}{met}},% FIXME: check
paragraph = {{par\adddot}{par\adddot}},
paragraphs = {{par\adddot}{par\adddot}},
mathesis = {{masterscriptie}{masterscriptie}},
@@ -56,22 +134,23 @@
typevolseriess = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +170,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -113,9 +192,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index 73f1d28f926..e24f59bc72b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{english-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{english}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {american},
+ article = {{article}{article}},
+ painting = {{painting}{painting}},
+ present = {{present}{present}},
+ song = {{song}{song}},
+ album = {{album}{album}},
+ map = {{map}{map}},
+ photograph = {{photograph}{photograph}},
+ photographs = {{photographs}{photographs}},
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},
+ lecturenotes = {{lecturenotes}{lecturenotes}},
+ podcast = {{audio\space podcast}{audio\space podcast}},
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},
+ interview = {{interview}{interview}},
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},
+ lithograph = {{lithograph}{lith\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space series}{TV\space series}},
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},
+ narrator = {{narrator}{narr\adddot}},
+ narrators = {{narrators}{narrs\adddot}},
+ producer = {{producer}{producer}},
+ producers = {{producers}{producers}},
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},
+ director = {{director}{dir\adddot}},
+ directors = {{directors}{dirs\adddot}},
+ writer = {{writer}{writer}},
+ writers = {{writers}{writers}},
+ host = {{host}{host}},
+ hosts = {{hosts}{hosts}},
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},
+ with = {{with}{with}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},
+ supplement = {{supplement}{suppl\adddot}},
+ part = {{part}{pt\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
on = {{on}{on}},
@@ -35,16 +118,11 @@
available = {{available}{available}},
from = {{from}{from}},
archivedat = {{archived\space at}{archived\space at}},
- with = {{with}{with}},
reprintas = {{reprinted as}{reprinted as}},
reprintfrom = {{reprinted from}{reprinted from}},
reviewof = {{review\space of}{review\space of}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
+ paragraph = {{paragraph}{para\adddot}},
+ paragraphs = {{paragraphs}{paras\adddot}},
mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}},
phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
@@ -58,22 +136,23 @@
typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \print*date to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -115,9 +194,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index b5bdad3dd7b..99d80e96539 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{french-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{french}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,31 +17,110 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {french},
- inpress = {{sous presse}{sous presse}},% remove when biblatex has it
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producteur}{producteur}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{producteur ex\'ecutif}{producteur ex\'ecutif}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{r\'ealisateur}{r\'ealisateur}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{\'ecrivain}{\'ecrivain}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{avec}{avec}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}p\adddot}},
on = {{le}{le}},
retrieved = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}},
- with = {{avec}{avec}},
- producer = {{producteur}{producteur}},
- execproducer = {{producteur ex\'ecutif}{producteur ex\'ecutif}},
- director = {{r\'ealisateur}{r\'ealisateur}},
- writer = {{\'ecrivain}{\'ecrivain}},
available = {{disponible}{disponible}},
from = {{\`a\space partir\space de}{\`a\space partir\space de}},
archivedat = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
reviewof = {{critique\space de}{critique\space de}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P}{\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}},
typechair = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}},
typechairs = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}},
@@ -55,18 +132,20 @@
typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -86,9 +165,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -108,9 +187,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
new file mode 100644
index 00000000000..db115cc5e70
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
@@ -0,0 +1,232 @@
+\ProvidesFile{galician-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\InheritBibliographyExtras{galician}
+
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
+\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{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{writer}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
+
+\DeclareBibliographyStrings{%
+ inherit = {galician},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produtor}{produtor}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{produtor executivo}{produtor executivo}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{escritor}{escritor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{con}{con}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ january = {{xaneiro}{xaneiro}},
+ february = {{febreiro}{febreiro}},
+ march = {{marzo}{marzo}},
+ april = {{abril}{abril}},
+ may = {{maio}{maio}},
+ june = {{xu\~no}{xu\~no}},
+ july = {{xullo}{xullo}},
+ august = {{agosto}{agosto}},
+ september = {{setembro}{setembro}},
+ october = {{outubro}{outubro}},
+ november = {{novembro}{novembro}},
+ december = {{decembro}{decembro}},
+ nodate = {{s\adddot d\adddot}{s\adddot d\adddot}},
+ mathesis = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}},
+ phdthesis = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}},
+ revisededition = {{edici\'on\space revisada}{edici\'on\space revisada}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ host = {{host}{host}},
+ page = {{p\'axina}{{}p\adddot}},
+ pages = {{p\'axinas}{{}pp\adddot}},
+ on = {{o}{o}},
+ retrieved = {{obtido}{obtido}},
+ available = {{dispo\~nible}{dispo\~nible}},
+ from = {{desde}{desde}},
+ archivedat = {{arquivado en}{arquivado en}},
+ reviewof = {{revisi\'on\space de}{revisi\'on\space de}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ origyear = {{data\space orixinal\space de\space publicaci\'on}{data\space orixinal\space de\space publicaci\'on}},
+ typechair = {{coordinador}{coord\adddot}},
+ typechairs = {{coordinadores}{coords\adddot}},
+ typevolume = {{editor\space do\space volume}{ed\adddotspace vol\adddot}},
+ typevolumes = {{editores\space do\space volume}{eds\adddotspace vol\adddot}},
+ typeseries = {{editor\space da\space serie}{ed\adddotspace ser\adddot}},
+ typeseriess = {{editores\space da\space serie}{eds\adddotspace ser\adddot}},
+ typevolseries = {{editor\space da\space serie\space e\space do\space volume}{ed\adddotspace vol\space\&\space ser\adddot}},
+ typevolseriess = {{editores\space da\space serie\space e\space do\space volume}{eds\adddotspace vol\space\&\space ser\adddot}},
+ annodomini = {{d\adddot\space C\adddot}{d\adddot\space C\adddot}},
+ beforechrist = {{a\adddot\space C\adddot}{a\adddot\space C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\ifkeyword{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ \iffieldundef{#3}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\ifkeyword{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldundef{#3}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
+ \mkbibmonth{\thefield{#2}}%
+}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\ifkeyword{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#3}%
+ {}%
+ {el\addspace\stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}%
+ {\addspace{en}\addspace}%
+ {\iffieldundef{#3}%
+ {en\addspace}%
+ {\addspace{de}\addspace}%
+ \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \thefield{#1}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index 6080eec48a4..9b380179cd3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{german-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{german}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,31 +20,111 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {german},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
retrieved = {{Zugriff}{Zugriff}},
available = {{Erh\"altlich}{Erh\"altlich}},
- with = {{mit}{mit}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index c2267e0d556..7e2f4226f82 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{greek-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {greek},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{writer}{writer}},%FIXME
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{with}{with}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{Αναθεωρημένη\space Έκδοση}{εκδ \adddotspace εκ\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Σελίδα}{{}σ\adddot}},
pages = {{Σελίδες}{{}σσ\adddot}},
on = {{στις}{στις}},
@@ -36,13 +119,8 @@
from = {{από}{από}},
archivedat = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}},
reviewof = {{Αναθεώρηση\space του}{αναθεώρηση\space του}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
- with = {{with}{with}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Μεταπτυχιακή εργασία}{Μεταπτυχιακή\addabbrvspace εργασία}},
phdthesis = {{Διδακτορική\addabbrvspace διατριβή}{Διδακτορική\addabbrvspace διατριβή}},
origyear = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}},
@@ -56,14 +134,15 @@
typevolseriess = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
@@ -87,9 +166,9 @@
#1\BibliographyWarning{Month out of range}%
\fi}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -109,9 +188,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -131,9 +210,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index 1758057bd6f..d5f00590ab9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{italian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {italian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{writer}{writer}},%FIXME
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{with}{with}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Pagina}{{}p\adddot}},
pages = {{Pagine}{{}pp\adddot}},
on = {{il}{il}},
@@ -36,13 +119,8 @@
from = {{da}{da}},
archivedat = {{archiviato\space il}{archiviato\space il}},
reviewof = {{Revisione\space di}{revisione\space di}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
- with = {{with}{with}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Tesi\space di\space laurea}{Tesi\space di\space laurea}},
phdthesis = {{Tesi\space di\space dottorato}{Tesi\space di\space dottorato}},
origyear = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}},
@@ -56,22 +134,23 @@
typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +170,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -113,9 +192,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
index fd37e7141e8..e9d8f44ec8f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{naustrian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,21 +20,101 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {naustrian},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Autor}{Autor}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Autor}{Aut\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Schriftsteller}{Schriftsteller}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
@@ -45,8 +123,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index ff23de5504e..c6be4e9b50e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{ngerman-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,22 +20,102 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {ngerman},
- abstract = {{Abstract}{Abstract}},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ abstract = {{Abstract}{Abstract}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{auf}{auf}},
@@ -46,8 +124,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -59,21 +137,23 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +173,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -116,9 +196,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
index b081e096743..6c4132e8620 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{norsk-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {norsk},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produsent}{produsent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss{\o}r}{regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fra}{fra}},
archivedat = {{arkivert\space ved}{arkivert\space ved}},
reviewof = {{anmeldelse\space av}{anmeldelse\space av}},
- producer = {{produsent}{produsent}},
- execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
- director = {{regiss{\o}r}{regiss{\o}r}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Masteroppgave}{Masteroppgave}},
phdthesis = {{Doktoravhandling}{Doktoravhandling}},
origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
@@ -56,22 +134,23 @@
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -117,9 +196,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
index f67bf18ac26..556a8c8841c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{norwegian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {norwegian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produsent}{produsent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss{\o}r}{regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fra}{fra}},
archivedat = {{arkivert\space ved}{arkivert\space ved}},
reviewof = {{anmeldelse\space av}{anmeldelse\space av}},
- producer = {{produsent}{produsent}},
- execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
- director = {{regiss{\o}r}{regiss{\o}r}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Masteroppgave}{Masteroppgave}},
phdthesis = {{Doktoravhandling}{Doktoravhandling}},
origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
@@ -56,22 +134,23 @@
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -117,9 +196,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
index 038b9ec2c7a..079a6c7e4f3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,21 +20,101 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {nswissgerman},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
@@ -45,8 +123,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
index 5658290a991..8837cbb3dc7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{nynorsk-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {nynorsk},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produsent}{produsent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss{\o}r}{regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fr{\aa}}{fr{\aa}}},
archivedat = {{arkivert\space ved}{arkivert\space ved}},
reviewof = {{melding\space av}{melding\space av}},
- producer = {{produsent}{produsent}},
- execproducer = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
- director = {{regiss{\o}r}{regiss{\o}r}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}},
phdthesis = {{Doktoravhandling}{Doktoravhandling}},
origyear = {{opphavleg\space publisert}{opphavleg\space publisert}},
@@ -56,22 +134,23 @@
typevolseriess = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -117,9 +196,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
index e4d32d1eca2..aef149d64e0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{portuguese-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,26 +17,108 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {portuguese},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produtor}{produtor}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{produtor executivo}{produtor executivo}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{diretor}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{escritor}{escritor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{com}{com}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
on = {{em}{em}},
retrieved = {{obtido}{obtido}},
available = {{dispon\'ivel}{disp.}},
from = {{de}{de}},
archivedat = {{arquivado\space em}{arquivado\space em}},
reviewof = {{Revis\~ao\space de}{revis\~ao\space de}},
- producer = {{produtor}{produtor}},
- execproducer = {{produtor executivo}{produtor executivo}},
- director = {{diretor}{diretor}},
- writer = {{escritor}{escritor}},
- with = {{com}{com}},
origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
typechair = {{Coordenador}{Coord\adddot}},
typechairs = {{Coordenadores}{Coords\adddot}},
@@ -48,22 +128,25 @@
typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}},
typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}},
typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -83,9 +166,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -105,9 +188,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
index 242e91d4745..e5a9e397d79 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{russian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,27 +17,107 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {russian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{продюсер}{продюсер}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{исполнительный продюсер}{исполнительный продюсер}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{режиссер}{режиссер}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{сценарист}{сценарист}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{с}{с}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{исправленное издание}{испр\adddotspace изд\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
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 = {{Председатели}{Председатели}},
@@ -51,6 +129,8 @@
typevolseriess = {{Редакторы\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
annodomini = {{нашей\space эры}{н\adddotspace э\adddot}},
beforechrist = {{до\space нашей\space эры}{до н\adddotspace э\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -75,9 +155,9 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -99,9 +179,9 @@
\mkbibmonth{\thefield{#2}}}%
{\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -123,9 +203,9 @@
\mkbibmonth{\thefield{#2}}}%
{\addspace\lbx@sl@mkbibmonth{\thefield{#2}}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
index 42a1d5a515b..5e61d3fb3e3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{slovene-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,11 +17,50 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\NewBibliographyString{% Month name variants used after day
datejanuary,
@@ -42,19 +79,61 @@
\DeclareBibliographyStrings{%
inherit = {slovene},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producent}{producent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{re\v{z}iser}{re\v{z}iser}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{avtor}{avtor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{z}{z}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{dopolnjena izdaja}{dopolnjena iz\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
on = {{na}{na}},
retrieved = {{pridobljeno}{pridobljeno}},
available = {{dostopno}{dostopno}},
from = {{}{}},
archivedat = {{arhivirano\space na}{arhivirano\space na}},
- with = {{z}{z}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
- producer = {{producent}{producent}},
- execproducer = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}},
- director = {{re\v{z}iser}{re\v{z}iser}},
- writer = {{avtor}{avtor}},
+ host = {{host}{host}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
datejanuary = {{januarja}{januarja}},
datefebruary = {{februarja}{februarja}},
datemarch = {{marca}{marca}},
@@ -78,6 +157,8 @@
typevolseriess = {{uredniki}{ur\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -102,9 +183,9 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -126,9 +207,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -150,9 +231,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index 6fa5444bc93..ba72381db8d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,10 +1,8 @@
-\ProvidesFile{spanish-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -21,15 +19,94 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {spanish},
- inpress = {{en prensa}{en prensa}},% remove when biblatex has it
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{productor}{productor}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{productor ejecutivo}{productor ejecutivo}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{escritor}{escritor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{con}{con}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
january = {{enero}{enero}},
february = {{febrero}{febrero}},
march = {{marzo}{marzo}},
@@ -46,11 +123,11 @@
mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}},
phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}},
revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}},
- producer = {{productor}{productor}},
- execproducer = {{productor ejecutivo}{productor ejecutivo}},
- director = {{director}{director}},
- writer = {{escritor}{escritor}},
- with = {{con}{con}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{P\'agina}{{}p\adddot}},
pages = {{P\'aginas}{{}pp\adddot}},
on = {{el}{el}},
@@ -59,8 +136,8 @@
from = {{desde}{desde}},
archivedat = {{archivado en}{archivado en}},
reviewof = {{revisi\'on\space de}{revisi\'on\space de}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}},
typechair = {{Coordinador}{Coord\adddot}},
typechairs = {{Coordinadores}{Coords\adddot}},
@@ -72,18 +149,20 @@
typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -103,9 +182,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -125,9 +204,9 @@
\mkbibmonth{\thefield{#2}}%
}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
index e4afdd9a49f..3b6d70ef4ce 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,8 +1,6 @@
-\ProvidesFile{swedish-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -20,15 +18,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {swedish},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producent}{producent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{exekutiv\space producent}{exekutiv\space producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss\"or}{regiss\"or}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{sida}{{}s\adddot}},
pages = {{sidor}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -38,15 +121,10 @@
archivedat = {{arkiverat\space vid}{arkiverat\space vid}},
nodate = {{utan\space {\aa}r}{u\adddot~{\aa}}},
reviewof = {{granskning\space av}{granskning\space av}},
- producer = {{producent}{producent}},
- execproducer = {{exekutiv\space producent}{exekutiv\space producent}},
- director = {{regiss\"or}{regiss\"or}},
editor = {{redakt\"or}{red\adddot}},
editors = {{redakt\"or}{red\adddot}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{examensuppsats}{examensuppsats}},
phdthesis = {{doktorsavhandling}{doktorsavhandling}},
origyear = {{originalarbete\space publicerat}{originalarbete\space publicerat}},
@@ -60,15 +138,17 @@
typevolseriess = {{redakt\"orer}{red\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -90,9 +170,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
index 67f5b39c018..2073ff067db 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
@@ -1,11 +1,9 @@
-\ProvidesFile{swissgerman-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -22,31 +20,112 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {swissgerman},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Executive\space Producers}},%FIXME
+ director = {{Regisseur}{Regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
retrieved = {{Zugriff\space am}{Zugriff\space am}},
available = {{erh\"altlich}{erh\"altlich}},
- with = {{mit}{mit}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +137,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
+
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +172,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +195,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%