summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/README2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib159
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib122
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdfbin108071 -> 108507 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex50
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdfbin87237 -> 88092 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex28
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx200
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx19
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx18
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx16
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx14
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx20
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx21
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx116
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx18
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx6
30 files changed, 598 insertions, 379 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/README b/Master/texmf-dist/doc/latex/biblatex-apa/README
index 36434691ac8..d2871741d73 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/README
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/README
@@ -1,4 +1,4 @@
-Version 6.9
+Version 7.0
Permission is granted to copy, distribute and/or modify this software under
the terms of the LaTeX Project Public License, version
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
index 62c187153ff..ddb7e7fd96f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
@@ -2,68 +2,68 @@
@BOOK{6.11,
AUTHOR = {Kessler, Jr., A.},
TITLE = {Title},
- YEAR = {2003},
+ DATE = {2003},
}
% (APA 6.12)
@BOOK{6.12a,
AUTHOR = {A. Smith and B. Jones},
TITLE = {Title},
- YEAR = {2007},
+ DATE = {2007},
}
@BOOK{6.12b,
AUTHOR = {A. Kisangau and B. Lyaruu and C. Hosea and D. Joseph},
TITLE = {Title},
- YEAR = {2007},
+ DATE = {2007},
}
@BOOK{6.12c,
AUTHOR = {A. Ireys and B. Chernoff and C. DeVet and D. Kim},
TITLE = {Title},
- YEAR = {2001},
+ DATE = {2001},
}
@BOOK{6.12d,
AUTHOR = {A. Ireys and B. Chernoff and E. Stein and C. DeVet and F. Silver},
TITLE = {Title},
- YEAR = {2001},
+ DATE = {2001},
}
@BOOK{6.12e,
AUTHOR = {A. Kurtines and B. Szapocznik},
TITLE = {Title},
- YEAR = {2003},
+ DATE = {2003},
}
@BOOK{6.12f,
AUTHOR = {A. Jöreskog and B. Sörbon},
TITLE = {Title},
- YEAR = {2007},
+ DATE = {2007},
}
@BOOK{6.12g,
AUTHOR = {A. Kosslyn and B. Koenig and C. Barrett and D. Cave and E. Tang and F. Gabrieli},
TITLE = {Title},
- YEAR = {1996},
+ DATE = {1996},
}
@BOOK{6.12h,
AUTHOR = {A. Kosslyn and B. Koenig and F. Gabrieli and E. Tang and G. Marsolek and H. Daly},
TITLE = {Title},
- YEAR = {1996},
+ DATE = {1996},
}
@BOOK{6.12i,
AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and D. Dinge},
TITLE = {Title},
- YEAR = {1990},
+ DATE = {1990},
}
@BOOK{6.12j,
AUTHOR = {A. Albert and B. Bryant and C. Cuthbert and E. Elide},
TITLE = {Title 2},
- YEAR = {1991},
+ DATE = {1991},
}
% (APA 6.13)
@@ -74,64 +74,64 @@
@MISC{6.13a,
AUTHOR = {A. Walker},
TITLE = {Title},
- YEAR = {2007},
+ DATE = {2007},
}
@MISC{6.13b,
AUTHOR = {A. Walker and B. Allen},
TITLE = {Title},
- YEAR = {2004},
+ DATE = {2004},
}
@MISC{6.13c,
AUTHOR = {A. Bradley and B. Ramirez and C. Soo},
TITLE = {Title},
- YEAR = {1999},
+ DATE = {1999},
}
@MISC{6.13d,
AUTHOR = {A. Bradley and B. Ramirez and C. Soo and D. Walsh},
TITLE = {Title},
- YEAR = {2006},
+ DATE = {2006},
}
@MISC{6.13e,
AUTHOR = {A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
TITLE = {Title},
- YEAR = {2008},
+ DATE = {2008},
}
@MISC{6.13f,
AUTHOR = {Z. Wasserstein and A. Walker and B. Allen and A. Bradley and B. Ramirez and C. Soo},
TITLE = {Title},
- YEAR = {2005},
+ DATE = {2005},
}
@MISC{6.13g,
AUTHOR = {{National Institute of Mental Health}},
SHORTAUTHOR = {NIMH},
TITLE = {Title},
- YEAR = {2003},
+ DATE = {2003},
}
@MISC{6.13h,
AUTHOR = {{University of Pittsburgh}},
TITLE = {Title},
- YEAR = {2005},
+ DATE = {2005},
}
@MISC{6.13i,
AUTHOR = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title1},
- YEAR = {2005},
+ DATE = {2005},
}
@MISC{6.13j,
AUTHOR = {{The American Psychological Association}},
SHORTAUTHOR = {APA},
TITLE = {Title2},
- YEAR = {2006},
+ DATE = {2006},
}
% (APA 6.14)
@@ -139,7 +139,7 @@
AUTHOR = {I. Light},
TITLE = {Deflecting Immigration},
SUBTITLE = {Networks, Markets, and regulation in Los Angeles},
- YEAR = {2006},
+ DATE = {2006},
LOCATION = {New York, NY},
PUBLISHER = {Russell Sage Foundation},
}
@@ -148,43 +148,43 @@
@ARTICLE{6.15a,
TITLE = {Study Finds Something Interesting},
SHORTTITLE = {Study Finds},
- YEAR = {2007},
+ DATE = {2007},
}
@BOOK{6.15b,
TITLE = {College Bound Seniors},
- YEAR = {2008},
+ DATE = {2008},
}
@BOOK{6.15c,
AUTHOR = {Anonymous},
TITLE = {Title},
- YEAR = {1998},
+ DATE = {1998},
}
% (APA 6.16)
@BOOK{6.16a,
AUTHOR = {{Department of Veterans Affairs}},
TITLE = {Title1},
- YEAR = {2001},
+ DATE = {2001},
}
@BOOK{6.16b,
AUTHOR = {{Department of Veterans Affairs}},
TITLE = {Title1},
- YEAR = {2003},
+ DATE = {2003},
}
@BOOK{6.16c,
AUTHOR = {A. Gogel},
TITLE = {Title1},
- YEAR = {1990},
+ DATE = {1990},
}
@BOOK{6.16d,
AUTHOR = {A. Gogel},
TITLE = {Title2},
- YEAR = {2006},
+ DATE = {2006},
}
@BOOK{6.16e,
@@ -196,13 +196,13 @@
@BOOK{6.16f,
AUTHOR = {A. Derryberry and B. Reed},
TITLE = {Title1},
- YEAR = {2005},
+ DATE = {2005},
}
@BOOK{6.16g,
AUTHOR = {A. Derryberry and B. Reed},
TITLE = {Title2},
- YEAR = {2005},
+ DATE = {2005},
}
@BOOK{6.16h,
@@ -214,50 +214,50 @@
@BOOK{6.16i,
AUTHOR = {A. Rothbart},
TITLE = {Title1},
- YEAR = {2003},
+ DATE = {2003},
}
@BOOK{6.16j,
AUTHOR = {A. Rothbart},
TITLE = {Title2},
- YEAR = {2003},
+ DATE = {2003},
}
@BOOK{6.16k,
AUTHOR = {A. Miller},
TITLE = {Title},
- YEAR = {1999},
+ DATE = {1999},
}
@BOOK{6.16l,
AUTHOR = {A. Shafrankse and B. Mahoney},
TITLE = {Title},
- YEAR = {1998},
+ DATE = {1998},
}
@BOOK{6.16m,
AUTHOR = {A. Minor},
TITLE = {Title},
- YEAR = {2001},
+ DATE = {2001},
}
@BOOK{6.16n,
AUTHOR = {A. Adams},
TITLE = {Title},
- YEAR = {1999},
+ DATE = {1999},
}
@BOOK{6.16o,
AUTHOR = {A. Storandt},
TITLE = {Title},
- YEAR = {2007},
+ DATE = {2007},
}
% PUBSTATE is not used as there is a year - enforces by a style source map in .bbx
@BOOK{6.16p,
AUTHOR = {Steven Smidge},
TITLE = {Something 1},
- YEAR = {2000},
+ DATE = {2000},
PUBSTATE = {inpress}
}
@@ -278,7 +278,7 @@
@BOOK{6.17,
AUTHOR = {A. Nicholson},
TITLE = {Title},
- YEAR = {2003},
+ DATE = {2003},
}
% (APA 6.18)
@@ -286,14 +286,14 @@
AUTHOR = {Aristotle},
TITLE = {Ethics},
TRANSLATOR = {S. Translator},
- YEAR = {1931},
+ DATE = {1931},
}
@BOOK{6.18b,
AUTHOR = {H. James},
TITLE = {Novel},
ORIGDATE = {1890},
- YEAR = {1983},
+ DATE = {1983},
}
% Last two examples need no references entry
@@ -302,13 +302,13 @@
@BOOK{6.19a,
AUTHOR = {{Centers for Disease Control and Prevention}},
TITLE = {Title},
- YEAR = {2005},
+ DATE = {2005},
}
@BOOK{6.19b,
AUTHOR = {A. Shimamura},
TITLE = {Title},
- YEAR = {1989},
+ DATE = {1989},
}
% (APA 6.20) - No examples need references entry
@@ -317,7 +317,7 @@
@BOOK{6.21,
AUTHOR = {{U.S. Department of Labor}},
TITLE = {Title},
- YEAR = {2007},
+ DATE = {2007},
}
% (APA 6.28a)
@@ -330,7 +330,7 @@
@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},
- YEAR = {2008},
+ DATE = {2008},
JOURNALTITLE = {Law Enforcement Executive Forum Journal},
VOLUME = {8},
NUMBER = {1},
@@ -344,7 +344,7 @@
JOURNALTITLE = {Psychology, Public Policy and Law},
VOLUME = {10},
NUMBER = {4},
- YEAR = {2004}
+ DATE = {2004}
}
@PATENT{A7.07,
@@ -360,7 +360,7 @@
AUTHOR = {Arthur Amorous and Brian Belligerent and Clive Clandestine},
TITLE = {Names Which Inspire Envy},
SUBTITLE = {The Fashions of Nominal Imprudence},
- YEAR = {1923},
+ DATE = {1923},
JOURNALTITLE = {Journal of International Interest},
VOLUME = {87},
NUMBER = {12},
@@ -371,25 +371,25 @@
@BOOK{UL1,
AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
TITLE = {Many Things and Other Topics},
- YEAR = {2010}
+ DATE = {2010}
}
@BOOK{UL2,
AUTHOR = {Jeremy Jester and Gregory Gesticulate and Randolf Rumble},
TITLE = {Random Articles Found Under Cats},
- YEAR = {2010}
+ DATE = {2010}
}
@BOOK{UL3,
AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled},
TITLE = {Can You Say a Word?},
- YEAR = {2010}
+ DATE = {2010}
}
@BOOK{UL4,
AUTHOR = {Patricia Petulant and Cloe Clueless and Brian Beffudled and Graham Grunt},
TITLE = {Looking at Spiders},
- YEAR = {2010}
+ DATE = {2010}
}
% Testing "with"
@@ -397,14 +397,14 @@
AUTHOR = {James Jaunty and Russell Rendition},
WITH = {Alan Also},
TITLE = {Look for Lost Limps},
- YEAR = {2000}
+ DATE = {2000}
}
% Testing citeauthor
@BOOK{ca1,
AUTHOR = {Brian Blameless and Colin Careless and Derek Delusional},
TITLE = {Three Modern Men},
- YEAR = {2001}
+ DATE = {2001}
}
% Testing no date
@@ -466,7 +466,7 @@
@BOOK{pretest,
AUTHOR = {Luis von Mises},
TITLE = {A Title},
- YEAR = {2000}
+ DATE = {2000}
}
% Prefix test (useprefix=false)
@@ -474,7 +474,7 @@
OPTIONS = {useprefix=false},
AUTHOR = {Luis von Mises},
TITLE = {Another Title},
- YEAR = {2001}
+ DATE = {2001}
}
% Prefix + suffix test (useprefix=true) first-last
@@ -489,27 +489,27 @@
OPTIONS = {useprefix=false},
AUTHOR = {von Greaves, Jr., Percy L.},
TITLE = {A test of noprefix 2},
- YEAR = {2001}
+ DATE = {2001}
}
% Prefix + suffix test (useprefix=true)
@BOOK{presufftest2,
AUTHOR = {von Greaves, Jr., Percy L.},
TITLE = {A test of noprefix 2},
- YEAR = {2001}
+ DATE = {2001}
}
% Oxford comma tests
@BOOK{oc1,
AUTHOR = {Hilarious, Hillary and Mirthful, Malcolm and Chuckles, Charles},
TITLE = {Laughter Through the Ages},
- YEAR = {1987}
+ DATE = {1987}
}
@BOOK{oc2,
AUTHOR = {Miserable, Markus and Doleful, Derek and Bitter, Brian},
TITLE = {Dictionary of Depressions},
- YEAR = {1987}
+ DATE = {1987}
}
% Test "and others"
@@ -523,7 +523,7 @@
VOLUME = {76},
NUMBER = {2},
PAGES = {306--317},
- YEAR = {2011}
+ DATE = {2011}
}
@ARTICLE{ao2,
@@ -538,27 +538,27 @@
JOURNAL = {Jolly Journal},
ISSUE = {Spring},
PAGES = {100--103},
- YEAR = {2001}
+ DATE = {2001}
}
% Testing name initials as per: http://blog.apastyle.org/apastyle/2014/01/when-to-use-author-initials-for-text-citations.html
@BOOK{first,
AUTHOR = {Brown, Y. and Campbell, W. K.},
- YEAR = {2004}
+ DATE = {2004}
}
@BOOK{second,
AUTHOR = {Campbell, A. and Muncer, M. and Gorman, B.},
- YEAR = {1993}
+ DATE = {1993}
}
@BOOK{third,
AUTHOR = {Campbell, W. K. and Bush, C. P. and Brunell, A. B.},
- YEAR = {2005}
+ DATE = {2005}
}
@BOOK{fourth,
AUTHOR = {Smyth, L. N. and Campbell, A. and Adams, K.},
- YEAR = {1992}
+ DATE = {1992}
}
@ARTICLE{deutsch1963,
@@ -568,24 +568,31 @@
VOLUME = {70},
NUMBER = {1},
PAGES = {1--10},
- YEAR = {1963},
+ DATE = {1963},
}
% Testing multicite name elision
@article{kingetal2005a,
- author = {King, J. E. and Weiss, A. and Farmer, K. H.},
- title = {Title},
- year = {2005}
+ AUTHOR = {King, J. E. and Weiss, A. and Farmer, K. H.},
+ TITLE = {Title},
+ DATE = {2005}
}
@article{weissetal2007a,
- author = {Weiss, A. and King, J. E. and Hopkins, W. D.},
- title = {Title},
- year = {2007}
+ AUTHOR = {Weiss, A. and King, J. E. and Hopkins, W. D.},
+ TITLE = {Title},
+ DATE = {2007}
}
@article{weissetal2009a,
- author = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.},
- title = {Title},
- year = {2009}
+ AUTHOR = {Weiss, A. and Inoue-Murayama, M. and Hong, K-W. and Inoue, E. and Udono, S. and Ochiai, T. and Matsuzawa, T. and Hirata, S. and King, J. E.},
+ TITLE = {Title},
+ DATE = {2009}
}
+
+% Testing era output
+@BOOK{plato,
+ AUTHOR = {Plato},
+ TITLE = {Meno},
+ DATE = {-0379?~}
+} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
index 64abca9ba5e..31b5d1de77e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test-references.bib
@@ -6,7 +6,7 @@
JOURNALTITLE = {Health Psychology},
VOLUME = {24},
PAGES = {225--229},
- YEAR = {2005},
+ DATE = {2005},
DOI = {10.1037/0278-6133.24.2.225},
URL = {http://some.url}
@@ -19,7 +19,7 @@
JOURNALTITLE = {Nicotine and Tobacco Research},
VOLUME = {6},
PAGES = {249--267},
- YEAR = {2004},
+ DATE = {2004},
DOI = {10.1080/14622200410001676305}
}
@@ -31,14 +31,14 @@
VOLUME = {2},
NUMBER = {2},
PAGES = {38--48},
- YEAR = {2006},
+ DATE = {2006},
URL = {http://ojs.lib.swin.edu.au/index.php/ejap}
}
@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},
- YEAR = {2008},
+ DATE = {2008},
JOURNALTITLE = {Law Enforcement Executive Forum Journal},
VOLUME = {8},
NUMBER = {1},
@@ -53,7 +53,7 @@
JOURNALTITLE = {Approche Neuropsychologique des Apprentissages chez l'Enfant},
VOLUME = {19},
PAGES = {5--17},
- YEAR = {2007},
+ DATE = {2007},
}
% (APA 7.01 Example 5)
@@ -63,7 +63,7 @@
AUTHOR = {S. C. {Von Ledebur}},
TITLE = {Optimizing Knowledge Transfer by New Employees in Companies},
JOURNALTITLE = {Knowledge Management Research and Practice},
- YEAR = {2007},
+ DATE = {2007},
NOTE = {Advance online publication},
DOI = {10.1057/palgrave.kmrp.8500141}
}
@@ -146,7 +146,7 @@
JOURNALTITLE = {Psychology, Public Policy and Law},
VOLUME = {10},
NUMBER = {4},
- YEAR = {2004}
+ DATE = {2004}
}
@ARTICLE{7.01:12b,
@@ -156,7 +156,7 @@
JOURNALTITLE = {Developmental Psychology},
VOLUME = {42},
PAGES = {391--458},
- YEAR = {2006}
+ DATE = {2006}
}
% APA manual implicit example made explicit - no editors
@@ -167,7 +167,7 @@
JOURNALTITLE = {Psychology, Public Policy and Law},
VOLUME = {10},
NUMBER = {4},
- YEAR = {2004}
+ DATE = {2004}
}
% (APA 7.01 Example 13)
@@ -179,7 +179,7 @@
JOURNALTITLE = {Journal of Applied Psychology},
VOLUME = {76},
PAGES = {143--168},
- YEAR = {1991},
+ DATE = {1991},
DOI = {10.1037/0021-9010.76.1.143}
}
@@ -190,7 +190,7 @@
JOURNALTITLE = {Monographs of the Society for Research in Child Development},
VOLUME = {58},
NUMBER = {1, Serial No. 231},
- YEAR = {1993}
+ DATE = {1993}
}
% Implicit example made explicit (Given in APA 5th Ed. Manual)
@@ -201,7 +201,7 @@
JOURNALTITLE = {Journal of Experimental Psychology Monographs},
VOLUME = {80},
NUMBER = {3, Pt. 2},
- YEAR = {1969}
+ DATE = {1969}
}
% (APA 7.01 Example 14)
@@ -211,7 +211,7 @@
JOURNALTITLE = {Journal of Contingencies and Crisis Management},
VOLUME = {14},
PAGES = {1--2},
- YEAR = {2006}
+ DATE = {2006}
}
% (APA 7.01 Example 15)
@@ -223,7 +223,7 @@
JOURNALTITLE = {Journal of Comparitive Psychology},
VOLUME = {122},
PAGES = {186--194},
- YEAR = {2008},
+ DATE = {2008},
DOI = {10.1037/0735-7036.122.2.186.supp}
}
@@ -235,7 +235,7 @@
JOURNALTITLE = {Society for Neuroscience Abstracts},
VOLUME = {17},
PAGES = {480},
- YEAR = {1991}
+ DATE = {1991}
}
% Note use of ABSTRACTURL field value to specify that the URL is for the abstract
@@ -246,7 +246,7 @@
JOURNALTITLE = {Psychology in the Schools},
VOLUME = {43},
PAGES = {701--712},
- YEAR = {2006},
+ DATE = {2006},
ABSTRACTURL = {http://www.interscience.wiley.com}
}
@@ -260,7 +260,7 @@
JOURNALTITLE = {Small Group Research},
VOLUME = {31},
PAGES = {24--53},
- YEAR = {2000},
+ DATE = {2000},
ABSTRACTLOC = {{S}ociological {A}bstracts database. (Accession No. 200010185)}
}
@@ -270,7 +270,7 @@
TITLE = {Computer Addiction? A Study of Computer Dependency},
LOCATION = {London, England},
PUBLISHER = {Taylor \& Francis},
- YEAR = {1989}
+ DATE = {1989}
}
% (APA 7.02 Example 19)
@@ -281,7 +281,7 @@
AUTHOR = {M. A. Shotton},
TITLE = {Computer Addiction? A Study of Computer Dependency},
TITLEADDON = {{DX} {R}eader version},
- YEAR = {1990},
+ DATE = {1990},
URL = {http://www.ebbokstore.tandf.co.uk/html/index.asp}
}
@@ -290,7 +290,7 @@
TITLE = {The Post-traumatic Stress Disorder Sourcebook},
SUBTITLE = {A Guide to Healing, Recovery, and Growth},
TITLEADDON = {{A}dobe {D}igital {E}ditions version},
- YEAR = {2001},
+ DATE = {2001},
DOI = {10.1036/0071393722}
}
@@ -374,7 +374,7 @@
PAGES = {3--18},
LOCATION = {Hillsdale, NJ},
PUBLISHER = {Erlbaum},
- YEAR = {1988},
+ DATE = {1988},
RELATED = {mcppiaget},
RELATEDTYPE = {reprintfrom}
}
@@ -394,7 +394,7 @@
TITLE = {{APA} Dictionary of Psychology},
LOCATION = {Washington, DC},
PUBLISHER = {American Psychological Association},
- YEAR = {2007},
+ DATE = {2007},
}
% (APA 7.02 Example 28)
@@ -405,7 +405,7 @@
EDITION = {22},
LOCATION = {Madrid, Spain},
PUBLISHER = {Author},
- YEAR = {2001},
+ DATE = {2001},
}
% (APA 7.02 Example 29)
@@ -418,7 +418,7 @@
TITLE = {Behaviourism},
BOOKTITLE = {The {S}tanford Encyclopedia of Philosophy},
EDITION = {Fall 2007 ed.},
- YEAR = {2005},
+ DATE = {2005},
URL = {http://plato.stanford.edu/entries/behaviourism/}
}
@@ -439,7 +439,7 @@
SUBTITLE = {A Guide for Schools},
TYPE = {NIH Publication},
NUMBER = {02-2650},
- YEAR = {2003},
+ DATE = {2003},
URL = {http://www.nhlbi.nih.gov/health/prof/lung/asthma/asth_sch.pdf}
}
@@ -447,7 +447,7 @@
@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},
- YEAR = {2007},
+ DATE = {2007},
URL = {http://www.apa.org/pi/wpo/sexualization.html}
}
@@ -459,7 +459,7 @@
TITLE = {The Contribution of Microfinance Institutions to Poverty Reduction in {T}anzania},
TYPE = {Research Report},
NUMBER = {06.3},
- YEAR = {2006},
+ DATE = {2006},
URLDESCRIPTION = {Poverty Alleviation website},
URL = {http://www.repoa.or.tz/documents_storage/Publications/Reports/06.3_Kessey_and_Urio.pdf}
}
@@ -473,7 +473,7 @@
SUBTITLE = {Influence and Domination in the Reading Policymaking Environment},
TYPE = {CIERA Report},
NUMBER = {3-025},
- YEAR = {2002},
+ 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}
}
@@ -520,7 +520,7 @@
BOOKTITLE = {Proceedings of the {N}ational {A}cademy of {S}ciences, {USA}},
VOLUME = {105},
PAGES = {12593--12598},
- YEAR = {2008},
+ DATE = {2008},
DOI = {10.1073/pnas.0805417105}
}
@@ -546,7 +546,7 @@
AUTHOR = {D. S. McNiel},
TITLE = {Meaning Through Narrative},
SUBTITLE = {A Personal Narrative Discussing Growing Up with an Alchoholic Mother},
- YEAR = {2006},
+ DATE = {2006},
NOTE = {Available from ProQuest Dissertations and Theses database},
ADDENDUM = {UMI No. 1434728}
}
@@ -555,7 +555,7 @@
@PHDTHESIS{7.05:41,
AUTHOR = {R. J. Adams},
TITLE = {Building a Foundation for Evaluation of Instruction in Higher Education and Continuing Education},
- YEAR = {1973},
+ DATE = {1973},
URL = {http://www.ohiolink.edu/etd/}
}
@@ -565,7 +565,7 @@
TITLE = {{MOOSE} Crossing},
SUBTITLE = {Construction, Community, and Learning in a Networked Virtual World for Kids},
INSTITUTION = {Massachusetts Institute of Technology},
- YEAR = {1977},
+ DATE = {1977},
URL = {http://www-static.cc.gatech.edu/~asb/thesis/}
}
@@ -578,7 +578,7 @@
SUBTITLE = {Texture Amplification, Motion Representation, and Figure-Ground Segregation},
VOLUME = {65},
NUMBER = {10},
- YEAR = {2005},
+ DATE = {2005},
PAGES = {5428}
}
@@ -592,7 +592,7 @@
TYPE = {Doctoral thesis},
INSTITUTION = {Royal Institute of Technology, Stockholm},
LOCATION = {Sweden},
- YEAR = {2000},
+ DATE = {2000},
URL = {http://urn.kb.se/resolve?urn=urn:nbn:se:kth:diva-3029}
}
@@ -657,7 +657,7 @@
ENTRYSUBTYPE = {Computer Game},
TITLE = {BioShock},
DATE = {2007}
- }
+}
% (APA 7.06 Example 48)
@REVIEW{7.06:48,
@@ -677,7 +677,7 @@
VOLUME = {2},
NUMBER = {1},
PAGES = {1--10},
- YEAR = {2003},
+ DATE = {2003},
}
% (APA 7.07 Example 49)
@@ -687,7 +687,7 @@
ENTRYSUBTYPE = {{DVD}},
PRODUCER = {{American Psychological Association}},
TITLE = {Responding Therapeutically to Patient Expressions of Sexual Attraction},
- YEAR = {2000},
+ DATE = {2000},
URL = {http://www.apa.org/videos/}
}
@@ -724,7 +724,7 @@
MAINTITLEADDON = {{CD}},
LOCATION = {New York, NY},
PUBLISHER = {Nonesuch Records},
- YEAR = {2008},
+ DATE = {2008},
}
% (APA 7.07 Example 53)
@@ -733,7 +733,7 @@
NAMEADDON = {Cartographer},
TITLE = {Population Density, 2000 {U}.{S}. {C}ensus},
ENTRYSUBTYPE = {Demographic map},
- YEAR = {2002},
+ DATE = {2002},
URL = {http://www.co.lewis.wa.us/publicworks/maps/Demographics/census-pop-dens_2000.pdf}
}
@@ -743,7 +743,7 @@
AUTHOR = {{Pew Hispanic Center}},
TITLE = {Changing Channels and Crisscrossing Cultures},
SUBTITLE = {A Survey of {L}atinos on the News Media},
- YEAR = {2004},
+ DATE = {2004},
URL = {http://pewhispanic.org/datasets/}
}
@@ -753,7 +753,7 @@
TITLE = {{E-SOFTA}},
SUBTITLE = {System for Observing Family Therapy Alliances},
ENTRYSUBTYPE = {Software and training videos},
- YEAR = {2002},
+ DATE = {2002},
NOTE = {Unpublished instrument},
URL = {http://www.softa-soatif.com/}
}
@@ -773,7 +773,7 @@
ENTRYSUBTYPE = {Apparatus and software},
LOCATION = {Mississauga, Ontario, Canada},
PUBLISHER = {SR Research},
- YEAR = {2004},
+ DATE = {2004},
}
% (APA 7.09 Example 58)
@@ -783,7 +783,7 @@
HOWPUBLISHED = {Unpublished manuscript},
INSTITUTION = {Department of Psychology, University of British Columbia},
LOCATION = {Vancouver, Canada},
- YEAR = {2003},
+ DATE = {2003},
}
% (APA 7.09 Example 59)
@@ -792,7 +792,7 @@
TITLE = {Mental Health Help-Seeking in Ethnic Minority Populations},
SUBTITLE = {A Theoretical Perspective},
HOWPUBLISHED = {Manuscript submitted for publication},
- YEAR = {2008},
+ DATE = {2008},
}
% (APA 7.09 Example 60)
@@ -800,14 +800,14 @@
AUTHOR = {F. Bordi and J. E. LeDoux},
ENTRYSUBTYPE = {Auditory Response Latencies in Rat Auditory Cortex},
NOTE = {Unpublished raw data},
- YEAR = {1993},
+ DATE = {1993},
}
% (APA 7.09 Example 61)
@UNPUBLISHED{7.09:61a,
AUTHOR = {S. D. Mitchell},
TITLE = {The Import of Uncertainty},
- YEAR = {2000},
+ DATE = {2000},
URL = {http://philsci-archive.pitt.edu/archive/00000162/}
}
@@ -818,7 +818,7 @@
VOLUME = {2},
NUMBER = {1},
PAGES = {58--71},
- YEAR = {2007},
+ DATE = {2007},
}
% (APA 7.09 Example 62)
@@ -828,7 +828,7 @@
AUTHOR = {K. Kubota},
TITLE = {``{S}oaking'' Model for Learning},
SUBTITLE = {Analyzing {J}apanese Learning/Teaching Process from a Socio-Historical Perspective},
- YEAR = {2007},
+ DATE = {2007},
EPRINTTYPE = {eric},
EPRINT = {ED498566}
}
@@ -866,20 +866,19 @@
@UNPUBLISHED{7.10:66,
AUTHOR = {A. Berliner},
TITLE = {Notes for a Lecture on Reminiscences of {W}undt and {L}epizig},
- YEAR = {1959},
+ DATE = {1959},
HOWPUBLISHED = {Anna Berliner Memoirs (Box M50)},
LOCATION = {{Archives of the History of American Psychology, University of Akron, Akron}, OH}
}
% (APA 7.10 Example 67)
-% Pseudo-boolean fields "DOUBTFULAUTHOR" and "DOUBTFULDATE" to specify doubtful information
-% to the drivers. Values should only ever be "true" if present.
+% biblatex 3.4+ supports data annotations which can be use to deal with uncertain authors
+% biblatex 3.5+ supports uncertainty marker for dates
@UNPUBLISHED{7.10:67,
- DOUBTFULAUTHOR = {true},
- DOUBTFULDATE = {true},
AUTHOR = {A. Allport},
+ AUTHOR+an = {=uncertain},
TITLE = {Marion {T}aylor Today---By the Biographer},
- YEAR = {1937},
+ DATE = {1937~},
HOWPUBLISHED = {Unpublished manuscript, Marion Taylor Papers},
LOCATION = {{Schlesinger Library, Radcliffe College, Cambridge}, MA}
}
@@ -935,17 +934,16 @@
}
% (APA 7.10 Example 73)
-% Use DOUBTFULDATE to specifiy the "known" status of the DATE (see Example 67)
+% biblatex 3.5+ supports 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
@MISC{7.10:73,
- DOUBTFULDATE = {true},
TITLEISDESCRIPTION = {true},
TITLE = {{Photographs of Robert M. Yerkes}},
- DATE = {1917/1954},
+ DATE = {circa 1917/1954},
HOWPUBLISHED = {Robert Mearns Yerkes Papers (Box 137, Folder 2292)},
LOCATION = {{Manuscripts and Archives, Yale University Library, New Haven}, CT}
}
@@ -1004,6 +1002,8 @@
}
% 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
@ONLINE{habitat1,
TITLE = {Mission, Vision \& Values},
URL = {http://www.tchabitat.org/missionvisionvalues},
@@ -1027,6 +1027,14 @@
URLDATE = {2012}
}
+@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}
+}
+
@INPROCEEDINGS{proc1,
AUTHOR = {Anon, A. N.},
TITLE = {A very interesting paper},
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
index 465e7321548..35236221e68 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
index e88f2a4243d..68c0f2ba4e9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa-test.tex
@@ -22,7 +22,7 @@
% 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 typsetting static data as this
+% 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}{%
@@ -64,32 +64,26 @@
\makeatletter
% This solution to detokenize leaving a space after the command and
% arguments is due to Bruno Le Floch on T.SE
-\long\def\apaexi#1%
- {%
- \catcode64=11
- \begingroup
- % Ensure that every character is preserved by \lowercase.
- \count@\z@
- \loop\ifnum\count@<256
- \lccode\count@\z@
- \advance\count@\@ne
- \repeat
- % Except spaces, changed to ^^A
- \lccode32=\@ne
- \lowercase
- {%
- \endgroup
- \expandafter\test@\detokenize{#1}\relax%
- \catcode64=12
- }%
- }
+\long\def\apaexi#1{%
+ \catcode64=11
+ \begingroup
+ % Ensure that every character is preserved by \lowercase.
+ \count@\z@
+ \loop\ifnum\count@<256
+ \lccode\count@\z@
+ \advance\count@\@ne
+ \repeat
+ % Except spaces, changed to ^^A
+ \lccode32=\@ne
+ \lowercase{%
+ \endgroup
+ \expandafter\test@\detokenize{#1}\relax%
+ \catcode64=12}}
% Then map {^^A => space, space =>} onto the string.
-\def\test@#1%
- {%
- \ifx#1\relax\test@end\fi
- \ifnum`#1=\@ne\space\else#1\fi
- \test@
- }
+\def\test@#1{%
+ \ifx#1\relax\test@end\fi
+ \ifnum`#1=\@ne\space\else#1\fi
+ \test@}
\def\test@end\fi#1\test@{\fi}
\def\apaex#1{\hbox{\hspace{-4em}\texttt{\small\apaexi{#1}}}\\$\rcurvearrowse$ \textbf{#1}}
@@ -434,6 +428,10 @@ Second citation:\\
% truncation of the 2007 and 2009 names is the same
\noindent{Testing name elision in cites}\\
\apaex{\parencite{kingetal2005a,weissetal2007a,weissetal2009a}}
+
+\noindent Testing circa/BCE/uncertain era format\\
+\apaex{\nptextcite{plato}}
+
\end{refsection}
\begin{refsection}[../bibtex/bib/biblatex-apa-test-references]
\nocite{*}
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
index 426c70aea28..98ad32a1b19 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
index 8347e873963..7ab3ba52fb4 100644
--- a/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-apa/biblatex-apa.tex
@@ -24,12 +24,12 @@
url={http://www.ctan.org/tex-archive/macros/latex/exptl/biblatex-contrib/biblatex-apa/},
author={Philip Kime},
email={Philip@kime.org.uk},
- revision={6.9},
+ revision={7.0},
date={\today}}
\hypersetup{%
pdftitle={APA Bib\LaTeX\ style},
- pdfsubject={APA Citation and References macros for Bib\LaTeX},
+ pdfsubject={APA 6 Conformant Style for Bib\LaTeX},
pdfauthor={Philip Kime},
pdfkeywords={latex, biblatex, APA, style}}
@@ -44,6 +44,16 @@ Please see the revision history below (section \ref{rev}) for details on change
version. This section is just for important things like incompatible
changes which users should be aware of.
+\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.
@@ -167,6 +177,7 @@ Johann Gründl for the Austrian localisation. Thanks to Svante Kvarnström
for the Swedish localisation. Thanks to Hendrik Maryns for further Dutch
localisation. Thanks to Tea Tušar and Bogdan Filipič for the Slovenian
localisation. Thanks to Sebastian Ørsted for the Danish localisation.
+Thanks to Jürgen Spitzmüller for the DGPs localisation hints.
\section{Use}\label{ref:use}
\label{use}
@@ -300,6 +311,10 @@ APA compliant US date formats. Default sensible date formats are included
for german, ngerman and french. You should redefine the |\mkbibdatelong|
macro in the relevant language |*-apa.lbx| file to change this if needed.
+A customisable macro \cmd{urldatecomma} determines what comes between the
+date of a URL and the URL itself. This defaults to the standard comma and
+space as per APA style but just a space in germanic localisations.
+
\subsection{Limitations}
\label{use:limit}
There are certain limitations you need to bear in mind when using these
@@ -308,7 +323,7 @@ citation and references processing---it just tells you how it wants things to
look and the implicit assumption is that you would type out everything by
hand if necessary. Having said that, the majority of the APA citation
and references style is implemented, there are just a few exceptions which
-are hardly worth the coding pain since they ambiguous and easily worked
+are hardly worth the coding pain since they are ambiguous and easily worked
around.
\section{Details}
@@ -437,6 +452,13 @@ applied to the data stream by |biber| and does not change your \file{.bib}.
\begin{changelog}
+\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+
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
index 80d786e25f7..66485f84eeb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/american-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{american-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{american-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{american}
% (APA 6.22) The example abbreviations
@@ -50,12 +50,14 @@
origyear = {{original\space work\space published}{original\space work\space published}},
typechair = {{Chair}{Chair}},
typechairs = {{Chairs}{Chairs}},
- typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}},
- typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}},
+ typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+ typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
typeseries = {{Series\space Editor}{Series\space Ed\adddot}},
typeseriess = {{Series\space Editors}{Series\space Eds\adddot}},
- typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}},
- typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}},
+ typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+ typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -67,7 +69,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
index 4944245cda7..85456ea612c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.bbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.bbx}[2016/05/13\space v6.9\space APA biblatex references style]
+\ProvidesFile{apa.bbx}[2016/07/01\space v7.0\space APA biblatex references style]
\RequireBiber[3]
\RequireBibliographyStyle{standard}
\urlstyle{rm} % APA examples all have URLs in same font as text
@@ -74,56 +74,71 @@
%
% Date formats. Suppress end range of less specific fields
-
-\newcommand*{\mkbibrangeapalong}[1]{%
- \ifthenelse{\equal{#1}{url}}
- {\printtext{%
- \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalongmdy{}{}{#1endday}}}%
- {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
- {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}}}
- {\printtext{%
- \mkbibdateapalong{#1year}{#1month}{#1day}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalong{}{}{#1endday}}}%
- {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
- {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}}}}}}}
-
+\newcommand*{\mkdaterangeapalong}[1]{%
+ \blx@metadateinfo{#1}%
+ \iffieldundef{#1year}{}
+ {\datecircaprint
+ \ifstrequal{#1}{url}% URL dates are unlikely to be BCE ...
+ {\printtext{%
+ \mkbibdateapalongmdy{#1year}{#1month}{#1day}%
+ \iffieldundef{#1endyear}%
+ {}%
+ {\iffieldequalstr{#1endyear}{}% open-ended range?
+ {\mbox{\bibdatedash}}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalongmdy{}{}{#1endday}}}%
+ {\mkbibdateapalongmdy{}{#1endmonth}{#1endday}}}%
+ {\mkbibdateapalongmdy{#1endyear}{#1endmonth}{#1endday}}}}%
+ \dateuncertainprint}}
+ {\printtext{%
+ \mkbibdateapalong{#1year}{#1month}{#1day}%
+ \dateeraprint{#1year}%
+ \iffieldundef{#1endyear}%
+ {}%
+ {\iffieldequalstr{#1endyear}{}% open-ended range?
+ {\mbox{\bibdatedash}}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalong{}{}{#1endday}}}%
+ {\mkbibdateapalong{}{#1endmonth}{#1endday}}}%
+ {\mkbibdateapalong{#1endyear}{#1endmonth}{#1endday}%
+ \dateeraprint{#1endyear}}}%
+ \enddateuncertainprint}}}}}
% Only for DATE as only \printdateextra is used
-\newcommand*{\mkbibrangeapalongextra}[1]{%
- \printtext{%
- \mkbibdateapalongextra{#1year}{#1month}{#1day}%
- \iffieldundef{#1endyear}%
- {}%
- {\iffieldequalstr{#1endyear}{}% open-ended range?
- {\mbox{\bibdatedash}}
- {\bibdatedash%
- \iffieldsequal{#1year}{#1endyear}%
- {\iffieldsequal{#1month}{#1endmonth}%
- {\iffieldsequal{#1day}{#1endday}%
- {}%
- {\mkbibdateapalongextra{}{}{#1endday}}}
- {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
- {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}}}}}}
-
+\newcommand*{\mkdaterangeapalongextra}[1]{%
+ \blx@metadateinfo{#1}%
+ \iffieldundef{#1year}{}
+ {\printtext{%
+ \datecircaprint
+ \mkbibdateapalongextra{#1year}{#1month}{#1day}%
+ \dateeraprint{#1year}%
+ \dateuncertainprint
+ \iffieldundef{#1endyear}%
+ {}%
+ {\iffieldequalstr{#1endyear}{}% open-ended range?
+ {\mbox{\bibdatedash}}
+ {\bibdatedash%
+ \iffieldsequal{#1year}{#1endyear}%
+ {\iffieldsequal{#1month}{#1endmonth}%
+ {\iffieldsequal{#1day}{#1endday}%
+ {}%
+ {\mkbibdateapalongextra{}{}{#1endday}}}
+ {\mkbibdateapalongextra{}{#1endmonth}{#1endday}}}
+ {\mkbibdateapalongextra{#1endyear}{#1endmonth}{#1endday}%
+ \dateeraprint{#1endyear}}}%
+ \enddateuncertainprint}}}}
+
+\AtEndPreamble{%
+ \renewcommand*{\datecircaprint}{%
+ \ifdatecirca{\biblcstring{circa}\printdelim{datecircadelim}}{}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -146,12 +161,12 @@
% (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) uses initials to disambiguate shared surnames
-% (APA 6.16) uses year postfix to disambiguate multiple items in same year
+% (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
+% (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
\DeclareSortingScheme{apa}{
@@ -170,22 +185,24 @@
\field{director}
\field{producer}
\field{execproducer}
- \field{origauthor}
\field{sorttitle}
\field{title}
}
\sort{
+ \field{pubstate}
+ }
+ \sort{
\field{sortyear}
\field{year}
- \field{pubstate}
+ \literal{-2000000000}% APA has "nodates" coming first
}
\sort{
\field{sorttitle}
\field{title}
}
\sort{
- \field[padside=left,padwidth=4,padchar=0]{volume}
- \literal{0000}
+ \field{volume}
+ \literal{0}
}
}
@@ -201,29 +218,33 @@
% 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{labeldate=true,%
- sorting=apa,%
+\ExecuteBibliographyOptions{%
+ abbreviate=true,%
autocite=inline,%
backref=true,%
- pagetracker=true,%
- useprefix=true,%
- usetranslator=true,%
- uniquelist=minyear,%
- uniquename=full,%
citetracker=true,%
- maxcitenames=2,%
- mincitenames=1,%
+ date=apalong,%
+ dateabbrev=false,%
+ datecirca=true,%
+ dateera=christian,%
+ labeldate=apalong,%
+ dateuncertain=true,%
+ eventdate=comp,%
+ labeldateparts=true,%
maxbibnames=7,%
+ maxcitenames=2,%
minbibnames=6,%
- abbreviate=true,%
+ mincitenames=1,%
mincrossrefs=999,%
- uniqueprimaryauthor=true,%
- eventdate=comp,%
- date=apalong,%
- datelabel=apalong,%
origdate=apalong,%
+ pagetracker=true,%
+ sorting=apa,%
+ uniquelist=minyear,%
+ uniquename=full,%
+ uniqueprimaryauthor=true,%
urldate=apalong,%
- dateabbrev=false}
+ useprefix=true,%
+ usetranslator=true}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -365,7 +386,7 @@
{\addcomma\addspace\ldots\addspace}
{\ifthenelse{\value{listcount}>\maxprtauth\AND\value{listcount}<\value{listtotal}}
{}
- {\iffieldequalstr{doubtfulauthor}{true}
+ {\iffieldannotation{uncertain}
{\mkbibbrackets{\usebibmacro{name:apa:family-given}%
{\namepartfamily}%
{\namepartgiven}%
@@ -420,6 +441,7 @@
% Months and days go into parenthesis with year, if set
% (APA 6.29) Issue goes where month normally goes if it
% is set.
+% (APA 7.10) circa or uncertain dates in brackets
% Make sure endmonth gets an expansion too
\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}}
@@ -436,13 +458,13 @@
\iffieldundef{labelyear}
{\iffieldundef{origyear}
{}
- {\printtext[yearorunkyear]{\printfield[noformat]{origyear}}}}%
- {\printtext[yearorunkyear]{\printdateextralabel}}}
+ {\printtext[apadate[{\printorigdate}}}%
+ {\printtext[apadate]{\printlabeldateextra}}}
-\DeclareFieldFormat{yearorunkyear}{%
- \ifthenelse{\iffieldequalstr{doubtfuldate}{true}}
- {\mkbibbrackets{ca\adddot\addspace#1}}
- {\mkbibparens{#1}}}
+\DeclareFieldFormat{apadate}{%
+ \ifboolexpr{ test {\ifdatecirca} or test {\ifdateuncertain} }
+ {\printtext{\mkbibbrackets{#1}}}
+ {\printtext{\mkbibparens{#1}}}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -847,16 +869,17 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 7.02 Example 21) Original year
-\DeclareFieldFormat{origyear}{\mkbibparens{\bibcpstring{origyear}~\thefield{origyear}}}
-
% Only give ORIGYEAR in references if both:
% YEAR is also given
% YEAR and ORIGYEAR are different
\newbibmacro*{origyear}{%
- \ifthenelse{\NOT\iffieldundef{labelyear}\AND\NOT\iffieldsequal{labelyear}{origyear}}
- {\printfield{origyear}}
- {}}
+ \ifboolexpr{%
+ not test {\iffieldundef{origyear}}
+ not test {\iffieldundef{labelyear}}
+ and not test {\iffieldsequal{labelyear}{origyear}}}
+ {\printtext{\mkbibparens{\bibcpstring{origyear}~\printorigdate}}}
+ {}}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1159,8 +1182,8 @@
\setunit{\addspace}%
\iffieldundef{urlyear}
{}
- {\printurldate%
- \setunit*{\addcomma\addspace}}%
+ {\printtext{\printurldate}%
+ \setunit*{\urldatecomma}}%
\printtext{\bibstring{from}}%
\setunit*{\addspace}%
\printfield{urldescription}%
@@ -1249,7 +1272,7 @@
\usebibmacro{related}}}
\newbibmacro*{related:reviewof}[1]{%
- \setunit{}% Sanitize this in case no author
+ \setunit{}% Sanitise this in case no author
\entrydata*{#1}{%
\ifentrytype{article}
{\printtext{\printfield[apacase]{title}}}
@@ -2171,7 +2194,6 @@
\newbibmacro*{bbx:savehash}{%
\savefield{fullhash}{\bbx@lasthash}}
-
\newbool{bbx@inset}
\DeclareBibliographyDriver{set}{%
\booltrue{bbx@inset}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
index 220709a82ff..ce17e03dff2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.cbx
@@ -12,7 +12,7 @@
%%
%% The Current Maintainer of this work is Philip Kime.
-\ProvidesFile{apa.cbx}[2016/05/13\space v6.9\space APA biblatex citation style]
+\ProvidesFile{apa.cbx}[2016/07/01\space v7.0\space APA biblatex citation style]
\RequireBiber[3]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -322,14 +322,19 @@
\savefield{fullhash}{\cbx@lasthash}}}}
\newbibmacro*{cite:plabelyear+extrayear}{%
- \iffieldundef{labelyear}
- {}
+ \iffieldundef{labelyear}{}
{\printtext[bibhyperref]{%
- \printfield[noformat]{origyear}\setunit*{\addslash}%
- \printfield{labelyear}\printfield{extrayear}}}%
- \iffieldundef{issue}
- {}
- {\addcomma\addspace\printfield{issue}}}
+ \iffieldundef{origyear}{}
+ {\ifboolexpr{ test {\iforigdatecirca} or test {\iforigdateuncertain} }
+ {\mkbibbrackets{\printorigdate}}
+ {\printorigdate}%
+ \setunit*{\addslash}}%
+ \ifboolexpr{ test {\iflabeldatecirca} or test {\iflabeldateuncertain} }
+ {\mkbibbrackets{\printlabeldateextra}}
+ {\printlabeldateextra}}}%
+ \iffieldundef{issue}
+ {}
+ {\addcomma\addspace\printfield{issue}}}
\newbibmacro*{cite:shorthand}{%
\ifciteseen
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
index cdf4592a0ac..7035ed87832 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/apa.dbx
@@ -11,21 +11,8 @@
%% This work has the LPPL maintenance status `maintained'.
%%
%% The Current Maintainer of this work is Philip Kime.
-%%
-%% This work consists of the files:
-%%
-%% apa.cbx (biblatex citation style)
-%% apa.bbx (biblatex references style)
-%% apa.dbx (biblatex style data model)
-%% *.lbx (localisation files for APA-specific strings)
-%% biblatex-apa.pdf (Style documentation)
-%% biblatex-apa.tex (Style documentation source)
-%% biblatex-apa-test.pdf (Style examples)
-%% biblatex-apa-test.tex (Style examples source)
-%% biblatex-apa-test-citations.bib (Style examples - citations)
-%% biblatex-apa-test-references.bib (Style examples - references)
-\ProvidesFile{apa.dbx}[2016/05/13\space v6.9\space APA biblatex style data model]
+\ProvidesFile{apa.dbx}[2016/07/01\space v7.0\space APA biblatex style data model]
\RequireBiber[3]
\DeclareDatamodelEntrytypes{
@@ -42,8 +29,6 @@
\DeclareDatamodelFields[type=field, datatype=literal]{
abstractloc,
- doubtfulauthor,
- doubtfuldate,
titleisdescription,
newspaper,
urldescription}
@@ -54,8 +39,6 @@
\DeclareDatamodelEntryfields{
titleisdescription,
with,
- doubtfulauthor,
- doubtfuldate,
abstractloc,
abstracturl,
urldescription}
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
index 9c4f0cef641..fbae1e68dab 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/austrian-apa.lbx
@@ -1,6 +1,9 @@
-\ProvidesFile{austrian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{austrian-apa.lbx}[2016/07/01\space v7.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}
@@ -27,7 +30,8 @@
\DeclareBibliographyStrings{%
inherit = {austrian},
- revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}},
producer = {{Produzent}{Produzent}},
execproducer = {{Produzent}{Produzent}},
director = {{Regisseur}{Regisseur}},
@@ -46,12 +50,14 @@
origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}},
typechair = {{Konferenzstuhl}{Konferenzstuhl}},
typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}},
- typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
- typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+ typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
+ typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
- typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
- typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+ typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
@@ -60,7 +66,8 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \renewcommand{\apashortdash}{~}%
+ \def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
index dadc19d8716..72a16af1a24 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/brazilian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{brazilian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{brazilian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{brazilian}
% (APA 6.22) The example abbreviations
@@ -42,12 +42,14 @@
origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
typechair = {{Coordenador}{Coord\adddot}},
typechairs = {{Coordenadores}{Coords\adddot}},
- typevolume = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}},
- typevolumes = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}},
- typeseries = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}},
- typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}},
- typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}},
- typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}},
+ typevolume = {{Editor\space do\space Volume}{Ed\adddotspace Vol\adddot}},
+ typevolumes = {{Editores\space do\space Volume}{Eds\adddotspace Vol\adddot}},
+ typeseries = {{Editor\space da\space S\'erie}{Ed\adddotspace S\'erie\adddot}},
+ typeseriess = {{Editores\space da\space S\'erie}{Eds\adddotspace S\'erie\adddot}},
+ typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddotspace Vol\space\&\space S\'erie}},
+ typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddotspace Vol\space\&\space S\'erie}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -59,7 +61,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
index 6b390450de6..f8c827e1363 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/british-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{british-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{british-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{british}
% (APA 6.22) The example abbreviations
@@ -48,12 +48,14 @@
origyear = {{original\space work\space published}{original\space work\space published}},
typechair = {{Chair}{Chair}},
typechairs = {{Chairs}{Chairs}},
- typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}},
- typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}},
+ typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+ typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
typeseries = {{Series\space Editor}{Series\space Ed\adddot}},
typeseriess = {{Series\space Editors}{Series\space Eds\adddot}},
- typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}},
- typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}},
+ typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+ typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
index 9e9599850b0..557ee9dcec0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/danish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{danish-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{danish-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{danish}
% (APA 6.22) The example abbreviations
@@ -66,6 +66,8 @@
typeseriess = {{serieredakt{\o}rer}{seriered\adddot}},
typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -77,7 +79,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
index da83afff1f5..00439e7dc70 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/dutch-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{dutch-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{dutch-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{dutch}
% (APA 6.22) The example abbreviations
@@ -54,6 +54,8 @@
typeseriess = {{Reeksredacteuren}{Reeksred\adddot}},
typevolseries = {{Reeks-\space en\space deelredacteur}{Reeks-\space\& deelred\adddot}},
typevolseriess = {{Reeks-\space en\space deelredacteuren}{Reeks-\space\& deelred\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
index 8034403c063..e8a35789e03 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/english-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{english-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{english-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{english}
% (APA 6.22) The example abbreviations
@@ -50,12 +50,14 @@
origyear = {{original\space work\space published}{original\space work\space published}},
typechair = {{Chair}{Chair}},
typechairs = {{Chairs}{Chairs}},
- typevolume = {{Volume\space Editor}{Vol\adddot\space Ed\adddot}},
- typevolumes = {{Volume\space Editors}{Vol\adddot\space Eds\adddot}},
+ typevolume = {{Volume\space Editor}{Vol\adddotspace Ed\adddot}},
+ typevolumes = {{Volume\space Editors}{Vol\adddotspace Eds\adddot}},
typeseries = {{Series\space Editor}{Series\space Ed\adddot}},
typeseriess = {{Series\space Editors}{Series\space Eds\adddot}},
- typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddot\space Ed\adddot}},
- typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddot\space Eds\adddot}},
+ typevolseries = {{Series\space and\space Volume\space Editor}{Series\space\& Vol\adddotspace Ed\adddot}},
+ typevolseriess = {{Series\space and\space Volume\space Editors}{Series\space\& Vol\adddotspace Eds\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -64,10 +66,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% (APA 7.10 Example 68) Drop end* when they are the same as *
-% You must use \printdate to get here otherwise it will be ignored
+% You must use \print*date to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
index 918fcf39c3c..f368f17e022 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/french-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{french-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{french-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{french}
% (APA 6.22) The example abbreviations
@@ -28,7 +28,7 @@
\DeclareBibliographyStrings{%
inherit = {french},
inpress = {{sous presse}{sous presse}},% remove when biblatex has it
- revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddot\space R\'ev\adddot}},
+ revisededition = {{\'Edition\space R\'evis\'e}{\'Ed\adddotspace R\'ev\adddot}},
page = {{Page}{{}p\adddot}},
pages = {{Pages}{{}p\adddot}},
on = {{le}{le}},
@@ -47,12 +47,14 @@
origyear = {{Date\space de\space premi\`ere publication}{Date\space de\space premi\`ere publication}},
typechair = {{Ma\^itre\space de\space Conf\'erence}{Ma\^itre\space de\space Conf\'erence}},
typechairs = {{Ma\^itres\space de\space Conf\'erence}{Ma\^itres\space de\space Conf\'erence}},
- typevolume = {{R\'edacteur\space du\space volume}{R\'ed\adddot\space vol\adddot}},
- typevolumes = {{R\'edacteur\space du\space volume}{R\'eds\adddot\space vol\adddot}},
- typeseries = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddot\space ser\adddot}},
- typeseriess = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddot\space ser\adddot}},
- typevolseries = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddot\space vol\space\&\space ser\adddot}},
- typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddot\space vol\space\&\space ser\adddot}},
+ typevolume = {{R\'edacteur\space du\space volume}{R\'ed\adddotspace vol\adddot}},
+ typevolumes = {{R\'edacteur\space du\space volume}{R\'eds\adddotspace vol\adddot}},
+ typeseries = {{R\'edacteur\space de\space la\space s\'erie}{R\'ed\adddotspace ser\adddot}},
+ typeseriess = {{R\'edacteurs\space de\space la\space s\'erie}{R\'eds\adddotspace ser\adddot}},
+ typevolseries = {{R\'edacteur\space de\space la\space s\'erie\space et\space du volume}{Red\adddotspace vol\space\&\space ser\adddot}},
+ typevolseriess = {{Directeurs\space de\space Publication\space et\space R\'edacteurs\space en\space chef}{Reds\adddotspace vol\space\&\space ser\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -60,7 +62,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
index 0aedb668c99..27bde3bc9a3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/german-apa.lbx
@@ -1,8 +1,11 @@
-\ProvidesFile{german-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{german-apa.lbx}[2016/07/01\space v7.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
+
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -27,7 +30,8 @@
\DeclareBibliographyStrings{%
inherit = {german},
- revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}},
producer = {{Produzent}{Produzent}},
execproducer = {{Produzent}{Produzent}},
director = {{Regisseur}{Regisseur}},
@@ -46,12 +50,14 @@
origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}},
typechair = {{Konferenzstuhl}{Konferenzstuhl}},
typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}},
- typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
- typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+ typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
+ typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
- typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
- typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+ typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
@@ -60,7 +66,8 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \renewcommand{\apashortdash}{~}%
+ \def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
index 000f26c2c9e..00cc54889f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/greek-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{greek-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{greek-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{greek}
% (APA 6.22) The example abbreviations
@@ -48,12 +48,14 @@
origyear = {{πρωτότυπη\space εργασία\space δημοσιευμένη}{πρωτότυπη\space εργασία\space δημοσιευμένη}},
typechair = {{Πρόεδρος}{Πρόεδρος}},
typechairs = {{Πρόεδροι}{Πρόεδροι}},
- typevolume = {{Τόμος\space Συντάκτης}{Τομ\adddot\space Συν\adddot}},
- typevolumes = {{Τόμοι\space Συντάκτες}{Τομ\adddot\space Συν\adddot}},
+ typevolume = {{Τόμος\space Συντάκτης}{Τομ\adddotspace Συν\adddot}},
+ typevolumes = {{Τόμοι\space Συντάκτες}{Τομ\adddotspace Συν\adddot}},
typeseries = {{Σειρά\space Συντάκτης}{Σειρά\space Συν\adddot}},
typeseriess = {{Σειρά\space Συντάκτες}{Σειρά\space Συν\adddot}},
- typevolseries = {{Σειρά\space και\space Τόμος\space Συντάκτης}{Σειρά\space\& Τομ\adddot\space Συν\adddot}},
- typevolseriess = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddot\space Συν\adddot}},
+ typevolseries = {{Σειρά\space και\space Τόμος\space Συντάκτης}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
+ typevolseriess = {{Σειρά\space και\space Τόμος\space Συντάκτες}{Σειρά\space\& Τομ\adddotspace Συν\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\lbx@gr@mkbibmonth#1{%
\ifcase0#1\relax
#1\BibliographyWarning{Month out of range}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
index c1b829207ef..8a56d04867d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/italian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{italian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{italian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{italian}
% (APA 6.22) The example abbreviations
@@ -27,7 +27,7 @@
\DeclareBibliographyStrings{%
inherit = {italian},
- revisededition = {{Edizione\space Revisionata}{Ed\adddot\space Rev\adddot}},
+ revisededition = {{Edizione\space Revisionata}{Ed\adddotspace Rev\adddot}},
page = {{Pagina}{{}p\adddot}},
pages = {{Pagine}{{}pp\adddot}},
on = {{il}{il}},
@@ -48,12 +48,14 @@
origyear = {{Data\space di\space prima\space pubblicazione}{Data\space di\space prima\space pubblicazione}},
typechair = {{Moderatore}{Moderatore}},
typechairs = {{Moderatori}{Moderatori}},
- typevolume = {{Redattore\space del\space Volume}{Red\adddot\space Vol\adddot}},
- typevolumes = {{Redattori\space del\space Volume}{Red\adddot\space Vol\adddot}},
- typeseries = {{Curatore\space della\space Collana}{Cur\addot\space Coll\adddot}},
- typeseriess = {{Curatori\space della\space Collana}{Cur\addot\space Coll\adddot}},
- typevolseries = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addot\space Coll\addot\& Vol\adddot}},
- typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addot\space Coll\addot\& Vol\adddot}},
+ typevolume = {{Redattore\space del\space Volume}{Red\adddotspace Vol\adddot}},
+ typevolumes = {{Redattori\space del\space Volume}{Red\adddotspace Vol\adddot}},
+ typeseries = {{Curatore\space della\space Collana}{Cur\addotspace Coll\adddot}},
+ typeseriess = {{Curatori\space della\space Collana}{Cur\addotspace Coll\adddot}},
+ typevolseries = {{Curatore\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
+ typevolseriess = {{Curatori\space della\space Collana\space e\space del\space Volume}{Cur\addotspace Coll\addot\& Vol\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
index 937f3e3cb48..0e0063eb631 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/naustrian-apa.lbx
@@ -1,8 +1,11 @@
-\ProvidesFile{naustrian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{naustrian-apa.lbx}[2016/07/01\space v7.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
+
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -27,7 +30,8 @@
\DeclareBibliographyStrings{%
inherit = {naustrian},
- revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}},
producer = {{Produzent}{Produzent}},
execproducer = {{Produzent}{Produzent}},
director = {{Regisseur}{Regisseur}},
@@ -46,12 +50,14 @@
origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}},
typechair = {{Konferenzstuhl}{Konferenzstuhl}},
typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}},
- typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
- typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+ typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
+ typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
- typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
- typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+ typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
@@ -60,7 +66,8 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \renewcommand{\apashortdash}{~}%
+ \def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
index 18a347bf38a..c5618821575 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/ngerman-apa.lbx
@@ -1,8 +1,11 @@
-\ProvidesFile{ngerman-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{ngerman-apa.lbx}[2016/07/01\space v7.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
+
\NewBibliographyString{revisededition}
\NewBibliographyString{typechair}
\NewBibliographyString{typechairs}
@@ -27,7 +30,8 @@
\DeclareBibliographyStrings{%
inherit = {ngerman},
- revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddot\space Aufl\adddot}},
+ andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ revisededition = {{\"Uberarbeitete\space Auflage}{\"Uberarb\adddotspace Aufl\adddot}},
producer = {{Produzent}{Produzent}},
execproducer = {{Produzent}{Produzent}},
director = {{Regisseur}{Regisseur}},
@@ -46,12 +50,14 @@
origyear = {{Original\space ver\"offentlicht}{Original\space ver\"offentlicht}},
typechair = {{Konferenzstuhl}{Konferenzstuhl}},
typechairs = {{Konferenzst\"uhle}{Konferenzst\"uhle}},
- typevolume = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
- typevolumes = {{Band\space Herausgeber}{Bd\adddot\space Hrsg\adddot}},
+ typevolume = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
+ typevolumes = {{Band\space Herausgeber}{Bd\adddotspace Hrsg\adddot}},
typeseries = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
typeseriess = {{Reihe\space Herausgeber}{Reihe\space Hrsg\adddot}},
- typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
- typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddot\space Hrsg\adddot}},
+ typevolseries = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ typevolseriess = {{Reihe\space und\space Band\space Herausgeber}{Reihe\space\& Bd\adddotspace Hrsg\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
@@ -60,7 +66,8 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \renewcommand{\apashortdash}{~}%
+ \def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
index cea9a6e3dba..62583e6ed52 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norsk-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{norsk-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{norsk}
% (APA 6.22) The example abbreviations
@@ -54,6 +54,8 @@
typeseriess = {{serieredakt{\o}rer}{seriered\adddot}},
typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
index f41e917e0af..a5a9e11a5fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/norwegian-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{norwegian-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{norwegian-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{norwegian}
% (APA 6.22) The example abbreviations
@@ -54,6 +54,8 @@
typeseriess = {{serieredakt{\o}rer}{seriered\adddot}},
typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
typevolseriess = {{serie- og bindredakt{\o}rer}{serie- og bindred\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
index 513cce7c0e1..2d296df8576 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/nynorsk-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{nynorsk-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{nynorsk-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{nynorsk}
% (APA 6.22) The example abbreviations
@@ -54,6 +54,8 @@
typeseriess = {{serieredakt{\o}rar}{seriered\adddot}},
typevolseries = {{serie- og bindredakt{\o}r}{serie- og bindred\adddot}},
typevolseriess = {{serie- og bindredakt{\o}rar}{serie- og bindred\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%
@@ -65,7 +67,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
new file mode 100644
index 00000000000..deff932d3a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/portuguese-apa.lbx
@@ -0,0 +1,116 @@
+\ProvidesFile{portuguese-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
+\InheritBibliographyExtras{portuguese}
+
+% (APA 6.22) The example abbreviations
+
+\NewBibliographyString{revisededition}
+\NewBibliographyString{typechair}
+\NewBibliographyString{typechairs}
+\NewBibliographyString{typevolume}
+\NewBibliographyString{typevolumes}
+\NewBibliographyString{typeseries}
+\NewBibliographyString{typeseriess}
+\NewBibliographyString{typevolseries}
+\NewBibliographyString{typevolseriess}
+\NewBibliographyString{on}
+\NewBibliographyString{retrieved}
+\NewBibliographyString{available}
+\NewBibliographyString{from}
+\NewBibliographyString{archivedat}
+\NewBibliographyString{origyear}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{producer}
+\NewBibliographyString{execproducer}
+\NewBibliographyString{director}
+\NewBibliographyString{writer}
+\NewBibliographyString{with}
+
+\DeclareBibliographyStrings{%
+ inherit = {portuguese},
+ revisededition = {{Edi\c{c}\~ao\space Revista}{ed\adddotspace rev\adddot}},
+ on = {{em}{em}},
+ retrieved = {{obtido}{obtido}},
+ available = {{dispon\'ivel}{disp.}},
+ from = {{de}{de}},
+ archivedat = {{arquivado\space em}{arquivado\space em}},
+ reviewof = {{Revis\~ao\space de}{revis\~ao\space de}},
+ producer = {{produtor}{produtor}},
+ execproducer = {{produtor executivo}{produtor executivo}},
+ director = {{diretor}{diretor}},
+ writer = {{escritor}{escritor}},
+ with = {{com}{com}},
+ origyear = {{trabalho\space original\space publicado\space em}{trabalho\space original\space publicado\space em}},
+ typechair = {{Coordenador}{Coord\adddot}},
+ typechairs = {{Coordenadores}{Coords\adddot}},
+ typevolume = {{Editor\space do\space Volume}{Ed\adddot\space Vol\adddot}},
+ typevolumes = {{Editores\space do\space Volume}{Eds\adddot\space Vol\adddot}},
+ typeseries = {{Editor\space da\space S\'erie}{Ed\adddot\space S\'erie\adddot}},
+ typeseriess = {{Editores\space da\space S\'erie}{Eds\adddot\space S\'erie\adddot}},
+ typevolseries = {{Editor\space da\space S\'erie\space e\space do\space Volume}{Ed\adddot\space Vol\space\&\space S\'erie}},
+ typevolseriess = {{Editores\space da\space S\'erie\space e\space do\space Volume}{Eds\adddot\space Vol\space\&\space S\'erie}},
+}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% (APA 7.10 Example 68) Drop end* when they are the same as *
+
+% You must use \printdate to get here otherwise it will be ignored
+
+\DeclareBibliographyExtras{%
+ \def\urldatecomma{\addcomma\addspace}%
+ \protected\def\mkbibdateapalong#1#2#3{%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ \iffieldundef{#3}%
+ {}%
+ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongextra#1#2#3{%
+ \iffieldundef{#1}%
+ {}%
+ {\iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}\printfield{extrayear}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#1}%
+ {}%
+ {\addcomma\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ \iffieldundef{#3}%
+ {}%
+ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#1}}%
+ {}%
+ {\addspace}%
+ \stripzeros{\thefield{#3}}}}%
+ \protected\def\mkbibdateapalongmdy#1#2#3{%
+ \iffieldundef{#3}%
+ {}%
+ {\stripzeros{\thefield{#3}}}%
+ \iffieldundef{#2}%
+ {}%
+ {\iffieldundef{#3}%
+ {}%
+ {\addspace}%
+ \mkbibmonth{\thefield{#2}}}%
+ \iffieldundef{#1}%
+ {}%
+ {\ifthenelse{\iffieldundef{#2}\OR\iffieldundef{#3}}%
+ {}%
+ {\addspace}%
+ \iffieldbibstring{#1}{\biblcstring{\thefield{#1}}}{\thefield{#1}}}}}
+
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
index f584c00aeeb..6a4c47633c1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/slovene-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{slovene-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{slovene-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{slovene}
% (APA 6.22) The example abbreviations
@@ -76,6 +76,8 @@
typeseriess = {{uredniki}{ur\adddot}},
typevolseries = {{urednik}{ur\adddot}},
typevolseriess = {{uredniki}{ur\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
\protected\gdef\lbx@sl@mkbibmonth#1{%
@@ -98,7 +100,7 @@
\fi}%
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
index df830f485c1..ceaa0da071c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/spanish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{spanish-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{spanish-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{spanish}
\setcounter{smartand}{0} % Turn off "smart and" or ampersands will all be replaced
@@ -64,12 +64,14 @@
origyear = {{Fecha\space inicial\space de\space publicaci\'on}{Fecha\space inicial\space de\space publicaci\'on}},
typechair = {{Coordinador}{Coord\adddot}},
typechairs = {{Coordinadores}{Coords\adddot}},
- typevolume = {{Editor\space del\space volumen}{Ed\adddot\space vol\adddot}},
- typevolumes = {{Editores\space del\space volumen}{Eds\adddot\space vol\adddot}},
- typeseries = {{Editor\space de\space la\space serie}{Ed\adddot\space ser\adddot}},
- typeseriess = {{Editores\space de\space la\space serie}{Eds\adddot\space ser\adddot}},
- typevolseries = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddot\space vol\space\&\space ser\adddot}},
- typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddot\space vol\space\&\space ser\adddot}},
+ typevolume = {{Editor\space del\space volumen}{Ed\adddotspace vol\adddot}},
+ typevolumes = {{Editores\space del\space volumen}{Eds\adddotspace vol\adddot}},
+ typeseries = {{Editor\space de\space la\space serie}{Ed\adddotspace ser\adddot}},
+ typeseriess = {{Editores\space de\space la\space serie}{Eds\adddotspace ser\adddot}},
+ typevolseries = {{Editor\space de\space la\space serie\space y\space del\space volumen}{Ed\adddotspace vol\space\&\space ser\adddot}},
+ typevolseriess = {{Editores\space de\space la\space serie\space y\space del\space volumen}{Eds\adddotspace vol\space\&\space ser\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -77,7 +79,7 @@
% You must use \printdate to get here otherwise it will be ignored
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
index dae141f77a7..6a26d2711b1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-apa/swedish-apa.lbx
@@ -1,4 +1,4 @@
-\ProvidesFile{swedish-apa.lbx}[2016/05/13\space v6.9\space APA biblatex localisation]
+\ProvidesFile{swedish-apa.lbx}[2016/07/01\space v7.0\space APA biblatex localisation]
\InheritBibliographyExtras{swedish}
% (APA 6.22) The example abbreviations
@@ -58,11 +58,13 @@
typeseriess = {{redakt\"orer}{red\adddot}},
typevolseries = {{redakt\"or}{red\adddot}},
typevolseriess = {{redakt\"orer}{red\adddot}},
+ annodomini = {{A\adddot D\adddot}{A\adddot D\adddot}},
+ beforechrist = {{B\adddot C\adddot}{B\adddot C\adddot}},
}
\DeclareBibliographyExtras{%
- \def\finalandcomma{\addcomma}%
+ \def\urldatecomma{\addcomma\addspace}%
\protected\def\mkbibdateapalong#1#2#3{%
\iffieldundef{#1}%
{}%