summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-03 21:31:31 +0000
committerKarl Berry <karl@freefriends.org>2018-04-03 21:31:31 +0000
commita25f5654b52302ab639f6d0f9169ff2f06854b82 (patch)
tree56d3b6d429bac187efaf46dd0bfe8c1938cf05bb /Master
parentdd7580060b118b4c1b6da0975a0078a279d6e43f (diff)
biblatex-apa (3apr18)
git-svn-id: svn://tug.org/texlive/trunk@47268 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib55
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin109649 -> 109564 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin90067 -> 89763 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx59
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx2
-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/danish-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/english-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/nswissgerman-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/portuguese-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx2
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx2
31 files changed, 103 insertions, 69 deletions
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 b4cf375074e..923017d196c 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
@@ -138,7 +138,7 @@
@BOOK{6.14,
AUTHOR = {I. Light},
TITLE = {Deflecting Immigration},
- SUBTITLE = {Networks, Markets, and regulation in Los Angeles},
+ SUBTITLE = {Networks, Markets, and Regulation in {L}os {A}ngeles},
DATE = {2006},
LOCATION = {New York, NY},
PUBLISHER = {Russell Sage Foundation},
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 26933ef00c0..3d71fef3c3a 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
@@ -62,7 +62,7 @@
@ARTICLE{7.01:5,
AUTHOR = {S. C. {Von Ledebur}},
TITLE = {Optimizing Knowledge Transfer by New Employees in Companies},
- JOURNALTITLE = {Knowledge Management Research and Practice},
+ JOURNALTITLE = {Knowledge Management Research \& Practice},
DATE = {2007},
NOTE = {Advance online publication},
DOI = {10.1057/palgrave.kmrp.8500141}
@@ -141,7 +141,7 @@
EDITOR = {C. Haney and R. L. Wiener},
TITLE = {Capital Punishment in the {United States}},
ISSUETITLE = {Special issue},
- JOURNALTITLE = {Psychology, Public Policy and Law},
+ JOURNALTITLE = {Psychology, Public Policy, and Law},
VOLUME = {10},
NUMBER = {4},
DATE = {2004}
@@ -162,7 +162,7 @@
TITLE = {Capital Punishment in the {United Kingdom}},
SHORTTITLE = {Capital Punishment},
ISSUETITLE = {Special issue},
- JOURNALTITLE = {Psychology, Public Policy and Law},
+ JOURNALTITLE = {Psychology, Public Policy, and Law},
VOLUME = {10},
NUMBER = {4},
DATE = {2004}
@@ -265,7 +265,7 @@
% (APA 7.02 Example 18)
@BOOK{7.02:18,
AUTHOR = {M. A. Shotton},
- TITLE = {Computer Addiction? A Study of Computer Dependency},
+ TITLE = {Computer Addiction? {A} Study of Computer Dependency},
LOCATION = {London, England},
PUBLISHER = {Taylor \& Francis},
DATE = {1989}
@@ -432,7 +432,7 @@
% NUMBER contains report number, "No." is added automatically and TYPE contains the
% report type
@REPORT{7.03:31,
- AUTHOR = {{U.S. Department of Health and Human Services, National Institute of Mental Health, National Heart, Lung and Blood Institute}},
+ AUTHOR = {{U.S. Department of Health and Human Services, National Institutes of Health, National Heart, Lung and Blood Institute}},
TITLE = {Managing Asthma},
SUBTITLE = {A Guide for Schools},
TYPE = {NIH Publication},
@@ -458,7 +458,7 @@
TYPE = {Research Report},
NUMBER = {06.3},
DATE = {2006},
- URLDESCRIPTION = {Poverty Alleviation website},
+ URLDESCRIPTION = {Research on Poverty Alleviation website},
URL = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessey_and_Urio.pdf}
}
@@ -488,9 +488,8 @@
}
% (APA 7.04 Example 36)
-% Note this renders with a period before the LOCATION which is more consistent with other entries
@INPROCEEDINGS{7.04:36,
- AUTHOR = {J. Muelbauer},
+ AUTHOR = {J. Muellbauer},
TITLE = {Housing, Credit and Consumer Expenditure},
EDITORA = {S. C. Ludvigson},
EDITORATYPE = {chair},
@@ -523,13 +522,16 @@
}
% (APA 7.04 Example 39)
+% Note that there is a LOCATION and PUBLISHER but these are ignored because
+% there is a DOI. This is inconsistent in the 2nd printing of 6th Edition
+% but is clear from the example formats at the beginning of 7.02
@INPROCEEDINGS{7.04:39,
AUTHOR = {I. Katz and K. Gabayan and H. Aghajan},
TITLE = {A Multi-touch Surface Using Multiple Cameras},
EDITOR = {J. Blanc-Talon and W. Philips and D. Popescu and P. Scheunders},
- MAINTITLE = {Lecture Notes in Computer Science},
+ MAINTITLE = {Lecture {N}otes in {C}omputer {S}cience},
VOLUME = {4678},
- BOOKTITLE = {Advanced Concepts for Intelligent Vision Systems},
+ BOOKTITLE = {Advanced {C}oncepts for {I}ntelligent {V}ision {S}ystems},
PAGES = {97--108},
LOCATION = {Berlin, Germany},
PUBLISHER = {Springer-Verlag},
@@ -560,7 +562,7 @@
% (APA 7.05 Example 42)
@PHDTHESIS{7.05:42,
AUTHOR = {A. Bruckman},
- TITLE = {{MOOSE} Crossing},
+ TITLE = {{MOOSE Crossing}},
SUBTITLE = {Construction, Community, and Learning in a Networked Virtual World for Kids},
INSTITUTION = {Massachusetts Institute of Technology},
DATE = {1977},
@@ -653,7 +655,7 @@
@SOFTWARE{bioshock,
AUTHOR = {{2K Games}},
ENTRYSUBTYPE = {Computer Game},
- TITLE = {BioShock},
+ TITLE = {Bio{S}hock},
DATE = {2007}
}
@@ -679,8 +681,9 @@
}
% (APA 7.07 Example 49)
-% We render this with "retrieved from" instead of "available from" as this is arbitrary
-% and ugly to parameterise. Forcing this means we can use a localisable string for "retrieved"
+% The "Available from" string is conditionalised by testing for "{DVD}" as
+% the ENTRYSUBTYPE. A bit hacky but an edge case anyway.
+% 3nd printing is incorrect as it has a period before the "(Producer)"
@VIDEO{7.07:49,
ENTRYSUBTYPE = {{DVD}},
PRODUCER = {{American Psychological Association}},
@@ -691,7 +694,7 @@
% (APA 7.07 Example 50)
@AUDIO{7.07:50,
- ENTRYSUBTYPE = {Audio Podcast},
+ ENTRYSUBTYPE = {Audio podcast},
PRODUCER = {D. {Van Nuys}},
TITLE = {Shrink Rap Radio},
DATE = {2007-12-19},
@@ -716,7 +719,7 @@
@MUSIC{7.07:52,
SORTKEY = {Lang, K. D.},
ENTRYSUBTYPE = {{CD}},
- AUTHOR = {{lang}, {k.} {d.}},
+ AUTHOR = {{lang}, {k} {d}},
TITLE = {Shadow and the Frame},
MAINTITLE = {Watershed},
MAINTITLEADDON = {{CD}},
@@ -796,7 +799,7 @@
% (APA 7.09 Example 60)
@DATA{7.09:60,
AUTHOR = {F. Bordi and J. E. LeDoux},
- ENTRYSUBTYPE = {Auditory Response Latencies in Rat Auditory Cortex},
+ ENTRYSUBTYPE = {Auditory response latencies in rat auditory cortex},
NOTE = {Unpublished raw data},
DATE = {1993},
}
@@ -845,7 +848,7 @@
@LETTER{7.10:64,
AUTHOR = {G. P. Zacharius},
TITLE = {Letter to {W}illiam {R}ickel ({W}. {R}ickel, {T}rans.)},
- DATE = {1935-08-15},
+ DATE = {1953-08-15},
NOTE = {Copy in possession of Hendrika Vande Kemp}
}
@@ -882,11 +885,12 @@
}
% (APA 7.10 Example 68)
-@UNPUBLISHED{7.10:68,
+@MISC{7.10:68,
AUTHOR = {{Subcommitee on Mental Hygiene Personnel in School Programs}},
TITLE = {{Meeting of Subcommittee on Mental Hygiene Personnel in School Programs}},
- HOWPUBLISHED = {David Chakow Papers (M1360)},
- LOCATION = {{Archives of the History of American Psychology, University of Akron, Akron}, OH},
+ HOWPUBLISHED = {David Shakow Papers (M1360)},
+ INSTITUTION = {Archives of the History of American Psychology},
+ LOCATION = {University of Akron, Akron, OH},
DATE = {1949-11-05/1949-11-06}
}
@@ -894,7 +898,7 @@
@MISC{7.10:69,
AUTHOR = {M. B. Smith},
TITLE = {Interview by {C}. {A}. {K}iesler},
- ENTRYSUBTYPE = {Tape Recording},
+ ENTRYSUBTYPE = {Tape recording},
HOWPUBLISHED = {President's Oral History Project, American Psychological Association},
LOCATION = {APA Archives, Washington, DC},
DATE = {1989-08-12},
@@ -908,7 +912,8 @@
AUTHOR = {C. F. Sparkman},
TITLE = {An Oral History with {D}r. {C}olley {F}. {S}parkman/{I}nterviewer: {O}rley {B}. {C}audill},
HOWPUBLISHED = {Mississippi Oral History Program (Vol. 289)},
- LOCATION = {University of Southern Mississippi, Hattiesburg},
+ INSTITUTION = {University of Southern Mississippi},
+ LOCATION = {Hattiesburg},
DATE = {1973}
}
@@ -926,13 +931,13 @@
AUTHOR = {{Sci-Art Publishers}},
TITLE = {Sci-{A}rt {P}ublications},
TITLEADDON = {Brochure},
- HOWPUBLISHED = {Cambridge, MA: Author. A. A. Roback Papers (HUGFP 104.50, Box2, Folder ``Miscellaneous Psychological Materials'')},
+ HOWPUBLISHED = {Cambridge, MA: Author. A. A. Roback Papers (HUGFP 104.50, Box 2, Folder ``Miscellaneous Psychological Materials'')},
LOCATION = {Harvard University Archives, Cambridge, MA},
DATE = {1935}
}
% (APA 7.10 Example 73)
-% biblatex 3.5+ supports EDTF circa markers in dates
+% biblatex 3.5+ supports ISO8601 circa markers in dates
% Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual
% with example 7.10:67. They differ in that 7.10:67 has brackets around the approximate
% date and 7.10:73 has parenthesis. I have chosen brackets for consistency.
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 63b8ab0d915..9fed2052a65 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.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index b289cf2f1a1..0453a5d6d73 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 cde6d43f10c..f3237af69fa 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -24,7 +24,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={7.6},
+ revision={7.7},
date={\today}}
\hypersetup{%
@@ -458,6 +458,10 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
\begin{changelog}
+\begin{release}{7.7}{2018-04-02}
+\item Bug fixes and example alignments
+\end{release}
+
\begin{release}{7.6}{2018-03-05}
\item Internal cleanup and bugfixes
\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 c532c441a09..b58b1a835ed 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2018/04/02\space v7.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 e3364b4a476..09b1843825a 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}[2018/03/05\space v7.6\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2018/04/02\space v7.7\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -675,8 +675,7 @@
\setunit*{\addcomma\addspace}%
\printfield{pages}%
\setunit{}%
- \printtext{\bibcloseparen}%
- \newunit}}
+ \printtext{\bibcloseparen}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1099,7 +1098,7 @@
\ifnameundef{producer}
{}
{\printnames[apaauthor][-\value{listtotal}]{producer}%
- \newunit
+ \addspace
\printtext[parens]{\bibcpstring{producer}}%
\setunit*{\addcomma\addspace\&\addspace}}}
@@ -1107,7 +1106,7 @@
\ifnameundef{director}
{}
{\printnames[apaauthor][-\value{listtotal}]{director}%
- \newunit
+ \addspace
\printtext[parens]{\bibcpstring{director}}%
\setunit*{\addcomma\addspace\&\addspace}}}
@@ -1115,7 +1114,7 @@
\ifnameundef{writer}
{}
{\printnames[apaauthor][-\value{listtotal}]{writer}%
- \newunit
+ \addspace
\printtext[parens]{\bibcpstring{writer}}%
\setunit*{\addcomma\addspace\&\addspace}}}
@@ -1215,7 +1214,9 @@
{\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
{}
{\printtext{\bibcpstring{abstract}}\addspace}%
- \printtext{\bibstring{retrieved}}%
+ \iffieldequalstr{entrysubtype}{{DVD}}
+ {\printtext{\bibstring{available}}}
+ {\printtext{\bibstring{retrieved}}}%
\setunit{\addspace}%
\iffieldundef{urlyear}
{}
@@ -1301,7 +1302,14 @@
\printfield{pages}%
\setunit{\addcomma\addspace}%
\bibstring{byauthor}\addspace
- \printnames[apanames][-\value{listtotal}]{editor}%
+ \ifnameundef{editor}
+ {}
+ {\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}%
@@ -1588,7 +1596,10 @@
\printfield[apacase]{eventtitle}%
\newunit
\printfield{venue}%
- \newunit\newblock
+ \iffieldundef{pages}
+ {\setunit{\addcomma\addspace}}
+ {\newunit}%
+ \newblock
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{origyear}%
@@ -1822,6 +1833,8 @@
\newunit\newblock
\printlist{organization}%
\newunit\newblock
+ \printlist{institution}%
+ \setunit*{\addcomma\addspace}%
\usebibmacro{location+publisher}%
\newunit\newblock
\usebibmacro{doi+eprint+url}%
@@ -2052,9 +2065,12 @@
\usebibmacro{title}%
\newunit\newblock
\printfield{howpublished}%
- \setunit{\addcomma\addspace}\newblock
+ \iflistundef{institution}
+ {\newunit}
+ {\setunit{\addcomma\addspace}}%
+ \newblock
\printlist{institution}%
- \newunit\newblock
+ \setunit*{\addcomma\addspace}\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock
\printlist{location}%
@@ -2139,16 +2155,25 @@
{\href{https://dx.doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}}
-% APA 6th
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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)
+
\newbibmacro*{location+publisher}{%
- \printlist[default][1-1]{location}%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- \newunit}
+ \iffieldundef{doi}
+ {\printlist[default][1-1]{location}%
+ \setunit*{\addcolon\space}%
+ \printlist{publisher}%
+ \newunit}
+ {}}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\newbibmacro*{type+institution}{%
\setunit{\addspace}%
- \ifthenelse{\iffieldundef{type}\AND\iffieldundef{institution}}
+ \ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} }
{}
{\printtext[parens]{%
\iflistundef{institution}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 27b992db1b8..8a6faa23927 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2018/03/05\space v7.6\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2018/04/02\space v7.7\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index a206ec52e55..5739c5ba5db 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2018/03/05\space v7.6\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2018/04/02\space v7.7\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
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 74855d47236..ddfc284126c 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
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 5a0bdede219..24603035b8e 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2018/04/02\space v7.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 c6577e72e14..c0b2a9cb66e 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{british}
% (APA 6.22) The example abbreviations
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 8f4d283963c..8fc789aeb77 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
% (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 f67c4714f25..55250f4c83d 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
% (APA 6.22) The example abbreviations
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 8ea04306c6d..8a55d1a9170 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{english}
% (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 a3e5db705f0..40d380aac86 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2018/04/02\space v7.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 642ce2babcb..090a5ee3adb 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2018/04/02\space v7.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 5d7c42135c8..6a9421363e9 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2018/04/02\space v7.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 544a3e7640e..afeb25143c0 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2018/04/02\space v7.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 4811fbd6711..b0f17e56c95 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2018/04/02\space v7.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 fc15245ad47..67f7ed9e1eb 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2018/04/02\space v7.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 e32047862a6..10726d6a5fc 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2018/04/02\space v7.7\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 d27cbea15cd..282eefb2721 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
% (APA 6.22) The example abbreviations
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 b877614dc0e..2134abf4392 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
% (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 cb62de27eaa..7c99e6fc476 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
% (APA 6.22) The example abbreviations
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 7b707591346..702444fa5e2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{portuguese-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
% (APA 6.22) The example abbreviations
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 57fa13a7549..0414a4186e9 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{russian-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
% (APA 6.22) The example abbreviations
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 2588a4832cc..acf2d3416d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
% (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 052b6b5bb99..dd604113942 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}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
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 75ccf7cac04..29a862782f8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
% (APA 6.22) The example abbreviations
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 c31776b2775..db9aabfb902 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swissgerman-apa.lbx}[2018/03/05\space v7.6\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2018/04/02\space v7.7\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German