summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-01-02 22:56:45 +0000
committerKarl Berry <karl@freefriends.org>2013-01-02 22:56:45 +0000
commit835ec1c13593ef44edd2cf0d4c73f183a65fa628 (patch)
treec620f82b6bf6a0198269e114088d4eed370cfd37
parentddff8d928fba272a4d256ee33196a0ba5610006a (diff)
biblatex-apa (2jan13)
git-svn-id: svn://tug.org/texlive/trunk@28699 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib20
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib11
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin100867 -> 101697 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex10
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin75395 -> 75792 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex11
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx167
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx4
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx2
25 files changed, 168 insertions, 107 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 527513bb63c..7053e53ee27 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 5.5
+Version 5.7
Permission is granted to copy, distribute and/or modify this software under
the terms of the LaTeX Project Public License, version
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index 4f4185c374a..6d60469cbf2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
@@ -392,3 +392,23 @@
AUTHOR = {Neil Nodate},
TITLE = {Testing 2},
}
+
+% Testing full name expansion (APA 6.27)
+@ARTICLE{6.27a,
+ AUTHOR = {Paul Janet},
+ TITLE = {The Notion of Personality},
+ ORIGTITLE = {La notion de la personnalité},
+ JOURNALTITLE = {Revue Scientifique},
+ VOLUME = {10},
+ PAGES = {574-575},
+ DATE = {1876}
+}
+
+@ARTICLE{6.27b,
+ AUTHOR = {Pierre Janet},
+ TITLE = {The Pathogenesis of Some Impulsions},
+ JOURNALTITLE = {Journal of Abnormal Psychology},
+ VOLUME = {1},
+ PAGES = {1-17},
+ DATE = {1906}
+}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
index 884e818507c..f853ddbf31a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
@@ -251,7 +251,7 @@
}
% (APA 7.01 Example 17)
-% Such unstructured extra information can be included in the NOTE field.
+% Such unstructured abstract information uses the ABSTRACTLOC field
% If the abstract/article was retreived from a standard online URI, things are little
% better defined - see examples 7.01:16*).
@ARTICLE{7.01:17,
@@ -261,7 +261,7 @@
VOLUME = {31},
PAGES = {24--53},
YEAR = {2000},
- NOTE = {Abstract retrieved from {S}ociological {A}bstracts database. (Accession No. 200010185)}
+ ABSTRACTLOC = {{S}ociological {A}bstracts database. (Accession No. 200010185)}
}
% (APA 7.02 Example 18)
@@ -517,10 +517,9 @@
@PROCEEDINGS{7.04:38,
AUTHOR = {S. Herculano-Houzel and C. E. Collins and P. Wong and J. H. Kaas and R. Lent},
TITLE = {The Basic Nonuniformity of the Cerebral Cortex},
- BOOKTITLE = {Proceedings of the {N}ational {A}cademy of {S}ciences},
+ BOOKTITLE = {Proceedings of the {N}ational {A}cademy of {S}ciences, {USA}},
VOLUME = {105},
PAGES = {12593--12598},
- LOCATION = {USA},
YEAR = {2008},
DOI = {10.1073/pnas.0805417105}
}
@@ -639,7 +638,7 @@
}
@VIDEO{apavid,
- AUTHOR = {{the American Psychological Association}},
+ PRODUCER = {{the American Psychological Association}},
TITLE = {Brief Therapy With Adolescents},
DATE = {2007}
}
@@ -1036,4 +1035,4 @@
EVENTDATE = {2010-09-07/2010-09-10},
LOCATION = {Coventry},
PAGES = {1--3}
-} \ No newline at end of file
+}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index e10e82335ff..7c11a431097 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
index 1bfd7fd6720..c1b6c79b50b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
@@ -152,7 +152,7 @@ name, we just give the name:\\
\apaex{\textcite{6.12c}}\\
\apaex{\textcite{6.12d}}\\
\apaex{\textcite{6.12c}}\footnote{This example is incorrect in the
- APA manual because «et al» is replacing only one name. This has been
+ APA 6th edition manual because «et al» is replacing only one name. This has been
verified with the APA and will be corrected in future editions.}\\
\apaex{\textcite{6.12d}}
@@ -348,7 +348,8 @@ semi-colon would be strange:
\apaex{\fullcite{FC1}}\\
\apaex{\fullcitebib{FC1}}
-\noindent Testing «with»\\
+% In citations, "WITH" is ignored (APA 6.27)
+\noindent Testing «with»---should not be present in cites\\
\apaex{\cite{with1}}\\
\apaex{\textcite{with1}}
@@ -360,6 +361,11 @@ semi-colon would be strange:
\apaex{\textcite{nodate1}}\\
\apaex{\textcite{nodate2}}
+\noindent Testing full name expansion (APA 6.27). See citation refs for how
+these appear in references\\
+\apaex{\textcite{6.27a}}\\
+\apaex{\textcite{6.27b}}
+
\end{refsection}
\begin{refsection}[biblatex-apa-test-references]
\nocite{*}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index 7be7bc67a32..d0166a55419 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
index b818d0ab078..a2de6b27beb 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -25,7 +25,7 @@
url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={5.6},
+ revision={5.7},
date={\today}}
\hypersetup{%
@@ -373,6 +373,15 @@ general notes:
\begin{changelog}
+\begin{release}{5.7}{2012-12-28}
+\item New name code to allow full name disambiguation as per APA 6.27
+\item Fixes to IN* types
+\end{release}
+
+\begin{release}{5.6}{2012-12-19}
+\item Fixed problems with EVENTDATE format
+\end{release}
+
\begin{release}{5.5}{2012-12-17}
\item Fixed serial comma requirement (APA 4.03)
\end{release}
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 0fc3f21a975..7acc6c338c9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{american}
% (APA 6.22) The example abbreviations
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 7d5f3dfa236..199b147c21f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -11,21 +11,8 @@
%% 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.bbx}[2012/12/20\space v5.6\space APA biblatex references style]
+
+\ProvidesFile{apa.bbx}[2012/12/28\space v5.7\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -217,11 +204,10 @@
sorting=apa,%
backref=true,%
pagetracker=true,%
- firstinits=true,%
useprefix=true,%
usetranslator=true,%
uniquelist=true,%
- uniquename=init,%
+ uniquename=full,%
citetracker=true,%
maxcitenames=2,%
mincitenames=1,%
@@ -229,9 +215,9 @@
minbibnames=6,%
abbreviate=true,%
mincrossrefs=999,%
- date=apalong,
- origdate=apalong,
- urldate=apalong,
+ date=apalong,%
+ origdate=apalong,%
+ urldate=apalong,%
eventdate=comp}
%
@@ -360,12 +346,8 @@
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
{\ifthenelse{\iffieldequalstr{doubtfulauthor}{true}}
- {\iffirstinits
- {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}?}}
- {\mkbibbrackets{\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}?}}}
- {\iffirstinits
- {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}
- {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}}}}%
+ {\mkbibbrackets{\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}?}}
+ {\usebibmacro{name:apa:last-first}{#1}{#3}{#4}{#5}{#7}}}}%
\ifmorenames{\andothersdelim\bibstring{andothers}}{}}
\renewbibmacro*{author}{%
@@ -376,8 +358,8 @@
\printfield{nameaddon}%
\ifnameundef{with}
{}
- {\printtext{\bibstring{with}\addspace}%
- \printnames[apaauthor][-\value{listtotal}]{with}
+ {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
+ \printnames[apaauthor][-\value{listtotal}]{with}}
\setunit*{\addspace}}}%
\newunit\newblock%
\usebibmacro{labelyear+extrayear}}
@@ -649,9 +631,7 @@
{\addcomma\addspace\ldots}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
- {\iffirstinits
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#7}}
- {\usebibmacro{name:first-last}{#1}{#3}{#5}{#7}}}}
+ {\usebibmacro{name:apa:first-last}{#1}{#3}{#4}{#5}{#7}}}%
\ifmorenames{\andothersdelim\bibstring{andothers}}{}}
\renewbibmacro*{author/editor}{%
@@ -691,29 +671,68 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27 Name format. Don't capitalise prefixes
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Name format. Don't capitalise prefixes
+% (APA 6.27) Full name disambiguation using brackets
+
+% #1 = last name
+% #2 = first name
+% #3 = first name (initials)
+% #4 = name prefix, a.k.a. 'von part'
+% #5 = name affix, a.k.a. 'junior part'
-\renewbibmacro*{name:last-first}[4]{%
+\renewbibmacro*{name:apa:last-first}[5]{%
+ \ifuseprefix
+ {\usebibmacro{name:delim}{#4#1}%
+ \usebibmacro{name:hook}{#4#1}%
+ \ifblank{#4}{}{%
+ \mkbibnameprefix{#4\isdot}%
+ \ifpunctmark{'}{}{\addhighpenspace}}%
+ \mkbibnamelast{#1\isdot}%
+ \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#3}\isdot%
+ \ifthenelse{\value{uniquename}>1}
+ {\addspace\mkbibbrackets{#2}}
+ {}}%
+ \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}
+ {\usebibmacro{name:delim}{#1}%
+ \usebibmacro{name:hook}{#1}%
+ \mkbibnamelast{#1}\isdot
+ \ifblank{#2#4}{}{\addcomma}%
+ \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+ \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}\isdot%
+ \ifthenelse{\value{uniquename}>1}
+ {\addspace\mkbibbrackets{#2}}
+ {}}%
+ \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}%
+ \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
+
+\renewbibmacro*{name:apa:first-last}[5]{%
\ifuseprefix
- {\usebibmacro{name:delim}{#3#1}%
- \usebibmacro{name:hook}{#3#1}%
- \ifblank{#3}{}{%
- \mkbibnameprefix{#3\isdot}%
+ {\usebibmacro{name:delim}{#2}%
+ \usebibmacro{name:hook}{#2}%
+ \ifblank{#2}{}{\mkbibnamefirst{#3}\isdot%
+ \ifthenelse{\value{uniquename}>1}
+ {\addspace\mkbibbrackets{#2}}
+ {}\addspace}%
+ \ifblank{#4}{}{%
+ \mkbibnameprefix{#4\isdot}%
\ifpunctmark{'}{}{\addhighpenspace}}%
\mkbibnamelast{#1\isdot}%
- \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
- \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+ \ifblank{#5}{}{\mkbibnameaffix{#5}\isdot}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
+ \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#3}\isdot%
+ \ifthenelse{\value{uniquename}>1}
+ {\addspace\mkbibbrackets{#2}}
+ {}\addspace}%
\mkbibnamelast{#1}\isdot
- \ifblank{#2#3}{}{\addcomma}%
+ \ifblank{#2#4}{}{\addcomma}%
\ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
- \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
- \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+ \ifblank{#4}{}{\addlowpenspace\mkbibnameprefix{#4}\isdot}%
+ \ifblank{#5}{}{\addcomma\addlowpenspace\mkbibnameaffix{#5}\isdot}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 6.27) Editor string in parens after author list
@@ -763,7 +782,7 @@
\ifnameundef{editorb}\AND%
\ifnameundef{editorc}\AND%
\ifnameundef{translator}}%
- {}%
+ {\setunit{\adddot\addspace}}%
{\ifnamesequal{editor}{translator}%
{\usebibmacro{in}%
\printnames[apanames][-\value{listtotal}]{editor}%
@@ -781,8 +800,8 @@
\clearname{translator}%
\setunit{\adddot\addspace}}%
\usebibmacro{in}%
- \usebibmacro{editorx}}}%
- \newunit}
+ \usebibmacro{editorx}}%
+ \setunit{\addcomma\addspace}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1117,23 +1136,24 @@
\DeclareFieldFormat{urldate}{#1}
\renewbibmacro*{url+urldate}{%
- \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\)\OR\NOT\iffieldundef{doi}}
+ \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}}
{}
- {\iffieldundef{abstracturl}
+ {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
{}
{\printtext{\bibcpstring{abstract}}\addspace}%
- \printtext{\bibstring{retrieved}}%
- \setunit{\addspace}%
- \iffieldundef{urlyear}
- {}
- {\printurldate%
- \setunit*{\addcomma\addspace}}%
- \printtext{\bibstring{from}}%
- \setunit*{\addspace}%
- \printfield{urldescription}%
- \setunit*{\addcolon\addspace}%
- \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
- \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
+ \printtext{\bibstring{retrieved}}%
+ \setunit{\addspace}%
+ \iffieldundef{urlyear}
+ {}
+ {\printurldate%
+ \setunit*{\addcomma\addspace}}%
+ \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}}}}
%
%%%%%%%%%%%%%%%%%
@@ -1177,13 +1197,22 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% 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}{%
- \ifboolexpr{
- test {\iffieldundef{addendum}}
- and
- test {\iffieldundef{related}}}
+ \iffieldundef{origyear}
+ {\ifboolexpr{
+ test {\iffieldundef{addendum}}
+ and
+ test {\iffieldundef{related}}}
{}
{\renewcommand*{\finentrypunct}{\relax}}}
+ {\renewcommand*{\finentrypunct}{\relax}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Related entries
@@ -1212,6 +1241,8 @@
\setunit{\addspace}%
\bibstring{byauthor}\addspace
\printnames[apanames][-\value{listtotal}]{author}%
+ \printnames[apanames][-\value{listtotal}]{producer}%
+ \printnames[apanames][-\value{listtotal}]{director}%
\setunit{\addcomma\addspace}%
\printdateextra}}
@@ -1379,7 +1410,7 @@
\usebibmacro{title}%
\ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
\usebibmacro{editor+trans}%
- \setunit{\addcomma\addspace}\newblock
+ \newblock
\usebibmacro{maintitle+booktitle}%
\newblock
\usebibmacro{addinfo}%
@@ -1441,8 +1472,8 @@
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
\usebibmacro{maintitle+booktitle}%
- \setunit{\addcomma\addspace}\newblock
- \printeventdate%
+ \iffieldundef{eventyear}{}{\setunit{\addcomma\addspace}}%
+ \printeventdate
\setunit*{\addspace}\newblock
\usebibmacro{addinfo}%
\newunit\newblock
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 2c7667b096c..ae483689653 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -25,7 +25,7 @@
%% biblatex-apa-test-citations.bib (Style examples - citations)
%% biblatex-apa-test-references.bib (Style examples - references)
-\ProvidesFile{apa.cbx}[2012/12/20\space v5.6\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2012/12/28\space v5.7\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -176,10 +176,10 @@
\savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
- {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}%
+ {\printnames[labelname][-\value{listtotal}]{labelname}}%
{\ifciteseen
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}\addspace\printnames[sabrackets]{shortauthor}}}%
+ {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
\savefield{namehash}{\cbx@lasthash}}}%
\setunit{\multicitedelim}}
@@ -197,21 +197,15 @@
\savefield{namehash}{\cbx@lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
- {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}%
+ {\printnames[labelname][-\value{listtotal}]{labelname}}%
{\ifciteseen
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}\addspace\printnames[sabrackets]{shortauthor}}}%
+ {\printnames[labelname][-\value{listtotal}]{author}\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
@@ -238,11 +232,11 @@
% Normal full cite
{\ifnameundef{shortauthor}%
% Normal full cite
- {\printnames[labelname][-\value{listtotal}]{labelname}\usebibmacro{with}}
+ {\printnames[labelname][-\value{listtotal}]{labelname}}
% Cite using short author
{\ifciteseen
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\usebibmacro{with}}}%
+ {\printnames[labelname][-\value{listtotal}]{author}}}%
% Year
\setunit{\ifbool{cbx:np}
{\nameyeardelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index b2eebc68681..ad660814ed6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -25,7 +25,7 @@
%% biblatex-apa-test-citations.bib (Style examples - citations)
%% biblatex-apa-test-references.bib (Style examples - references)
-\ProvidesFile{apa.dbx}[2012/12/20\space v5.6\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2012/12/28\space v5.7\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
@@ -41,6 +41,7 @@
director}
\DeclareDatamodelFields[type=field, datatype=literal]{
+ abstractloc,
doubtfulauthor,
doubtfuldate,
titleisdescription,
@@ -55,6 +56,7 @@
with,
doubtfulauthor,
doubtfuldate,
+ abstractloc,
abstracturl,
urldescription}
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 ec8c5824c73..22121e1a082 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{austrian-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% (APA 6.22) The example abbreviations
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 d61360192f8..3c952f1c6ef 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
% (APA 6.22) The example abbreviations
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 1ceb000b413..0815cdfdf98 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{british}
% (APA 6.22) The example abbreviations
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 b95c02c1a69..4331407e4c7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
% (APA 6.22) The example abbreviations
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 1e390192ea5..ddcf2e76c45 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{french}
% (APA 6.22) The example abbreviations
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 44d43916949..56fba8ff3e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{german-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{german}
% (APA 6.22) The example abbreviations
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 05974b5e372..26d2d27f2be 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
% (APA 6.22) The example abbreviations
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 b90782f10d1..a2b5e2b4c44 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
% (APA 6.22) The example abbreviations
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 4fc64bfbc1a..3e10f912313 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{naustrian-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
% (APA 6.22) The example abbreviations
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 192228babde..5993cac8bf0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{ngerman-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
% (APA 6.22) The example abbreviations
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 aabf17b4312..4be0ba4bbde 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2012/12/28\space v5.8\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
% (APA 6.22) The example abbreviations
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 df234662570..f8d2cfcddb5 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
% (APA 6.22) The example abbreviations
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 3ca19a91b18..ffe8bf5227c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
% (APA 6.22) The example abbreviations
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 4c65cef49d4..0ecc9f86b2a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2012/12/20\space v5.6\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2012/12/28\space v5.7\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced