texlive[52949] Master: biblatex-apa6 (27nov19)

commits+karl at tug.org commits+karl at tug.org
Wed Nov 27 23:06:27 CET 2019


Revision: 52949
          http://tug.org/svn/texlive?view=revision&revision=52949
Author:   karl
Date:     2019-11-27 23:06:27 +0100 (Wed, 27 Nov 2019)
Log Message:
-----------
biblatex-apa6 (27nov19)

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/tlpkg-ctan-check
    trunk/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/README
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-citations.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-references.bib
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.tex
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
    trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
    trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
    trunk/Master/tlpkg/tlpsrc/biblatex-apa6.tlpsrc

Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/README	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/README	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,34 @@
+Permission is granted to copy, distribute and/or modify this software under
+the terms of the LaTeX Project Public License, version
+1.3c (http://www.latex-project.org/lppl.txt). The current
+maintainer is Philip Kime (© 2018).
+
+This package is a biblatex style for APA (American Psychological
+Association) 6th Edition style compliant documents typeset in LaTeX. It
+implements a citation style (apa6.cbx) and a references section style
+(apa6.bbx). The styles are loaded just like any other biblatex
+styles but I wouldn't try to use the citation and references styles
+separately as they rely on each other, macro-wise, in places.
+
+In this document and in the code, the specific APA requirements are
+referred to by the section and (if appropriate) the example number of the
+APA Style Guide 6th Edition).
+
+You will need to be using csquotes >= 4.3 and biblatex >= 3.4 The biber
+backend for biblatex >= 2.5 is also required. This style will not work
+correctly if using bibtex as the backend for biblatex. If you want to take
+advantage of the biblatex \DeclareQuotePunctuation facility to enforce the
+APA required "American punctuation", you should use the babel package with
+the "american" option (see biblatex manual section |3.9.1|). You can of
+course use other languages but in such cases, to adhere to APA "American"
+punctuation rules (following commas moved inside closing quotes etc.), then
+you should set up \DeclareQuotePunctuation yourself as per section 4.7.5 of
+the biblatex manual.
+
+You can also use this with apa.cls version 1.3.4 or greater by using the 
+"noapacite" class option to that class package (which prevents it from
+trying to use plain bibtex with the apacite package).
+
+Please refer first to biblatex-apa6.pdf for the main documentation.
+
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-citations.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-citations.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-citations.bib	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,624 @@
+% (APA 6.11)
+ at BOOK{6.11,
+  AUTHOR         = {Kessler, Jr., A.},
+  TITLE          = {Title},
+  DATE           = {2003},
+}
+
+% (APA 6.12)
+ at BOOK{6.12a,
+  AUTHOR         = {A. Smith and B. Jones},
+  TITLE          = {Title},
+  DATE           = {2007},
+}
+
+ at BOOK{6.12b,
+  AUTHOR         = {A. Kisangau and B. Lyaruu and C. Hosea and D. Joseph},
+  TITLE          = {Title},
+  DATE           = {2007},
+}
+
+ at BOOK{6.12c,
+  AUTHOR         = {A. Ireys and B. Chernoff and C. DeVet and D. Kim},
+  TITLE          = {Title},
+  DATE           = {2001},
+}
+
+ at BOOK{6.12d,
+  AUTHOR         = {A. Ireys and B. Chernoff and E. Stein and C. DeVet and F. Silver},
+  TITLE          = {Title},
+  DATE           = {2001},
+}
+
+ at BOOK{6.12e,
+  AUTHOR         = {A. Kurtines and B. Szapocznik},
+  TITLE          = {Title},
+  DATE           = {2003},
+}
+
+ at BOOK{6.12f,
+  AUTHOR         = {A. Jöreskog and B. Sörbon},
+  TITLE          = {Title},
+  DATE           = {2007},
+}
+
+ at BOOK{6.12g,
+  AUTHOR         = {A. Kosslyn and B. Koenig and C. Barrett and D. Cave and E. Tang and F. Gabrieli},
+  TITLE          = {Title},
+  DATE           = {1996},
+}
+
+ at BOOK{6.12h,
+  AUTHOR         = {A. Kosslyn and B. Koenig and F. Gabrieli and E. Tang and G. Marsolek and H. Daly},
+  TITLE          = {Title},
+  DATE           = {1996},
+}
+
+ at BOOK{6.12i,
+  AUTHOR         = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge},
+  TITLE          = {Title},
+  DATE           = {1990},
+}
+
+ at BOOK{6.12j,
+  AUTHOR         = {A. Albert and B. Bryant and C. Cuthbert and E. Elide},
+  TITLE          = {Title 2},
+  DATE           = {1991},
+}
+
+% (APA 6.13)
+% These are all misc so that we can turn off uniquelist because they all interact and
+% break the examples otherwise. The reason is that we are generating these examples
+% from a real datasource. The table as displayed in the APA 6th assumes that the examples
+% are just static strings.
+ at MISC{6.13a,
+  AUTHOR         = {A. Walker},
+  TITLE          = {Title},
+  DATE           = {2007},
+}
+
+ at MISC{6.13b,
+  AUTHOR         = {A. Walker and B. Allen},
+  TITLE          = {Title},
+  DATE           = {2004},
+}
+
+ at MISC{6.13c,
+  AUTHOR         = {A. Bradley and B. Ramirez and C. Soo},
+  TITLE          = {Title},
+  DATE           = {1999},
+}
+
+ at MISC{6.13d,
+  AUTHOR         = {A. Bradley and B. Ramirez and C. Soo and D. Walsh},
+  TITLE          = {Title},
+  DATE           = {2006},
+}
+
+ at MISC{6.13e,
+  AUTHOR         = {A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
+  TITLE          = {Title},
+  DATE           = {2008},
+}
+
+ at MISC{6.13f,
+  AUTHOR         = {Z. Wasserstein and A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
+  TITLE          = {Title},
+  DATE           = {2005},
+}
+
+ at MISC{6.13g,
+  AUTHOR         = {{National Institute of Mental Health}},
+  SHORTAUTHOR    = {NIMH},
+  TITLE          = {Title},
+  DATE           = {2003},
+}
+
+ at MISC{6.13h,
+  AUTHOR         = {{University of Pittsburgh}},
+  TITLE          = {Title},
+  DATE           = {2005},
+}
+
+ at MISC{6.13i,
+  AUTHOR         = {{The American Psychological Association}},
+  SHORTAUTHOR    = {APA},
+  TITLE          = {Title1},
+  DATE           = {2005},
+}
+
+ at MISC{6.13j,
+  AUTHOR         = {{The American Psychological Association}},
+  SHORTAUTHOR    = {APA},
+  TITLE          = {Title2},
+  DATE           = {2006},
+}
+
+% (APA 6.14)
+ at BOOK{6.14,
+  AUTHOR         = {I. Light},
+  TITLE          = {Deflecting Immigration},
+  SUBTITLE       = {Networks, Markets, and Regulation in {L}os {A}ngeles},
+  DATE           = {2006},
+  LOCATION       = {New York, NY},
+  PUBLISHER      = {Russell Sage Foundation},
+}
+
+% (APA 6.15)
+ at ARTICLE{6.15a,
+  TITLE          = {Study Finds Something Interesting},
+  SHORTTITLE     = {Study Finds},
+  DATE           = {2007},
+}
+
+ at BOOK{6.15b,
+  TITLE          = {College Bound Seniors},
+  DATE           = {2008},
+}
+
+ at BOOK{6.15c,
+  AUTHOR         = {Anonymous},
+  TITLE          = {Title},
+  DATE           = {1998},
+}
+
+% (APA 6.16)
+ at BOOK{6.16a,
+  AUTHOR         = {{Department of Veterans Affairs}},
+  TITLE          = {Title1},
+  DATE           = {2001},
+}
+
+ at BOOK{6.16b,
+  AUTHOR         = {{Department of Veterans Affairs}},
+  TITLE          = {Title1},
+  DATE           = {2003},
+}
+
+ at BOOK{6.16c,
+  AUTHOR         = {A. Gogel},
+  TITLE          = {Title1},
+  DATE           = {1990},
+}
+
+ at BOOK{6.16d,
+  AUTHOR         = {A. Gogel},
+  TITLE          = {Title2},
+  DATE           = {2006},
+}
+
+ at BOOK{6.16e,
+  AUTHOR         = {A. Gogel},
+  TITLE          = {Title3},
+  PUBSTATE       = {inpress},
+}
+
+ at BOOK{6.16f,
+  AUTHOR         = {A. Derryberry and B. Reed},
+  TITLE          = {Title1},
+  DATE           = {2005},
+}
+
+ at BOOK{6.16g,
+  AUTHOR         = {A. Derryberry and B. Reed},
+  TITLE          = {Title2},
+  DATE           = {2005},
+}
+
+ at BOOK{6.16h,
+  AUTHOR         = {A. Derryberry and B. Reed},
+  TITLE          = {Title3},
+  PUBSTATE       = {inpress},
+}
+
+ at BOOK{6.16i,
+  AUTHOR         = {A. Rothbart},
+  TITLE          = {Title1},
+  DATE           = {2003},
+}
+
+ at BOOK{6.16j,
+  AUTHOR         = {A. Rothbart},
+  TITLE          = {Title2},
+  DATE           = {2003},
+}
+
+ at BOOK{6.16k,
+  AUTHOR         = {A. Miller},
+  TITLE          = {Title},
+  DATE           = {1999},
+}
+
+ at BOOK{6.16l,
+  AUTHOR         = {A. Shafrankse and B. Mahoney},
+  TITLE          = {Title},
+  DATE           = {1998},
+}
+
+ at BOOK{6.16m,
+  AUTHOR         = {A. Minor},
+  TITLE          = {Title},
+  DATE           = {2001},
+}
+
+ at BOOK{6.16n,
+  AUTHOR         = {A. Adams},
+  TITLE          = {Title},
+  DATE           = {1999},
+}
+
+ at BOOK{6.16o,
+  AUTHOR         = {A. Storandt},
+  TITLE          = {Title},
+  DATE           = {2007},
+}
+
+% PUBSTATE is not used as there is a year - enforces by a style source map in .bbx
+ at BOOK{6.16p,
+  AUTHOR         = {Steven Smidge},
+  TITLE          = {Something 1},
+  DATE           = {2000},
+  PUBSTATE       = {inpress}
+}
+
+ at BOOK{6.16q,
+  AUTHOR         = {Steven Smidge},
+  TITLE          = {Something 2},
+  PUBSTATE       = {inpress}
+}
+
+ at BOOK{6.16r,
+  AUTHOR         = {Steven Smidge},
+  TITLE          = {Something 3},
+  PUBSTATE       = {inpress}
+}
+
+
+% (APA 6.17)
+ at BOOK{6.17,
+  AUTHOR         = {A. Nicholson},
+  TITLE          = {Title},
+  DATE           = {2003},
+}
+
+% (APA 6.18)
+ at BOOK{6.18a,
+  AUTHOR         = {Aristotle},
+  TITLE          = {Ethics},
+  TRANSLATOR     = {S. Translator},
+  DATE           = {1931},
+}
+
+ at BOOK{6.18b,
+  AUTHOR         = {H. James},
+  TITLE          = {Novel},
+  ORIGDATE       = {1890},
+  DATE           = {1983},
+}
+
+% Last two examples need no references entry
+
+% (APA 6.19)
+ at BOOK{6.19a,
+  AUTHOR         = {{Centers for Disease Control and Prevention}},
+  TITLE          = {Title},
+  DATE           = {2005},
+}
+
+ at BOOK{6.19b,
+  AUTHOR         = {A. Shimamura},
+  TITLE          = {Title},
+  DATE           = {1989},
+}
+
+% (APA 6.20) - No examples need references entry
+
+% (APA 6.21)
+ at BOOK{6.21,
+  AUTHOR         = {{U.S. Department of Labor}},
+  TITLE          = {Title},
+  DATE           = {2007},
+}
+
+% (APA 6.28a)
+ at BOOK{6.28a,
+  AUTHOR         = {Arthur Somebody},
+  TITLE          = {Some Title},
+}
+
+% These are copied from the references .bib file just so the sections splitting works
+ at ARTICLE{7.01:3b,
+  AUTHOR         = {M. A. Light and I. H. Light},
+  TITLE          = {The Geographic Expansion of Mexican Immigration in the United States and its Implications for Local Law Enforcement},
+  DATE           = {2008},
+  JOURNALTITLE   = {Law Enforcement Executive Forum Journal},
+  VOLUME         = {8},
+  NUMBER         = {1},
+  PAGES          = {73--82},
+}
+
+ at ARTICLE{7.01:12c,
+  TITLE          = {Capital Punishment in the United Kingdom},
+  SHORTTITLE     = {Capital Punishment},
+  TITLEADDON     = {Special issue},
+  JOURNALTITLE   = {Psychology, Public Policy and Law},
+  VOLUME         = {10},
+  NUMBER         = {4},
+  DATE           = {2004}
+}
+
+ at PATENT{A7.07,
+  AUTHOR         = {I. M. Smith},
+  TITLE          = {{U}.{S}. {P}atent {N}o. 123,445},
+  DATE           = {1998},
+  LOCATION       = {Washington, DC},
+  PUBLISHER      = {U.S. Patent and Trademark Office}
+}
+
+% Testing fullcite so make it nice and long
+ at ARTICLE{FC1,
+  AUTHOR         = {Arthur Amorous and Brian Belligerent and Clive Clandestine},
+  TITLE          = {Names Which Inspire Envy},
+  SUBTITLE       = {The Fashions of Nominal Imprudence},
+  DATE           = {1923},
+  JOURNALTITLE   = {Journal of International Interest},
+  VOLUME         = {87},
+  NUMBER         = {12},
+  PAGES          = {1423--1458},
+}
+
+% Testing uniqueness for identical name lists and subset lists
+ at BOOK{UL1,
+  AUTHOR         = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
+  TITLE          = {Many Things and Other Topics},
+  DATE           = {2010}
+}
+
+ at BOOK{UL2,
+  AUTHOR         = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
+  TITLE          = {Random Articles Found Under Cats},
+  DATE           = {2010}
+}
+
+ at BOOK{UL3,
+  AUTHOR         = {Patricia Petulant and Cloe Clueless and Brian Beffudled},
+  TITLE          = {Can You Say a Word?},
+  DATE           = {2010}
+}
+
+ at BOOK{UL4,
+  AUTHOR         = {Patricia Petulant and Cloe Clueless and Brian Beffudled and Graham Grunt},
+  TITLE          = {Looking at Spiders},
+  DATE           = {2010}
+}
+
+% Testing "with"
+ at BOOK{with1,
+  AUTHOR = {James Jaunty and Russell Rendition},
+  WITH   = {Alan Also},
+  TITLE  = {Look for Lost Limps},
+  DATE   = {2000}
+}
+
+% Testing citeauthor
+ at BOOK{ca1,
+  AUTHOR = {Brian Blameless and Colin Careless and Derek Delusional},
+  TITLE  = {Three Modern Men},
+  DATE   = {2001}
+}
+
+% Testing no date
+ at BOOK{nodate1,
+  AUTHOR = {Neil Nodate},
+  TITLE = {Testing},
+  URLDATE = {2012}
+}
+
+ at BOOK{nodate2,
+  AUTHOR = {Neil Nodate},
+  TITLE = {Testing 2},
+}
+
+% Testing full name expansion (APA 6.27)
+ at 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}
+}
+
+ at ARTICLE{6.27b,
+  AUTHOR = {Pierre Janet},
+  TITLE  = {The Pathogenesis of Some Impulsions},
+  JOURNALTITLE = {Journal of Abnormal Psychology},
+  VOLUME = {1},
+  PAGES  = {1-17},
+  DATE = {1906}
+}
+
+% Suffix test for first-last (editor)
+ at INCOLLECTION{stest1,
+  AUTHOR      = {Gring, III, Alan J.},
+  EDITOR      = {Greaves, Jr., Percy L.},
+  TITLE       = {A test of suffix 1},
+  DATE        = {1968},
+  LOCATION    = {New York, NY},
+  PUBLISHER   = {Wiley},
+  PAGES       = {1--34}
+}
+
+% Suffix test for first-last (editor)
+ at INCOLLECTION{stest2,
+  EDITOR      = {Greaves, Jr., Percy L.},
+  TITLE       = {A test of suffix 2},
+  DATE        = {1968},
+  LOCATION    = {New York, NY},
+  PUBLISHER   = {Wiley},
+  PAGES       = {1--34}
+}
+
+% Don't forget that useprefix=false doesn't ignore the prefix completely - it is still used in
+% hash and uniqueness generation and so there are two different "Greaves" here - one von and one not
+% Prefix test (useprefix=true)
+ at BOOK{pretest,
+  AUTHOR      = {Luis von Mises},
+  TITLE       = {A Title},
+  DATE        = {2000}
+}
+
+% Prefix test (useprefix=false)
+ at MISC{nopretest,
+  OPTIONS     = {useprefix=false},
+  AUTHOR      = {Luis von Mises},
+  TITLE       = {Another Title},
+  DATE        = {2001}
+}
+
+% Prefix + suffix test (useprefix=true) first-last
+ at INCOLLECTION{presufftest,
+  EDITOR      = {von Greaves, Jr., Percy L.},
+  TITLE       = {A test of prefix 2},
+  DATE        = {1969},
+}
+
+% Prefix + suffix test (useprefix=false)
+ at MISC{nopresufftest,
+  OPTIONS     = {useprefix=false},
+  AUTHOR      = {von Greaves, Jr., Percy L.},
+  TITLE       = {A test of noprefix 2},
+  DATE        = {2001}
+}
+
+% Prefix + suffix test (useprefix=true)
+ at BOOK{presufftest2,
+  AUTHOR      = {von Greaves, Jr., Percy L.},
+  TITLE       = {A test of noprefix 2},
+  DATE        = {2001}
+}
+
+% Oxford comma tests
+ at BOOK{oc1,
+  AUTHOR      = {Hilarious, Hillary and Mirthful, Malcolm and Chuckles, Charles},
+  TITLE       = {Laughter Through the Ages},
+  DATE        = {1987}
+}
+
+ at BOOK{oc2,
+  AUTHOR      = {Miserable, Markus and Doleful, Derek and Bitter, Brian},
+  TITLE       = {Dictionary of Depressions},
+  DATE        = {1987}
+}
+
+% Test "and others"
+ at ARTICLE{ao1,
+  AUTHOR         = {Boker, S. and Neale, M. and Maes, H. and Wilde, M. and
+                   Spiegel, M. and Brick, T. and Spies, J. and Estabrook,
+                   R. and Kenny, S. and Bates, T. and others},
+  TITLE          = {Open{M}x: {A}n open source extended structural
+                   equation modeling framework},
+  JOURNAL        = {Psychometrika},
+  VOLUME         = {76},
+  NUMBER         = {2},
+  PAGES          = {306--317},
+  DATE           = {2011}
+}
+
+ at ARTICLE{ao2,
+  AUTHOR = {Olive, K. A. and others},
+  DATE   = {2014}
+}
+
+% Testing season
+ at ARTICLE{season1,
+  AUTHOR  = {Terrence Test},
+  TITLE   = {Some Title},
+  JOURNAL = {Jolly Journal},
+  ISSUE   = {Spring},
+  PAGES   = {100--103},
+  DATE    = {2001}
+}
+% Testing name initials as per: http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html
+ at BOOK{first,
+  AUTHOR = {Brown, Y. and Campbell, W. K.},
+  DATE = {2004}
+}
+
+ at BOOK{second,
+  AUTHOR = {Campbell, A. and Muncer, M. and Gorman, B.},
+  DATE = {1993}
+}
+
+ at BOOK{third,
+  AUTHOR = {Campbell, W. K. and Bush, C. P. and Brunell, A. B.},
+  DATE = {2005}
+}
+
+ at BOOK{fourth,
+  AUTHOR = {Smyth, L. N. and Campbell, A. and Adams, K.},
+  DATE = {1992}
+}
+
+ at ARTICLE{deutsch1963,
+  TITLE = {Attention: Some theoretical considerations},
+  AUTHOR = {Deutsch, J. Anthony and Deutsch, Diana},
+  JOURNAL = {Psychological Review},
+  VOLUME = {70},
+  NUMBER = {1},
+  PAGES = {1--10},
+  DATE = {1963},
+}
+
+% Testing multicite name elision
+ at ARTICLE{kingetal2005a,
+  AUTHOR = {King, J. E. and Weiss, A. and Farmer, K. H.},
+  TITLE = {Title},
+  DATE = {2005}
+}
+
+ at ARTICLE{weissetal2007a,
+  AUTHOR = {Weiss, A. and King, J. E. and Hopkins, W. D.},
+  TITLE = {Title},
+  DATE = {2007}
+}
+
+ at ARTICLE{weissetal2009a,
+  AUTHOR = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.},
+  TITLE = {Title},
+  DATE = {2009}
+}
+
+% Testing era output
+ at BOOK{plato,
+  AUTHOR = {Plato},
+  TITLE  = {Meno},
+  DATE = {-0379%}
+}
+
+% Testing citation with complete dates
+ at ARTICLE{Ludwig2014,
+ ENTRYSUBTYPE  = {nonacademic},
+ AUTHOR = {Ludwig, Jan},
+ TITLE = {Wenn nichts mehr geht},
+ URL = {http://www.zeit.de/campus/2014/06/pruefungsergebnis-klage},
+ JOURNALTITLE = {Zeit Campus},
+ DATE = {2014-10-08},
+ LANGUAGE = {de}
+}
+
+% Testing date range with same months, different days
+ at BOOK{daterange1,
+  AUTHOR        = {Freddy Furnishings},
+  TITLE         = {Authorship Provisions in Augment},
+  DATE          = {1984-02-01/1984-02-27},
+}
+
+% Testing date range with different months
+ at BOOK{daterange2,
+  AUTHOR        = {Graham Granary},
+  TITLE         = {Authorship Provisions in Augment},
+  DATE          = {1984-02-27/1984-03-01},
+}
+


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-citations.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-references.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-references.bib	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,1060 @@
+% (APA 7.01 Example 1)
+% Note that the URL is suppressed if there is a DOI
+ at ARTICLE{7.01:1,
+  AUTHOR         = {K. L. Herbst-Damm and J. A. Kulik},
+  TITLE          = {Volunteer Support, Marital Status, and the Survival Times of Terminally Ill Patients},
+  JOURNALTITLE   = {Health Psychology},
+  VOLUME         = {24},
+  PAGES          = {225--229},
+  DATE           = {2005},
+  DOI            = {10.1037/0278-6133.24.2.225},
+  URL            = {http://some.url}
+
+}
+
+% (APA 7.01 Example 2)
+% Note here that there is a month but this should not be shown in ARTICLES
+% as per 6.28
+ at ARTICLE{7.01:2,
+  AUTHOR         = {D. G. Gilbert and J. F. McClernon and N. E. Rabinovich and C. Sugai and L. C. Plath and G. Asgaard and D. Dickinson and N. Botros},
+  TITLE          = {Effects of Quitting Smoking and {EEG} Activation and Attention Last for More Than 31 Days and are More Severe With Stress, Dependence, {DRD2 A1} Allele, and Depressive Traits},
+  JOURNALTITLE   = {Nicotine and Tobacco Research},
+  VOLUME         = {6},
+  PAGES          = {249--267},
+  DATE           = {2004-06-22},
+  DOI            = {10.1080/14622200410001676305}
+}
+
+% (APA 7.01 Example 3)
+ at ARTICLE{7.01:3a,
+  AUTHOR         = {T. J. Sillick and N. S. Schutte},
+  TITLE          = {Emotional Intelligence and Self-esteem Mediate Between Perceived Early Parental Love and Adult Happiness},
+  JOURNALTITLE   = {E-Journal of Applied Psychology},
+  VOLUME         = {2},
+  NUMBER         = {2},
+  PAGES          = {38--48},
+  DATE           = {2006},
+  URL            = {http://ojs.lib.swin.edu.au/index.php/ejap}
+}
+
+ at ARTICLE{7.01:3b,
+  AUTHOR         = {M. A. Light and I. H. Light},
+  TITLE          = {The Geographic Expansion of {M}exican Immigration in the {U}nited {S}tates and its Implications for Local Law Enforcement},
+  DATE           = {2008},
+  JOURNALTITLE   = {Law Enforcement Executive Forum Journal},
+  VOLUME         = {8},
+  NUMBER         = {1},
+  PAGES          = {73--82},
+}
+
+% (APA 7.01 Example 4)
+ at ARTICLE{7.01:4,
+  AUTHOR         = {P. Guimard and A. Florin},
+  ORIGTITLE      = {Les évaluations des enseignants en grande section de maternelle sont-elles prédictives des difficultés de lecture au cours préparatoire?},
+  TITLE          = {Are Teacher Ratings in Kindergarten Predictive of Reading Difficulties in First Grade?},
+  JOURNALTITLE   = {Approche Neuropsychologique des Apprentissages chez l'Enfant},
+  VOLUME         = {19},
+  PAGES          = {5--17},
+  DATE           = {2007},
+}
+
+% (APA 7.01 Example 5)
+% PUBSTATE field is reserved for biblatex defined keys so use NOTE for such non-standard
+% things
+ at ARTICLE{7.01:5,
+  AUTHOR         = {S. C. {Von Ledebur}},
+  TITLE          = {Optimizing Knowledge Transfer by New Employees in Companies},
+  JOURNALTITLE   = {Knowledge Management Research \& Practice},
+  DATE           = {2007},
+  NOTE           = {Advance online publication},
+  DOI            = {10.1057/palgrave.kmrp.8500141}
+}
+
+% (APA 7.01 Example 6)
+ at ARTICLE{7.01:6,
+  AUTHOR         = {R. Briscoe},
+  PUBSTATE       = {inpress},
+  TITLE          = {Egocentric Spatial Representation in Action and Perception},
+  JOURNALTITLE   = {Philosophy and Phenomenological Research},
+  URL            = {http://cogprints.org/5780/1/ECSRAP.F07.pdf}
+}
+
+% (APA 7.01 Example 7)
+% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Magazine Article"
+% and has different date format requirements
+ at ARTICLE{7.01:7,
+  ENTRYSUBTYPE   = {nonacademic},
+  AUTHOR         = {J. Chamberlin and A. Novotney and E. Packard and M. Price},
+  TITLE          = {Enhancing Worker Well-being},
+  SUBTITLE       = {Occupational Health Psychologists Convene to Share Their Research on Work, Stress, and Health},
+  JOURNALTITLE   = {Monitor on Psychology},
+  VOLUME         = {39},
+  NUMBER         = {5},
+  PAGES          = {26-29},
+  DATE           = {2008-05}
+}
+
+% (APA 7.01 Example 8)
+% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Online Magazine Article"
+% and has different date format requirements
+ at ARTICLE{7.01:8,
+  ENTRYSUBTYPE   = {nonacademic},
+  AUTHOR         = {Richard Clay},
+  TITLE          = {Science vs. Ideology},
+  SUBTITLE       = {Psychologists Fight Back About the Misuse of Research},
+  JOURNALTITLE   = {Monitor on Psychology},
+  VOLUME         = {39},
+  NUMBER         = {6},
+  DATE           = {2008-06},
+  URL            = {http://www.apa.org/monitor/}
+}
+
+% (APA 7.01 Example 9)
+% The date format in the formatted APA example is inconsistent with all other date
+% range examples which have a '-' separating the range. We use '-' here too.
+% Note the use of "nonacademic" ENTRYSUBTYPE. This is a "Newsletter Article"
+% and has different date format requirements
+ at ARTICLE{7.01:9,
+  ENTRYSUBTYPE   = {nonacademic},
+  TITLE          = {Six Sites Meet for Comprehensive Anti-gang Initiative Conference},
+  SHORTTITLE     = {Six Sites Meet},
+  JOURNALTITLE   = {OJJDP News {@} a Glance},
+  DATE           = {2006-11/2006-12},
+  URL            = {http://www.ncjrs.gov/html/ojjdp/news_at_glance/216684/topstory.html}
+}
+
+% (APA 7.01 Example 10)
+% Use entrytype "NEWSARTICLE" for newspaper articles so that the pages specification
+% is formatted correctly (needs "p/pp" whereas normal articles don't)
+% Use the "NEWSPAPER" field for the title of the paper, otherwise this entrytype
+% is similar to ARTICLE
+% Numeral format is redefined to allow page number starting in letters
+% Discontinuous pages are ok
+ at NEWSARTICLE{7.01:10,
+  AUTHOR         = {J. Schwartz},
+  TITLE          = {Obesity Affects Economic, Social Status},
+  NEWSPAPER      = {The Washington Post},
+  PAGES          = {A1, A4},
+  DATE           = {1993-09-30},
+}
+
+% (APA 7.01 Example 11)
+ at NEWSARTICLE{7.01:11,
+  AUTHOR         = {J. E. Brody},
+  TITLE          = {Mental Reserves Keep Brain Agile},
+  NEWSPAPER      = {The New York Times},
+  DATE           = {2007-12-11},
+  URL            = {http://www.nytimes.com}
+}
+
+% (APA 7.01 Example 12)
+ at PERIODICAL{7.01:12a,
+  EDITOR         = {C. Haney and R. L. Wiener},
+  TITLE          = {Capital Punishment in the {United States}},
+  ISSUETITLE     = {Special issue},
+  JOURNALTITLE   = {Psychology, Public Policy, and Law},
+  VOLUME         = {10},
+  NUMBER         = {4},
+  DATE           = {2004}
+}
+
+ at PERIODICAL{7.01:12b,
+  EDITOR         = {P. Greenfield and Z. Yan},
+  TITLE          = {Children, Adolescents, and the {I}nternet},
+  ISSUETITLE     = {Special section},
+  JOURNALTITLE   = {Developmental Psychology},
+  VOLUME         = {42},
+  PAGES          = {391--458},
+  DATE           = {2006}
+}
+
+% APA manual implicit example made explicit - no editors
+ at PERIODICAL{7.01:12c,
+  TITLE          = {Capital Punishment in the {United Kingdom}},
+  SHORTTITLE     = {Capital Punishment},
+  ISSUETITLE     = {Special issue},
+  JOURNALTITLE   = {Psychology, Public Policy, and Law},
+  VOLUME         = {10},
+  NUMBER         = {4},
+  DATE           = {2004}
+}
+
+% (APA 7.01 Example 13)
+% Monographs can be specified as articles with appropriate NUMBER fields
+ at ARTICLE{7.01:13a,
+  AUTHOR         = {D. C. Ganster and J. Schaubroeck and W. E. Sime and B. T. Mayes},
+  TITLE          = {The Nomological Validity of the {T}ype {A} Personality Among Employed Adults},
+  TITLEADDON     = {Monograph},
+  JOURNALTITLE   = {Journal of Applied Psychology},
+  VOLUME         = {76},
+  PAGES          = {143--168},
+  DATE           = {1991},
+  DOI            = {10.1037/0021-9010.76.1.143}
+}
+
+% Implicit example made explicit (Given in APA 5th Ed. Manual)
+ at ARTICLE{7.01:13b,
+  AUTHOR         = {P. L. Harris and R. D. Kavanaugh},
+  TITLE          = {Young Children's Understanding of Pretense},
+  JOURNALTITLE   = {Monographs of the Society for Research in Child Development},
+  VOLUME         = {58},
+  NUMBER         = {1, Serial No. 231},
+  DATE           = {1993}
+}
+
+% Implicit example made explicit (Given in APA 5th Ed. Manual)
+ at ARTICLE{7.01:13c,
+  AUTHOR         = {W. F. Battig and W. E. Montague},
+  TITLE          = {Category Norms for Verbal Items in 56 Categories},
+  SUBTITLE       = {A Replication and Extension of the {C}onnecticut Category Norms},
+  JOURNALTITLE   = {Journal of Experimental Psychology Monographs},
+  VOLUME         = {80},
+  NUMBER         = {3, Pt. 2},
+  DATE           = {1969}
+}
+
+% (APA 7.01 Example 14)
+ at ARTICLE{7.01:14,
+  TITLE          = {Editorial: ``{W}hat a Disaster'' and Why Does This Question Matter?},
+  TITLEADDON     = {Editorial},
+  JOURNALTITLE   = {Journal of Contingencies and Crisis Management},
+  VOLUME         = {14},
+  PAGES          = {1--2},
+  DATE           = {2006}
+}
+
+% (APA 7.01 Example 15)
+% Note use of font change
+ at ARTICLE{7.01:15,
+  AUTHOR         = {S. Marshall-Pescini and A. Whiten},
+  TITLE          = {Social Learning of Nut-Cracking Behaviour in {E}ast {A}frican Sanctuary-living Chimpanzees (\textsl{Pan troglodytes schweinfurthii})},
+  TITLEADDON     = {Supplemental material},
+  JOURNALTITLE   = {Journal of Comparitive Psychology},
+  VOLUME         = {122},
+  PAGES          = {186--194},
+  DATE           = {2008},
+  DOI            = {10.1037/0735-7036.122.2.186.supp}
+}
+
+% (APA 7.01 Example 16)
+ at ARTICLE{7.01:16a,
+  AUTHOR         = {N. J. Woolf and S. L. Young and M. S. Fanselow and L. L. Butcher},
+  TITLE          = {{MAP-2} Expression in Cholinoceptive Pyramidal Cells of Rodent Cortex and Hippocampus is Altered by {P}avlovian Conditioning},
+  TITLEADDON     = {Abstract},
+  JOURNALTITLE   = {Society for Neuroscience Abstracts},
+  VOLUME         = {17},
+  PAGES          = {480},
+  DATE           = {1991}
+}
+
+% Note use of ABSTRACTURL field value to specify that the URL is for the abstract
+% and so the entry gets "Abstract retrieved from" instead of just "retrieved from"
+ at ARTICLE{7.01:16b,
+  AUTHOR         = {S. R. Lassen and M. M. Steele and W. Sailor},
+  TITLE          = {The Relationship of School-wide Positive Behavour Support to Academic Achievement in an Urban Middle School},
+  JOURNALTITLE   = {Psychology in the Schools},
+  VOLUME         = {43},
+  PAGES          = {701--712},
+  DATE           = {2006},
+  ABSTRACTURL    = {http://www.interscience.wiley.com}
+}
+
+% (APA 7.01 Example 17)
+% 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*).
+ at ARTICLE{7.01:17,
+  AUTHOR         = {L. R. Hare and K. O'Neill},
+  TITLE          = {Effectiveness and Efficiency in Small Academic Peer Groups},
+  JOURNALTITLE   = {Small Group Research},
+  VOLUME         = {31},
+  PAGES          = {24--53},
+  DATE           = {2000},
+  ABSTRACTLOC    = {{S}ociological {A}bstracts database. (Accession No. 200010185)}
+}
+
+% (APA 7.02 Example 18)
+ at BOOK{7.02:18,
+  AUTHOR         = {M. A. Shotton},
+  TITLE          = {Computer Addiction? {A} Study of Computer Dependency},
+  LOCATION       = {London, England},
+  PUBLISHER      = {Taylor \& Francis},
+  DATE           = {1989}
+}
+
+% (APA 7.02 Example 19)
+% Note the different year to the actual example to stop bibaltex generating extrayear
+% since the APA examples pretend each example is effectively an entry from a
+% different bibliography
+ at BOOK{7.02:19a,
+  AUTHOR         = {M. A. Shotton},
+  TITLE          = {Computer Addiction? A Study of Computer Dependency},
+  TITLEADDON     = {{DX} {R}eader version},
+  DATE           = {1990},
+  URL            = {http://www.ebbokstore.tandf.co.uk/html/index.asp}
+}
+
+ at BOOK{7.02:19b,
+  AUTHOR         = {G. R. Schiraldi},
+  TITLE          = {The Post-traumatic Stress Disorder Sourcebook},
+  SUBTITLE       = {A Guide to Healing, Recovery, and Growth},
+  TITLEADDON     = {{A}dobe {D}igital {E}ditions version},
+  DATE           = {2001},
+  DOI            = {10.1036/0071393722}
+}
+
+% (APA 7.02 Example 20)
+ at BOOK{7.02:20,
+  AUTHOR         = {E. O'Keefe},
+  TITLE          = {Egoism \& the Crisis in {W}estern Values},
+  URL            = {http://www.onlineoriginals.com/showitem.asp?itemID=135}
+}
+
+% (APA 7.02 Example 21)
+% NOTE is automatically generated from ORIGDATE
+ at INBOOK{7.02:21,
+  AUTHOR         = {S. Freud},
+  EDITOR         = {J. Strachey},
+  TRANSLATOR     = {J. Strachey},
+  TITLE          = {The Method of Interpreting Dreams},
+  BOOKTITLE      = {The Standard Edition of the Complete Psychological Works of {S}igmund {F}reud},
+  VOLUME         = {4},
+  PAGES          = {96--121},
+  SUBTITLE       = {An Analysis of a Specimen Dream},
+  DATE           = {1953},
+  ORIGDATE       = {1900},
+  URL            = {http://books.google.com/books},
+}
+
+% (APA 7.02 Example 22)
+ at BOOK{7.02:22,
+  EDITOR         = {N. Thomas},
+  TITLE          = {Perspectives on the Community College},
+  SUBTITLE       = {A Journey of Discovery},
+  TITLEADDON     = {Monograph},
+  DATE           = {2002},
+  URL            = {http://eric.ed.gov/}
+}
+
+% (APA 7.02 Example 23)
+ at BOOK{7.02:23,
+  EDITOR         = {S. Koch},
+  TITLE          = {Psychology},
+  SUBTITLE       = {A Study of Science},
+  VOLUMES        = {1--6},
+  LOCATION       = {New York, NY},
+  PUBLISHER      = {McGraw-Hill},
+  DATE           = {1959/1963}
+}
+
+% (APA 7.02 Example 24)
+ at INBOOK{7.02:24,
+  AUTHOR         = {Strong, Jr., E. K. and R. S. Uhrbrock},
+  EDITORA        = {L. Outhwaite},
+  EDITORATYPE    = {series},
+  TITLE          = {Bibliography in Job Analysis},
+  BOOKTITLE      = {Personnel {R}esearch {S}eries},
+  BOOKSUBTITLE   = {Vol. 1. {J}ob Analysis and the Curriculum},
+  PAGES          = {140--146},
+  DATE           = {1923},
+  DOI            = {10.1037/10762-000}
+}
+
+% (APA 7.02 Example 25)
+ at INBOOK{7.02:25,
+  AUTHOR         = {D. M. Haybron},
+  EDITOR         = {M. Eid and R. J. Larsen},
+  TITLE          = {Philosophy and the Science of Subjective Well-Being},
+  BOOKTITLE      = {The Science of Subjective Well-Being},
+  LOCATION       = {New York, NY},
+  PUBLISHER      = {Guildford Press},
+  PAGES          = {17-43},
+  DATE           = {2008},
+}
+
+% (APA 7.02 Example 26)
+ at INBOOK{7.02:26,
+  AUTHOR         = {J. Piaget},
+  EDITOR         = {K. Richardson and S. Sheldon},
+  TRANSLATOR     = {G. Gellerier and J. Langer},
+  TITLE          = {Extracts From {P}iaget's Theory},
+  BOOKTITLE      = {Cognitive Development to Adolescence},
+  BOOKSUBTITLE   = {A Reader},
+  PAGES          = {3--18},
+  LOCATION       = {Hillsdale, NJ},
+  PUBLISHER      = {Erlbaum},
+  DATE           = {1988},
+  RELATED        = {mcppiaget},
+  RELATEDTYPE    = {reprintfrom}
+}
+
+ at INCOLLECTION{mcppiaget,
+  EDITOR      = {P. H. Mussen},
+  TITLE       = {Manual of Child Psychology},
+  DATE        = {1970},
+  LOCATION    = {New York, NY},
+  PUBLISHER   = {Wiley},
+  PAGES       = {703--732}
+}
+
+% (APA 7.02 Example 27)
+ at BOOK{7.02:27,
+  EDITOR         = {G. R. VandenBos},
+  TITLE          = {{APA} Dictionary of Psychology},
+  LOCATION       = {Washington, DC},
+  PUBLISHER      = {American Psychological Association},
+  DATE           = {2007},
+}
+
+% (APA 7.02 Example 28)
+ at BOOK{7.02:28,
+  AUTHOR         = {{Real Academia Española}},
+  ORIGTITLE      = {Diccionario de la lengua española},
+  TITLE          = {Dictionary of the {S}panish Language},
+  EDITION        = {22},
+  LOCATION       = {Madrid, Spain},
+  PUBLISHER      = {Author},
+  DATE           = {2001},
+}
+
+% (APA 7.02 Example 29)
+% If the EDITION field is not just an edition number like "2" or "4" (which
+% will be turned into an ordinal like "2nd" or "4th" by the style automatically),
+% then make the EDITION field the exact string you need.
+ at INBOOK{7.02:29,
+  AUTHOR         = {G. Graham},
+  EDITOR         = {E. N. Zalta},
+  TITLE          = {Behaviourism},
+  BOOKTITLE      = {The {S}tanford Encyclopedia of Philosophy},
+  EDITION        = {Fall 2007 ed.},
+  DATE           = {2005},
+  URL            = {http://plato.stanford.edu/entries/behaviourism/}
+}
+
+% (APA 7.02 Example 30)
+ at INBOOK{7.02:30,
+  TITLE          = {Heuristic},
+  BOOKTITLE      = {{M}erriam-{W}ebster's Online Dictionary},
+  EDITION        = {11},
+  URL            = {http://www.m-w.com/dicitonary/heuristic}
+}
+
+% (APA 7.03 Example 31)
+% NUMBER contains report number, "No." is added automatically and TYPE contains the
+% report type
+ at REPORT{7.03:31,
+  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},
+  NUMBER         = {02-2650},
+  DATE           = {2003},
+  URL            = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf}
+}
+
+% (APA 7.03 Example 32)
+ at REPORT{7.03:32,
+  AUTHOR         = {{American Psychological Association, Task Force on the Sexualization of Girls}},
+  TITLE          = {Report of the {APA} {T}ask {F}orce on the {S}exualization of {G}irls},
+  DATE           = {2007},
+  URL            = {http://www.apa.org/pi/wpo/sexualization.html}
+}
+
+% (APA 7.03 Example 33)
+% Use URLDESCRIPTION to introduce website address; defaults to just "Retreived from"
+% if not present
+ at REPORT{7.03:33,
+  AUTHOR         = {S. S. A. Kessy and F. M. Urio},
+  TITLE          = {The Contribution of Microfinance Institutions to Poverty Reduction in {T}anzania},
+  TYPE           = {Research Report},
+  NUMBER         = {06.3},
+  DATE           = {2006},
+  URLDESCRIPTION = {Research on Poverty Alleviation website},
+  URL            = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessey_and_Urio.pdf}
+}
+
+% (APA 7.03 Example 34)
+% This example is an anomaly as it doesnt' have "No." before the report number.
+% This style does this consistently for all reports with numbers
+ at REPORT{7.03:34,
+  AUTHOR         = {J. E. McDaniel and C. G. Miskel},
+  TITLE          = {The Effect of Groups and Individuals on National Decisionmaking},
+  SUBTITLE       = {Influence and Domination in the Reading Policymaking Environment},
+  TYPE           = {CIERA Report},
+  NUMBER         = {3-025},
+  DATE           = {2002},
+  URLDESCRIPTION = {University of Michigan, Center for Improvement of Early Reading Achievement website},
+  URL            = {http://www.ciera.org/library/reports/inquiry-3/3-025/3-025.pdf}
+}
+
+% (APA 7.03 Example 35)
+ at TECHREPORT{7.03:35,
+  AUTHOR         = {{Employee Benefit Research Institute}},
+  TITLE          = {Sources of health Insurance and Characteristics of the Uninsured},
+  TYPE           = {Issue Brief},
+  NUMBER         = {123},
+  DATE           = {1992-02},
+  LOCATION       = {Washington, DC},
+  PUBLISHER      = {Author}
+}
+
+% (APA 7.04 Example 36)
+ at INPROCEEDINGS{7.04:36,
+  AUTHOR         = {J. Muellbauer},
+  TITLE          = {Housing, Credit and Consumer Expenditure},
+  EDITORA        = {S. C. Ludvigson},
+  EDITORATYPE    = {chair},
+  BOOKTITLE      = {Housing and Consumer Behaviour},
+  EVENTTITLE     = {Symposium Conducted at the Meeting of the {F}ederal {R}eserve {B}ank of {K}ansas {C}ity},
+  LOCATION       = {Jackson Hole, WY},
+  DATE           = {2007-09}
+}
+
+% (APA 7.04 Example 37)
+% Unpublished conference papers are UNPUBLISHED type
+ at UNPUBLISHED{7.04:37,
+  AUTHOR         = {S. Liu},
+  TITLE          = {Defending Against Business Crises with the Help of Inteligent Agent Based Early Warning Solutions},
+  DATE           = {2005-05},
+  LOCATION       = {Miami, FL},
+  NOTE           = {Paper presented at the Seventh International Conferene on Enterprise Information Systems},
+  ABSTRACTURL    = {http://www.iceis.org/iceis2005/abstracts_2005.htm}
+}
+
+% (APA 7.04 Example 38)
+ at 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, {USA}},
+  VOLUME         = {105},
+  PAGES          = {12593--12598},
+  DATE           = {2008},
+  DOI            = {10.1073/pnas.0805417105}
+}
+
+% (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
+ at 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 {N}otes in {C}omputer {S}cience},
+  VOLUME         = {4678},
+  BOOKTITLE      = {Advanced {C}oncepts for {I}ntelligent {V}ision {S}ystems},
+  PAGES          = {97--108},
+  LOCATION       = {Berlin, Germany},
+  PUBLISHER      = {Springer-Verlag},
+  DATE           = {2007},
+  DOI            = {10.1007/978-3-540-74607-2_9}
+}
+
+% (APA 7.05 Example 40)
+% The PHDTHESIS and MASTERSTHESIS are the same as THESIS but they supply a default
+% TYPE field automatically
+ at MASTERSTHESIS{7.05:40,
+  AUTHOR         = {D. S. McNiel},
+  TITLE          = {Meaning Through Narrative},
+  SUBTITLE       = {A Personal Narrative Discussing Growing Up with an Alchoholic Mother},
+  DATE           = {2006},
+  NOTE           = {Available from ProQuest Dissertations and Theses database},
+  ADDENDUM       = {UMI No. 1434728}
+}
+
+% (APA 7.05 Example 41)
+ at PHDTHESIS{7.05:41,
+  AUTHOR         = {R. J. Adams},
+  TITLE          = {Building a Foundation for Evaluation of Instruction in Higher Education and Continuing Education},
+  DATE           = {1973},
+  URL            = {http://www.ohiolink.edu/etd/}
+}
+
+% (APA 7.05 Example 42)
+ at PHDTHESIS{7.05:42,
+  AUTHOR         = {A. Bruckman},
+  TITLE          = {{MOOSE Crossing}},
+  SUBTITLE       = {Construction, Community, and Learning in a Networked Virtual World for Kids},
+  INSTITUTION    = {Massachusetts Institute of Technology},
+  DATE           = {1977},
+  URL            = {http://www-static.cc.gatech.edu/~asb/thesis/}
+}
+
+% (APA 7.05 Example 43)
+% This example formats naturally as an article as it has VOLUME, NUMBER etc.
+ at ARTICLE{7.05:43,
+  AUTHOR         = {L. G. Appelbaum},
+  JOURNALTITLE   = {Dissertation Abstracts International: Section B. Sciences and Engineering},
+  TITLE          = {Three Studies of Human Information Processing},
+  SUBTITLE       = {Texture Amplification, Motion Representation, and Figure-Ground Segregation},
+  VOLUME         = {65},
+  NUMBER         = {10},
+  DATE           = {2005},
+  PAGES          = {5428}
+}
+
+% (APA 7.05 Example 44)
+% Note we're overriding TYPE here which is usually automatically set for PHDTHESIS since,
+% for some reason, this entry has "Doctoral thesis" instead of the usual "Doctoral
+% dissertation"
+ at PHDTHESIS{7.05:44,
+  AUTHOR         = {P. Carlbom},
+  TITLE          = {Carbody and Passengers in Rail Vehicle Dynamics},
+  TYPE           = {Doctoral thesis},
+  INSTITUTION    = {Royal Institute of Technology, Stockholm},
+  LOCATION       = {Sweden},
+  DATE           = {2000},
+  URL            = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029}
+}
+
+% (APA 7.06 Example 45)
+% Note how this is handled by the biblatex/biber "related entries" functionality
+% We have included the year in the reviewed item for consistency, as per 7.06:46
+% The comma after the reviewed title is ommited for consistency, as per 7.06:48
+ at REVIEW{7.06:45,
+  AUTHOR         = {B. R. Schatz},
+  TITLE          = {Learning By Text or Context?},
+  REVIEWTEXT     = {the book},
+  RELATED        = {brdu},
+  RELATEDTYPE    = {reviewof},
+  RELATEDSTRING  = {Review of the book},
+  JOURNALTITLE   = {Science},
+  VOLUME         = {290},
+  PAGES          = {1304},
+  DATE           = {2000-11-17},
+  DOI            = {10.1126/science.290.5495.1304},
+}
+
+ at BOOK{brdu,
+  AUTHOR     = {John Seely Brown and Paul Duguid},
+  TITLE      = {The Social Life of Information},
+  DATE       = {2000},
+  PUBLISHER  = {Harvard Business School Press}
+}
+
+% (APA 7.06 Example 46)
+% Note that this example drops the "produced" in the reviewed item. It's not worth
+% automating this sort of verb as "by" is perfectly acceptable.
+ at REVIEW{7.06:46,
+  AUTHOR         = {A. Axelman and J. L. Shapiro},
+  TITLE          = {Does the Solution Warrant the Problem?},
+  RELATED        = {apavid},
+  RELATEDTYPE    = {reviewof},
+  RELATEDSTRING  = {Review of the {DVD}},
+  JOURNALTITLE   = {PsycCRITIQUES},
+  VOLUME         = {52},
+  NUMBER         = {51},
+  DATE           = {2007},
+  DOI            = {10.1037/a0009036}
+}
+
+ at VIDEO{apavid,
+  PRODUCER   = {{the American Psychological Association}},
+  TITLE      = {Brief Therapy With Adolescents},
+  DATE       = {2007}
+}
+
+% (APA 7.06 Example 47)
+% Again we drop the "produced" as with Example 46
+ at REVIEW{7.06:47,
+  RELATED        = {bioshock},
+  RELATEDTYPE    = {reviewof},
+  RELATEDSTRING  = {Review of the video game},
+  URL            = {http://www.whattheyplay.com/products/bioshock-for-xbox-360/?fm=3&ob=1&t=0#166},
+}
+
+ at SOFTWARE{bioshock,
+  AUTHOR         = {{2K Games}},
+  ENTRYSUBTYPE   = {Computer Game},
+  TITLE          = {Bio{S}hock},
+  DATE           = {2007}
+}
+
+% (APA 7.06 Example 48)
+ at REVIEW{7.06:48,
+  AUTHOR         = {K. S. Wolf},
+  TITLE          = {The Future for {D}eaf Individuals is Not That Bleak},
+  RELATED        = {deaf},
+  RELATEDTYPE    = {reviewof},
+  RELATEDSTRING  = {Peer commentary on the paper},
+  DATE           = {2005},
+  URL            = {http://www.personalityresearch.org/papers/hal.htm#wolf}
+}
+
+ at ARTICLE{deaf,
+  AUTHOR         = {K. S. Wolf},
+  TITLE          = {``{D}ecrease of {D}eaf potential in a mainstreamed environment''},
+  JOURNALTITLE   = {Some Journal},
+  VOLUME         = {2},
+  NUMBER         = {1},
+  PAGES          = {1--10},
+  DATE           = {2003},
+}
+
+% (APA 7.07 Example 49)
+% 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)"
+ at VIDEO{7.07:49,
+  ENTRYSUBTYPE   = {{DVD}},
+  PRODUCER       = {{American Psychological Association}},
+  TITLE          = {Responding Therapeutically to Patient Expressions of Sexual Attraction},
+  DATE           = {2000},
+  URL            = {http://www.apa.org/videos/}
+}
+
+% (APA 7.07 Example 50)
+ at AUDIO{7.07:50,
+  ENTRYSUBTYPE   = {Audio podcast},
+  PRODUCER       = {D. {Van Nuys}},
+  TITLE          = {Shrink Rap Radio},
+  DATE           = {2007-12-19},
+  URL            = {http://www.shrinkrapradio.com/}
+}
+
+% (APA 7.07 Example 51)
+ at VIDEO{7.07:51,
+  ENTRYSUBTYPE   = {Television series episode},
+  WRITER         = {D. Egan},
+  DIRECTOR       = {J. Alexander},
+  EXECPRODUCER   = {D. Shore},
+  TITLE          = {Failure to Communicate},
+  MAINTITLE      = {House},
+  LOCATION       = {New York, NY},
+  PUBLISHER      = {Fox Broadcasting},
+  DATE           = {2005},
+}
+
+% (APA 7.07 Example 52)
+% Note use of SORTKEY to make sorting ignore the lower case AUTHOR
+ at MUSIC{7.07:52,
+  SORTKEY        = {Lang, K. D.},
+  ENTRYSUBTYPE   = {{CD}},
+  AUTHOR         = {{lang}, {k} {d}},
+  TITLE          = {Shadow and the Frame},
+  MAINTITLE      = {Watershed},
+  MAINTITLEADDON = {{CD}},
+  LOCATION       = {New York, NY},
+  PUBLISHER      = {Nonesuch Records},
+  DATE           = {2008},
+}
+
+% (APA 7.07 Example 53)
+ at MISC{7.07:53,
+  AUTHOR         = {{Lewis County Geographic Information Services}},
+  NAMEADDON      = {Cartographer},
+  TITLE          = {Population Density, 2000 {U}.{S}. {C}ensus},
+  ENTRYSUBTYPE   = {Demographic map},
+  DATE           = {2002},
+  URL            = {http://www.co.lewis.wa.us/publicworks/maps/Demographics/census-pop-dens_2000.pdf}
+}
+
+% (APA 7.08 Example 54)
+ at DATA{7.08:54,
+  ENTRYSUBTYPE   = {Data file and code book},
+  AUTHOR         = {{Pew Hispanic Center}},
+  TITLE          = {Changing Channels and Crisscrossing Cultures},
+  SUBTITLE       = {A Survey of {L}atinos on the News Media},
+  DATE           = {2004},
+  URL            = {http://pewhispanic.org/datasets/}
+}
+
+% (APA 7.08 Example 55)
+ at MISC{7.08:55,
+  AUTHOR         = {M. L. Friedlander and V. Escudero and L. Heatherington},
+  TITLE          = {{E-SOFTA}},
+  SUBTITLE       = {System for Observing Family Therapy Alliances},
+  ENTRYSUBTYPE   = {Software and training videos},
+  DATE           = {2002},
+  NOTE           = {Unpublished instrument},
+  URL            = {http://www.softa-soatif.com/}
+}
+
+% (APA 7.08 Example 56)
+ at SOFTWARE{7.08:56,
+  TITLE          = {Comprehensive {M}eta-{A}nalysis},
+  TITLEADDON     = {Computer software},
+  VERSION        = {2},
+  LOCATION       = {Englewood, NJ},
+  PUBLISHER      = {Biostat}
+}
+
+% (APA 7.08 Example 57)
+ at MISC{7.08:57,
+  TITLE          = {{Eyelink II}},
+  ENTRYSUBTYPE   = {Apparatus and software},
+  LOCATION       = {Mississauga, Ontario, Canada},
+  PUBLISHER      = {SR Research},
+  DATE           = {2004},
+}
+
+% (APA 7.09 Example 58)
+ at UNPUBLISHED{7.09:58,
+  AUTHOR         = {E. Blackwell and P. J. Conrod},
+  TITLE          = {A Five-Dimensional Measure of Drinking Motives},
+  HOWPUBLISHED   = {Unpublished manuscript},
+  INSTITUTION    = {Department of Psychology, University of British Columbia},
+  LOCATION       = {Vancouver, Canada},
+  DATE           = {2003},
+}
+
+% (APA 7.09 Example 59)
+ at UNPUBLISHED{7.09:59,
+  AUTHOR         = {J. Y. Ting and P. Florsheim and W. Huang},
+  TITLE          = {Mental Health Help-Seeking in Ethnic Minority Populations},
+  SUBTITLE       = {A Theoretical Perspective},
+  HOWPUBLISHED   = {Manuscript submitted for publication},
+  DATE           = {2008},
+}
+
+% (APA 7.09 Example 60)
+ at DATA{7.09:60,
+  AUTHOR         = {F. Bordi and J. E. LeDoux},
+  ENTRYSUBTYPE   = {Auditory response latencies in rat auditory cortex},
+  NOTE           = {Unpublished raw data},
+  DATE           = {1993},
+}
+
+% (APA 7.09 Example 61)
+ at UNPUBLISHED{7.09:61a,
+  AUTHOR         = {S. D. Mitchell},
+  TITLE          = {The Import of Uncertainty},
+  DATE           = {2000},
+  URL            = {http://philsci-archive.pitt.edu/archive/00000162/}
+}
+
+ at ARTICLE{7.09:61b,
+  AUTHOR         = {S. D. Mitchell},
+  TITLE          = {The Import of Uncertainty},
+  JOURNALTITLE   = {The Pluralist},
+  VOLUME         = {2},
+  NUMBER         = {1},
+  PAGES          = {58--71},
+  DATE           = {2007},
+}
+
+% (APA 7.09 Example 62)
+% "eric" is defined as a recognised eprint type in the style and will be formatted as a
+% localised version of "Retrieved from ERIC database (<eprintid>)"
+ at UNPUBLISHED{7.09:62,
+  AUTHOR         = {K. Kubota},
+  TITLE          = {``{S}oaking'' Model for Learning},
+  SUBTITLE       = {Analyzing {J}apanese Learning/Teaching Process from a Socio-Historical Perspective},
+  DATE           = {2007},
+  EPRINTTYPE     = {eric},
+  EPRINT         = {ED498566}
+}
+
+% (APA 7.10 Example 63)
+ at LETTER{7.10:63,
+  AUTHOR         = {L. K. Frank},
+  TITLE          = {Letter to {R}obert {M}. {O}gden},
+  INSTITUTION    = {Rockerfeller Archive Center},
+  NUMBER         = {GEB series 1.3, Box 371, Folder 3877},
+  LOCATION       = {Tarrytown, NY},
+  DATE           = {1935-02-04},
+}
+
+% (APA 7.10 Example 64)
+ at LETTER{7.10:64,
+  AUTHOR         = {G. P. Zacharius},
+  TITLE          = {Letter to {W}illiam {R}ickel ({W}. {R}ickel, {T}rans.)},
+  DATE           = {1953-08-15},
+  NOTE           = {Copy in possession of Hendrika Vande Kemp}
+}
+
+% (APA 7.10 Example 65)
+% Entrytype is "LETTERS" (plural) for a collection of letters
+ at LETTERS{7.10:65,
+  AUTHOR         = {G. W. Allport},
+  TITLE          = {Correspondence},
+  DATE           = {1930/1967},
+  INSTITUTION    = {Gordon W. Allport Papers},
+  NUMBER         = {HUG 4118.10},
+  LOCATION       = {{Harvard University Archives, Cambridge}, MA},
+}
+
+% (APA 7.10 Example 66)
+ at UNPUBLISHED{7.10:66,
+  AUTHOR         = {A. Berliner},
+  TITLE          = {Notes for a Lecture on Reminiscences of {W}undt and {L}epizig},
+  DATE           = {1959},
+  HOWPUBLISHED   = {Anna Berliner Memoirs (Box M50)},
+  LOCATION       = {{Archives of the History of American Psychology, University of Akron, Akron}, OH}
+}
+
+% (APA 7.10 Example 67)
+% biblatex 3.4+ supports data annotations which can be use to deal with uncertain authors
+% biblatex 3.5+ supports uncertainty marker for dates
+ at UNPUBLISHED{7.10:67,
+  AUTHOR         = {A. Allport},
+  AUTHOR+an      = {=uncertain},
+  TITLE          = {Marion {T}aylor Today---By the Biographer},
+  DATE           = {1937~},
+  HOWPUBLISHED   = {Unpublished manuscript, Marion Taylor Papers},
+  LOCATION       = {{Schlesinger Library, Radcliffe College, Cambridge}, MA}
+}
+
+% (APA 7.10 Example 68)
+ at 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 Shakow Papers (M1360)},
+  INSTITUTION    = {Archives of the History of American Psychology},
+  LOCATION       = {University of Akron, Akron, OH},
+  DATE           = {1949-11-05/1949-11-06}
+}
+
+% (APA 7.10 Example 69)
+ at MISC{7.10:69,
+  AUTHOR         = {M. B. Smith},
+  TITLE          = {Interview by {C}. {A}. {K}iesler},
+  ENTRYSUBTYPE   = {Tape recording},
+  HOWPUBLISHED   = {President's Oral History Project, American Psychological Association},
+  LOCATION       = {APA Archives, Washington, DC},
+  DATE           = {1989-08-12},
+}
+
+% (APA 7.10 Example 70)
+% Note that this example is inconsistent in the APA 6th Edition (2nd printing) manual
+% with example 7.10:69. They differ in that 7.10:69 has a period before the location
+% and 7.10:70 has a comma. I have chosen a period for consistency.
+ at UNPUBLISHED{7.10:70,
+  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)},
+  INSTITUTION    = {University of Southern Mississippi},
+  LOCATION       = {Hattiesburg},
+  DATE           = {1973}
+}
+
+% (APA 7.10 Example 71)
+% If no normal paper citation, use ENTRYSUBTYPE to say what this NEWSARTICLE is
+ at NEWSARTICLE{7.10:71,
+  TITLE          = {Psychoanalysis Institute to Open},
+  DATE           = {1948-09-18},
+  ENTRYSUBTYPE   = {Clipping from an unidentified Dayton, OH newspaper},
+  NOTE           = {Copy in possession of author}
+}
+
+% (APA 7.10 Example 72)
+ at UNPUBLISHED{7.10:72,
+  AUTHOR         = {{Sci-Art Publishers}},
+  TITLE          = {Sci-{A}rt {P}ublications},
+  TITLEADDON     = {Brochure},
+  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 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.
+% Use TITLEISDESCRIPTION to indicate a title that is really a description and not a real
+% title
+ at MISC{7.10:73,
+  TITLEISDESCRIPTION = {true},
+  TITLE          = {{Photographs of Robert M. Yerkes}},
+  DATE           = {1917~/1954},
+  HOWPUBLISHED   = {Robert Mearns Yerkes Papers (Box 137, Folder 2292)},
+  LOCATION       = {{Manuscripts and Archives, Yale University Library, New Haven}, CT}
+}
+
+% (APA 7.11 Example 74)
+ at ONLINE{7.11:74,
+  ENTRYSUBTYPE   = {Online forum comment},
+  AUTHOR         = {T. Rampersad},
+  TITLE          = {Re: {T}raditional Knowledge and Traditional Cultural Expressions},
+  DATE           = {2005-06-08},
+  URL            = {http://www.wipo.int/roller/comments/ipisforum/Weblog/theme_eight_how_can_cultural#comments},
+}
+
+% (APA 7.11 Example 75)
+ at ONLINE{7.11:75,
+  ENTRYSUBTYPE   = {Electronic mailing list message},
+  AUTHOR         = {S. Smith},
+  TITLE          = {Re: Disputed Estimates of {IQ}},
+  DATE           = {2006-01-05},
+  URL            = {http://tech.groups.yahoo.com/group/ForensicNetwork/message/670},
+}
+
+% (APA 7.11 Example 76)
+ at ONLINE{7.11:76a,
+  ENTRYSUBTYPE   = {Web log post},
+  AUTHOR         = {{PZ Myers}},
+  TITLE          = {The Unfortunate Prerequisites and Consequences of Partitioning Your Mind},
+  DATE           = {2007-01-22},
+  URL            = {http://scienceblogs.com/pharyngula/2007/01/the_unfortunate_prerequisites.php},
+}
+
+ at ONLINE{7.11:76b,
+  ENTRYSUBTYPE   = {Web log comment},
+  AUTHOR         = {MiddleKid},
+  TITLE          = {Re: {T}he Unfortunate Prerequisites and Consequences of Partitioning Your Mind},
+  DATE           = {2007-01-22},
+  URL            = {http://scienceblogs.com/pharyngula/2007/01/the_unfortunate_prerequisites.php},
+}
+
+% (APA 7.11 Example 77)
+ at ONLINE{7.11:77,
+  ENTRYSUBTYPE   = {Video file},
+  AUTHOR         = {R. Norton},
+  TITLE          = {How to Train a Cat to Operate a Light Switch},
+  DATE           = {2006-11-04},
+  URL            = {http://www.youtube.com/watch?v=Vja83KLQXZs},
+}
+
+% (APA A7.07)
+ at PATENT{A7.07,
+  AUTHOR         = {I. M. Smith},
+  TITLE          = {{U}.{S}. {P}atent {N}o. 123,445},
+  DATE           = {1998},
+  LOCATION       = {Washington, DC},
+  PUBLISHER      = {U.S. Patent and Trademark Office}
+}
+
+% APA 6th doesn't have any extended date format examples.
+% Also test order of inpress and nodate, see
+% http://blog.apastyle.org/apastyle/2013/01/alphabetizing-in-press-and-no-date-references.html
+ at ONLINE{habitat1,
+    TITLE = {Mission, Vision \& Values},
+    URL = {http://www.tchabitat.org/missionvisionvalues},
+    ORGANIZATION = {Twin Cities Habitat for Humanity website},
+    URLDATE = {2011-09-15}
+}
+
+ at ONLINE{habitat2,
+    TITLE = {Mission, Vision \& Values},
+    DATE = {2011},
+    URL = {http://www.tchabitat.org/missionvisionvalues},
+    ORGANIZATION = {Twin Cities Habitat for Humanity website},
+    URLDATE = {2011-09}
+}
+
+ at ONLINE{habitat3,
+    TITLE = {Mission, Vision \& Values},
+    DATE = {2012},
+    URL = {http://www.tchabitat.org/missionvisionvalues},
+    ORGANIZATION = {Twin Cities Habitat for Humanity website},
+    URLDATE = {2012}
+}
+
+ at ONLINE{habitat4,
+    TITLE = {Mission, Vision \& Values},
+    PUBSTATE       = {inpress},
+    URL = {http://www.tchabitat.org/missionvisionvalues},
+    ORGANIZATION = {Twin Cities Habitat for Humanity website},
+    URLDATE = {2011-09-15}
+}
+
+ at INPROCEEDINGS{proc1,
+  AUTHOR = {Anon, A. N.},
+  TITLE = {A very interesting paper},
+  BOOKTITLE = {Proc. {UKACC} International Conference on Control},
+  DATE = {2010-09},
+  EVENTDATE = {2010-09-07/2010-09-10},
+  LOCATION = {Coventry},
+  PAGES = {1--3}
+}


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test-references.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf	2019-11-27 22:05:41 UTC (rev 52948)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf	2019-11-27 22:06:27 UTC (rev 52949)

Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.tex	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,458 @@
+\documentclass[paper=a4]{article}
+\usepackage[american]{babel}
+\usepackage{csquotes}
+\usepackage{shortvrb}
+\usepackage{ifthen}
+\usepackage{color}
+\usepackage[retainmissing]{MnSymbol}
+\usepackage[top=2.5cm]{geometry}
+
+% Unicode
+\usepackage{fontspec}
+\setmainfont[Ligatures=TeX]{TeXGyrePagella}
+\setsansfont[Ligatures=TeX]{TexGyreHeros}
+\setmonofont[Ligatures=NoCommon]{TeXGyreCursor}
+\MakeAutoQuote{«}{»}
+
+% Biblatex
+\usepackage[style=apa6]{biblatex}
+
+% Custom settings for misc entries in order to format the table for 6.13*
+% This table implies that the examples on each line are in a separate
+% document but since we are generating the citations from a real data
+% source, we have to prevent the usual uniquelist processing by making
+% all of the examples MISC entrytypes and changing uniquelist
+% per-type. There is no point in just typesetting static data as this
+% wouldn't be a test of anything.
+\ExecuteBibliographyOptions[misc]{uniquelist=false}
+\DeclareNameFormat[misc]{labelname}{%
+  \ifthenelse{\value{listcount}=1\OR\value{listtotal}=2}
+    {\usebibmacro{labelname:doname}
+      {\namepartfamily}
+      {\namepartfamilyi}
+      {\namepartgiven}
+      {\namepartgiveni}
+      {\namepartprefix}
+      {\namepartprefixi}
+      {\namepartsuffix}
+      {\namepartsuffixi}}
+    {\ifthenelse{\value{listtotal}>5}
+      {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
+       \ifnum\value{listcount}>2 \relax\fi}
+      {\ifciteseen
+       {\ifnum\value{listcount}=2 \andothersdelim\bibstring{andothers}\fi
+        \ifnum\value{listcount}=3 \relax\fi
+        \ifnum\value{listcount}=4 \relax\fi
+        \ifnum\value{listcount}=5 \relax\fi}
+       {\usebibmacro{labelname:doname}
+         {\namepartfamily}
+         {\namepartfamilyi}
+         {\namepartgiven}
+         {\namepartgiveni}
+         {\namepartprefix}
+         {\namepartprefixi}
+         {\namepartsuffix}
+         {\namepartsuffixi}}}}}
+\MakeShortVerb{\|}
+
+\newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
+                       {\textcolor{blue}{\texttt{(APA #2)}}}%
+                       {\textcolor{blue}{\texttt{(APA #2 Example #1)}}}}
+
+\setlength{\parskip}{3ex}
+
+\makeatletter
+% This solution to detokenize leaving a space after the command and
+% arguments is due to Bruno Le Floch on T.SE
+\long\def\apaexi#1{%
+  \catcode64=11
+  \begingroup
+  % Ensure that every character is preserved by \lowercase.
+  \count@\z@
+  \loop\ifnum\count@<256
+    \lccode\count@\z@
+    \advance\count@\@ne
+  \repeat
+  % Except spaces, changed to ^^A
+  \lccode32=\@ne
+  \lowercase{%
+    \endgroup
+    \expandafter\test@\detokenize{#1}\relax%
+    \catcode64=12}}
+% Then map {^^A => space, space =>} onto the string.
+\def\test@#1{%
+  \ifx#1\relax\test at end\fi
+  \ifnum`#1=\@ne\space\else#1\fi
+  \test@}
+\def\test at end\fi#1\test@{\fi}
+
+\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}}
+\def\apaexs#1{\hbox{\texttt{\footnotesize\apaexi{#1}}} \textbf{\small #1}}
+\makeatother
+
+% This just makes it easier to find a specific (APA 7.x) example in the
+% typeset references section
+\reversemarginpar
+\renewbibmacro*{begentry}{\marginpar{\footnotesize \textcolor{blue}{\thefield{entrykey}}}}
+
+\usepackage[colorlinks=true]{hyperref}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%% END PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{document}
+\section*{|biblatex-apa| style examples}
+This file typesets just about all useful examples from
+\apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. Also included are some
+clarifications from the APA blog
+(\url{http://blog.apastyle.org/apastyle/}). Please refer to the
+|biblatex-apa6-test-references.bib| file for details on the references
+entries. The |.bib| key for each entry in the References section is listed
+for convenience in the left margin. The keys are not arbitrary and consist
+of the APA section they are taken from (7.01--7.11), followed by a colon,
+followed by the example number. This makes it easier to cross-reference the
+typeset examples with the commented |.bib| file. I chose not to put the
+examples in the References section in example number order so that the APA
+requirements for References list alphabetisation and order could also be
+demonstrated.
+
+\section*{Citations}
+\begin{refsection}[../bibtex/bib/biblatex-apa6-test-citations]
+\noindent Please see accompanying file |biblatex-apa6-test-citations.bib|
+for the bibliographic entries which these examples use.
+
+\noindent\apa{4.03}\\
+Oxford comma in citations for three or more names:\\
+\apaex{\textcite{oc1}}\\
+\apaex{\parencite{oc2}}
+
+\noindent\apa{6.11}\\
+Simple cite. «Jr.» suffix is not shown (bib entry for this example has a suffix):\\
+\apaex{\textcite{6.11}}
+
+\noindent Within a paragraph, not in the «narrative sense»:\\
+\apaex{\autocite{6.11}}
+
+\noindent To cite the parts separately:\\
+\apaex{\citeyear{6.11}, \citeauthor{6.11}}
+
+\noindent The per-paragraph rules for elision of years are more flexible in
+APA 6th edition. There is more discretion to do this as the narrative
+consistency suggests and so this style no longer automatically elides years
+after the first mention within a paragraph. Cases can be handled as
+per the examples above.
+
+\noindent\apa{6.12} \apa{6.13}\\
+Citations like\\
+\apaex{\textcite{6.12a}}\\
+which have two authors are never name-truncated after the first cite:\\
+\apaex{\textcite{6.12a}}
+
+\noindent First citation of 3--5 author entry:\\
+\apaex{\textcite{6.12b}}
+
+\noindent Subsequent citations:\\
+\apaex{\textcite{6.12b}}\\
+Subsequent citations within a paragraph:\\
+\apaex{\citeauthor{6.12b}}
+
+\noindent Note that the dropping of the year for subsequent paragraph
+citations is not automatic as there may be cases where you don't want to do
+this (see APA 6.11).
+
+\noindent Automatic list disambiguation for ambiguous truncations after
+first cite. Note that «et al» is plural so
+it will only truncate two or more names. If it would truncate just one
+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 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}}
+
+\noindent Multiple-authors in running text are separated by «and».
+However, in parenthetical cites, multiple authors are separated by «\&»:\\
+\apaex{\textcite{6.12e}}\\
+\apaex{\parencite{6.12f}}
+
+\noindent Automatic list disambiguation for ambiguous truncations again,
+this time the truncation is on first cite as there are more than 5 authors:\\
+\apaex{\textcite{6.12g}}\\
+\apaex{\textcite{6.12h}}
+
+\noindent Automatic list disambiguation is only for ambiguous author lists
+in the same year so these are not disambiguated:\\
+\apaex{\textcite{6.12i}}\\
+\apaex{\textcite{6.12j}}\\
+\apaex{\textcite{6.12i}}\\
+\apaex{\textcite{6.12j}}
+
+\noindent The following table replicates with real data the examples
+in Table 6.1, p.~177 of the APA 6th Edition manual. Note that this
+table in the APA manual essentially assumes that the citations on each
+line are in a separate document since there is no list disambiguation
+or repeated cite truncations between lines. To simulate this with real
+data, the source for this document uses |\citereset| between lines and
+makes all of the data entries of MISC type, unsetting «uniquelist» for
+this type and using a custom labelname style.
+
+\begin{center}
+\begin{tabular}{lllll}
+\textbf{\parbox{2cm}{\center Type of citation}} & \textbf{\parbox{2.4cm}{\center First
+    citation in text}} & \textbf{\parbox{2.4cm}{\center Subsequent citations in
+    text}} & \textbf{\parbox{2.4cm}{\center Parenthetical format, first citation
+    in text}} & \textbf{\parbox{2.4cm}{\center Parenthetical format, subsequent
+    citations in text}}\\\\
+\hline
+\\
+\parbox{2cm}{\raggedright One work by one author}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13a}}} &
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13a}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13a}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13a}}}\\\\
+\parbox{2cm}{\raggedright One work by two authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13b}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13b}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13b}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13b}}}\\\\
+\parbox{2cm}{\raggedright One work by three authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13c}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13c}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13c}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13c}}}\\\\
+\parbox{2cm}{\raggedright One work by four authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13d}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13d}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13d}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13d}}}\\\\
+\parbox{2cm}{\raggedright One work by five authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13e}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13e}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13e}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13e}}}\\\\
+\parbox{2cm}{\raggedright One work by six authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13f}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13f}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13f}}}\\\\
+\parbox{2cm}{\raggedright Groups (readily identified through abbreviation) as authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13g}}}\citereset\citeresetapa
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13g}}}\\\\
+\parbox{2cm}{\raggedright Groups (no abbreviation) as authors}
+& \parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13h}}} & 
+\parbox{2.4cm}{\raggedright\apaexs{\textcite{6.13h}}}\citereset
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13h}}}
+& \parbox{2.4cm}{\raggedright\apaexs{\parencite{6.13h}}}\\\\
+\hline
+\end{tabular}
+\end{center}
+
+\noindent\apa{6.13}\\
+Author abbreviations should work between citations of different works by
+the author:\\
+\apaex{\parencite{6.13i}}\\
+\apaex{\parencite{6.13i}}\\
+\apaex{\parencite{6.13j}}
+
+\noindent\apa{6.14}\\
+Citations of an entry with an author who shares a
+surname with another entry always appears with initials when primary
+author. It is not explicit in the APA 6th edition manual but initials only
+appear with primary authors\footnote{\url{http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html}}:\\
+\apaex{\textcite{6.14}}\\
+\apaex{\textcite{7.01:3b}}
+
+\noindent\apa{6.15}\\
+Use |SHORTTITLE| field of the entry if it exists:\\
+\apaex{\parencite{6.15a}}\\\\
+Books, reports etc. use italics instead of quotes:\\
+\apaex{\textcite{6.15b}}\\\\
+Citing anonymous author:\\
+\apaex{\textcite{6.15c}}
+
+\noindent\apa{6.16}\\
+Two or more works within the same parentheses:\\
+\apaex{\parencite{6.16a,6.16b}}\\
+\apaex{\parencite{6.16c,6.16d,6.16e}}
+
+\noindent Citations of works by same authors in the same year:\\
+\apaex{\parencite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\\\
+\textcolor{red}{Note: This example, (p.~178 APA Manual 6th edition, 2nd
+  printing) is slightly odd as the «in press-a» is not indicated and
+  should be «in press» since no other in press items are listed for the
+  same authors in the example.}
+
+\noindent Compact citations in alphabetic order:\\
+\apaex{\parencites{6.16k,6.16l}}
+
+\noindent Compact citations with special order:\\
+\apaex{\parencites{6.16m}[see also][]{6.16n,6.16o}}
+
+\noindent «in press» should have hyphen before disambiguating part of label
+(also in references):\\
+\apaex{\parencite{6.16p,6.16q,6.16r}}
+
+\noindent\apa{6.17}\\
+Secondary sources:\\
+\apaex{\parencite[as cited in][]{6.17}}
+
+\noindent\apa{6.18}\\
+Classical works:\\
+\apaex{(\citeauthor{6.18a}, trans. \citeyear{6.18a})}\\
+\textcolor{red}{Note: The example is managed using lower-level cite
+  commands. This is another example of the APA not really thinking about
+  automated processing and specifying an anomalous infix format. It would
+  be better and probably acceptable for it to be:}\\
+\apaex{\parencite[][trans.]{6.18a}}\\\\
+Entries with an |ORIGDATE| field will automatically use it:\\
+\apaex{\textcite{6.18b}}\\\\
+The other examples of standard classical texts in this section should just
+be typed by hand--there is little benefit to automating these examples and
+they wouldn't usually be in the References section anyway.
+
+\noindent\apa{6.19}\\
+These examples are easily dealt with using standard |biblatex| functionality.\\
+\apaex{\parencite[][10]{6.19a}}\\
+\apaex{\parencite[][Chapter 3]{6.19b}}
+
+\noindent\apa{6.20}\\
+Such cases are just typed out--they have no Reference section entry and
+don't therefore have a bibliography database entry.
+
+\noindent\apa{6.21}\\
+Within parentheses, use the |\nptextcite| command which is equivalent to
+the |\textcite| command but omits the parenthesis and uses commas instead.
+See the |biblatex-apa6| docs.\\
+\apaex{(\nptextcite[see Table 3 of][]{6.21} for complete data)}
+
+\noindent\apa{6.28}\\
+Entries with no date use «n.d.».\\
+\apaex{\textcite{6.28a}}\\
+\apaex{\parencite{6.28a}}\\
+\apaex{(\nptextcite{6.28a})}
+
+\noindent\apa{7.01:12c}\\
+Issue with no editors\\
+\apaex{\parencite{7.01:12c}}
+
+\noindent\apa{A7.07}\\
+A patent citation uses the title but with no quotes\\
+\apaex{\textcite{A7.07}}\\
+\apaex{\parencite{A7.07}}
+
+\noindent Some tests of uniqueness and uniquelist
+
+\noindent Two works by same authors in same year are disambiguated by extradate «a»
+and «b» and are truncated after first cite because it is the same author
+list and therefore not ambiguous:\\
+\apaex{\textcite{UL1}}\\
+\apaex{\textcite{UL1}}\\
+\apaex{\textcite{UL2}}\\
+\apaex{\textcite{UL2}}\\
+
+\noindent One author list is an ordered subset of the other and so both need fully
+expanding to be properly disambiguated. Truncating either would be ambiguous.\\
+\apaex{\textcite{UL3}}\\
+\apaex{\textcite{UL3}}\\
+\apaex{\textcite{UL4}}\\
+\apaex{\textcite{UL4}}
+
+\noindent Some misc citation cases\\
+\apaex{\textcite{6.16c,6.16d,6.16e}}\\
+\apaex{\textcite{6.16f,6.16g,6.16h}}\\
+\apaex{\textcite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\
+Note here that the multicite delimiter is a comma as in running text, a
+semi-colon would be strange:
+\apaex{\textcites{6.16f}{6.16g}{6.16h}{6.16i}{6.16j}}\\
+\apaex{\cite{6.16f,6.16g,6.16h,6.16i,6.16j}}\\
+\apaex{\cite{6.16k,6.16l}}\\
+\apaex{\fullcite{FC1}}\\
+\apaex{\fullcitebib{FC1}}
+
+\noindent Testing «with»---should not be present in cites (APA 6.27)\\
+\apaex{\cite{with1}}\\
+\apaex{\textcite{with1}}
+
+\noindent Testing author name citing\\
+\apaex{\citeauthor{ca1}}\\
+\apaex{\citeauthor{ca1}}
+
+\noindent Testing nodate\\
+\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}}
+
+\noindent Testing suffices\\
+\apaex{\textcite{stest1}}\\
+\apaex{\textcite{stest2}}
+
+\noindent Testing prefices\\
+\apaex{\textcite{pretest}}\\
+\apaex{\textcite{nopretest}}
+
+% presufftest2 and nopresufftest are the same name and so even though
+% useprefix=false nopresufftest, hashes are the same so there is an extradate
+\noindent Testing prefices plus suffices\\
+\apaex{\textcite{presufftest}}\\
+\apaex{\textcite{presufftest2}}\\
+\apaex{\textcite{nopresufftest}}
+
+\noindent Testing «and others»\\
+\apaex{\textcite{ao1}}\\
+\apaex{\textcite{ao2}}
+
+\noindent Testing seasonal periodical citations\\
+\apaex{\textcite{season1}}
+
+\noindent Testing first list name initials only as per:\\
+\url{http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html}\\
+First citation:\\
+\apaex{\parencite{first,second,third,fourth,deutsch1963}}\\
+Second citation:\\
+\apaex{\parencite{first,second,third,fourth,deutsch1963}}
+
+% Testing name elision in cites
+% That is, \parencite{kingetal2005a,weissetal2007a,weissetal2009a}
+% Should give:
+% (King, Weiss, & Farmer, 2005; Weiss, King, & Hopkins, 2007; Weiss et al., 2009)
+% and not
+% (King, Weiss, & Farmer, 2005; Weiss, King, & Hopkins, 2007, 2009)
+% which happens if elision is based on namehash because the mincitenames
+% truncation of the 2007 and 2009 names is the same
+\noindent{Testing name elision in cites}\\
+\apaex{\parencite{kingetal2005a,weissetal2007a,weissetal2009a}}
+
+\noindent Testing circa/BCE/uncertain era format\\
+\apaex{\nptextcite{plato}}
+
+\noindent Testing citation formats for complete dates\\
+\apaex{\textcite{Ludwig2014}}
+
+\noindent Testing month ranges with same months, different days\\
+\apaex{\textcite{daterange1}}
+
+\noindent Testing month ranges with different months\\
+\apaex{\textcite{daterange2}}
+
+\end{refsection}
+\begin{refsection}[../bibtex/bib/biblatex-apa6-test-references]
+\nocite{*}
+\end{refsection}
+\newpage
+% Just (APA 7.x) real references and related entry examples here
+\printbibliography[section=2]
+\newpage
+% Include a references section for citation examples just so hyperref
+% targets can be checked
+\printbibliography[section=1,title=Misc citation references]
+\end{document}
+
+% Local Variables:
+% TeX-engine: luatex
+% End:


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6-test.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf	2019-11-27 22:05:41 UTC (rev 52948)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf	2019-11-27 22:06:27 UTC (rev 52949)

Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,882 @@
+\documentclass{ltxdockit}
+\usepackage[british]{babel}
+\usepackage[strict]{csquotes}
+\usepackage{shortvrb}
+\usepackage{ifthen}
+\usepackage{listings}
+\usepackage{metalogo}
+\MakeAutoQuote{«}{»}
+\MakeShortVerb{\|}
+
+% Unicode
+\usepackage{fontspec}
+\setmainfont[Ligatures=TeX]{TeXGyrePagella}
+\setsansfont[Ligatures=TeX]{TexGyreHeros}
+\setmonofont[Ligatures=NoCommon]{TeXGyreCursor}
+
+\newcommand\apa[2][]{\ifthenelse{\equal{#1}{}}%
+                       {\texttt{(APA #2)}}%
+                       {\texttt{(APA #2 Example #1)}}}
+
+\titlepage{%
+  title={APA 6th Edition Bib\LaTeX\ style},
+  subtitle={Citation and References macros for Bib\LaTeX},
+  url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
+  author={Philip Kime},
+  email={Philip at kime.org.uk},
+  revision={8.0},
+  date={\today}}
+
+\hypersetup{%
+  pdftitle={APA Bib\LaTeX\ style},
+  pdfsubject={APA 6 Conformant Style for Bib\LaTeX},
+  pdfauthor={Philip Kime},
+  pdfkeywords={latex, biblatex, APA, style}}
+
+\begin{document}
+
+\printtitlepage
+\tableofcontents
+
+\section{Important Changes}\label{special}
+
+\textbf{This is a legacy style for a previous edition of the APA guidelines. The
+latest version is always on CTAN with the name |biblatex-apa|}.\\[2ex]
+
+Please see the revision history below (section \ref{rev}) for  details on changes in each
+version. This section is just for important things like incompatible
+changes which users should be aware of.
+
+\minisec{7.8}
+|ARTICLE| entries now correctly do not print month/day in the bibliography
+as per APA 6.28. For non-academic articles (APA 7.01, examples 7, 8 and 9),
+use the new:
+
+\begin{verbatim}
+  ENTRYSUBTYPE = {nonacademic}
+\end{verbatim}
+
+This will allow month/day data in the bibliography. In the future, there
+may be other differences for |ARTICLE| subtypes and it is better to keep
+these semantically distinct from standard academic journal articles.
+
+\minisec{7.5}
+This version requires |biblatex| $>=$3.8 and |biber| $>=$2.8.
+
+\minisec{7.1}
+This version requires |biblatex| $>=$3.6 and |biber| $>=$2.6.
+
+\minisec{7.0}
+This version requires |biblatex| $>=$3.5 and |biber| $>=$2.6. Uncertain,
+approximate and era-marked dates are now supported in the |biblatex| core
+and therefore special fields are no longer needed in the style. See example
+files, in particular \texttt{7.10:67} entry in the references test
+\file{.bib} and the \texttt{plato} entry in the citation test \file{.bib}.
+
+\minisec{7.0}
+This version requires |biblatex| $>=$3.5 and |biber| $>=$2.6.
+
+\minisec{6.9}
+This version requires |biblatex| $>=$3.4 and |biber| $>=$2.5.
+
+\minisec{6.8}
+This version requires |biblatex| $>=$3.3 and |biber| $>=$2.4.
+
+\minisec{5.0}
+The style now uses the customisable data model functionality of |biblatex|
+2.0 and |biber| 1.0 and so these are now required. Several cases
+which previously were forced to use custom fields like |USERA|,
+|USERB| etc. can now be more naturally implemented with semantically
+appropriate fields. See \file{biblatex-apa-references.bib} for
+examples. This particularly aids the use of |VIDEO| entries, for
+example which now support fields |DIRECTOR|, |PRODUCER|,
+|WRITER| and |EXECPRODUCER|.
+
+Entries which relate to other entries like reviews and reprints are
+now implemented more naturally using the |biblatex| 2 «related
+entries» functionality. See entries with the |RELATED| field in
+\file{biblatex-apa-references.bib} and the |biblatex| manual for
+details and examples.
+
+Entries where authors are listed as «with» are now supported using the
+name field |WITH|. See examples file.
+
+\minisec{4.5}
+|biber| is now \emph{required}. This is because APA style needs a custom
+sorting scheme and only |biber| supports this. |bibtex| support is going
+away in |biblatex| eventually anyway so it's best to switch.
+
+\minisec{4.4}
+The |\maxprtauth| command is now a package option called
+«apamaxprtauth», see section \ref{opts}.
+
+\minisec{4.3}
+Specifying entries as «in press» should now be done using the official |biblatex|
+mechanism for this. Instead of, for example:
+
+\begin{verbatim}
+  YEAR = {in press}
+\end{verbatim}
+
+\noindent you should use:
+
+\begin{verbatim}
+  PUBSTATE = {inpress}
+\end{verbatim}
+
+\noindent as «|inpress|» is a |biblatex| localisation string which will
+render correctly in supported languages. If you still use the older method,
+it will still work but the string will always appear as the English «in
+press».
+
+\section{Introduction}\label{int}
+
+\subsection{About}
+
+This package is a Bib\LaTeX\ style for APA (American Psychological
+Association) 6th Edition style compliant documents typeset in \latex. It
+implements a citation style (\file{apa.cbx}), a references section style
+(\file{apa.bbx}), some data model enhancements (\file{apa.dbx}) and string
+localisation files (\path{<language>-apa.lbx}). Currently there are only
+string localisations for a few languages---if you can help with any other
+languages, please mail me; the localisation |.lbx| files are very small and
+simple and it would be a small translation task for the few APA-specific
+strings needed. The styles are loaded just like any other Bib\LaTeX\ styles
+but I wouldn't try to use the citation and references styles separately as
+they rely on each other, macro-wise, in places.
+
+In this document and in the code, the specific APA requirements are
+referred to by the section and (if appropriate) the example number of the
+APA Style Guide (6th Edition).
+
+\subsection{Requirements}\label{ref:req}
+
+You will need to be using \sty{csquotes} ($\geq$ 4.3), Bib\LaTeX\ ($\geq$
+3.4) and Biber ($\geq$ 2.5). If you want to take advantage of the
+Bib\LaTeX\ |\DeclareQuotePunctuation| facility to enforce the APA required
+«American» punctuation, you should normally use the \sty{babel} package
+with the «american» option (see Bib\LaTeX\ manual section |3.9.1|). You can
+of course use other languages but in such cases, to adhere to APA
+«American» punctuation rules (following commas moved inside closing quotes
+etc.), then you should set up |\DeclareQuotePunctuation| yourself as per
+section |4.7.5| of the Bib\LaTeX\ manual.
+
+If you are using the |apa.cls| \latex class, you need be using version
+$\geq$ 1.3.4. The class should be invoked with the |noapacite| class option
+as per the |apa.cls| documentation. Without this class option, the
+|apa.cls| class will automatically try to use plain Bib\TeX\ with the
+|apacite| style which is completely incompatible with Bib\LaTeX.
+
+\subsection{License}
+
+Permission is granted to copy, distribute and/or modify this software under
+the terms of the \latex Project Public License, version
+1.3c\footnote{\url{http://www.latex-project.org/lppl.txt}}. The current
+maintainer is Philip Kime (\textcopyright\ 2015).
+
+\subsection{History}
+
+When I started using Bib\LaTeX, I assumed there would be an APA style
+when I went looking. I was wrong. I started to try to make one and realised
+why there was none. The APA style manual is enormous; the citation and
+references specifications run to about 60 pages and are very specific in
+terms of formatting. They are also not entirely consistent but then again,
+it is rare to have such a thorough specification to work from.
+Inconsistencies in the manual and workarounds are noted in the examples
+document.
+
+\subsection{Acknowledgments}
+
+Thanks to Philipp Lehman for Bib\LaTeX\ which really has been a major
+advance over pure Bib\TeX. Thanks to Alexander van Loon for the Dutch
+localisation. Thanks to Paul Thompson for the suggestion to
+parameterise the max authors setting. Thanks to George Gkotsis for the
+Greek localisation. Thanks to Erikson Kaszubowski for the Brazilian
+localisation. Thanks to Braulio José Solano Rojas for the Spanish
+localisation. Thanks to Stefan Mayer for the |subtitlepunct| suggestion.
+Thanks to Håkon Malmedal for the Norwegian localisation. Thanks to
+Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström
+for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch
+localisation. Thanks to Tea Tušar and Bogdan Filipič for the Slovenian
+localisation. Thanks to Sebastian Ørsted for the Danish localisation.
+Thanks to Jürgen Spitzmüller for the DGPs localisation hints. Thanks to
+Sergei Golovan for the Russian localisation. Thanks to Vítor Míguez for the
+Galacian localisation.
+
+\section{Use}\label{ref:use}
+\label{use}
+This package is available via \TeX Live as |biblatex-apa|. You can find it
+through the provided \TeX Live update utilities which will install it
+automatically for you. If you need to install manually (to use a new
+version which has not yet been published to the \TeX Live updaters, for
+example), you can download it from CTAN and then, put the \path{.cbx},
+\path{.bbx} and \path{.lbx} files in your texmf tree, usually:\\ 
+
+\noindent\path{<texmf>/tex/latex/biblatex/cbx/apa.cbx}\\
+\path{<texmf>/tex/latex/biblatex/bbx/apa.bbx}\\
+\path{<texmf>/tex/latex/biblatex/lbx/<language>-apa.lbx}\\
+
+\noindent Specify the style in the usual way when loading Bib\LaTeX. If you
+are using \sty{babel}:
+
+\begin{ltxcode}
+\usepackage[american]{babel}
+\usepackage{csquotes}
+\usepackage[style=apa]{biblatex}
+\end{ltxcode}
+
+or \sty{polyglossia}:
+
+\begin{ltxcode}
+\usepackage{polyglossia}
+\setdefaultlanguage[variant=american]{english}
+\usepackage{csquotes}
+\usepackage[style=apa]{biblatex}
+\end{ltxcode}
+
+\noindent Note that the APA manual requires the forcing of titles into
+«sentence case», that is, initial cap followed by lower case for sentence
+units, with the exception of names and material from languages which do not
+follow English capitalisation. As of version 0.8a, Bib\LaTeX\ has a
+|\MakeSentenceCase| macro which deals with this. So, in the traditional
+Bib\TeX\ way, capitalise correctly in the |.bib| file, protecting names etc.
+with the usual brace pairs and the style will take care of forcing the
+APA-style sentence case in the References section. Unlike the References
+section, titles in citations in the APA style appear in normal case and the
+style will ensure this too.
+
+\subsection{Package options}\label{opts}
+
+The following options are set as usual in the options passed to
+|biblatex|.
+
+\begin{ltxcode}
+apabackref=true|false
+\end{ltxcode}% | stupid comment to stop emacs highlighting as verb due
+             % to single pipe
+
+\noindent It is not APA style to include backreferences in the References to
+pages where citations of the entry occur. However, this is very
+useful, especially in proofing and so if you set the |apabackref|
+option to «true», these are enabled. The default is «false».
+
+\begin{ltxcode}
+apamaxprtauth=<num>
+\end{ltxcode}
+
+\noindent This option controls the number of author/editor names which are
+printed in the References. APA style defaults to 7. You can change this if
+you really want to fully print all author list references in certain
+contexts (for example in a CV where you are an author in position 8 \ldots)
+
+Setting Bib\LaTeX package options which change name processing
+like \opt{uniquename} and \opt{uniquelist} is not supported as this style
+does tricky things internally to match the peculiar APA standard. You
+should not need to change them anyway as then you wouldn't be using APA
+style anyway.
+
+\subsection{Localisation}
+
+Localisation is provided for APA-specific strings in the accompanying
+|.lbx| files which are loaded automatically.
+
+Normal use will invoke \sty{babel} with the «american» language or
+\sty{polyglossia} with «american» variant of «english».
+
+The \file{english-apa.lbx} is a copy of the \file{american-apa.lbx} since
+the default is «American» English.
+
+The APA manual does not mention nor sanction any non «American» English
+strings but it is quite common for non-English journals to ask for APA style
+bibliographies and so this must be supported.
+
+If not using the \sty{babel} «american» option, it may be necessary to set up
+the |\DeclareQuotePunctuation| option as mentioned in section \ref{ref:req}
+above. You would only need to do this if, for some strange reason, a
+non-american journal required the (unpleasant) american practice of moving
+final punctuation marks inside closing quotes.
+
+\subsubsection{Date formats}
+
+Obviously, an American style uses month/day/year formats. European formats
+are usually day/month/year. The APA style dictates long date formats and so
+this is not really apparent in the bibliography. There is an APA standard
+for long date formats which may not be correct for European journals using
+roughly APA formatting standards (German journals tend to have a different
+long date format, for example). The «american» babel option will give you
+APA compliant US date formats. Default sensible date formats are included
+for german, ngerman and french. You should redefine the |\mkbibdatelong|
+macro in the relevant language |*-apa.lbx| file to change this if needed.
+
+A customisable macro \cmd{urldatecomma} determines what comes between the
+date of a URL and the URL itself. This defaults to the standard comma and
+space as per APA style but just a space in germanic localisations.
+
+\subsection{Limitations}
+\label{use:limit}
+There are certain limitations you need to bear in mind when using these
+styles. The APA manual is written without much regard for automation of
+citation and references processing---it just tells you how it wants things to
+look and the implicit assumption is that you would type out everything by
+hand if necessary. Having said that, the majority of the APA citation
+and references style is implemented, there are just a few exceptions which
+are hardly worth the coding pain since they are ambiguous and easily worked
+around.
+
+\section{Details}
+
+The detailed information for this style is contained in the example document and
+accompanying \path{.bib} files:
+\begin{description}
+\item[\path{biblatex-apa.tex}] This document.
+\item[\path{biblatex-apa-test.tex}]\footnote{\path{biblatex-apa-test.pdf}
+    is also provided and is the typeset version of this \latex source
+    file.} This document typesets just about every useful example from
+  \apa{6.11}--\apa{6.21} and \apa{7.01}--\apa{7.11}. The examples in it
+  aim to look as much like the APA manual examples as possible. All
+  citation examples in the document are real examples using a \path{.bib}
+  file.
+\item[\path{biblatex-apa-test-citations.bib}] This contains the \path{.bib}
+  entries for the citations examples. You won't find anything of interest
+  in this file---it's just used to provide real data for the citation
+  examples.
+\item[\path{biblatex-apa-test-references.bib}] This contains the
+  \path{.bib} entries for all of the examples in \apa{7.x}. This file is
+  the main documentation for the |biblatex-apa| implementation of the APA
+  References section style. To see how the style deals with a particular
+  example from \apa{7.x}, look it up in here. Every example is marked with
+  the APA example number and has explanatory notes.
+\item[\path{apa.cbx}] The |biblatex-apa| citations style. It is
+  decently structured with comments but shouldn't need to be read for
+  normal use.
+\item[\path{apa.bbx}] The |biblatex-apa| references style. It is
+  decently structured with comments but shouldn't need to be read for
+  normal use.
+\item[\path{apa.dbx}] The |biblatex-apa| data model additions. This allows
+  users to utilise more natural entry type and field names for certain
+  entries. See comments in the \path{biblatex-apa-test-references.bib}.
+\item[\path{*.lbx}] The |biblatex-apa| localisation files. These files
+  override some language-specific macros for some fixed strings.
+\end{description}
+
+\subsection{Citations}
+
+To specify something as «in press», use the |biblatex| |PUBSTATE| field
+with the special key value of «|inpress|» (see |biblatex| manual, section
+4.9.2.11). See the notes on the |PUBSTATE| field in section \ref{refs}
+below.
+
+\apa{6.13} requires that there should be no parentheses around the year of
+the citation when the citation itself occurs within parenthesis. This is
+tricky to completely automate within the remit of a citation style since it
+requires knowledge of the current typesetting state. So, the new citation
+command
+
+\begin{ltxsyntax}
+\cmditem{nptextcite}[prenote][postnote]{key}<punctuation>
+\end{ltxsyntax}
+
+\noindent is provided for such situations. It is identical to |\textcite|
+but does not put parentheses around the year and separates items with
+commas. See examples using this command in \path{biblatex-apa-test.tex}.
+There is also a multi-cite version |\nptextcites| that works in the same
+way as |\textcites|.
+
+The |\fullcite| command uses ampersands, like the references section
+and there is also a |\fullcitebib| command which is the same as
+|\fullcite| but which fakes a mini references section with APA style
+indentation and so is not intended to be used inline like
+|\fullcite|. See examples in the test file.
+
+\subsection{References}\label{refs}
+
+The references style was based on the Bib\LaTeX\ default
+|authoryear-comp| style but is heavily modified. If in doubt read the
+example references |.bib| as it is commented and you can learn a lot from
+the examples by picking something close to what you need from the APA
+examples and then looking in this file to see how it was implemented. Some
+general notes:
+
+\begin{itemize}
+\setlength{\itemsep}{0pt}
+\item The |PUBSTATE| field takes priority over any date field. If you specify
+  something with a |PUBSTATE| field like «inpress», then the year label in
+  citations and the references will be the localisation of the |PUBSTATE|
+  value key (|PUBSTATE| takes a pre-defined set of localisation keys as
+  values, see |biblatex| manual).
+\item APA style sometimes refers to the «series» of a multi-volume work.
+  This corresponds to the |MAINTITLE| field in the \file{.bib} and
+  \emph{not} the |SERIES| field.
+\item |VOLUME|, |NUMBER| and |CHAPTER| are forced into arabic numerals if
+  they are given as roman numerals, as required by \apa{6.22}.
+\end{itemize}
+
+\subsubsection{Journal number for journals with per-issue pagination}
+As per APA 6th edition section 6.30 and 7.01, journals which paginate by
+issue need the volume number including in the reference section. Since
+there is no way to automatically determine when this is the case, use the
+|biber| sourcemap feature to implement this, removing the |NUMBER| field
+from journals known to implement continuous pagination across volumes. For
+example, with this in your preamble:
+
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+       \step[fieldsource=journaltitle,
+             match=\regexp{(?:journal\stitle\sone|journal\stitle\stwo)}]
+       \step[fieldset=number, null]
+    }
+  }
+}
+\end{lstlisting}
+%
+Simply include |NUMBER| fields for all journals and entries with
+|JOURNALTITLE| of «journal title one» or «journal title two» (which
+are known to paginate across all numbers of a volume) will have
+their |NUMBER| field dynamically removed at document compile time, as
+required.
+
+\subsubsection{Retrieval dates for online items}
+
+APA 6th edition section 6.32 says «Do not include retrieval dates unless
+the source material may change over time (e.g., Wikis)». This is open to
+interpretation of what constitutes a Wiki and what counts as «changing over
+time». The style does not implement anything for this requirement by
+default but you can automate your own interpretation by putting this in
+your preamble:
+
+\begin{lstlisting}[style=latex]{}
+\DeclareSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+       \step[fieldsource=url,
+             notmatch=\regexp{wiki},
+             final=1]
+       \step[fieldset=urldate, null]
+    }
+  }
+}
+\end{lstlisting}
+
+\noindent This will dynamically remove the |URLDATE| field from any entry
+where the |URL| field doesn't match the regular expression «wiki». Modify this
+regular expression according to taste. This modification is dynamically
+applied to the data stream by |biber| and does not change your \file{.bib}.
+
+\section{Revision history}\label{rev}
+
+\begin{changelog}
+
+\begin{release}{8.0}{2019-09-07}
+\item Removed unused and unneeded use of NUMBER and SERIES fields
+\end{release}
+
+\begin{release}{7.9}{2019-09-03}
+\item Bugfix release
+\end{release}
+
+\begin{release}{7.8}{2019-08-30}
+\item Fixed date rules for |ARTICLE|s
+\end{release}
+
+\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}
+
+\begin{release}{7.5}{2017-11-05}
+\item Compat for bibaltex 3.8
+\item |\DeclareLanguageMapping| is now no longer necessary due to the new
+  |\DeclareLanguageMappingSuffix| macro.
+\end{release}
+
+\begin{release}{7.4}{2017-01-06}
+\item Minor bugfix release
+\end{release}
+
+\begin{release}{7.3}{2016-12-21}
+\item Minor bugfix release
+\end{release}
+
+\begin{release}{7.2}{2016-10-24}
+\item Minor bugfix release for date fields
+\end{release}
+
+\begin{release}{7.1}{2016-09-15}
+\item Minor bugfix release for legacy YEAR fields and |inpress| strings
+\item Requires |biblatex| 3.6+ and biber 2.6+
+\end{release}
+
+\begin{release}{7.0}{2016-09-14}
+\item Added \cmd{urldatacomma}
+\item Now following DGPs guidelines for some formatting in Germanic
+  locales.
+\item Requires |biblatex| 3.5+ and biber 2.6+
+\end{release}
+
+\begin{release}{6.9}{2016-05-13}
+\item Bug fixes
+\item Requires |biblatex| 3.4+ and biber 2.5+
+\end{release}
+
+\begin{release}{6.8}{2016-03-01}
+\item Bug fixes
+\item Updated to use new \cmd{DeclareNameFormat} structure for |biblatex|
+  3.3+ (which is now required)
+\end{release}
+
+\begin{release}{6.7}{2015-01-23}
+\item Bug fixes
+\end{release}
+
+\begin{release}{6.6}{2014-10-23}
+\item Bug fixes
+\end{release}
+
+\begin{release}{6.5}{2014-04-16}
+\item Bug fixes
+\item Slovenian localisation
+\end{release}
+
+\begin{release}{6.4}{2013-10-30}
+\item Fixed explicit «and others» problem
+\item Improved french localisation
+\end{release}
+
+\begin{release}{6.3}{2013-10-28}
+\item Fixed issue where |SHORTAUTHOR| was only being used for exact same citations.
+\end{release}
+
+\begin{release}{6.2}{2013-10-19}
+\item Corrected Dutch translations
+\item Fixed Norwegian lbx corruption
+\item Misc bugfixes
+\end{release}
+
+\begin{release}{6.1}{2013-07-19}
+\item Corrected APA 6.12 error and switched to uniquelist=minyear
+\item Documented way of automating some APA 6.32 requirements
+\end{release}
+
+\begin{release}{6.0}{2013-07-10}
+\item Added Swedish localisation
+\item Fixed useprefix=false issue
+\end{release}
+
+\begin{release}{5.9}{2013-05-08}
+\item Compatibility with |biblatex| 2.6--«nodate» is now part of core
+\item autocite is set to inline
+\end{release}
+
+\begin{release}{5.8}{2013-03-07}
+\item Made BOOK like INBOOK for order of online/reprint information
+\item Fixes for recursive RELATED fields
+\end{release}
+
+\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}
+
+\begin{release}{5.4}{2012-11-28}
+\item Updated for |biblatex| 2.4
+\end{release}
+
+\begin{release}{5.3}{2012-11-21}
+\item Updated for some |biblatex| changes.
+\end{release}
+
+\begin{release}{5.2}{2012-09-30}
+\item Entries with no YEAR no longer fall back on other date fields
+  and use «nodate» bibstring.
+\item «nodate» bibstring no longer lowercased and supports extrayear
+\end{release}
+
+\begin{release}{5.1}{2012-08-01}
+\item Added Norwegian localisation (thanks to Håkon Malmedal)
+\item Fixed some documentation issues
+\end{release}
+
+\begin{release}{5.0}{2012-07-01}
+\item Using |biblatex| 2.0/|biber 1.0| data model facility.
+\end{release}
+
+\begin{release}{4.8}{2012-06-02}
+\item Put in proper package version strings
+\item Fixed a problem with \cmd{textcites} (thanks to Florian Sesser and
+  Cornielia Entner for reporting)
+\end{release}
+
+\begin{release}{4.7}{2012-04-19}
+\item Made |firstinits=false| possible
+\item Fixed a problem with explicit «and others» with names (thanks to
+  George Pigman)
+\end{release}
+
+\begin{release}{4.6}{2012-02-08}
+\item Reduced the Biber requirement to a warning due to bug in |biblatex| 1.7
+\item Added Italian localisation (thanks to Luca Montanelli)
+\end{release}
+
+\begin{release}{4.5}{2012-01-31}
+\item Noted in manual that |biber| is now required due to custom sorting.
+\item Added |INSTITUTION| field to |REPORT| entries
+\end{release}
+
+\begin{release}{4.4}{2012-01-25}
+\item |\maxprtauth| command is now a package option «apamaxprtauth»
+\item New package option «apabackref» controlling whether
+  backreferences and links to citations appear in the References.
+\end{release}
+
+\begin{release}{4.3}{2012-01-22}
+\item «et al» now only replaces two or more names since it's plural
+\item «in press» items now should use the |biblatex| |PUBSTATE| field
+\item Fixed «in press» hyphenation issue for disambiguation in references
+\item URLs are now by default in roman font as per APA style.
+\end{release}
+
+\begin{release}{4.2}{2011-11-12}
+\item Fixed macro name typo
+\end{release}
+
+\begin{release}{4.1}{2011-11-02}
+\item |subtitlepunct| now skips if following terminating punctuation
+\end{release}
+
+\begin{release}{4.0}{2011-10-05}
+\item Disabled «smart and» for spanish localisation as it breaks ampersands
+\end{release}
+
+\begin{release}{3.9}{2011-10-03}
+\item Fixed data format issue in localisations
+\end{release}
+
+\begin{release}{3.8}{2011-09-25}
+\item Fixed slanted/italic confusion in bibliography
+\end{release}
+
+\begin{release}{3.7}{2011-09-23}
+\item Fixed issue no dates when labelyear defined
+\end{release}
+
+\begin{release}{3.6}{2011-09-20}
+\item Fixed issue with American format long dates
+\end{release}
+
+\begin{release}{3.5}{2011-09-05}
+\item Fixed issue Editor name part order when in Author position (thanks to
+  Johann Bauer)
+\end{release}
+
+\begin{release}{3.4}{2011-09-01}
+\item Fixed issue with |\fullcite| not resetting |bbx| globals
+\end{release}
+
+\begin{release}{3.3}{2011-08-23}
+\item Spanish localisation
+\end{release}
+
+\begin{release}{3.2}{2011-08-12}
+\item Minor fix in |inbook| format
+\item Doc clean up
+\end{release}
+
+\begin{release}{3.1}{2011-07-31}
+\item Made compatible with Bib\LaTeX\ 1.6
+\end{release}
+
+\begin{release}{3.0}{2011-05-06}
+\item |maxnames| and |minnames| are now set to sensible things and actually
+  used. Biber $\geq$ 0.9.3 is now required as this implements a fix for
+  |uniquelist| in Bib\LaTeX\ which needs |maxnames| and |minnames| set to
+  real values.
+\item Fixed bug with commas before «et al» not appearing in some cases.
+\end{release}
+
+\begin{release}{2.9}{2011-05-03}
+\item APA wants no space between volume and number for articles, even though it's
+  horribly ugly\ldots
+\item Made urls not optional with Bib\LaTeX\ url toggle in |ONLINE| entrytype (thanks to Mattias Erll)
+\end{release}
+
+\begin{release}{2.8}{2011-04-23}
+\item Added a Greek localisation strings file.
+\end{release}
+
+\begin{release}{2.7}{2011-04-1}
+\item Biber is now a strongly recommended requirement due to APA name and
+  name list disambiguation requirements.
+\item Updated for Bib\LaTeX\ 1.4/Biber 0.9 with automatic list
+  disambiguation. Package now deals with all APA 6th Edition citation examples.
+\end{release}
+
+\begin{release}{2.6}{2011-03-15}
+\item Made fullcite use ampersand
+\item Added fullcitebib macro to allow fake bib citations
+\end{release}
+
+\begin{release}{2.5}{2010-11-24}
+\item Refactored hyperref to only link from years to make it
+  consistent across cite commands
+\item Added hyperref target references section for citation examples
+\item Fixed textcite multicite issue
+\end{release}
+
+\begin{release}{2.4}{2010-11-14}
+\item Fixed postnotes/hyperref for textcite
+\end{release}
+
+\begin{release}{2.3}{2010-11-04}
+\item Overhauled hyperref functionality and made more robust
+\end{release}
+
+\begin{release}{2.2}{2010-10-15}
+\item Parameterised max author/editor list (thanks to Paul Thompson)
+\item Better rudimentary regression script
+\item Completely reconfigured EPRINT/EPRINTTYPE
+\end{release}
+
+\begin{release}{2.1}{2010-10-17}
+\item New Dutch localisation (thanks to Alexander van Loon)
+\end{release}
+
+\begin{release}{2.0}{2010-09-30}
+\item Moved to new date format code internally
+\end{release}
+
+\begin{release}{1.9}{2010-09-27}
+\item Moved docs to LuaLaTeX compat
+\item Fixed german/ngerman date formats
+\item Cleaned up date format code
+\end{release}
+
+\begin{release}{1.8}{2010-08-06}
+\item Fixed seven author ellipsis bug
+\end{release}
+
+\begin{release}{1.7}{2010-08-05}
+\item Corrected dateless entry format, added examples to test doc
+\item Corrected multi delim for |\citeyear|
+\item Updated test doc for Bib\LaTeX\ 0.9b compat
+\end{release}
+
+\begin{release}{1.6}{2010-07-19}
+\item Added correct |\citeyear| definition
+\end{release}
+
+\begin{release}{1.5}{2010-07-12}
+\item Corrected |NOTE/ADDENDUM| examples
+\item Made |\nptextcite| behave more consistently like |\textcite| for multi-cites.
+\end{release}
+
+\begin{release}{1.4}{2010-07-07}
+\item Removed extra space after DOI
+\end{release}
+
+\begin{release}{1.3}{2010-07-05}
+\item Fixed Oxford comma bug
+\end{release}
+
+\begin{release}{1.2}{2010-06-18}
+\item Made style arguments more explicit in |.bbx|
+\item Fixed bad documentation due to beta Bib\LaTeX\ version.
+\item Updated docs - minimum Bib\LaTeX\ version
+\end{release}
+
+\begin{release}{1.1}{2010-05-28}
+\item Fixed |INBOOK| |citetitle| format to match |BOOK|.
+\item Fixed |extrayear| in entries with full date specifications.
+\end{release}
+
+\begin{release}{1.0}{2010-05-12}
+\item Fixed |TYPE| and |NUMBER| fields in |REPORT| entries. Now more
+  flexible.
+\item |PUBSTATE| is now valid for articles.
+\item |DOI|, if present, suppresses any |URL| field.
+\item Abstract retrieval string is now conditional on |USERB| field, not on
+  the existence of an abstract.
+\item Default strings for |PHDTHESIS| and |MASTERSTHESIS| entries corrected.
+\item |LOCATION| is now valid for thesis entries and comes after |INSTITUTION|.
+\end{release}
+
+\begin{release}{0.9}{2010-03-08}
+\item Update for APA manual 6th edition and Bib\LaTeX\ 0.9
+\end{release}
+
+\begin{release}{0.8}{2010-02-15}
+\item Fixed bug with spaces after nptextcite
+\item Updated for Bib\LaTeX\ 0.9
+\end{release}
+
+\begin{release}{0.7}{2010-01-20}
+\item Made hyperref links more consistent, using the whole citation and not
+  just the year.
+\end{release}
+
+\begin{release}{0.6}{2009-11-20}
+\item Corrected two bugs in |cite| macro which left a trailing space after
+  multiple cites and actually cited the year twice for multiple cite
+  commands in some circumstances.
+\item Corrected bug where |\textcite| would leave a stray open bracket on
+  the stack when year was suppressed within a paragraph.
+\end{release}
+
+\begin{release}{0.5}{2009-09-19}
+\item Replaced literal string with localised form in url macro.
+\item Moved localisation strings into \sty{.lbx} files.
+\item |\DeclareLanguageMapping| is now needed in preamble.
+\item Moved |\DeclareBibliographyExtras| into \sty{.lbx} files.
+\item Some support for alternative localised date formats.
+\item Fixed slant/italic font problem since the |\mkbibemph| macro had
+  changed in Bib\LaTeX\ 0.8e.
+\item Fixed |liststop| error which was preventing name lists with two
+  entries from having the comma before the ampersand.
+\end{release}
+
+\begin{release}{0.4}{2009-07-24}
+\item Fixed bug where multiple year ranges were not displayed properly.
+\item Updated to remove pre-Bib\LaTeX\ 0.8e macros error.
+\end{release}
+
+\begin{release}{0.3}{2008-12-21}
+\item Updated to use new fields (|EVENTTITLE|) and new options
+  (|usetranslator|) from Bib\LaTeX\ 0.8b.
+\end{release}
+
+\begin{release}{0.2}{2008-12-06}
+\item Added |noremoteinfo| option).
+\item Fixed bbx bug with more than 7 authors still printing names after «et al». Was
+  due to resetting maxnames to 999.
+\item Removed the customised (hacked) |apa-biblatex.cls| class from the package as
+  |apa.cls| version 1.3.4 is compatible with Bib\LaTeX\.
+\item Altered documentation about requiring the «american» babel option.
+  This is not required if you set up |\DeclareQuotePunctuation| yourself.
+\item Added minimum required version of \sty{csquotes}.
+\item Minor doc tweaks.
+\end{release}
+
+\begin{release}{0.1}{2008-12-01}
+\item Initial release
+\end{release}
+
+
+
+\end{changelog}
+\end{document}
+
+% Local Variables:
+% TeX-engine: luatex
+% End:


Property changes on: trunk/Master/texmf-dist/doc/latex/biblatex-apa6/biblatex-apa6.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/american-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,144 @@
+\ProvidesFile{american-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{american}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {american},
+  revisededition   = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{on}{on}},
+  retrieved        = {{retrieved}{retrieved}},
+  available        = {{available}{available}},
+  from             = {{from}{from}},
+  archivedat       = {{archived\space at}{archived\space at}},
+  with             = {{with}{with}},
+  reprintas        = {{reprinted as}{reprinted as}},
+  reprintfrom      = {{reprinted from}{reprinted from}},
+  reviewof         = {{review\space of}{review\space of}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  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}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
+  typeseries       = {{Series\space Editor}{Series\space Ed\adddot}},
+  typeseriess      = {{Series\space Editors}{Series\space Eds\adddot}},
+  typevolseries    = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.bbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,2243 @@
+%% Copyright 2019 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.
+
+\ProvidesFile{apa6.bbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex references style]
+\RequireBiber[3]
+\RequireBibliographyStyle{standard}
+\urlstyle{rm} % APA examples all have URLs in same font as text
+
+% Declare the language mapping suffix
+\DeclareLanguageMappingSuffix{-apa6}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Automated capitalisation after colons
+%  (https://blog.apastyle.org/apastyle/2011/06/capitalization-after-colons.html)
+%  Copied and adapted from ieee.bbx
+
+% {<process>} {*} {<text>}
+\newcommand*{\bbx at colon@search}[3]{%
+  \bbx at colon@search at aux#1#2\empty#3: \stop
+}
+\long\def\bbx at colon@search at aux#1#2#3: #4\stop{%
+  \expandafter#1\expandafter#2\expandafter{#3}%
+  \ifblank{#4}
+    {}
+    {%
+      : %
+      \bbx at colon@search at aux#1#2\empty#4\stop
+    }%
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Used to join citations/references to
+%  extradate
+
+\newcommand{\apashortdash}{-}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%  Allow variable max authors/editors limit
+
+\newcommand{\maxprtauth}{7}
+\DeclareBibliographyOption{apamaxprtauth}{%
+  \ifstrempty{#1}
+    {}
+    {\renewcommand{\maxprtauth}{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.22) Force roman numerals into arabic
+%            using etoolbox macros
+
+\newcommand{\apanum}[1]{\ifrmnum{#1}{\rmntonum{#1}}{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Apa defines no particular hanging indent but this makes it look like the
+% examples in the style manual.
+
+\setlength{\bibhang}{2.5em}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 4.16 Example 29) Some DSM macros
+
+\gdef\DSMIII{\emph{DSM-III}}
+\gdef\DSMIIIR{\emph{DSM-III-R}}
+\gdef\DSMIV{\emph{DSM-IV}}
+\gdef\DSMIVTR{\emph{DSM-IV-TR}}
+\gdef\PsycSCAN{\emph{PsycSCAN}}
+\gdef\PsycARTICLES{\emph{PsycARTICLES}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+
+% Date formats. Suppress end range of less specific fields
+\newcommand*{\mkdaterangeapalong}[1]{%
+  \begingroup
+    \blx at metadateinfo{#1}%
+    \iffieldundef{#1year}{}
+      {\datecircaprint
+       \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+         {\printtext{%
+             \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
+             \iffieldundef{#1endyear}%
+               {}%
+               {\iffieldequalstr{#1endyear}{}% open-ended range?
+                 {\mbox{\bibdatedash}}
+                 {\bibdatedash%
+                  \iffieldsequal{#1year}{#1endyear}%
+                    {\iffieldsequal{#1month}{#1endmonth}%
+                      {\iffieldsequal{#1day}{#1endday}%
+                        {}%
+                        {\mkbibdateapalongmdy{}{}{#1endday}}}%
+                      {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
+                    {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
+             \dateuncertainprint}}
+         {\printtext{%
+             \mkbibdateapalong{#1year}{#1month}{#1day}%
+             \dateeraprint{#1year}%
+             \iffieldundef{#1endyear}%
+               {}%
+               {\iffieldequalstr{#1endyear}{}% open-ended range?
+                 {\mbox{\bibdatedash}}
+                 {\bibdatedash%
+                  \iffieldsequal{#1year}{#1endyear}%
+                    {\iffieldsequal{#1month}{#1endmonth}%
+                      {\iffieldsequal{#1day}{#1endday}%
+                        {}%
+                        {\mkbibdateapalong{}{}{#1endday}}}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
+                    {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                   \dateeraprint{#1endyear}}}%
+               \enddateuncertainprint}}}}%
+  \endgroup}
+
+% Only for DATE as only \printdateextra is used
+\newcommand*{\mkdaterangeapalongextra}[1]{%
+  \begingroup
+    \blx at metadateinfo{#1}%
+    \iffieldundef{#1year}{}
+      {\printtext{%
+        \datecircaprint
+        \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+        \dateeraprint{#1year}%
+        \dateuncertainprint
+        \iffieldundef{#1endyear}%
+          {}%
+          {\iffieldequalstr{#1endyear}{}% open-ended range?
+            {\mbox{\bibdatedash}}
+            {\bibdatedash%
+             \iffieldsequal{#1year}{#1endyear}%
+               {\iffieldsequal{#1month}{#1endmonth}%
+                  {\iffieldsequal{#1day}{#1endday}%
+                    {}%
+                    {\mkbibdateapalongextra{}{}{#1endday}}}
+                  {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
+               {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                \dateeraprint{#1endyear}}}%
+           \enddateuncertainprint}}}%
+  \endgroup}
+
+\AtEndPreamble{%
+  \renewcommand*{\datecircaprint}{%
+    \ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.09 Example 62) ERIC
+% eprint references
+
+\DeclareFieldFormat{eprint:eric}{%
+  \printtext{\bibcpstring{retrieved}}%
+  \setunit{\addspace}%
+  \printtext{\bibstring{from}}\addspace%
+  ERIC\addspace database\adddot\addspace%
+  \mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) Five author max before "et al" and a one author truncation policy
+%            However, only after the first cite, see the labelname format
+%            in .cbx. It's also overridden per-entry by uniquelist
+% (APA 6.x)  Citation tracking is global
+% (APA 6.14) Use initials to disambiguate shared surnames
+% (APA 6.16) Use year postfix to disambiguate multiple items in same year
+% (APA 6.10) Never reference anything not cited
+% (APA 6.25) Author initials only
+% (APA 6.25) Sorting is nyt but we need to account for PUBSTATE which comes
+%            after all normal cites for the same author
+
+\DeclareSortingTemplate{apa}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \field{sortname}
+    \field{author}
+    \field{editor}
+    \field{translator}
+    \field{writer}
+    \field{director}
+    \field{producer}
+    \field{execproducer}
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{pubstate}
+  }
+  \sort{
+    \field{sortyear}
+    \field{year}
+    \literal{-2000000000}% APA has "nodates" coming first
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{volume}
+    \literal{0}
+  }
+}
+
+% Don't fall back on other year fields if there is no year, use
+% "nodate" string
+\DeclareLabeldate{%
+  \field{pubstate}
+  \field{date}
+  \field{year}%legacy - no EDTF support
+  \literal{nodate}
+}
+
+% Due to APA strange requirements like truncation after first cite and
+% ellipsis from 7th to n-1 in bib, there might be some really strange
+% edge cases which can't be handled as this needs treating in the style
+% after biber has finished. Very unlikely though.
+\ExecuteBibliographyOptions{%
+                            abbreviate=true,%
+                            autocite=inline,%
+                            backref=true,%
+                            citetracker=true,%
+                            date=apalong,%
+                            dateabbrev=false,%
+                            datecirca=true,%
+                            dateera=christian,%
+                            labeldate=apalong,%
+                            dateuncertain=true,%
+                            eventdate=comp,%
+                            labeldateparts=true,%
+                            maxbibnames=7,%
+                            maxcitenames=2,%
+                            minbibnames=6,%
+                            mincitenames=1,%
+                            mincrossrefs=999,%
+                            origdate=apalong,%
+                            pagetracker=true,%
+                            sortcites=true,%
+                            sorting=apa,%
+                            uniquelist=minyear,%
+                            uniquename=full,%
+                            uniqueprimaryauthor=true,%
+                            urldate=apalong,%
+                            useprefix=true,%
+                            usetranslator=true}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \step[fieldsource=year, final]
+      \step[fieldset=pubstate, null]
+    }
+    \map{
+      \step[fieldsource=date, final]
+      \step[fieldset=pubstate, null]
+   }
+  }
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% It is not APA standard to have backrefs in the bib
+% Some users might like it though.
+
+\newbool{apa:backref}
+\DeclareBibliographyOption{apabackref}{%
+  \ifstrequal{#1}{true}
+    {\global\booltrue{apa:backref}}
+    {\global\boolfalse{apa:backref}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Additional material sometimes goes in parens
+%            after title. This bool tracks the parens.
+
+\newbool{bbx:parens}
+\AtEveryBibitem{\global\boolfalse{bbx:parens}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (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
+%            tracks if it has been inserted yet.
+%            Can't use \clearfield{volume} as some
+%            later number format tests need to know
+%            whether volume was defined.
+
+\newbool{bbx:volseen}
+\AtEveryBibitem{\global\boolfalse{bbx:volseen}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) This bool tracks if the title was put
+%            in the author position.
+%            Can't use \clearfield{title} as some
+%            later punctuation tests need to know
+%            whether title was defined.
+
+\newbool{bbx:titleinauthpos}
+\AtEveryBibitem{\global\boolfalse{bbx:titleinauthpos}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Need a flag to say when the editor
+%            is in author position because this
+%            can effect where the year goes.
+
+\newbool{bbx:editorinauthpos}
+\AtEveryBibitem{\global\boolfalse{bbx:editorinauthpos}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Flag to say whether the "in" has
+%            been placed already in IN*
+%            Reset every bibitem.
+
+\newbool{bbx:in}
+\AtEveryBibitem{\global\boolfalse{bbx:in}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Set up some standard APA formats
+
+\DeclareFieldFormat{volume}{\apanum{#1}}
+\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
+\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
+\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
+\DeclareFieldFormat{part}{#1}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.25) Works by the same author have the full author
+%            name, not an eliding dash. Author is always
+%            last name first.
+% (APA 6.27) Ellipsis in 7th position and then nothing until last
+% (APA 7.10 Example 67) Unknown names and dates
+%
+
+% \printnames does different things depending on whether the format you are
+% calling is the default for the name field or is a custom format:
+%
+%   * Default format (e.g. "labelname" format for printing labelname): no
+%     start/stop max/minnames truncation is done first - the format is
+%     supposed to do it.
+%   * Custom format (e.g. "labelname" format for printing author):
+%     max/minnames truncation is done before calling the format so we have
+%     to do \printnames[format][-\value{listtotal}]{field} to ensure we get
+%     all of the names in the list to work on
+
+\DeclareNameAlias{default}{apaauthor}
+
+\DeclareNameFormat{apaauthor}{%
+  \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
+    {\addcomma\space\ldots\space}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
+      {}
+      {\iffieldannotation{uncertain}
+        {\mkbibbrackets{\usebibmacro{name:apa:family-given}%
+                         {\namepartfamily}%
+                         {\namepartgiven}%
+                         {\namepartgiveni}%
+                         {\namepartprefix}%
+                         {\namepartsuffix}?}}
+        {\usebibmacro{name:apa:family-given}%
+          {\namepartfamily}%
+          {\namepartgiven}%
+          {\namepartgiveni}%
+          {\namepartprefix}%
+          {\namepartsuffix}}}}%
+    \ifthenelse{\value{listcount}=\value{listtotal}}%
+      {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+
+\renewbibmacro*{author}{%
+  \ifnameundef{author}
+    {\usebibmacro{labeltitle}}
+    {\printnames[apaauthor][-\value{listtotal}]{author}%
+     \setunit*{\addspace}%
+     \printfield{nameaddon}%
+     \ifnameundef{with}
+       {}
+       {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
+        \printnames[apaauthor][-\value{listtotal}]{with}}
+        \setunit*{\addspace}}}%
+  \newunit\newblock%
+  \usebibmacro{labelyear+extradate}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) References section delimiters are ampersands, not " and "
+% (APA 6.27) Use blank for long lists
+% (APA 4.03) Serial comma for lists of three or more
+
+\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
+  \ifthenelse{\value{listcount}>\maxprtauth}
+    {}
+    {\ifthenelse{\value{liststop}>2}
+       {\finalandcomma\addspace\&\space}
+       {\addspace\&\space}}}
+
+\DeclareDelimFormat[bib,biblist]{finalnamedelim:apa:family-given}{%
+  \ifthenelse{\value{listcount}>\maxprtauth}
+    {}
+    {\finalandcomma\addspace\&\space}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.28) Use "nodate" bibstring for references with no year
+%            Months and days go into parenthesis with year, if set
+% (APA 6.29) Issue goes where month normally goes if it
+%            is set.
+% (APA 7.10) circa or uncertain dates in brackets
+
+% Make sure endmonth gets an expansion too
+\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}}
+
+\newbibmacro*{monthorissue}{%
+  \iffieldundef{issue}
+    {\iffieldundef{month}
+      {}
+      {\addcomma\space\printfield{month}%
+      \iffieldundef{endmonth}{}{/\printfield{endmonth}}}}
+    {\addcomma\space\printfield{issue}}}
+
+\newbibmacro*{labelyear+extradate}{%
+  \iffieldundef{labelyear}
+    {\iffieldundef{origyear}
+      {}
+      {\printtext[apadate]{\printorigdate}}}%
+    {\printtext[apadate]{\printlabeldateextra}}}
+
+\DeclareFieldFormat{apadate}{%
+  \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} }
+    {\printtext{\mkbibbrackets{#1}}}
+    {\printtext{\mkbibparens{#1}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) General format of titles.
+%            Ugly Chicago-style lowercasing of English titles
+
+\DeclareFieldFormat{apacase}{\bbx at colon@search\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat{issuetitle}{#1\isdot}
+\DeclareFieldFormat{title}{\iffieldequalstr{titleisdescription}{true}{\mkbibbrackets{#1}}{\mkbibemph{#1}\isdot}}
+\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx at colon@search\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[article]{title}{#1\isdot}
+\DeclareFieldFormat[article]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inbook]{title}{#1\isdot}
+\DeclareFieldFormat[inbook]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[incollection]{title}{#1\isdot}
+\DeclareFieldFormat[incollection]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inproceedings]{title}{#1\isdot}
+\DeclareFieldFormat[inproceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[proceedings]{title}{#1\isdot}
+\DeclareFieldFormat[proceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.01 Example 10) Newspapers have prefix for pages.
+
+\DeclareFieldFormat[newsarticle]{pages}{%
+    \DeclareNumChars{.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}%
+    \mkpageprefix{#1}%
+    \DeclareNumChars{.}}
+
+\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}}
+\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[newsarticle]{title}{#1}
+\DeclareFieldFormat[article]{pages}{#1}
+
+\newbibmacro*{newspaper}{%
+  \printfield{newspaper}
+  \setunit{\addcomma\space}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29)      Additional {main}title information in brackets (using)
+%                 {MAIN}TITLEADDON field. Colon after maintitle.
+
+\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
+
+\newbibmacro*{bookaddinfo}{%
+  \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
+    {}
+    {\printtext{\bibopenparen}%
+     \printfield{edition}%
+     \setunit*{\addcomma\addspace}%
+     \printfield{volumes}%
+     \setunit{}%
+     \printtext{\bibcloseparen}}%
+}
+
+\renewbibmacro*{title}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
+    {}
+    {\iffieldundef{origtitle}
+      {\printtext[title]{%
+        \printfield[apacase]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[apacase]{subtitle}}}
+      {\printfield{origtitle}%
+       \setunit{\addspace}%
+       \printtext[brackets]{%
+        \printfield[apacase]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[apacase]{subtitle}}}%
+     \setunit{\addspace}%
+     \printfield{titleaddon}%
+     \iffieldequalstr{entrytype}{book}%
+       {\setunit{\addspace}\usebibmacro{bookaddinfo}}%
+       {}%
+     \ifthenelse{%
+       \ifnameundef{author}\AND%
+       \(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND%
+       \ifnameundef{producer}\AND%
+       \ifnameundef{director}\AND%
+       \ifnameundef{writer}}
+        {\newunit\newblock
+         \usebibmacro{labelyear+extradate}}
+        {}}}
+
+\renewbibmacro*{maintitle}{%
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+    {}
+    {\printtext[maintitle]{%
+       \printfield[apacase]{maintitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{mainsubtitle}}%
+    \setunit{\addspace}}
+  \printfield{maintitleaddon}%
+  \addcolon}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Format of volume and number for articles
+
+\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Commas between title and volume for articles
+
+\renewbibmacro*{journal+issuetitle}{%
+  \usebibmacro{journal}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{volume}%
+  \printfield{number}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{issuename}%
+  \newunit}
+
+\newbibmacro*{issuename}{%
+  \iffieldundef{issuetitle}
+    {}
+    {\printtext[issuetitle]{%
+       \printfield[noformat]{issuetitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[noformat]{issuesubtitle}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Additional information for non-periodicals in
+%            parenthesis after title. This is ugly but it's
+%            hard to put in "optional parens" like this
+%            around an unknown amount of characters.
+
+\newbibmacro*{addinfo}{%
+  \ifthenelse{\iffieldundef{edition}\AND%
+              \iffieldundef{chapter}\AND%
+              \iffieldundef{volumes}\AND%
+              \iffieldundef{pages}\AND%
+              \iffieldundef{number}\AND%
+              \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
+  {}
+  {\printtext{\bibopenparen}%
+   \printfield{edition}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{chapter}%
+   \setunit*{\addcomma\addspace}%
+   \notbool{bbx:volseen}%
+     {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}%
+      \printfield{volume}%
+      \iffieldundef{part}{}{\printfield{part}}}{}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{volumes}%
+   \setunit*{\addcomma\addspace}%
+   \printfield{pages}%
+   \setunit{}%
+   \printtext{\bibcloseparen}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) "In " precedes editor/trans list, no colon
+
+\newbibmacro*{in}{%
+  \ifbool{bbx:in}%
+    {}%
+    {\global\booltrue{bbx:in}%
+     \bibcpstring{in}\setunit{\space}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Editors have first names first ...
+% (APA 7.02 Example 27) ... unless there is no author
+
+\DeclareNameFormat{apanames}{%
+  \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
+    {\addcomma\space\ldots\space}
+    {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
+      {}
+      {\usebibmacro{name:apa:given-family}%
+        {\namepartfamily}%
+        {\namepartgiven}%
+        {\namepartgiveni}%
+        {\namepartprefix}%
+        {\namepartsuffix}}}%
+    \ifthenelse{\value{listcount}=\value{listtotal}}%
+      {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+
+\renewbibmacro*{author/editor}{%
+  \ifnameundef{author}
+    {\ifnameundef{editor}
+      {}
+      {\usebibmacro{editorinauthpos}}}
+    {\global\boolfalse{bbx:editorinauthpos}%
+     \usebibmacro{author}}}
+
+\newbibmacro*{editorinauthpos}{%
+    \global\booltrue{bbx:editorinauthpos}%
+    \printnames[apaauthor][-\value{listtotal}]{editor}%
+    \setunit{\addspace}%
+    \ifnameundef{editor}
+      {}
+      {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}%
+       % need to clear editor so we don't get an "In" clause later
+       % But we also need to set a flag to say we did this so we
+       % don't lose sight of the fact we once had an editor for
+       % various year placement tests
+       \clearname{editor}%
+       \setunit{\adddot\addspace}%
+       \usebibmacro{labelyear+extradate}%
+       \setunit{\adddot\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Name format. Don't capitalise prefixes
+% (APA 6.27) Full name disambiguation using brackets
+
+% #1 = family name
+% #2 = given name
+% #3 = given name (initials)
+% #4 = name prefix
+% #5 = name suffix
+
+\newbibmacro*{name:delim:apa:family-given}[1]{%
+  \ifnumgreater{\value{listcount}}{\value{liststart}}
+    {\ifboolexpr{
+       test {\ifnumless{\value{listcount}}{\value{liststop}}}
+       or
+       test \ifmorenames
+     }
+       {\printdelim{multinamedelim}}
+       {\printdelim{finalnamedelim:apa:family-given}}}
+    {}}
+
+\newbibmacro*{name:apa:family-given}[5]{%
+  \ifuseprefix
+    {\usebibmacro{name:delim:apa:family-given}{#4#1}%
+     \usebibmacro{name:hook}{#4#1}%
+     \ifdefvoid{#4}{}{%
+       \mkbibnameprefix{#4}\isdot%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \mkbibnamefamily{#1}\isdot%
+     \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#3}\isdot%
+                      \ifthenelse{\value{uniquename}>1}
+                        {\bibnamedelimd\mkbibbrackets{#2}}
+                        {}}%
+     \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}
+    {\usebibmacro{name:delim:apa:family-given}{#1}%
+     \usebibmacro{name:hook}{#1}%
+     \mkbibnamefamily{#1}\isdot
+     \ifboolexpe{%
+       test {\ifdefvoid{#2}}
+       and
+       test {\ifdefvoid{#4}}}
+       {}
+       {\revsdnamepunct}%
+     \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#3}%
+                      \ifthenelse{\value{uniquename}>1}
+                        {\bibnamedelimd\mkbibbrackets{#2}}
+                        {}}%
+     \ifdefvoid{#4}{}{%
+       \bibnamedelimc\mkbibnameprefix{#4}%
+       \ifprefchar{}{\bibnamedelimc}}%
+     \ifdefvoid{#5}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}}
+
+\newbibmacro*{name:apa:given-family}[5]{%
+  \usebibmacro{name:delim}{#2#4#1#5}%
+  \usebibmacro{name:hook}{#2#4#1#5}%
+  \ifdefvoid{#2}{}{\mkbibnamegiven{#3}\isdot%
+                   \ifthenelse{\value{uniquename}>1}
+                     {\bibnamedelimd\mkbibbrackets{#2}}
+                     {}%
+                   \bibnamedelimd}%
+  \ifdefvoid{#4}{}{%
+    \mkbibnameprefix{#4}\isdot
+    \ifprefchar{}{\bibnamedelimc}}%
+  \mkbibnamefamily{#1}\isdot%
+  \ifdefvoid{#5}{}{\bibnamedelimd\mkbibnamesuffix{#5}\isdot}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.27) Editor string in parens after author list
+% (APA 7.02 Example 21) Collapse editor and trans if same
+% (APA 7.02 Example 26) Translator
+
+
+% Separated out into book and in* macros because otherwise
+% this makes one ugly, huge, unreadable beast.
+
+\newbibmacro*{book:editor+trans}{%
+  \ifthenelse{\ifnameundef{editor}\AND%
+              \ifnameundef{editora}\AND%
+              \ifnameundef{editorb}\AND%
+              \ifnameundef{editorc}\AND%
+              \ifnameundef{translator}}%
+    {}%
+    {\ifnamesequal{editor}{translator}%
+       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
+        \printnames[apanames][-\value{listtotal}]{editor}%
+        \setunit*{\addcomma\addspace}%
+        \usebibmacro{apaeditorstrg}{editor}%
+        \setunit*{\addspace\&\space}%
+        \printtext{\bibcpstring{translator}}%
+        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+       {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
+        \ifnameundef{editor}%
+          {}%
+          {\printnames[apanames][-\value{listtotal}]{editor}%
+           \setunit{\addcomma\addspace}%
+           \usebibmacro{apaeditorstrg}{editor}%
+           \clearname{editor}%
+           \setunit{\adddot}%
+           \setunit*{\addspace\&\space}}%
+        \ifnameundef{translator}%
+          {\setunit{}}%
+          {\printnames[apanames][-\value{listtotal}]{translator}%
+           \setunit{\addcomma\addspace}%
+           \printtext{\bibcpstring{translator}}%
+           \clearname{translator}%
+           \setunit{\adddot}}%
+        \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
+
+\newbibmacro*{editor+trans}{%
+  \ifthenelse{\ifnameundef{editor}\AND%
+              \ifnameundef{editora}\AND%
+              \ifnameundef{editorb}\AND%
+              \ifnameundef{editorc}\AND%
+              \ifnameundef{translator}}%
+    {\setunit{\adddot\addspace}}%
+    {\ifnamesequal{editor}{translator}%
+      {\usebibmacro{in}%
+       \printnames[apanames][-\value{listtotal}]{editor}%
+       \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
+       \usebibmacro{apaeditorstrg}{editor}%
+       \setunit*{\addspace\&\space}%
+       \printtext{\bibcpstring{translator}}%
+       \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+      {\ifnameundef{translator}%
+        {}%
+        {\setunit{\addspace}%
+         \printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}%
+         \setunit{\addcomma\addspace}%
+         \printtext{\bibcpstring{translator}}}%
+         \clearname{translator}%
+         \setunit{\adddot\addspace}}%
+       \usebibmacro{in}%
+       \usebibmacro{editorx}}%
+     \setunit{\addcomma\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Special journal issues are periodicals
+
+\DeclareFieldFormat[periodical]{pages}{#1}
+\DeclareFieldFormat[periodical]{title}{#1\isdot}
+\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
+
+\renewbibmacro*{periodical}{%
+  \iffieldundef{title}
+    {}
+    {\printtext[title]{%
+       \printfield[apacase]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{subtitle}}}}
+
+\renewbibmacro*{title+issuetitle}{%
+  \usebibmacro{periodical}%
+  \setunit{\addspace}%
+  \printfield{issuetitle}%
+  \notbool{bbx:editorinauthpos}
+    {\newunit
+     \usebibmacro{labelyear+extradate}}
+    {}}
+
+\newbibmacro*{pnumber}{%
+  \printfield{volume}%
+  \printfield{number}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 21) Original year
+
+% Only give ORIGYEAR in references if both:
+%   YEAR is also given
+%   YEAR and ORIGYEAR are different
+
+\newbibmacro*{origyear}{%
+  \ifboolexpr{%
+    not test {\iffieldundef{origyear}}
+    not test {\iffieldundef{labelyear}}
+    and not test {\iffieldsequal{labelyear}{origyear}}}
+      {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}}
+      {}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02) "In " before booktitle, edited or not
+% (APA 6.30) Non-periodical volume number followed by "."
+
+\renewbibmacro*{maintitle+title}{%
+  \iffieldsequal{maintitle}{title}
+    {\clearfield{maintitle}%
+     \clearfield{mainsubtitle}%
+     \clearfield{maintitleaddon}}
+    {\iffieldundef{maintitle}
+      {}
+      {\usebibmacro{maintitle}%
+       \newunit\newblock
+       \iffieldundef{volume}
+         {}
+         {\setunit{\global\booltrue{bbx:volseen}}%
+          \printfield{volume}%
+          \printfield{part}%
+          \setunit{\adddot\space}}}}%
+  \usebibmacro{title}%
+  \newunit}
+
+\renewbibmacro*{maintitle+booktitle}{%
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}
+    {}
+    {\usebibmacro{in}%
+     \iffieldundef{maintitle}
+      {}
+      {\usebibmacro{maintitle}%
+       \newunit\newblock
+       \iffieldundef{volume}
+         {}
+         {\setunit{\addspace\global\booltrue{bbx:volseen}}%
+          \printfield{volume}%
+          \printfield{part}%
+          \setunit{\adddot\addspace}}}%
+    \usebibmacro{booktitle}}}
+
+\renewbibmacro*{booktitle}{%
+  \ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{booksubtitle}}
+    {}
+    {\printtext[booktitle]{%
+       \printfield[apacase]{booktitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{booksubtitle}}%
+     \setunit{\addspace}}%
+  \printfield{booktitleaddon}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.29) Colon separates title/subtitle
+%            Skip if following terminating punctuation
+
+\renewcommand*{\subtitlepunct}{\ifterm{}{\addcolon}\space}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Format of volume depends on whether
+%            there is a maintitle (what APA calls "series") or not.
+
+\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
+                              {\bibcpstring{volume}~\apanum{#1}}
+                              {\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Number for reports with no prefix if not
+%            a numeral. Report number is optional and so must be
+%            the parens.
+
+\DeclareFieldFormat{number}{\iffieldundef{volume}
+                             {\ifinteger{\thefield{number}}
+                               {\addspace\mkbibemph{\bibcpstring{number}~\apanum{#1}}\adddot}
+                               {\apanum{#1}}}
+                             {\mkbibemph{\apanum{#1}}}}
+
+\DeclareFieldFormat[report]{number}{\mkbibparens{\iffieldundef{type}
+                                                  {}
+                                                  {\printfield{type}\setunit{\addspace}}%
+                                                  \bibcpstring{number}~\apanum{#1}}}
+
+\newbibmacro*{apa:reportnum}{%
+  \iffieldundef{number}%
+    {}%
+    {\printfield{number}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.30) Location only shows first item
+
+\DeclareListFormat{default}{%
+  \usebibmacro{list:delim}{#1}%
+  #1\isdot}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 38) Proceedings emph number, location
+%                       and location. Pages have no prefix
+
+\DeclareListFormat[proceedings]{location}{\mkbibemph{#1}}
+\DeclareFieldFormat[proceedings]{pages}{#1}
+\DeclareFieldFormat[proceedings]{number}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[proceedings]{volume}{\mkbibemph{\apanum{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02 Example 40--44) Theses titles and volume
+%                           Titles are not emph if only an abstract
+
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.05) Unpublished theses
+
+\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.06) Reviews
+
+% The title of the review depends on the entrytype of the thing reviewed
+\newcommand*{\begrelateddelimreviewof}{\addspace}
+\DeclareFieldFormat[review]{title}{%
+  \entrydata*{\thefield{related}}{%
+    \ifentrytype{article}
+      {\mkbibemph{\printtext[apacase]{\thefield{savedtitle}}}}
+      {\printtext[apacase]{\thefield{savedtitle}}}}}
+
+\DeclareFieldFormat[review]{pages}{#1}
+\DeclareFieldFormat[review]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[review]{number}{\mkbibparens{\apanum{#1}}}
+
+\newbibmacro*{reviewauthor}{%
+  \ifnameundef{author}
+    {\booltrue{bbx:noreviewauthor}}
+    {\usebibmacro{author}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Media authors
+
+\newbibmacro*{producer}{%
+  \ifnameundef{producer}
+    {}
+    {\printnames[apaauthor][-\value{listtotal}]{producer}%
+     \addspace
+     \printtext[parens]{\bibcpstring{producer}}%
+     \setunit*{\addcomma\addspace\&\addspace}}}
+
+\newbibmacro*{director}{%
+  \ifnameundef{director}
+    {}
+    {\printnames[apaauthor][-\value{listtotal}]{director}%
+     \addspace
+     \printtext[parens]{\bibcpstring{director}}%
+     \setunit*{\addcomma\addspace\&\addspace}}}
+
+\newbibmacro*{writer}{%
+  \ifnameundef{writer}
+    {}
+    {\printnames[apaauthor][-\value{listtotal}]{writer}%
+     \addspace
+     \printtext[parens]{\bibcpstring{writer}}%
+     \setunit*{\addcomma\addspace\&\addspace}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%
+% (APA 7.07) Misc and data
+
+\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}}}}
+
+%
+%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.07) Audiovisual
+
+\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}}{#1}}
+\DeclareFieldFormat[video]{maintitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[video]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[audio]{entrysubtype}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[music]{title}{#1}
+\DeclareFieldFormat[music]{maintitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[music]{mainsubtitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[audio]{howpublished}{\mkbibparens{#1}}
+
+\newbibmacro*{tvseries}{%
+  \iffieldundef{maintitle}
+    {}
+    {\usebibmacro{in}%
+     \ifnameundef{execproducer}
+       {}
+       {\printnames[apanames][-\value{listtotal}]{execproducer}%
+         \addspace
+         \printtext[parens]{\bibcpstring{execproducer}}}
+     \setunit{\addcomma\addspace}%
+     \usebibmacro{avmaintitle}%
+     \newunit}}
+
+\newbibmacro*{avmaintitle}{%
+  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+    {}
+    {\printtext[maintitle]{%
+       \printfield[apacase]{maintitle}%
+       \setunit{\subtitlepunct}%
+       \printfield[apacase]{mainsubtitle}}%
+    \setunit{\addspace}}
+  \printfield{maintitleaddon}}
+
+\newbibmacro*{album}{%
+  \iffieldundef{maintitle}
+    {}
+    {\bibcpstring{on}%
+     \setunit{\addspace}%
+     \usebibmacro{avmaintitle}%
+     \newunit}}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10) Letter/Letters
+
+\DeclareFieldFormat[letter]{title}{\mkbibbrackets{#1}}
+\DeclareFieldFormat[letters]{title}{#1}
+\DeclareFieldFormat[letter]{number}{\mkbibparens{#1}}
+\DeclareFieldFormat[letters]{number}{\mkbibparens{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%
+% (APA 6.31) URLs
+
+\DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{abstracturl}{\url{#1}}
+\DeclareFieldFormat{urldate}{#1}
+
+\renewbibmacro*{url+urldate}{%
+     \ifthenelse{\(\iffieldundef{url}\AND\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}\)\OR\NOT\iffieldundef{doi}}
+       {}
+       {\ifthenelse{\iffieldundef{abstracturl}\AND\iffieldundef{abstractloc}}
+         {}
+         {\printtext{\bibcpstring{abstract}}\addspace}%
+         \iffieldequalstr{entrysubtype}{{DVD}}
+           {\printtext{\bibstring{available}}}
+           {\printtext{\bibstring{retrieved}}}%
+          \setunit{\addspace}%
+          \iffieldundef{urlyear}
+            {}
+            {\printtext{\printurldate}%
+             \setunit*{\urldatecomma}}%
+          \printtext{\bibstring{from}}%
+          \setunit*{\addspace}%
+          \printfield{urldescription}%
+          \setunit*{\addcolon\addspace}%
+          \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}%
+          \iffieldundef{abstractloc}{}{\printfield{abstractloc}\renewcommand*{\finentrypunct}{\relax}}%
+          \iffieldundef{abstracturl}{}{\printfield{abstracturl}\renewcommand*{\finentrypunct}{\relax}}}}
+
+%
+%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.11) Non-emph titles for online items
+%            Subtype in brackets
+
+
+\DeclareFieldFormat[online]{title}{#1}
+\DeclareFieldFormat[online]{entrysubtype}{\mkbibbrackets{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA A7.07) Emph titles for patents
+
+\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.08 Example 56) Software has version in title
+
+\DeclareFieldFormat[software]{title}{#1}
+\DeclareFieldFormat[software]{version}{\mkbibparens{\bibcpstring{version}~#1}}
+
+\newbibmacro*{apa:softwaretitle}{%
+  \printtext[title]{%
+  \printfield[apacase]{title}%
+  \setunit{\subtitlepunct}%
+  \printfield[apacase]{subtitle}}%
+  \setunit{\addspace}%
+  \iffieldundef{version}%
+     {}
+     {\printfield{version}}
+  \printfield{titleaddon}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Hacky bits to suppress final period in some cases.
+% * If there is an ORIGYEAR field (APA 7.02:21)
+% * Unless there is a RELATED and ADDENDUM
+\newbibmacro*{apa:finpunct}{%
+  \iffieldundef{origyear}
+    {\ifboolexpr{
+       test {\iffieldundef{addendum}}
+       and
+       test {\iffieldundef{related}}}
+     {}
+     {\renewcommand*{\finentrypunct}{\relax}}}
+    {\renewcommand*{\finentrypunct}{\relax}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Related entries
+
+\DeclareFieldFormat{related:reprintfrom}{\mkbibparens{#1}}
+\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
+
+\renewbibmacro*{related:reprintfrom}[1]{%
+  \entrydata*{#1}{%
+    \printtext{\mkbibemph{\printfield[apacase]{title}}}%
+    \setunit{\bibpagespunct}%
+    \printfield{pages}%
+    \setunit{\addcomma\addspace}%
+    \bibstring{byauthor}\addspace
+    \ifnameundef{editor}
+      {}
+      {\printnames[apanames][-\value{listtotal}]{editor}%
+       \setunit{\addcomma\addspace}%
+       \usebibmacro{apaeditorstrg}{editor}%
+       \setunit{\addcomma\addspace}%
+       \printlabeldateextra
+       \setunit{\addcomma\addspace}}%
+    \printnames[apanames][-\value{listtotal}]{author}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{location+publisher}%
+    \newunit\newblock
+    \usebibmacro{related}}}
+
+\newbibmacro*{related:reviewof}[1]{%
+  \setunit{}% Sanitise this in case no author
+  \entrydata*{#1}{%
+    \ifentrytype{article}
+      {\printtext{\printfield[apacase]{title}}}
+      {\printtext{\mkbibemph{\printfield[apacase]{title}}}}%
+    \setunit{\addspace}%
+    \bibstring{byauthor}\addspace
+    \printnames[apanames][-\value{listtotal}]{author}%
+    \printnames[apanames][-\value{listtotal}]{producer}%
+    \printnames[apanames][-\value{listtotal}]{director}%
+    \setunit{\addcomma\addspace}%
+    \printdateextra
+    \newunit\newblock
+    \usebibmacro{related}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.x) General type layouts
+
+\DeclareBibliographyDriver{article}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{journal+issuetitle}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{newsarticle}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{newspaper}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{maintitle+title}%
+  \setunit{\addspace}\newblock
+  \usebibmacro{book:editor+trans}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{booklet}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{proceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{booktitle}%
+  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{location+publisher}%
+  \setunit{\addcomma\addspace}%
+  \printfield{volume}%
+  \setunit*{\adddot}%
+  \printfield{number}%
+  \setunit{\addcomma\addspace}
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{collection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \setunit{\addcomma\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \setunit*{\addspace}\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \setunit*{\addcomma\addspace}\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{editor+trans}%
+  \setunit*{\addcomma\addspace}\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \iffieldundef{eventyear}{}{\setunit{\addcomma\addspace}}%
+  \printeventdate
+  \setunit*{\addspace}\newblock
+  \usebibmacro{addinfo}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \printfield[apacase]{eventtitle}%
+  \newunit
+  \printfield{venue}%
+  \iffieldundef{pages}
+    {\setunit{\addcomma\addspace}}
+    {\newunit}%
+  \newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{origyear}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \printfield{entrysubtype}%
+  \addperiod\addspace
+  \iftoggle{bbx:doi}
+    {\printfield{doi}%
+     \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}%
+     \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{url+urldate}%
+  \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{byholder}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{periodical}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title+issuetitle}%
+  \setunit{\adddot\addspace}
+  \usebibmacro{journal}%
+  \setunit{\addcomma\addspace}
+  \printlist{location}%
+  \setunit{\addcomma\addspace}
+  \usebibmacro{pnumber}%
+  \setunit{\addcomma\addspace}
+  \printfield{pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \usebibmacro{apa:reportnum}%
+  \newunit\newblock
+  \printlist{institution}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{type+institution}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{review}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{reviewauthor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \newunit\newblock
+  \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
+  \newunit\newblock
+  \usebibmacro{journal+issuetitle}%
+  \newunit\newblock
+  \printfield{note}%
+  \setunit{\bibpagespunct}%
+  \printfield{pages}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \printlist{institution}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{data}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{datatitle}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{letter}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printlist{institution}%
+  \setunit{\addspace}\newblock
+  \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
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{letters}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\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
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{writer}%
+  \usebibmacro{director}%
+  \usebibmacro{producer}%
+  \newunit\newblock
+  \usebibmacro{labelyear+extradate}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{tvseries}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{movie}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{writer}%
+  \usebibmacro{director}%
+  \usebibmacro{producer}%
+  \newunit\newblock
+  \usebibmacro{labelyear+extradate}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{tvseries}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{writer}%
+  \usebibmacro{director}%
+  \usebibmacro{producer}%
+  \newunit\newblock
+  \usebibmacro{labelyear+extradate}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \setunit{\addspace}\newblock
+  \printfield{entrysubtype}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+  \usebibmacro{album}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{software}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{apa:softwaretitle}%
+  \newunit\newblock
+  \usebibmacro{location+publisher}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{unpublished}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor}%
+  \setunit{\printdelim{nametitledelim}}\newblock
+  \usebibmacro{title}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \iflistundef{institution}
+    {\newunit}
+    {\setunit{\addcomma\addspace}}%
+  \newblock
+  \printlist{institution}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printfield{note}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{apa:pageref}%
+  \usebibmacro{apa:finpunct}
+  \usebibmacro{finentry}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Modified, common macros
+
+\newbibmacro*{editorx}{%
+  \ifnameundef{editor}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editor}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}
+     \clearname{editor}%
+     \newunit}%
+  \ifnameundef{editora}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editora}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editora}}
+     \clearname{editora}%
+     \newunit}%
+  \ifnameundef{editorb}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editorb}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editorb}}
+     \clearname{editorb}%
+     \newunit}%
+  \ifnameundef{editorc}
+    {}
+    {\printnames[apanames][-\value{listtotal}]{editorc}%
+     \setunit{\addspace}%
+     \printtext[parens]{\usebibmacro{apaeditorstrg}{editorc}}
+     \clearname{editorc}%
+     \newunit}}
+
+\newbibmacro*{apaeditorstrg}[1]{%
+  \iffieldundef{#1type}
+    {\ifthenelse{\value{#1}>1\OR\ifandothers{#1}}
+       {\bibcpstring{editors}}
+       {\bibcpstring{editor}}}
+    {\ifthenelse{\value{#1}>1\OR\ifandothers{#1}}
+         {\bibcpstring{type\thefield{#1type}s}}
+         {\bibcpstring{type\thefield{#1type}}}}}
+
+\renewbibmacro*{doi+eprint+url}{%
+  \iftoggle{bbx:doi}
+    {\printfield{doi}%
+     \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}%
+     \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}%
+  \newunit\newblock
+  \iftoggle{bbx:url}
+    {\usebibmacro{url+urldate}%
+     \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}}
+    {}}
+
+
+\DeclareFieldFormat{doi}{%
+  doi\addcolon
+  \ifhyperref
+    {\href{https://doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.02) No LOCATION/PUBLISHER if there is a DOI
+%            (Inconsistent in 2nd printing, see 7.04:39 which
+%            is incorrect in 2nd printing)
+
+\newbibmacro*{location+publisher}{%
+  \iffieldundef{doi}
+    {\printlist[default][1-1]{location}%
+     \setunit*{\addcolon\space}%
+     \printlist{publisher}%
+     \newunit}
+    {}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+  
+\newbibmacro*{type+institution}{%
+  \setunit{\addspace}%
+  \ifboolexpr{ test {\iffieldundef{type}} and test {\iflistundef{institution}} }
+    {}
+    {\printtext[parens]{%
+       \iflistundef{institution}
+         {\setunit*{\addspace}}
+         {\setunit*{\addcolon\space}}%
+       \printfield{type}%
+       \setunit*{\addcomma\space}%
+       \printlist{institution}%
+       \setunit*{\addcomma\space}%
+       \printlist{location}}%
+     \newunit}}
+
+\newbibmacro*{labeltitle}{%
+  \iffieldundef{label}
+    {\printfield{title}%
+     \clearfield{title}%
+     \setunit{\addspace}%
+     \printfield{entrysubtype}%
+     \clearfield{entrysubtype}%
+     \global\booltrue{bbx:titleinauthpos}}
+    {\printfield{label}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Wrapper for backrefs
+
+\newbibmacro{apa:pageref}{%
+  \ifbool{apa:backref}{\usebibmacro{pageref}}{}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+
+% Unchanged from authoryear-comp
+
+\DeclareBibliographyOption{dashed}[true]{%
+  \ifstrequal{#1}{true}
+    {\ExecuteBibliographyOptions{pagetracker}%
+     \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx at lasthash}}}
+    {\ExecuteBibliographyOptions{pagetracker=false}%
+     \renewbibmacro*{bbx:savehash}{}}}
+
+\DeclareFieldFormat{shorthandwidth}{#1}
+\setlength{\bibitemsep}{0pt}
+
+\DeclareNameAlias{author}{sortname}
+\DeclareNameAlias{editor}{sortname}
+\DeclareNameAlias{translator}{sortname}
+
+\defbibenvironment{bibliography}
+  {\list
+     {}
+     {\setlength{\leftmargin}{\bibhang}%
+      \setlength{\itemindent}{-\leftmargin}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}}}
+  {\endlist}
+  {\item}
+
+\defbibenvironment{shorthands}
+  {\list
+     {\printfield[shorthandwidth]{shorthand}}
+     {\setlength{\labelwidth}{\shorthandwidth}%
+      \setlength{\leftmargin}{\labelwidth}%
+      \setlength{\labelsep}{\biblabelsep}%
+      \addtolength{\leftmargin}{\labelsep}%
+      \setlength{\itemsep}{\bibitemsep}%
+      \setlength{\parsep}{\bibparsep}%
+      \renewcommand*{\makelabel}[1]{##1\hss}}}
+  {\endlist}
+  {\item}
+
+\InitializeBibliographyStyle{%
+  \global\undef\bbx at lasthash}
+
+\newbibmacro*{bbx:savehash}{%
+  \savefield{fullhash}{\bbx at lasthash}}
+
+\newbool{bbx at inset}
+\DeclareBibliographyDriver{set}{%
+  \booltrue{bbx at inset}%
+  \entryset{}{}%
+  \newunit\newblock
+  \usebibmacro{setpageref}%
+  \finentry}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.cbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,538 @@
+%% Copyright 2019 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.
+
+\ProvidesFile{apa6.cbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex citation style]
+\RequireBiber[3]
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.16) labelyear postfix is not emphasised or italic
+%            Dashes between labelyear and non-numeric year (or pseudo-year)
+
+\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.11) requires comma separator between authors and years
+
+\DeclareDelimFormat{nameyeardelim}{\addcomma\space}
+\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) No comma before "et al" if there is only one name
+%            preceding it
+
+\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.12) ampersand separator in parenthetical cites
+
+\DeclareDelimFormat[parencite]{finalnamedelim}
+  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.11) Suffices are not shown in citations
+% (APA 6.12) 3-5 authors have "et al." after first cite
+% (Blog https://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author and only when not unique across all *primary* authors
+
+\newbibmacro*{labelname:doname}[8]{%
+  \ifboolexpr{test {\ifnumcomp{\value{listcount}}{>}{1}}
+              or
+              test {\ifuniqueprimaryauthor}}
+    {\setcounter{uniquename}{0}}
+    {}%
+  \ifcase\value{uniquename}%
+    \ifuseprefix
+      {\usebibmacro{name:family}{#1}{#3}{#5}{\relax}}
+      {\usebibmacro{name:family}{#1}{#3}{\relax}{\relax}}%
+  \or
+     \ifuseprefix
+       {\usebibmacro{name:given-family}{#1}{#4}{#5}{\relax}}
+       {\usebibmacro{name:given-family}{#1}{#4}{\relax}{\relax}}%
+  \or
+     \ifuseprefix
+       {\usebibmacro{name:given-family}{#1}{#3}{#5}{\relax}}
+       {\usebibmacro{name:given-family}{#1}{#3}{\relax}{\relax}}%
+  \fi
+  \usebibmacro{name:andothers}}
+
+% Can't do this with the built-in printnames format as APA requires truncation
+% and disambiguation only after first cite
+% We either use uniquelist or minnames for truncation. If uniquelist isn't
+% defined, we fall back on minnames
+%
+% \printnames does different things depending on whether the format you are
+% calling is the default for the name field or is a custom format:
+%
+% max/minnames truncation is done before calling the format so we have
+% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
+% all of the names in the list to work on here
+%
+% Explicit "and others" is dealt with in labelname:doname via a custom name:andothers
+
+\DeclareNameFormat{labelname}{%
+  % First set the truncation point
+  \ifthenelse{\value{uniquelist}>1}
+    {\numdef\cbx at min{\value{uniquelist}}}
+    {\numdef\cbx at min{\value{minnames}}}%
+  % Always print the first name and the second if there are only two since
+  % "et al" must always be plural
+  \ifboolexpr{test {\ifnumcomp{\value{listcount}}{=}{1}}
+              or test {\ifnumcomp{\value{listtotal}}{=}{2}}}
+    {\usebibmacro{labelname:doname}%
+      {\namepartfamily}%
+      {\namepartfamilyi}%
+      {\namepartgiven}%
+      {\namepartgiveni}%
+      {\namepartprefix}%
+      {\namepartprefixi}%
+      {\namepartsuffix}%
+      {\namepartsuffixi}}
+    % We are looking at name >=3
+    % If the list is 6 or more names or we have seen citation before, potential truncation
+    {\ifboolexpr{test {\ifnumcomp{\value{listtotal}}{>}{5}}
+                 or test {\ifciteseen}}
+     % Less than the truncation point, print normally
+     {\ifnumcomp{\value{listcount}}{<}{\cbx at min + 1}
+       {\usebibmacro{labelname:doname}%
+         {\namepartfamily}%
+         {\namepartfamilyi}%
+         {\namepartgiven}%
+         {\namepartgiveni}%
+         {\namepartprefix}%
+         {\namepartprefixi}%
+         {\namepartsuffix}%
+         {\namepartsuffixi}}
+       {}%
+      % At potential truncation point ...
+      \ifnumcomp{\value{listcount}}{=}{\cbx at min + 1}
+        % but enforce plurality of et al - only truncate here if there is at
+        % least one more element after the current potential truncation point
+        % so that "et al" covers at least two elements.
+        {\ifnumcomp{\value{listcount}}{<}{\value{listtotal}}
+          {\printdelim{andothersdelim}\bibstring{andothers}}
+          {\usebibmacro{labelname:doname}%
+            {\namepartfamily}%
+            {\namepartfamilyi}%
+            {\namepartgiven}%
+            {\namepartgiveni}%
+            {\namepartprefix}%
+            {\namepartprefixi}%
+            {\namepartsuffix}%
+            {\namepartsuffixi}}}
+        {}%
+      % After truncation point, do not print name
+      \ifnumcomp{\value{listcount}}{>}{\cbx at min + 1}
+       {\relax}%
+       {}}%
+     % We are looking at name >=3
+     % Name list is < 6 names or we haven't seen this citation before, print normally
+     {\usebibmacro{labelname:doname}%
+       {\namepartfamily}%
+       {\namepartfamilyi}%
+       {\namepartgiven}%
+       {\namepartgiveni}%
+       {\namepartprefix}%
+       {\namepartprefixi}%
+       {\namepartsuffix}%
+       {\namepartsuffixi}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.13) Groups as names
+%            SHORTAUTHOR brackets in parencites
+
+\DeclareNameFormat{sabrackets}{%
+  \mkbibbrackets{%
+    \usebibmacro{labelname:doname}%
+      {\namepartfamily}%
+      {\namepartfamilyi}%
+      {\namepartgiven}%
+      {\namepartgiveni}%
+      {\namepartprefix}%
+      {\namepartprefixi}%
+      {\namepartsuffix}%
+      {\namepartsuffixi}}}
+
+\DeclareFieldFormat{shorthand}{\ifciteseen
+                                {#1}
+                                {\mkbibbrackets{#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.13) Deal with SHORTAUTHOR fields
+% (APA 6.16) Multiple same author cites in a compact citation call do not
+%            need to be repeated but the full years must be repeated with
+%            their extradate postfixes
+% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
+% (APA 6.28) ISSUE after year when available
+\def\citeresetapa{\global\let\cbx at apa@names\@empty}
+\citeresetapa
+\def\cbx at apa@ifnamesaved{%
+  \xifinlist{\thefield{fullhash}}{\cbx at apa@names}
+    {\@firstoftwo}
+    {\@secondoftwo}}
+
+\newbibmacro*{cite:author}{%
+  \iffieldequals{fullhash}{\cbx at lasthash}
+% Multiple cites in one command
+   {\setunit{\compcitedelim}%
+    \usebibmacro{cite:plabelyear+extradate}}%
+% Single cite
+   {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+% No author/editor
+     {\usebibmacro{cite:noname}%
+       \savefield{fullhash}{\cbx at lasthash}}
+% Normal cite
+     {\ifnameundef{shortauthor}
+        {\printnames[labelname][-\value{listtotal}]{labelname}}%
+        {\cbx at apa@ifnamesaved
+          {\printnames{shortauthor}}
+          {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
+      \savefield{fullhash}{\cbx at lasthash}}}%
+   \setunit{\multicitedelim}}
+
+% Using fullhash instead of namehash otherwise we may omit namelist for
+% lists which are equal only because of minnames truncation i.e:
+%
+% X and Y and Z (2009)
+% X and W and V (2010)
+%
+% which have the same namehash due to minnames visibility truncation to 1 
+% would be printed incorrectly as
+% \cite{one, two} -> X, Y & Z 2009, 2010
+\newbibmacro*{cite}{%
+  \iffieldequals{fullhash}{\cbx at lasthash}
+% Multiple cites in one command
+   {\setunit{\compcitedelim}%
+    \usebibmacro{cite:plabelyear+extradate}}%
+% Single cite
+   {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+% No author/editor
+     {\usebibmacro{cite:noname}%
+       \setunit{\printdelim{nameyeardelim}}%
+       \usebibmacro{cite:plabelyear+extradate}%
+       \savefield{fullhash}{\cbx at lasthash}}
+% Normal cite
+     {\ifnameundef{shortauthor}
+        {\printnames[labelname][-\value{listtotal}]{labelname}}%
+        {\cbx at apa@ifnamesaved
+          {\printnames{shortauthor}}
+          {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
+      \setunit{\printdelim{nameyeardelim}}%
+      \usebibmacro{cite:plabelyear+extradate}%
+      \savefield{fullhash}{\cbx at lasthash}}}%
+   \setunit{\multicitedelim}}
+
+\newbibmacro*{textcite}{%
+  \iffieldequals{fullhash}{\cbx at lasthash}
+% Compact cite - more than one thing for same author
+    {\setunit{\compcitedelim}%
+     \usebibmacro{cite:plabelyear+extradate}}
+% 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
+         {\usebibmacro{cite:noname}%
+          \setunit{\ifbool{cbx:np}%
+                   {\printdelim{nameyeardelim}}%
+                   {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+          \usebibmacro{cite:plabelyear+extradate}}
+    % Cite using shorthand
+         {\usebibmacro{cite:shorthand}}}
+  % Normal cite with author/editor
+  % Normal full cite
+       {\ifnameundef{shortauthor}%
+    % Normal full cite
+         {\printnames[labelname][-\value{listtotal}]{labelname}}
+    % Cite using short author
+         {\cbx at apa@ifnamesaved
+           {\printnames{shortauthor}}
+           {\printnames[labelname][-\value{listtotal}]{author}}}%
+  % Year
+        \setunit{\ifbool{cbx:np}
+                  {\printdelim{nameyeardelim}}
+                  {\global\booltrue{cbx:parens}\addspace\bibopenparen}}%
+  % Put the shortauthor inside the year brackets if necessary
+        \ifnameundef{shortauthor}
+         {}
+         {\cbx at apa@ifnamesaved
+           {}
+           {\printnames{shortauthor}\setunit{\printdelim{nameyeardelim}}}}%
+  % Actual year printing
+        \usebibmacro{cite:plabelyear+extradate}%
+  % Save name hash for checks later
+        \savefield{fullhash}{\cbx at lasthash}}}}
+
+\newbibmacro*{cite:plabelyear+extradate}{%
+  \iffieldundef{labelyear}{}
+    {\printtext[bibhyperref]{%
+        \clearfield{labelmonth}% don't want months in citations
+        \clearfield{labelday}% don't want days in citations
+        \clearfield{labelendmonth}% don't want months in citations
+        \clearfield{labelendday}% don't want days in citations
+        \iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges
+          {\clearfield{labelendyear}}
+          {}%
+        \iffieldundef{origyear}{}
+          {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} }
+            {\mkbibbrackets{\printorigdate}}
+            {\printorigdate}%
+           \setunit*{\addslash}}%
+       \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} }
+         {\mkbibbrackets{\printlabeldateextra}}
+         {\printlabeldateextra}}}%
+  \iffieldundef{issue}
+    {}
+    {\addcomma\addspace\printfield{issue}}}
+
+\newbibmacro*{cite:shorthand}{%
+  \ifciteseen
+    {\printfield{shorthand}}
+    {\printnames[labelname][-\value{listtotal}]{labelname}%
+     \setunit{\printdelim{nameyeardelim}}%
+     \printfield{title}\space\printfield{shorthand}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.15) Fall back to title for citations without authors
+
+\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}}
+\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[patent]{citetitle}{#1}
+
+\newbibmacro*{cite:noname}{%
+    \printfield[citetitle]{labeltitle}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 6.21) No parens round year for cites when the cite is in
+%            parentheses. Use new command \nptextcite for such cites.
+
+\DeclareDelimFormat[nptextcite]{finalnamedelim}
+  {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareMultiCiteCommand{\nptextcites}{\nptextcite}{\multicitedelim}
+\DeclareCiteCommand{\nptextcite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \global\booltrue{cbx:np}%
+   \usebibmacro{textcite}%
+   \usebibmacro{cite:post}%
+   \global\boolfalse{cbx:np}}%
+  {}
+  {\iffieldundef{postnote}
+     {}
+     {\printdelim{nameyeardelim}%
+      \printfield{postnote}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% No shorthand
+% 
+\newbibmacro*{citeyear}{%
+  \iffieldundef{labelyear}
+    {\usebibmacro{cite:init}}
+    {\iffieldequals{fullhash}{\cbx at lasthash}
+       {\setunit{\compcitedelim}%
+        \usebibmacro{cite:plabelyear+extradate}}
+       {\usebibmacro{cite:plabelyear+extradate}%
+        \savefield{fullhash}{\cbx at lasthash}}}%
+  \setunit{\multicitedelim}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Fullcite should use "&"
+% Also need to reset the global booleans which are normally done at
+% every bib item but since these aren't bib items, they are not reset
+
+\DeclareDelimFormat[fullcite,fullcitebib]{finalnamedelim}
+   {\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
+
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}%
+      \global\boolfalse{bbx:parens}%
+      \global\boolfalse{bbx:volseen}%
+      \global\boolfalse{bbx:titleinauthpos}%
+      \global\boolfalse{bbx:editorinauthpos}%
+      \global\boolfalse{bbx:in}%
+      \global\let\blx at related@loop\@empty}
+    {\thefield{entrytype}}%
+   \usebibmacro{cite:post}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\fullcitebib}
+  {\list{}
+   {\setlength{\leftmargin}{\bibhang}%
+     \setlength{\itemindent}{-\leftmargin}%
+     \setlength{\itemsep}{\bibitemsep}%
+     \setlength{\parsep}{\bibparsep}}\item}
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}%
+      \global\boolfalse{bbx:parens}%
+      \global\boolfalse{bbx:volseen}%
+      \global\boolfalse{bbx:titleinauthpos}%
+      \global\boolfalse{bbx:editorinauthpos}%
+      \global\boolfalse{bbx:in}}
+    {\thefield{entrytype}}%
+   \finentry
+   \usebibmacro{cite:post}}
+  {\item}
+  {\endlist}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newbool{cbx:parens} % boolean to say we're inside parens
+\newbool{cbx:np} % boolean to say we're using a non-parentheses text cite
+
+\newbibmacro*{textcite:postnote}{%
+  \usebibmacro{postnote}%
+  \ifbool{cbx:parens}
+    {\bibcloseparen\global\boolfalse{cbx:parens}}
+    {}}
+
+\newbibmacro*{cite:init}{%
+  \global\boolfalse{cbx:parens}%
+  \global\undef\cbx at lasthash}
+
+\newbibmacro*{cite:post}{%
+  \xifinlist{\thefield{fullhash}}{\cbx at apa@names}
+    {}
+    {\listxadd{\cbx at apa@names}{\thefield{fullhash}}}}
+
+\newbibmacro*{cite:labelyear}{%
+  \printfield{labelyear}}
+
+\newbibmacro*{cite:extradate}{%
+  \printfield{extradate}}
+
+\newbibmacro*{cite:labelyear+extradate}{%
+  \iffieldundef{labelyear}
+    {}
+    {\printfield{labelyear}%
+       \printfield{extradate}}}
+
+\DeclareCiteCommand{\citeyear}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{cite:plabelyear+extradate}}
+  {\multinamedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\bibsentence
+   \usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareMultiCiteCommand{\textcites}{\textcite}{\compcitedelim}
+
+\DeclareCiteCommand{\textcite}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{textcite}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\citeauthor}
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite:author}%
+   \usebibmacro{cite:post}}
+  {}
+  {\usebibmacro{postnote}}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/apa6.dbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,128 @@
+%% Copyright 2019 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.
+
+\ProvidesFile{apa6.dbx}[2019/09/07\space v8.0\space APA 6th ed. 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]{
+  abstractloc,
+  titleisdescription,
+  newspaper,
+  urldescription}
+
+\DeclareDatamodelFields[type=field, datatype=verbatim]{
+  abstracturl}
+
+\DeclareDatamodelEntryfields{
+  titleisdescription,
+  with,
+  abstractloc,
+  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}
+

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/austrian-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,213 @@
+\ProvidesFile{austrian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{austrian}
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {austrian},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  with             = {{mit}{mit}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/brazilian-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,136 @@
+\ProvidesFile{brazilian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{brazilian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {brazilian},
+  revisededition   = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}},
+  on               = {{em}{em}},
+  retrieved        = {{recuperado}{recuperado}},
+  available        = {{dispon\'ivel}{disp.}},
+  from             = {{de}{de}},
+  archivedat       = {{arquivado\space em}{arquivado\space em}},
+  reviewof         = {{Revis\~ao\space de}{revis\~ao\space de}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  origyear         = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
+  typechair        = {{Coordenador}{Coord\adddot}},
+  typechairs       = {{Coordenadores}{Coords\adddot}},
+  typevolume       = {{Editor\space do\space Volume}{Ed\adddotspace Vol\adddot}},
+  typevolumes      = {{Editores\space do\space Volume}{Eds\adddotspace Vol\adddot}},
+  typeseries       = {{Editor\space da\space S\'erie}{Ed\adddotspace S\'erie\adddot}},
+  typeseriess      = {{Editores\space da\space S\'erie}{Eds\adddotspace S\'erie\adddot}},
+  typevolseries    = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddotspace Vol\space\&\space S\'erie}},
+  typevolseriess   = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/british-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,142 @@
+\ProvidesFile{british-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{british}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {british},
+  revisededition   = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{on}{on}},
+  retrieved        = {{retrieved}{retrieved}},
+  available        = {{available}{available}},
+  from             = {{from}{from}},
+  archivedat       = {{archived\space at}{archived\space at}},
+  reviewof         = {{Review\space of}{review\space of}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Master's thesis}{Master's\addabbrvspace thesis}},
+  phdthesis        = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
+  origyear         = {{original\space work\space published}{original\space work\space published}},
+  typechair        = {{Chair}{Chair}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
+  typeseries       = {{Series\space Editor}{Series\space Ed\adddot}},
+  typeseriess      = {{Series\space Editors}{Series\space Eds\adddot}},
+  typevolseries    = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/danish-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,155 @@
+\ProvidesFile{danish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{danish}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {danish},
+  revisededition   = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{hentet}{hentet}},
+  available        = {{tilgængelig}{tilgængelig}},
+  from             = {{fra}{fra}},
+  archivedat       = {{arkiveret\space ved}{arkiveret\space ved}},
+  reviewof         = {{anmeldelse\space af}{anmeldelse\space af}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{producent}{producent}},
+  director         = {{instrukt{\o}r}{instrukt{\o}r}},
+  writer           = {{manuskript}{manuskript}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  january          = {{januar}{januar}},
+  february         = {{februar}{februar}},
+  march            = {{marts}{marts}},
+  april            = {{april}{april}},
+  may              = {{maj}{maj}},
+  june             = {{juni}{juni}},
+  july             = {{juli}{juli}},
+  august           = {{august}{august}},
+  september        = {{september}{september}},
+  october          = {{oktober}{oktober}},
+  november         = {{november}{november}},
+  december         = {{december}{december}},
+  mathesis         = {{Speciale}{Speciale}},
+  phdthesis        = {{Ph.d.-afhandling}{Ph.d.-afhandling}},
+  origyear         = {{oprindeligt\space offentliggjort}{oprindeligt\space offentliggjort}},
+  typechair        = {{ordstyrer}{ordstyrer}},
+  typechairs       = {{ordstyrere}{ordstyrere}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rer}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rer}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\thefield{#1}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\thefield{#1}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \thefield{#1}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/dutch-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,142 @@
+\ProvidesFile{dutch-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{dutch}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {dutch},
+  revisededition   = {{Herziene\space editie}{herz\adddotspace ed\adddot}},
+  page             = {{Pagina}{{}p\adddot}},
+  pages            = {{Pagina's}{{}pp\adddot}},
+  on               = {{op}{op}},
+  retrieved        = {{verkregen}{verkregen}},
+  available        = {{beschikbaar}{beschikbaar}},
+  from             = {{van}{van}},
+  archivedat       = {{gearchiveerd\space onder}{gearchiveerd\space onder}},
+  reviewof         = {{bespreking\space van}{bespreking\space van}},
+  producer         = {{producent}{producent}},
+  execproducer     = {{uitvoerend producent}{uitvoerend producent}},
+  director         = {{regisseur}{regisseur}},
+  writer           = {{schrijver}{schrijver}},
+  with             = {{met}{met}},% FIXME: check
+  paragraph        = {{par\adddot}{par\adddot}},
+  paragraphs       = {{par\adddot}{par\adddot}},
+  mathesis         = {{masterscriptie}{masterscriptie}},
+  phdthesis        = {{proefschrift}{proefschrift}},
+  origyear         = {{origineel\space werk\space gepubliceerd}{origineel\space werk\space gepubliceerd}},
+  typechair        = {{hoofd}{hoofd}},
+  typechairs       = {{hoofden}{hoofden}},
+  typevolume       = {{Deelredacteur}{Deelred\adddot}},
+  typevolumes      = {{Deelredacteuren}{Deelred\adddot}},
+  typeseries       = {{Reeksredacteur}{Reeksred\adddot}},
+  typeseriess      = {{Reeksredacteuren}{Reeksred\adddot}},
+  typevolseries    = {{Reeks-\space en\space deelredacteur}{Reeks-\space\& deelred\adddot}},
+  typevolseriess   = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/english-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,144 @@
+\ProvidesFile{english-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{english}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {american},
+  revisededition   = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}pp\adddot}},
+  on               = {{on}{on}},
+  retrieved        = {{retrieved}{retrieved}},
+  available        = {{available}{available}},
+  from             = {{from}{from}},
+  archivedat       = {{archived\space at}{archived\space at}},
+  with             = {{with}{with}},
+  reprintas        = {{reprinted as}{reprinted as}},
+  reprintfrom      = {{reprinted from}{reprinted from}},
+  reviewof         = {{review\space of}{review\space of}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  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}},
+  typechairs       = {{Chairs}{Chairs}},
+  typevolume       = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+  typevolumes      = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
+  typeseries       = {{Series\space Editor}{Series\space Ed\adddot}},
+  typeseriess      = {{Series\space Editors}{Series\space Eds\adddot}},
+  typevolseries    = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+  typevolseriess   = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \print*date to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/french-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,137 @@
+\ProvidesFile{french-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{french}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {french},
+  inpress          = {{sous presse}{sous presse}},% remove when biblatex has it
+  revisededition   = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}},
+  page             = {{Page}{{}p\adddot}},
+  pages            = {{Pages}{{}p\adddot}},
+  on               = {{le}{le}},
+  retrieved        = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}},
+  with             = {{avec}{avec}},
+  producer         = {{producteur}{producteur}},
+  execproducer     = {{producteur ex\'ecutif}{producteur ex\'ecutif}},
+  director         = {{r\'ealisateur}{r\'ealisateur}},
+  writer           = {{\'ecrivain}{\'ecrivain}},
+  available        = {{disponible}{disponible}},
+  from             = {{\`a\space partir\space de}{\`a\space partir\space de}},
+  archivedat       = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
+  reviewof         = {{critique\space de}{critique\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P}{\P}},
+  origyear         = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}},
+  typechair        = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}},
+  typechairs       = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}},
+  typevolume       = {{R\'edacteur\space du\space volume}{R\'ed\adddotspace vol\adddot}},
+  typevolumes      = {{R\'edacteur\space du\space volume}{R\'eds\adddotspace vol\adddot}},
+  typeseries       = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddotspace ser\adddot}},
+  typeseriess      = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddotspace ser\adddot}},
+  typevolseries    = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddotspace vol\space\&\space ser\adddot}},
+  typevolseriess   = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/galician-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,153 @@
+\ProvidesFile{galician-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{galician}
+
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {galician},
+  inpress          = {{no prelo}{no prelo}},% remove when biblatex has it
+  january          = {{xaneiro}{xaneiro}},
+  february         = {{febreiro}{febreiro}},
+  march            = {{marzo}{marzo}},
+  april            = {{abril}{abril}},
+  may              = {{maio}{maio}},
+  june             = {{xu\~no}{xu\~no}},
+  july             = {{xullo}{xullo}},
+  august           = {{agosto}{agosto}},
+  september        = {{setembro}{setembro}},
+  october          = {{outubro}{outubro}},
+  november         = {{novembro}{novembro}},
+  december         = {{decembro}{decembro}},
+  nodate           = {{s\adddot d\adddot}{s\adddot d\adddot}},
+  mathesis         = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}},
+  phdthesis        = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}},
+  revisededition   = {{edici\'on\space revisada}{edici\'on\space revisada}},
+  producer         = {{produtor}{produtor}},
+  execproducer     = {{produtor executivo}{produtor executivo}},
+  director         = {{director}{director}},
+  writer           = {{escritor}{escritor}},
+  with             = {{con}{con}},
+  page             = {{p\'axina}{{}p\adddot}},
+  pages            = {{p\'axinas}{{}pp\adddot}},
+  on               = {{o}{o}},
+  retrieved        = {{obtido}{obtido}},
+  available        = {{dispo\~nible}{dispo\~nible}},
+  from             = {{desde}{desde}},
+  archivedat       = {{arquivado en}{arquivado en}},
+  reviewof         = {{revisi\'on\space de}{revisi\'on\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{data\space orixinal\space de\space publicaci\'on}{data\space orixinal\space de\space publicaci\'on}},
+  typechair        = {{coordinador}{coord\adddot}},
+  typechairs       = {{coordinadores}{coords\adddot}},
+  typevolume       = {{editor\space do\space volume}{ed\adddotspace vol\adddot}},
+  typevolumes      = {{editores\space do\space volume}{eds\adddotspace vol\adddot}},
+  typeseries       = {{editor\space da\space serie}{ed\adddotspace ser\adddot}},
+  typeseriess      = {{editores\space da\space serie}{eds\adddotspace ser\adddot}},
+  typevolseries    = {{editor\space da\space serie\space e\space do\space volume}{ed\adddotspace vol\space\&\space ser\adddot}},
+  typevolseriess   = {{editores\space da\space serie\space e\space do\space volume}{eds\adddotspace vol\space\&\space ser\adddot}},
+  annodomini       = {{d\adddot\space C\adddot}{d\adddot\space C\adddot}},
+  beforechrist     = {{a\adddot\space C\adddot}{a\adddot\space C\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
+       \mkbibmonth{\thefield{#2}}%
+}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {el\addspace\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {\addspace{en}\addspace}%
+      {\iffieldundef{#3}%
+        {en\addspace}%
+        {\addspace{de}\addspace}%
+       \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \thefield{#1}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/german-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,212 @@
+\ProvidesFile{german-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{german}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {german},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff}{Zugriff}},
+  available        = {{Erh\"altlich}{Erh\"altlich}},
+  with             = {{mit}{mit}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/greek-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,159 @@
+\ProvidesFile{greek-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{greek}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {greek},
+  revisededition   = {{Αναθεωρημένη\space Έκδοση}{εκδ \adddotspace εκ\adddot}},
+  page             = {{Σελίδα}{{}σ\adddot}},
+  pages            = {{Σελίδες}{{}σσ\adddot}},
+  on               = {{στις}{στις}},
+  retrieved        = {{ανακτήθηκε}{ανακτήθηκε}},
+  available        = {{διαθέσιμο}{διαθέσιμο}},
+  from             = {{από}{από}},
+  archivedat       = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}},
+  reviewof         = {{Αναθεώρηση\space του}{αναθεώρηση\space του}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Μεταπτυχιακή εργασία}{Μεταπτυχιακή\addabbrvspace εργασία}},
+  phdthesis        = {{Διδακτορική\addabbrvspace διατριβή}{Διδακτορική\addabbrvspace διατριβή}},
+  origyear         = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}},
+  typechair        = {{Πρόεδρος}{Πρόεδρος}},
+  typechairs       = {{Πρόεδροι}{Πρόεδροι}},
+  typevolume       = {{Τόμος\space Συντάκτης}{Τομ\adddotspace Συν\adddot}},
+  typevolumes      = {{Τόμοι\space Συντάκτες}{Τομ\adddotspace Συν\adddot}},
+  typeseries       = {{Σειρά\space Συντάκτης}{Σειρά\space Συν\adddot}},
+  typeseriess      = {{Σειρά\space Συντάκτες}{Σειρά\space Συν\adddot}},
+  typevolseries    = {{Σειρά\space και\space Τόμος\space Συντάκτης}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
+  typevolseriess   = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\lbx at gr@mkbibmonth#1{%
+    \ifcase0#1\relax
+      #1\BibliographyWarning{Month out of range}%
+    \or\abx at bibmonth{datejanuary}%
+    \or\abx at bibmonth{datefebruary}%
+    \or\abx at bibmonth{datemarch}%
+    \or\abx at bibmonth{dateapril}%
+    \or\abx at bibmonth{datemay}%
+    \or\abx at bibmonth{datejune}%
+    \or\abx at bibmonth{datejuly}%
+    \or\abx at bibmonth{dateaugust}%
+    \or\abx at bibmonth{dateseptember}%
+    \or\abx at bibmonth{dateoctober}%
+    \or\abx at bibmonth{datenovember}%
+    \or\abx at bibmonth{datedecember}%
+    \else
+      #1\BibliographyWarning{Month out of range}%
+    \fi}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \lbx at gr@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \lbx at gr@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \lbx at gr@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/italian-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,142 @@
+\ProvidesFile{italian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{italian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {italian},
+  revisededition   = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}},
+  page             = {{Pagina}{{}p\adddot}},
+  pages            = {{Pagine}{{}pp\adddot}},
+  on               = {{il}{il}},
+  retrieved        = {{recuperato}{recuperato}},
+  available        = {{disponibile}{disponibile}},
+  from             = {{da}{da}},
+  archivedat       = {{archiviato\space il}{archiviato\space il}},
+  reviewof         = {{Revisione\space di}{revisione\space di}},
+  producer         = {{producer}{producer}},
+  execproducer     = {{executive producer}{executive producer}},
+  director         = {{director}{director}},
+  writer           = {{writer}{writer}},
+  with             = {{with}{with}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Tesi\space di\space laurea}{Tesi\space di\space laurea}},
+  phdthesis        = {{Tesi\space di\space dottorato}{Tesi\space di\space dottorato}},
+  origyear         = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}},
+  typechair        = {{Moderatore}{Moderatore}},
+  typechairs       = {{Moderatori}{Moderatori}},
+  typevolume       = {{Redattore\space del\space Volume}{Red\adddotspace Vol\adddot}},
+  typevolumes      = {{Redattori\space del\space Volume}{Red\adddotspace Vol\adddot}},
+  typeseries       = {{Curatore\space della\space Collana}{Cur\addotspace Coll\adddot}},
+  typeseriess      = {{Curatori\space della\space Collana}{Cur\addotspace Coll\adddot}},
+  typevolseries    = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
+  typevolseriess   = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\addspace}%
+       \stripzeros{\thefield{#3}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#3}}%
+        {\ifthenelse{\iffieldundef{#2}}%
+          {}%
+          {\addspace}}%
+        {\addcomma\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/naustrian-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,214 @@
+\ProvidesFile{naustrian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{naustrian}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {naustrian},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Autor}{Autor}},
+  writer           = {{Schriftsteller}{Schriftsteller}},
+  with             = {{mit}{mit}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/ngerman-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,215 @@
+\ProvidesFile{ngerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{ngerman}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {ngerman},
+  abstract         = {{Abstract}{Abstract}},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  with             = {{mit}{mit}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{auf}{auf}},
+  retrieved        = {{verf\"ugbar}{verf\"ugbar}},
+  available        = {{Erh\"altlich}{Erh\"altlich}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+  nodate           = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}}
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norsk-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,146 @@
+\ProvidesFile{norsk-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{norsk}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {norsk},
+  revisededition   = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{hentet}{hentet}},
+  available        = {{tilgjengelig}{tilgjengelig}},
+  from             = {{fra}{fra}},
+  archivedat       = {{arkivert\space ved}{arkivert\space ved}},
+  reviewof         = {{anmeldelse\space av}{anmeldelse\space av}},
+  producer         = {{produsent}{produsent}},
+  execproducer     = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+  director         = {{regiss{\o}r}{regiss{\o}r}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Masteroppgave}{Masteroppgave}},
+  phdthesis        = {{Doktoravhandling}{Doktoravhandling}},
+  origyear         = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
+  typechair        = {{ordstyrer}{ordstyrer}},
+  typechairs       = {{ordstyrere}{ordstyrere}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rer}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rer}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/norwegian-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,143 @@
+\ProvidesFile{norwegian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{norwegian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {norwegian},
+  revisededition   = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{hentet}{hentet}},
+  available        = {{tilgjengelig}{tilgjengelig}},
+  from             = {{fra}{fra}},
+  archivedat       = {{arkivert\space ved}{arkivert\space ved}},
+  reviewof         = {{anmeldelse\space av}{anmeldelse\space av}},
+  producer         = {{produsent}{produsent}},
+  execproducer     = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+  director         = {{regiss{\o}r}{regiss{\o}r}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Masteroppgave}{Masteroppgave}},
+  phdthesis        = {{Doktoravhandling}{Doktoravhandling}},
+  origyear         = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
+  typechair        = {{ordstyrer}{ordstyrer}},
+  typechairs       = {{ordstyrere}{ordstyrere}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rer}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rer}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nswissgerman-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,214 @@
+\ProvidesFile{nswissgerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{nswissgerman}
+
+% (APA 6.22) The example abbreviations
+
+% Following DGPs guidlines for German/Austrian/Swiss German
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {nswissgerman},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  with             = {{mit}{mit}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/nynorsk-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,146 @@
+\ProvidesFile{nynorsk-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{nynorsk}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {nynorsk},
+  revisededition   = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}},
+  page             = {{side}{{}s\adddot}},
+  pages            = {{sider}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{henta}{henta}},
+  available        = {{tilgjengeleg}{tilgjengeleg}},
+  from             = {{fr{\aa}}{fr{\aa}}},
+  archivedat       = {{arkivert\space ved}{arkivert\space ved}},
+  reviewof         = {{melding\space av}{melding\space av}},
+  producer         = {{produsent}{produsent}},
+  execproducer     = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
+  director         = {{regiss{\o}r}{regiss{\o}r}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}},
+  phdthesis        = {{Doktoravhandling}{Doktoravhandling}},
+  origyear         = {{opphavleg\space publisert}{opphavleg\space publisert}},
+  typechair        = {{ordstyrar}{ordstyrar}},
+  typechairs       = {{ordstyrarar}{ordstyrarar}},
+  typevolume       = {{bindredakt{\o}r}{bindred\adddot}},
+  typevolumes      = {{bindredakt{\o}rar}{bindred\adddot}},
+  typeseries       = {{serieredakt{\o}r}{seriered\adddot}},
+  typeseriess      = {{serieredakt{\o}rar}{seriered\adddot}},
+  typevolseries    = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
+  typevolseriess   = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/portuguese-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,134 @@
+\ProvidesFile{portuguese-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{portuguese}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {portuguese},
+  revisededition   = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}},
+  on               = {{em}{em}},
+  retrieved        = {{obtido}{obtido}},
+  available        = {{dispon\'ivel}{disp.}},
+  from             = {{de}{de}},
+  archivedat       = {{arquivado\space em}{arquivado\space em}},
+  reviewof         = {{Revis\~ao\space de}{revis\~ao\space de}},
+  producer         = {{produtor}{produtor}},
+  execproducer     = {{produtor executivo}{produtor executivo}},
+  director         = {{diretor}{diretor}},
+  writer           = {{escritor}{escritor}},
+  with             = {{com}{com}},
+  origyear         = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
+  typechair        = {{Coordenador}{Coord\adddot}},
+  typechairs       = {{Coordenadores}{Coords\adddot}},
+  typevolume       = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}},
+  typevolumes      = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}},
+  typeseries       = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}},
+  typeseriess      = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}},
+  typevolseries    = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}},
+  typevolseriess   = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/russian-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,147 @@
+\ProvidesFile{russian-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{russian}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {russian},
+  revisededition   = {{исправленное издание}{испр\adddotspace изд\adddot}},
+  on               = {{на}{на}},
+  retrieved        = {{получено}{получено}},
+  available        = {{доступно}{доступно}},
+  from             = {{c}{c}},
+  archivedat       = {{в архиве\space на}{в архиве\space на}},
+  with             = {{с}{с}},
+  paragraph        = {{абзац}{абз\adddot}},
+  paragraphs       = {{абзацы}{абз\adddot}},
+  producer         = {{продюсер}{продюсер}},
+  execproducer     = {{исполнительный продюсер}{исполнительный продюсер}},
+  director         = {{режиссер}{режиссер}},
+  writer           = {{сценарист}{сценарист}},
+  origyear         = {{оригинальная\space работа\space опубликована}{ориг\adddotspace работа\space опубл\adddot}},
+  typechair        = {{Председатель}{Председатель}},
+  typechairs       = {{Председатели}{Председатели}},
+  typevolume       = {{Редактор\space тома}{Ред\adddotspace т\adddot}},
+  typevolumes      = {{Редакторы\space тома}{Ред\adddotspace т\adddot}},
+  typeseries       = {{Редактор\space серии}{Ред\adddotspace сер\adddot}},
+  typeseriess      = {{Редакторы\space серии}{Ред\adddotspace сер\adddot}},
+  typevolseries    = {{Редактор\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
+  typevolseriess   = {{Редакторы\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
+  annodomini       = {{нашей\space эры}{н\adddotspace э\adddot}},
+  beforechrist     = {{до\space нашей\space эры}{до н\adddotspace э\adddot}},
+}
+
+\protected\gdef\lbx at sl@mkbibmonth#1{%
+  \ifcase0#1\relax
+    #1\BibliographyWarning{Month out of range}%
+  \or\abx at bibmonth{datejanuary}%
+  \or\abx at bibmonth{datefebruary}%
+  \or\abx at bibmonth{datemarch}%
+  \or\abx at bibmonth{dateapril}%
+  \or\abx at bibmonth{datemay}%
+  \or\abx at bibmonth{datejune}%
+  \or\abx at bibmonth{datejuly}%
+  \or\abx at bibmonth{dateaugust}%
+  \or\abx at bibmonth{dateseptember}%
+  \or\abx at bibmonth{dateoctober}%
+  \or\abx at bibmonth{datenovember}%
+  \or\abx at bibmonth{datedecember}%
+  \else
+    #1\BibliographyWarning{Month out of range}%
+  \fi}%
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}%
+          {\addcomma\addspace}%
+         \mkbibmonth{\thefield{#2}}}%
+        {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}%
+          {\addcomma\addspace}%
+         \mkbibmonth{\thefield{#2}}}%
+        {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {\mkbibmonth{\thefield{#2}}}%
+        {\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/slovene-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,175 @@
+\ProvidesFile{slovene-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{slovene}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\NewBibliographyString{% Month name variants used after day
+  datejanuary,
+  datefebruary,
+  datemarch,
+  dateapril,
+  datemay,
+  datejune,
+  datejuly,
+  dateaugust,
+  dateseptember,
+  dateoctober,
+  datenovember,
+  datedecember%
+}
+
+\DeclareBibliographyStrings{%
+  inherit          = {slovene},
+  revisededition   = {{dopolnjena izdaja}{dopolnjena iz\adddot}},
+  on               = {{na}{na}},
+  retrieved        = {{pridobljeno}{pridobljeno}},
+  available        = {{dostopno}{dostopno}},
+  from             = {{}{}},
+  archivedat       = {{arhivirano\space na}{arhivirano\space na}},
+  with             = {{z}{z}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  producer         = {{producent}{producent}},
+  execproducer     = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}},
+  director         = {{re\v{z}iser}{re\v{z}iser}},
+  writer           = {{avtor}{avtor}},
+  datejanuary      = {{januarja}{januarja}},
+  datefebruary     = {{februarja}{februarja}},
+  datemarch        = {{marca}{marca}},
+  dateapril        = {{aprila}{aprila}},
+  datemay          = {{maja}{maja}},
+  datejune         = {{junija}{junija}},
+  datejuly         = {{julija}{julija}},
+  dateaugust       = {{avgusta}{avgusta}},
+  dateseptember    = {{septembra}{septembra}},
+  dateoctober      = {{oktobra}{oktobra}},
+  datenovember     = {{novembra}{novembra}},
+  datedecember     = {{decembra}{decembra}},
+  origyear         = {{izvirno\space delo\space objavljeno}{izvirno\space delo\space objavljeno}},
+  typechair        = {{Predsednik}{Predsednik}},
+  typechairs       = {{Predsedniki}{Predsedniki}},
+  typevolume       = {{urednik}{ur\adddot}},
+  typevolumes      = {{uredniki}{ur\adddot}},
+  typeseries       = {{urednik}{ur\adddot}},
+  typeseriess      = {{uredniki}{ur\adddot}},
+  typevolseries    = {{urednik}{ur\adddot}},
+  typevolseriess   = {{uredniki}{ur\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+\protected\gdef\lbx at sl@mkbibmonth#1{%
+  \ifcase0#1\relax
+    #1\BibliographyWarning{Month out of range}%
+  \or\abx at bibmonth{datejanuary}%
+  \or\abx at bibmonth{datefebruary}%
+  \or\abx at bibmonth{datemarch}%
+  \or\abx at bibmonth{dateapril}%
+  \or\abx at bibmonth{datemay}%
+  \or\abx at bibmonth{datejune}%
+  \or\abx at bibmonth{datejuly}%
+  \or\abx at bibmonth{dateaugust}%
+  \or\abx at bibmonth{dateseptember}%
+  \or\abx at bibmonth{dateoctober}%
+  \or\abx at bibmonth{datenovember}%
+  \or\abx at bibmonth{datedecember}%
+  \else
+    #1\BibliographyWarning{Month out of range}%
+  \fi}%
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\adddot\addspace}%
+       \lbx at sl@mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/spanish-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,152 @@
+\ProvidesFile{spanish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{spanish}
+
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {spanish},
+  inpress          = {{en prensa}{en prensa}},% remove when biblatex has it
+  january          = {{enero}{enero}},
+  february         = {{febrero}{febrero}},
+  march            = {{marzo}{marzo}},
+  april            = {{abril}{abril}},
+  may              = {{mayo}{mayo}},
+  june             = {{junio}{junio}},
+  july             = {{julio}{julio}},
+  august           = {{agosto}{agosto}},
+  september        = {{septiembre}{septiembre}},
+  october          = {{octubre}{octubre}},
+  november         = {{noviembre}{noviembre}},
+  december         = {{diciembre}{diciembre}},
+  nodate           = {{s\adddot f\adddot}{s\adddot f\adddot}},
+  mathesis         = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}},
+  phdthesis        = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}},
+  revisededition   = {{Edici\'on\space revisada}{Edici\'on\space revisada}},
+  producer         = {{productor}{productor}},
+  execproducer     = {{productor ejecutivo}{productor ejecutivo}},
+  director         = {{director}{director}},
+  writer           = {{escritor}{escritor}},
+  with             = {{con}{con}},
+  page             = {{P\'agina}{{}p\adddot}},
+  pages            = {{P\'aginas}{{}pp\adddot}},
+  on               = {{el}{el}},
+  retrieved        = {{Recuperado}{Recuperado}},
+  available        = {{disponible}{disponible}},
+  from             = {{desde}{desde}},
+  archivedat       = {{archivado en}{archivado en}},
+  reviewof         = {{revisi\'on\space de}{revisi\'on\space de}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}},
+  typechair        = {{Coordinador}{Coord\adddot}},
+  typechairs       = {{Coordinadores}{Coords\adddot}},
+  typevolume       = {{Editor\space del\space volumen}{Ed\adddotspace vol\adddot}},
+  typevolumes      = {{Editores\space del\space volumen}{Eds\adddotspace vol\adddot}},
+  typeseries       = {{Editor\space de\space la\space serie}{Ed\adddotspace ser\adddot}},
+  typeseriess      = {{Editores\space de\space la\space serie}{Eds\adddotspace ser\adddot}},
+  typevolseries    = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddotspace vol\space\&\space ser\adddot}},
+  typevolseriess   = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \stripzeros{\thefield{#3}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#1}%
+        {}%
+        {\addcomma\addspace}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
+       \mkbibmonth{\thefield{#2}}%
+}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {el\addspace\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {\addspace{en}\addspace}%
+      {\iffieldundef{#3}%
+        {en\addspace}%
+        {\addspace{de}\addspace}%
+       \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \thefield{#1}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swedish-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,139 @@
+\ProvidesFile{swedish-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{swedish}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{nodate}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {swedish},
+  revisededition   = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}},
+  page             = {{sida}{{}s\adddot}},
+  pages            = {{sidor}{{}s\adddot}},
+  on               = {{p{\aa}}{p{\aa}}},
+  retrieved        = {{h\"amtad}{h\"amtad}},
+  available        = {{tillg\"anglig}{tillg\"anglig}},
+  from             = {{fr{\aa}n}{fr{\aa}n}},
+  archivedat       = {{arkiverat\space vid}{arkiverat\space vid}},
+  nodate           = {{utan\space {\aa}r}{u\adddot~{\aa}}},
+  reviewof         = {{granskning\space av}{granskning\space av}},
+  producer         = {{producent}{producent}},
+  execproducer     = {{exekutiv\space producent}{exekutiv\space producent}},
+  director         = {{regiss\"or}{regiss\"or}},
+  editor           = {{redakt\"or}{red\adddot}},
+  editors          = {{redakt\"or}{red\adddot}},
+  writer           = {{manus}{manus}},
+  with             = {{med}{med}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  mathesis         = {{examensuppsats}{examensuppsats}},
+  phdthesis        = {{doktorsavhandling}{doktorsavhandling}},
+  origyear         = {{originalarbete\space publicerat}{originalarbete\space publicerat}},
+  typechair        = {{ordf\"orande}{ordf\"orande}},
+  typechairs       = {{ordf\"oranden}{ordf\"oranden}},
+  typevolume       = {{redakt\"or}{red\adddot}},
+  typevolumes      = {{redakt\"orer}{red\adddot}},
+  typeseries       = {{redakt\"or}{red\adddot}},
+  typeseriess      = {{redakt\"orer}{red\adddot}},
+  typevolseries    = {{redakt\"or}{red\adddot}},
+  typevolseriess   = {{redakt\"orer}{red\adddot}},
+  annodomini       = {{A\adddot D\adddot}{A\adddot D\adddot}},
+  beforechrist     = {{B\adddot C\adddot}{B\adddot C\adddot}},
+}
+
+
+\DeclareBibliographyExtras{%
+  \def\urldatecomma{\addcomma\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+    \iffieldundef{#3}%
+      {}%
+      {\iffieldundef{#1}%
+        {}
+        {\addcomma\addspace}%
+       \stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}
+        {\iffieldundef{#1}
+          {}
+          {\addspace}}%
+        {\adddot\addspace}%
+       \mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\stripzeros{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa6/swissgerman-apa6.lbx	2019-11-27 22:06:27 UTC (rev 52949)
@@ -0,0 +1,213 @@
+\ProvidesFile{swissgerman-apa6.lbx}[2019/09/07\space v8.0\space APA 6th ed. biblatex localisation]
+\InheritBibliographyExtras{swissgerman}
+
+% Following DGPs guidlines for German/Austrian/Swiss German
+% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+  inherit          = {swissgerman},
+  andothers        = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+  revisededition   = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+  producer         = {{Produzent}{Produzent}},
+  execproducer     = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
+  director         = {{Regisseur}{Regisseur}},
+  writer           = {{Autor}{Autor}},
+  page             = {{Seite}{{}S\adddot}},
+  pages            = {{Seiten}{{}S\adddot}},
+  on               = {{am}{am}},
+  retrieved        = {{Zugriff\space am}{Zugriff\space am}},
+  available        = {{erh\"altlich}{erh\"altlich}},
+  with             = {{mit}{mit}},
+  from             = {{unter}{unter}},
+  archivedat       = {{archiviert\space unter}{archiviert\space unter}},
+  reviewof         = {{Rezension\space des}{Rezension\space des}},
+  paragraph        = {{\P}{\P}},
+  paragraphs       = {{\P\P}{\P\P}},
+  origyear         = {{Original\space erschienen}{Original\space erschienen}},
+  typechair        = {{Leitung}{Leitung}},
+  typechairs       = {{Leitung}{Leitung}},
+  typevolume       = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typevolumes      = {{Bandherausgeber}{Bandhrsg\adddot}},
+  typeseries       = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typeseriess      = {{Reihenherausgeber}{Reihenhrsg\adddot}},
+  typevolseries    = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  typevolseriess   = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
+  annodomini       = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
+  beforechrist     = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+\DeclareBibliographyExtras{%
+  \renewcommand{\apashortdash}{~}%
+  \def\urldatecomma{\addspace}%
+  \protected\def\mkbibdateapalong#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongextra#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}%
+       \printfield{extradate}%
+       \ifboolexpr{test {\iffieldundef{#3}} and test {\iffieldundef{#2}}}
+         {}
+         {\addcomma\space}}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}%
+       \iffieldundef{#2}
+         {}
+         {\addspace}}%
+    \iffieldundef{#2}%
+      {}%
+      {\mkbibmonth{\thefield{#2}}}}%
+  \protected\def\mkbibdateapalongmdy#1#2#3{%
+    % As per 6.28, Articles only have year
+    \ifboolexpr{ test {\ifentrytype{article}}
+                 and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+      {\clearfield{labelmonth}%
+       \clearfield{labelday}}
+      {}%
+    \iffieldundef{#3}%
+      {}%
+      {\mkbibordinal{\thefield{#3}}}%
+    \iffieldundef{#2}%
+      {}%
+      {\iffieldundef{#3}%
+        {}%
+        {\addspace}%
+       \mkbibmonth{\thefield{#2}}}%
+    \iffieldundef{#1}%
+      {}%
+      {\iffieldundef{#2}%
+        {}%
+        {\addspace}%
+       \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}%
+  \def\apa at lbx@de at mkdaterangeapalong#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\datecircaprint
+         \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+           {\printtext{%
+               \iffieldsequal{#1year}{#1endyear}
+                 {\iffieldsequal{#1month}{#1endmonth}
+                    {\mkbibdateapalongmdy{}{}{#1day}}
+                    {\mkbibdateapalongmdy{}{#1month}{#1day}}}
+                 {\mkbibdateapalongmdy{#1year}{#1month}{#1day}}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}%
+               \dateuncertainprint}}
+           {\printtext{%
+               \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+                 {\mkbibdateapalong{#1year}{}{#1day}}%
+                 {\mkbibdateapalong{#1year}{#1month}{#1day}}%
+               \dateeraprint{#1year}%
+               \iffieldundef{#1endyear}%
+                 {}%
+                 {\iffieldequalstr{#1endyear}{}% open-ended range?
+                   {\mbox{\bibdatedash}}
+                   {\bibdatedash%
+                    \iffieldsequal{#1year}{#1endyear}%
+                      {\mkbibdateapalong{}{#1endmonth}{#1endday}}%
+                      {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+                     \dateeraprint{#1endyear}}}%
+                 \enddateuncertainprint}}}}%
+    \endgroup}%
+  \def\apa at lbx@de at mkdaterangeapalongextra#1{%
+    \begingroup
+      \blx at metadateinfo{#1}%
+      \iffieldundef{#1year}{}
+        {\printtext{%
+          \datecircaprint
+          \ifboolexpr{test {\iffieldsequal{#1year}{#1endyear}}
+                           and test {\iffieldsequal{#1month}{#1endmonth}}}
+            {\mkbibdateapalongextra{#1year}{}{#1day}}%
+            {\mkbibdateapalongextra{#1year}{#1month}{#1day}}%
+          \dateeraprint{#1year}%
+          \dateuncertainprint
+          \iffieldundef{#1endyear}%
+            {}%
+            {\iffieldequalstr{#1endyear}{}% open-ended range?
+              {\mbox{\bibdatedash}}
+              {\bibdatedash%
+               \iffieldsequal{#1year}{#1endyear}%
+                 {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}
+                 {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+                  \dateeraprint{#1endyear}}}%
+             \enddateuncertainprint}}}%
+    \endgroup}%
+  \savecommand\mkdaterangeapalong
+  \savecommand\mkdaterangeapalongextra
+  \def\mkdaterangeapalong{%
+    \apa at lbx@de at mkdaterangeapalong}%
+  \def\mkdaterangeapalongextra#1{%
+    \apa at lbx@de at mkdaterangeapalongextra{#1}}%
+}
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\mkdaterangeapalong
+  \restorecommand\mkdaterangeapalongextra
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput

Modified: trunk/Master/tlpkg/bin/tlpkg-ctan-check
===================================================================
--- trunk/Master/tlpkg/bin/tlpkg-ctan-check	2019-11-27 22:05:41 UTC (rev 52948)
+++ trunk/Master/tlpkg/bin/tlpkg-ctan-check	2019-11-27 22:06:27 UTC (rev 52949)
@@ -96,7 +96,7 @@
     bera berenisadf besjournals bestpapers betababel beton beuron
     bewerbung bez123 bezierplot bgreek bgteubner bguq bhcexam
     bib-fr bib2gls bibarts biber bibhtml
-    biblatex biblatex-abnt biblatex-anonymous biblatex-apa
+    biblatex biblatex-abnt biblatex-anonymous biblatex-apa biblatex-apa6
     biblatex-archaeology biblatex-arthistory-bonn
     biblatex-bath biblatex-bookinarticle biblatex-bookinother biblatex-bwl
     biblatex-caspervector biblatex-cheatsheet biblatex-chem

Added: trunk/Master/tlpkg/tlpsrc/biblatex-apa6.tlpsrc
===================================================================
Modified: trunk/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc	2019-11-27 22:05:41 UTC (rev 52948)
+++ trunk/Master/tlpkg/tlpsrc/collection-bibtexextra.tlpsrc	2019-11-27 22:06:27 UTC (rev 52949)
@@ -26,6 +26,7 @@
 depend biblatex-abnt
 depend biblatex-anonymous
 depend biblatex-apa
+depend biblatex-apa6
 depend biblatex-archaeology
 depend biblatex-arthistory-bonn
 depend biblatex-bath



More information about the tex-live-commits mailing list