texlive[52900] Master/texmf-dist: biblatex-apa (23nov19)
commits+karl at tug.org
commits+karl at tug.org
Sat Nov 23 22:21:40 CET 2019
Revision: 52900
http://tug.org/svn/texlive?view=revision&revision=52900
Author: karl
Date: 2019-11-23 22:21:40 +0100 (Sat, 23 Nov 2019)
Log Message:
-----------
biblatex-apa (23nov19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/README 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,7 +1,7 @@
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).
+maintainer is Philip Kime (© 2019).
This package is a biblatex style for APA (American Psychological
Association) style compliant documents typeset in LaTeX. It
@@ -12,7 +12,7 @@
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).
+APA Style Guide 7th 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
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,444 +1,450 @@
-% (APA 6.11)
- at BOOK{6.11,
- AUTHOR = {Kessler, Jr., A.},
+% (APA 8.6)
+ at BOOK{8.6a,
+ AUTHOR = {A. Rabbitt},
TITLE = {Title},
- DATE = {2003},
+ DATE = {1982}
}
-% (APA 6.12)
- at BOOK{6.12a,
- AUTHOR = {A. Smith and B. Jones},
+ at BOOK{8.6b,
+ AUTHOR = {A. Lyon and B. Brent and C. Crump},
TITLE = {Title},
- DATE = {2007},
+ DATE = {2014}
}
- at BOOK{6.12b,
- AUTHOR = {A. Kisangau and B. Lyaruu and C. Hosea and D. Joseph},
+ at BOOK{8.6c,
+ AUTHOR = {A. Nicholson},
TITLE = {Title},
- DATE = {2007},
+ DATE = {2003}
}
- at BOOK{6.12c,
- AUTHOR = {A. Ireys and B. Chernoff and C. DeVet and D. Kim},
+% (APA 8.10)
+ at BOOK{8.10a,
+ AUTHOR = {Kessler, Jr., A.},
TITLE = {Title},
- DATE = {2001},
+ DATE = {2003}
}
- at BOOK{6.12d,
- AUTHOR = {A. Ireys and B. Chernoff and E. Stein and C. DeVet and F. Silver},
- TITLE = {Title},
- DATE = {2001},
+ at ARTICLE{8.10b,
+ AUTHOR = {Terrence Test},
+ TITLE = {Some Title},
+ JOURNAL = {Jolly Journal},
+ ISSUE = {Spring},
+ PAGES = {100--103},
+ DATE = {2001}
}
- at BOOK{6.12e,
- AUTHOR = {A. Kurtines and B. Szapocznik},
+% (APA 8.11)
+ at BOOK{8.11a,
+ AUTHOR = {A. Koehler},
TITLE = {Title},
- DATE = {2003},
+ DATE = {2016}
}
- at BOOK{6.12f,
- AUTHOR = {A. Jöreskog and B. Sörbon},
+% (APA 8.12)
+ at BOOK{8.12a,
+ AUTHOR = {A. Adams and B. Brown and C. Clapham},
TITLE = {Title},
- DATE = {2007},
+ DATE = {2019}
}
- at BOOK{6.12g,
- AUTHOR = {A. Kosslyn and B. Koenig and C. Barrett and D. Cave and E. Tang and F. Gabrieli},
+ at BOOK{8.12b,
+ AUTHOR = {A. Shumway and B. Shulman},
TITLE = {Title},
- DATE = {1996},
+ DATE = {2015}
}
- at BOOK{6.12h,
- AUTHOR = {A. Kosslyn and B. Koenig and F. Gabrieli and E. Tang and G. Marsolek and H. Daly},
+ at BOOK{8.12c,
+ AUTHOR = {A. Westinghouse},
TITLE = {Title},
- DATE = {1996},
+ DATE = {2017}
}
- at BOOK{6.12i,
- AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge},
- TITLE = {Title},
- DATE = {1990},
+ at BOOK{8.12d,
+ GROUPAUTHOR = {{Department of Veteran Affairs}},
+ TITLE = {Title1}
}
- at BOOK{6.12j,
- AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and E. Elide},
- TITLE = {Title 2},
- DATE = {1991},
+ at BOOK{8.12e,
+ GROUPAUTHOR = {{Department of Veteran Affairs}},
+ TITLE = {Title1},
+ DATE = {2017}
}
-% (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 BOOK{8.12f,
+ GROUPAUTHOR = {{Department of Veteran Affairs}},
+ TITLE = {Title2},
+ DATE = {2017}
}
- at MISC{6.13b,
- AUTHOR = {A. Walker and B. Allen},
- TITLE = {Title},
- DATE = {2004},
+ at BOOK{8.12g,
+ GROUPAUTHOR = {{Department of Veteran Affairs}},
+ TITLE = {Title1},
+ DATE = {2019}
}
- at MISC{6.13c,
- AUTHOR = {A. Bradley and B. Ramirez and C. Soo},
- TITLE = {Title},
- DATE = {1999},
+ at BOOK{8.12h,
+ AUTHOR = {A. Zhou},
+ TITLE = {Title1},
+ PUBSTATE = {inpress}
}
- at MISC{6.13d,
- AUTHOR = {A. Bradley and B. Ramirez and C. Soo and D. Walsh},
- TITLE = {Title},
- DATE = {2006},
+ at BOOK{8.12i,
+ AUTHOR = {A. Zhou},
+ TITLE = {Title1}
}
- at MISC{6.13e,
- AUTHOR = {A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
- TITLE = {Title},
- DATE = {2008},
+ at BOOK{8.12j,
+ AUTHOR = {A. Zhou},
+ TITLE = {Title1},
+ DATE = {2000}
}
- 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 BOOK{8.12k,
+ AUTHOR = {A. Zhou},
+ TITLE = {Title1},
+ DATE = {2016}
}
- at MISC{6.13g,
- AUTHOR = {{National Institute of Mental Health}},
- SHORTAUTHOR = {NIMH},
- TITLE = {Title},
- DATE = {2003},
+ at BOOK{8.12l,
+ AUTHOR = {A. Carraway and B. Brown and C. Crush},
+ TITLE = {Title1},
+ DATE = {2013}
}
- at MISC{6.13h,
- AUTHOR = {{University of Pittsburgh}},
- TITLE = {Title},
- DATE = {2005},
+ at BOOK{8.12m,
+ AUTHOR = {A. Carraway and B. Brown and C. Crush},
+ TITLE = {Title2},
+ DATE = {2014}
}
- at MISC{6.13i,
- AUTHOR = {{The American Psychological Association}},
- SHORTAUTHOR = {APA},
+ at BOOK{8.12n,
+ AUTHOR = {A. Carraway and B. Brown and C. Crush},
+ TITLE = {Title3},
+ DATE = {2019}
+}
+
+ at BOOK{8.12o,
+ AUTHOR = {A. Sampson and B. Hughes},
TITLE = {Title1},
- DATE = {2005},
+ DATE = {2020}
}
- at MISC{6.13j,
- AUTHOR = {{The American Psychological Association}},
- SHORTAUTHOR = {APA},
- TITLE = {Title2},
- DATE = {2006},
+ at BOOK{8.12p,
+ AUTHOR = {A. Augustine},
+ TITLE = {Title1},
+ DATE = {2017}
}
-% (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},
+ at BOOK{8.12q,
+ AUTHOR = {A. Melara and B. Brunswick and C. Davenport},
+ TITLE = {Title1},
+ DATE = {2018}
}
-% (APA 6.15)
- at ARTICLE{6.15a,
- TITLE = {Study Finds Something Interesting},
- SHORTTITLE = {Study Finds},
- DATE = {2007},
+ at BOOK{8.12r,
+ AUTHOR = {A. Pérez},
+ TITLE = {Title1},
+ DATE = {2014}
}
- at BOOK{6.15b,
- TITLE = {College Bound Seniors},
- DATE = {2008},
+% PUBSTATE is not used as there is a DATE - enforced by a style source map in .bbx
+ at BOOK{8.12s,
+ AUTHOR = {Steven Smidge},
+ TITLE = {Something 1},
+ DATE = {2000},
+ PUBSTATE = {inpress}
}
- at BOOK{6.15c,
- AUTHOR = {Anonymous},
+ at BOOK{8.12t,
+ AUTHOR = {Steven Smidge},
+ TITLE = {Something 2},
+ PUBSTATE = {inpress}
+}
+
+ at BOOK{8.12u,
+ AUTHOR = {Steven Smidge},
+ TITLE = {Something 3},
+ PUBSTATE = {inpress}
+}
+
+% (APA 8.13)
+ at BOOK{8.13a,
+ GROUPAUTHOR = {{Centers for Disease Control and Prevention}},
TITLE = {Title},
- DATE = {1998},
+ DATE = {2019}
}
-% (APA 6.16)
- at BOOK{6.16a,
- AUTHOR = {{Department of Veterans Affairs}},
- TITLE = {Title1},
- DATE = {2001},
+ at BOOK{8.13b,
+ AUTHOR = {A. Shimamura},
+ TITLE = {Title},
+ DATE = {2017}
}
- at BOOK{6.16b,
- AUTHOR = {{Department of Veterans Affairs}},
- TITLE = {Title1},
- DATE = {2003},
+ at BOOK{8.13c,
+ AUTHOR = {A. Armstrong},
+ TITLE = {Title},
+ DATE = {2015}
}
- at BOOK{6.16c,
- AUTHOR = {A. Gogel},
- TITLE = {Title1},
- DATE = {1990},
+ at BOOK{8.13d,
+ AUTHOR = {A. Shadid},
+ TITLE = {Title},
+ DATE = {2020}
}
- at BOOK{6.16d,
- AUTHOR = {A. Gogel},
- TITLE = {Title2},
- DATE = {2006},
+ at BOOK{8.13e,
+ AUTHOR = {A. Kovačič and B. Horvat},
+ TITLE = {Title},
+ DATE = {2019}
}
- at BOOK{6.16e,
- AUTHOR = {A. Gogel},
- TITLE = {Title3},
- PUBSTATE = {inpress},
+ at BOOK{8.13f,
+ AUTHOR = {A. Thompson},
+ TITLE = {Title},
+ DATE = {2020}
}
- at BOOK{6.16f,
- AUTHOR = {A. Derryberry and B. Reed},
- TITLE = {Title1},
- DATE = {2005},
+ at BOOK{8.13g,
+ GROUPAUTHOR = {{Beck Institute for Cognitive Behaviour Therapy}},
+ TITLE = {Title},
+ DATE = {2012}
}
- at BOOK{6.16g,
- AUTHOR = {A. Derryberry and B. Reed},
- TITLE = {Title2},
- DATE = {2005},
+ at BOOK{8.13h,
+ TITLE = {King James Bible},
+ ORIGDATE = {1769},
+ DATE = {2017}
}
- at BOOK{6.16h,
- AUTHOR = {A. Derryberry and B. Reed},
- TITLE = {Title3},
- PUBSTATE = {inpress},
+% Note the special date specification for BC and circa - see biblatex manual
+ at BOOK{8.13i,
+ AUTHOR = {Aristotle},
+ TITLE = {Ethics},
+ ORIGDATE = {-0349~},
+ DATE = {1994}
}
- at BOOK{6.16i,
- AUTHOR = {A. Rothbart},
- TITLE = {Title1},
- DATE = {2003},
+ at BOOK{8.13j,
+ AUTHOR = {W. Shakespeare},
+ ORIGDATE = {1623},
+ DATE = {1995}
}
- at BOOK{6.16j,
- AUTHOR = {A. Rothbart},
- TITLE = {Title2},
- DATE = {2003},
+% (APA 8.14)
+ at BOOK{8.14a,
+ TITLE = {Interpersonal Skills and Other Desperate Phrases Designed to Sound Scientific},
+ SHORTTITLE = {Interpersonal Skills},
+ DATE = {2019}
}
- at BOOK{6.16k,
- AUTHOR = {A. Miller},
+ at ARTICLE{8.14b,
+ TITLE = {Understanding Sensory Memory},
+ DATE = {2018}
+}
+
+ at BOOK{8.14c,
+ AUTHOR = {Anonymous},
TITLE = {Title},
- DATE = {1999},
+ DATE = {2017}
}
- at BOOK{6.16l,
- AUTHOR = {A. Shafrankse and B. Mahoney},
+% (APA 8.15)
+ at BOOK{8.15a,
+ AUTHOR = {S. Freud},
TITLE = {Title},
- DATE = {1998},
+ ORIGDATE = {1900},
+ DATE = {1953}
}
- at BOOK{6.16m,
- AUTHOR = {A. Minor},
+ at BOOK{8.15b,
+ AUTHOR = {J. Piaget},
TITLE = {Title},
- DATE = {2001},
+ ORIGDATE = {1966},
+ DATE = {2000}
}
- at BOOK{6.16n,
- AUTHOR = {A. Adams},
+
+% (APA 8.17)
+ at BOOK{8.17a,
+ AUTHOR = {Luna, A},
TITLE = {Title},
- DATE = {1999},
+ DATE = {2020}
}
- at BOOK{6.16o,
- AUTHOR = {A. Storandt},
+ at BOOK{8.17b,
+ AUTHOR = {Sales, A and D'Agostino, B},
TITLE = {Title},
- DATE = {2007},
+ DATE = {2020}
}
-% 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{8.17c,
+ AUTHOR = {Martin, A and Someone B and Someoneelse C},
+ TITLE = {Title},
+ DATE = {2020}
}
- at BOOK{6.16q,
- AUTHOR = {Steven Smidge},
- TITLE = {Something 2},
- PUBSTATE = {inpress}
+ at BOOK{8.17d,
+ GROUPAUTHOR = {{National Institute of Mental Health}},
+ SHORTAUTHOR = {NIMH},
+ TITLE = {Title},
+ DATE = {2020}
}
- at BOOK{6.16r,
- AUTHOR = {Steven Smidge},
- TITLE = {Something 3},
- PUBSTATE = {inpress}
+ at BOOK{8.17e,
+ GROUPAUTHOR = {{Stanford University}},
+ TITLE = {Title},
+ DATE = {2020}
}
+ at BOOK{8.17f,
+ AUTHOR = {A. Jöreskog and B. Sörbon},
+ TITLE = {Title},
+ DATE = {2007}
+}
-% (APA 6.17)
- at BOOK{6.17,
- AUTHOR = {A. Nicholson},
+ at BOOK{8.17g,
+ AUTHOR = {A. Eifert and B. Yildiz},
TITLE = {Title},
- DATE = {2003},
+ DATE = {2018}
}
-% (APA 6.18)
- at BOOK{6.18a,
- AUTHOR = {Aristotle},
- TITLE = {Ethics},
- TRANSLATOR = {S. Translator},
- DATE = {1931},
+ at BOOK{8.17h,
+ GROUPAUTHOR = {{American Educational Research Association} and {Some other group} and {Yet another group}},
+ TITLE = {Title},
+ DATE = {2014}
}
- at BOOK{6.18b,
- AUTHOR = {H. James},
- TITLE = {Novel},
- ORIGDATE = {1890},
- DATE = {1983},
+% (APA 8.18)
+ at BOOK{8.18a,
+ AUTHOR = {A. Kapoor and B. Bloom and C. Montez and D. Warner and E. Hill},
+ TITLE = {Title},
+ DATE = {2017}
}
-% Last two examples need no references entry
+ at BOOK{8.18b,
+ AUTHOR = {A. Kapoor and B. Bloom and C. Zucker and D. Tang and E. Köroğlu and F. L'Enfant and G. Kim and H. Daly},
+ TITLE = {Title},
+ DATE = {2017}
+}
-% (APA 6.19)
- at BOOK{6.19a,
- AUTHOR = {{Centers for Disease Control and Prevention}},
+ at BOOK{8.18c,
+ AUTHOR = {A. Hasan and B. Liang and C. Kahn and D. Jones-Miller},
TITLE = {Title},
- DATE = {2005},
+ DATE = {2015}
}
- at BOOK{6.19b,
- AUTHOR = {A. Shimamura},
+ at BOOK{8.18d,
+ AUTHOR = {A. Hasan and B. Liang and C. Kahn and D. Weintraub},
TITLE = {Title},
- DATE = {1989},
+ DATE = {2015}
}
-% (APA 6.20) - No examples need references entry
-
-% (APA 6.21)
- at BOOK{6.21,
- AUTHOR = {{U.S. Department of Labor}},
+ at BOOK{8.18e,
+ AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge},
TITLE = {Title},
- DATE = {2007},
+ DATE = {1990}
}
-% (APA 6.28a)
- at BOOK{6.28a,
- AUTHOR = {Arthur Somebody},
- TITLE = {Some Title},
+ at BOOK{8.18f,
+ AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and E. Elide},
+ TITLE = {Title 2},
+ DATE = {1991}
}
-% 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},
+% (APA 8.19)
+ at BOOK{8.19a,
+ AUTHOR = {A. Judge and B. Kammeyer-Mueller},
+ TITLE = {Title1},
+ DATE = {2012-07}
}
- 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 BOOK{8.19b,
+ AUTHOR = {A. Judge and B. Kammeyer-Mueller},
+ TITLE = {Title2},
+ DATE = {2012-06}
}
- 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}
+ at MISC{8.19c,
+ AUTHOR = {A. Sifuentes},
+ TITLE = {Title1}
}
-% 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},
+ at MISC{8.19d,
+ AUTHOR = {A. Sifuentes},
+ TITLE = {Title2}
}
-% 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}
+% (APA 8.20)
+ at BOOK{8.20a,
+ AUTHOR = {J. M. Taylor and B. Neimeyer},
+ TITLE = {Title},
+ DATE = {2015}
}
- at BOOK{UL2,
- AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
- TITLE = {Random Articles Found Under Cats},
- DATE = {2010}
+ at BOOK{8.20b,
+ AUTHOR = {T. Taylor},
+ TITLE = {Title},
+ DATE = {2014}
}
- at BOOK{UL3,
- AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled},
- TITLE = {Can You Say a Word?},
- DATE = {2010}
+ at BOOK{8.20c,
+ AUTHOR = {Reginald Plumber},
+ TITLE = {Title},
+ DATE = {2015}
}
- at BOOK{UL4,
- AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled and Graham Grunt},
- TITLE = {Looking at Spiders},
- DATE = {2010}
+ at BOOK{8.20d,
+ AUTHOR = {Robert Plumber},
+ TITLE = {Title},
+ DATE = {2014}
}
-% Testing "with"
- at BOOK{with1,
- AUTHOR = {James Jaunty and Russell Rendition},
- WITH = {Alan Also},
- TITLE = {Look for Lost Limps},
- DATE = {2000}
+ at BOOK{8.20e,
+ AUTHOR = {A. Chen and B. Chen},
+ TITLE = {Title},
+ DATE = {2019}
}
-% Testing citeauthor
- at BOOK{ca1,
- AUTHOR = {Brian Blameless and Colin Careless and Derek Delusional},
- TITLE = {Three Modern Men},
- DATE = {2001}
+ at BOOK{8.20f,
+ AUTHOR = {Brown, Y. and Campbell, W. K.},
+ DATE = {2004}
}
-% Testing no date
- at BOOK{nodate1,
- AUTHOR = {Neil Nodate},
- TITLE = {Testing},
- URLDATE = {2012}
+ at BOOK{8.20g,
+ AUTHOR = {Campbell, A. and Muncer, M. and Gorman, B.},
+ DATE = {1993}
}
- at BOOK{nodate2,
- AUTHOR = {Neil Nodate},
- TITLE = {Testing 2},
+ at BOOK{8.20h,
+ AUTHOR = {Campbell, W. K. and Bush, C. P. and Brunell, A. B.},
+ DATE = {2005}
}
-% 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 BOOK{8.20i,
+ AUTHOR = {Smyth, L. N. and Campbell, A. and Adams, K.},
+ DATE = {1992}
}
- 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}
+ at ARTICLE{8.20j,
+ AUTHOR = {Deutsch, J. Anthony and Deutsch, Diana},
+ DATE = {1963}
}
+% (APA 8.21)
+ at BOOK{8.21a,
+ GROUPAUTHOR = {{The American Psychological Association}},
+ SHORTAUTHOR = {APA},
+ TITLE = {Title1},
+ DATE = {2017}
+}
+
+ at BOOK{8.21b,
+ GROUPAUTHOR = {{The American Psychological Association}},
+ SHORTAUTHOR = {APA},
+ TITLE = {Title2},
+ DATE = {2006}
+}
+
% Suffix test for first-last (editor)
@INCOLLECTION{stest1,
AUTHOR = {Gring, III, Alan J.},
@@ -499,19 +505,6 @@
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"
@ARTICLE{ao1,
AUTHOR = {Boker, S. and Neale, M. and Maes, H. and Wilde, M. and
@@ -531,46 +524,6 @@
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
@ARTICLE{kingetal2005a,
AUTHOR = {King, J. E. and Weiss, A. and Farmer, K. H.},
@@ -590,13 +543,6 @@
DATE = {2009}
}
-% Testing era output
- at BOOK{plato,
- AUTHOR = {Plato},
- TITLE = {Meno},
- DATE = {-0379%}
-}
-
% Testing citation with complete dates
@ARTICLE{Ludwig2014,
ENTRYSUBTYPE = {nonacademic},
@@ -622,3 +568,14 @@
DATE = {1984-02-27/1984-03-01},
}
+% 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},
+ JOURNALTITLE = {Journal of International Interest},
+ VOLUME = {87},
+ NUMBER = {12},
+ PAGES = {1423--1458},
+ DATE = {1923}
+}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,1060 +1,2430 @@
-% (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 9.8)
+ at BOOK{9.8:1,
+ AUTHOR = {A. A. Author and B. B. Author},
+ DATE = {2014}
+}
+ at BOOK{9.8:2,
+ GROUPAUTHOR = {{American Psychological Association} and {National Institutes of Health}},
+ DATE = {2014}
}
-% (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}
+ at BOOK{9.8:3,
+ AUTHOR = {A. A. Author and B. B. Author and C. C. Author},
+ DATE = {2014}
}
-% (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},
+ at BOOK{9.8:4,
+ AUTHOR = {First and Second and Third and Fourth and Fifth and Sixth and
+ Seventh and Eighth and Ninth and Tenth and Eleventh and Twelfth and
+ Thirteenth and Fourteenth and Fifteenth and Sixteenth and
+ Seventeenth and Eighteenth and Nineteenth and Twentieth},
+ DATE = {2014}
+}
+
+ at BOOK{9.8:5,
+ AUTHOR = {First and Second and Third and Fourth and Fifth and Sixth and
+ Seventh and Eighth and Ninth and Tenth and Eleventh and Twelfth and
+ Thirteenth and Fourteenth and Fifteenth and Sixteenth and
+ Seventeenth and Eighteenth and Nineteenth and Twentieth and
+ Twentyfirst and Twentysecond},
+ DATE = {2014}
+}
+
+ at BOOK{9.8:6,
+ AUTHOR = {Xu, Ai-Jun},
+ DATE = {2014}
+}
+
+% protect the hyphenated lower-case initial from being detected
+ at BOOK{9.8:7,
+ AUTHOR = {Raboso, {Lee-ann}},
+ DATE = {2014}
+}
+
+ at BOOK{9.8:8,
+ AUTHOR = {Author, Jr., A. A. and B. B. Author},
+ DATE = {2014}
+}
+
+ at BOOK{9.8:9,
+ AUTHOR = {K. Meyers},
+ WITH = {W. T. Long},
+ TITLE = {Withering Worrying},
+ DATE = {2014}
+}
+
+ at BOOK{9.8:10,
+ AUTHOR = {Plato},
+ DATE = {2014}
+}
+
+% using the biber string annotation feature for usernames. This allows
+% usernames to be attached to any name in a name list. Must call a username
+% annotation "username"
+ at BOOK{9.8:11,
+ AUTHOR = {U. Author},
+ AUTHOR+an:username = {1="@ausername"},
+ DATE = {2014}
+}
+
+% (APA 9.44)
+ at NAMEONLY{9.44:1a,
+ AUTHOR = {A. S. Benjamin}
+}
+
+ at NAMEONLY{9.44:1b,
+ AUTHOR = {ben Yaakov, D.}
+}
+
+ at NAMEONLY{9.44:2a,
+ AUTHOR = {N. K. Denzin}
+}
+
+ at NAMEONLY{9.44:2b,
+ AUTHOR = {de Onís, C.}
+}
+
+ at NAMEONLY{9.44:2c,
+ AUTHOR = {J. T. Devlin}
+}
+
+ at NAMEONLY{9.44:3a,
+ AUTHOR = {Girard, John-Bill}
+}
+
+ at NAMEONLY{9.44:3b,
+ AUTHOR = {Girard-Perregaux, A. S.}
+}
+
+ at NAMEONLY{9.44:4a,
+ AUTHOR = {Ibn Abdulaziz, T.}
+}
+
+ at NAMEONLY{9.44:4b,
+ AUTHOR = {Ibn Nidal, A. K. M.}
+}
+
+ at NAMEONLY{9.44:5a,
+ AUTHOR = {M. E. López}
+}
+
+ at NAMEONLY{9.44:5b,
+ AUTHOR = {López de Molina, G.}
+}
+
+ at NAMEONLY{9.44:6a,
+ AUTHOR = {MacCallum, II, T.}
+}
+
+ at NAMEONLY{9.44:6b,
+ AUTHOR = {MacCallum, III, T.}
+}
+
+ at NAMEONLY{9.44:7a,
+ AUTHOR = {E. MacNeil}
+}
+
+ at NAMEONLY{9.44:7b,
+ AUTHOR = {Z. C. E. McAdoo}
+}
+
+ at NAMEONLY{9.44:7c,
+ AUTHOR = {L. L. M'Carthy}
+}
+
+ at NAMEONLY{9.44:8a,
+ AUTHOR = {S. R. Olson}
+}
+
+ at NAMEONLY{9.44:8b,
+ AUTHOR = {U. O'Neil}
+}
+
+ at NAMEONLY{9.44:8c,
+ AUTHOR = {R. Oppenheimer}
+}
+
+ at NAMEONLY{9.44:9a,
+ AUTHOR = {F. Partridge}
+}
+
+ at NAMEONLY{9.44:9b,
+ AUTHOR = {Plato}
+}
+
+ at NAMEONLY{9.44:10a,
+ AUTHOR = {San Martin, Q. E}
+}
+
+ at NAMEONLY{9.44:10b,
+ AUTHOR = {Santa Maria, M.}
+}
+
+ at NAMEONLY{9.44:10c,
+ AUTHOR = {F. E. Santayana}
+}
+
+% Silly requirement to list "Sr" before "Jr" because it's "older"
+ at NAMEONLY{9.44:11a,
+ AUTHOR = {Santiago, Sr., J.},
+ SORTNAME = {SantiagoJ1}
+}
+
+ at NAMEONLY{9.44:11b,
+ AUTHOR = {Santiago, Jr., J.},
+ SORTNAME = {SantiagoJ2}
+}
+
+ at NAMEONLY{9.44:12a,
+ AUTHOR = {S. A. Villafuerte}
+}
+
+ at NAMEONLY{9.44:12b,
+ AUTHOR = {Villa-Lobos, J.}
+}
+
+% (APA 9.46)
+ at BOOK{9.46:1,
+ AUTHOR = {S. N. Patel}
+}
+
+ at BOOK{9.46:2,
+ AUTHOR = {S. N. Patel},
+ DATE = {2016}
+}
+
+ at BOOK{9.46:3,
+ AUTHOR = {S. N. Patel},
+ DATE = {2020}
+}
+
+ at BOOK{9.46:4,
+ AUTHOR = {S. N. Patel},
+ DATE = {2020-04}
+}
+
+ at BOOK{9.46:5,
+ AUTHOR = {S. N. Patel},
+ PUBSTATE = {inpress}
+}
+
+ at BOOK{9.46:6,
+ AUTHOR = {T. E. Davidson},
+ DATE = {2019}
+}
+
+ at BOOK{9.46:7,
+ AUTHOR = {T. E. Davidson and McCabe, M. P.},
+ DATE = {2015}
+}
+
+ at BOOK{9.46:8,
+ AUTHOR = {Costa, Jr., P. T. and McCrae, R. R.},
+ DATE = {2013}
+}
+
+ at BOOK{9.46:9,
+ AUTHOR = {Costa, Jr., P. T. and McCrae, R. R.},
+ DATE = {2014}
+}
+
+ at BOOK{9.46:10,
+ AUTHOR = {T. E. Jacobson and B. Duncan and S. E. Young},
+ DATE = {2019}
+}
+
+ at BOOK{9.46:11,
+ AUTHOR = {T. E. Jacobson and K. M. Raymond},
+ DATE = {2017}
+}
+
+ at BOOK{9.46:12,
+ AUTHOR = {S. J. Pfeiffer and Wan-Wan Chu and S. H. Park},
+ DATE = {2018}
+}
+
+ at BOOK{9.46:13,
+ AUTHOR = {S. J. Pfeiffer and Wan-Wan Chu and T. L. Wall},
+ DATE = {2018}
+}
+
+% (APA 9.47)
+ at BOOK{9.47:1,
+ AUTHOR = {H. Azikiwe and A. Bello},
+ DATE = {2020}
+}
+
+ at BOOK{9.47:2,
+ AUTHOR = {H. Azikiwe and A. Bello},
+ DATE = {2020-03-26}
+}
+
+ at BOOK{9.47:3,
+ AUTHOR = {H. Azikiwe and A. Bello},
+ DATE = {2020-04-02}
+}
+
+ at ARTICLE{9.47:4,
+ AUTHOR = {T. A. Judge and Kammeyer-Mueller, J. D},
+ TITLE = {General and Specific Measures in Organizational Behaviour Research},
+ SUBTITLE = {Considerations, Examples, and Recommandations for Researchers},
+ JOURNALTITLE = {Organizational Behaviour},
+ VOLUME = {33},
+ NUMBER = {2},
+ PAGES = {161--174},
+ DATE = {2012},
+ DOI = {10.1002/job.764}
+}
+
+ at ARTICLE{9.47:5,
+ AUTHOR = {T. A. Judge and Kammeyer-Mueller, J. D},
+ TITLE = {On the Value of Aiming High},
+ SUBTITLE = {The Causes and Consequences of Ambition},
+ JOURNALTITLE = {Journal of Applied Psychology},
+ VOLUME = {97},
+ NUMBER = {4},
+ PAGES = {758--775},
+ DATE = {2012},
+ DOI = {10.1037/a0028084}
+}
+
+% Testing title nosort options - title sorting ignores "The" "An" and "A"
+% at the beginning
+ at BOOK{9.47:6,
+ AUTHOR = {A. Smith},
+ TITLE = {Interesting Things},
+ DATE = {2014}
+}
+
+ at BOOK{9.47:7,
+ AUTHOR = {A. Smith},
+ TITLE = {A Litany of Special Things},
+ DATE = {2014}
+}
+
+ at BOOK{9.47:8,
+ AUTHOR = {A. Smith},
+ TITLE = {An Awful Lot of Special Things},
+ DATE = {2014}
+}
+
+ at BOOK{9.47:9,
+ AUTHOR = {A. Smith},
+ TITLE = {The Banality of Special Things},
+ DATE = {2014}
+}
+
+% Testing no date and in press extradate
+ at BOOK{9.47:10,
+ AUTHOR = {B. Brown}
+}
+
+ at BOOK{9.47:11,
+ AUTHOR = {B. Brown}
+}
+
+ at BOOK{9.47:12,
+ AUTHOR = {B. Brown},
+ PUBSTATE = {inpress}
+}
+
+ at BOOK{9.47:13,
+ AUTHOR = {B. Brown},
+ PUBSTATE = {inpress}
+}
+
+% (APA 9.48)
+ at BOOK{9.48:1,
+ AUTHOR = {J. M. Taylor and G. J. Neimeyer},
+ DATE = {2015}
+}
+
+ at BOOK{9.48:2,
+ AUTHOR = {T. Taylor},
+ DATE = {2014}
+}
+
+% (APA 9.49)
+ at BOOK{9.49:1,
+ AUTHOR = {Anonymous},
+ TITLE = {The Pnakotic Manuscript},
+ DATE = {-3000~}
+}
+
+ at BOOK{9.49:2,
+ TITLE = {The Book of Eibon},
+ DATE = {-2000~}
+}
+
+ at BOOK{9.49:3,
+ AUTHOR = {A. Smith},
+ TITLE = {Top 100 Silliest Reference List Sorting Requirements},
+ SORTTITLE = {Top One Hundred Silliest Reference List Sorting Requirements},
+ DATE = {2019}
+}
+
+ at BOOK{9.49:4,
+ AUTHOR = {A. Smith},
+ TITLE = {Top 10 Political Pandering Epithets in Psychology},
+ SORTTITLE = {Top Ten Political Pandering Epithets in Psychology},
+ DATE = {2019}
+}
+
+ at ARTICLE{9.49:5,
+ AUTHOR = {J. Jones},
+ TITLE = {Annoyingly Casual Titles},
+ SUBTITLE = {How to Exhaust all Effort on the Title Alone},
+ SORTTITLE = {Annoyingly Casual Titles Part 1},
+ JOURNALTITLE = {Journal of the Decline of Academia},
+ DATE = {2012}
+}
+
+ at ARTICLE{9.49:6,
+ AUTHOR = {J. Jones},
+ TITLE = {Annoyingly Casual Titles},
+ SUBTITLE = {Creating Titles to Distract from Vacuity},
+ SORTTITLE = {Annoyingly Casual Titles Part 2},
+ JOURNALTITLE = {Journal of the Decline of Academia},
+ DATE = {2012}
+}
+
+% (APA 9.51)
+ at INBOOK{9.51:1,
+ AUTHOR = {L. K. Barber and M. J. Grawitch and P. W. Maloney},
+ EDITOR = {M. J. Grawitch and D. W. Ballard},
+ TITLE = {Work-life Balance},
+ SUBTITLE = {Contemporary Perspectives},
+ BOOKTITLE = {The Psychologically Healthy Workplace},
+ BOOKSUBTITLE = {Building a Win-Win Environment for Organizations and Employees},
+ PAGES = {111--113},
+ PUBLISHER = {American Psychological Association},
+ DATE = {2016},
+ DOI = {10.1037/14731-006},
+ ANNOTATION = {This book chapter provides an overview of the
+ psychosociological concept of work-life balance. The
+ authors discuss findings from studies showing harmful
+ effects of work-life conflict on psychological and
+ behavioural health as well as beneficial effects of
+ work-life facilitation, wherein one role makes a
+ positive contribution to the other. The chapter concludes
+ with a description of work-life balance initiatives that
+ organizations have adopted to help employees manage their
+ dual work and nonwork obligations and some of the key
+ factors influencing their effectiveness.}
+}
+
+ at ARTICLE{9.51:2,
+ AUTHOR = {D. S. Carlson and M. J. Thompson and K. M. Kacmar},
+ TITLE = {Double Crossed},
+ SUBTITLE = {The Spillover and Crossover Effect of Work Demands on
+ Work Outcomes Through the Family},
+ JOURNALTITLE = {Journal of Applied Psychology},
+ VOLUME = {104},
NUMBER = {2},
- PAGES = {38--48},
- DATE = {2006},
- URL = {http://ojs.lib.swin.edu.au/index.php/ejap}
+ PAGES = {214--228},
+ DATE = {2019},
+ DOI = {10.1037/apl0000348},
+ ANNOTATION = {\textcite{9.51:2} conducted an empirical study to
+ examine the multiple paths through which work and family
+ variables can affect work outcomes. Whereas
+ \textcite{9.51:1} explored how work obligations can
+ increase stress or enhance fulfillment at home,
+ \citeauthor{9.51:2} viewed work demands as raising family
+ stress, with potential negative consequences on work
+ performance. Results supported a model in which direct
+ effects of work demands and spillover effects of work
+ demands to work-to-family conflict led to a lower job
+ satisfaction and affective commitment, as well as
+ crossover effects of work-to-family conflict, spousal
+ stress transmission, and later family-to-work conflict on
+ organizational citizenship and absenteeism. Overall, the
+ study demonstrated a link from work demands to work
+ outcomes when considering the family, but those paths
+ differed depending on whether attitudinal or behavioural
+ work outcomes were examined.}
}
- 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},
+% (APA 9.52)
+ at ARTICLE{9.52:1,
+ AUTHOR = {L. Angel and C. Bastin and S. Genon and E. Balteau and
+ C. Phillips and A. Luxen and P. Maquet and E. Salmon
+ and F. Collette},
+ TITLE = {Differential Effects of Aging on the Neural
+ Correlates of Recollection and Familiarity},
+ JOURNALTITLE = {Cortex},
+ VOLUME = {49},
+ NUMBER = {6},
+ PAGES = {1585--1597},
+ DATE = {2013},
+ DOI = {10.1016/j.cortex.2012.10.002},
+ KEYWORDS = {meta}
+}
+
+ at INBOOK{9.52:2,
+ AUTHOR = {J. R. Finley and J. G. Tullis and A. S. Benjamin},
+ EDITOR = {M. S. Khine and I. M. Saleh},
+ TITLE = {Metacognitive Control of Learning and Remembering},
+ BOOKTITLE = {New Science of Learning},
+ BOOKSUBTITLE = {Cognition, Computers and Collaboration in Education},
+ PAGES = {109--131},
+ PUBLISHER = {Springer},
+ DATE = {2010},
+ DOI = {10.1007/978-1-4419-57160_6}
+}
+
+ at ARTICLE{9.52:3,
+ AUTHOR = {R. Hanaki and N. Abe and T. Fujii and A. Ueno and Y.
+ Nishio and K. Hiraoka and T. Shimomura and O. Iizuka
+ and M. Shinohara and K. Hirayama and E. Mori},
+ TITLE = {The Effects of Aging and Alzheimer's Disease on
+ Associative Recognition Memory},
+ JOURNALTITLE = {Neurological Sciences},
+ VOLUME = {32},
+ NUMBER = {6},
+ PAGES = {1115--1122},
+ DATE = {2011},
+ DOI = {10.1007/s10072-011-0748-4},
+ KEYWORDS = {meta}
+}
+
+ at ARTICLE{9.52:4,
+ AUTHOR = {M. B. Hargis and A. D. Castel},
+ TITLE = {Younger and Older Adults' Associative Memory for
+ Medication Interactions of Varying Severity},
+ JOURNALTITLE = {Memory},
+ VOLUME = {26},
+ NUMBER = {8},
+ PAGES = {1151--1158},
+ DATE = {2018},
+ DOI = {10.1080/09658211.2018.1441423},
+}
+
+
+
+
+
+
+
+
+
+
+
+% (APA 10.1 Example 1)
+% Note that the URL is suppressed if there is a DOI
+ at ARTICLE{10.1:1,
+ AUTHOR = {S. M. McCauley and M. H. Christiansen},
+ TITLE = {Language Learning as Language Use},
+ SUBTITLE = {A Cross-linguistic Model of Child Language Development},
+ JOURNALTITLE = {Psychological Review},
+ VOLUME = {126},
NUMBER = {1},
- PAGES = {73--82},
+ PAGES = {1--51},
+ DATE = {2019},
+ DOI = {10.1037/rev0000126},
+ URL = {http://some.url}
}
-% (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 10.1 Example 2)
+ at ARTICLE{10.1:2,
+ AUTHOR = {E. Ahmann and L. J. Tuttle and M. Saviet and S. D. Wright},
+ TITLE = {A Descriptive Review of {ADHD} Coaching Research},
+ SUBTITLE = {Implications for College Students},
+ JOURNALTITLE = {Journal of Postsecondary Education and Disability},
+ VOLUME = {31},
+ NUMBER = {1},
+ PAGES = {17--39},
+ DATE = {2018},
+ URL = {https://www.ahead.org/professional-resources/publications/jped/archived-jped/jped-volume-31}
}
-% (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},
+% (APA 10.1 Example 3)
+ at ARTICLE{10.1:3a,
+ AUTHOR = {M. Anderson},
+ TITLE = {Getting Consistent with Consequences},
+ JOURNALTITLE = {Educational Leadership},
+ VOLUME = {76},
+ NUMBER = {1},
+ PAGES = {26-33},
+ DATE = {2018}
+}
+
+ at ARTICLE{10.1:3b,
+ AUTHOR = {C. Goldman},
+ TITLE = {The Complicated Calibration of Love, Especially in Adoption},
+ JOURNALTITLE = {Chicago Tribune},
+ KEYWORDS = {nonacademic},
+ DATE = {2018-11-28}
+}
+
+% (APA 10.1 Example 4)
+% This is incorrect in APA 7th as the DOI is http but the standard is https
+ at ARTICLE{10.1:4,
+ AUTHOR = {E. Kalnay and M. Kanamitsu and R. Kistler and W.
+ Collins and D. Deaven and L. Gandin and M. Iredell and S.
+ Saha and G. White and J. Wollen and Y. Zhu and M.
+ Chelliah and W. Ebisuzaki and W. Higgins and J. Janowiak
+ and K. C. Mo and C. Ropelewski and J. Wang and A. Leetma
+ and A. Aaron and B. Baron C. Court and D. Joseph},
+ TITLE = {The {NCEP/NCAR} 40-year Reanalysis Project},
+ JOURNALTITLE = {Bulletin of the American Meteorological Society},
+ VOLUME = {77},
+ NUMBER = {3},
+ PAGES = {437--471},
+ DATE = {1996-01-01},
+ DOI = {fg6rf9}
+}
+
+% (APA 10.1 Example 5)
+% Use AUTHOR for mixed people/group author lists as special formatting is only
+% specified for group author lists (APA 9.8)
+ at ARTICLE{10.1:5,
+ AUTHOR = {De Vries, R. and M. Nieuwenhuijze and S. E. Buitendijk
+ and {the members of Midwifery Science Work Group}},
+ TITLE = {What Does It Take To Have a Strong and Independent Profession of Midwifery? {L}essons From the {N}etherlands},
+ JOURNALTITLE = {Midwifery},
+ VOLUME = {29},
+ NUMBER = {10},
+ PAGES = {1122--1128},
+ DATE = {2013},
+ DOI = {10.1016/j.midw.2013.07.007}
+}
+
+% (APA 10.1 Example 6)
+ at ARTICLE{10.1:6,
+ AUTHOR = {D. Burin and K. Kilteni and M. Rabuffetti and M. Slater and L. Pia},
+ TITLE = {Body Ownership Increases the Interference Between
+ Observed and Executed Movements},
+ JOURNALTITLE = {{PLOS ONE}},
+ VOLUME = {14},
+ NUMBER = {1},
+ DATE = {2019},
+ EPRINTTYPE = {article},
+ EPRINT = {e0209899},
+ DOI = {10.1371/journal.pone.0209899}
+}
+
+% (APA 10.1 Example 7)
+ at ARTICLE{10.1:7,
+ AUTHOR = {S. M. Huestegge and T. Raettig and L. Huestegge},
+ TITLE = {Are Face-incongruent Voices Harder to Process? {E}ffects
+ of Face-Voice Gender Incongruity on Basic Cognitive
+ Information Processing},
+ JOURNALTITLE = {Experimental Psychology},
NOTE = {Advance online publication},
- DOI = {10.1057/palgrave.kmrp.8500141}
+ DATE = {2019},
+ DOI = {10.1027/1618-3169/a000440}
}
-% (APA 7.01 Example 6)
- at ARTICLE{7.01:6,
- AUTHOR = {R. Briscoe},
+% (APA 10.1 Example 8)
+ at ARTICLE{10.1:8,
PUBSTATE = {inpress},
- TITLE = {Egocentric Spatial Representation in Action and Perception},
- JOURNALTITLE = {Philosophy and Phenomenological Research},
- URL = {http://cogprints.org/5780/1/ECSRAP.F07.pdf}
+ AUTHOR = {T. Pachur and B. Scheibehenne},
+ TITLE = {Unpacking Buyer-Seller Differences in Valuation from Experience},
+ SUBTITLE = {A Cognitive Modeling Approach},
+ JOURNALTITLE = {Psychonomic Bulletin \& Review}
}
-% (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 10.1 Example 9)
+ at ARTICLE{10.1:9,
+ AUTHOR = {V. Chaves-Morillo and Gómez Calero, C. and J. J.
+ Fernández-Muñoz and A. Toledano-Muñoz and J.
+ Fernández-Heute and N. Martinez-Monge and D.
+ Palacios-Ceña and C. Peñacoba-Puente},
+ ORIGTITLE = {La anosmia neurosensorial: Relación entre subtipo, tiempo de reconocimiento y edad},
+ TITLE = {Sensorineural Anosmia},
+ SUBTITLE = {Relationship Between Subtype, Recognition Time, and Age},
+ JOURNALTITLE = {Clínica y Salud},
+ VOLUME = {28},
+ NUMBER = {3},
+ PAGES = {155--161},
+ DATE = {2018},
+ DOI = {10.1016/j.clysa.2017.04.002}
}
-% (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 10.1 Example 10)
+ at ARTICLE{10.1:10,
+ AUTHOR = {J. Piaget},
+ TRANSLATOR = {J. Bliss and H. Furth},
+ TITLE = {Intellectual Evolution from Adolescence to Adulthood},
+ JOURNALTITLE = {Human Development},
+ VOLUME = {15},
+ NUMBER = {1},
+ PAGES = {1--12},
+ DATE = {1972},
+ ORIGDATE = {1970},
+ DOI = {10.1159/00027/1225}
}
-% (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 10.1 Example 11)
+ at ARTICLE{10.1:11,
+ AUTHOR = {M. F. Shore},
+ TITLE = {Marking Time in the Land Of Plenty},
+ SUBTITLE = {Reflections on Mental Health in the {U}nited {S}tates},
+ JOURNALTITLE = {American Journal of Orthopsychiatry},
+ VOLUME = {84},
+ NUMBER = {6},
+ PAGES = {611--618},
+ DATE = {2014},
+ DOI = {10.1037/h0100165},
+ RELATED = {10.1:11r},
+ RELATEDTYPE = {reprintfrom}
}
-% (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},
+ at ARTICLE{10.1:11r,
+ TITLE = {Marking Time in the Land Of Plenty},
+ SUBTITLE = {Reflections on Mental Health in the {U}nited {S}tates},
+ JOURNALTITLE = {American Journal of Orthopsychiatry},
+ VOLUME = {51},
+ NUMBER = {3},
+ PAGES = {391--402},
+ DATE = {1981},
+ DOI = {10.1111/j.1939-0025.1981.tb01388.x}
}
-% (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 10.1 Example 12)
+ at PERIODICAL{10.1:12a,
+ EDITOR = {S. O. Lilienfeld},
+ TITLE = {Heterodox Issues in Psychology},
+ ISSUETITLE = {Special section},
+ JOURNALTITLE = {Archives of Scientific Psychology},
+ VOLUME = {6},
+ NUMBER = {1},
+ PAGES = {51--104},
+ DATE = {2018}
}
-% (APA 7.01 Example 12)
- at PERIODICAL{7.01:12a,
- EDITOR = {C. Haney and R. L. Wiener},
- TITLE = {Capital Punishment in the {United States}},
+ at PERIODICAL{10.1:12b,
+ EDITOR = {S. H. McDaniel and E. Salas and A. E. Kazak},
+ TITLE = {The Science of Teamwork},
ISSUETITLE = {Special issue},
- JOURNALTITLE = {Psychology, Public Policy, and Law},
- VOLUME = {10},
+ JOURNALTITLE = {American Psychologist},
+ VOLUME = {73},
NUMBER = {4},
- DATE = {2004}
+ DATE = {2018}
}
- 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 10.1 Example 13)
+ at ARTICLE{10.1:13,
+ AUTHOR = {J. Mehrholz and M. Pohl and T. Platz and J. Kugler and B. Elsner},
+ TITLE = {Electromechanical and Robot-Assisted Arm Training for
+ Improving Activities of Daily Living, Arm Function, and
+ Arm Muscle Strength After Stroke},
+ JOURNALTITLE = {Cochrane Database of Systematic Reviews},
+ DATE = {2018},
+ DOI = {10.1002/14651858.CD006876.pub5}
}
-% 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 10.1 Example 14)
+ at ARTICLE{10.1:14,
+ AUTHOR = {M. C. Morey},
+ TITLE = {Physical Activity and Exercise in Older Adults},
+ JOURNALTITLE = {{UpToDate}},
+ DATE = {2019},
+ URLDATE = {2019-07-22},
+ URL = {https://www.uptodate.com/contents/physical-activity-and-exercise-in-older-adults}
}
-% (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}
+% (APA 10.1 Example 15)
+% Note use of KEYWORDS to indicate non-academic magazine so that dates
+% are formatted correctly
+ at ARTICLE{10.1:15a,
+ AUTHOR = {S. Bergeson},
+ TITLE = {Really Cool Neutral Plasmas},
+ JOURNALTITLE = {Science},
+ VOLUME = {363},
+ NUMBER = {6422},
+ PAGES = {33--34},
+ KEYWORDS = {nonacademic},
+ DATE = {2019-01-04},
+ DOI = {10.1126/science.aau7988}
}
-% 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}
+ at ARTICLE{10.1:15b,
+ AUTHOR = {M. Bustillos},
+ TITLE = {On Video Games and Storytelling},
+ SUBTITLE = {An Interview with {T}om {B}issell},
+ JOURNALTITLE = {The New Yorker},
+ KEYWORDS = {nonacademic},
+ DATE = {2013-03-19},
+ URL = {https://www.newyorker.com/books/page-turner/on-video-games-and-storytelling-an-interview-with-tom-bissell}
}
-% 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}
+ at ARTICLE{10.1:15c,
+ AUTHOR = {K. Wier},
+ TITLE = {Forgiveness Can Improve Mental and Physical Health},
+ JOURNALTITLE = {Monitor on Psychology},
+ VOLUME = {48},
+ NUMBER = {1},
+ KEYWORDS = {nonacademic},
+ PAGES = {30},
+ DATE = {2017-01}
}
-% (APA 7.01 Example 14)
- at ARTICLE{7.01:14,
- TITLE = {Editorial: ``{W}hat a Disaster'' and Why Does This Question Matter?},
+% (APA 10.1 Example 16)
+ at ARTICLE{10.1:16a,
+ AUTHOR = {B. Guarino},
+ TITLE = {How Will Humanity React to Alien Life? {P}sychologists Have Some Predictions},
+ JOURNALTITLE = {The Washington Post},
+ KEYWORDS = {nonacademic},
+ DATE = {2017-12-04},
+ URL = {https://www.washingtonpost.com/news/speaking-of-science/wp/2017/12/04/how-will-humanity-react-to-alien-life-psychologists-have-some-predictions}
+}
+
+ at ARTICLE{10.1:16b,
+ AUTHOR = {A. Hess},
+ TITLE = {Cats Who Take Direction},
+ JOURNALTITLE = {The New York Times},
+ KEYWORDS = {nonacademic},
+ DATE = {2019-01-03},
+ PAGES = {C1}
+}
+
+% (APA 10.1 Example 17)
+% Can't be ONLINE as the format isn't the same as all other ONLINE examples
+ at MISC{10.1:17,
+ AUTHOR = {M. Klymkowsky},
+ TITLE = {Can We Talk Scientifically About Free Will?},
+ LOCATION = {Sci-Ed},
+ DATE = {2018-09-15},
+ URL = {https://blogs.plos.org/scied/2018/09/15/can-we-talk-scientifically-about-free-will/},
+}
+
+% (APA 10.1 Example 18)
+% This uses the RELATED method which is sensitive to language for the
+% "Comment on the article" string. A simpler but less general way of getting the same
+% results would be:
+%@ARTICLE{10.1:18,
+% AUTHOR = {{KS in NJ}},
+% TITLE = {From this article, it sounds like men are figuring
+% something out that women have known forever. {I} know of many},
+% TITLEADDON = {Comment on the article ``How workout buddies can help stave off loneliness''},
+% JOURNALTITLE = {The Washington Post},
+% KEYWORDS = {nonacademic},
+% DATE = {2019-01-15},
+% URL = {https://wapo.st/2HDToGJ}
+%}
+
+ at ARTICLE{10.1:18,
+ AUTHOR = {{KS in NJ}},
+ TITLE = {From this article, it sounds like men are figuring
+ something out that women have known forever. {I} know of many},
+ RELATED = {10.1:18r},
+ RELATEDTYPE = {commentonarticle},
+ JOURNALTITLE = {The Washington Post},
+ KEYWORDS = {nonacademic},
+ DATE = {2019-01-15},
+ URL = {https://wapo.st/2HDToGJ}
+}
+
+ at ARTICLE{10.1:18r,
+ AUTHOR = {A. Author},
+ TITLE = {How Workout Buddies can Help Stave off Loneliness},
+ JOURNALTITLE = {The Washington Post},
+ DATE = {2019-01-15}
+}
+
+% (APA 10.1 Example 19)
+ at ARTICLE{10.1:19,
+ AUTHOR = {N. G. Cuellar},
+ TITLE = {Study Abroad Programs},
TITLEADDON = {Editorial},
- JOURNALTITLE = {Journal of Contingencies and Crisis Management},
- VOLUME = {14},
- PAGES = {1--2},
- DATE = {2006}
+ JOURNALTITLE = {Journal of Transcultural Nursing},
+ VOLUME = {27},
+ NUMBER = {3},
+ PAGES = {209},
+ DATE = {2016},
+ DOI = {10.1177/1043659616638722}
}
-% (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 10.2 Example 20)
+ at BOOK{10.2:20,
+ AUTHOR = {L. S. Brown},
+ TITLE = {Feminist Therapy},
+ EDITION = {2},
+ PUBLISHER = {American Psychological Association},
+ DATE = {2018},
+ DOI = {10.1037/0000092-000}
}
-% (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}
+% (APA 10.2 Example 21)
+ at BOOK{10.2:21,
+ AUTHOR = {R. Burgess},
+ TITLE = {Rethinking Global Health},
+ SUBTITLE = {Frameworks of Power},
+ PUBLISHER = {Routledge},
+ DATE = {2019}
}
-% 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 10.2 Example 22)
+% The ENTRYSUBTYPE is inserted as a literal string because it is not a known
+% localisation string - this is automatically detected.
+ at BOOK{10.2:22a,
+ ENTRYSUBTYPE = {Audiobook},
+ AUTHOR = {S. Cain},
+ NARRATOR = {K. Mazur},
+ TITLE = {Quiet},
+ SUBTITLE = {The Power of Introverts in a World that Can't Stop Talking},
+ PUBLISHER = {Random House Audio},
+ DATE = {2012},
+ URL = {http://bit.ly/2GOBpbl}
}
-% (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)}
+ at BOOK{10.2:22b,
+ AUTHOR = {B. Christian and T. Griffiths},
+ TITLE = {Algorithms to Live By},
+ SUBTITLE = {The Computer Science of Human Decisions},
+ PUBLISHER = {{Henry Holt and Co.}},
+ DATE = {2016},
+ URL = {http://a.co/7qGBZAk}
}
-% (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 10.2 Example 23)
+ at BOOK{10.2:23,
+ AUTHOR = {D. H. Meadows},
+ EDITOR = {D. Wright},
+ TITLE = {Thinking in Systems},
+ SUBTITLE = {A Primer},
+ PUBLISHER = {Chelsea Green Publishing},
+ DATE = {2008}
}
-% (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}
+% (APA 10.2 Example 24)
+ at BOOK{10.2:24,
+ EDITOR = {Schmid, Henry-James},
+ TITLE = {Entrenchment and the Psychology of Language Learning},
+ SUBTITLE = {How we Reorganize and Adapt Linguistic Knowledge},
+ PUBLISHER = {American Psychological Association and De Gruyter Mouton},
+ DATE = {2017},
+ DOI = {10.1037/15969-000}
}
- 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 10.2 Example 25)
+ at BOOK{10.2:25,
+ EDITOR = {Hacker Hughes, J.},
+ TITLE = {Military Veteran Psychological Health and Social Care},
+ SUBTITLE = {Contemporary Approaches},
+ PUBLISHER = {Routledge},
+ DATE = {2017}
}
-% (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 10.2 Example 26)
+ at BOOK{10.2:26,
+ EDITOR = {K. F. Pridham and R. Limbo and M. Schroeder},
+ TITLE = {Guided Participation in Pediatric Nursing Practice},
+ SUBTITLE = {Relationship-based Teaching and Learning with Parents, Children and Adolescents},
+ PUBLISHER = {Springer Publishing Company},
+ DATE = {2018},
+ URL = {http://a.co/0IAiVgt}
}
-% (APA 7.02 Example 21)
-% NOTE is automatically generated from ORIGDATE
- at INBOOK{7.02:21,
+% (APA 10.2 Example 27)
+ at BOOK{10.2:27a,
+ AUTHOR = {N. Amano and H. Kondo},
+ TITLE = {Lexical Characteristics of {J}apanese Language},
+ ORIGTITLE = {Nihongo no goi tokusei},
+ PUBLISHER = {Sansei-do},
+ VOLUME = {7},
+ DATE = {2000}
+}
+
+ at BOOK{10.2:27b,
+ AUTHOR = {J. Piaget and B. Inhelder},
+ TITLE = {The Psychology of the Child},
+ ORIGTITLE = {La psychologie de l'enfant},
+ PUBLISHER = {Quadrige},
+ DATE = {1966}
+}
+
+% (APA 10.2 Example 28)
+ at BOOK{10.2:28,
+ AUTHOR = {J. Piaget and B. Inhelder},
+ TRANSLATOR = {H. Weaver},
+ EDITION = {2},
+ TITLE = {The Psychology of the Child},
+ PUBLISHER = {Basic Books},
+ DATE = {1969},
+ ORIGDATE = {1966}
+}
+
+% (APA 10.2 Example 29)
+ at BOOK{10.2:29a,
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},
+ TITLE = {The Interpretation of Dreams},
+ SUBTITLE = {The Complete and Definitive Text},
+ PUBLISHER = {Basic Books},
+ DATE = {2010},
+ ORIGDATE = {1900}
}
-% (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/}
+ at BOOK{10.2:29b,
+ AUTHOR = {J. K. Rowling},
+ NARRATOR = {J. Dale},
+ TITLE = {Harry {P}otter and the Sorceror's Stone},
+ TITLEADDON = {Audiobook},
+ PUBLISHER = {Pottermore Publishing},
+ DATE = {2015},
+ ORIGDATE = {1997},
+ URL = {http://bit.ly/2TcHchx}
}
-% (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 10.2 Example 30)
+ at BOOK{10.2:30a,
+ AUTHOR = {S. T. Fiske and D. T. Gilbert and G. Lindzey},
+ TITLE = {Handbook of Social Psychology},
+ PUBLISHER = {John Wiley \& Sons},
+ EDITION = {5},
+ VOLUME = {1},
+ DATE = {2010},
+ DOI = {10.1002/9780470561119}
}
-% (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}
+ at BOOK{10.2:30b,
+ EDITOR = {C. B. Travis and J. W. White},
+ TITLE = {{APA} Handbook of the Psychology of Women},
+ SUBTITLE = {Vol. 1. History, theory, and Battlegrounds},
+ PUBLISHER = {American Psychological Association},
+ DATE = {2018},
+ DOI = {10.1037/0000059-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},
+% (APA 10.2 Example 31)
+ at BOOK{10.2:31,
+ AUTHOR = {S. Madigan},
+ TITLE = {Narrative Therapy},
+ PUBLISHER = {American Psychological Association},
+ SERIES = {Theories of Psychotherapy Series},
+ EDITION = {2},
+ DATE = {2019},
+ DOI = {10.1037/00000131-000}
+}
+
+% (APA 10.2 Example 32)
+% Note the use of GROUPAUTHOR instead of AUTHOR here
+ at MANUAL{10.2:32a,
+ GROUPAUTHOR = {{American Psychiatric Association}},
+ TITLE = {Diagnostic and Statistical Manual of Mental Disorders},
+ SHORTHAND = {DSM-5},
+ EDITION = {5},
+ PUBLISHER = {American Psychiatric Association},
+ DATE = {2013},
+ DOI = {10.1176/appi.books.9780890425596}
+}
+
+ at MANUAL{10.2:32b,
+ GROUPAUTHOR = {{World Health Organization}},
+ TITLE = {International Statistical Classification of Diseases and Related Health Problems},
+ SHORTHAND = {ICD-11},
+ EDITION = {11},
+ PUBLISHER = {{World Health Organization}},
+ DATE = {2019},
+ URL = {https://icd.who.int/}
+}
+
+% (APA 10.2 Example 33)
+ at BOOK{10.2:33a,
+ GROUPAUTHOR = {{American Psychological Association}},
+ TITLE = {{APA} Dictionary of Psychology},
+ URL = {https://dictionary.apa.org/},
+ URLDATE = {2019-06-14}
+}
+
+ at BOOK{10.2:33b,
+ GROUPAUTHOR = {{Merriam-Webster}},
+ TITLE = {{M}erriam-{W}ebster.com Dictionary},
+ URL = {https://www.merriam-webster.com/},
+ URLDATE = {2019-05-05}
+}
+
+ at BOOK{10.2:33c,
+ EDITOR = {E. N. Zalta},
+ TITLE = {The {S}tanford Encyclopedia of Philosophy},
+ EDITION = {Summer 2019 ed.},
+ URL = {https://plato.stanford.edu/archives/sum2019/},
+ PUBLISHER = {Stanford University},
+ DATE = {2019}
+}
+
+% (APA 10.2 Example 34)
+ at BOOK{10.2:34,
+ EDITOR = {M. Gold},
+ TITLE = {The Complete Social Scientist},
+ SUBTITLE = {A {K}urt {L}ewin Reader},
+ PUBLISHER = {American Psychological Association},
+ DATE = {1999},
+ DOI = {10.1037/10319-000}
+}
+
+% (APA 10.2 Example 35)
+% No AUTHOR or GROUPAUTHOR - title goes in author position
+ at BOOK{10.2:35a,
+ TITLE = {{K}ing {J}ames {B}ible},
+ DATE = {2017},
+ ORIGDATE = {1769},
+ URLDESCRIPTION = {King James Bible Online},
+ URL = {https://www.kingjamesbibleonline.org/}
+}
+
+ at BOOK{10.2:35b,
+ TITLE = {The {Q}ur'an},
+ TRANSLATOR = {Abdel Haleem, M. A. S.},
+ PUBLISHER = {Oxford University Press},
+ DATE = {2004}
+}
+
+ at BOOK{10.2:35c,
+ TITLE = {{T}he {T}orah},
+ SUBTITLE = {The Five Books of {M}oses},
+ EDITION = {3},
+ PUBLISHER = {The Jewish Publication Society},
+ DATE = {2015},
+ ORIGDATE = {1962}
+}
+
+% (APA 10.2 Example 36)
+% Note the special format of the ORIGDATE field and the resulting output.
+% Biber supports considerable ISO8601 date formats like this with full
+% localisation support for the output. See the BibLaTeX manual.
+ at BOOK{10.2:36,
+ AUTHOR = {Aristotle},
+ TRANSLATOR = {S. H. Butcher},
+ TITLE = {Poetics},
+ DATE = {1994},
+ ORIGDATE = {-0349~},
+ PUBLISHER = {The Internet Classics Archive},
+ URL = {http://classics.mit.edu/Aristotle/poetics.html}
+}
+
+% (APA 10.2 Example 37)
+ at BOOK{10.2:37,
+ AUTHOR = {W. Shakespeare},
+ EDITOR = {B. A. Mowat and P. Werstine},
+ TITLE = {Much Ado About Nothing},
+ PUBLISHER = {Washington Square Press},
+ DATE = {1995},
+ ORIGDATE = {1623}
+}
+
+% (APA 10.3 Example 38)
+ at INBOOK{10.3:38,
+ AUTHOR = {K. F. Balsam and C. R. Martell and K. P. Jones and S. A. Safren},
+ EDITOR = {G. Y. Iwamasa and P. A. Hays},
+ TITLE = {Affirmative Cognitive Behaviour Therapy with Sexual and
+ Gender Minority People},
+ BOOKTITLE = {Culturally Responsive Cognitive Behaviour Therapy},
+ BOOKSUBTITLE = {Practice and Supervision},
+ EDITION = {2},
+ PAGES = {287--314},
+ PUBLISHER = {American Psychological Association},
+ DATE = {2019},
+ DOI = {10.1037/0000119-012}
+}
+
+% (APA 10.3 Example 39)
+ at INBOOK{10.3:39,
+ AUTHOR = {R. Weinstock and G. B. Leong and J. A. Silva},
+ EDITOR = {R. Rosner},
+ TITLE = {Defining Forensic Psychiatry},
+ SUBTITLE = {Roles and Responsibilities},
+ BOOKTITLE = {Principles and Practise of Forensic Psychiatry},
+ EDITION = {2},
+ PAGES = {7--13},
+ PUBLISHER = {CRC Press},
+ DATE = {2003}
+}
+
+% (APA 10.3 Example 40)
+ at INBOOK{10.3:40,
+ AUTHOR = {N. Tafoya and Del Vecchio, A.},
+ EDITOR = {M. McGoldrick and J. Giordano and N. Garcia-Preto},
+ TITLE = {Back to the Future},
+ SUBTITLE = {An Examination of the {N}ative {A}merican {H}olocaust experience},
+ BOOKTITLE = {Ethnicity and Family Therapy},
+ EDITION = {3},
+ PAGES = {55--63},
+ PUBLISHER = {Guilford Press},
+ DATE = {2005},
+ URL = {http://a.co/36xRhBT}
+}
+
+% (APA 10.3 Example 41)
+ at INBOOK{10.3:41,
+ AUTHOR = {Carcavilla González, N.},
+ EDITOR = {Garcia Meilán, J. J.},
+ TITLE = {Auditory Sensory Therapy},
+ SUBTITLE = {Brain Activation Through Music},
+ ORIGTITLE = {Terapia senorial auditiva: {A}ctivation cerebral por
+ medio de la música},
+ BOOKTITLE = {Guía práctica de terapias estimulativas en el {A}lzhéimer},
+ PAGES = {67--86},
+ PUBLISHER = {Editorial Síntesis},
+ DATE = {2015},
+ URL = {http://www.sintesis.com/guias-profesionales-203/guia-practica-de-terapias-estimulativas-en-el-alzheimer-libro-1943.html}
+}
+
+% (APA 10.3 Example 42)
+ at INBOOK{10.3:42,
+ AUTHOR = {M. Heidegger},
+ EDITOR = {D. F. Krell},
+ TRANSLATOR = {J. Sallis},
+ TITLE = {On the Essence of Truth},
+ BOOKTITLE = {Basic Writings},
+ PAGES = {111--138},
+ PUBLISHER = {Harper Perennial Modern Thought},
DATE = {2008},
+ ORIGDATE = {1961}
}
-% (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},
+% (APA 10.3 Example 43)
+% Note that this done with the related entries functionality supported by Biber
+ at INBOOK{10.3:43,
+ AUTHOR = {C. Sacchett and G. W. Humphreys},
+ EDITOR = {D. A. Balota and E. J. Marsh},
+ TITLE = {Calling a Squirrel and Squirrel but a Canoe a Wigwam},
+ SUBTITLE = {A Category-specific Deficit for Artefactual Objects and
+ Body Parts},
+ BOOKTITLE = {Cognitive Psychology},
+ BOOKSUBTITLE = {Key Readings in Cognition},
+ PAGES = {100--108},
+ PUBLISHER = {Psychology Press},
+ DATE = {2004},
+ RELATED = {10.3:43r},
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}
+ at ARTICLE{10.3:43r,
+ AUTHOR = {C. Sacchett and G. W. Humphreys},
+ TITLE = {Calling a Squirrel and Squirrel but a Canoe a Wigwam},
+ SUBTITLE = {A Category-specific Deficit for Artefactual Objects and
+ Body Parts},
+ JOURNALTITLE = {Cognitive Neuropsychology},
+ VOLUME = {9},
+ NUMBER = {1},
+ PAGES = {73--86},
+ DATE = {1992},
+ DOI = {d4vb59}
}
-% (APA 7.02 Example 27)
- at BOOK{7.02:27,
- EDITOR = {G. R. VandenBos},
- TITLE = {{APA} Dictionary of Psychology},
- LOCATION = {Washington, DC},
+% (APA 10.3 Example 44)
+ at INBOOK{10.3:44,
+ AUTHOR = {U. Bronfenbrenner},
+ EDITOR = {U. Bronfenbrenner},
+ TITLE = {The Social Ecology of Human Development},
+ SUBTITLE = {A Retrospective Conclusion},
+ BOOKTITLE = {Making Human Beings Human},
+ BOOKSUBTITLE = {Bioecological Perspectives on Human Development},
+ PAGES = {72--40},
+ PUBLISHER = {SAGE Publications},
+ DATE = {2005},
+ RELATED = {10.3:44r},
+ RELATEDTYPE = {reprintfrom}
+}
+
+ at INCOLLECTION{10.3:44r,
+ EDITOR = {F. Richardson},
+ TITLE = {Brain and Intelligence},
+ SUBTITLE = {The Ecology of Child Development},
+ PUBLISHER = {National Education Press},
+ PAGES = {113--123},
+ DATE = {1973}
+}
+
+% (APA 10.3 Example 45)
+ at INBOOK{10.3:45,
+ AUTHOR = {S. Goldin-Meadow},
+ EDITOR = {L. S. Lisben and U. Mueller},
+ TITLE = {Gesture and Cognitive Development},
+ BOOKTITLE = {Handbook of Child Psychology and Developmental Science},
+ BOOKSUBTITLE = {Vol. 2. {C}ognitive Processes},
+ EDITION = {7},
+ PAGES = {339--380},
+ PUBLISHER = {John Wiley \& Sons},
+ DATE = {2015},
+ DOI = {10.1002/9781118963418.childpsy209}
+}
+
+% (APA 10.3 Example 46)
+ at INBOOK{10.3:46,
+ AUTHOR = {K. Lewin},
+ EDITOR = {M. Gold},
+ TITLE = {Group Decision and Social Change},
+ BOOKTITLE = {The Complete Social Scientist},
+ BOOKSUBTITLE = {A {K}urt {L}ewin Reader},
PUBLISHER = {American Psychological Association},
- DATE = {2007},
+ PAGES = {265--284},
+ DATE = 1999,
+ ORIGDATE = 1948,
+ DOI = {10.1037/10319-000}
}
-% (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 10.3 Example 47)
+ at INBOOK{10.3:47a,
+ GROUPAUTHOR = {{American Psychological Association}},
+ TITLE = {Positive Transference},
+ BOOKTITLE = {{APA} Dictionary of Psychology},
+ URL = {https://dictionary.apa.org/positive-transference},
+ URLDATE = {2019-08-31}
}
-% (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,
+ at INBOOK{10.3:47b,
+ GROUPAUTHOR = {{Merriam-Webster}},
+ TITLE = {Self-report},
+ BOOKTITLE = {{M}erriam-{W}ebster.com Dictionary},
+ URL = {https://www.merriam-webster.com/dictionary/self-report},
+ URLDATE = {2019-07-12}
+}
+
+% (APA 10.3 Example 48)
+ at INBOOK{10.3:48,
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/}
+ EDITION = {Summer 2019 ed.},
+ URL = {https://plato.stanford.edu/archives/sum2019/entries/behaviourism},
+ PUBLISHER = {Stanford University},
+ DATE = {2019}
}
-% (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 10.3 Example 49)
+ at INBOOK{10.3:49,
+ TITLE = {List of Oldest Companies},
+ BOOKTITLE = {Wikipedia},
+ URL = {https://en.wikipedia.org/w/index.php?title=List_of_oldest_companies&oldid=878158136},
+ DATE = {2019-01-13}
}
-% (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},
+% (APA 10.4 Example 50)
+ at REPORT{10.4:50a,
+ GROUPAUTHOR = {{Australian Government Productivity Commission} and
+ {New Zealand Productivity Commission}},
+ TITLE = {Strengthening Trans-{T}asman Economic Relations},
+ URL = {https://www.pc.gov.au/inquiries/completed/australia-new-zealand/report/trans-tasman.pdf},
+ DATE = {2012}
+}
+
+ at REPORT{10.4:50b,
+ GROUPAUTHOR = {{Canada Council for the Arts}},
+ TITLE = {What We Heard},
+ SUBTITLE = {Summary of Key Findings: 2013 {C}anada {C}ouncil's
+ {I}nter-{A}rts {O}ffice Consultation},
+ URL = {http://publications.gc.ca/collections/collection_2017/canadacouncil/K23-65-2013-eng.pdf},
+ DATE = {2013}
+}
+
+% NUMBER field has the (localised) "No." prefix as the field is basically
+% numerical. This detection is automatic.
+ at REPORT{10.4:50c,
+ GROUPAUTHOR = {{National Cancer Institute}},
+ TITLE = {Facing Forward},
+ SUBTITLE = {Life After Cancer Treatment},
+ NUMBER = {18-2424},
TYPE = {NIH Publication},
- NUMBER = {02-2650},
- DATE = {2003},
- URL = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf}
+ URL = {https://www.cancer.gov/publications/patient-education/life-after-cancer-treatment.pdf},
+ DATE = {2018}
}
-% (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 10.4 Example 51)
+ at REPORT{10.4:51a,
+ AUTHOR = {D. Fried and A. Polyakova},
+ TITLE = {Democratic Defense Against Disinformation},
+ PUBLISHER = {Atlantic Council},
+ URL = {https://www.atlantic.org/images/publications/Democratic_Defense_Against_Disinformation_FINAL.pdf},
+ DATE = {2018}
}
-% (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}
+ at REPORT{10.4:51b,
+ AUTHOR = {A. Segaert and A. Bauer},
+ TITLE = {The Extent and Nature of Veteran Homelessness in {C}anada},
+ PUBLISHER = {{Employment and Social Development Canada}},
+ URL = {https://www.canada.ca/en/employment-social-development/programs/communities/homelessness/publications-bulletins/veterans-report.html},
+ DATE = {2015}
}
-% (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 10.4 Example 52)
+ at REPORT{10.4:52,
+ AUTHOR = {D. L. Blackwell and J. W. Lucas and T. C. Clarke},
+ TITLE = {Summary Health Statistics for {U}.{S}. Adults},
+ SUBTITLE = {National {H}ealth {I}nterview {S}urvey, 2012},
+ PUBLISHER = {{Centers for Disease Control and Prevention}},
+ ISSUE = {Vital and Health Statistics Series},
+ NUMBER = {10, Issue 260},
+ URL = {https://www.atlantic.org/images/publications/Democratic_Defense_Against_Disinformation_FINAL.pdf},
+ DATE = {2014}
}
-% (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},
+% (APA 10.4 Example 53)
+ at REPORT{10.4:53,
+ GROUPAUTHOR = {{British Cardiovascular Society Working Group}},
+ TITLE = {British {C}ardiovascular {S}ociety {W}orking {G}roup report},
+ SUBTITLE = {Out-of-hours Cardiovascular Care: {M}anagement of
+ Cardiac Emergencies and Hospital In-patients},
+ PUBLISHER = {British Cardiovascular Society},
+ URL = {http://www.bcs.com/documents/BCSOOHWP_Final_Report_05092016.pdf},
+ DATE = {2016}
+}
+
+% (APA 10.4 Example 54)
+ at REPORT{10.4:54,
+ GROUPAUTHOR = {{U.S. Securities and Exchange Commission}},
+ TITLE = {Agency Financial Report},
+ SUBTITLE = {Fiscal Year 2017},
+ URL = {https://www.sec.gov/files/sec-2017-agency-financial-report.pdf},
+ DATE = {2017}
+}
+
+% (APA 10.4 Example 55)
+ at REPORT{10.4:55a,
+ GROUPAUTHOR = {{American Counseling Association}},
+ TITLE = {2014 {ACA} code of ethics},
+ URL = {https://www.counseling.org/knowledge-center},
+ DATE = {2014}
+}
+
+ at REPORT{10.4:55b,
+ GROUPAUTHOR = {{American Nurses Association}},
+ TITLE = {Code of Ethics for Nurses with Interpretive Statements},
+ URL = {https://www.nursingworld.org/coe-view-only},
+ DATE = {2015}
+}
+
+ at REPORT{10.4:55c,
+ GROUPAUTHOR = {{American Psychological Association}},
+ TITLE = {Ethical Principles of Psychologists and Code of Conduct},
+ TYPE = {2002, amended effective June 1, 2010, and January 1, 2017},
+ URL = {https://www.apa.org/ethics/code/index.aspx},
+ DATE = {2017}
+}
+
+% (APA 10.4 Example 56)
+% Annotations for author roles must be called "role". This is an example of
+% a literal annotation as there is no localised string for this role since it
+% is quite rare. You could create a localisation string for this with
+% \NewBibliographyString and \DeclareBibliographyStrings and remove the
+% quotes. See the Data Annotation documentation in the biblatex manual
+ at REPORT{10.4:56,
+ AUTHOR = {C. B. Blair},
+ AUTHOR+an:role = {1="Principal Investigator"},
+ TITLE = {Stress, Self-Regulation and Psychopathology in Middle Childhood},
+ TITLEADDON = {Grant},
+ TYPE = {Project No. 5R01HD081252-04},
+ INSTITUTION = {Eunice Kennedy Shriver National Institute of Child
+ Health \& Human Development},
+ URL = {https://projectreporter.nih.gov/project_info_details.cfm?aid=9473071&icde=40092311},
+ DATE = {2015/2020}
+}
+
+% (APA 10.4 Example 57)
+ at REPORT{10.4:57,
+ AUTHOR = {J. Lichtenstein},
+ TITLE = {Profile of Veteran Business Owners},
+ SUBTITLE = {More Young Veterans Appear to be Starting Businesses},
TYPE = {Issue Brief},
- NUMBER = {123},
- DATE = {1992-02},
- LOCATION = {Washington, DC},
- PUBLISHER = {Author}
+ NUMBER = {1},
+ PUBLISHER = {U.S. Small Business Administration, Office of Advocacy},
+ URL = {https://www.sba.org/sites/default/files/Issue%20Brief%201,%20Veteran%20Business%20Owners.pdf},
+ DATE = {2013}
}
-% (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 10.4 Example 58)
+ at REPORT{10.4:58,
+ AUTHOR = {M. Harwell},
+ TITLE = {Don't Expect Too Much},
+ SUBTITLE = {The Limited Usefulness of Common {SES} Measures and a
+ Prescription for Change},
+ TITLEADDON = {Policy Brief},
+ PUBLISHER = {National Education Policy Center},
+ URL = {https://nepc.colorado.edu/publication/SES},
+ DATE = {2018}
}
-% (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 10.4 Example 59)
+% PUBLISHER should be ignored as it is the same as the GROUPAUTHOR
+% This is enforced by a Biber style source map
+ at REPORT{10.4:59,
+ GROUPAUTHOR = {{U.S. Food and Drug Administration}},
+ TITLE = {{FDA} Authorizes First Interoperable Insulin Pup
+ Intended to Allow Patients to Customize Treatment
+ Through their Individual Diabetes Management Devices},
+ TITLEADDON = {Press release},
+ PUBLISHER = {{U.S. Food and Drug Administration}},
+ URL = {https://www.fds.gov/NewsEvents/Newsroom/PressAnnouncements/ucm631412.htm},
+ DATE = {2019-02-14}
}
-% (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 10.5 Example 60)
+ at PROCEEDINGS{10.5:60,
+ AUTHOR = {A. Fistek and E. Jester and K. Sonnenberg},
+ TITLE = {Everybody's Got a Little Music in Them},
+ SUBTITLE = {Using Music Therapy to Connect, Engage, and Motivate},
+ TITLEADDON = {Conference session},
+ EVENTTITLE = {Autism Society National Conference},
+ LOCATION = {Milwaukee, WI, United States},
+ URL = {https://asa.confex.com/asa/2017/webprogramarchives/Session9517.html},
+ DATE = {2017-07-12/2017-07-15}
}
-% (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 10.5 Example 61)
+ at PROCEEDINGS{10.5:61,
+ AUTHOR = {S. Maddox and J. Hurling and E. Stewart and A. Edwards},
+ TITLE = {If Mama Ain't Happy, Nobody's Happy},
+ SUBTITLE = {The Effect of Parental Depression on Mood Dysregulation
+ in Children},
+ TITLEADDON = {Paper presentation},
+ EVENTTITLE = {Southeastern Psychological Association 62nd Annual Meeting},
+ LOCATION = {New Orleans, LA, United States},
+ DATE = {2016-03-30/2016-04-02}
}
-% (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 10.5 Example 62)
+ at PROCEEDINGS{10.5:62,
+ AUTHOR = {J. Pearson},
+ TITLE = {Fat Talk and its Effects on State-Based Body Image in Women},
+ TITLEADDON = {Poster presentation},
+ EVENTTITLE = {Australian Psychological Society Congress},
+ LOCATION = {Sydney, NSW, Australia},
+ URL = {http://bit.ly/2XGSThP},
+ DATE = {2018-09-27/2018-09-30}
}
-% (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 10.5 Example 63)
+% A special case here of roles for uncommon, secondary name lists. Use the
+% EDITORA--EDITORC fields with an associated EDITORTYPE localisation string
+ at INPROCEEDINGS{10.5:63,
+ AUTHOR = {De Boer, D. and LaFavour, T.},
+ EDITORA = {A. M. Schmidt and A. Kryvanos},
+ EDITORATYPE = {chair},
+ TITLE = {The Art and Significance of Successfully Identifying
+ Resilient Individuals},
+ SUBTITLE = {A Person-Focused Approach},
+ MAINTITLE = {Perspectives on Resilience: {C}onceptualization,
+ Measurement, and Enhancement},
+ MAINTITLEADDON = {Symposium},
+ EVENTTITLE = {Western Psychological Association 98th Annual Convention},
+ LOCATION = {Portland, OR, United States},
+ DATE = {2018-04-26/2018-04-29}
}
-% (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 10.6 Example 64)
+ at THESIS{10.6:64,
+ AUTHOR = {L. Harris},
+ TITLE = {Instructional Leadership Perceptions and Practices of
+ Elementary School Leaders},
+ TITLEADDON = {Unpublished Doctoral Dissertation},
+ INSTITUTION = {University of Virginia},
+ DATE = {2014}
}
-% (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 10.6 Example 65)
+ at THESIS{10.6:65,
+ AUTHOR = {M. M. Hollander},
+ TITLE = {Resistance to Authority},
+ SUBTITLE = {Methodological Innovations and New Lessons from the
+ {M}ilgram Experiment},
+ TITLEADDON = {Doctoral Dissertation, {U}niversity of {W}isconsin-{M}adison},
+ PUBLISHER = {{ProQuest Dissertations and Theses Global}},
+ TYPE = {Publication},
+ NUMBER = {10289373},
+ DATE = {2017}
}
-% (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 10.6 Example 66)
+ at THESIS{10.6:66,
+ AUTHOR = {V. H. Hutcheson},
+ TITLE = {Dealing with Dual Differences},
+ SUBTITLE = {Social Coping Strategies of Gifted and Lesbian, Gay,
+ Bisexual, Transgender, and Queer Adolescents},
+ TITLEADDON = {Master's Thesis, {T}he {C}ollege of {W}illiam \& {M}ary},
+ PUBLISHER = {William \& Mary Digital Archive},
+ URL = {https://digitalarchive.wm.edu/bitstream/handle/10288/16594/HutchesonVirginia2012.pdf},
+ DATE = {2012}
}
-% (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},
+% (APA 10.7 Example 67)
+ at ARTICLE{10.7:67,
+ AUTHOR = {L. A. Mirabito and N. C. Heck},
+ TITLE = {Bringing {LGBTQ} Youth Theater into the Spotlight},
+ RELATED = {10.7:67r},
+ RELATEDTYPE = {reviewoffilm},
+ JOURNALTITLE = {Psychology of Sexual Orientation and Gender Diversity},
+ VOLUME = {3},
+ NUMBER = {4},
+ PAGES = {499--500},
+ DATE = {2016},
+ DOI = {10.1037/sgd0000205}
}
- at BOOK{brdu,
- AUTHOR = {John Seely Brown and Paul Duguid},
- TITLE = {The Social Life of Information},
- DATE = {2000},
- PUBLISHER = {Harvard Business School Press}
+% Data annotation for the first name in the |AUTHOR| list. "director" is a
+% localisation string
+ at VIDEO{10.7:67r,
+ ENTRYSUBTYPE = {film},
+ AUTHOR = {E. Brodsky},
+ AUTHOR+an:role = {1=director},
+ TITLE = {The Year We Thought About Love},
+ DATE = {2016}
}
-% (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}
+% (APA 10.7 Example 68)
+ at ARTICLE{10.7:68,
+ AUTHOR = {F. Santos},
+ TITLE = {Reframing Refugee Children's Stories},
+ RELATED = {10.7:68r},
+ RELATEDTYPE = {reviewofbook},
+ JOURNALTITLE = {The New York Times},
+ KEYWORDS = {nonacademic},
+ DATE = {2019-01-11},
+ URL = {https://nyt.ms/2Hlgjk3}
}
- at VIDEO{apavid,
- PRODUCER = {{the American Psychological Association}},
- TITLE = {Brief Therapy With Adolescents},
- DATE = {2007}
+ at BOOK{10.7:68r,
+ AUTHOR = {M. Yousafzai},
+ TITLE = {We are Displaced},
+ SUBTITLE = {My Journey and Stories From Refugee Girls Around the World},
+ DATE = {2016}
}
-% (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},
+% (APA 10.7 Example 69)
+% APA gives little thought to automated formatting in general, likely
+% because they are not aware of any automated styles and expect people to
+% just manually type bibliographies ... have to manually "reverse
+% emphasise" part of the title
+ at ONLINE{10.7:69,
+ AUTHOR = {D. Perkins},
+ TITLE = {\textup{The good place} ends its Remarkable Second
+ Season With Irrational Hope, Unexpected Gifts, and a Smile},
+ RELATED = {10.7:69r},
+ RELATEDTYPE = {reviewoftv},
+ ORGANIZATION = {A.V. Club},
+ DATE = {2018-02-01},
+ URL = {https://www.avclub.com/the-good-place-ends-its-remarkable-second-season-with-i-1822649316}
}
- at SOFTWARE{bioshock,
- AUTHOR = {{2K Games}},
- ENTRYSUBTYPE = {Computer Game},
- TITLE = {Bio{S}hock},
- DATE = {2007}
+% Two data annotations for the first name in the |AUTHOR| list. These are automatically
+% combined
+ at VIDEO{10.7:69r,
+ ENTRYSUBTYPE = {tvepisode},
+ AUTHOR = {M. Schur},
+ AUTHOR+an:role = {1=writer,director},
+ TITLE = {Somewhere Else},
+ DATE = {2018}
}
-% (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}
+% (APA 10.8 Example 70)
+% HOWPUBLISHED recognises the following localisation strings:
+% manunpub - Unpublished Manuscript
+% maninprep - Manuscript in preparation
+% mansub - Manuscript submitted for publication
+ at UNPUBLISHED{10.8:70,
+ AUTHOR = {J. Yoo and Y. Miyamoto and A. Rigotti and C. Ryff},
+ TITLE = {Linking Positive Affect to Blood Lipids},
+ SUBTITLE = {A Cultural Perspective},
+ LOCATION = {Department of Psychology},
+ INSTITUTION = {University of Wisconsin-Madison},
+ HOWPUBLISHED = {manunpub},
+ DATE = {2016}
}
- 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 10.8 Example 71)
+ at UNPUBLISHED{10.8:71,
+ AUTHOR = {M. O'Shea},
+ TITLE = {Understanding Proactive Behaviour in the Workplace as a
+ Function of Gender},
+ LOCATION = {Department of Management},
+ INSTITUTION = {University of Kansas},
+ HOWPUBLISHED = {maninprep},
+ DATE = {2018}
}
-% (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 10.8 Example 72)
+ at UNPUBLISHED{10.8:72,
+ AUTHOR = {T. Lippincott and E. K. Poindexter},
+ TITLE = {Emotion Recognition as a Function of Facial Cues},
+ SUBTITLE = {Implications for Practice},
+ LOCATION = {Department of Psychology},
+ INSTITUTION = {University of Washington},
+ HOWPUBLISHED = {mansub},
+ DATE = {2019}
}
-% (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 10.8 Example 73)
+ at UNPUBLISHED{10.8:73a,
+ AUTHOR = {C. Leuker and L. Samartzidis and R. Hertwig and T. J. Pleskac},
+ TITLE = {When Money Talks},
+ SUBTITLE = {Judging Risk and Coercion in High-Paying Clinical Trials},
+ LOCATION = {PsyArXiv},
+ DOI = {10.17605/OSF.IO/9P7CB},
+ DATE = {2018}
}
-% (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},
+ at UNPUBLISHED{10.8:73b,
+ AUTHOR = {M. A. Stults-Kolehmainen and R. Sinha},
+ TITLE = {The Effects of Stress on Physical Activity and Exercise},
+ LOCATION = {PubMed Central},
+ URL = {https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3894304},
+ DATE = {2015}
}
-% (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 10.8 Example 74)
+ at UNPUBLISHED{10.8:74,
+ AUTHOR = {H-K Ho},
+ TITLE = {Teacher Preparation for Early Childhood Special
+ Education in {T}aiwan},
+ NUMBER = {ED545393},
+ LOCATION = {ERIC},
+ URL = {https://files.eric.ed.gov/fulltext/ED545393.pdf},
+ DATE = {2014}
}
-% (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 10.9 Example 75)
+ at DATASET{10.9:75a,
+ ENTRYSUBTYPE = {Data Set},
+ AUTHOR = {A. D'Souza and M. Wiseheart},
+ TITLE = {Cognitive Effects of Music and Dance Training in Children},
+ NUMBER = {ICPSR 37080},
+ VERSION = {V1},
+ PUBLISHER = {ICPSR},
+ DOI = {10.3886/ICPSR37080.1},
+ DATE = {2018}
}
-% (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/}
+ at DATASET{10.9:75b,
+ ENTRYSUBTYPE = {Data set and code book},
+ GROUPAUTHOR = {{National Center for Education Statistics}},
+ TITLE = {Fast Response Survey System ({FRSS})},
+ SUBTITLE = {Teacher's Use of Educational Technology in {U}.{S}.
+ Public Schools, 2009},
+ NUMBER = {ICPSR 35531},
+ VERSION = {V3},
+ PUBLISHER = {{National Archive of Data on Arts and Culture}},
+ DOI = {10.3886/ICPSR335531.v3},
+ DATE = {2016}
}
-% (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/}
+ at DATASET{10.9:75c,
+ ENTRYSUBTYPE = {Data set},
+ GROUPAUTHOR = {{Pew Research Center}},
+ TITLE = {American Trends Panel {W}ave 26},
+ URL = {https://www.pewsocialtrends.org/dataset/american-trends-panel-wave-26/},
+ DATE = {2018}
}
-% (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 10.9 Example 76)
+ at DATASET{10.9:76a,
+ TITLEADDON = {Unpublished raw data on the correlations between the
+ {F}ive {F}acet {M}indfulness {Q}uestionnaire and the {K}entucky
+ {I}nventory of {M}indfulness {S}kills},
+ INSTITUTION = {University of Kentucky},
+ AUTHOR = {R. A. Baer},
+ DATE = {2015}
}
-% (APA 7.08 Example 57)
- at MISC{7.08:57,
- TITLE = {{Eyelink II}},
+ at DATASET{10.9:76b,
+ ENTRYSUBTYPE = {Unpublished raw data},
+ GROUPAUTHOR = {{Oregan Youth Authority}},
+ TITLE = {Recidivism Outcomes},
+ DATE = {2011}
+}
+
+% (APA 10.10 Example 77)
+ at SOFTWARE{10.10:77,
+ ENTRYSUBTYPE = {Computer software},
+ AUTHOR = {M. Borenstein and L. Hedges and J. Higgins and H. Rothstein},
+ TITLE = {Comprehensive Meta-Analysis},
+ VERSION = {3.3.070},
+ PUBLISHER = {Biostat},
+ URL = {https://www.meta-analysis.com/},
+ DATE = {2014}
+}
+
+% (APA 10.10 Example 78)
+ at HARDWARE{10.10:78a,
ENTRYSUBTYPE = {Apparatus and software},
- LOCATION = {Mississauga, Ontario, Canada},
- PUBLISHER = {SR Research},
- DATE = {2004},
+ AUTHOR = {{SR Research}},
+ TITLE = {Eyelink 1000 Plus},
+ URL = {https://www.sr-research.com/eyelink1000plus.html},
+ DATE = {2016}
}
-% (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},
+ at HARDWARE{10.10:78b,
+ ENTRYSUBTYPE = {Apparatus},
+ AUTHOR = {{Tactile Labs}},
+ TITLE = {Latero Tactile Display},
+ URL = {https://www.tactilelabs.com/products/haptics/latero-tactile-display/},
+ DATE = {2015}
}
-% (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 10.10 Example 79)
+% The ENTRYSUBTYPE here is not a localisation string as such neologisms
+% don't need them usually - it's just inserted as it is
+ at SOFTWARE{10.10:79,
+ ENTRYSUBTYPE = {Mobile app},
+ AUTHOR = {Epocrates},
+ TITLE = {Epocrates Medical References},
+ VERSION = {18.12},
+ PUBLISHER = {App Store},
+ URL = {https://itunes.apple.com/us/app/epocrates/id281935788?mt=8},
+ DATE = {2019}
}
-% (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 10.10 Example 80)
+% The \relax is in the AUTHOR field just to make it different to 10.10.79
+% to suppress extrayear for the purposes of matching the APA guide exactly
+ at SOFTWARE{10.10:80,
+ ENTRYSUBTYPE = {Mobile app},
+ AUTHOR = {Epocrates\relax},
+ APPENTRY = {Interaction Check: {A}spirin + Sertraline},
+ TITLE = {Epocrates Medical References},
+ VERSION = {18.12},
+ PUBLISHER = {Google Play Store},
+ URL = {https://play.google.com/store/apps/details?id=com.epocrates&hl=en_US},
+ DATE = {2019}
}
-% (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/}
+% (APA 10.11 Example 81)
+ at MANUAL{10.11:81,
+ AUTHOR = {A. Tellegen and Y. S. Ben-Porath},
+ TITLE = {Minnesota {M}ultiphasic {P}ersonality {I}nventory--2
+ {R}estructured {F}orm ({MMPI-2-RF})},
+ SUBTITLE = {Technical Manual},
+ PUBLISHER = {Pearson},
+ DATE = {2011}
}
- 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 10.11 Example 82)
+ at SOFTWARE{10.11:82,
+ AUTHOR = {{Project Implicit}},
+ TITLE = {Gender-{S}cience {IAT}},
+ URL = {https://implicit.harvard.edi/implicit/takeatest.html}
}
-% (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 10.11 Example 83)
+ at SOFTWARE{10.11:83a,
+ ENTRYSUBTYPE = {Database record},
+ AUTHOR = {J. Alonso-Tapia and C. Nieto and E. Merino-Tejedor and
+ J. A. Huertas and M. Ruiz},
+ TITLE = {Situated {G}oals {Q}uestionnaire for {U}niversity
+ {S}tudents ({SGQ-U}, {CMS-U})},
+ PUBLISHER = {PsycTESTS},
+ DOI = {10.1037/t66267-000},
+ DATE = {2018}
}
-% (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},
+ at SOFTWARE{10.11:83b,
+ ENTRYSUBTYPE = {Database record},
+ AUTHOR = {D. Cardoza and J. K. Morris and H. F. Myers and N. Rodriguez},
+ TITLE = {Acculturative {S}tress {I}nventory ({ASI})},
+ NUMBER = {TC022704},
+ PUBLISHER = {ETS TestLink},
+ DATE = {2000}
}
-% (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 10.12 Example 84)
+% Annotations for author roles must be called "role". This is an example of
+% an annotation which is a localisation string
+ at VIDEO{10.12:84a,
+ ENTRYSUBTYPE = {film},
+ AUTHOR = {M. Forman},
+ AUTHOR+an:role = {1=director},
+ TITLE = {One Flew Over the Cuckoo's Nest},
+ PUBLISHER = {United Artists},
+ DATE = {1975}
}
-% (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},
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:84b,
+ ENTRYSUBTYPE = {film},
+ AUTHOR = {D. Fosha and H. Levenson},
+ AUTHOR+an:role = {1=guestexpert;2=host},
+ TITLE = {Accelerated Experiental Dynamic Psychotherapy ({AEDP}) Supervision},
+ NOTE = {educational DVD},
+ PUBLISHER = {American Pychological Association},
+ URL = {http://www.apa.org/pubs/videos/4310958.aspx},
+ DATE = {2017}
}
-% (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}
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:84c,
+ ENTRYSUBTYPE = {film},
+ AUTHOR = {P. Jackson},
+ AUTHOR+an:role = {1=director},
+ TITLE = {The Lord of the Rings},
+ SUBTITLE = {The Fellowship of the Ring},
+ NOTE = {four-disc special extended ed. on DVD},
+ PUBLISHER = {WingNut Films and The Saul Zaentz Company},
+ DATE = {2001}
}
-% (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 10.12 Example 85)
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:85,
+ ENTRYSUBTYPE = {film},
+ AUTHOR = {L. Malle},
+ AUTHOR+an:role = {1=director},
+ TITLE = {Goodbye Children},
+ ORIGTITLE = {Au revoir les enfants},
+ PUBLISHER = {Nouvelles Éditions de Films},
+ DATE = {1987}
}
-% (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 10.12 Example 86)
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:86,
+ ENTRYSUBTYPE = {tvseries},
+ AUTHOR = {D. Simon and R. F. Colesberry and Kostroff Noble, N.},
+ AUTHOR+an:role = {=execproducers},
+ TITLE = {The Wire},
+ PUBLISHER = {Blown Deadline Productions and HBO},
+ DATE = {2002/2008}
}
-% (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 10.12 Example 87)
+% ENTRYSUBTYPE is a localisation string
+% Dual localisation string data annotation for the first AUTHOR
+ at VIDEO{10.12:87a,
+ ENTRYSUBTYPE = {tvepisode},
+ AUTHOR = {K. Barris},
+ AUTHOR+an:role = {1=director,writer},
+ TITLE = {Lemons ({S}eason 3, {E}pisode 12)},
+ MAINTITLE = {Black-ish},
+ EXECPRODUCER = {K. Barris and J. Groff and A. Anderson and E. B.
+ Dobbins and L. Fishburne and H. Sugland},
+ PUBLISHER = {Wilmore Films and Artists First and Cinema Gypsy
+ Productions and ABC Studios},
+ DATE = {2017-01-11}
}
-% (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}
+% ENTRYSUBTYPE is a localisation string
+% Three data annotations, one for each name in the AUTHOR list
+ at VIDEO{10.12:87b,
+ ENTRYSUBTYPE = {tvepisode},
+ AUTHOR = {B. Oakley and J. Weinstein and J. Lynch},
+ AUTHOR+an:role = {1=writer;2=writer;3=director},
+ TITLE = {Who Shot {M}r. {B}urns? ({P}art {O}ne) ({S}eason 6,
+ {E}pisode 25)},
+ MAINTITLE = {The Simpsons},
+ EXECPRODUCER = {D. Mirkin and J. L. Brooks and M. Groening and S. Simon},
+ PUBLISHER = {Gracie Films and Twentieth Century Fox Film Corporation},
+ DATE = {1995-05-21}
}
-% (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 10.12 Example 88)
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:88a,
+ ENTRYSUBTYPE = {video},
+ AUTHOR = {S. Giertz},
+ TITLE = {Why You Should Make Useless Things},
+ PUBLISHER = {TED Conferences},
+ DATE = {2018-04},
+ URL = {https://www.ted.com/talks/simone_giertz_why_you_should_make_useless_things}
}
-% (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}
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:88b,
+ ENTRYSUBTYPE = {video},
+ GROUPAUTHOR = {TED},
+ TITLE = {Brené {B}rown},
+ SUBTITLE = {Listening to Shame},
+ PUBLISHER = {YouTube},
+ DATE = {2012-03-16},
+ URL = {https://www.youtube.com/watch?v=psN1DORYYV0}
}
-% (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 10.12 Example 89)
+% Here, the ENTRYSUBTYPE is not a localisation string as there is no
+% localisation necessary for such ugly neologisms
+ at VIDEO{10.12:89,
+ ENTRYSUBTYPE = {Webinar},
+ AUTHOR = {J. F. Goldberg},
+ TITLE = {Evaluating Adverse Drug Effects},
+ PUBLISHER = {American Psychiatric Association},
+ DATE = {2018},
+ URL = {https://education.psychiatry.org/Users/ProductDetails.aspx?ActivityID=6172}
}
-% (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 10.12 Example 90)
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:90a,
+ ENTRYSUBTYPE = {video},
+ AUTHOR = {S. Cutts},
+ TITLE = {Happiness},
+ PUBLISHER = {Vimeo},
+ DATE = {2017-11-24},
+ URL = {https://vimeo.com/244405542}
}
-% (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},
+% ENTRYSUBTYPE is a localisation string
+% A literal data annotation (not a localisation string) for the AUTHOR username
+ at VIDEO{10.12:90b,
+ ENTRYSUBTYPE = {video},
+ AUTHOR = {M. Fogarty},
+ AUTHOR+an:username = {1="Grammar Girl"},
+ TITLE = {How to Diagram a Sentence (Absolute Basics)},
+ PUBLISHER = {YouTube},
+ DATE = {2016-09-30},
+ URL = {https://youtube.be/deiEY5Yq1ql}
}
-% (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},
+% ENTRYSUBTYPE is a localisation string
+ at VIDEO{10.12:90c,
+ ENTRYSUBTYPE = {video},
+ GROUPAUTHOR = {{University of Oxford}},
+ TITLE = {How Do Geckos Walk on Water?},
+ PUBLISHER = {YouTube},
+ DATE = {2016-12-06},
+ URL = {https://www.youtube.com/watch?v=qm1xGfOZJc8}
}
- 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 10.13 Example 91)
+% ENTRYSUBTYPE is (obviously) not a localisation string, inserted literally
+ at AUDIO{10.13:91a,
+ ENTRYSUBTYPE = {Album recorded by Academy of St Martin in the Fields},
+ AUTHOR = {J. S. Bach},
+ TITLE = {The {B}randenburg Concertos},
+ SUBTITLE = {Concertos {BVW} 1043 \& 1060},
+ PUBLISHER = {Decca},
+ DATE = {2010},
+ ORIGDATE = {1721}
}
-% (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},
+ at AUDIO{10.13:91b,
+ ENTRYSUBTYPE = {album},
+ AUTHOR = {D. Bowie},
+ TITLE = {Blackstar},
+ PUBLISHER = {Columbia},
+ DATE = {2016}
}
-% (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 10.13 Example 92)
+% Notice that useprefix is disabled as Beethoven generally does not have
+% the prefix leading
+% ENTRYSUBTYPE is not a localisation string
+ at AUDIO{10.13:92a,
+ OPTIONS = {useprefix=false},
+ ENTRYSUBTYPE = {Song recorded by Staatskapelle Dresden},
+ AUTHOR = {van Beethoven, L.},
+ TITLE = {Symphony {N}o. 3 in {E}-flat major},
+ MAINTITLE = {Beethoven: {C}omplete {S}ymphonies},
+ PUBLISHER = {Brilliant Classics},
+ DATE = {2012},
+ ORIGDATE = {1804}
}
-% 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}
+% ENTRYSUBTYPE is a localisation string
+ at AUDIO{10.13:92b,
+ ENTRYSUBTYPE = {song},
+ AUTHOR = {Beyoncé},
+ TITLE = {Formation},
+ MAINTITLE = {Lemonade},
+ PUBLISHER = {Parkwood and Columbia},
+ DATE = {2016}
}
- 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}
+% ENTRYSUBTYPE is a localisation string
+ at AUDIO{10.13:92c,
+ ENTRYSUBTYPE = {song},
+ GROUPAUTHOR = {{Childish Gambino}},
+ TITLE = {This is {A}merica},
+ PUBLISHER = {mcDJ and RCA},
+ DATE = {2018}
}
- at ONLINE{habitat3,
- TITLE = {Mission, Vision \& Values},
- DATE = {2012},
- URL = {http://www.tchabitat.org/missionvisionvalues},
- ORGANIZATION = {Twin Cities Habitat for Humanity website},
- URLDATE = {2012}
+% ENTRYSUBTYPE is a localisation string
+ at AUDIO{10.13:92d,
+ ENTRYSUBTYPE = {song},
+ AUTHOR = {K. Lamar},
+ TITLE = {Humble},
+ MAINTITLE = {Damn},
+ PUBLISHER = {Aftermath Entertainment and Interscope Records and Top
+ Dawg Entertainment},
+ DATE = {2017}
}
- 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}
+% (APA 10.13 Example 93)
+% ENTRYSUBTYPE is a localisation string as it expands to the localisable "Audio podcast"
+% for some reason best known to the APA
+ at AUDIO{10.13:93,
+ ENTRYSUBTYPE = {podcast},
+ AUTHOR = {S. Vedantam},
+ AUTHOR+an:role = {1=host},
+ TITLE = {Hidden Brain},
+ PUBLISHER = {NPR},
+ DATE = {2015/},
+ URL = {https://www.npr.org/series/423302056/hidden-brain}
}
- 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}
+% (APA 10.13 Example 94)
+% ENTRYSUBTYPE is a localisation string as it expands to the localisable
+% "Audio podcast episode" for some reason best known to the APA
+ at AUDIO{10.13:94,
+ ENTRYSUBTYPE = {podcastepisode},
+ AUTHOR = {I. Glass},
+ AUTHOR+an:role = {1=host},
+ TITLE = {Amusement Park},
+ MAINTITLE = {This {A}merican {L}ife},
+ NUMBER = {443},
+ PUBLISHER = {WBEZ Chicago},
+ DATE = {2011-08-12},
+ URL = {https://www.thisamericanlife.org/radio-archives/episode/443/amusement-park}
}
+
+% (APA 10.13 Example 95)
+% ENTRYSUBTYPE is a localisation string
+ at AUDIO{10.13:95,
+ ENTRYSUBTYPE = {interview},
+ AUTHOR = {de Beauvoir, S.},
+ TITLE = {Simone de {B}eauvoir Discusses the Art of Writing},
+ PUBLISHER = {Studs Terkel Radio Archive and The Chicago History Museum},
+ DATE = {1960-05-04},
+ URL = {https://studsterkel.wfmt.com/programs/simone-de-beauvoir-discusses-art-writing}
+}
+
+% (APA 10.13 Example 96)
+% ENTRYSUBTYPE is a localisation string
+ at AUDIO{10.13:96,
+ ENTRYSUBTYPE = {speech},
+ AUTHOR = {King, Jr., M. L.},
+ TITLE = {I Have a Dream},
+ PUBLISHER = {American Rhetoric},
+ DATE = {1963-08-28},
+ URL = {https://www.americanrhetoric.com/speeches/mlkihaveadream.htm}
+}
+
+% (APA 10.14 Example 97)
+% ENTRYSUBTYPE is a localisation string
+ at IMAGE{10.14:97a,
+ ENTRYSUBTYPE = {lithograph},
+ AUTHOR = {E. Delacroix},
+ TITLE = {Faust Attempts to Seduce {M}arguerite},
+ LOCATION = {The Louvre, Paris, France},
+ DATE = {1826/1827}
+}
+
+% ENTRYSUBTYPE is a localisation string
+ at IMAGE{10.14:97b,
+ ENTRYSUBTYPE = {painting},
+ AUTHOR = {G. Wood},
+ TITLE = {American Gothic},
+ LOCATION = {Art Institute of Chicago, Chicago, IL, United States},
+ DATE = {1930},
+ URL = {https://www.artic.edu/aic/collections/artwork/6565}
+}
+
+% (APA 10.14 Example 98)
+% No need for a localisation string for such neologisms which are the same
+% in all languages
+ at IMAGE{10.14:98,
+ ENTRYSUBTYPE = {Clip art},
+ AUTHOR = {GDJ},
+ TITLE = {Neural Network Deep Learning Prismatic},
+ PUBLISHER = {Openclipart},
+ DATE = {2018},
+ URL = {https://openclipart.org/detail/309343/neural-network-deep-learning-prismatic}
+}
+
+% (APA 10.14 Example 99)
+% No need for a localisation string for such neologisms which are the same
+% in all languages
+ at IMAGE{10.14:99,
+ ENTRYSUBTYPE = {Infographic},
+ AUTHOR = {J. Rossman and R. Palmer},
+ TITLE = {Sorting Through our Space Junk},
+ PUBLISHER = {World Science Festival},
+ DATE = {2015},
+ URL = {https://www.worldsciencefestival.com/2015/11/space-junk-infographic/}
+}
+
+% (APA 10.14 Example 100)
+% ENTRYSUBTYPE is a localisation string
+ at IMAGE{10.14:100a,
+ ENTRYSUBTYPE = {map},
+ AUTHOR = {D. Cable},
+ TITLE = {The Racial Dot Map},
+ LOCATION = {University of Virginia},
+ PUBLISHER = {Weldon Cooper Center for Public Service},
+ DATE = {2013},
+ URL = {https://demographics.coopercenter.org/Racial-Dot-Map}
+}
+
+% TITLEADDON is used to unconditionally add what is usually post-title
+% information in brackets when there is no title
+ at IMAGE{10.14:100b,
+ AUTHOR = {Google},
+ TITLEADDON = {Google {M}aps directions for driving from {L}a {P}az,
+ {B}olivia, to {L}ima, {P}eru},
+ URL = {https://goo.gl/YYE3GR},
+ URLDATE = {2020-02-16}
+}
+
+% (APA 10.14 Example 101)
+% ENTRYSUBTYPE is a localisation string
+ at IMAGE{10.14:101a,
+ ENTRYSUBTYPE = {photograph},
+ AUTHOR = {S. McCurry},
+ TITLE = {Afghan Girl},
+ PUBLISHER = {National Geographic},
+ DATE = {1985},
+ URL = {https://www.nationalgeographic.com/magazine/national-geographic-magazine-50-years-of-covers/#/ngm-1985-jun-714.jpg}
+}
+
+ at IMAGE{10.14:101b,
+ AUTHOR = {Jessica Rinaldi},
+ TITLEADDON = {Photograph series of a boy who finds his footing after
+ abuse by those he trusted},
+ PUBLISHER = {The Pulitzer Prizes},
+ DATE = {2016},
+ URL = {https://www.pulitzer.org/winners/jessica-rinaldi}
+}
+
+% (APA 10.14 Example 102)
+ at IMAGE{10.14:102a,
+ AUTHOR = {E. Canan and J. Vasilev},
+ TITLEADDON = {Lecture notes on resource allocation},
+ LOCATION = {{Department of Management Control and Information Systems}},
+ PUBLISHER = {University of Chile},
+ DATE = {2019-05-22},
+ URL = {https://uchilefau.academia.edu/ElseZCanan}
+}
+
+% ENTRYSUBTYPE is a localisation string as it expands to "Powerpoint Slides"
+ at IMAGE{10.14:102b,
+ ENTRYSUBTYPE = {powerpoint},
+ AUTHOR = {Brian Housand},
+ TITLE = {Game on! {I}ntegrating Games and Simulations in the Classroom},
+ PUBLISHER = {SlideShare},
+ DATE = {2016},
+ URL = {https://www.slideshare.net/brianhousand/game-on-iagc-2016/}
+}
+
+% ENTRYSUBTYPE is a localisation string as it expands to "Powerpoint Slides"
+ at IMAGE{10.14:102c,
+ ENTRYSUBTYPE = {powerpoint},
+ AUTHOR = {R. Mack and G. Spake},
+ TITLE = {Citing Open Source Images and Formatting References for
+ Presentations},
+ PUBLISHER = {Canvas at FNU},
+ DATE = {2018},
+ URL = {https://fnu.onelogin.com/login}
+}
+
+% (APA 10.15 Example 103)
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:103a,
+ ENTRYSUBTYPE = {Tweet},
+ GROUPAUTHOR = {{APA Education}},
+ GROUPAUTHOR+an:username = {1="@APAEducation"},
+ TITLE = {College Students are Forming Mental-Health
+ Clubs--and They're Making a Difference @washingtonpost},
+ TITLEADDON = {Thumbnail with link attached},
+ ORGANIZATION = {Twitter},
+ DATE = {2018-06-29},
+ URL = {https://twitter.com/apaeducation/status/1012810490530140161}
+}
+
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:103b,
+ ENTRYSUBTYPE = {Tweet},
+ GROUPAUTHOR = {{Badlands National Park}},
+ GROUPAUTHOR+an:username = {1="@BadlandsNPS"},
+ TITLE = {Biologists Have Identified More Than 400
+ Different Plant Species Growing in
+ @{B}adlandsNPS \#{DYK} \#biodoversity},
+ ORGANIZATION = {Twitter},
+ DATE = {2018-02-26},
+ URL = {https://twitter.com/BadlandsNPS/status/968196500412133379}
+}
+
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:103c,
+ ENTRYSUBTYPE = {Tweet},
+ AUTHOR = {B. White},
+ AUTHOR+an:username = {1="@BettyMWhite"},
+ TITLE = {I Treasure Every Minute We Spent Together \#koko},
+ TITLEADDON = {Image attached},
+ ORGANIZATION = {Twitter},
+ DATE = {2018-06-21},
+ URL = {https://twitter.com/BettyMWhite/status/1009951892846227456}
+}
+
+% (APA 10.15 Example 104)
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:104,
+ ENTRYSUBTYPE = {Twitter profile},
+ GROUPAUTHOR = {{APA Style}},
+ GROUPAUTHOR+an:username = {1="@APA\_Style"},
+ TITLE = {Tweets},
+ ORGANIZATION = {Twitter},
+ URL = {https://twitter.com/APA_Style},
+ URLDATE = {2019-11-01}
+}
+
+% (APA 10.15 Example 105)
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:105a,
+ ENTRYSUBTYPE = {Status update},
+ AUTHOR = {N. Gaiman},
+ TITLE = {100,000+ {R}ohingya Refugees Could be at
+ Serious Risk during {B}angladesh's Monsoon
+ Season. {M}y Fellow {UNHCR} {G}oodwill
+ {A}mbassador {C}ate {B}lanchett is},
+ TITLEADDON = {Image attached},
+ ORGANIZATION = {Facebook},
+ URL = {http://bit.ly/2JQxPAD},
+ DATE = {2018-03-22}
+}
+
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:105b,
+ ENTRYSUBTYPE = {Infographic},
+ GROUPAUTHOR = {{National Institute of Mental Health}},
+ TITLE = {Suicide Affects all Ages, Genders, Races, and
+ Ethnicities. {C}heck out These 5 {A}ction
+ {S}teps for {H}elping {S}omeone in {E}motional
+ {P}ain},
+ ORGANIZATION = {Facebook},
+ URL = {http://bit.ly/321Qstq},
+ DATE = {2018-11-28}
+}
+
+% Note protecting of automatic sentence-casing in SUBTITLE for url
+ at ONLINE{10.15:105c,
+ ENTRYSUBTYPE = {video},
+ GROUPAUTHOR = {{News From Science}},
+ TITLE = {These Frogs Walk Instead of Hop},
+ SUBTITLE = {{h}ttps://scimag.2{K}lriw{H}},
+ ORGANIZATION = {Facebook},
+ URL = {https://www.facebook.com/ScienceNOW/videos/10155508587605108},
+ DATE = {2018-06-26}
+}
+
+% (APA 10.15 Example 106)
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:106,
+ ENTRYSUBTYPE = {Facebook page},
+ GROUPAUTHOR = {{Smithsonian's National Zoo and Conservation
+ Biology Institute}},
+ TITLE = {Home},
+ ORGANIZATION = {Facebook},
+ URL = {https://www.facebookcom/nationalzoo},
+ URLDATE = {2019-06-22}
+}
+
+% (APA 10.15 Example 107)
+% ENTRYSUBTYPE is a localisation string
+ at ONLINE{10.15:107,
+ ENTRYSUBTYPE = {photographs},
+ GROUPAUTHOR = {{Zeitz MOCAA}},
+ GROUPAUTHOR+an:username = {1="@zeitzmocaa"},
+ TITLE = {Grade 6 Learners from {P}arkfields {P}rimary
+ {S}chool in {H}anover {P}ark Visited the
+ Museum for a Tour and Workshop Hosted by},
+ ORGANIZATION = {Instagram},
+ URL = {https://www.instagram.com/p/BqpHpjFBs3b},
+ DATE = {2018-11-26}
+}
+
+% (APA 10.15 Example 108)
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:108,
+ ENTRYSUBTYPE = {Highlight},
+ GROUPAUTHOR = {{The New York Public Library}},
+ GROUPAUTHOR+an:username = {1="@nypl"},
+ TITLE = {The Raven},
+ ORGANIZATION = {Instagram},
+ URL = {https://bitly.com/2FV8bu3},
+ URLDATE = {2019-04-16}
+}
+
+% (APA 10.15 Example 109)
+% ENTRYTYPE is not a localisation string for such, unfortunately, universal neologisms
+ at ONLINE{10.15:109,
+ ENTRYSUBTYPE = {Online forum post},
+ GROUPAUTHOR = {{National Aeronautics Space Administration}},
+ GROUPAUTHOR+an:username = {1="nasa"},
+ TITLE = {I'm {NASA} Astronaut {S}cott {T}ingle. {A}sk
+ me anything about adjusting to being back on
+ {E}arth after my first spaceflight!},
+ ORGANIZATION = {Reddit},
+ URL = {https://www.reddit.com/r/IAmA/comments/9fagqy/im_nasa_astronaut_scott_tingle_ask_me_anything/},
+ DATE = {2018-09-12}
+}
+
+% (APA 10.16 Example 110)
+ at ONLINE{10.16:110a,
+ AUTHOR = {N. Avramova},
+ TITLE = {The Secret to a Long, Happy, Health Life? {T}hink Age-Positive},
+ ORGANIZATION = {CNN},
+ DATE = {2019-01-03},
+ URL = {https://www.cnn.com/2019/01/03/health/respect-towards-elderly-leads-to-long-life-intl/index.html}
+}
+
+ at ONLINE{10.16:110b,
+ AUTHOR = {C. Bologna},
+ TITLE = {What Happens to Your Mind and Body When you Feel Homesick?},
+ ORGANIZATION = {HuffPost},
+ DATE = {2018-06-27},
+ URL = {https://www.huffingtonpost.com/entry/what-happens-mind-body-homesick_us_5b201ebde4b09d7a3d77eee1}
+}
+
+% (APA 10.16 Example 111)
+ at ONLINE{10.16:111a,
+ GROUPAUTHOR = {{Centers for Disease Control and Prevention}},
+ TITLE = {People at High Risk of Developing Flu-related Complications},
+ DATE = {2018-01-23},
+ URL = {https://www.cdc.gov/flu/about/disease/high_risk.htm}
+}
+
+ at ONLINE{10.16:111b,
+ GROUPAUTHOR = {{World Health Organization}},
+ TITLE = {Questions and Answers on Immunization and Vaccine Safety},
+ DATE = {2018-03},
+ URL = {https://www.who.int/features/qa/84/en/}
+}
+
+% (APA 10.16 Example 112)
+ at ONLINE{10.16:112,
+ AUTHOR = {Martin Lillie, C. M.},
+ TITLE = {Be Kind To Yourself},
+ SUBTITLE = {How Self-Compassion can Improve Your Resiliency},
+ ORGANIZATION = {Mayo Clinic},
+ DATE = {2016-12-29},
+ URL = {https://www.mayoclinic.org/healthy-lifestyle/adult-health/in-depth/self-compassion-can-improve-your-resiliency/art-20267193}
+}
+
+% (APA 10.16 Example 113)
+ at ONLINE{10.16:113a,
+ AUTHOR = {J. Boddy and T. Neumann and S. Jennings and V. Morrow
+ and P. Alderson and R. Rees and W. Gibson},
+ TITLE = {Ethics Principles},
+ ORGANIZATION = {The Research Ethics Guidebook: A Resource for Social Scientists},
+ URL = {http://www.ethicsguidebook.ac.uk/EthicsPrinciples}
+}
+
+ at ONLINE{10.16:113b,
+ GROUPAUTHOR = {{National Nurses United}},
+ TITLE = {What Employers Should do to Protect Nurses from {Z}ika},
+ URL = {https://www.nationalnursesunited.org/pages/what-employers-should-do-to-protect-rns-from-zika}
+}
+
+% (APA 10.16 Example 114)
+ at ONLINE{10.16:114,
+ GROUPAUTHOR = {{U.S. Census Bureau}},
+ TITLE = {{U}.{S}. and World Population Clock},
+ ORGANIZATION = {U.S. Department of Commerce},
+ URL = {https://www.census.gov/popclock/},
+ URLDATE = {2019-07-03}
+}
+
+% (APA 11.8 Example 22)
+ at PATENT{11.8:22,
+ AUTHOR = {S. C. Hiremath and S. Kumar and F. Lu and A Salehi},
+ TITLE = {Using Metaphors to Present Concepts Across Different
+ Intellectual Domains},
+ TYPE = {U.S. Patent},
+ NUMBER = {9,367,592},
+ PUBLISHER = {{U.S. Patent and Trademark Office}},
+ URL = {http://patft.uspto.gov/netacgi/nph-Parser?patentnumber=9367592},
+ DATE = {2016}
+}
+
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex 2019-11-23 21:21:40 UTC (rev 52900)
@@ -13,46 +13,10 @@
\setsansfont[Ligatures=TeX]{TexGyreHeros}
\setmonofont[Ligatures=NoCommon]{TeXGyreCursor}
\MakeAutoQuote{«}{»}
-
+\maxdeadcycles=1000
% Biblatex
\usepackage[style=apa]{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}{}}%
@@ -86,7 +50,7 @@
\test@}
\def\test at end\fi#1\test@{\fi}
-\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}}
+\def\apaex#1{\hspace*{-4em}\parbox{\textwidth}{\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}}
\def\apaexs#1{\hbox{\texttt{\footnotesize\apaexi{#1}}} \textbf{\small #1}}
\makeatother
@@ -93,301 +57,189 @@
% 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}}}}
+\renewbibmacro*{begentry}{\marginpar{\footnotesize\textcolor{blue}{\thefield{entrykey}}}%
+ \ifkeyword{meta}{\textsuperscript{*}}{}}
\usepackage[colorlinks=true]{hyperref}
+\setcounter{secnumdepth}{0}
+\setcounter{tocdepth}{3}
%%%%%%%%%%%%%%%%%%%%%%%%%%%% END PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%%%
+\addglobalbib{../bibtex/bib/biblatex-apa-test-references.bib}
+
\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
+\section{APA style examples}
+This file typesets just about all useful examples from \apa{8}--\apa{10}.
+Also included are some clarifications from the APA blog
(\url{http://blog.apastyle.org/apastyle/}). Please refer to the
|biblatex-apa-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,
+of the APA section they are taken from, 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.
+typeset examples with the commented |.bib| file.
-\section*{Citations}
-\begin{refsection}[../bibtex/bib/biblatex-apa-test-citations]
+\tableofcontents
+\newpage
+\section{APA 8--Citations}
+\begin{refsection}[../bibtex/bib/biblatex-apa-test-citations.bib]
\noindent Please see accompanying file |biblatex-apa-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{8.6}\\
+Secondary sources. The example in APA 7th is inconsistent with other
+examples of similar format which use a semi-colon:\\
+\apaex{\parencites{8.6a}[as cited in][]{8.6b}}\\\\
+\noindent To obtain the exact format, if desired, wrap the citation in:\\
+|\DeclareDelimFormat{multicitedelim}{\addcomma\space}|\\
+|\DeclareDelimFormat{multicitedelim}{\addsemicolon\space}|\\
+\DeclareDelimFormat{multicitedelim}{\addcomma\space}\\
+\apaex{\parencites{8.6a}[as cited in][]{8.6b}}\\
+\DeclareDelimFormat{multicitedelim}{\addsemicolon\space}\\
+\noindent Primary source with no date:\\
+\apaex{Allport's diary \parencite[as cited in][]{8.6c}}
-\noindent\apa{6.11}\\
+\noindent\apa{8.9}\\
+Such cases are just typed out--they have no Reference section entry and
+don't therefore have a bibliography database entry.
+
+\noindent\apa{8.10}\\
Simple cite. «Jr.» suffix is not shown (bib entry for this example has a suffix):\\
-\apaex{\textcite{6.11}}
+\apaex{\textcite{8.10a}}\\
-\noindent Within a paragraph, not in the «narrative sense»:\\
-\apaex{\autocite{6.11}}
+\noindent Testing seasonal periodical citations--should be ignored and only
+year printed:\\
+\apaex{\textcite{8.10b}}
-\noindent To cite the parts separately:\\
-\apaex{\citeyear{6.11}, \citeauthor{6.11}}
+\noindent\apa{8.11}\\
+Within a paragraph, not in the narrative sense:\\
+\apaex{\autocite{8.11a}}
-\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 Within parentheses, use the |\nptextcite| command which is equivalent to
+the |\textcite| command but omits the parenthesis and uses commas instead.
+See the |biblatex-apa| docs.\\
+\apaex{(\nptextcite[see][for more detail]{8.11a})}\\
+\apaex{(e.g., falsely balanced news coverage; \nptextcite{8.11a})}\\
+\apaex{\textcite{8.11a} noted the dangers of falsely balanced news coverage.}\\
+\apaex{In \citeyear{8.11a}, \citeauthor{8.11a} noted the dangers of falsely balanced news coverage.}
-\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\apa{8.12}\\
+Citing multiple works:\\
+\apaex{\parencite{8.12a,8.12b,8.12c}}\\
+\apaex{\parencite{8.12d,8.12e,8.12f,8.12g}}\\
+\apaex{\parencite{8.12h,8.12i,8.12j,8.12k}}\\
+\apaex{\parencite{8.12l,8.12m,8.12n}}\\
+\apaex{\parencites{8.12o}[see also][]{8.12p,8.12q, 8.12r}}
-\noindent First citation of 3--5 author entry:\\
-\apaex{\textcite{6.12b}}
+\noindent «in press» should have hyphen before disambiguating part of label\\
+\apaex{\parencite{8.12s,8.12t,8.12u}}
-\noindent Subsequent citations:\\
-\apaex{\textcite{6.12b}}\\
-Subsequent citations within a paragraph:\\
-\apaex{\citeauthor{6.12b}}
+\noindent\apa{8.13}\\
+Classical and part works:\\
+\apaex{\parencite[10]{8.13a}}\\
+\apaex{\parencite[Chapter 3]{8.13b}}\\
+\apaex{\parencite[3--17]{8.13c}}\\
+\apaex{\parencite[paras. 2--3]{8.13d}}\\
+\apaex{\parencite[Table 1]{8.13e}}\\
+\apaex{\parencite[Slide 7]{8.13f}}\\
+\apaex{\parencite[1:30:40]{8.13g}}\\
+\apaex{\parencite[1 Cor. 13:1]{8.13h}}\\
+\apaex{\parencite[Part IV]{8.13i}}\\
+\apaex{\parencite[\nopp 1.3.36--37]{8.13j}}\\\\
+Note the use of |\nopp| in the Shakespeare example to suppress the
+pagination prefix since the part specification is auto-detected as a range
+by |biblatex| which it then assumes is a page range. Note also the date
+format for the Aristotle example, see the reference file for the data
+format--no special formatting is required by the user as |biblatex| fully
+supports the relevant parts of the ISO 8601 specification and can
+parse/format such dates automatically.
-\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}\\
+\noindent\apa{8.14}\\
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}}\\\\
+\apaex{\parencite{8.14a}}\\\\
+Articles use quotes instead of italics:\\
+\apaex{\parencite{8.14b}}\\\\
Citing anonymous author:\\
-\apaex{\textcite{6.15c}}
+\apaex{\parencite{8.14c}}
-\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\apa{8.15}\\
+Citations with reprint/reissue dates:\\
+\apaex{\textcite{8.15a}}\\
+\apaex{\parencite{8.15b}}
-\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\apa{8.16}\\
+This is not a strict rule and so simply use the lower-level citation
+commands:\\
+\apaex{\citeauthor{8.11a}}
-\noindent Compact citations in alphabetic order:\\
-\apaex{\parencites{6.16k,6.16l}}
+\noindent\apa{8.17}\\
+Basic in-text citation styles:\\
+\begin{table}
+\begin{tabular}{p{0.33\textwidth}p{0.33\textwidth}p{0.33\textwidth}}
+ \textbf{Author type} & \textbf{Parenthetical citation} & \textbf{Narrative citation}\\\\
+ \hline
+ \\
+ One author & \apaexs{\parencite{8.17a}} & \apaexs{\textcite{8.17a}}\\\\
+ Two authors & \apaexs{\parencite{8.17b}} & \apaexs{\textcite{8.17b}}\\\\
+ Three or more authors & \apaexs{\parencite{8.17c}} & \apaexs{\textcite{8.17c}}\\\\
+ Group author with abbreviation & &\\
+ ~~First citation & \apaexs{\parencite{8.17d}}\citeresetapa & \apaexs{\textcite{8.17d}}\\\\
+ ~~Subsequent citations & \apaexs{\parencite{8.17d}} & \apaexs{\textcite{8.17d}}\\\\
+ Group author without abbreviation & \apaexs{\parencite{8.17e}} & \apaexs{\textcite{8.17e}}\\\\
+ \hline
+\end{tabular}
+\caption{APA Table 8.1}
+\label{tab:8.1}
+\end{table}
-\noindent Compact citations with special order:\\
-\apaex{\parencites{6.16m}[see also][]{6.16n,6.16o}}
+\noindent Authors in narrative citations are separated by «and».
+However, in parenthetical cites, authors are separated by «\&»:\\
+\apaex{\parencite{8.17f}}\\
+\apaex{\textcite{8.17g}}\\
+\apaex{\parencite{8.17h}}
-\noindent «in press» should have hyphen before disambiguating part of label
-(also in references):\\
-\apaex{\parencite{6.16p,6.16q,6.16r}}
+\noindent Automatic list disambiguation for ambiguous truncations. 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{8.18a}}\\
+\apaex{\textcite{8.18b}}\\
+\apaex{\textcite{8.18c}}\\
+\apaex{\textcite{8.18d}}
-\noindent\apa{6.17}\\
-Secondary sources:\\
-\apaex{\parencite[as cited in][]{6.17}}
+\noindent Automatic list disambiguation is only for ambiguous author lists
+in the same year. This is implied in \apa{8.18} by the phrase «the same
+in-text citation form». So these are not disambiguated:\\
+\apaex{\textcite{8.18e}}\\
+\apaex{\textcite{8.18f}}
-\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{8.19}\\
+Citations of works by same authors in the same year:\\
+\apaex{\parencite{8.19a}}\\
+\apaex{\textcite{8.19b}}\\
+\apaex{\parencite{8.19c,8.19d}}
-\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{8.20}\\
+Citations of an entry with an author who shares a surname with another
+entry always appears with initials when primary author:\\
+\apaex{\parencite{8.20a,8.20b}}
-\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 When initials are also the same, revert to standard format:\\
+\apaex{\parencite{8.20c,8.20d}}
-\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-apa| docs.\\
-\apaex{(\nptextcite[see Table 3 of][]{6.21} for complete data)}
+\noindent Only the primary author should have initials:\\
+\apaex{\parencite{8.20f,8.20g,8.20h,8.20i,8.20j}}\\
-\noindent\apa{6.28}\\
-Entries with no date use «n.d.».\\
-\apaex{\textcite{6.28a}}\\
-\apaex{\parencite{6.28a}}\\
-\apaex{(\nptextcite{6.28a})}
+\noindent Authors in same reference with same surname:\\
+\apaex{\parencite{8.20e}}
-\noindent\apa{7.01:12c}\\
-Issue with no editors\\
-\apaex{\parencite{7.01:12c}}
+\noindent\apa{8.21}\\
+Group author abbreviations should work between citations of different works by
+the author:\\
+\apaex{\parencite{8.21a}}\\
+\apaex{\parencite{8.21a}}\\
+\apaex{\parencite{8.21b}}
-\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}}
@@ -407,16 +259,6 @@
\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:
@@ -428,9 +270,6 @@
\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}}
@@ -440,19 +279,733 @@
\noindent Testing month ranges with different months\\
\apaex{\textcite{daterange2}}
+\noindent Testing fullcite\\
+\apaex{\fullcite{FC1}}\\
+\apaex{\fullcitebib{FC1}}
+
+\printbibliography[title={APA 8 Citation References}]
+
\end{refsection}
-\begin{refsection}[../bibtex/bib/biblatex-apa-test-references]
-\nocite{*}
+\newpage
+\section{APA 9--General Reference List}
+
+% (APA 9.8)
+\begin{refsection}
+
+\noindent\apa{9.8}\\
+\apaex{\parencite{9.8:1}}\\
+\apaex{\parencite{9.8:2}}\\
+\apaex{\parencite{9.8:3}}\\
+\apaex{\parencite{9.8:4}}\\
+\apaex{\parencite{9.8:5}}\\
+\apaex{\parencite{9.8:6}}\\
+\apaex{\parencite{9.8:7}}\\
+\apaex{\parencite{9.8:8}}\\
+\apaex{\parencite{9.8:9}}\\
+\apaex{\parencite{9.8:10}}\\
+\apaex{\parencite{9.8:11}}
+
+\apaex{\textcite{9.8:1}}\\
+\apaex{\textcite{9.8:2}}\\
+\apaex{\textcite{9.8:3}}\\
+\apaex{\textcite{9.8:4}}\\
+\apaex{\textcite{9.8:5}}\\
+\apaex{\textcite{9.8:6}}\\
+\apaex{\textcite{9.8:7}}\\
+\apaex{\textcite{9.8:8}}\\
+\apaex{\textcite{9.8:9}}\\
+\apaex{\textcite{9.8:10}}\\
+\apaex{\textcite{9.8:11}}
+
+\printbibliography[title={APA 9.8--Format of the Author Element}]
+
+\noindent\textbf{Note:} The username feature is nicely managed by |biber|'s
+annotation feature which allows arbitrary strings to be attached to any
+list member.
+
\end{refsection}
\newpage
-% Just (APA 7.x) real references and related entry examples here
-\printbibliography[section=2]
+
+% (APA 9.44)
+\begin{refsection}
+
+\nocite{9.44:1a,9.44:1b,9.44:2a,9.44:2b,9.44:2c,9.44:3a,9.44:3b,9.44:4a,9.44:4b,%
+ 9.44:5a,9.44:5b,9.44:6a,9.44:6b,9.44:7a,9.44:7b,9.44:7c,9.44:8a,9.44:8b,9.44:8c,%
+ 9.44:9a,9.44:9b,9.44:10a,9.44:10b,9.44:10c,9.44:11a,9.44:11b,9.44:12a,9.44:12b}
+
+\printbibliography[title={APA 9.44--Order of Works in a Reference List}]
+
+\noindent\textbf{Note:} The rather silly requirement for the «Santiago» examples are
+done via |SORTNAME|.
+
+\end{refsection}
\newpage
-% Include a references section for citation examples just so hyperref
-% targets can be checked
-\printbibliography[section=1,title=Misc citation references]
+% (APA 9.46)
+\begin{refsection}
+
+\nocite{9.46:1,9.46:2,9.46:3,9.46:4,9.46:5,9.46:6,9.46:7,9.46:8,9.46:9,9.46:10,%
+ 9.46:11,9.46:12,9.46:13}
+
+\printbibliography[title={APA 9.46--Order of Multiple Works by the Same First Author}]
+
+\end{refsection}
+\newpage
+% (APA 9.47)
+\begin{refsection}
+
+\nocite{9.47:1,9.47:2,9.47:3,9.47:4,9.47:5,9.47:6,9.47:7,9.47:8,9.47:9,9.47:10,%
+ 9.47:11,9.47:12,9.47:13}
+
+\printbibliography[title={APA 9.47--Order of Works With the Same Author and
+Same Date}]
+
+\noindent\textbf{Note:} Examples added for no dates, «in press» requirements and
+also ignoring of «The», «An» and «A» in titles for sorting purposes.
+
+\end{refsection}
+\newpage
+% (APA 9.48)
+\begin{refsection}
+
+\nocite{9.48:1,9.48:2}
+
+\printbibliography[title={APA 9.48--Order of Works by First Authors With
+ the Same Surname}]
+
+\end{refsection}
+\newpage
+% (APA 9.49)
+\begin{refsection}
+
+\nocite{9.49:1,9.49:2,9.49:3,9.49:4,9.49:5,9.49:6}
+
+\printbibliography[title={APA 9.49--Order of Works with No Author or an
+ Anonymous Author}]
+
+\noindent\textbf{Note:} Examples added for anonymous authors and numeral
+expansion/series sorting using |SORTTITLE|.
+
+\end{refsection}
+\newpage
+% (APA 9.51)
+\begin{refsection}
+
+\nocite{9.51:1,9.51:2}
+
+\printbibliography[title={APA 9.51--Annotated Bibliographies}]
+
+\end{refsection}
+\newpage
+% (APA 9.52)
+\begin{refsection}
+
+\nocite{9.52:1,9.52:2,9.52:3,9.52:4}
+
+\printbibliography[title={APA 9.52--References Included in a Meta-Analysis}]
+
+\noindent\textbf{Note:} Use the |meta| keyword in the |KEYWORDS| field to
+indicate works included in a Meta-Analysis.
+
+\end{refsection}
+\newpage
+\section{APA 10--References Examples}
+\subsection{APA 10.1--Periodicals}
+
+\begin{refsection}
+
+\noindent\apa{10.1 Example 1}\\
+\apaex{\parencite{10.1:1}}\\
+\apaex{\textcite{10.1:1}}
+
+\noindent\apa{10.1 Example 2}\\
+\apaex{\parencite{10.1:2}}\\
+\apaex{\textcite{10.1:2}}
+
+\noindent\apa{10.1 Example 3}\\
+\apaex{\parencite{10.1:3a,10.1:3b}}\\
+\apaex{\textcite{10.1:3a} and \textcite{10.1:3b}}
+
+\noindent\apa{10.1 Example 4}\\
+\apaex{\parencite{10.1:4}}\\
+\apaex{\textcite{10.1:4}}
+
+\noindent\apa{10.1 Example 5}\\
+\apaex{\parencite{10.1:5}}\\
+\apaex{\textcite{10.1:5}}
+
+\noindent\apa{10.1 Example 6}\\
+\apaex{\parencite{10.1:6}}\\
+\apaex{\textcite{10.1:6}}
+
+\noindent\apa{10.1 Example 7}\\
+\apaex{\parencite{10.1:7}}\\
+\apaex{\textcite{10.1:7}}
+
+\noindent\apa{10.1 Example 8}\\
+\apaex{\parencite{10.1:8}}\\
+\apaex{\textcite{10.1:8}}
+
+\noindent\apa{10.1 Example 9}\\
+\apaex{\parencite{10.1:9}}\\
+\apaex{\textcite{10.1:9}}
+
+\noindent\apa{10.1 Example 10}\\
+\apaex{\parencite{10.1:10}}\\
+\apaex{\textcite{10.1:10}}
+
+\noindent\apa{10.1 Example 11}\\
+\apaex{\parencite{10.1:11}}\\
+\apaex{\textcite{10.1:11}}
+
+\noindent\apa{10.1 Example 12}\\
+\apaex{\parencite{10.1:12a,10.1:12b}}\\
+\apaex{\textcite{10.1:12a} and \textcite{10.1:12b}}
+
+\noindent\apa{10.1 Example 13}\\
+\apaex{\parencite{10.1:13}}\\
+\apaex{\textcite{10.1:13}}
+
+\noindent\apa{10.1 Example 14}\\
+\apaex{\parencite{10.1:14}}\\
+\apaex{\textcite{10.1:14}}
+
+\noindent\apa{10.1 Example 15}\\
+\apaex{\parencite{10.1:15a,10.1:15b,10.1:15c}}\\
+\apaex{\textcite{10.1:15a}, \textcite{10.1:15b}, and \textcite{10.1:15c}}
+
+\noindent\apa{10.1 Example 16}\\
+\apaex{\parencite{10.1:16a,10.1:16b}}\\
+\apaex{\textcite{10.1:16a} and \textcite{10.1:16b}}
+
+\noindent\apa{10.1 Example 17}\\
+\apaex{\parencite{10.1:17}}\\
+\apaex{\textcite{10.1:17}}
+
+\noindent\apa{10.1 Example 18}\\
+\apaex{\parencite{10.1:18}}\\
+\apaex{\textcite{10.1:18}}
+
+\noindent\apa{10.1 Example 19}\\
+\apaex{\parencite{10.1:19}}\\
+\apaex{\textcite{10.1:19}}
+
+\printbibliography[title={APA 10.1 References}]
+
+\end{refsection}
+\newpage
+\subsection{APA 10.2--Books and Reference Works}
+
+\begin{refsection}
+
+\noindent\apa{10.2 Example 20}\\
+\apaex{\parencite{10.2:20}}\\
+\apaex{\textcite{10.2:20}}
+
+\noindent\apa{10.2 Example 21}\\
+\apaex{\parencite{10.2:21}}\\
+\apaex{\textcite{10.2:21}}
+
+\noindent\apa{10.2 Example 22}\\
+\apaex{\parencite{10.2:22a,10.2:22b}}\\
+\apaex{\textcite{10.2:22a} and \textcite{10.2:22b}}
+
+\noindent\apa{10.2 Example 23}\\
+\apaex{\parencite{10.2:23}}\\
+\apaex{\textcite{10.2:23}}
+
+\noindent\apa{10.2 Example 24}\\
+\apaex{\parencite{10.2:24}}\\
+\apaex{\textcite{10.2:24}}
+
+\noindent\apa{10.2 Example 25}\\
+\apaex{\parencite{10.2:25}}\\
+\apaex{\textcite{10.2:25}}
+
+\noindent\apa{10.2 Example 26}\\
+\apaex{\parencite{10.2:26}}\\
+\apaex{\textcite{10.2:26}}
+
+\noindent\apa{10.2 Example 27}\\
+\apaex{\parencite{10.2:27a,10.2:27b}}\\
+\apaex{\textcite{10.2:27a} and \textcite{10.2:27b}}
+
+\noindent\apa{10.2 Example 28}\\
+\apaex{\parencite{10.2:28}}\\
+\apaex{\textcite{10.2:28}}
+
+\noindent\apa{10.2 Example 29}\\
+\apaex{\parencite{10.2:29a,10.2:29b}}\\
+\apaex{\textcite{10.2:29a} and \textcite{10.2:29b}}
+
+\noindent\apa{10.2 Example 30}\\
+\apaex{\parencite{10.2:30a,10.2:30b}}\\
+\apaex{\textcite{10.2:30a} and \textcite{10.2:30b}}
+
+\noindent\apa{10.2 Example 31}\\
+\apaex{\parencite{10.2:31}}\\
+\apaex{\textcite{10.2:31}}
+
+\noindent\apa{10.2 Example 32}\\
+The examples for citing such manuals are a mess in the 7th edition with a
+language-dependent possessive in the narrative examples. However, these
+rules are not strict according to the comments and can be constructed with
+the help of lower-level commands:\\\\
+\apaex{\citetitle{10.2:32a} (\citefield{10.2:32a}{edition};
+ \citefield{10.2:32a}{shorthand}; \citeauthor{10.2:32a}, \citeyear{10.2:32a})}\\
+\apaex{\citetitle{10.2:32b} (\citefield{10.2:32b}{edition};
+ \citefield{10.2:32b}{shorthand}; \citeauthor{10.2:32b}, \citeyear{10.2:32b})}\\\\
+\apaex{\citeauthor{10.2:32a}'s (\citeyear{10.2:32a}) \citetitle{10.2:32a}
+ (\citefield{10.2:32a}{edition}; \citefield{10.2:32a}{shorthand})}\\
+\apaex{\citeauthor{10.2:32b}'s (\citeyear{10.2:32b}) \citetitle{10.2:32b}
+ (\citefield{10.2:32b}{edition}; \citefield{10.2:32b}{shorthand})}\\\\
+
+\noindent Then for subsequent cites, use the normal commands:\\
+\apaex{\parencite{10.2:32a,10.2:32b}}\\
+\apaex{\textcite{10.2:32a} and \textcite{10.2:32b}}
+
+\noindent\apa{10.2 Example 33}\\
+\apaex{\parencite{10.2:33a,10.2:33b,10.2:33c}}\\
+\apaex{\textcite{10.2:33a} and \textcite{10.2:33b} and \textcite{10.2:33c}}
+
+\noindent\apa{10.2 Example 34}\\
+\apaex{\parencite{10.2:34}}\\
+\apaex{\textcite{10.2:34}}
+
+\noindent\apa{10.2 Example 35}\\
+\apaex{\parencite{10.2:35a,10.2:35b,10.2:35c}}\\
+\apaex{\textcite{10.2:35a} and \textcite{10.2:35b} and \textcite{10.2:35c}}
+
+\noindent\apa{10.2 Example 36}\\
+\apaex{\parencite{10.2:36}}\\
+\apaex{\textcite{10.2:36}}
+
+\noindent\apa{10.2 Example 37}\\
+\apaex{\parencite{10.2:37}}\\
+\apaex{\textcite{10.2:37}}
+
+\printbibliography[title={APA 10.2 References}]
+
+\end{refsection}
+\newpage
+\subsection{APA 10.3--Edited Book Chapters and Entries in Reference Works}
+
+\begin{refsection}
+
+\noindent\apa{10.3 Example 38}\\
+\apaex{\parencite{10.3:38}}\\
+\apaex{\textcite{10.3:38}}
+
+\noindent\apa{10.3 Example 39}\\
+\apaex{\parencite{10.3:39}}\\
+\apaex{\textcite{10.3:39}}
+
+\noindent\apa{10.3 Example 40}\\
+\apaex{\parencite{10.3:40}}\\
+\apaex{\textcite{10.3:40}}
+
+\noindent\apa{10.3 Example 41}\\
+\apaex{\parencite{10.3:41}}\\
+\apaex{\textcite{10.3:41}}
+
+\noindent\apa{10.3 Example 42}\\
+\apaex{\parencite{10.3:42}}\\
+\apaex{\textcite{10.3:42}}
+
+\noindent\apa{10.3 Example 43}\\
+\apaex{\parencite{10.3:43}}\\
+\apaex{\textcite{10.3:43}}
+
+\noindent\apa{10.3 Example 44}\\
+\apaex{\parencite{10.3:44}}\\
+\apaex{\textcite{10.3:44}}
+
+\noindent\apa{10.3 Example 45}\\
+\apaex{\parencite{10.3:45}}\\
+\apaex{\textcite{10.3:45}}
+
+\noindent\apa{10.3 Example 46}\\
+\apaex{\parencite{10.3:46}}\\
+\apaex{\textcite{10.3:46}}
+
+\noindent\apa{10.3 Example 47}\\
+\apaex{\parencite{10.3:47a,10.3:47b}}\\
+\apaex{\textcite{10.3:47a} and \textcite{10.3:47b}}
+
+\noindent\apa{10.3 Example 48}\\
+\apaex{\parencite{10.3:48}}\\
+\apaex{\textcite{10.3:48}}
+
+\noindent\apa{10.3 Example 49}\\
+\apaex{\parencite{10.3:49}}\\
+\apaex{\textcite{10.3:49}}
+
+\printbibliography[title={APA 10.3 References}]
+
+\end{refsection}
+\newpage
+\subsection{APA 10.4--Reports and Gray Literature}
+
+\begin{refsection}
+
+\noindent\apa{10.4 Example 50}\\
+\apaex{\parencite{10.4:50a,10.4:50b,10.4:50c}}\\
+\apaex{\textcite{10.4:50a} and \textcite{10.4:50b} and \textcite{10.4:50c}}
+
+\noindent\apa{10.4 Example 51}\\
+\apaex{\parencite{10.4:51a,10.4:51b}}\\
+\apaex{\textcite{10.4:51a} and \textcite{10.4:51b}}
+
+\noindent\apa{10.4 Example 52}\\
+\apaex{\parencite{10.4:52}}\\
+\apaex{\textcite{10.4:52}}
+
+\noindent\apa{10.4 Example 53}\\
+\apaex{\parencite{10.4:53}}\\
+\apaex{\textcite{10.4:53}}
+
+\noindent\apa{10.4 Example 54}\\
+\apaex{\parencite{10.4:54}}\\
+\apaex{\textcite{10.4:54}}
+
+\noindent\apa{10.4 Example 55}\\
+\apaex{\parencite{10.4:55a,10.4:55b,10.4:55c}}\\
+\apaex{\textcite{10.4:55a} and \textcite{10.4:55b} and \textcite{10.4:55c}}
+
+\noindent\apa{10.4 Example 56}\\
+\apaex{\parencite{10.4:56}}\\
+\apaex{\textcite{10.4:56}}
+
+\noindent\apa{10.4 Example 57}\\
+\apaex{\parencite{10.4:57}}\\
+\apaex{\textcite{10.4:57}}
+
+\noindent\apa{10.4 Example 58}\\
+\apaex{\parencite{10.4:58}}\\
+\apaex{\textcite{10.4:58}}
+
+\noindent\apa{10.4 Example 59}\\
+\apaex{\parencite{10.4:59}}\\
+\apaex{\textcite{10.4:59}}
+
+\printbibliography[title={APA 10.4 References }]
+\end{refsection}
+\newpage
+\subsection{APA 10.5--Conference Sessions and Presentations}
+
+\begin{refsection}
+
+\noindent\apa{10.5 Example 60}\\
+\apaex{\parencite{10.5:60}}\\
+\apaex{\textcite{10.5:60}}
+
+\noindent\apa{10.5 Example 61}\\
+\apaex{\parencite{10.5:61}}\\
+\apaex{\textcite{10.5:61}}
+
+\noindent\apa{10.5 Example 62}\\
+\apaex{\parencite{10.5:62}}\\
+\apaex{\textcite{10.5:62}}
+
+\noindent\apa{10.5 Example 63}\\
+\apaex{\parencite{10.5:63}}\\
+\apaex{\textcite{10.5:63}}
+
+\printbibliography[title={APA 10.5 References }]
+\end{refsection}
+\newpage
+\subsection{APA 10.6--Dissertations and Theses}
+
+\begin{refsection}
+
+\noindent\apa{10.6 Example 64}\\
+\apaex{\parencite{10.6:64}}\\
+\apaex{\textcite{10.6:64}}
+
+\noindent\apa{10.6 Example 65}\\
+\apaex{\parencite{10.6:65}}\\
+\apaex{\textcite{10.6:65}}
+
+\noindent\apa{10.6 Example 66}\\
+\apaex{\parencite{10.6:66}}\\
+\apaex{\textcite{10.6:66}}
+
+\printbibliography[title={APA 10.6 References }]
+\end{refsection}
+\newpage
+\subsection{APA 10.7--Reviews}
+
+\begin{refsection}
+
+\noindent\apa{10.7 Example 67}\\
+\apaex{\parencite{10.7:67}}\\
+\apaex{\textcite{10.7:67}}
+
+\noindent\apa{10.7 Example 68}\\
+\apaex{\parencite{10.7:68}}\\
+\apaex{\textcite{10.7:68}}
+
+\noindent\apa{10.7 Example 69}\\
+\apaex{\parencite{10.7:69}}\\
+\apaex{\textcite{10.7:69}}
+
+\printbibliography[title={APA 10.7 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.8--Unpublished Works and Informally Published Works}
+
+\begin{refsection}
+
+\noindent\apa{10.8 Example 70}\\
+\apaex{\parencite{10.8:70}}\\
+\apaex{\textcite{10.8:70}}
+
+\noindent\apa{10.8 Example 71}\\
+\apaex{\parencite{10.8:71}}\\
+\apaex{\textcite{10.8:71}}
+
+\noindent\apa{10.8 Example 72}\\
+\apaex{\parencite{10.8:72}}\\
+\apaex{\textcite{10.8:72}}
+
+\noindent\apa{10.8 Example 73}\\
+\apaex{\parencite{10.8:73a,10.8:73b}}\\
+\apaex{\textcite{10.8:73a} and \textcite{10.8:73b}}
+
+\noindent\apa{10.8 Example 74}\\
+\apaex{\parencite{10.8:74}}\\
+\apaex{\textcite{10.8:74}}
+
+\printbibliography[title={APA 10.8 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.9--Data Sets}
+
+\begin{refsection}
+
+\noindent\apa{10.9 Example 75}\\
+\apaex{\parencite{10.9:75a,10.9:75b,10.9:75c}}\\
+\apaex{\textcite{10.9:75a} and \textcite{10.9:75b} and \textcite{10.9:75c}}
+
+\noindent\apa{10.9 Example 76}\\
+\apaex{\parencite{10.9:76a,10.9:76b}}\\
+\apaex{\textcite{10.9:76a} and \textcite{10.9:76b}}
+
+\printbibliography[title={APA 10.9 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.10--Computer Software, Mobile Apps, Apparatuses, and Equipment}
+
+\begin{refsection}
+
+\noindent\apa{10.10 Example 77}\\
+\apaex{\parencite{10.10:77}}\\
+\apaex{\textcite{10.10:77}}
+
+\noindent\apa{10.10 Example 78}\\
+\apaex{\parencite{10.10:78a,10.10:78b}}\\
+\apaex{\textcite{10.10:78a} and \textcite{10.10:78b}}
+
+\noindent\apa{10.10 Example 79}\\
+\apaex{\parencite{10.10:79}}\\
+\apaex{\textcite{10.10:79}}
+
+\noindent\apa{10.10 Example 80}\\
+\apaex{\parencite{10.10:80}}\\
+\apaex{\textcite{10.10:80}}
+
+\printbibliography[title={APA 10.10 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.11--Tests, Scales, and Inventories}
+
+\begin{refsection}
+
+\noindent\apa{10.11 Example 81}\\
+\apaex{\parencite{10.11:81}}\\
+\apaex{\textcite{10.11:81}}
+
+\noindent\apa{10.11 Example 82}\\
+\apaex{\parencite{10.11:82}}\\
+\apaex{\textcite{10.11:82}}
+
+\noindent\apa{10.11 Example 83}\\
+\apaex{\parencite{10.11:83a,10.11:83b}}\\
+\apaex{\textcite{10.11:83a} and \textcite{10.11:83b}}
+
+\printbibliography[title={APA 10.11 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.12--Audiovisual Works}
+
+\begin{refsection}
+
+\noindent\apa{10.12 Example 84}\\
+\apaex{\parencite{10.12:84a,10.12:84b,10.12:84c}}\\
+\apaex{\textcite{10.12:84a} and \textcite{10.12:84b} and \textcite{10.12:84c}}
+
+\noindent\apa{10.12 Example 85}\\
+\apaex{\parencite{10.12:85}}\\
+\apaex{\textcite{10.12:85}}
+
+\noindent\apa{10.12 Example 86}\\
+\apaex{\parencite{10.12:86}}\\
+\apaex{\textcite{10.12:86}}
+
+\noindent\apa{10.12 Example 87}\\
+\apaex{\parencite{10.12:87a,10.12:87b}}\\
+\apaex{\textcite{10.12:87a} and \textcite{10.12:87b}}
+
+\noindent\apa{10.12 Example 88}\\
+\apaex{\parencite{10.12:88a,10.12:88b}}\\
+\apaex{\textcite{10.12:88a} and \textcite{10.12:88b}}
+
+\noindent\apa{10.12 Example 89}\\
+\apaex{\parencite{10.12:89}}\\
+\apaex{\textcite{10.12:89}}
+
+\noindent\apa{10.12 Example 90}\\
+\apaex{\parencite{10.12:90a,10.12:90b,10.12:90c}}\\
+\apaex{\textcite{10.12:90a} and \textcite{10.12:90b} and \textcite{10.12:90c}}
+
+\printbibliography[title={APA 10.12 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.13--Audio Works}
+
+\begin{refsection}
+
+\noindent\apa{10.13 Example 91}\\
+\apaex{\parencite{10.13:91a,10.13:91b}}\\
+\apaex{\textcite{10.13:91a} and \textcite{10.13:91b}}
+
+\noindent\apa{10.13 Example 92}\\
+\apaex{\parencite{10.13:92a,10.13:92b,10.13:92c,10.13:92d}}\\
+\apaex{\textcite{10.13:92a} and \textcite{10.13:92b} and
+ \textcite{10.13:92c} and \textcite{10.13:92d}}
+
+\noindent\apa{10.13 Example 93}\\
+\apaex{\parencite{10.13:93}}\\
+\apaex{\textcite{10.13:93}}
+
+\noindent\apa{10.13 Example 94}\\
+\apaex{\parencite{10.13:94}}\\
+\apaex{\textcite{10.13:94}}
+
+\noindent\apa{10.13 Example 95}\\
+\apaex{\parencite{10.13:95}}\\
+\apaex{\textcite{10.13:95}}
+
+\noindent\apa{10.13 Example 96}\\
+\apaex{\parencite{10.13:96}}\\
+\apaex{\textcite{10.13:96}}
+
+\printbibliography[title={APA 10.13 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.14--Visual Works}
+
+\begin{refsection}
+
+\noindent\apa{10.14 Example 97}\\
+\apaex{\parencite{10.14:97a,10.14:97b}}\\
+\apaex{\textcite{10.14:97a} and \textcite{10.14:97b}}
+
+\noindent\apa{10.14 Example 98}\\
+\apaex{\parencite{10.14:98}}\\
+\apaex{\textcite{10.14:98}}
+
+\noindent\apa{10.14 Example 99}\\
+\apaex{\parencite{10.14:99}}\\
+\apaex{\textcite{10.14:99}}
+
+\noindent\apa{10.14 Example 100}\\
+\apaex{\parencite{10.14:100a,10.14:100b}}\\
+\apaex{\textcite{10.14:100a} and \textcite{10.14:100b}}
+
+\noindent\apa{10.14 Example 101}\\
+\apaex{\parencite{10.14:101a,10.14:101b}}\\
+\apaex{\textcite{10.14:101a} and \textcite{10.14:101b}}
+
+\noindent\apa{10.14 Example 102}\\
+\apaex{\parencite{10.14:102a,10.14:102b,10.14:102c}}\\
+\apaex{\textcite{10.14:102a} and \textcite{10.14:102b} and \textcite{10.14:102c}}
+
+\printbibliography[title={APA 10.14 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.15--Social Media}
+
+\begin{refsection}
+
+\noindent\apa{10.15 Example 103}\\
+\apaex{\parencite{10.15:103a,10.15:103b,10.15:103c}}\\
+\apaex{\textcite{10.15:103a} and \textcite{10.15:103b} and \textcite{10.15:103c}}
+
+\noindent\apa{10.15 Example 104}\\
+\apaex{\parencite{10.15:104}}\\
+\apaex{\textcite{10.15:104}}
+
+\noindent\apa{10.15 Example 105}\\
+\apaex{\parencite{10.15:105a,10.15:105b,10.15:105c}}\\
+\apaex{\textcite{10.15:105a} and \textcite{10.15:105b} and \textcite{10.15:105c}}
+
+\noindent\apa{10.15 Example 106}\\
+\apaex{\parencite{10.15:106}}\\
+\apaex{\textcite{10.15:106}}
+
+\noindent\apa{10.15 Example 107}\\
+\apaex{\parencite{10.15:107}}\\
+\apaex{\textcite{10.15:107}}
+
+\noindent\apa{10.15 Example 108}\\
+\apaex{\parencite{10.15:108}}\\
+\apaex{\textcite{10.15:108}}
+
+\noindent\apa{10.15 Example 109}\\
+\apaex{\parencite{10.15:109}}\\
+\apaex{\textcite{10.15:109}}
+
+\printbibliography[title={APA 10.15 References}]
+\end{refsection}
+\newpage
+\subsection{APA 10.16--Webpages and Websites}
+
+\begin{refsection}
+
+\noindent\apa{10.16 Example 110}\\
+\apaex{\parencite{10.16:110a,10.16:110b}}\\
+\apaex{\textcite{10.16:110a} and \textcite{10.16:110b}}
+
+\noindent\apa{10.16 Example 111}\\
+\apaex{\parencite{10.16:111a,10.16:111b}}\\
+\apaex{\textcite{10.16:111a} and \textcite{10.16:111b}}
+
+\noindent\apa{10.16 Example 112}\\
+\apaex{\parencite{10.16:112}}\\
+\apaex{\textcite{10.16:112}}
+
+\noindent\apa{10.16 Example 113}\\
+\apaex{\parencite{10.16:113a,10.16:113b}}\\
+\apaex{\textcite{10.16:113a} and \textcite{10.16:113b}}
+
+\noindent\apa{10.16 Example 114}\\
+\apaex{\parencite{10.16:114}}\\
+\apaex{\textcite{10.16:114}}
+
+\printbibliography[title={APA 10.16 References}]
+\end{refsection}
+
+\newpage
+\subsection{APA 11.8--Patents}
+
+\begin{refsection}
+
+\noindent\apa{11.8 Example 22}\\
+\apaex{\parencite{11.8:22}}\\
+\apaex{\textcite{11.8:22}}
+
+\printbibliography[title={APA 11.8 References}]
+\end{refsection}
+
\end{document}
-% Local Variables:
-% TeX-engine: luatex
-% End:
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex 2019-11-23 21:21:40 UTC (rev 52900)
@@ -24,12 +24,12 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip at kime.org.uk},
- revision={8.0},
+ revision={9.0},
date={\today}}
\hypersetup{%
pdftitle={APA Bib\LaTeX\ style},
- pdfsubject={APA 6 Conformant Style for Bib\LaTeX},
+ pdfsubject={APA 7th Edition Conformant Style for Bib\LaTeX},
pdfauthor={Philip Kime},
pdfkeywords={latex, biblatex, APA, style}}
@@ -44,88 +44,24 @@
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:
+\minisec{9.0}
+Completely overhauled for APA 7th edition. APA 7th edition is a lot more
+consistent in terms of its formatting blocks and elements, resulting in
+much less dependence on ad-hoc entry types and fields. In general, your
+\file{.bib} should be updated in accordance with this documentation for APA
+7th edition compatibility.
-\begin{verbatim}
- ENTRYSUBTYPE = {nonacademic}
-\end{verbatim}
+\noindent |biber| 2.14+ and and |biblatex| 3.14 + are \emph{required}.
-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.
+One effect of the normalisation of reference entries in the 7th edition is
+that standard entrytypes can be used to cover many more cases. However,
+differentiation between different entry subtypes (for example, songs,
+albums or podcasts within the |AUDIO| entry type) is handled by localised
+strings held in the |ENTRYSUBTYPE| field. As a result, many more
+localisation strings have been added to the |.lbx| files. Please let me
+know if you are able to translation the new strings in the |.lbx| file for
+your language, they are generally marked with ``\texttt{\%FIXME}``.
-\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}
@@ -134,22 +70,23 @@
Association) 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.
+localisation files (\path{<language>-apa.lbx}). The style is loaded just
+like any other Bib\LaTeX\ styles but don't try to use the citation and
+references styles separately as they rely on each other, macro-wise, in
+places.
+In general, there is no attempt to generalise this style for non-APA
+requirements--it is written for APA compliance only. Having said that,
+there are a few options which allow users to change the APA defaults.
+
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).
+APA Style Guide (7th 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
+3.14) and Biber ($\geq$ 2.14). 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
@@ -158,11 +95,10 @@
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.
+If you are using an APA document \latex class, the class should be invoked
+with the |noapacite| class option as per the documentation. Without this
+class option, the APA class will automatically try to use plain Bib\TeX\
+with the |apacite| style which is completely incompatible with Bib\LaTeX.
\subsection{License}
@@ -169,18 +105,17 @@
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).
+maintainer is Philip Kime.
\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.
+When I started using Bib\LaTeX, I assumed there would be an APA style. 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 over many chapters 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}
@@ -197,7 +132,8 @@
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.
+Sergei Golovan for the Russian localisation. Thanks to Vítor Míguez for the
+Galacian localisation.
\section{Use}\label{ref:use}
\label{use}
@@ -235,7 +171,7 @@
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.
+Bib\TeX\ way, capitalise normally 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
@@ -248,8 +184,7 @@
\begin{ltxcode}
apabackref=true|false
-\end{ltxcode}% | stupid comment to stop emacs highlighting as verb due
- % to single pipe
+\end{ltxcode}%|
\noindent It is not APA style to include backreferences in the References to
pages where citations of the entry occur. However, this is very
@@ -261,16 +196,10 @@
\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
+printed in the References. APA style defaults to 20. 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)
+contexts (for example in a CV where you are an author in position 21 \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
@@ -302,7 +231,7 @@
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.
+macro in the relevant language |.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
@@ -327,21 +256,21 @@
\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.
+ file.} This document typesets every useful example from
+ \apa{8}--\apa{10}. 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.
+ \path{.bib} entries for all of the examples in \apa{9} and \apa{10}. 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{9} or \apa{10}, look it up in here. Every
+ example is marked with the APA example number and has explanatory notes
+ where necessary.
\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.
@@ -357,12 +286,7 @@
\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
+\apa{8.11} 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
@@ -393,483 +317,85 @@
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{Publication Status}
+In addition to the standard |PUBSTATE| field publication state localisation
+string ``in press'', the |HOWPUBLISHED| field offers also the following
+localisation strings \apa{10.8}. There is no better way to do this as such
+states are language dependent and need localisation strings:
-\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{description}
+ \item[manunpub] Unpublished Manuscript
+ \item[maninprep] Manuscript in preparation
+ \item[mansub] Manuscript submitted for publication
+\end{description}
-\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}
+\subsubsection{Authors and Group Authors}
+APA 7th edition has a concept of a ``Group'' author \apa{9.11}. The style
+provides the |GROUPAUTHOR| entry field in all entry types. It is
+recommended to use |GROUPAUTHOR| when the author is an organisation or
+group as there are rules for name lists which are different for group
+authors (for example \apa{9.8}). |AUTHOR| is used much more extensively as
+the main agent of a work and the specific roles for particular agents is
+handled using |biber'|'s data annotation feature, see below.
+
+\subsubsection{Roles}
+The main role \apa{9.10} is of course specified by the |AUTHOR| entry
+field. You can attach specialised roles to any name in the |AUTHOR| field as
+required by many examples in \apa{10}, using |biber|'s data annotation
+feature. This is heavily used in the style and allows easy automation of
+complex examples like those in \apa{10.12}. See the
+|biblatex-apa-test-references.bib| example file used to generate the main
+test document. Data annotations can be named and the style requires that
+you name data annotations for various tasks correctly:
+
+\begin{description}
+ \item[role] Data annotation to denote a specialised role for a particular
+ name in the |AUTHOR| name list or a specialised role for the entire
+ name list. Multiple roles may be specified for a name/name list.
+ \item[username] Literal data annotation to denote a username for an
+ online service associated with a name in the |AUTHOR| name list.
+\end{description}
%
-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.
+Examples of these data annotations can be found in example documentation
+and |.bib| file. Data annotations are generally used when particular names
+in a name list require annotating with a specialized role.
-\subsubsection{Retrieval dates for online items}
+Some roles:
-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{itemize}
+ \item Editor(s)
+ \item Translator(s)
+ \item Narrator(s)
+\end{itemize}
+%
+are very common and often occur in addition to the |AUTHOR| name list and
+so are usually specified by their own entry field. When the specialized
+role attaches to a complete name list \apa{10.2:26} rather than
+an individual name in a list \apa{10.12:84}, you have the choice
+to use data annotations or a dedicated name list. The latter is preferable
+if an appropriate name list exists (it does for all examples in \apa{10}).
-\begin{lstlisting}[style=latex]{}
-\DeclareSourcemap{
- \maps[datatype=bibtex]{
- \map{
- \step[fieldsource=url,
- notmatch=\regexp{wiki},
- final=1]
- \step[fieldset=urldate, null]
- }
- }
-}
-\end{lstlisting}
+There are some special cases for secondary name lists with uncommon roles
+which are handled with the standard |biblatex| |EDITORX| fields and
+associated |EDITORTYPE| fields \apa{10.5:63}.
-\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}.
+\subsubsection{Article types}
+Since |ARTICLE| entry types are used extensively for academic journals and
+also newspaper articles, the |KEYWORD| ``nonacademic'' should be specified
+for articles that are not academic articles in an academic journal. This is
+because date formatting differs in the style between academic and
+non-academic articles. This is a more general solution than introducing new
+entry types which are not supported by other software.
+
\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
+\begin{release}{9.0}{2019-}
+\item First release (of APA 7th edition style)
\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}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{american-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{american}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,78 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {american},
+ article = {{article}{article}},
+ painting = {{painting}{painting}},
+ present = {{present}{present}},
+ song = {{song}{song}},
+ album = {{album}{album}},
+ map = {{map}{map}},
+ photograph = {{photograph}{photograph}},
+ photographs = {{photographs}{photographs}},
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},
+ lecturenotes = {{lecturenotes}{lecturenotes}},
+ podcast = {{audio\space podcast}{audio\space podcast}},
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},
+ interview = {{interview}{interview}},
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},
+ lithograph = {{lithograph}{lith\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space series}{TV\space series}},
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},
+ supplement = {{supplement}{suppl\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+ reviewof = {{review of}{rev\adddotspace of}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
on = {{on}{on}},
@@ -38,13 +99,29 @@
with = {{with}{with}},
reprintas = {{reprinted as}{reprinted as}},
reprintfrom = {{reprinted from}{reprinted from}},
- reviewof = {{review\space of}{review\space of}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ commentonarticle = {{comment\space on\space the\space article}{comment\space on\space the\space article}},
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
+ part = {{part}{pt\adddot}},
+ paragraph = {{paragraph}{para\adddot}},
+ paragraphs = {{paragraphs}{paras\adddot}},
+ narrator = {{narrator}{narr\adddot}},
+ narrators = {{narrators}{narrs\adddot}},
producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
+ producers = {{producers}{producers}},
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},
+ director = {{director}{dir\adddot}},
+ directors = {{directors}{dirs\adddot}},
writer = {{writer}{writer}},
+ writers = {{writers}{writers}},
+ host = {{host}{host}},
+ hosts = {{hosts}{hosts}},
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},
mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}},
phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
@@ -58,6 +135,8 @@
typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -64,16 +143,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +171,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -115,9 +193,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2019/09/07\space v8.0\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2019/11/23\space v9.0\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -43,19 +43,53 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Used to join citations/references to
-% extradate
+% Optional parens/brackets
+% Thanks to egreg from https://tex.stackexchange.com/questions/53068/how-to-check-if-a-macro-value-is-empty-or-will-not-create-text-with-plain-tex-co
+% for this test for expanded emptiness so that we can easily opt to not print parens around nothing
+% Without this, it is very messy - you have to test all potential fields for defness first and this
+% is messy because the fields in the additional info vary betwee entrytypes
+\def\foreverunspace{%
+ \ifnum\lastnodetype=11
+ \unskip\foreverunspace
+ \else
+ \ifnum\lastnodetype=12
+ \unkern\foreverunspace
+ \else
+ \ifnum\lastnodetype=13
+ \unpenalty\foreverunspace
+ \fi
+ \fi
+ \fi
+}
-\newcommand{\apashortdash}{-}
+\newrobustcmd{\mkbibparense}[1]{%
+ \setbox0=\hbox{#1\foreverunspace}%
+ \ifdim\wd0=0pt
+ \else
+ % Since we are evaluating the argument twice and it contains \setunit,
+ % need to sanitise \setunit second time around. Can't just put in \box0
+ % as it might be long and won't linebreak
+ \mkbibparens{\setunit{}#1}%
+ \fi}
+\newrobustcmd{\mkbibbracketse}[1]{%
+ \setbox0=\hbox{#1\foreverunspace}%
+ \ifdim\wd0=0pt
+ \else
+ % Since we are evaluating the argument twice and it contains \setunit,
+ % need to sanitise \setunit second time around. Can't just put in \box0
+ % as it might be long and won't linebreak
+ \mkbibbrackets{\setunit{}#1}%
+ \fi}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.8) - Allow variable max authors/editors limit
+% Default to APA 19
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Allow variable max authors/editors limit
-
-\newcommand{\maxprtauth}{7}
+\newcommand{\maxprtauth}{20}
\DeclareBibliographyOption{apamaxprtauth}{%
\ifstrempty{#1}
{}
@@ -62,43 +96,28 @@
{\renewcommand{\maxprtauth}{#1}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.22) Force roman numerals into arabic
-% using etoolbox macros
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Force roman numerals into arabic using
+% etoolbox macros
\newcommand{\apanum}[1]{\ifrmnum{#1}{\rmntonum{#1}}{#1}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Apa defines no particular hanging indent but this makes it look like the
-% examples in the style manual.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.43) Hanging indent of 0.5in
-\setlength{\bibhang}{2.5em}
+\setlength{\bibhang}{0.5in}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 4.16 Example 29) Some DSM macros
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Date formats. Suppress end range of less specific fields
-\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}%
@@ -110,7 +129,7 @@
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
+ {\bibdatedash\bibstring{present}}
{\bibdatedash%
\iffieldsequal{#1year}{#1endyear}%
{\iffieldsequal{#1month}{#1endmonth}%
@@ -126,7 +145,7 @@
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
+ {\bibdatedash\bibstring{present}}
{\bibdatedash%
\iffieldsequal{#1year}{#1endyear}%
{\iffieldsequal{#1month}{#1endmonth}%
@@ -152,7 +171,7 @@
\iffieldundef{#1endyear}%
{}%
{\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
+ {\bibdatedash\bibstring{present}}
{\bibdatedash%
\iffieldsequal{#1year}{#1endyear}%
{\iffieldsequal{#1month}{#1endmonth}%
@@ -170,34 +189,25 @@
\ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.09 Example 62) ERIC
-% eprint references
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 8.12) sort citations
+% (APA 8.17) More than two authors is truncated to one but overriden for list ambiguity to
+% point of no ambiguity
+% (APA 8.20) Use initials to disambiguate shared surnames
+% (APA 8.19) Use year postfix to disambiguate multiple items in same year
+% (APA 9.44, 9.46, 9.47) Sorting is nyt but we need to account for PUBSTATE which comes
+% after all normal cites for the same author
+% (APA 9.42) Secular Before Common Era dates, approximate dates
+% (APA Figure 9.2) Sorting ignores punctuation in names
+% (APA 9.47) Ignore "The", "An" and "A" when sorting titles
-\DeclareFieldFormat{eprint:eric}{%
- \printtext{\bibcpstring{retrieved}}%
- \setunit{\addspace}%
- \printtext{\bibstring{from}}\addspace%
- ERIC\addspace database\adddot\addspace%
- \mkbibparens{#1}}
+\DeclareNosort{
+ \nosort{setnames}{\regexp{\p{General_Category=Punctuation}}}
+ \nosort{settitles}{\regexp{\A(?:The|An|A)\s+}}
+}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (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}
@@ -208,12 +218,8 @@
\sort{
\field{sortname}
\field{author}
+ \field{groupauthor}
\field{editor}
- \field{translator}
- \field{writer}
- \field{director}
- \field{producer}
- \field{execproducer}
\field{sorttitle}
\field{title}
}
@@ -235,19 +241,24 @@
}
}
+% Include groupauthor
+\DeclareLabelname{%
+ \field{shortauthor}
+ \field{author}
+ \field{groupauthor}
+ \field{shorteditor}
+ \field{editor}
+}
+
% Don't fall back on other year fields if there is no year, use
% "nodate" string
\DeclareLabeldate{%
\field{pubstate}
\field{date}
- \field{year}%legacy - no EDTF support
+ \field{year}%legacy - no ISO8601 support
\literal{nodate}
}
-% Due to APA strange requirements like truncation after first cite and
-% ellipsis from 7th to n-1 in bib, there might be some really strange
-% edge cases which can't be handled as this needs treating in the style
-% after biber has finished. Very unlikely though.
\ExecuteBibliographyOptions{%
abbreviate=true,%
autocite=inline,%
@@ -256,32 +267,35 @@
date=apalong,%
dateabbrev=false,%
datecirca=true,%
- dateera=christian,%
- labeldate=apalong,%
+ dateera=secular,%
dateuncertain=true,%
eventdate=comp,%
+ labeldate=apalong,%
labeldateparts=true,%
- maxbibnames=7,%
+ maxbibnames=20,%
maxcitenames=2,%
- minbibnames=6,%
+ minbibnames=19,%
mincitenames=1,%
mincrossrefs=999,%
+ maxitems=999,%
origdate=apalong,%
pagetracker=true,%
sortcites=true,%
sorting=apa,%
uniquelist=minyear,%
- uniquename=full,%
+ uniquename=init,%
uniqueprimaryauthor=true,%
urldate=apalong,%
useprefix=true,%
- usetranslator=true}
+ usetranslator=true,%
+ usenarrator=true}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
+% (APA 10.2:32) Remove PUBLISHER if it is the same as GROUPAUTHOR
-% Enforce ignoring of PUBSTATE if there is a YEAR or DATE field
\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
\map{
@@ -291,8 +305,16 @@
\map{
\step[fieldsource=date, final]
\step[fieldset=pubstate, null]
+ }
+ \map{
+ \step[typesource=hardware, typetarget=software, final]
+ }
+ \map{
+ \step[fieldsource=groupauthor, match=\regexp{([^{}]+)}, final]
+ \step[fieldsource=publisher, match=\regexp{$1}, final]%$
+ \step[fieldset=publisher, null]
}
- }
+ }
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -308,95 +330,119 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Additional material sometimes goes in parens
-% after title. This bool tracks the parens.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Flag to say whether the "in" has
+% been placed already in IN*
+% Reset every bibitem.
-\newbool{bbx:parens}
-\AtEveryBibitem{\global\boolfalse{bbx:parens}}
+\newbool{bbx:in}
+\AtEveryBibitem{\global\boolfalse{bbx:in}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.06:47) Reviews are awkward - if no author, date
-% position changes so we need a flag to
-% track this
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Set up some standard APA formats
-\newbool{bbx:noreviewauthor}
-\AtEveryBibitem{\global\boolfalse{bbx:noreviewauthor}}
+% General format of titles. Ugly Chicago-style lowercasing of English titles
+\DeclareFieldFormat{apacase}{\bbx at colon@search\MakeSentenceCase*{#1}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% HOWPUBLISHED
+\DeclareFieldFormat[unpublished]{howpublished}{\mkbibbrackets{%
+ \ifbibstring{#1}{\bibcpstring{#1}}{#1}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Sometimes "Vol" is inside the additional
-% material parens, sometimes not. This bool
-% tracks if it has been inserted yet.
-% Can't use \clearfield{volume} as some
-% later number format tests need to know
-% whether volume was defined.
+% TITLE
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[article]{title}{#1\isdot}
+\DeclareFieldFormat[inbook]{title}{#1\isdot}
+\DeclareFieldFormat[incollection]{title}{#1\isdot}
+\DeclareFieldFormat[inproceedings]{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[proceedings]{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[periodical]{title}{#1\isdot}
+\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[patent]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[image]{title}{\mkbibemph{#1}}
+\DeclareFieldFormat[misc]{title}{#1\isdot}
+\DeclareFieldFormat[audio]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
+\DeclareFieldFormat[video]{title}{\iffieldundef{maintitle}{\mkbibemph{#1}\isdot}{#1}}
-\newbool{bbx:volseen}
-\AtEveryBibitem{\global\boolfalse{bbx:volseen}}
+% TITLEADDON
+\DeclareFieldFormat{titleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% MAINTITLEADDON
+\DeclareFieldFormat{maintitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) This bool tracks if the title was put
-% in the author position.
-% Can't use \clearfield{title} as some
-% later punctuation tests need to know
-% whether title was defined.
+% BOOKTITLEADDON
+\DeclareFieldFormat{booktitleaddon}{\mkbibbrackets{\bbx at colon@search\MakeSentenceCase*{#1}}}
-\newbool{bbx:titleinauthpos}
-\AtEveryBibitem{\global\boolfalse{bbx:titleinauthpos}}
+% ISSUETITLE
+\DeclareFieldFormat{issuetitle}{#1\isdot}
+\DeclareFieldFormat[periodical]{issuetitle}{\mkbibbrackets{#1}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% ORIGTITLE
+\DeclareFieldFormat{origtitle}{\mkbibemph{\bbx at colon@search\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[article]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inbook]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[incollection]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[inproceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
+\DeclareFieldFormat[proceedings]{origtitle}{\bbx at colon@search\MakeSentenceCase*{#1}\isdot}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Need a flag to say when the editor
-% is in author position because this
-% can effect where the year goes.
+% VOLUME
+\DeclareFieldFormat{volume}{\iffieldundef{maintitle}
+ {\bibcpstring{volume}~\apanum{#1}}
+ {\mkbibemph{\bibcpstring{volume}~\apanum{#1}}}}
+\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{volume}{\mkbibemph{\apanum{#1}}}
-\newbool{bbx:editorinauthpos}
-\AtEveryBibitem{\global\boolfalse{bbx:editorinauthpos}}
+% VOLUMES
+\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% CHAPTER
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Flag to say whether the "in" has
-% been placed already in IN*
-% Reset every bibitem.
+\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
-\newbool{bbx:in}
-\AtEveryBibitem{\global\boolfalse{bbx:in}}
+% NUMBER
+\DeclareFieldFormat{number}{\iffieldundef{volume}
+ {\ifinteger{\thefield{number}}
+ {\addspace\mkbibemph{\bibcpstring{number}~\apanum{#1}}\adddot}
+ {\apanum{#1}}}
+ {\mkbibemph{\apanum{#1}}}}
+\DeclareFieldFormat[report]{number}{\apanum{#1}}
+\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+\DeclareFieldFormat[reprint]{number}{\mkbibbrackets{\apanum{#1}}}
+\DeclareFieldFormat[periodical]{number}{\mkbibparens{\apanum{#1}}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% PAGES
+\DeclareFieldFormat[inbook]{pages}{\mkpageprefix[bookpagination]{#1}}
+\DeclareFieldFormat[incollection]{pages}{\mkpageprefix[bookpagination]{#1}}
+\DeclareFieldFormat[periodical]{pages}{#1}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Set up some standard APA formats
+% LOCATION
+\DeclareListFormat[misc]{location}{\mkbibemph{#1}}
+\DeclareListFormat[periodical]{location}{\mkbibemph{#1}}
-\DeclareFieldFormat{volume}{\apanum{#1}}
-\DeclareFieldFormat{chapter}{\bibcpstring{chapter}~\apanum{#1}}
-\DeclareFieldFormat{volumes}{\bibcpstring{volumes}~#1}
-\DeclareFieldFormat{addendum}{\mkbibparens{#1}}
-\DeclareFieldFormat{part}{#1}
+% NAMEADDON
+\DeclareFieldFormat[misc]{nameaddon}{\mkbibparens{#1}}
-%
+% VERSION
+\DeclareFieldFormat[dataset]{version}{\bibcpstring{version}~#1}
+\DeclareFieldFormat[software]{version}{\bibcpstring{version}~#1}
+
+% URL
+\DeclareFieldFormat{url}{\url{#1}}
+\DeclareFieldFormat{urldate}{#1}
+
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.25) Works by the same author have the full author
+% (APA 9.47) Works by the same author have the full author
% name, not an eliding dash. Author is always
% last name first.
-% (APA 6.27) Ellipsis in 7th position and then nothing until last
-% (APA 7.10 Example 67) Unknown names and dates
-%
+% (APA 10.1:4) Ellipsis from 20th position and then nothing until last
+% (APA 9.x) Unknown names and dates
+% (APA 9.8) Two group authors drop the comma in between
% \printnames does different things depending on whether the format you are
% calling is the default for the name field or is a custom format:
@@ -409,6 +455,16 @@
% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
% all of the names in the list to work on
+% It's not completely obvious but it's implied that names identical apart from a suffix
+% are to be treated as different name lists for extradate calculation so we add suffix
+% to the default definition
+\DeclareUniquenameTemplate{
+ \namepart[use=true, base=true]{prefix}
+ \namepart[base=true]{family}
+ \namepart{given}
+ \namepart{suffix}
+}
+
\DeclareNameAlias{default}{apaauthor}
\DeclareNameFormat{apaauthor}{%
@@ -416,43 +472,92 @@
{\addcomma\space\ldots\space}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
- {\iffieldannotation{uncertain}
- {\mkbibbrackets{\usebibmacro{name:apa:family-given}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}?}}
- {\usebibmacro{name:apa:family-given}%
- {\namepartfamily}%
- {\namepartgiven}%
- {\namepartgiveni}%
- {\namepartprefix}%
- {\namepartsuffix}}}}%
+ {\printtext{\usebibmacro{name:apa:family-given}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ \let\bibstring\bibcplstring
+ \setunit{\addspace}%
+ \printtext{\mkbibparense{\usebibmacro{role}}}%
+ \hasitemannotation[\currentname][username]{\addspace\mkbibbrackets{\getitemannotation[\currentname][username]}}{}}}%
\ifthenelse{\value{listcount}=\value{listtotal}}%
- {\ifmorenames{\printdelim{andothersdelim}\bibstring{andothers}}{}}{}}
+ {\ifmorenames
+ {\printdelim{andothersdelim}
+ \bibstring{andothers}}
+ {}%
+ \let\bibstring\bibcplstring
+ \setunit{\addspace}%
+ \printtext{\mkbibparense{\usebibmacro{roles}}}}
+ {}}
-\renewbibmacro*{author}{%
- \ifnameundef{author}
- {\usebibmacro{labeltitle}}
- {\printnames[apaauthor][-\value{listtotal}]{author}%
- \setunit*{\addspace}%
- \printfield{nameaddon}%
- \ifnameundef{with}
- {}
- {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
- \printnames[apaauthor][-\value{listtotal}]{with}}
- \setunit*{\addspace}}}%
+\DeclareNameFormat{apanames}{%
+ \ifthenelse{\value{listcount}=\maxprtauth\AND\value{listcount}<\value{listtotal}}
+ {\addcomma\space\ldots\space}
+ {\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
+ {}
+ {\printtext{\usebibmacro{name:apa:given-family}%
+ {\namepartfamily}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}}%
+ \let\bibstring\bibcpsstring
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{role}}}%
+ \ifthenelse{\value{listcount}=\value{listtotal}}%
+ {\ifmorenames
+ {\printdelim{andothersdelim}%
+ \bibstring{andothers}}
+ {}%
+ \let\bibstring\bibcplstring
+ \setunit{\addspace}%
+ \usebibmacro{roles}}
+ {}}
+
+\renewbibmacro*{author/editor}{%
+ \ifthenelse{\ifnameundef{author}\AND\ifnameundef{groupauthor}}
+ {\ifnameundef{editor}
+ {\usebibmacro{title}%
+ % need to clear all title fields so we don't get them again later
+ \clearfield{title}%
+ \clearfield{subtitle}%
+ \clearfield{titleaddon}}
+ {\usebibmacro{editorinauthpos}}}
+ {\usebibmacro{author}}%
\newunit\newblock%
\usebibmacro{labelyear+extradate}}
+\newbibmacro*{editorinauthpos}{%
+ \printnames[apaauthor][-\value{listtotal}]{editor}%
+ \setunit{\addspace}%
+ \ifnameundef{editor}
+ {}
+ {\printtext[parens]{\usebibmacro{apaeditorstrg}{editor}}%
+ % need to clear editor so we don't get an "In" clause later
+ \clearname{editor}}}
+
+\renewbibmacro*{author}{%
+ \ifnameundef{author}
+ {\printnames[apaauthor][-\value{listtotal}]{groupauthor}}
+ {\printnames[apaauthor][-\value{listtotal}]{author}}%
+ \setunit*{\addspace}%
+ \printfield{nameaddon}%
+ \ifnameundef{with}
+ {}
+ {\setunit{}\addspace\mkbibparens{\printtext{\bibstring{with}\addspace}%
+ \printnames[apaauthor][-\value{listtotal}]{with}}
+ \setunit*{\addspace}}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) References section delimiters are ampersands, not " and "
-% (APA 6.27) Use blank for long lists
-% (APA 4.03) Serial comma for lists of three or more
+% (APA 9.8) Author delimiters are ampersands before final author
+% Long author lists
+% Serial comma for lists of three or more
+% Ampersand only (no comma) between two group authors
\DeclareDelimFormat[bib,biblist]{finalnamedelim}{%
\ifthenelse{\value{listcount}>\maxprtauth}
@@ -464,29 +569,22 @@
\DeclareDelimFormat[bib,biblist]{finalnamedelim:apa:family-given}{%
\ifthenelse{\value{listcount}>\maxprtauth}
{}
- {\finalandcomma\addspace\&\space}}
-
+ {\ifthenelse{\ifcurrentname{groupauthor}\AND%
+ \value{liststop}=2}
+ {\addspace\&\space}
+ {\finalandcomma\addspace\&\space}}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.28) Use "nodate" bibstring for references with no year
+% (APA 9.47) Use "nodate" bibstring for references with no year
% Months and days go into parenthesis with year, if set
-% (APA 6.29) Issue goes where month normally goes if it
-% is set.
-% (APA 7.10) circa or uncertain dates in brackets
+% (APA 8.13, 10.2) circa or uncertain dates in brackets
% Make sure endmonth gets an expansion too
\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}}
-\newbibmacro*{monthorissue}{%
- \iffieldundef{issue}
- {\iffieldundef{month}
- {}
- {\addcomma\space\printfield{month}%
- \iffieldundef{endmonth}{}{/\printfield{endmonth}}}}
- {\addcomma\space\printfield{issue}}}
-
\newbibmacro*{labelyear+extradate}{%
\iffieldundef{labelyear}
{\iffieldundef{origyear}
@@ -502,71 +600,42 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) General format of titles.
-% Ugly Chicago-style lowercasing of English titles
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.5) Conference event information
-\DeclareFieldFormat{apacase}{\bbx at colon@search\MakeSentenceCase*{#1}}
+\newbibmacro*{eventinfo}{%
+ \printfield{eventtitle}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}}
-\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{.}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.25) No prefix for pages
-\DeclareFieldFormat[newsarticle]{newspaper}{\mkbibemph{#1}}
-\DeclareFieldFormat[newsarticle]{entrysubtype}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[newsarticle]{title}{#1}
-\DeclareFieldFormat[article]{pages}{#1}
+\DeclareFieldFormat{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.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 9.52) References in a meta-analysis
+% Dates ignore month/day in nonacademic
+% articles
-\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}}}
+\renewbibmacro*{begentry}{%
+ \ifkeyword{meta}{\textsuperscript{*}}{}}
-\newbibmacro*{bookaddinfo}{%
- \ifthenelse{\iffieldundef{edition}\AND\iffieldundef{volumes}}
- {}
- {\printtext{\bibopenparen}%
- \printfield{edition}%
- \setunit*{\addcomma\addspace}%
- \printfield{volumes}%
- \setunit{}%
- \printtext{\bibcloseparen}}%
-}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Title and additional post title information
+
\renewbibmacro*{title}{%
\ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}}
- {}
+ {\printfield{titleaddon}}
{\iffieldundef{origtitle}
{\printtext[title]{%
\printfield[apacase]{title}%
@@ -579,45 +648,95 @@
\setunit{\subtitlepunct}%
\printfield[apacase]{subtitle}}}%
\setunit{\addspace}%
+ \ifentrytype{inbook}{}{\usebibmacro{addinfo1}}% additional info in parens
+ \setunit{\addspace}%
+ \iffieldundef{related}
+ {}
+ {\ifthenelse{\iffieldequalstr{relatedtype}{reviewofbook}\OR%
+ \iffieldequalstr{relatedtype}{reviewoffilm}\OR%
+ \iffieldequalstr{relatedtype}{reviewoftv}\OR%
+ \iffieldequalstr{relatedtype}{commentonarticle}}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}%
+ \togglefalse{bbx:related}}% disable default related expansion later on
+ {}}%
+ \setunit{\addspace}%
\printfield{titleaddon}%
- \iffieldequalstr{entrytype}{book}%
- {\setunit{\addspace}\usebibmacro{bookaddinfo}}%
- {}%
- \ifthenelse{%
- \ifnameundef{author}\AND%
- \(\ifnameundef{editor}\AND\NOT\boolean{bbx:editorinauthpos}\)\AND%
- \ifnameundef{producer}\AND%
- \ifnameundef{director}\AND%
- \ifnameundef{writer}}
- {\newunit\newblock
- \usebibmacro{labelyear+extradate}}
- {}}}
+ \setunit{\addspace}%
+ \usebibmacro{addinfo2}}}%
-\renewbibmacro*{maintitle}{%
- \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
- {}
- {\printtext[maintitle]{%
- \printfield[apacase]{maintitle}%
- \setunit{\subtitlepunct}%
- \printfield[apacase]{mainsubtitle}}%
- \setunit{\addspace}}
- \printfield{maintitleaddon}%
- \addcolon}
+\newbibmacro*{addinfo1}{%
+ \printtext{%
+ \mkbibparense{%
+ \usebibmacro{editor+trans+narr}%
+ \setunit*{\addsemicolon\addspace}%
+ \printfield{edition}%
+ \setunit*{\addcomma\addspace}%
+ \ifthenelse{\ifentrytype{report}\OR%
+ \ifentrytype{thesis}\OR%
+ \ifentrytype{unpublished}\OR%
+ \ifentrytype{dataset}\OR%
+ \ifentrytype{software}\OR%
+ \ifentrytype{audio}\OR%
+ \ifentrytype{patent}\OR%
+ \ifentrytype{image}}{\usebibmacro{addinfo3}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{inbook}{\printfield{pages}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{book}{\printfield{volumes}}{}%
+ \setunit*{\addcomma\addspace}%
+ \ifentrytype{book}{\printfield{volume}}{}}}}
+% Additional post title information in brackets
+\newbibmacro*{addinfo2}{%
+ \printtext{%
+ \mkbibbracketse{%
+ \iffieldbibstring{entrysubtype}
+ {\bibcplstring{\thefield{entrysubtype}}}
+ {\printfield{entrysubtype}}%
+ \setunit*{\addsemicolon\addspace}%
+ \printfield{note}}}}
+
+% number/issue information
+\newbibmacro*{addinfo3}{%
+ \iffieldundef{type}
+ {\iffieldundef{issue}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}
+ {\printfield{issue}\setunit{\addspace}%
+ \iffieldundef{number}
+ {}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}}}
+ {\printfield{type}\setunit{\addspace}%
+ \iffieldundef{number}
+ {}
+ {\iffieldnums{number}{\bibcpstring{number}~}{}\printfield{number}}}%
+ \ifthenelse{\ifentrytype{dataset}\OR\ifentrytype{software}}
+ {\setunit*{\addsemicolon\addspace}%
+ \printfield{version}}
+ {}}
+
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Format of volume and number for articles
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.1 Example 6) eprints (eLocator)
-\DeclareFieldFormat[article]{volume}{\mkbibemph{\apanum{#1}}}
-\DeclareFieldFormat[article]{number}{\mkbibparens{\apanum{#1}}}
+\renewbibmacro*{eprint}{%
+ \iffieldundef{eprinttype}
+ {}
+ {\printtext{%
+ \iffieldbibstring{eprinttype}{\bibcpstring{\strfield{eprinttype}}}{\strfield{eprinttype}}%
+ \setunit{\addspace}}}%
+ \printfield{eprint}}
+\DeclareFieldFormat{eprint}{#1}
+
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Commas between title and volume for articles
+% (APA 10) Commas between title and volume for articles
+% (APA 10.6) eLocator is part of journal info
\renewbibmacro*{journal+issuetitle}{%
\usebibmacro{journal}%
@@ -624,7 +743,9 @@
\setunit*{\addcomma\addspace}%
\printfield{volume}%
\printfield{number}%
- \setunit{\addspace}\newblock
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{eprint}%
+ \newunit\newblock
\usebibmacro{issuename}%
\newunit}
@@ -639,42 +760,11 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Additional information for non-periodicals in
-% parenthesis after title. This is ugly but it's
-% hard to put in "optional parens" like this
-% around an unknown amount of characters.
-
-\newbibmacro*{addinfo}{%
- \ifthenelse{\iffieldundef{edition}\AND%
- \iffieldundef{chapter}\AND%
- \iffieldundef{volumes}\AND%
- \iffieldundef{pages}\AND%
- \iffieldundef{number}\AND%
- \(\iffieldundef{volume}\OR\boolean{bbx:volseen}\)}
- {}
- {\printtext{\bibopenparen}%
- \printfield{edition}%
- \setunit*{\addcomma\addspace}%
- \printfield{chapter}%
- \setunit*{\addcomma\addspace}%
- \notbool{bbx:volseen}%
- {\iffieldundef{volume}{}{\global\booltrue{bbx:volseen}}%
- \printfield{volume}%
- \iffieldundef{part}{}{\printfield{part}}}{}%
- \setunit*{\addcomma\addspace}%
- \printfield{volumes}%
- \setunit*{\addcomma\addspace}%
- \printfield{pages}%
- \setunit{}%
- \printtext{\bibcloseparen}}}
-
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) "In " precedes editor/trans list, no colon
-
+% "In" precedes editor/trans list, no colon
+% Use a flag to track as it could be inserted in more
+% than one potential location
+
\newbibmacro*{in}{%
\ifbool{bbx:in}%
{}%
@@ -685,53 +775,81 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.27) Editors have first names first ...
-% (APA 7.02 Example 27) ... unless there is no author
+% Names
-\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}}{}}{}}
+% Individual name roles
+\newbibmacro*{role}{%
+ \hasitemannotation[\currentname][role]%
+ {\getitemannotation[\currentname][role]}
+ {\ifitemannotation[\currentname][role]{writer}
+ {\bibstring{writer}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{director}
+ {\bibstring{director}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{execproducer}
+ {\bibstring{execproducer}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{producer}
+ {\bibstring{producer}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{host}
+ {\bibstring{host}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{chair}
+ {\bibstring{chair}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \ifitemannotation[\currentname][role]{guestexpert}
+ {\bibstring{guestexpert}%
+ \setunit{\addspace\&\addspace}}
+ {}}%
+ \setunit{}}
-\renewbibmacro*{author/editor}{%
- \ifnameundef{author}
- {\ifnameundef{editor}
- {}
- {\usebibmacro{editorinauthpos}}}
- {\global\boolfalse{bbx:editorinauthpos}%
- \usebibmacro{author}}}
+% roles for complete name lists
+\newbibmacro*{roles}{%
+ \hasfieldannotation[\currentname][role]%
+ {\getfieldannotation[\currentname][role]}
+ {\iffieldannotation[\currentname][role]{writers}
+ {\bibstring{writers}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{directors}
+ {\bibstring{directors}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{execproducers}
+ {\bibstring{execproducers}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{producers}
+ {\bibstring{producers}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{hosts}
+ {\bibstring{hosts}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{chairs}
+ {\bibstring{chairs}%
+ \setunit{\addspace\&\addspace}}
+ {}%
+ \iffieldannotation[\currentname][role]{guestexperts}
+ {\bibstring{guestexperts}%
+ \setunit{\addspace\&\addspace}}
+ {}}%
+ \setunit{}}
-\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
+% Name format
% #1 = family name
% #2 = given name
@@ -738,7 +856,7 @@
% #3 = given name (initials)
% #4 = name prefix
% #5 = name suffix
-
+
\newbibmacro*{name:delim:apa:family-given}[1]{%
\ifnumgreater{\value{listcount}}{\value{liststart}}
{\ifboolexpr{
@@ -799,37 +917,31 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (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
+% (APA 9.10) Role strings in parens after author list
+% Collapse roles if same person
+% (APA 10.1 Example 10) Translator
+% (APA 10.2 Example 22) Narrator
-
-% Separated out into book and in* macros because otherwise
-% this makes one ugly, huge, unreadable beast.
-
-\newbibmacro*{book:editor+trans}{%
+\newbibmacro*{editor+trans+narr}{%
\ifthenelse{\ifnameundef{editor}\AND%
\ifnameundef{editora}\AND%
\ifnameundef{editorb}\AND%
\ifnameundef{editorc}\AND%
- \ifnameundef{translator}}%
- {}%
+ \ifnameundef{translator}\AND%
+ \ifnameundef{narrator}}%
+ {\printtext{}}% Print nothing, so the puncutation tracker is kept informed
{\ifnamesequal{editor}{translator}%
- {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
- \printnames[apanames][-\value{listtotal}]{editor}%
+ {\printnames[apanames][-\value{listtotal}]{editor}%
\setunit*{\addcomma\addspace}%
\usebibmacro{apaeditorstrg}{editor}%
\setunit*{\addspace\&\space}%
- \printtext{\bibcpstring{translator}}%
- \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
- {\printtext{\bibopenparen}\global\booltrue{bbx:parens}%
- \ifnameundef{editor}%
+ \printtext{\bibcpstring{translator}}}
+ {\ifnameundef{editor}%
{}%
{\printnames[apanames][-\value{listtotal}]{editor}%
\setunit{\addcomma\addspace}%
\usebibmacro{apaeditorstrg}{editor}%
\clearname{editor}%
- \setunit{\adddot}%
\setunit*{\addspace\&\space}}%
\ifnameundef{translator}%
{\setunit{}}%
@@ -836,9 +948,13 @@
{\printnames[apanames][-\value{listtotal}]{translator}%
\setunit{\addcomma\addspace}%
\printtext{\bibcpstring{translator}}%
- \clearname{translator}%
- \setunit{\adddot}}%
- \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}}}
+ \clearname{translator}}%
+ \ifnameundef{narrator}%
+ {\setunit{}}%
+ {\printnames[apanames][-\value{listtotal}]{narrator}%
+ \setunit{\addcomma\addspace}%
+ \printtext{\bibcpstring{narrator}}%
+ \clearname{narrator}}}}}
\newbibmacro*{editor+trans}{%
\ifthenelse{\ifnameundef{editor}\AND%
@@ -850,36 +966,29 @@
{\ifnamesequal{editor}{translator}%
{\usebibmacro{in}%
\printnames[apanames][-\value{listtotal}]{editor}%
- \setunit{\addspace\bibopenparen\global\booltrue{bbx:parens}}%
- \usebibmacro{apaeditorstrg}{editor}%
- \setunit*{\addspace\&\space}%
- \printtext{\bibcpstring{translator}}%
- \ifbool{bbx:parens}{\printtext{\bibcloseparen}\global\boolfalse{bbx:parens}}{}}
+ \setunit{\addspace}%
+ \printtext[parens]{%
+ \usebibmacro{apaeditorstrg}{editor}%
+ \setunit*{\addspace\&\space}%
+ \bibcpstring{translator}}}
{\ifnameundef{translator}%
{}%
{\setunit{\addspace}%
\printtext[parens]{\printnames[apanames][-\value{listtotal}]{translator}%
- \setunit{\addcomma\addspace}%
- \printtext{\bibcpstring{translator}}}%
+ \setunit{\addcomma\addspace}%
+ \bibcpstring{translator}}%
\clearname{translator}%
\setunit{\adddot\addspace}}%
\usebibmacro{in}%
\usebibmacro{editorx}}%
\setunit{\addcomma\addspace}}}
-
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Special journal issues are periodicals
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% 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}
{}
@@ -891,11 +1000,7 @@
\renewbibmacro*{title+issuetitle}{%
\usebibmacro{periodical}%
\setunit{\addspace}%
- \printfield{issuetitle}%
- \notbool{bbx:editorinauthpos}
- {\newunit
- \usebibmacro{labelyear+extradate}}
- {}}
+ \printfield{issuetitle}}%
\newbibmacro*{pnumber}{%
\printfield{volume}%
@@ -902,10 +1007,10 @@
\printfield{number}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02 Example 21) Original year
+% (APA 10.1 Example 10) Original year
% Only give ORIGYEAR in references if both:
% YEAR is also given
@@ -916,15 +1021,15 @@
not test {\iffieldundef{origyear}}
not test {\iffieldundef{labelyear}}
and not test {\iffieldsequal{labelyear}{origyear}}}
- {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}}
- {}}
+ {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}%
+ \renewcommand*{\finentrypunct}{\relax}}
+ {}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02) "In " before booktitle, edited or not
-% (APA 6.30) Non-periodical volume number followed by "."
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.3) Reference work references
\renewbibmacro*{maintitle+title}{%
\iffieldsequal{maintitle}{title}
@@ -937,8 +1042,7 @@
\newunit\newblock
\iffieldundef{volume}
{}
- {\setunit{\global\booltrue{bbx:volseen}}%
- \printfield{volume}%
+ {\printfield{volume}%
\printfield{part}%
\setunit{\adddot\space}}}}%
\usebibmacro{title}%
@@ -954,12 +1058,23 @@
\newunit\newblock
\iffieldundef{volume}
{}
- {\setunit{\addspace\global\booltrue{bbx:volseen}}%
- \printfield{volume}%
+ {\printfield{volume}%
\printfield{part}%
\setunit{\adddot\addspace}}}%
- \usebibmacro{booktitle}}}
+ \usebibmacro{booktitle}%
+ \setunit{\addspace}%
+ \usebibmacro{addinfo1}}}
+\renewbibmacro*{maintitle}{%
+ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{mainsubtitle}}
+ {}
+ {\printtext[maintitle]{%
+ \printfield[apacase]{maintitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[apacase]{mainsubtitle}}%
+ \setunit{\addspace}}
+ \printfield{maintitleaddon}}
+
\renewbibmacro*{booktitle}{%
\ifthenelse{\iffieldundef{booktitle}\AND\iffieldundef{booksubtitle}}
{}
@@ -971,11 +1086,11 @@
\printfield{booktitleaddon}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.29) Colon separates title/subtitle
-% Skip if following terminating punctuation
+% Colon separates title/subtitle
+% Skip if following terminating punctuation
\renewcommand*{\subtitlepunct}{\ifterm{}{\addcolon}\space}
@@ -982,350 +1097,212 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.30) Format of volume depends on whether
-% there is a maintitle (what APA calls "series") or not.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.2.24) Multiple publishers, semi-colon sep
-\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}%
+\DeclareListFormat{publisher}{%
+ \usebibmacro{publisher:delim}{#1}%
#1\isdot}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newbibmacro*{publisher:delim}[1]{%
+ \ifnumgreater{\value{listcount}}{\value{liststart}}
+ {\printdelim[publisher]{multilistdelim}}
+ {}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.02 Example 38) Proceedings emph number, location
-% and location. Pages have no prefix
+\DeclareDelimFormat[publisher]{multilistdelim}{\addsemicolon\space}
+\DeclareDelimFormat[publisher]{finallistdelim}{\addsemicolon\space}
-\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 10.10) Software
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newbibmacro*{appentry}{%
+ \iffieldundef{appentry}
+ {\newunit\newblock}
+ {\printfield[apacase]{appentry}%
+ \newunit\newblock
+ \usebibmacro{in}%
+ \setunit{\addspace}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.05) Unpublished theses
+%
+%%%%%%%%%%%%%%%%%%%%%%
-\DeclareFieldFormat[unpublished]{title}{\mkbibemph{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.1 Example 18) Comment on article
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand*{\begrelateddelimcommentonarticle}{\addspace}
+\DeclareFieldFormat{related:commentonarticle}{\def\bibstring{\blx at imc@bibcpstring}\mkbibbrackets{#1}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.06) Reviews
+\renewbibmacro*{related:commentonarticle}[1]{%
+ \entrydata*{#1}{%
+ \printtext{\mkbibquote{\printfield[apacase]{title}}}}}
-% 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
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.7) Reviews - role strings need to be the
+% short versions in reviews
-\newbibmacro*{producer}{%
- \ifnameundef{producer}
- {}
- {\printnames[apaauthor][-\value{listtotal}]{producer}%
- \addspace
- \printtext[parens]{\bibcpstring{producer}}%
- \setunit*{\addcomma\addspace\&\addspace}}}
+\newcommand*{\begrelateddelimreviewofbook}{\addspace}
+\DeclareFieldFormat{related:reviewofbook}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
+\newbibmacro*{related:reviewofbook}[1]{\usebibmacro{related:reviewofx}{#1}}
-\newbibmacro*{director}{%
- \ifnameundef{director}
- {}
- {\printnames[apaauthor][-\value{listtotal}]{director}%
- \addspace
- \printtext[parens]{\bibcpstring{director}}%
- \setunit*{\addcomma\addspace\&\addspace}}}
+\newcommand*{\begrelateddelimreviewoffilm}{\addspace}
+\DeclareFieldFormat{related:reviewoffilm}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
+\newbibmacro*{related:reviewoffilm}[1]{\usebibmacro{related:reviewofx}{#1}}
-\newbibmacro*{writer}{%
- \ifnameundef{writer}
- {}
- {\printnames[apaauthor][-\value{listtotal}]{writer}%
- \addspace
- \printtext[parens]{\bibcpstring{writer}}%
- \setunit*{\addcomma\addspace\&\addspace}}}
+\newcommand*{\begrelateddelimreviewoftv}{\addspace}
+\DeclareFieldFormat{related:reviewoftv}{\def\bibstring{\blx at imc@bibcpsstring}\mkbibbrackets{#1}}
+\newbibmacro*{related:reviewoftv}[1]{\usebibmacro{related:reviewofx}{#1}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\DeclareFieldFormat{reviewtitle}{%
+ \iffieldequalstr{entrysubtype}{tvepisode}
+ {\mkbibquote{\bbx at colon@search\MakeSentenceCase*{#1}}}
+ {\bbx at colon@search\MakeSentenceCase*{#1}}}
-%%%%%%%%%%%%%%%%%
-% (APA 7.07) Misc and data
+\newbibmacro*{related:reviewofx}[1]{%
+ \entrydata*{#1}{%
+ \printtext{\mkbibemph{%
+ \printfield[reviewtitle]{title}%
+ \iffieldundef{subtitle}
+ {}
+ {\setunit{\addcolon\addspace}%
+ \printfield[reviewtitle]{subtitle}}}%
+ \setunit{\addcomma\addspace}%
+ \biblstring{byauthor}%
+ \setunit{\addspace}%
+ \printnames[apanames][-\value{listtotal}]{author}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\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}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.13) Audio
-\newbibmacro*{datatitle}{%
- \iffieldundef{title}
- {\iffieldundef{entrysubtype}
- {}
- {\printfield{entrysubtype}}}
- {\iffieldundef{entrysubtype}
- {}
- {\usebibmacro{title}\addspace
- \printfield{entrysubtype}}}}
+\newbibmacro*{mainaudio}{%
+ \iffieldundef{maintitle}{}
+ {\iffieldequalstr{entrysubtype}{podcastepisode}{\bibcpstring{in}}{\bibcpstring{on}}%
+ \setunit{\addspace}%
+ \printfield{maintitle}}}
%
-%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.07) Audiovisual
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.12) 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}
- {}
+\newbibmacro*{mainvideo}{%
+ \iffieldundef{maintitle}{}
{\usebibmacro{in}%
- \ifnameundef{execproducer}
- {}
- {\printnames[apanames][-\value{listtotal}]{execproducer}%
- \addspace
- \printtext[parens]{\bibcpstring{execproducer}}}
+ \printnames[apanames][-\value{listtotal}]{execproducer}%
+ \setunit{\addspace}%
+ \printtext{\mkbibparens{\bibcplstring{execproducers}}}%
\setunit{\addcomma\addspace}%
- \usebibmacro{avmaintitle}%
- \newunit}}
+ \printfield{maintitle}}}
-\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}}
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Related entries
%
-%%%%%%%%%%%%%%%%%%%%
+% Have to force capitlisation bibstring variant because the delim
+% has no printable char and this breaks default capitalisation
-%%%%%%%%%%%%%%%%%
-% (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}}
+% Suppress final period after reprints in parens
+\renewbibmacro*{endrelated}{%
+ \iffieldequalstr{relatedtype}{reprintfrom}
+ {\renewcommand*{\finentrypunct}{\relax}}
+ {}}
+
+\newcommand*{\begrelateddelimreprintfrom}{\addperiod\addspace}
+\DeclareFieldFormat{related:reprintfrom}{\let\bibstring\bibcpstring\mkbibparens{#1}}
\DeclareFieldFormat{related:reviewof}{\mkbibbrackets{#1}}
\renewbibmacro*{related:reprintfrom}[1]{%
\entrydata*{#1}{%
- \printtext{\mkbibemph{\printfield[apacase]{title}}}%
- \setunit{\bibpagespunct}%
- \printfield{pages}%
- \setunit{\addcomma\addspace}%
- \bibstring{byauthor}\addspace
- \ifnameundef{editor}
- {}
- {\printnames[apanames][-\value{listtotal}]{editor}%
+ \ifentrytype{article}
+ {\mkbibquote{%
+ \printfield[apacase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[apacase]{subtitle}}%
\setunit{\addcomma\addspace}%
+ \printlabeldateextra
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{journal}%
+ \setunit*{\addcomma\addspace}%
+ \printfield{volume}%
+ \printfield[reprint]{number}%
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{eprint}%
+ \setunit{\addcomma\addspace}%
+ \iffieldundef{issuetitle}
+ {}
+ {\printtext[issuetitle]{%
+ \printfield[noformat]{issuetitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[noformat]{issuesubtitle}}}%
+ \setunit{\addcomma\addspace}%
+ \printfield{pages}%
+ \setunit{\addcomma\addspace}%
+ \printfield{note}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{doi+url}%
+ \setunit{}}
+ {\ifentrytype{incollection}
+ {\mkbibemph{%
+ \printfield[apacase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[apacase]{subtitle}}%
+ \setunit{\addcomma\addspace}%
+ \printfield{pages}%
+ \setunit{\addcomma\addspace}%
+ \biblstring{byauthor}\space
+ \printnames[apanames][-\value{listtotal}]{editor}%
+ \setunit{\addcomma\addspace}%
\usebibmacro{apaeditorstrg}{editor}%
\setunit{\addcomma\addspace}%
\printlabeldateextra
- \setunit{\addcomma\addspace}}%
- \printnames[apanames][-\value{listtotal}]{author}%
- \setunit{\addcomma\addspace}%
- \usebibmacro{location+publisher}%
- \newunit\newblock
- \usebibmacro{related}}}
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{location+publisher}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{doi+url}%
+ \setunit{}}
+ {}}}}
-\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 9.51) Annotations
+
+\renewbibmacro*{annotation}{%
+ \iffieldundef{annotation}
+ {}
+ {\begingroup
+ \togglefalse{blx at bibliography}%
+ \newline
+ \setunit{}%
+ \printfield{annotation}%
+ \endgroup}}
+
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.x) General type layouts
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.x) General entrytype drivers
+% Custom driver to make a cleaner example for 9.44
+\DeclareBibliographyDriver{nameonly}{%
+ \usebibmacro{begentry}%
+ \printnames[apaauthor][-\value{listtotal}]{author}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyDriver{article}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -1339,19 +1316,21 @@
\newunit\newblock
\printfield{note}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
+ \newblock
+ \usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
- \newunit\newblock
+ \setunit{\addspace}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:finpunct}%
\usebibmacro{apa:pageref}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{newsarticle}{%
+\DeclareBibliographyDriver{audio}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1358,24 +1337,22 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \usebibmacro{newspaper}%
- \setunit{\bibpagespunct}%
- \printfield{pages}%
+ \usebibmacro{mainaudio}%
\newunit\newblock
- \printfield{entrysubtype}%
+ \usebibmacro{location+publisher}%
\newunit\newblock
- \printfield{note}%
+ \usebibmacro{doi+url}%
+ \newblock
+ \usebibmacro{origyear}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
\printfield{addendum}%
- \newunit\newblock
+ \setunit{\addspace}\newblock
\iftoggle{bbx:related}
{\usebibmacro{related:init}%
\usebibmacro{related}}
{}%
- \usebibmacro{apa:finpunct}%
\usebibmacro{apa:pageref}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{book}{%
@@ -1384,15 +1361,11 @@
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{maintitle+title}%
- \setunit{\addspace}\newblock
- \usebibmacro{book:editor+trans}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
@@ -1402,10 +1375,10 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{booklet}{%
+\DeclareBibliographyDriver{dataset}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1412,16 +1385,18 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printfield{howpublished}%
- \newunit\newblock
\printfield{type}%
- \newunit\newblock
+ \newunit
\printfield{note}%
\newunit\newblock
+ \printlist{organization}%
+ \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printlist{institution}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1429,10 +1404,10 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{proceedings}{%
+\DeclareBibliographyDriver{image}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1439,22 +1414,10 @@
\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
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1462,10 +1425,10 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{collection}{%
+\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1472,43 +1435,16 @@
\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{doi+url}%
+ \newblock
\usebibmacro{origyear}%
\newunit\newblock
\printfield{addendum}%
@@ -1518,21 +1454,19 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+ \newunit\newblock
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
\usebibmacro{maintitle+booktitle}%
- \newblock
- \usebibmacro{addinfo}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
@@ -1540,8 +1474,8 @@
\newunit\newblock
\usebibmacro{origyear}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1549,41 +1483,35 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
+ \newunit\newblock
\usebibmacro{editor+trans}%
\setunit*{\addcomma\addspace}\newblock
\usebibmacro{maintitle+booktitle}%
- \iffieldundef{eventyear}{}{\setunit{\addcomma\addspace}}%
- \printeventdate
- \setunit*{\addspace}\newblock
- \usebibmacro{addinfo}%
\newunit\newblock
+ \usebibmacro{eventinfo}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\printlist{organization}%
\newunit
- \printfield[apacase]{eventtitle}%
- \newunit
\printfield{venue}%
\iffieldundef{pages}
{\setunit{\addcomma\addspace}}
{\newunit}%
\newblock
- \usebibmacro{location+publisher}%
- \newunit\newblock
\usebibmacro{origyear}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1591,7 +1519,7 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
\DeclareBibliographyDriver{manual}{%
@@ -1601,8 +1529,6 @@
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
\newunit\newblock
- \printfield{edition}%
- \newunit\newblock
\printfield{type}%
\newunit
\printfield{version}%
@@ -1613,8 +1539,8 @@
\newunit
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1622,59 +1548,20 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{online}{%
+\DeclareBibliographyDriver{misc}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\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
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1682,28 +1569,21 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{periodical}{%
+\DeclareBibliographyDriver{online}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title+issuetitle}%
- \setunit{\adddot\addspace}
- \usebibmacro{journal}%
- \setunit{\addcomma\addspace}
- \printlist{location}%
- \setunit{\addcomma\addspace}
- \usebibmacro{pnumber}%
- \setunit{\addcomma\addspace}
- \printfield{pages}%
+ \usebibmacro{title}%
\newunit\newblock
- \printfield{note}%
+ \printlist{organization}%
+ \addperiod\addspace
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1711,47 +1591,21 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{report}{%
+\DeclareBibliographyDriver{patent}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \usebibmacro{apa:reportnum}%
\newunit\newblock
- \printlist{institution}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{thesis}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \usebibmacro{type+institution}%
- \newunit\newblock
\printfield{note}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \usebibmacro{doi+url}%
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
@@ -1760,61 +1614,27 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{review}{%
+\DeclareBibliographyDriver{periodical}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{reviewauthor}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \newunit\newblock
- \ifbool{bbx:noreviewauthor}{\usebibmacro{labelyear+extradate}}{}%
- \newunit\newblock
- \usebibmacro{journal+issuetitle}%
- \newunit\newblock
- \printfield{note}%
- \setunit{\bibpagespunct}%
+ \usebibmacro{title+issuetitle}%
+ \setunit{\adddot\addspace}
+ \usebibmacro{journal}%
+ \setunit{\addcomma\addspace}
+ \printlist{location}%
+ \setunit{\addcomma\addspace}
+ \usebibmacro{pnumber}%
+ \setunit{\addcomma\addspace}
\printfield{pages}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \printfield{addendum}%
- \usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{misc}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\printdelim{nametitledelim}}\newblock
- \usebibmacro{title}%
- \ifthenelse{\iffieldundef{title}\AND\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \printfield{entrysubtype}%
- \newunit\newblock
- \printfield{howpublished}%
- \newunit\newblock
- \printfield{type}%
- \newunit
- \printfield{version}%
- \newunit
\printfield{note}%
\newunit\newblock
- \printlist{organization}%
+ \usebibmacro{doi+url}%
\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}
@@ -1822,55 +1642,32 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{data}{%
+\DeclareBibliographyDriver{proceedings}{%
\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
+ \usebibmacro{eventinfo}%
+ \setunit{\addcomma\addspace}%
+ \usebibmacro{booktitle}%
+ \setunit{\addcomma\addspace}%
+ \printfield{volume}%
+ \setunit*{\adddot}%
\printfield{number}%
+ \setunit{\addcomma\addspace}
+ \printfield{pages}%
\newunit\newblock
\printfield{note}%
- \setunit{\addcomma\addspace}\newblock
- \usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printlist{organization}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1878,10 +1675,10 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{letters}{%
+\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
@@ -1889,15 +1686,13 @@
\usebibmacro{title}%
\newunit\newblock
\printlist{institution}%
- \setunit{\addspace}\newblock
- \printfield{number}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1905,28 +1700,21 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{video}{%
+\DeclareBibliographyDriver{software}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{writer}%
- \usebibmacro{director}%
- \usebibmacro{producer}%
- \newunit\newblock
- \usebibmacro{labelyear+extradate}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{appentry}%
\usebibmacro{title}%
- \setunit{\addspace}\newblock
- \printfield{entrysubtype}%
\newunit\newblock
- \usebibmacro{tvseries}%
- \newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1934,28 +1722,24 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{movie}{%
+\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{writer}%
- \usebibmacro{director}%
- \usebibmacro{producer}%
- \newunit\newblock
- \usebibmacro{labelyear+extradate}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \setunit{\addspace}\newblock
- \printfield{entrysubtype}%
\newunit\newblock
- \usebibmacro{tvseries}%
+ \printlist{institution}%
\newunit\newblock
\usebibmacro{location+publisher}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printfield{note}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newunit\newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1963,26 +1747,26 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{audio}{%
+\DeclareBibliographyDriver{unpublished}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{writer}%
- \usebibmacro{director}%
- \usebibmacro{producer}%
- \newunit\newblock
- \usebibmacro{labelyear+extradate}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \setunit{\addspace}\newblock
- \printfield{entrysubtype}%
+ \setunit{\addspace}%
+ \printfield{howpublished}%
\newunit\newblock
- \usebibmacro{location+publisher}%
+ \printlist{location}%
+ \setunit{\addcomma\addspace}
+ \printlist{institution}%
\newunit\newblock
- \usebibmacro{doi+eprint+url}%
+ \printfield{note}%
\newunit\newblock
+ \usebibmacro{doi+url}%
+ \newblock
\printfield{addendum}%
\newunit\newblock
\iftoggle{bbx:related}
@@ -1990,69 +1774,22 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}%
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
-\DeclareBibliographyDriver{music}{%
+\DeclareBibliographyDriver{video}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
- \usebibmacro{author}%
+ \usebibmacro{author/editor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{title}%
- \ifthenelse{\NOT\iffieldundef{title}\OR\boolean{bbx:titleinauthpos}}{\newunit}{\setunit{\addspace}}\newblock
- \usebibmacro{album}%
\newunit\newblock
- \usebibmacro{location+publisher}%
- \printfield{addendum}%
+ \usebibmacro{mainvideo}%
\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}}%
+ \usebibmacro{doi+url}%
\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}
@@ -2060,7 +1797,7 @@
\usebibmacro{related}}
{}%
\usebibmacro{apa:pageref}%
- \usebibmacro{apa:finpunct}
+ \usebibmacro{annotation}%
\usebibmacro{finentry}}
%
@@ -2108,71 +1845,36 @@
{\bibcpstring{type\thefield{#1type}s}}
{\bibcpstring{type\thefield{#1type}}}}}
-\renewbibmacro*{doi+eprint+url}{%
- \iftoggle{bbx:doi}
- {\printfield{doi}%
- \iffieldundef{doi}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}%
- \newunit\newblock
- \iftoggle{bbx:eprint}
- {\usebibmacro{eprint}%
- \iffieldundef{eprint}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}%
- \newunit\newblock
- \iftoggle{bbx:url}
- {\usebibmacro{url+urldate}%
- \iffieldundef{url}{}{\renewcommand*{\finentrypunct}{\relax}}}
- {}}
+%(APA 9.35) No periods after URLS
+\newbibmacro*{doi+url}{%
+ \iffieldundef{doi}
+ {\iffieldundef{url}{\newunit}{\usebibmacro{url+urldate}\setunit{\addspace}}}
+ {\printfield{doi}\renewcommand*{\finentrypunct}{\relax}\setunit{\addspace}}}
+\renewbibmacro*{url+urldate}{%
+ \ifthenelse{\iffieldundef{url}\OR\NOT\iffieldundef{doi}}
+ {}
+ {\iffieldundef{urlyear}
+ {}
+ {\printtext{\bibstring{retrieved}}%
+ \addspace
+ \printurldate
+ \setunit{\urldatecomma}%
+ \bibstring{from}%
+ \setunit{\addspace}}%
+ \iffieldundef{url}{}{\printfield{url}\renewcommand*{\finentrypunct}{\relax}}}}
\DeclareFieldFormat{doi}{%
- doi\addcolon
\ifhyperref
- {\href{https://doi.org/#1}{\nolinkurl{#1}}}
- {\nolinkurl{#1}}}
+ {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
+ {\nolinkurl{https://doi.org/#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}
- {}}
+ \printlist{location}%
+ \setunit*{\addcomma\space}%
+ \printlist{publisher}}
%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\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}}}
-
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2185,8 +1887,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-
% Unchanged from authoryear-comp
\DeclareBibliographyOption{dashed}[true]{%
@@ -2199,10 +1899,6 @@
\DeclareFieldFormat{shorthandwidth}{#1}
\setlength{\bibitemsep}{0pt}
-\DeclareNameAlias{author}{sortname}
-\DeclareNameAlias{editor}{sortname}
-\DeclareNameAlias{translator}{sortname}
-
\defbibenvironment{bibliography}
{\list
{}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -12,13 +12,14 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2019/09/07\space v8.0\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2019/11/23\space v9.0\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.16) labelyear postfix is not emphasised or italic
+% (APA 8.19) labelyear postfix is not emphasised or italic
% Dashes between labelyear and non-numeric year (or pseudo-year)
+\newcommand{\apashortdash}{-}
\DeclareFieldFormat{extradate}{\iffieldnums{labelyear}{\mknumalph{#1}}{\apashortdash\mknumalph{#1}}}
%
@@ -25,7 +26,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.11) requires comma separator between authors and years
+% (APA 8.11) requires comma separator between authors and years
\DeclareDelimFormat{nameyeardelim}{\addcomma\space}
\DeclareDelimFormat[textcite]{nameyeardelim}{\addcomma\space}
@@ -34,7 +35,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) No comma before "et al" if there is only one name
+% (APA 8.17) No comma before "et al" if there is only one name
% preceding it
\DeclareDelimFormat{andothersdelim}{\ifnum\value{listcount}>2 \finalandcomma\fi\addspace}
@@ -43,7 +44,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.12) ampersand separator in parenthetical cites
+% (APA 8.17) ampersand separator in parenthetical cites
\DeclareDelimFormat[parencite]{finalnamedelim}
{\ifnum\value{liststop}>2 \finalandcomma\fi\addspace\&\space}
@@ -70,10 +71,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.11) Suffices are not shown in citations
-% (APA 6.12) 3-5 authors have "et al." after first cite
-% (Blog http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html) Initials only for primary author and only when not unique across all *primary* authors
-
+% (APA 8.10) Suffices are not shown in citations
+% (APA 8.17) 3+ authors have "et al."
+% (APA 8.20) Initials only for primary author and only when not unique across all *primary* authors
+
\newbibmacro*{labelname:doname}[8]{%
\ifboolexpr{test {\ifnumcomp{\value{listcount}}{>}{1}}
or
@@ -95,92 +96,22 @@
\fi
\usebibmacro{name:andothers}}
-% Can't do this with the built-in printnames format as APA requires truncation
-% and disambiguation only after first cite
-% We either use uniquelist or minnames for truncation. If uniquelist isn't
-% defined, we fall back on minnames
-%
-% \printnames does different things depending on whether the format you are
-% calling is the default for the name field or is a custom format:
-%
-% max/minnames truncation is done before calling the format so we have
-% to do \printnames[format][-\value{listtotal}]{field} to ensure we get
-% all of the names in the list to work on here
-%
-% Explicit "and others" is dealt with in labelname:doname via a custom name:andothers
-
\DeclareNameFormat{labelname}{%
- % First set the truncation point
- \ifthenelse{\value{uniquelist}>1}
- {\numdef\cbx 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}}}}
+ \usebibmacro{labelname:doname}%
+ {\namepartfamily}%
+ {\namepartfamilyi}%
+ {\namepartgiven}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartprefixi}%
+ {\namepartsuffix}%
+ {\namepartsuffixi}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.13) Groups as names
+% (APA 8.21) Groups as names
% SHORTAUTHOR brackets in parencites
\DeclareNameFormat{sabrackets}{%
@@ -204,12 +135,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.13) Deal with SHORTAUTHOR fields
-% (APA 6.16) Multiple same author cites in a compact citation call do not
+% (APA 8.21) Deal with SHORTAUTHOR fields
+% (APA 8.12) Multiple same author cites in a compact citation call do not
% need to be repeated but the full years must be repeated with
% their extradate postfixes
-% (APA 6.18) Cite ORIGYEAR/YEAR if ORIGYEAR present
-% (APA 6.28) ISSUE after year when available
+% (APA 8.15) Cite ORIGYEAR/YEAR if ORIGYEAR present
+% (APA 10.1:11) Reprints have original year in citation
+
\def\citeresetapa{\global\let\cbx at apa@names\@empty}
\citeresetapa
\def\cbx at apa@ifnamesaved{%
@@ -223,17 +155,20 @@
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
% Single cite
- {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+ {\ifnameundef{labelname}
% No author/editor
{\usebibmacro{cite:noname}%
\savefield{fullhash}{\cbx at lasthash}}
% Normal cite
{\ifnameundef{shortauthor}
- {\printnames[labelname][-\value{listtotal}]{labelname}}%
- {\cbx at apa@ifnamesaved
+ {\printnames{labelname}}%
+ {\cbx at apa@ifnamesaved
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}\addspace\printnames[sabrackets]{shortauthor}}}%
- \savefield{fullhash}{\cbx at lasthash}}}%
+ {\ifnameundef{groupauthor}
+ {\printnames[labelname]{author}}
+ {\printnames[labelname]{groupauthor}}%
+ \addspace\printnames[sabrackets]{shortauthor}}}%
+ \savefield{fullhash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
% Using fullhash instead of namehash otherwise we may omit namelist for
@@ -251,7 +186,7 @@
{\setunit{\compcitedelim}%
\usebibmacro{cite:plabelyear+extradate}}%
% Single cite
- {\ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
+ {\ifnameundef{labelname}
% No author/editor
{\usebibmacro{cite:noname}%
\setunit{\printdelim{nameyeardelim}}%
@@ -259,11 +194,14 @@
\savefield{fullhash}{\cbx 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}}%
+ {\printnames{labelname}}%
+ {\cbx at apa@ifnamesaved
+ {\printnames{shortauthor}}
+ {\ifnameundef{groupauthor}
+ {\printnames[labelname]{author}}
+ {\printnames[labelname]{groupauthor}}%
+ \addspace\printnames[sabrackets]{shortauthor}}}%
+ \setunit{\printdelim{nameyeardelim}}%
\usebibmacro{cite:plabelyear+extradate}%
\savefield{fullhash}{\cbx at lasthash}}}%
\setunit{\multicitedelim}}
@@ -279,8 +217,8 @@
{\bibcloseparen\global\boolfalse{cbx:parens}}
{}%
\setunit{\compcitedelim}%
- \ifthenelse{\ifnameundef{labelname}\OR\iffieldequalstr{entrytype}{patent}}
- % No author/editor or patent
+ \ifnameundef{labelname}
+ % No author/editor
{\iffieldundef{shorthand}%
% Cite using title
{\usebibmacro{cite:noname}%
@@ -294,11 +232,13 @@
% Normal full cite
{\ifnameundef{shortauthor}%
% Normal full cite
- {\printnames[labelname][-\value{listtotal}]{labelname}}
+ {\printnames{labelname}}
% Cite using short author
{\cbx at apa@ifnamesaved
{\printnames{shortauthor}}
- {\printnames[labelname][-\value{listtotal}]{author}}}%
+ {\ifnameundef{groupauthor}
+ {\printnames[labelname]{author}}
+ {\printnames[labelname]{groupauthor}}}}%
% Year
\setunit{\ifbool{cbx:np}
{\printdelim{nameyeardelim}}
@@ -324,22 +264,22 @@
\iffieldsequal{labelyear}{labelendyear}% Don't want no-op year ranges
{\clearfield{labelendyear}}
{}%
- \iffieldundef{origyear}{}
- {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} }
- {\mkbibbrackets{\printorigdate}}
- {\printorigdate}%
+ \iffieldundef{origyear}
+ {}
+ {\printorigdate%
\setunit*{\addslash}}%
- \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} }
- {\mkbibbrackets{\printlabeldateextra}}
- {\printlabeldateextra}}}%
- \iffieldundef{issue}
- {}
- {\addcomma\addspace\printfield{issue}}}
+ \iffieldundef{related}
+ {}
+ {\iffieldequalstr{relatedtype}{reprintfrom}
+ {\entrydata*{\thefield{related}}{\printlabeldateextra}%
+ \setunit*{\addslash}}
+ {}}%
+ \printlabeldateextra}}}
\newbibmacro*{cite:shorthand}{%
\ifciteseen
{\printfield{shorthand}}
- {\printnames[labelname][-\value{listtotal}]{labelname}%
+ {\printnames{labelname}%
\setunit{\printdelim{nameyeardelim}}%
\printfield{title}\space\printfield{shorthand}}}
@@ -347,15 +287,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.15) Fall back to title for citations without authors
+% (APA 8.14) Fall back to title for citations without authors
\DeclareFieldFormat{citetitle}{\mkbibquote{#1}}
\DeclareFieldFormat[online]{citetitle}{\mkbibquote{#1}}
\DeclareFieldFormat[inbook]{citetitle}{\mkbibquote{#1}}
\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}}
+\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}}
\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}}
-\DeclareFieldFormat[patent]{citetitle}{#1}
\newbibmacro*{cite:noname}{%
\printfield[citetitle]{labeltitle}}
@@ -363,8 +303,23 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 10.2:32) Raw field cite formats
+
+\DeclareFieldFormat{citefield}{%
+ \ifcurrentfield{edition}
+ {\ifinteger{#1}
+ {\mkbibordedition{#1}~\bibstring{edition}}
+ {#1\isdot}}
+ {\ifcurrentfield{shorthand}
+ {\mkbibemph{#1}}
+ {#1}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 6.21) No parens round year for cites when the cite is in
+% (APA 8.11) No parens round year for cites when the cite is in
% parentheses. Use new command \nptextcite for such cites.
\DeclareDelimFormat[nptextcite]{finalnamedelim}
@@ -416,10 +371,6 @@
{\usebibmacro{prenote}}
{\usedriver
{\DeclareNameAlias{sortname}{default}%
- \global\boolfalse{bbx:parens}%
- \global\boolfalse{bbx:volseen}%
- \global\boolfalse{bbx:titleinauthpos}%
- \global\boolfalse{bbx:editorinauthpos}%
\global\boolfalse{bbx:in}%
\global\let\blx at related@loop\@empty}
{\thefield{entrytype}}%
@@ -435,10 +386,6 @@
\setlength{\parsep}{\bibparsep}}\item}
{\usedriver
{\DeclareNameAlias{sortname}{default}%
- \global\boolfalse{bbx:parens}%
- \global\boolfalse{bbx:volseen}%
- \global\boolfalse{bbx:titleinauthpos}%
- \global\boolfalse{bbx:editorinauthpos}%
\global\boolfalse{bbx:in}}
{\thefield{entrytype}}%
\finentry
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -12,25 +12,22 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.dbx}[2019/09/07\space v8.0\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2019/11/23\space v9.0\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
- letters,
- data,
- newsarticle}
+ nameonly}
\DeclareDatamodelFields[type=list, datatype=name]{
- with,
- writer,
- producer,
+ groupauthor,
+ narrator,
execproducer,
- director}
+ execdirector,
+ with}
\DeclareDatamodelFields[type=field, datatype=literal]{
abstractloc,
- titleisdescription,
- newspaper,
+ appentry,
urldescription}
\DeclareDatamodelFields[type=field, datatype=verbatim]{
@@ -37,92 +34,48 @@
abstracturl}
\DeclareDatamodelEntryfields{
- titleisdescription,
with,
+ groupauthor,
+ narrator,
+ execproducer,
+ execdirector,
abstractloc,
abstracturl,
urldescription}
+\DeclareDatamodelEntryfields[software]{
+ appentry}
-\DeclareDatamodelEntryfields[video]{
- writer,
- producer,
- execproducer,
- director}
-
-\DeclareDatamodelEntryfields[newsarticle]{
+\DeclareDatamodelEntryfields[report]{
+ addendum,
author,
- newspaper,
- title,
- day,
- endday,
- endmonth,
- endyear,
- month,
- year,
- addendum,
+ authortype,
+ chapter,
doi,
- editor,
- editora,
- editorb,
- editorc,
- editoratype,
- editorbtype,
- editorctype,
- eid,
eprint,
eprintclass,
eprinttype,
- issn,
- issue,
- issuetitle,
- issuesubtitle,
+ institution,
+ isrn,
language,
+ location,
note,
number,
- origlanguage,
pages,
- series,
+ pagetotal,
+ pubstate,
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}
+\DeclareDatamodelConstraints[book,inbook,article,report]{
+ \constraint[type=mandatory]{
+ \constraintfieldsor{
+ \constraintfield{author}
+ \constraintfield{groupauthor}
+ }
+ \constraintfield{title}
+ }
+}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,11 +1,9 @@
-\ProvidesFile{austrian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{austrian}
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -22,20 +20,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
-
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
+
\DeclareBibliographyStrings{%
inherit = {austrian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{Comment\space on\space the\space article}
+ {Comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{Review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{Review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{Review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
@@ -45,8 +123,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{brazilian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,14 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {brazilian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{writer}{writer}},%FIXME
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
revisededition = {{Edi\c{c}\~ao\space Revisada}{ed\adddotspace rev\adddot}},
on = {{em}{em}},
retrieved = {{recuperado}{recuperado}},
@@ -34,10 +118,6 @@
from = {{de}{de}},
archivedat = {{arquivado\space em}{arquivado\space em}},
reviewof = {{Revis\~ao\space de}{revis\~ao\space de}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
with = {{with}{with}},
origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
typechair = {{Coordenador}{Coord\adddot}},
@@ -50,6 +130,8 @@
typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -56,16 +138,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -85,9 +166,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -107,9 +188,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{british-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{british}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,14 +17,93 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {british},
+ article = {{article}{article}},
+ painting = {{painting}{painting}},
+ present = {{present}{present}},
+ song = {{song}{song}},
+ album = {{album}{album}},
+ map = {{map}{map}},
+ photograph = {{photograph}{photograph}},
+ photographs = {{photographs}{photographs}},
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},
+ lecturenotes = {{lecturenotes}{lecturenotes}},
+ podcast = {{audio\space podcast}{audio\space podcast}},
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},
+ interview = {{interview}{interview}},
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},
+ lithograph = {{lithograph}{lith\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space series}{TV\space series}},
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},
+ narrator = {{narrator}{narr\adddot}},
+ narrators = {{narrators}{narrs\adddot}},
+ producer = {{producer}{producer}},
+ producers = {{producers}{producers}},
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},
+ director = {{director}{dir\adddot}},
+ directors = {{directors}{dirs\adddot}},
+ writer = {{writer}{writer}},
+ writers = {{writers}{writers}},
+ host = {{host}{host}},
+ hosts = {{hosts}{hosts}},
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},
+ supplement = {{supplement}{suppl\adddot}},
+ part = {{part}{pt\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
@@ -36,13 +113,14 @@
from = {{from}{from}},
archivedat = {{archived\space at}{archived\space at}},
reviewof = {{Review\space of}{review\space of}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
with = {{with}{with}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},
+ paragraphs = {{paragraphs}{paras\adddot}},
mathesis = {{Master's thesis}{Master's\addabbrvspace thesis}},
phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
@@ -56,6 +134,8 @@
typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,16 +142,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +170,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -113,9 +192,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{danish-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {danish},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{producent}{producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{instrukt{\o}r}{instr\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manuskript}{manuskript}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revideret\space udgave}{rev\adddotspace udg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fra}{fra}},
archivedat = {{arkiveret\space ved}{arkiveret\space ved}},
reviewof = {{anmeldelse\space af}{anmeldelse\space af}},
- producer = {{producer}{producer}},
- execproducer = {{producent}{producent}},
- director = {{instrukt{\o}r}{instrukt{\o}r}},
- writer = {{manuskript}{manuskript}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
january = {{januar}{januar}},
february = {{februar}{februar}},
march = {{marts}{marts}},
@@ -68,6 +146,8 @@
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -74,16 +154,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -105,9 +184,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -129,9 +208,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{dutch-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {dutch},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producent}{producent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{uitvoerend producent}{uitvoerend producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regisseur}{reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{schrijver}{schrijver}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{met}{met}},% FIXME: check
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{Herziene\space editie}{herz\adddotspace ed\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Pagina}{{}p\adddot}},
pages = {{Pagina's}{{}pp\adddot}},
on = {{op}{op}},
@@ -36,11 +119,6 @@
from = {{van}{van}},
archivedat = {{gearchiveerd\space onder}{gearchiveerd\space onder}},
reviewof = {{bespreking\space van}{bespreking\space van}},
- producer = {{producent}{producent}},
- execproducer = {{uitvoerend producent}{uitvoerend producent}},
- director = {{regisseur}{regisseur}},
- writer = {{schrijver}{schrijver}},
- with = {{met}{met}},% FIXME: check
paragraph = {{par\adddot}{par\adddot}},
paragraphs = {{par\adddot}{par\adddot}},
mathesis = {{masterscriptie}{masterscriptie}},
@@ -56,6 +134,8 @@
typevolseriess = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,16 +142,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +170,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -113,9 +192,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{english-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{english}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {american},
+ article = {{article}{article}},
+ painting = {{painting}{painting}},
+ present = {{present}{present}},
+ song = {{song}{song}},
+ album = {{album}{album}},
+ map = {{map}{map}},
+ photograph = {{photograph}{photograph}},
+ photographs = {{photographs}{photographs}},
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},
+ lecturenotes = {{lecturenotes}{lecturenotes}},
+ podcast = {{audio\space podcast}{audio\space podcast}},
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},
+ interview = {{interview}{interview}},
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},
+ lithograph = {{lithograph}{lith\adddot}},
+ video = {{video}{video}},
+ film = {{film}{film}},
+ tvseries = {{TV\space series}{TV\space series}},
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},
+ narrator = {{narrator}{narr\adddot}},
+ narrators = {{narrators}{narrs\adddot}},
+ producer = {{producer}{producer}},
+ producers = {{producers}{producers}},
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},
+ director = {{director}{dir\adddot}},
+ directors = {{directors}{dirs\adddot}},
+ writer = {{writer}{writer}},
+ writers = {{writers}{writers}},
+ host = {{host}{host}},
+ hosts = {{hosts}{hosts}},
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},
+ with = {{with}{with}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},
+ supplement = {{supplement}{suppl\adddot}},
+ part = {{part}{pt\adddot}},
revisededition = {{Revised\space Edition}{rev\adddotspace ed\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}pp\adddot}},
on = {{on}{on}},
@@ -35,16 +118,11 @@
available = {{available}{available}},
from = {{from}{from}},
archivedat = {{archived\space at}{archived\space at}},
- with = {{with}{with}},
reprintas = {{reprinted as}{reprinted as}},
reprintfrom = {{reprinted from}{reprinted from}},
reviewof = {{review\space of}{review\space of}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
+ paragraph = {{paragraph}{para\adddot}},
+ paragraphs = {{paragraphs}{paras\adddot}},
mathesis = {{Master's\addabbrvspace thesis}{Master's\addabbrvspace thesis}},
phdthesis = {{Doctoral\addabbrvspace dissertation}{Doctoral\addabbrvspace dissertation}},
origyear = {{original\space work\space published}{original\space work\space published}},
@@ -58,6 +136,8 @@
typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -64,16 +144,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \print*date to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -115,9 +194,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{french-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{french}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,31 +17,110 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {french},
- inpress = {{sous presse}{sous presse}},% remove when biblatex has it
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producteur}{producteur}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{producteur ex\'ecutif}{producteur ex\'ecutif}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{r\'ealisateur}{r\'ealisateur}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{\'ecrivain}{\'ecrivain}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{avec}{avec}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}p\adddot}},
on = {{le}{le}},
retrieved = {{R\'ecup\'er\'ee}{R\'ecup\'er\'ee}},
- with = {{avec}{avec}},
- producer = {{producteur}{producteur}},
- execproducer = {{producteur ex\'ecutif}{producteur ex\'ecutif}},
- director = {{r\'ealisateur}{r\'ealisateur}},
- writer = {{\'ecrivain}{\'ecrivain}},
available = {{disponible}{disponible}},
from = {{\`a\space partir\space de}{\`a\space partir\space de}},
archivedat = {{archiv\'es\space \`a}{archiv\'es\space \`a}},
reviewof = {{critique\space de}{critique\space de}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P}{\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}},
typechair = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}},
typechairs = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}},
@@ -55,18 +132,20 @@
typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -86,9 +165,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -108,9 +187,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Added: trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/galician-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -0,0 +1,232 @@
+\ProvidesFile{galician-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
+\InheritBibliographyExtras{galician}
+
+\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{writer}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
+
+\DeclareBibliographyStrings{%
+ inherit = {galician},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produtor}{produtor}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{produtor executivo}{produtor executivo}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{escritor}{escritor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{con}{con}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ january = {{xaneiro}{xaneiro}},
+ february = {{febreiro}{febreiro}},
+ march = {{marzo}{marzo}},
+ april = {{abril}{abril}},
+ may = {{maio}{maio}},
+ june = {{xu\~no}{xu\~no}},
+ july = {{xullo}{xullo}},
+ august = {{agosto}{agosto}},
+ september = {{setembro}{setembro}},
+ october = {{outubro}{outubro}},
+ november = {{novembro}{novembro}},
+ december = {{decembro}{decembro}},
+ nodate = {{s\adddot d\adddot}{s\adddot d\adddot}},
+ mathesis = {{tese\addabbrvspace de\addabbrvspace mestrado}{tese\addabbrvspace de\addabbrvspace mestrado}},
+ phdthesis = {{tese\addabbrvspace doutoral}{tese\addabbrvspace doutoral}},
+ revisededition = {{edici\'on\space revisada}{edici\'on\space revisada}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
+ host = {{host}{host}},
+ page = {{p\'axina}{{}p\adddot}},
+ pages = {{p\'axinas}{{}pp\adddot}},
+ on = {{o}{o}},
+ retrieved = {{obtido}{obtido}},
+ available = {{dispo\~nible}{dispo\~nible}},
+ from = {{desde}{desde}},
+ archivedat = {{arquivado en}{arquivado en}},
+ reviewof = {{revisi\'on\space de}{revisi\'on\space de}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
+ origyear = {{data\space orixinal\space de\space publicaci\'on}{data\space orixinal\space de\space publicaci\'on}},
+ typechair = {{coordinador}{coord\adddot}},
+ typechairs = {{coordinadores}{coords\adddot}},
+ typevolume = {{editor\space do\space volume}{ed\adddotspace vol\adddot}},
+ typevolumes = {{editores\space do\space volume}{eds\adddotspace vol\adddot}},
+ typeseries = {{editor\space da\space serie}{ed\adddotspace ser\adddot}},
+ typeseriess = {{editores\space da\space serie}{eds\adddotspace ser\adddot}},
+ typevolseries = {{editor\space da\space serie\space e\space do\space volume}{ed\adddotspace vol\space\&\space ser\adddot}},
+ typevolseriess = {{editores\space da\space serie\space e\space do\space volume}{eds\adddotspace vol\space\&\space ser\adddot}},
+ annodomini = {{d\adddot\space C\adddot}{d\adddot\space C\adddot}},
+ beforechrist = {{a\adddot\space C\adddot}{a\adddot\space C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\ifkeyword{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ \iffieldundef{#3}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\ifkeyword{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \iffieldundef{#3}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\stripzeros{\thefield{#3}}\addspace de\addspace}}%
+ \mkbibmonth{\thefield{#2}}%
+}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3{%
+ % As per 10.1, Articles only have year
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and not test {\ifkeyword{nonacademic}} }
+ {\clearfield{labelmonth}%
+ \clearfield{labelday}}
+ {}%
+ \iffieldundef{#3}%
+ {}%
+ {el\addspace\stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}%
+ {\addspace{en}\addspace}%
+ {\iffieldundef{#3}%
+ {en\addspace}%
+ {\addspace{de}\addspace}%
+ \mkbibmonth{\thefield{#2}}{\addspace{de}\addspace}}%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldundef{#2}%
+ {}%
+ {\addspace}%
+ \thefield{#1}}}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{german-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{german}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,31 +20,111 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {german},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
retrieved = {{Zugriff}{Zugriff}},
available = {{Erh\"altlich}{Erh\"altlich}},
- with = {{mit}{mit}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{greek-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {greek},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{writer}{writer}},%FIXME
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{with}{with}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{Αναθεωρημένη\space Έκδοση}{εκδ \adddotspace εκ\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Σελίδα}{{}σ\adddot}},
pages = {{Σελίδες}{{}σσ\adddot}},
on = {{στις}{στις}},
@@ -36,13 +119,8 @@
from = {{από}{από}},
archivedat = {{αρχειοθετήθηκε\space στις}{αρχειοθετήθηκε\space στις}},
reviewof = {{Αναθεώρηση\space του}{αναθεώρηση\space του}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
- with = {{with}{with}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Μεταπτυχιακή εργασία}{Μεταπτυχιακή\addabbrvspace εργασία}},
phdthesis = {{Διδακτορική\addabbrvspace διατριβή}{Διδακτορική\addabbrvspace διατριβή}},
origyear = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}},
@@ -56,6 +134,8 @@
typevolseriess = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,8 +142,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
@@ -87,9 +166,9 @@
#1\BibliographyWarning{Month out of range}%
\fi}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -109,9 +188,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -131,9 +210,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{italian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {italian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producer}{producer}},%FIXME
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{Executive\space Producer}{Exec\adddot\space Prod\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{writer}{writer}},%FIXME
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{with}{with}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Pagina}{{}p\adddot}},
pages = {{Pagine}{{}pp\adddot}},
on = {{il}{il}},
@@ -36,13 +119,8 @@
from = {{da}{da}},
archivedat = {{archiviato\space il}{archiviato\space il}},
reviewof = {{Revisione\space di}{revisione\space di}},
- producer = {{producer}{producer}},
- execproducer = {{executive producer}{executive producer}},
- director = {{director}{director}},
- writer = {{writer}{writer}},
- with = {{with}{with}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Tesi\space di\space laurea}{Tesi\space di\space laurea}},
phdthesis = {{Tesi\space di\space dottorato}{Tesi\space di\space dottorato}},
origyear = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}},
@@ -56,6 +134,8 @@
typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,16 +142,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +170,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -113,9 +192,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{naustrian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{naustrian}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,21 +20,101 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {naustrian},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Autor}{Autor}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Autor}{Aut\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Schriftsteller}{Schriftsteller}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
@@ -45,8 +123,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{ngerman-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{ngerman}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,22 +20,102 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {ngerman},
- abstract = {{Abstract}{Abstract}},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ abstract = {{Abstract}{Abstract}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{auf}{auf}},
@@ -46,8 +124,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -59,21 +137,23 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}},
nodate = {{nicht\space datiert}{{}n\adddot\addabthinspace d\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +173,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -116,9 +196,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{norsk-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {norsk},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produsent}{produsent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss{\o}r}{regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fra}{fra}},
archivedat = {{arkivert\space ved}{arkivert\space ved}},
reviewof = {{anmeldelse\space av}{anmeldelse\space av}},
- producer = {{produsent}{produsent}},
- execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
- director = {{regiss{\o}r}{regiss{\o}r}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Masteroppgave}{Masteroppgave}},
phdthesis = {{Doktoravhandling}{Doktoravhandling}},
origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
@@ -56,6 +134,8 @@
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,16 +142,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -117,9 +196,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{norwegian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {norwegian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produsent}{produsent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss{\o}r}{regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utgave}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fra}{fra}},
archivedat = {{arkivert\space ved}{arkivert\space ved}},
reviewof = {{anmeldelse\space av}{anmeldelse\space av}},
- producer = {{produsent}{produsent}},
- execproducer = {{ut{\o}vende produsent}{ut{\o}vende produsent}},
- director = {{regiss{\o}r}{regiss{\o}r}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Masteroppgave}{Masteroppgave}},
phdthesis = {{Doktoravhandling}{Doktoravhandling}},
origyear = {{opprinnelig\space publisert}{opprinnelig\space publisert}},
@@ -56,6 +134,8 @@
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,16 +142,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -117,9 +196,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nswissgerman-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{nswissgerman-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{nswissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{nswissgerman}
-% (APA 6.22) The example abbreviations
-
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
@@ -22,21 +20,101 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {nswissgerman},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{Regisseur}{Reg\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
@@ -45,8 +123,8 @@
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +136,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +171,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{nynorsk-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {nynorsk},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produsent}{produsent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss{\o}r}{regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{revidert\space utg{\aa}ve}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{side}{{}s\adddot}},
pages = {{sider}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -36,13 +119,8 @@
from = {{fr{\aa}}{fr{\aa}}},
archivedat = {{arkivert\space ved}{arkivert\space ved}},
reviewof = {{melding\space av}{melding\space av}},
- producer = {{produsent}{produsent}},
- execproducer = {{ut{\o}vande produsent}{ut{\o}vande produsent}},
- director = {{regiss{\o}r}{regiss{\o}r}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{Masteroppg{\aa}ve}{Masteroppg{\aa}ve}},
phdthesis = {{Doktoravhandling}{Doktoravhandling}},
origyear = {{opphavleg\space publisert}{opphavleg\space publisert}},
@@ -56,6 +134,8 @@
typevolseriess = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -62,16 +142,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -93,9 +172,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -117,9 +196,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{portuguese-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{portuguese-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{portuguese}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,15 +17,102 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {portuguese},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{produtor}{produtor}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{produtor executivo}{produtor executivo}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{diretor}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{escritor}{escritor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{com}{com}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
on = {{em}{em}},
retrieved = {{obtido}{obtido}},
available = {{dispon\'ivel}{disp.}},
@@ -34,11 +119,6 @@
from = {{de}{de}},
archivedat = {{arquivado\space em}{arquivado\space em}},
reviewof = {{Revis\~ao\space de}{revis\~ao\space de}},
- producer = {{produtor}{produtor}},
- execproducer = {{produtor executivo}{produtor executivo}},
- director = {{diretor}{diretor}},
- writer = {{escritor}{escritor}},
- with = {{com}{com}},
origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
typechair = {{Coordenador}{Coord\adddot}},
typechairs = {{Coordenadores}{Coords\adddot}},
@@ -48,6 +128,10 @@
typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}},
typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}},
typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%
@@ -54,16 +138,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
-
+% Drop end* when they are the same as *
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -83,9 +166,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -105,9 +188,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/russian-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{russian-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{russian-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{russian}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,27 +17,107 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {russian},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{продюсер}{продюсер}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{исполнительный продюсер}{исполнительный продюсер}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{режиссер}{режиссер}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{сценарист}{сценарист}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{с}{с}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{исправленное издание}{испр\adddotspace изд\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
on = {{на}{на}},
retrieved = {{получено}{получено}},
available = {{доступно}{доступно}},
from = {{c}{c}},
archivedat = {{в архиве\space на}{в архиве\space на}},
- with = {{с}{с}},
paragraph = {{абзац}{абз\adddot}},
paragraphs = {{абзацы}{абз\adddot}},
- producer = {{продюсер}{продюсер}},
- execproducer = {{исполнительный продюсер}{исполнительный продюсер}},
- director = {{режиссер}{режиссер}},
- writer = {{сценарист}{сценарист}},
origyear = {{оригинальная\space работа\space опубликована}{ориг\adddotspace работа\space опубл\adddot}},
typechair = {{Председатель}{Председатель}},
typechairs = {{Председатели}{Председатели}},
@@ -51,6 +129,8 @@
typevolseriess = {{Редакторы\space серии\space и\space тома}{Ред\adddotspace сер\adddotspace и\space т\adddot}},
annodomini = {{нашей\space эры}{н\adddotspace э\adddot}},
beforechrist = {{до\space нашей\space эры}{до н\adddotspace э\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
\protected\gdef\lbx at sl@mkbibmonth#1{%
@@ -75,9 +155,9 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -99,9 +179,9 @@
\mkbibmonth{\thefield{#2}}}%
{\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -123,9 +203,9 @@
\mkbibmonth{\thefield{#2}}}%
{\addspace\lbx at sl@mkbibmonth{\thefield{#2}}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{slovene-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -19,11 +17,50 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\NewBibliographyString{% Month name variants used after day
datejanuary,
@@ -42,19 +79,61 @@
\DeclareBibliographyStrings{%
inherit = {slovene},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producent}{producent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{re\v{z}iser}{re\v{z}iser}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{avtor}{avtor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{z}{z}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{dopolnjena izdaja}{dopolnjena iz\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
on = {{na}{na}},
retrieved = {{pridobljeno}{pridobljeno}},
available = {{dostopno}{dostopno}},
from = {{}{}},
archivedat = {{arhivirano\space na}{arhivirano\space na}},
- with = {{z}{z}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
- producer = {{producent}{producent}},
- execproducer = {{izvr\v{s}ni producent}{izvr\v{s}ni producent}},
- director = {{re\v{z}iser}{re\v{z}iser}},
- writer = {{avtor}{avtor}},
+ host = {{host}{host}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
datejanuary = {{januarja}{januarja}},
datefebruary = {{februarja}{februarja}},
datemarch = {{marca}{marca}},
@@ -78,6 +157,8 @@
typevolseriess = {{uredniki}{ur\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
\protected\gdef\lbx at sl@mkbibmonth#1{%
@@ -102,9 +183,9 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -126,9 +207,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -150,9 +231,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,10 +1,8 @@
-\ProvidesFile{spanish-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -21,15 +19,94 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {spanish},
- inpress = {{en prensa}{en prensa}},% remove when biblatex has it
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{productor}{productor}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{productor ejecutivo}{productor ejecutivo}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{director}{dir\adddot}},%FIXME
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{escritor}{escritor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{con}{con}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
january = {{enero}{enero}},
february = {{febrero}{febrero}},
march = {{marzo}{marzo}},
@@ -46,11 +123,11 @@
mathesis = {{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}{Tesis\addabbrvspace de\addabbrvspace maestr\'ia}},
phdthesis = {{Tesis\addabbrvspace doctoral}{Tesis\addabbrvspace doctoral}},
revisededition = {{Edici\'on\space revisada}{Edici\'on\space revisada}},
- producer = {{productor}{productor}},
- execproducer = {{productor ejecutivo}{productor ejecutivo}},
- director = {{director}{director}},
- writer = {{escritor}{escritor}},
- with = {{con}{con}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{P\'agina}{{}p\adddot}},
pages = {{P\'aginas}{{}pp\adddot}},
on = {{el}{el}},
@@ -59,8 +136,8 @@
from = {{desde}{desde}},
archivedat = {{archivado en}{archivado en}},
reviewof = {{revisi\'on\space de}{revisi\'on\space de}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}},
typechair = {{Coordinador}{Coord\adddot}},
typechairs = {{Coordinadores}{Coords\adddot}},
@@ -72,18 +149,20 @@
typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -103,9 +182,9 @@
{\addspace}%
\stripzeros{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -125,9 +204,9 @@
\mkbibmonth{\thefield{#2}}%
}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,8 +1,6 @@
-\ProvidesFile{swedish-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -20,15 +18,100 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {swedish},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
+ producer = {{producent}{producent}},
+ producers = {{producers}{producers}},%FIXME
+ execproducer = {{exekutiv\space producent}{exekutiv\space producent}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ director = {{regiss\"or}{regiss\"or}},
+ directors = {{directors}{dirs\adddot}},%FIXME
+ writer = {{manus}{manus}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{med}{med}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
revisededition = {{reviderad\space utg{\aa}va}{rev\adddotspace utg\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{sida}{{}s\adddot}},
pages = {{sidor}{{}s\adddot}},
on = {{p{\aa}}{p{\aa}}},
@@ -38,15 +121,10 @@
archivedat = {{arkiverat\space vid}{arkiverat\space vid}},
nodate = {{utan\space {\aa}r}{u\adddot~{\aa}}},
reviewof = {{granskning\space av}{granskning\space av}},
- producer = {{producent}{producent}},
- execproducer = {{exekutiv\space producent}{exekutiv\space producent}},
- director = {{regiss\"or}{regiss\"or}},
editor = {{redakt\"or}{red\adddot}},
editors = {{redakt\"or}{red\adddot}},
- writer = {{manus}{manus}},
- with = {{med}{med}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
mathesis = {{examensuppsats}{examensuppsats}},
phdthesis = {{doktorsavhandling}{doktorsavhandling}},
origyear = {{originalarbete\space publicerat}{originalarbete\space publicerat}},
@@ -60,6 +138,8 @@
typevolseriess = {{redakt\"orer}{red\adddot}},
annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
@@ -66,9 +146,9 @@
\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -90,9 +170,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +194,9 @@
{\adddot\addspace}%
\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2019-11-23 21:21:19 UTC (rev 52899)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-apa/swissgerman-apa.lbx 2019-11-23 21:21:40 UTC (rev 52900)
@@ -1,11 +1,9 @@
-\ProvidesFile{swissgerman-apa.lbx}[2019/09/07\space v8.0\space APA biblatex localisation]
+\ProvidesFile{swissgerman-apa.lbx}[2019/11/23\space v9.0\space APA biblatex localisation]
\InheritBibliographyExtras{swissgerman}
% Following DGPs guidlines for German/Austrian/Swiss German
% http://homepage.univie.ac.at/harald.werneck/Richtlinien_zur_Manuskriptgestaltung.pdf
-% (APA 6.22) The example abbreviations
-
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -22,31 +20,112 @@
\NewBibliographyString{archivedat}
\NewBibliographyString{origyear}
\NewBibliographyString{reviewof}
+\NewBibliographyString{with}
+\NewBibliographyString{supplement}
+\NewBibliographyString{commentonarticle}
+\NewBibliographyString{reviewofbook}
+\NewBibliographyString{reviewoffilm}
+\NewBibliographyString{reviewoftv}
+\NewBibliographyString{manunpub}
+\NewBibliographyString{maninprep}
+\NewBibliographyString{mansub}
\NewBibliographyString{producer}
+\NewBibliographyString{producers}
\NewBibliographyString{execproducer}
+\NewBibliographyString{execproducers}
+\NewBibliographyString{execdirector}
+\NewBibliographyString{execdirectors}
\NewBibliographyString{director}
+\NewBibliographyString{directors}
\NewBibliographyString{writer}
-\NewBibliographyString{with}
+\NewBibliographyString{writers}
+\NewBibliographyString{host}
+\NewBibliographyString{hosts}
+\NewBibliographyString{guestexpert}
+\NewBibliographyString{guestexperts}
+\NewBibliographyString{narrator}
+\NewBibliographyString{narrators}
+\NewBibliographyString{film}
+\NewBibliographyString{tvseries}
+\NewBibliographyString{tvepisode}
+\NewBibliographyString{video}
+\NewBibliographyString{song}
+\NewBibliographyString{album}
+\NewBibliographyString{podcast}
+\NewBibliographyString{podcastepisode}
+\NewBibliographyString{interview}
+\NewBibliographyString{speech}
+\NewBibliographyString{lithograph}
+\NewBibliographyString{map}
+\NewBibliographyString{lecturenotes}
+\NewBibliographyString{powerpoint}
+\NewBibliographyString{photograph}
+\NewBibliographyString{photographs}
+\NewBibliographyString{present}
+\NewBibliographyString{painting}
+\NewBibliographyString{article}
\DeclareBibliographyStrings{%
inherit = {swissgerman},
- andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
- revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ article = {{article}{article}},%FIXME
+ painting = {{painting}{painting}},%FIXME
+ present = {{present}{present}},%FIXME
+ song = {{song}{song}},%FIXME
+ album = {{album}{album}},%FIXME
+ map = {{map}{map}},%FIXME
+ photograph = {{photograph}{photograph}},%FIXME
+ photographs = {{photographs}{photographs}},%FIXME
+ powerpoint = {{Powerpoint\space slides}{Powerpoint\space slides}},%FIXME
+ lecturenotes = {{lecturenotes}{lecturenotes}},%FIXME
+ podcast = {{audio\space podcast}{audio\space podcast}},%FIXME
+ podcastepisode = {{audio\space podcast\space episode}{audio\space podcast\space episode}},%FIXME
+ interview = {{interview}{interview}},%FIXME
+ speech = {{speech\space audio\space recording}{speech\space audio\space recording}},%FIXME
+ lithograph = {{lithograph}{lith\adddot}},%FIXME
+ video = {{video}{video}},%FIXME
+ film = {{film}{film}},%FIXME
+ tvseries = {{TV\space series}{TV\space series}},%FIXME
+ tvepisode = {{TV\space series\space episode}{TV\space series\space episode}},%FIXME
+ narrator = {{narrator}{narr\adddot}},%FIXME
+ narrators = {{narrators}{narrs\adddot}},%FIXME
producer = {{Produzent}{Produzent}},
+ producers = {{producers}{producers}},%FIXME
execproducer = {{ausf\"uhrender Produzent}{ausf\adddotspace Produzent}},
- director = {{Regisseur}{Regisseur}},
+ execproducers = {{Executive\space Producers}{Exec\adddot\space Prods\adddot}},%FIXME
+ execdirector = {{Executive\space Director}{Exec\adddot\space Dir\adddot}},%FIXME
+ execdirectors = {{Executive\space Directorss}{Exec\adddot\space Dirs\adddot}},%FIXME
+ execproducers = {{Executive\space Producers}{Executive\space Producers}},%FIXME
+ director = {{Regisseur}{Regi\adddot}},
+ directors = {{directors}{dirs\adddot}},%FIXME
writer = {{Autor}{Autor}},
+ writers = {{writers}{writers}},%FIXME
+ host = {{host}{host}},%FIXME
+ hosts = {{hosts}{hosts}},%FIXME
+ guestexpert = {{Guest\space Expert}{Guest\space Expert}},%FIXME
+ guestexperts = {{Guest\space Experts}{Guest\space Experts}},%FIXME
+ with = {{mit}{mit}},
+ manunpub = {{unpublished\space manuscript}{unpublished\space manuscript}},%FIXME
+ maninprep = {{manuscript\space in\space preparation}{manuscript\space in\space preparation}},%FIXME
+ mansub = {{manuscript\space submitted\space for\space publication}{manuscript\space submitted\space for\space publication}},%FIXME
+ supplement = {{supplement}{suppl\adddot}},%FIXME
+ part = {{part}{pt\adddot}},%FIXME
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"uberarbeitete\space Auf\noligature lage}{\"uberarb\adddotspace Aufl\adddot}},
+ commentonarticle = {{comment\space on\space the\space article}
+ {comment\space on\space the\space article}},%FIXME
+ reviewofbook = {{review\space of\space the\space book}{review\space of\space the\space book}},%FIXME
+ reviewoffilm = {{review\space of\space the\space film}{review\space of\space the\space film}},%FIXME
+ reviewoftv = {{review\space of\space the\space {TV}\space series\space episode}{review\space of\space the\space {TV}\space series\space episode}},%FIXME
page = {{Seite}{{}S\adddot}},
pages = {{Seiten}{{}S\adddot}},
on = {{am}{am}},
retrieved = {{Zugriff\space am}{Zugriff\space am}},
available = {{erh\"altlich}{erh\"altlich}},
- with = {{mit}{mit}},
from = {{unter}{unter}},
archivedat = {{archiviert\space unter}{archiviert\space unter}},
reviewof = {{Rezension\space des}{Rezension\space des}},
- paragraph = {{\P}{\P}},
- paragraphs = {{\P\P}{\P\P}},
+ paragraph = {{paragraph}{para\adddot}},%FIXME
+ paragraphs = {{paragraphs}{paras\adddot}},%FIXME
origyear = {{Original\space erschienen}{Original\space erschienen}},
typechair = {{Leitung}{Leitung}},
typechairs = {{Leitung}{Leitung}},
@@ -58,20 +137,22 @@
typevolseriess = {{Reihen- und\space Bandherausgeber}{Reihen-\space\& Bandhrsg\adddot}},
annodomini = {{A\adddot\addabthinspace D\adddot}{A\adddot\addabthinspace D\adddot}},
beforechrist = {{B\adddot\addabthinspace C\adddot}{B\adddot\addabthinspace C\adddot}},
+ commonera = {{C\adddot E\adddot}{C\adddot E\adddot}},
+ beforecommonera = {{B\adddot C\adddot E\adddot}{B\adddot C\adddot E\adddot}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% (APA 7.10 Example 68) Drop end* when they are the same as *
+% Drop end* when they are the same as *
+% You must use \printdate to get here otherwise it will be ignored
-% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -91,9 +172,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongextra#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
@@ -114,9 +195,9 @@
{}%
{\mkbibmonth{\thefield{#2}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3{%
- % As per 6.28, Articles only have year
+ % As per 10.1, Articles only have year
\ifboolexpr{ test {\ifentrytype{article}}
- and not test {\iffieldequalstr{entrysubtype}{nonacademic}} }
+ and not test {\ifkeyword{nonacademic}} }
{\clearfield{labelmonth}%
\clearfield{labelday}}
{}%
More information about the tex-live-commits
mailing list