summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-apa
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-14 23:29:42 +0000
committerKarl Berry <karl@freefriends.org>2012-07-14 23:29:42 +0000
commit9c45fe88cb4094081b2b1243cd17bcc43439c041 (patch)
tree7cc4b04347495547b4afce8a28ac028256eb69d9 /Master/texmf-dist/tex/latex/biblatex-apa
parent9c2ad73f6c5870b83ac88537986c2bbb2294f7c4 (diff)
biblatex-apa (10jul12)
git-svn-id: svn://tug.org/texlive/trunk@27057 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-apa')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx19
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx422
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx88
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx143
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx13
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx13
13 files changed, 622 insertions, 167 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 411537fd556..fdccae125f5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,5 +1,4 @@
-% v4.6
-\ProvidesFile{american-apa.lbx}
+\ProvidesFile{american-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{american}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {american},
@@ -33,9 +37,16 @@
from = {{from}{from}},
archivedat = {{archived\space at}{archived\space at}},
nodate = {{no\space date}{{}n\adddot d\adddot}},
- reviewof = {{Review\space of}{review\space of}},
+ 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}},
january = {{January}{January}},
february = {{February}{February}},
march = {{March}{March}},
@@ -48,7 +59,7 @@
october = {{October}{October}},
november = {{November}{November}},
december = {{December}{December}},
- mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}},
+ 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}},
typechair = {{Chair}{Chair}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 1d346fad9e4..49cb6e1bc2b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -1,5 +1,4 @@
-%% apa.bbx v4.7
-%% Copyright 2011 Philip Kime
+%% Copyright 2012 Philip Kime
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,6 +16,7 @@
%%
%% apa.cbx (biblatex citation style)
%% apa.bbx (biblatex references style)
+%% apa.dbx (biblatex style data model)
%% *.lbx (localisation files for APA-specific strings)
%% biblatex-apa.pdf (Style documentation)
%% biblatex-apa.tex (Style documentation source)
@@ -25,8 +25,8 @@
%% biblatex-apa-test-citations.bib (Style examples - citations)
%% biblatex-apa-test-references.bib (Style examples - references)
-\ProvidesFile{apa.bbx}
-\RequireBiber[2]
+\ProvidesFile{apa.bbx}[2012/07/01\space v5.0\space APA biblatex references style]
+\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -146,19 +146,15 @@
% eprint references
\DeclareFieldFormat{eprint:eric}{%
- \iffieldequalstr{userb}{urlisabstract}
- {\printtext{\bibcpstring{abstract}}\addspace%
- \printtext{\bibstring{retrieved}}}
- {\printtext{\bibcpstring{retrieved}}}%
- \setunit{\addspace}%
- \printtext{\bibstring{from}}\addspace%
- ERIC\addspace database\addspace%
- \mkbibparens{#1}}
+ \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
@@ -179,10 +175,15 @@
\field{sortkey}
}
\sort{
- \name{sortname}
- \name{author}
- \name{editor}
- \name{translator}
+ \field{sortname}
+ \field{author}
+ \field{editor}
+ \field{translator}
+ \field{writer}
+ \field{director}
+ \field{producer}
+ \field{execproducer}
+ \field{origauthor}
\field{sorttitle}
\field{title}
}
@@ -203,6 +204,10 @@
\DeclareLabelyear{pubstate,year,eventyear,origyear,urlyear}
+% 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 sort of this needs treating in
+% the style after biber has finished. Very unlikely though.
\ExecuteBibliographyOptions{labelyear=true,%
sorting=apa,%
backref=true,%
@@ -213,8 +218,10 @@
uniquelist=true,%
uniquename=init,%
citetracker=true,%
- maxnames=2,%
- minnames=1,%
+ maxcitenames=2,%
+ mincitenames=1,%
+ maxbibnames=7,%
+ minbibnames=6,%
abbreviate=true,%
mincrossrefs=999,%
alldates=apalong}
@@ -245,6 +252,17 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.06:47) Reviews are awkward - if no author, date
+% position changes so we need a flag to
+% track this
+
+\newbool{bbx:noreviewauthor}
+\AtEveryBibitem{\global\boolfalse{bbx:noreviewauthor}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.30) Sometimes "Vol" is inside the additional
% material parens, sometimes not. This bool
@@ -333,7 +351,7 @@
{\addcomma\addspace\ldots\addspace}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
- {\ifthenelse{\iffieldequalstr{usere}{unkauth}\OR\iffieldequalstr{usere}{unkauthdate}}
+ {\ifthenelse{\iffieldequalstr{doubtfulauthor}{true}}
{\iffirstinits
{\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}}
{\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}?}}}
@@ -347,7 +365,12 @@
{\usebibmacro{labeltitle}}
{\printnames[apaauthor][-\value{listtotal}]{author}%
\setunit*{\addspace}%
- \printfield{nameaddon}}%
+ \printfield{nameaddon}%
+ \ifnameundef{with}
+ {}
+ {\printtext{\bibstring{with}\addspace}%
+ \printnames[apaauthor][-\value{listtotal}]{with}
+ \setunit*{\addspace}}}%
\newunit\newblock%
\usebibmacro{labelyear+extrayear}}
@@ -402,7 +425,7 @@
{\printtext[yearorunkyear]{\printdateextra}}}}
\DeclareFieldFormat{yearorunkyear}{%
- \ifthenelse{\iffieldequalstr{usere}{unkdate}\OR\iffieldequalstr{usere}{unkauthdate}}
+ \ifthenelse{\iffieldequalstr{doubtfuldate}{true}}
{\mkbibbrackets{ca\adddot\addspace#1}}
{\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}\AND\iffieldundef{day}}
{\mkbibparens{\usebibmacro{noyear}}}
@@ -426,7 +449,7 @@
\DeclareFieldFormat{apacase}{\MakeSentenceCase*{#1}}
\DeclareFieldFormat{issuetitle}{#1\isdot}
-\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}}
\DeclareFieldFormat{origtitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
\DeclareFieldFormat[article]{title}{#1\isdot}
\DeclareFieldFormat[article]{origtitle}{\MakeSentenceCase*{#1}\isdot}
@@ -443,12 +466,17 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.01 Example 10) Articles that aren't newspapers don't have
-% prefix for pages.
+% (APA 7.01 Example 10) Newspapers have prefix for pages.
+
+\DeclareFieldFormat[newsarticle]{pages}{\mkpageprefix{#1}}
+\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}}
+\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[newsarticle]{title}{#1}
+\DeclareFieldFormat[article]{pages}{#1}
-\DeclareFieldFormat[article]{pages}{\iffieldequalstr{entrysubtype}{newspaper}
- {\mkpageprefix{#1}}
- {#1}}
+\newbibmacro*{newspaper}{%
+ \printfield{newspaper}
+ \setunit{\addcomma\space}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -494,8 +522,9 @@
\ifthenelse{%
\ifnameundef{author}\AND%
\(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND%
- \ifnameundef{namea}\AND%
- \ifnameundef{nameb}}
+ \ifnameundef{producer}\AND%
+ \ifnameundef{director}\AND%
+ \ifnameundef{writer}}
{\newunit\newblock
\usebibmacro{labelyear+extrayear}}
{}}}
@@ -645,7 +674,7 @@
\NumCheckSetup{\ifcurrentfield{pages}
{\DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}}
- {\DeclareNumChars{.}}}
+ {}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -821,7 +850,7 @@
\newunit\newblock
\iffieldundef{volume}
{}
- {\setunit{\global\booltrue{bbx:volseen}}%
+ {\setunit{\addspace\global\booltrue{bbx:volseen}}%
\printfield{volume}%
\printfield{part}%
\setunit{\adddot}%
@@ -929,81 +958,73 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 7.06) Reviews
-\DeclareFieldFormat[review]{title}{#1}
-\DeclareFieldFormat[review]{origtitle}{\mkbibemph{#1}}
+% The title of the review depends on the entrytype of the thing reviewed
+\DeclareFieldFormat[review]{title}{
+ \entrydata*{\thefield{related}}{%
+ \iffieldequalstr{entrytype}{article}
+ {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}}
+ {\printtext[apacase]{\thefield{savedtitle}}}}}
+
\DeclareFieldFormat[review]{pages}{#1}
\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}}
-\newbibmacro*{reviewauthor}{%
+\renewbibmacro*{reviewauthor}{%
\ifnameundef{author}
- {\usebibmacro{reviewlabeltitle}}
- {\printnames[apaauthor][-\value{listtotal}]{author}}%
- \newunit\newblock%
- \usebibmacro{labelyear+extrayear}}
-
-\newbibmacro*{reviewlabeltitle}{%
- \iffieldundef{label}
- {\usebibmacro{reviewof}%
- \clearfield{entrysubtype}%
- \clearfield{origtitle}%
- \clearfield{verba}}
- {\printfield{label}}}
-
-\newbibmacro*{reviewtitle}{%
- \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
- {\printtext{}}% Dummy printtext as we do want to record that we output
- % a title for the punctuation tracker
- {\printtext[title]{%
- \printfield[apacase]{title}%
- \setunit{\subtitlepunct}%
- \printfield[apacase]{subtitle}}%
- \setunit{\addspace}%
- \printfield{titleaddon}}}
-
-\newbibmacro*{reviewof}{%
- \iffieldundef{origtitle}
- {}
- {\printtext[brackets]{%
- \printfield{entrysubtype}\addspace%
- \printtext[origtitle]{%
- \printfield[apacase]{origtitle}%
- \setunit{\subtitlepunct}%
- \printfield[apacase]{origsubtitle}}%
- \setunit{\addcomma\addspace}%
- \printfield{verba}}}}
+ {\booltrue{bbx:noreviewauthor}}
+ {\usebibmacro{author}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Films
+% Media authors
-\newbibmacro*{mediaauthor}{%
- \ifnameundef{namea}
+\newbibmacro*{producer}{%
+ \ifnameundef{producer}
{}
- {\printnames[apanames][-\value{listtotal}]{namea}%
- \newunit%
- \printtext[parens]{\printfield{nameatype}}}
- \setunit*{\addcomma\addspace\&\addspace}%
- \ifnameundef{nameb}
+ {\printnames[apaauthor][-\value{listtotal}]{producer}%
+ \newunit
+ \printtext[parens]{\bibcpstring{producer}}%
+ \setunit*{\addcomma\addspace\&\addspace}}}
+
+\newbibmacro*{director}{%
+ \ifnameundef{director}
{}
- {\printnames[apanames][-\value{listtotal}]{nameb}%
- \setunit{\addspace}%
- \printtext[parens]{\printfield{namebtype}}}
- \newunit
- \usebibmacro{labelyear+extrayear}}
+ {\printnames[apaauthor][-\value{listtotal}]{director}%
+ \newunit
+ \printtext[parens]{\bibcpstring{director}}%
+ \setunit*{\addcomma\addspace\&\addspace}}}
+
+\newbibmacro*{writer}{%
+ \ifnameundef{writer}
+ {}
+ {\printnames[apaauthor][-\value{listtotal}]{writer}%
+ \newunit
+ \printtext[parens]{\bibcpstring{writer}}%
+ \setunit*{\addcomma\addspace\&\addspace}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%
-% (APA 7.07) Misc
+% (APA 7.07) Misc and data
-\DeclareFieldFormat[misc]{title}{\iffieldequalstr{userd}{dataset}{\mkbibemph{#1}}{%
- \iffieldequalstr{userd}{description}{\mkbibbrackets{#1}}{#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}}
+
+\newbibmacro*{datatitle}{%
+ \iffieldundef{title}
+ {\iffieldundef{entrysubtype}
+ {}
+ {\printfield{entrysubtype}}}
+ {\iffieldundef{entrysubtype}
+ {}
+ {\usebibmacro{title}\addspace
+ \printfield{entrysubtype}}}}
%
%%%%%%%%%%%%%%%%%
@@ -1024,11 +1045,11 @@
\iffieldundef{maintitle}
{}
{\usebibmacro{in}%
- \ifnameundef{namec}
+ \ifnameundef{execproducer}
{}
- {\printnames[apanames][-\value{listtotal}]{namec}%
- \setunit{\addspace}%
- \printtext[parens]{\printfield{namectype}}}
+ {\printnames[apanames][-\value{listtotal}]{execproducer}%
+ \addspace
+ \printtext[parens]{\bibcpstring{execproducer}}}
\setunit{\addcomma\addspace}%
\usebibmacro{avmaintitle}%
\newunit}}
@@ -1043,13 +1064,10 @@
\setunit{\addspace}}
\printfield{maintitleaddon}}
-\newbibmacro*{on}{%
- \bibcpstring{on}\setunit{\space}}
-
\newbibmacro*{album}{%
\iffieldundef{maintitle}
{}
- {\usebibmacro{on}%
+ {\bibcpstring{on}%
\setunit{\addspace}%
\usebibmacro{avmaintitle}%
\newunit}}
@@ -1059,11 +1077,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10) Letters
-
+% (APA 7.10) Letter/Letters
-\DeclareFieldFormat[letter]{title}{\iffieldequalstr{entrysubtype}{collection}{#1}{\mkbibbrackets{#1}}}
+\DeclareFieldFormat[letter]{title}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[letters]{title}{#1}
\DeclareFieldFormat[letter]{number}{\mkbibparens{#1}}
+\DeclareFieldFormat[letters]{number}{\mkbibparens{#1}}
%
%%%%%%%%%%%%%%%%%%%%
@@ -1072,17 +1091,16 @@
% (APA 6.31) URLs
\DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{abstracturl}{\url{#1}}
\DeclareFieldFormat{urldate}{#1}
\renewbibmacro*{url+urldate}{%
- \def\@apaar{retrieved}% default
- \ifthenelse{\iffieldundef{url}\OR\NOT\iffieldundef{doi}}
+ \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\)\OR\NOT\iffieldundef{doi}}
{}
- {\iffieldundef{usera}{}{\patchcmd{\@apaar}{retrieved}{\thefield{usera}}{}{}}%
- \iffieldequalstr{userb}{urlisabstract}
- {\printtext{\bibcpstring{abstract}}\addspace%
- \printtext{\bibstring{\@apaar}}}
- {\printtext{\bibcpstring{\@apaar}}}%
+ {\iffieldundef{abstracturl}
+ {}
+ {\printtext{\bibcpstring{abstract}}\addspace}%
+ \printtext{\bibstring{retrieved}}%
\setunit{\addspace}%
\iffieldundef{urlyear}
{}
@@ -1090,10 +1108,10 @@
\setunit*{\addcomma\addspace}}%
\printtext{\bibstring{from}}%
\setunit*{\addspace}%
- \printlist{organization}%
+ \printfield{urldescription}%
\setunit*{\addcolon\addspace}%
- \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
-
+ \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
+ \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
%
%%%%%%%%%%%%%%%%%
@@ -1138,7 +1156,45 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newbibmacro*{apa:finpunct}{%
- \iffieldundef{addendum}{}{\renewcommand*{\finentrypunct}{\relax}}}
+ \ifboolexpr{
+ test {\iffieldundef{addendum}}
+ and
+ test {\iffieldundef{related}}}
+ {}
+ {\renewcommand*{\finentrypunct}{\relax}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Related entries
+
+\DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}}
+\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
+
+\newbibmacro*{related:reprintfrom}[1]{%
+ \entrydata*{#1}{%
+ \printtext{\mkbibemph{\printfield[apacase]{title}}}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \setunit{\addcomma\addspace}%
+ \bibstring{byauthor}\addspace
+ \printnames[apanames][-\value{listtotal}]{editor}%
+ \printnames[apanames][-\value{listtotal}]{author}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}}}
+
+\newbibmacro*{related:reviewof}[1]{%
+ \setunit{}% Sanitize 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}%
+ \setunit{\addcomma\addspace}%
+ \printdateextra}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 7.x) General type layouts
@@ -1159,6 +1215,32 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
+ \usebibmacro{apa:finpunct}%
+ \usebibmacro{apa:pageref}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{newsarticle}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{title}%
+ \newunit\newblock
+ \usebibmacro{newspaper}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \newunit\newblock
+ \printfield{entrysubtype}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:finpunct}%
\usebibmacro{apa:pageref}%
\usebibmacro{finentry}}
@@ -1183,6 +1265,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1205,6 +1289,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1233,6 +1319,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1255,6 +1343,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1283,6 +1373,8 @@
\usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1311,6 +1403,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1334,7 +1428,7 @@
\newunit\newblock
\printlist{organization}%
\newunit
- \printfield{eventtitle}%
+ \printfield[apacase]{eventtitle}%
\newunit
\printfield{venue}%
\newunit\newblock
@@ -1345,6 +1439,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1373,6 +1469,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1400,6 +1498,8 @@
\iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1423,6 +1523,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1447,6 +1549,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1468,6 +1572,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1486,6 +1592,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1495,9 +1603,11 @@
\usebibmacro{begentry}%
\usebibmacro{reviewauthor}%
\setunit{\labelnamepunct}\newblock
- \usebibmacro{reviewtitle}%
+ \usebibmacro{title}%
\newblock
- \usebibmacro{reviewof}%
+ \usebibmacro{related}%
+ \newunit\newblock
+ \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extrayear}}{}%
\newunit\newblock
\usebibmacro{journal+issuetitle}%
\newunit\newblock
@@ -1536,6 +1646,34 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
+ \usebibmacro{apa:pageref}%
+ \usebibmacro{apa:finpunct}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{data}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author}%
+ \newunit\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}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1552,12 +1690,38 @@
\printfield{number}%
\newunit\newblock
\printfield{note}%
+ \setunit{\addcomma\addspace}\newblock
+ \usebibmacro{location+publisher}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
+ \usebibmacro{apa:pageref}%
+ \usebibmacro{apa:finpunct}%
+ \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{letters}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor}%
+ \setunit{\labelnamepunct}\newblock
+ \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
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1565,7 +1729,11 @@
\DeclareBibliographyDriver{video}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{mediaauthor}%
+ \usebibmacro{writer}%
+ \usebibmacro{director}%
+ \usebibmacro{producer}%
+ \newunit\newblock
+ \usebibmacro{labelyear+extrayear}%
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
@@ -1578,6 +1746,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1585,7 +1755,11 @@
\DeclareBibliographyDriver{movie}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{mediaauthor}%
+ \usebibmacro{writer}%
+ \usebibmacro{director}%
+ \usebibmacro{producer}%
+ \newunit\newblock
+ \usebibmacro{labelyear+extrayear}%
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
@@ -1598,6 +1772,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1605,7 +1781,11 @@
\DeclareBibliographyDriver{audio}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{mediaauthor}%
+ \usebibmacro{writer}%
+ \usebibmacro{director}%
+ \usebibmacro{producer}%
+ \newunit\newblock
+ \usebibmacro{labelyear+extrayear}%
\setunit{\labelnamepunct}\newblock
\usebibmacro{title}%
\setunit{\addspace}\newblock
@@ -1616,6 +1796,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1631,6 +1813,8 @@
\newunit\newblock
\usebibmacro{location+publisher}%
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1646,6 +1830,8 @@
\newunit\newblock
\usebibmacro{doi+eprint+url}%
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
@@ -1668,6 +1854,8 @@
\usebibmacro{doi+eprint+url}%
\newunit\newblock
\printfield{addendum}%
+ \newunit\newblock
+ \usebibmacro{related}%
\usebibmacro{apa:pageref}%
\usebibmacro{apa:finpunct}
\usebibmacro{finentry}}
@@ -1747,6 +1935,7 @@
\newunit}
\newbibmacro*{type+institution}{%
+ \setunit{\addspace}%
\ifthenelse{\iffieldundef{type}\AND\iffieldundef{institution}}
{}
{\printtext[parens]{%
@@ -1764,7 +1953,10 @@
\iffieldundef{label}
{\iffieldundef{shorttitle}
{\printfield{title}%
- \clearfield{title}
+ \clearfield{title}%
+ \setunit{\addspace}%
+ \printfield{entrysubtype}%
+ \clearfield{entrysubtype}%
\global\booltrue{bbx:titleinauthpos}}
{\printfield[title]{shorttitle}}}
{\printfield{label}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 14cee944036..13d0e397643 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -1,5 +1,4 @@
-%% apa.cbx v4.7
-%% Copyright 2011 Philip Kime
+%% Copyright 2012 Philip Kime
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,6 +16,7 @@
%%
%% apa.cbx (biblatex citation style)
%% apa.bbx (biblatex references style)
+%% apa.dbx (biblatex style data model)
%% *.lbx (localisation files for APA-specific strings)
%% biblatex-apa.pdf (Style documentation)
%% biblatex-apa.tex (Style documentation source)
@@ -25,8 +25,8 @@
%% biblatex-apa-test-citations.bib (Style examples - citations)
%% biblatex-apa-test-references.bib (Style examples - references)
-\ProvidesFile{apa.cbx}
-\RequireBiber[1]
+\ProvidesFile{apa.cbx}[2012/07/01\space 5.0\space APA biblatex citation style]
+\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.16) year postfix is not emphasised or italic
@@ -164,6 +164,25 @@
% (APA 6.28) If no date, use "(n.d.)"
% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
+\newbibmacro*{cite:author}{%
+ \iffieldequals{namehash}{\cbx@lasthash}
+% Multiple cites in one command
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:plabelyear+extrayear}}%
+% Single cite
+ {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+% No author/editor
+ {\usebibmacro{cite:noname}%
+ \savefield{namehash}{\cbx@lasthash}}
+% Normal cite
+ {\ifnameundef{shortauthor}
+ {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}%
+ {\ifciteseen
+ {\printnames{shortauthor}}
+ {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}\addspace\printnames[sabrackets]{shortauthor}}}%
+ \savefield{namehash}{\cbx@lasthash}}}%
+ \setunit{\multicitedelim}}
+
\newbibmacro*{cite}{%
\iffieldequals{namehash}{\cbx@lasthash}
% Multiple cites in one command
@@ -178,22 +197,33 @@
\savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
- {\printnames[labelname][-\value{listtotal}]{labelname}}
+ {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}%
{\ifciteseen
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
+ {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}\addspace\printnames[sabrackets]{shortauthor}}}%
\setunit{\nameyeardelim}%
\usebibmacro{cite:plabelyear+extrayear}%
\savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
+\newbibmacro*{with}{%
+ \ifnameundef{with}
+ {}
+ {\setunit{}\addspace\bibopenparen\bibstring{with}\addspace
+ \printnames[labelname][-\value{listtotal}]{with}\bibcloseparen}}
+
\newbibmacro*{textcite}{%
\iffieldequals{namehash}{\cbx@lasthash}
% Compact cite - more than one thing for same author
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extrayear}}
-% Single cite
- {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+% New cite
+ {%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \setunit{\compcitedelim}%
+ \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
% No author/editor or patent
{\iffieldundef{shorthand}%
% Cite using title
@@ -208,11 +238,11 @@
% Normal full cite
{\ifnameundef{shortauthor}%
% Normal full cite
- {\printnames[labelname][-\value{listtotal}]{labelname}}
+ {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}
% Cite using short author
{\ifciteseen
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}}}%
+ {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}}}%
% Year
\setunit{\ifbool{cbx:np}
{\nameyeardelim}
@@ -224,14 +254,9 @@
{}
{\printnames{shortauthor}\setunit{\nameyeardelim}}}%
% Actual year printing
- \usebibmacro{cite:plabelyear+extrayear}%
- \savefield{namehash}{\cbx@lasthash}}}%
- \setunit{%
- \ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- % multicitedelim semi-colon doesn't make much sense for textcites
- \compcitedelim}}
+ \usebibmacro{cite:plabelyear+extrayear}%
+ % Save name hash for checks later
+ \savefield{namehash}{\cbx@lasthash}}}}
\newbibmacro*{cite:plabelyear+extrayear}{%
\iffieldundef{labelyear}
@@ -308,6 +333,8 @@
{\nameyeardelim
\printfield{postnote}}}
+
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -372,18 +399,9 @@
\newbibmacro*{textcite:postnote}{%
\usebibmacro{postnote}%
- \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
- {\setunit{}%
- \printtext{%
- \ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}}
- {\setunit{%
- \ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
- \multicitedelim}}}
-
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}
\newbibmacro*{cite:init}{%
\global\boolfalse{cbx:parens}%
@@ -434,6 +452,8 @@
{}
{\usebibmacro{postnote}}
+\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim}
+
\DeclareCiteCommand{\textcite}
{\usebibmacro{cite:init}%
\usebibmacro{prenote}}
@@ -442,4 +462,12 @@
{}
{\usebibmacro{textcite:postnote}}
+\DeclareCiteCommand{\citeauthor}
+ {\usebibmacro{cite:init}%
+ \usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite:author}}
+ {}
+ {\usebibmacro{postnote}}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
new file mode 100644
index 00000000000..a29a1c2c545
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -0,0 +1,143 @@
+%% Copyright 2012 Philip Kime
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Philip Kime.
+%%
+%% This work consists of the files:
+%%
+%% apa.cbx (biblatex citation style)
+%% apa.bbx (biblatex references style)
+%% apa.dbx (biblatex style data model)
+%% *.lbx (localisation files for APA-specific strings)
+%% biblatex-apa.pdf (Style documentation)
+%% biblatex-apa.tex (Style documentation source)
+%% biblatex-apa-test.pdf (Style examples)
+%% biblatex-apa-test.tex (Style examples source)
+%% biblatex-apa-test-citations.bib (Style examples - citations)
+%% biblatex-apa-test-references.bib (Style examples - references)
+
+\ProvidesFile{apa.dbx}[2012/07/01\space v5.0\space APA biblatex style data model]
+\RequireBiber[3]
+
+\DeclareDatamodelEntrytypes{
+ letters,
+ data,
+ newsarticle}
+
+\DeclareDatamodelFields[type=list, datatype=name]{
+ with,
+ writer,
+ producer,
+ execproducer,
+ director}
+
+\DeclareDatamodelFields[type=field, datatype=literal]{
+ doubtfulauthor,
+ doubtfuldate,
+ titleisdescription,
+ newspaper,
+ urldescription}
+
+\DeclareDatamodelFields[type=field, datatype=verbatim]{
+ abstracturl}
+
+\DeclareDatamodelEntryfields{
+ titleisdescription,
+ with,
+ doubtfulauthor,
+ doubtfuldate,
+ abstracturl,
+ urldescription}
+
+
+\DeclareDatamodelEntryfields[video]{
+ writer,
+ producer,
+ execproducer,
+ director}
+
+\DeclareDatamodelEntryfields[newsarticle]{
+ author,
+ newspaper,
+ title,
+ day,
+ endday,
+ endmonth,
+ endyear,
+ month,
+ year,
+ addendum,
+ doi,
+ editor,
+ editora,
+ editorb,
+ editorc,
+ editoratype,
+ editorbtype,
+ editorctype,
+ eid,
+ eprint,
+ eprintclass,
+ eprinttype,
+ issn,
+ issue,
+ issuetitle,
+ issuesubtitle,
+ language,
+ 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,
+ pubstate,
+ subtitle,
+ titleaddon,
+ type,
+ url,
+ urlday,
+ urlendday,
+ urlendmonth,
+ urlendyear,
+ urlmonth,
+ urlyear,
+ version}
+
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 b297ecd12f6..78ee414a269 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,5 +1,4 @@
-% v4.6
-\ProvidesFile{brazilian-apa.lbx}
+\ProvidesFile{brazilian-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {brazilian},
@@ -32,6 +36,11 @@
archivedat = {{arquivado\space em}{arquivado\space em}},
nodate = {{sem\space data}{{}s\adddot d\adddot}},
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}},
typechairs = {{Coordenadores}{Coords\adddot}},
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 a4196e8f3d2..da4080ef7e3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{british-apa.lbx}
+\ProvidesFile{british-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{british}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {british},
@@ -34,6 +38,11 @@
archivedat = {{archived\space at}{archived\space at}},
nodate = {{no\space date}{{}n\adddot d\adddot}},
reviewof = {{Review\space of}{review\space of}},
+ 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}},
january = {{January}{January}},
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 a0eee6a4b39..d61f489088e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{dutch-apa.lbx}
+\ProvidesFile{dutch-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {dutch},
@@ -34,6 +38,11 @@
archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}},
nodate = {{geen\space datum}{{}n\adddot d\adddot}},
reviewof = {{Bespreking\space van}{bespreking\space van}},
+ producer = {{producer}{producer}},
+ execproducer = {{executive producer}{executive producer}},
+ director = {{director}{director}},
+ writer = {{writer}{writer}},
+ with = {{with}{with}},
paragraph = {{par\adddot}{par\adddot}},
paragraphs = {{par\adddot}{par\adddot}},
january = {{januari}{januari}},
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 82c4be76ffa..4283c0d10b0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{french-apa.lbx}
+\ProvidesFile{french-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{french}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {french},
@@ -42,6 +46,11 @@
pages = {{Pages}{{}pp\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}},
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 72127eeb8c2..6ccca606d32 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{german-apa.lbx}
+\ProvidesFile{german-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {german},
@@ -37,11 +41,16 @@
november = {{November}{November}},
december = {{Dezember}{Dezember}},
revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+ producer = {{Produzent}{Produzent}},
+ execproducer = {{Produzent}{Produzent}},
+ director = {{Regisseur}{Regisseur}},
+ writer = {{Schriftsteller}{Schriftsteller}},
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}},
nodate = {{ohne\space Datum}{{}o\adddot D\adddot}},
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 eef20f1564e..46ff26e2071 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{greek-apa.lbx}
+\ProvidesFile{greek-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {greek},
@@ -34,6 +38,11 @@
archivedat = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}},
nodate = {{χωρίς\space ημερομηνία}{{}χ\adddot η\adddot}},
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}},
january = {{Ιανουάριος}{Ιανουάριος}},
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 62858b83328..c000e3d47f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{italian-apa.lbx}
+\ProvidesFile{italian-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {italian},
@@ -34,6 +38,11 @@
archivedat = {{archiviato\space il}{archiviato\space il}},
nodate = {{senza\space data}{{}n\adddot d\adddot}},
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}},
january = {{Gennaio}{Gennaio}},
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 61a352828df..594fe2e509a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{ngerman-apa.lbx}
+\ProvidesFile{ngerman-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% (APA 6.22) The example abbreviations
@@ -21,6 +20,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {ngerman},
@@ -37,6 +41,11 @@
november = {{November}{November}},
december = {{Dezember}{Dezember}},
revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+ producer = {{Produzent}{Produzent}},
+ execproducer = {{Produzent}{Produzent}},
+ director = {{Regisseur}{Regisseur}},
+ writer = {{Schriftsteller}{Schriftsteller}},
+ with = {{mit}{mit}},
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
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 5ea970378a2..a85ed039e37 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,5 +1,4 @@
-% v4.7
-\ProvidesFile{spanish-apa.lbx}
+\ProvidesFile{spanish-apa.lbx}[2012/07/01\space v5.0\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -23,6 +22,11 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
\DeclareBibliographyStrings{%
inherit = {spanish},
@@ -42,6 +46,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}{\'Ed\adddot\space R\'ev\adddot}},
+ producer = {{producer}{producer}},
+ execproducer = {{executive producer}{executive producer}},
+ director = {{director}{director}},
+ writer = {{writer}{writer}},
+ with = {{with}{with}},
page = {{P\'agina}{{}p\adddot}},
pages = {{P\'aginas}{{}pp\adddot}},
on = {{el}{el}},